diff --git a/client/src/components/demo.jsx b/client/src/components/demo.jsx index 494015ef..e6bee9eb 100644 --- a/client/src/components/demo.jsx +++ b/client/src/components/demo.jsx @@ -46,7 +46,7 @@ function Demo(args) { const { combiner, items, equipping, equipped, players, combo } = demo; const vboxDemo = () => { - function inventoryBtn(i, j) { + function stashBtn(i, j) { if (!i) return ; const highlighted = combiner.indexOf(j) > -1; const classes = `${highlighted ? 'highlight' : ''}`; @@ -82,7 +82,7 @@ function Demo(args) { ); } - function inventoryElement() { + function stashElement() { return (
@@ -96,7 +96,7 @@ function Demo(args) {
 
- {items.map((i, j) => inventoryBtn(i, j))} + {items.map((i, j) => stashBtn(i, j))}
{combinerBtn()}
@@ -106,7 +106,7 @@ function Demo(args) { return (
- {inventoryElement()} + {stashElement()}
); }; diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 99161682..639b6e11 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -5,7 +5,7 @@ const forEach = require('lodash/forEach'); const actions = require('../actions'); -const InventoryElement = require('./vbox.inventory'); +const StashElement = require('./vbox.stash'); const StoreElement = require('./vbox.store'); const CombinerElement = require('./vbox.combiner'); @@ -202,12 +202,12 @@ class Vbox extends preact.Component { ); } - function inventoryHdr() { + function stashHdr() { return (

e.target.scrollIntoView(true)} - onMouseOver={e => vboxHover(e, 'inventory')}> STASH + onMouseOver={e => vboxHover(e, 'stash')}> STASH

@@ -242,7 +242,7 @@ class Vbox extends preact.Component { return (
{vboxHdr()} - {inventoryHdr()} + {stashHdr()} {refundBtn()} - { @@ -40,8 +40,8 @@ function inventoryElement(props) { return ; + disabled={!stashHighlight} + class={stashHighlight ? 'receiving' : 'empty'} > ; } const comboHighlight = vboxHighlight && vboxHighlight.includes(v) ? 'combo-border' : ''; @@ -94,16 +94,16 @@ function inventoryElement(props) { return (
e.stopPropagation()} onDragOver={ev => ev.preventDefault()} - onDrop={inventoryClick} + onDrop={stashClick} >
- {range(0, 4).map(i => inventoryBtn(vbox.bound[i], i))} + {range(0, 4).map(i => stashBtn(vbox.bound[i], i))}
); } -module.exports = inventoryElement; +module.exports = stashElement; diff --git a/client/src/constants.jsx b/client/src/constants.jsx index 5a7a24a3..c0fb5541 100644 --- a/client/src/constants.jsx +++ b/client/src/constants.jsx @@ -29,8 +29,8 @@ module.exports = { description:

ITEMS that are available to buy.
The VBOX is refilled every round.
Click REFILL at the bottom to purchase a refill.

, }, - inventory: { - item: 'INVENTORY', + stash: { + item: 'STASH', description:

Holds ITEMS
ITEMS carry over each round.

, }, bits: { @@ -60,7 +60,7 @@ module.exports = { }, constructSkills: { item: 'SKILLS', - description: 'Skills are used by constructs in the game phase.\nBase skills can be bought from the VBOX.\nEquip skills from the inventory. Double-click to unequip.', + description: 'Skills are used by constructs in the game phase.\nBase skills can be bought from the VBOX.\nEquip skills from the stash. Double-click to unequip.', }, constructSpecs: { item: 'SPECS', diff --git a/client/src/tutorial.utils.jsx b/client/src/tutorial.utils.jsx index 3534cc36..23436be6 100644 --- a/client/src/tutorial.utils.jsx +++ b/client/src/tutorial.utils.jsx @@ -138,7 +138,7 @@ function tutorialStage(tutorial, ws, clearTutorial, instance) {

Tutorial

The first construct on your team is {constructOne}.

Skill items can be equipped to your constructs to be used in the combat phase.

-

Click the newly combined skill item in the top right of the inventory.
+

Click the newly combined skill from the stash.
Once selected click the construct SKILL slot to equip the skill.

); @@ -161,7 +161,7 @@ function tutorialStage(tutorial, ws, clearTutorial, instance) {

Tutorial

Equipping specialisation items will increase the stats of your constructs.

These can also be combined with colours for further specialisation.

-

Click the specialisation item in the top right of the inventory.
+

Click the specialisation item from the stash.
Once selected click the construct SPEC slot to equip the specialisation.

);