ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.12.1'

Browse Source
This commit is contained in:
ntr 2020-01-12 17:39:45 +10:00
commit c641aca232
21 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.12.0
1.12.1

1
WORKLOG.md
View File

@ -3,6 +3,7 @@
_ntr_
* can't reset password without knowing password =\
* hard reload client on version change
* audio
* animation effects

2
acp/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.12.0",
"version": "1.12.1",
"description": "",
"main": "index.js",
"scripts": {

12
client/assets/styles/styles.mobile.less
View File

@ -48,6 +48,10 @@
}
.team {
grid-gap: 1em;
}
.team, #targeting, .resolving-skill {
width: calc(90% - 3em);
}
@ -92,7 +96,7 @@
}
.player {
width: calc(90%);
width: calc(90% - 1.5em);
.game-construct {
grid-template-areas:
"left"
@ -110,11 +114,11 @@
}
.resolving-skill {
width: calc(90%);
width: calc(90% - 1.5em);
}
.opponent {
width: calc(90%);
width: calc(90% - 1.5em);
.game-construct {
grid-template-rows: 2fr min-content;
grid-template-rows: 1fr;
@ -160,9 +164,9 @@
}
aside {
font-size: 75%;
button {
margin-bottom: 0.5em;
z-index: 50;
}
}
}

2
client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.12.0",
"version": "1.12.1",
"description": "",
"main": "index.js",
"scripts": {

1
client/src/actions.jsx
View File

@ -45,7 +45,6 @@ export const setTeamPage = value => ({ type: 'SET_TEAM_PAGE', value });
export const setTeamSelect = value => ({ type: 'SET_TEAM_SELECT', value: Array.from(value) });
export const setTutorial = value => ({ type: 'SET_TUTORIAL', value });
export const setTutorialGame = value => ({ type: 'SET_TUTORIAL_GAME', value });
export const setVboxSelected = value => ({ type: 'SET_VBOX_SELECTED', value: value });
export const setVboxCombiner = value => ({ type: 'SET_VBOX_COMBINER', value });

3
client/src/components/front.page.jsx
View File

@ -50,12 +50,11 @@ function Play(args) {
);
const list = () => {
if (promptRegister) {
return (
<div class='block-text'>
<p><b>You just won your first round of MNML.</b></p>
<p>Register below to play a real Bo5 against other players, play a practice round, customise your team & more...</p>
<p>Register below to play a real Bo5 against other players,<br/> play a practice round against a tougher AI opponent,<br/> customise your team & more...</p>
<p>glhf</p>
</div>
)

7
client/src/components/game.construct.skill.btn.jsx
View File

@ -64,12 +64,9 @@ function Skill(props) {
);
}
// const skillChosen = game.stack.some(stack => stack.source_construct_id === construct.id);
const targeting = game.stack.some(stack => stack.source_construct_id === construct.id && stack.skill === s.skill);
// const skillChosen = game.stack.some(stack => stack.source === construct.id);
const targeting = game.stack.some(stack => stack.source === construct.id && stack.skill === s.skill);
// if (skillChosen && !targeting) {
// return false;
// }
const cdText = construct.skills[i].cd > 0
? `${s.cd}T`
: '';

11
client/src/components/targeting.arrows.jsx
View File

@ -9,8 +9,8 @@ const shapes = require('./shapes');
const { effectInfo } = require('../utils');
const addState = connect(
({ game, account, animating, itemInfo, gameEffectInfo, tutorialGame }) =>
({ game, account, animating, itemInfo, gameEffectInfo, tutorialGame })
({ game, account, animating, itemInfo, gameEffectInfo, authenticated }) =>
({ game, account, animating, itemInfo, gameEffectInfo, authenticated })
);
class TargetSvg extends Component {
@ -32,7 +32,6 @@ class TargetSvg extends Component {
if (newProps.account !== this.props.account) return true;
if (newProps.animating !== this.props.animating) return true;
if (newProps.gameEffectInfo !== this.props.gameEffectInfo) return true;
if (newProps.tutorialGame !== this.props.tutorialGame) return true;
if (newState.width !== this.state.width) return true;
if (newState.height !== this.state.height) return true;
return false;
@ -45,7 +44,7 @@ class TargetSvg extends Component {
animating,
game,
gameEffectInfo,
tutorialGame,
authenticated,
} = props;
const { width, height } = state;
@ -53,10 +52,10 @@ class TargetSvg extends Component {
if (game.phase === 'Finished') return false; // Clear everything if its over (in case of abandon)
// First time joining game phase
if (tutorialGame) {
if (!authenticated && game.stack.length === 0) {
return (
<div class="resolving-skill">
<h2>Select your skills, click on targets and then hit <b>READY</b>.</h2>
<h2><b>Select a skill</b> from each construct, <b>click a target</b> for that skill and then click <b>READY</b>.</h2>
</div>
);
}

4
client/src/components/welcome.login.jsx
View File

@ -51,10 +51,11 @@ function Login(args) {
<label for="username">Username</label>
<input
class="login-input"
type="email"
type="text"
placeholder="username"
tabIndex={1}
value={name}
autocomplete="username"
onInput={linkState(this, 'name')}
/>
<label for="password">Password</label>
@ -63,6 +64,7 @@ function Login(args) {
type="password"
placeholder="password"
tabIndex={2}
autocomplete="current-password"
value={password}
onInput={linkState(this, 'password')}
/>

5
client/src/events.jsx
View File

@ -30,10 +30,6 @@ function registerEvents(store) {
}
function clearTutorialGame() {
store.dispatch(actions.setTutorialGame(null));
}
function setPing(ping) {
store.dispatch(actions.setPing(ping));
}
@ -231,7 +227,6 @@ function registerEvents(store) {
clearInstance,
clearMtxActive,
clearTutorial,
clearTutorialGame,
setAccount,
setAuthenticated,
setAccountInstances,

1
client/src/reducers.jsx
View File

@ -54,7 +54,6 @@ module.exports = {
teamSelect: createReducer([null, null, null], 'SET_TEAM_SELECT'),
tutorial: createReducer(1, 'SET_TUTORIAL'),
tutorialGame: createReducer(1, 'SET_TUTORIAL_GAME'),
vboxSelected: createReducer({ storeSelect: [], stashSelect: [] }, 'SET_VBOX_SELECTED'),
vboxCombiner: createReducer(null, 'SET_VBOX_COMBINER'),

7
client/src/socket.jsx
View File

@ -12,7 +12,7 @@ function errorToast(err) {
return toast.error({
title: 'BEEP BOOP',
message: err,
position: 'topRight',
position: 'bottomLeft',
});
}
@ -129,7 +129,6 @@ function createSocket(events) {
{ game_id: gameId, construct_id: constructId, target_construct_id: targetConstructId, skill },
]);
events.setActiveSkill(null);
events.clearTutorialGame();
}
function sendGameSkillClear(gameId) {
@ -342,7 +341,7 @@ function createSocket(events) {
function onOpen() {
toast.info({
message: 'connected',
position: 'topRight',
position: 'bottomLeft',
});
sendPing();
@ -361,7 +360,7 @@ function createSocket(events) {
console.error('WebSocket closed', event);
toast.warning({
message: 'disconnected',
position: 'topRight',
position: 'bottomLeft',
});
return setTimeout(connect, 5000);
}

4
client/src/utils.jsx
View File

@ -208,7 +208,7 @@ function postData(url = '/', data = {}) {
function errorToast(message) {
toast.error({
position: 'topRight',
position: 'bottomLeft',
drag: false,
close: false,
message,
@ -217,7 +217,7 @@ function errorToast(message) {
function infoToast(message) {
toast.info({
position: 'topRight',
position: 'bottomLeft',
drag: false,
close: false,
message,

2
core/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mnml_core"
version = "1.12.0"
version = "1.12.1"
authors = ["ntr <ntr@smokestack.io>", "mashy <mashy@mnml.gg>"]
[dependencies]

2
ops/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-ops",
"version": "1.12.0",
"version": "1.12.1",
"description": "",
"main": "index.js",
"scripts": {

2
server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mnml"
version = "1.12.0"
version = "1.12.1"
authors = ["ntr <ntr@smokestack.io>"]
[dependencies]

20
server/src/rpc.rs
View File

@ -141,24 +141,6 @@ struct Connection {
events: CbSender<Event>,
}
impl Connection {
// this is where last minute processing happens
// use it to modify outgoing messages, update subs, serialize in some way...
fn send(&self, msg: RpcMessage) -> Result<(), Error> {
let msg = match msg {
RpcMessage::InstanceState(v) => RpcMessage::InstanceState(v.redact(self.id)),
RpcMessage::AccountInstances(v) =>
RpcMessage::AccountInstances(v.into_iter().map(|i| i.redact(self.id)).collect()),
RpcMessage::GameState(v) => RpcMessage::GameState(v.redact(self.id)),
_ => msg,
};
self.ws.send(msg).unwrap();
Ok(())
}
}
// we unwrap everything in here cause really
// we don't care if this panics
// it's run in a thread so it's supposed to bail
@ -178,7 +160,7 @@ impl Handler for Connection {
},
Err(e) => {
warn!("{:?}", e);
self.send(RpcMessage::Error(e.to_string())).unwrap();
self.ws.send(RpcMessage::Error(e.to_string())).unwrap();
},
};
},

10
server/src/user_anonymous.rs
View File

@ -50,6 +50,16 @@ impl User for Anonymous {
_ => (),
};
// last minute redactions and processing
// this happens after the state setting as we need to keep
// all the skills to prevent forfeiting
let msg = match msg {
RpcMessage::InstanceState(v) => RpcMessage::InstanceState(v.redact(self.id)),
RpcMessage::GameState(v) => RpcMessage::GameState(v.redact(self.id)),
_ => msg,
};
self.ws.send(msg)?;
Ok(())

9
server/src/user_authenticated.rs
View File

@ -79,6 +79,15 @@ impl User for Authenticated {
_ => (),
};
// last minute processing
let msg = match msg {
RpcMessage::InstanceState(v) => RpcMessage::InstanceState(v.redact(self.id)),
RpcMessage::AccountInstances(v) =>
RpcMessage::AccountInstances(v.into_iter().map(|i| i.redact(self.id)).collect()),
RpcMessage::GameState(v) => RpcMessage::GameState(v.redact(self.id)),
_ => msg,
};
self.ws.send(msg)?;
Ok(())

2
studios/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-studios",
"version": "1.12.0",
"version": "1.12.1",
"description": "",
"main": "index.js",
"scripts": {