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

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
ntr 2019-09-12 12:39:39 +10:00
commit 78853943f2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/instance.constructs.jsx
View File

@ -179,7 +179,7 @@ function Construct(props) {
const stats = Object.keys(STATS).map(s => { const stats = Object.keys(STATS).map(s => {
const stat = STATS[s]; const stat = STATS[s];
const info = (s === 'Speed' && 'Speed') const info = (s === 'SpeedStat' && 'Speed')
|| (s.includes('Power') && 'Power') || (s.includes('Power') && 'Power')
|| (s.includes('Life') && 'Life'); || (s.includes('Life') && 'Life');

7
client/src/components/instance.ctrl.jsx
View File

@ -15,9 +15,8 @@ const addState = connect(
} = state; } = state;
function sendReady() { function sendReady() {
document.activeElement.blur() document.activeElement.blur();
return ws.sendInstanceReady(instance.id); return ws.sendInstanceReady(instance.id);
return false;
} }
function sendAbandon() { function sendAbandon() {
@ -87,14 +86,14 @@ function Controls(args) {
? <button class="ready" onClick={() => sendReady()}>Ready</button> ? <button class="ready" onClick={() => sendReady()}>Ready</button>
: <button class="ready" onClick={leave}>Leave</button> : <button class="ready" onClick={leave}>Leave</button>
const abandon = instance.phase !== 'Finished' ? sendAbandon : false;
return ( return (
<aside> <aside>
{timer} {timer}
<div class="controls"> <div class="controls">
<PlayerBox player={opponent} /> <PlayerBox player={opponent} />
{ready} {ready}
<PlayerBox player={player} isPlayer={true} abandon={sendAbandon}/> <PlayerBox player={player} isPlayer={true} abandon={abandon}/>
</div> </div>
</aside> </aside>
); );