From 4ab8e99f1d52dbdfc02e536012dbe5c993c2165e Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sat, 20 Jul 2019 22:44:36 +1000
Subject: [PATCH] fix boolean 0 check bullshit

---
 client/src/components/vbox.component.jsx | 11 +++++------
 client/src/events.jsx                    |  4 ++--
 client/src/keyboard.jsx                  |  2 +-
 client/src/reducers.jsx                  |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 3f8b9fa4..2633d593 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -240,7 +240,7 @@ function Vbox(args) {
     const reclaimClass = `vbox-btn reclaim ${reclaiming ? 'reclaiming' : ''}`;
 
     function inventoryBtn(v, i) {
-        if (!v) return <button disabled class='empty' >&nbsp;</button>;
+        if (!v && v !== 0) return <button disabled class='empty' >&nbsp;</button>;
 
         function onClick(e) {
             if (reclaiming) return sendVboxReclaim(i);
@@ -279,25 +279,24 @@ function Vbox(args) {
     }
 
     function combinerBtn() {
-        const dots = combiner.filter(v => v).length;
         let text = '';
 
-        if (dots < 3) {
+        if (combiner.length < 3) {
             for (let i = 0; i < 3; i++) {
-                if (dots > i) {
+                if (combiner.length > i) {
                     text += '■ ';
                 } else {
                     text += '▫ ';
                 }
             }
         } else {
-            text = 'combine'
+            text = 'combine';
         }
 
         return (
             <button
                 class='vbox-btn'
-                disabled={dots !== 3}
+                disabled={combiner.length !== 3}
                 onMouseOver={e => hoverInfo(e, 'refine')}
                 onClick={() => sendVboxCombine()}>
                 {text}
diff --git a/client/src/events.jsx b/client/src/events.jsx
index f0a93581..3aad7443 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -113,7 +113,7 @@ function registerEvents(store) {
 
     function clearCombiner() {
         store.dispatch(actions.setInfo([]));
-        store.dispatch(actions.setCombiner([null, null, null]));
+        store.dispatch(actions.setCombiner([]));
     }
 
     function clearConstructRename() {
@@ -139,7 +139,7 @@ function registerEvents(store) {
     }
 
     function clearInstance() {
-        store.dispatch(actions.setCombiner([null, null, null]));
+        store.dispatch(actions.setCombiner([]));
         store.dispatch(actions.setReclaiming(false));
         store.dispatch(actions.setActiveSkill(null));
         store.dispatch(actions.setActiveConstruct(null));
diff --git a/client/src/keyboard.jsx b/client/src/keyboard.jsx
index 9e8629b4..8964cec5 100644
--- a/client/src/keyboard.jsx
+++ b/client/src/keyboard.jsx
@@ -4,7 +4,7 @@ const actions = require('./actions');
 function setupKeys(store) {
     console.log('binding keys');
     key.unbind('esc');
-    key('esc', () => store.dispatch(actions.setCombiner([null, null, null])));
+    key('esc', () => store.dispatch(actions.setCombiner([])));
     key('esc', () => store.dispatch(actions.setReclaiming(false)));
     key('esc', () => store.dispatch(actions.setActiveSkill(null)));
     key('esc', () => store.dispatch(actions.setActiveConstruct(null)));
diff --git a/client/src/reducers.jsx b/client/src/reducers.jsx
index 3366bcaa..539c5473 100644
--- a/client/src/reducers.jsx
+++ b/client/src/reducers.jsx
@@ -21,7 +21,7 @@ module.exports = {
     animTarget:         createReducer(null, 'SET_ANIM_TARGET'),
     animText:           createReducer(null, 'SET_ANIM_TEXT'),
 
-    combiner:           createReducer([null, null, null], 'SET_COMBINER'),
+    combiner:           createReducer([], 'SET_COMBINER'),
     constructs:         createReducer([], 'SET_CONSTRUCTS'),
     constructEditId:    createReducer(null, 'SET_CONSTRUCT_EDIT_ID'),
     constructRename:    createReducer(null, 'SET_CONSTRUCT_RENAME'),