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

wl remove duplicate vbox hoverFn

Browse Source
This commit is contained in:
Mashy 2019-11-21 11:19:33 +10:00
parent 917858174c
commit 5cb9f6ebd0
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WORKLOG.md
View File

@ -1,10 +1,10 @@
# WORK WORK
## NOW
* add combine between all of shop and stash, stash size -> 4
*PRODUCTION*
* supporter gold name in instance (anyone whos put any money into game)
* can't reset password without knowing password =\
* Graphics
@ -17,17 +17,12 @@
- Speed (e.g. boots)
- Life (e.g. heart)
* reduce inventory size and consolidate vbox and inventory on left side
* audio
* background music
* animation effects
* vbox combine / buy / equip etc
* reclaim change colour from red (clashes with red items)
* represent construct colours during game phase (coloured border?)
* supporter gold name in instance (anyone whos put any money into game)
* Give the bots some ai / make stronger so its a challenge for new people to beat
- train a few games of with some round losses to get them into the game

17
client/src/components/vbox.component.jsx
View File

@ -241,14 +241,14 @@ class Vbox extends preact.Component {
<div class='items'>
<h3
onTouchStart={e => e.target.scrollIntoView(true)}
onMouseOver={e => hoverInfo(e, 'vbox')}> STORE
onMouseOver={e => vboxHover(e, 'vbox')}> STORE
</h3>
<div class={`bits ${vbox.bits < 3 ? 'red' : false}`} onMouseOver={e => hoverInfo(e, 'bits')}>
<div class={`bits ${vbox.bits < 3 ? 'red' : false}`} onMouseOver={e => vboxHover(e, 'bits')}>
<h2> {vbox.bits}b </h2>
</div>
<button
class='vbox-btn'
onMouseOver={e => hoverInfo(e, 'refill')}
onMouseOver={e => vboxHover(e, 'refill')}
disabled={vbox.bits < 2
|| (tutorial && tutorial < 7 && instance.time_control === 'Practice' && instance.rounds.length === 1)
}
@ -410,7 +410,7 @@ class Vbox extends preact.Component {
<div class='items'>
<h3
onTouchStart={e => e.target.scrollIntoView(true)}
onMouseOver={e => hoverInfo(e, 'inventory')}> STASH
onMouseOver={e => vboxHover(e, 'inventory')}> STASH
</h3>
<button
disabled={tutorialDisabled || !refund}
@ -431,15 +431,6 @@ class Vbox extends preact.Component {
//
// EVERYTHING
//
function hoverInfo(e, newInfo) {
if (shopSelect.find(c => c[0])) return true;
if (stashSelect.length !== 0) {
const base = stashSelect.find(c => !['Red', 'Blue', 'Green'].includes(vbox.bound[c]));
if (base || base === 0) return true;
}
return setInfo(newInfo);
}
return (
<div class='vbox'>
{vboxHdr()}