From 331844f904562ef05d2f8a58da6fcfddf2b79273 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 20 May 2019 12:31:37 +1000
Subject: [PATCH] client var -> item

---
 client/src/actions.jsx                       |  2 +-
 client/src/components/info.component.jsx     | 16 +++++------
 client/src/components/info.cryp.jsx          |  4 +--
 client/src/components/instance.container.jsx |  4 +--
 client/src/components/instance.cryps.jsx     | 28 ++++++++++----------
 client/src/components/instance.equip.jsx     | 20 +++++++-------
 client/src/components/vbox.component.jsx     | 14 +++++-----
 client/src/components/vbox.container.jsx     |  4 +--
 client/src/events.jsx                        |  6 ++---
 client/src/reducers.jsx                      |  4 +--
 client/src/socket.jsx                        |  2 +-
 client/src/utils.jsx                         |  4 +--
 12 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/client/src/actions.jsx b/client/src/actions.jsx
index deffd2ec..01ca414c 100644
--- a/client/src/actions.jsx
+++ b/client/src/actions.jsx
@@ -53,7 +53,7 @@ export const SET_ACTIVE_CRYP = 'SET_ACTIVE_CRYP';
 export const setActiveCryp = value => ({ type: SET_ACTIVE_CRYP, value });
 
 export const SET_ACTIVE_VAR = 'SET_ACTIVE_VAR';
-export const setActiveVar = value => ({ type: SET_ACTIVE_VAR, value });
+export const setActiveItem = value => ({ type: SET_ACTIVE_VAR, value });
 
 export const SET_INFO = 'SET_INFO';
 export const setInfo = value => ({ type: SET_INFO, value });
diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index 6284790e..bb1175b1 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -2,7 +2,7 @@ const preact = require('preact');
 const range = require('lodash/range');
 
 const { ITEMS: { SKILLS, COLOURS, SPECS: SPEC_CONSTANT } } = require('./../constants');
-const { COLOUR_ICONS, STATS, SPECS, convertVar, crypAvatar } = require('../utils');
+const { COLOUR_ICONS, STATS, SPECS, convertItem, crypAvatar } = require('../utils');
 const shapes = require('./shapes');
 
 const InfoCryp = require('./info.cryp');
@@ -19,7 +19,7 @@ function Info(args) {
         vboxHidden,
     } = args;
 
