This commit is contained in:
ntr 2019-05-20 18:19:33 +10:00
parent 9c586fe9f7
commit 0fafa97f6e
6 changed files with 33 additions and 19 deletions

View File

@ -109,6 +109,16 @@
.vbox-hdr .bits { .vbox-hdr .bits {
font-size: 2em; font-size: 2em;
line-height: 1em; line-height: 1em;
animation: bits 1s ease-out;
}
@keyframes action {
0% {
color: palegoldenrod;
}
100% {
color: whitesmoke;
}
} }
.vbox button { .vbox button {
@ -298,7 +308,6 @@
/* Equipment */ /* Equipment */
.equip { .equip {
display: flex; display: flex;
margin: 1em 0;
text-align: center; text-align: center;
} }

View File

@ -73,7 +73,7 @@ function Info(args) {
return ( return (
<div className="info-spec"> <div className="info-spec">
<div>{info}</div> <h2>{info}</h2>
<div>{fullInfo.description}</div> <div>{fullInfo.description}</div>
<div className="thresholds"> <div className="thresholds">
{thresholdEl} {thresholdEl}

View File

@ -40,10 +40,16 @@ function Instance(args) {
if (!instance) return false; if (!instance) return false;
function hoverInfo(e, info) {
e.stopPropagation();
return setInfo(info);
}
const rdyClasses = `instance-btn instance-ui-btn ${player.ready ? 'ready' : ''}`; const rdyClasses = `instance-btn instance-ui-btn ${player.ready ? 'ready' : ''}`;
const readyBtn = ( const readyBtn = (
<button <button
className={rdyClasses} className={rdyClasses}
onMouseOver={e => hoverInfo(e, 'ready')}
onClick={() => sendInstanceReady()}> onClick={() => sendInstanceReady()}>
Ready Ready
</button> </button>

View File

@ -38,10 +38,6 @@ const addState = connect(
return dispatch(actions.setInfo(null)); return dispatch(actions.setInfo(null));
} }
function setVboxHighlight(v) {
dispatch(actions.setVboxHighlight(v));
}
function setItemEquip(v) { function setItemEquip(v) {
return dispatch(actions.setItemEquip(v)); return dispatch(actions.setItemEquip(v));
} }
@ -50,7 +46,7 @@ const addState = connect(
return dispatch(actions.setItemUnequip(v)); return dispatch(actions.setItemUnequip(v));
} }
return { quit, clearInfo, setInfo, setActiveCryp, setItemUnequip, setItemEquip, setVboxHighlight }; return { quit, clearInfo, setInfo, setActiveCryp, setItemUnequip, setItemEquip };
} }
); );
@ -65,17 +61,10 @@ function Cryp(props) {
setActiveCryp, setActiveCryp,
setItemUnequip, setItemUnequip,
setItemEquip, setItemEquip,
setVboxHighlight,
itemInfo, itemInfo,
setInfo, setInfo,
} = props; } = props;
function setHighlight(type) {
if (type === 'skill') return setVboxHighlight(itemInfo.items.filter(v => v.skill).map(v => v.item));
if (type === 'spec') return setVboxHighlight(itemInfo.items.filter(v => v.spec).map(v => v.item));
return false;
}
function onClick(e) { function onClick(e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@ -85,6 +74,8 @@ function Cryp(props) {
} }
function hoverInfo(e, info) { function hoverInfo(e, info) {
console.log(info);
if (!info) return false;
e.stopPropagation(); e.stopPropagation();
return setInfo(info); return setInfo(info);
} }
@ -107,15 +98,15 @@ function Cryp(props) {
return true; return true;
} }
const action = skill ? '' : 'action'; // const action = skill ? '' : 'action';
const equip = skillList.includes(vbox.bound[itemEquip]) && !skill ? 'equip' : ''; const equip = skillList.includes(vbox.bound[itemEquip]) && !skill ? 'equip' : '';
const classes = `right ${action} ${equip}`; const classes = `${equip}`;
return ( return (
<button <button
key={i} key={i}
className={classes} className={classes}
onClick={skillClick} onClick={skillClick}
onMouseOver={e => hoverInfo(e, s)} > onMouseOver={e => hoverInfo(e, skill && skill.skill)} >
{s} {s}
</button> </button>
); );

View File

@ -286,7 +286,7 @@ function Vbox(args) {
<div className='vbox-box' onClick={() => setReclaiming(false)} onMouseOver={e => hoverInfo(e, 'vbox')} > <div className='vbox-box' onClick={() => setReclaiming(false)} onMouseOver={e => hoverInfo(e, 'vbox')} >
<div className="vbox-hdr"> <div className="vbox-hdr">
<h3 onTouchStart={e => e.target.scrollIntoView(true)}>VBOX</h3> <h3 onTouchStart={e => e.target.scrollIntoView(true)}>VBOX</h3>
<div className="bits" >{vbox.bits}b</div> <div className="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div>
</div> </div>
<button <button
className="instance-btn instance-ui-btn vbox-btn" className="instance-btn instance-ui-btn vbox-btn"

View File

@ -19,6 +19,14 @@ module.exports = {
item: 'I-COMBINATOR', item: 'I-COMBINATOR',
description: 'Combines purchased ITEMS into more powerful variants. Hover over an ITEM to see recipes.', description: 'Combines purchased ITEMS into more powerful variants. Hover over an ITEM to see recipes.',
}, },
bits: {
item: 'BITS',
description: 'The VBOX currency.\nColours: 1b\nSkills: 2b\nSpecs: 3b\nWin: +12b\nLose: +9b',
},
ready: {
item: 'READY',
description: 'Ends the VBOX PHASE. If your opponent is also ready the GAME PHASE begins.',
},
reclaim: { reclaim: {
item: 'RECLAIM', item: 'RECLAIM',
description: 'Reclaim ITEMS for half the purchase cost of their combined ITEMS.\nClick to enable and click ITEM to reclaim.', description: 'Reclaim ITEMS for half the purchase cost of their combined ITEMS.\nClick to enable and click ITEM to reclaim.',
@ -39,7 +47,7 @@ module.exports = {
item: 'QUICK ACCESS - SPECS', item: 'QUICK ACCESS - SPECS',
description: 'Click to select \nClick target CRYP to equip', description: 'Click to select \nClick target CRYP to equip',
}, },
crypSkill: { crypSkills: {
item: 'SKILLS', item: 'SKILLS',
description: 'Skills are used by Cryps in-game.\nClick a SKILL above and select a CRYP to equip.', description: 'Skills are used by Cryps in-game.\nClick a SKILL above and select a CRYP to equip.',
}, },