-    function CrypVar() {
+    function CrypItem() {
         if (!info) return false;
         const [type, value] = info;
         if (!type) return false;
@@ -48,7 +48,7 @@ function Info(args) {
                 return console.warn('UNHANLDED VAR', value);
             }
             return (
-                <div className="info-var">
+                <div className="info-item">
                     {value} - {itemDetails.description}
                 </div>
             );
@@ -175,8 +175,8 @@ function Info(args) {
                     <tbody>
                         {filteredCombos.map((c, i) =>
                             <tr key={i} >
-                                <td className="highlight" >{convertVar(c.var)}</td>
-                                {c.units.map((u, j) => <td key={j}>{convertVar(u)}</td>)}
+                                <td className="highlight" >{convertItem(c.item)}</td>
+                                {c.units.map((u, j) => <td key={j}>{convertItem(u)}</td>)}
                             </tr>
                         )}
                     </tbody>
@@ -190,8 +190,8 @@ function Info(args) {
                 <tbody>
                     {vboxCombos.map((c, i) =>
                         <tr key={i} >
-                            <td className="highlight" >{convertVar(c.var)}</td>
-                            {c.units.map((u, j) => <td key={j} >{convertVar(u)}</td>)}
+                            <td className="highlight" >{convertItem(c.item)}</td>
+                            {c.units.map((u, j) => <td key={j} >{convertItem(u)}</td>)}
                         </tr>
                     )}
                 </tbody>
@@ -207,7 +207,7 @@ function Info(args) {
 
     return (
         <div className={classes} >
-            <CrypVar />
+            <CrypItem />
             <Combos />
         </div>
     );
diff --git a/client/src/components/info.cryp.jsx b/client/src/components/info.cryp.jsx
index b64c837f..230864dc 100644
--- a/client/src/components/info.cryp.jsx
+++ b/client/src/components/info.cryp.jsx
@@ -52,8 +52,8 @@ function InfoCryp(args) {
     if (!cryp) return false;
 
     function setHighlight(type) {
-        if (type === 'skill') return setVboxHighlight(vboxInfo.vars.filter(v => v.skill).map(v => v.v));
-        if (type === 'spec') return setVboxHighlight(vboxInfo.vars.filter(v => v.spec).map(v => v.v));
+        if (type === 'skill') return setVboxHighlight(vboxInfo.items.filter(v => v.skill).map(v => v.v));
+        if (type === 'spec') return setVboxHighlight(vboxInfo.items.filter(v => v.spec).map(v => v.v));
         return false;
     }
 
diff --git a/client/src/components/instance.container.jsx b/client/src/components/instance.container.jsx
index d7e32140..206333e9 100644
--- a/client/src/components/instance.container.jsx
+++ b/client/src/components/instance.container.jsx
@@ -6,7 +6,7 @@ const Instance = require('./instance.component');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, instance, player, account, activeVar, vboxHidden } = state;
+        const { ws, instance, player, account, activeItem, vboxHidden } = state;
 
         function sendInstanceReady() {
             return ws.sendInstanceReady(instance.id);
@@ -16,7 +16,7 @@ const addState = connect(
             return ws.sendVboxApply(instance.id, crypId, i);
         }
 
-        return { instance, player, account, sendInstanceReady, sendVboxApply, activeVar, vboxHidden };
+        return { instance, player, account, sendInstanceReady, sendVboxApply, activeItem, vboxHidden };
     },
 
     function receiveDispatch(dispatch) {
diff --git a/client/src/components/instance.cryps.jsx b/client/src/components/instance.cryps.jsx
index 007930c5..95dae84d 100644
--- a/client/src/components/instance.cryps.jsx
+++ b/client/src/components/instance.cryps.jsx
@@ -8,7 +8,7 @@ const actions = require('../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, instance, player, account, vboxHidden, vboxInfo, activeVar, activeCryp } = state;
+        const { ws, instance, player, account, vboxHidden, vboxInfo, activeItem, activeCryp } = state;
 
         function sendInstanceReady() {
             return ws.sendInstanceReady(instance.id);
@@ -18,7 +18,7 @@ const addState = connect(
             return ws.sendVboxApply(instance.id, crypId, i);
         }
 
-        return { instance, player, account, sendInstanceReady, sendVboxApply, vboxHidden, vboxInfo, activeVar, activeCryp };
+        return { instance, player, account, sendInstanceReady, sendVboxApply, vboxHidden, vboxInfo, activeItem, activeCryp };
     },
 
     function receiveDispatch(dispatch) {
@@ -50,7 +50,7 @@ const addState = connect(
 function Cryp(props) {
     const {
         activeCryp,
-        activeVar,
+        activeItem,
         cryp,
         player,
         sendVboxApply,
@@ -61,21 +61,21 @@ function Cryp(props) {
     } = props;
 
     function setHighlight(type) {
-        if (type === 'skill') return setVboxHighlight(vboxInfo.vars.filter(v => v.skill).map(v => v.v));
-        if (type === 'spec') return setVboxHighlight(vboxInfo.vars.filter(v => v.spec).map(v => v.v));
+        if (type === 'skill') return setVboxHighlight(vboxInfo.items.filter(v => v.skill).map(v => v.v));
+        if (type === 'spec') return setVboxHighlight(vboxInfo.items.filter(v => v.spec).map(v => v.v));
         return false;
     }
 
     function onClick(e) {
         e.stopPropagation();
         e.preventDefault();
-        if (activeVar !== null) sendVboxApply(cryp.id, activeVar);
+        if (activeItem !== null) sendVboxApply(cryp.id, activeItem);
         return setActiveCryp(cryp);
     }
 
     const { vbox } = player;
-    const skillList = vboxInfo.vars.filter(v => v.skill).map(v => v.v);
-    const specList = vboxInfo.vars.filter(v => v.spec).map(v => v.v);
+    const skillList = vboxInfo.items.filter(v => v.skill).map(v => v.v);
+    const specList = vboxInfo.items.filter(v => v.spec).map(v => v.v);
 
     const skills = range(0, 3).map(i => {
         const skill = cryp.skills[i];
@@ -84,7 +84,7 @@ function Cryp(props) {
             : (<span className="gray">+</span>);
 
         function skillClick(e) {
-            if (!skill && activeVar !== null) return sendVboxApply(cryp.id, activeVar);
+            if (!skill && activeItem !== null) return sendVboxApply(cryp.id, activeItem);
             if (!skill) setHighlight('skill');
             else setInfo('skill', { skill: skill.skill, cryp });
             e.stopPropagation();
@@ -92,7 +92,7 @@ function Cryp(props) {
         }
 
         const action = skill ? '' : 'action';
-        const equip = skillList.includes(vbox.bound[activeVar]) && !skill ? 'equip' : '';
+        const equip = skillList.includes(vbox.bound[activeItem]) && !skill ? 'equip' : '';
         const classes = `right ${action} ${equip}`;
         return (
             <button key={i} className={classes} onClick={skillClick} >{s}</button>
@@ -104,13 +104,13 @@ function Cryp(props) {
 
         function blankSpecClick(e) {
             e.stopPropagation();
-            if (activeVar !== null) return sendVboxApply(cryp.id, activeVar);
+            if (activeItem !== null) return sendVboxApply(cryp.id, activeItem);
             setHighlight('spec');
             return setActiveCryp(cryp);
         }
 
         if (!s) {
-            const equip = specList.includes(vbox.bound[activeVar]) ? 'equip-spec' : 'gray';
+            const equip = specList.includes(vbox.bound[activeItem]) ? 'equip-spec' : 'gray';
             return (
                 <figure key={i} onClick={blankSpecClick} className={equip} >
                     {shapes.diamond(`stat-icon ${equip}`)}
@@ -185,7 +185,7 @@ function Cryp(props) {
 function InstanceCryps(props) {
     const {
         activeCryp,
-        activeVar,
+        activeItem,
         player,
         instance,
         // clearInfo,
@@ -202,7 +202,7 @@ function InstanceCryps(props) {
     if (instance.phase === 'Lobby') return false;
 
     const cryps = player.cryps.map((c, i) => Cryp({
-        activeCryp, activeVar, cryp: c, player, sendVboxApply, setInfo, setActiveCryp, vboxInfo, setVboxHighlight,
+        activeCryp, activeItem, cryp: c, player, sendVboxApply, setInfo, setActiveCryp, vboxInfo, setVboxHighlight,
     }));
 
     const classes = `cryp-list ${vboxHidden ? '' : 'hidden'}`;
diff --git a/client/src/components/instance.equip.jsx b/client/src/components/instance.equip.jsx
index aaf34f16..a45ca744 100644
--- a/client/src/components/instance.equip.jsx
+++ b/client/src/components/instance.equip.jsx
@@ -3,7 +3,7 @@ const preact = require('preact');
 const range = require('lodash/range');
 
 const actions = require('../actions');
-const { convertVar, SPECS } = require('./../utils');
+const { convertItem, SPECS } = require('./../utils');
 
 const addState = connect(
     function receiveState(state) {
@@ -25,11 +25,11 @@ const addState = connect(
             return dispatch(actions.setInfo([]));
         }
 
-        function setActiveVar(v) {
-            return dispatch(actions.setActiveVar(v));
+        function setActiveItem(v) {
+            return dispatch(actions.setActiveItem(v));
         }
 
-        return { setInfo, setActiveVar, clearInfo };
+        return { setInfo, setActiveItem, clearInfo };
     }
 
 );
@@ -41,7 +41,7 @@ function Equipment(props) {
         vboxInfo,
         sendUnequip,
         setInfo,
-        setActiveVar,
+        setActiveItem,
     } = props;
 
     const { vbox } = player;
@@ -51,7 +51,7 @@ function Equipment(props) {
     function boundClick(e, i) {
         const value = vbox.bound[i];
         setInfo('item', value);
-        setActiveVar(i);
+        setActiveItem(i);
         return false;
     }
 
@@ -70,12 +70,12 @@ function Equipment(props) {
     const specClass = infoType === 'spec' ? 'specs highlight' : 'specs';
 
     // const classes = `right ${skill ? '' : 'action'}`;
-    const skillList = vboxInfo.vars.filter(v => v.skill).map(v => v.v);
-    const specList = vboxInfo.vars.filter(v => v.spec).map(v => v.v);
+    const skillList = vboxInfo.items.filter(v => v.skill).map(v => v.v);
+    const specList = vboxInfo.items.filter(v => v.spec).map(v => v.v);
 
 
     const skills = range(0, 9).map(i => {
-        const item = convertVar(vbox.bound[i]);
+        const item = convertItem(vbox.bound[i]);
         if (skillList.includes(item)) {
             return (
                 <button key={i} className={''} onClick={e => boundClick(e, i)}>
@@ -86,7 +86,7 @@ function Equipment(props) {
     });
 
     const specs = range(0, 9).map(i => {
-        const item = convertVar(vbox.bound[i]);
+        const item = convertItem(vbox.bound[i]);
         if (specList.includes(item)) {
             return (
                 <figure key={i} onClick={e => boundClick(e, i)}>
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index daea780c..63b02f29 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -3,7 +3,7 @@ const range = require('lodash/range');
 
 const shapes = require('./shapes');
 
-const { convertVar } = require('./../utils');
+const { convertItem } = require('./../utils');
 
 function Vbox(args) {
     const {
@@ -42,7 +42,7 @@ function Vbox(args) {
         const filteredCombos = vboxInfo.combos
             .filter(combo => combinerValues.every(u => combo.units.includes(u)));
 
-        const comboValues = vboxInfo.vars.filter(v => {
+        const comboValues = vboxInfo.items.filter(v => {
             if (!filteredCombos.some(c => c.units.includes(v.v))) return false;
             if (!['Red', 'Green', 'Blue'].includes(v.v) && combinerValues.includes(v.v)) return false;
             return true;
@@ -104,7 +104,7 @@ function Vbox(args) {
                 onClick={freeClick}
                 onDblClick={() => sendVboxAccept(j, i) }
                 >
-                {convertVar(c)}
+                {convertItem(c)}
             </td>;
         });
 
@@ -154,7 +154,7 @@ function Vbox(args) {
                 key={i}
                 className={`${highlighted ? 'highlight' : ''}`}
                 onClick={e => boundClick(e, i, highlighted) }>
-                {convertVar(value)}
+                {convertItem(value)}
             </td>
         );
     });
@@ -189,13 +189,13 @@ function Vbox(args) {
             <tbody>
                 <tr>
                     <td onClick={() => combinerRmv(0)}>
-                        {combiner[0] !== null ? convertVar(vbox.bound[combiner[0]]) : shapes.vboxColour('gray')}
+                        {combiner[0] !== null ? convertItem(vbox.bound[combiner[0]]) : shapes.vboxColour('gray')}
                     </td>
                     <td onClick={() => combinerRmv(1)}>
-                        {combiner[1] !== null ? convertVar(vbox.bound[combiner[1]]) : shapes.vboxColour('gray')}
+                        {combiner[1] !== null ? convertItem(vbox.bound[combiner[1]]) : shapes.vboxColour('gray')}
                     </td>
                     <td onClick={() => combinerRmv(2)}>
-                        {convertVar(vbox.bound[combiner[2]])}
+                        {convertItem(vbox.bound[combiner[2]])}
                     </td>
                 </tr>
             </tbody>
diff --git a/client/src/components/vbox.container.jsx b/client/src/components/vbox.container.jsx
index 6b69bca1..19fa5413 100644
--- a/client/src/components/vbox.container.jsx
+++ b/client/src/components/vbox.container.jsx
@@ -12,7 +12,7 @@ const addState = connect(
             player,
             combiner,
             reclaiming,
-            activeVar,
+            activeItem,
             activeCryp,
             info,
             vboxHidden,
@@ -45,7 +45,7 @@ const addState = connect(
             player,
             combiner,
             reclaiming,
-            activeVar,
+            activeItem,
             activeCryp,
             info,
             vboxInfo,
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 15ad89d5..1caed41c 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -112,8 +112,8 @@ function registerEvents(store) {
         store.dispatch(actions.setActiveSkill(skill));
     }
 
-    function setActiveVar(v) {
-        store.dispatch(actions.setActiveVar(v));
+    function setActiveItem(v) {
+        store.dispatch(actions.setActiveItem(v));
     }
 
     function clearInfo(info) {
@@ -206,7 +206,7 @@ function registerEvents(store) {
         clearCombiner,
         setAccount,
         setActiveSkill,
-        setActiveVar,
+        setActiveItem,
         setCryps,
         setCrypList,
         setGame,
diff --git a/client/src/reducers.jsx b/client/src/reducers.jsx
index 91c04fcf..5d6fbb93 100644
--- a/client/src/reducers.jsx
+++ b/client/src/reducers.jsx
@@ -16,7 +16,7 @@ module.exports = {
     account:        createReducer(null, actions.SET_ACCOUNT),
     activeCryp:     createReducer(null, actions.SET_ACTIVE_CRYP),
     activeSkill:    createReducer(null, actions.SET_ACTIVE_SKILL),
-    activeVar:      createReducer(null, actions.SET_ACTIVE_VAR),
+    activeItem:      createReducer(null, actions.SET_ACTIVE_VAR),
     combiner:       createReducer([null, null, null], actions.SET_COMBINER),
     cryps:          createReducer([], actions.SET_CRYPS),
     game:           createReducer(null, actions.SET_GAME),
@@ -33,6 +33,6 @@ module.exports = {
     showLog:        createReducer(false, actions.SET_SHOW_LOG),
     vboxHidden:     createReducer(false, actions.SET_VBOX_HIDDEN),
     vboxHighlight:  createReducer([], actions.SET_VBOX_HIGHLIGHT),
-    vboxInfo:       createReducer({ combos: [], vars: [] }, actions.SET_VBOX_INFO),
+    vboxInfo:       createReducer({ combos: [], items: [] }, actions.SET_VBOX_INFO),
     ws:             createReducer(null, actions.SET_WS),
 };
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index 194adc91..72b27bf6 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -93,7 +93,7 @@ function createSocket(events) {
 
     function sendVboxApply(instanceId, crypId, index) {
         send({ method: 'player_vbox_apply', params: { instance_id: instanceId, cryp_id: crypId, index } });
-        events.setActiveVar(null);
+        events.setActiveItem(null);
     }
 
     function sendVboxUnequip(instanceId, crypId, target) {
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index d0d942eb..08e4341b 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -374,7 +374,7 @@ function getCombatText(cryp, resolution) {
     return '';
 }
 
-function convertVar(v) {
+function convertItem(v) {
     if (['Red', 'Green', 'Blue'].includes(v)) {
         return (
             shapes.vboxColour(v.toLowerCase())
@@ -390,7 +390,7 @@ function convertVar(v) {
 
 module.exports = {
     stringSort,
-    convertVar,
+    convertItem,
     numSort,
     genAvatar,
     crypAvatar,