From 9f15bf1defa215603c20a0358ac594ca0a34976c Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 22 May 2019 12:07:16 +1000
Subject: [PATCH] remove player from state

---
 client/src/actions.jsx                       |  1 -
 client/src/components/info.component.jsx     |  5 ++-
 client/src/components/info.container.jsx     |  4 +--
 client/src/components/instance.component.jsx |  5 +--
 client/src/components/instance.cryps.jsx     |  4 ++-
 client/src/components/instance.equip.jsx     |  3 +-
 client/src/components/nav.jsx                |  2 --
 client/src/components/vbox.component.jsx     |  5 +--
 client/src/events.jsx                        | 38 ++++++++++----------
 client/src/reducers.jsx                      |  1 -
 server/src/skill.rs                          | 10 +++---
 11 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/client/src/actions.jsx b/client/src/actions.jsx
index 57315e7c..9fc79bff 100644
--- a/client/src/actions.jsx
+++ b/client/src/actions.jsx
@@ -6,7 +6,6 @@ export const setVboxHighlight = value => ({ type: 'SET_VBOX_HIGHLIGHT', value })
 export const setInstances = value => ({ type: 'SET_INSTANCES', value });
 export const setNav = value => ({ type: 'SET_NAV', value });
 export const setInstance = value => ({ type: 'SET_INSTANCE', value });
-export const setPlayer = value => ({ type: 'SET_PLAYER', value });
 export const setPing = value => ({ type: 'SET_PING', value });
 export const setGame = value => ({ type: 'SET_GAME', value });
 export const setResolution = value => ({ type: 'SET_RESOLUTION', value });
diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index d1020a19..89dd44ca 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -12,9 +12,11 @@ function Info(args) {
 
         combiner,
         instance,
-        player,
+        account,
     } = args;
 
+    const player = instance.players.find(p => p.id === account.id);
+
     function Info() {
         if (!info) return false;
         const fullInfo = itemInfo.items.find(i => i.item === info) || INFO[info];
@@ -93,6 +95,7 @@ function Info(args) {
 
     function Combos() {
         if (!player) return false;
+        if (combiner.every(c => !c)) return false;
 
         if (!(combiner.every(u => u === null))) {
             const filteredCombos = itemInfo.combos
diff --git a/client/src/components/info.container.jsx b/client/src/components/info.container.jsx
index 9da668c7..9d460ff9 100644
--- a/client/src/components/info.container.jsx
+++ b/client/src/components/info.container.jsx
@@ -11,7 +11,7 @@ const addState = connect(
             info,
             itemInfo,
             instance,
-            player,
+            account,
         } = state;
 
         return {
@@ -20,7 +20,7 @@ const addState = connect(
             info,
             itemInfo,
             instance,
-            player,
+            account,
         };
     },
 );
diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx
index 9dab67b1..9a61b3ce 100644
--- a/client/src/components/instance.component.jsx
+++ b/client/src/components/instance.component.jsx
@@ -10,13 +10,14 @@ const actions = require('../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, instance, player } = state;
+        const { ws, instance, account } = state;
+        const player = instance.players.find(p => p.id === account.id);
 
         function sendInstanceReady() {
             return ws.sendInstanceReady(instance.id);
         }
 
-        return { instance, player, sendInstanceReady };
+        return { player, instance, sendInstanceReady };
     },
 
     function receiveDispatch(dispatch) {
diff --git a/client/src/components/instance.cryps.jsx b/client/src/components/instance.cryps.jsx
index f4bdd206..00b6a61a 100644
--- a/client/src/components/instance.cryps.jsx
+++ b/client/src/components/instance.cryps.jsx
@@ -8,7 +8,8 @@ const actions = require('../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, instance, player, account, itemInfo, itemEquip, activeCryp } = state;
+        const { ws, instance, account, itemInfo, itemEquip, activeCryp } = state;
+        const player = instance.players.find(p => p.id === account.id);
 
         function sendInstanceReady() {
             return ws.sendInstanceReady(instance.id);
@@ -128,6 +129,7 @@ function Cryp(props) {
         return (
             <button
                 key={i}
+                disabled={!skill && !itemEquip}
                 className={classes}
                 onClick={skillClick}
                 onDblClick={skillDblClick}
diff --git a/client/src/components/instance.equip.jsx b/client/src/components/instance.equip.jsx
index 1981b97f..502a61d8 100644
--- a/client/src/components/instance.equip.jsx
+++ b/client/src/components/instance.equip.jsx
@@ -8,7 +8,8 @@ const { convertItem, SPECS } = require('./../utils');
 
 const addState = connect(
     function receiveState(state) {
-        const { player, activeCryp, itemInfo, info, ws, instance, itemUnequip } = state;
+        const { account, activeCryp, itemInfo, info, ws, instance, itemUnequip } = state;
+        const player = instance.players.find(p => p.id === account.id);
 
         function sendUnequip(crypId, item) {
             return ws.sendVboxUnequip(instance.id, crypId, item);
diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx
index 1dc6c916..a4b2fee9 100644
--- a/client/src/components/nav.jsx
+++ b/client/src/components/nav.jsx
@@ -17,8 +17,6 @@ const addState = connect(
         } = state;
 
         function sendInstanceState(instance) {
-            ws.clearGameStateTimeout();
-            ws.clearInstanceStateTimeout();
             return ws.sendInstanceState(instance.id);
         }
 
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 49f442f5..181104ca 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -10,14 +10,16 @@ const addState = connect(
     function receiveState(state) {
         const {
             ws,
+            account,
             instance,
-            player,
             combiner,
             reclaiming,
             vboxHighlight,
             itemInfo,
         } = state;
 
+        const player = instance.players.find(p => p.id === account.id);
+
         function sendVboxDiscard() {
             return ws.sendVboxDiscard(instance.id);
         }
@@ -34,7 +36,6 @@ const addState = connect(
             return ws.sendVboxReclaim(instance.id, i);
         }
 
-
         return {
             combiner,
             instance,
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 72f79542..154ab042 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -17,24 +17,24 @@ function registerEvents(store) {
     });
 
 
-    // cryp animations
-    function crypAnimations() {
-        const cryps = document.querySelectorAll('img');
-        if (!cryps.length) return window.requestAnimationFrame(crypAnimations);
-        return anime({
-            targets: 'img',
-            translateX: () => anime.random(-20, 20),
-            translateY: () => anime.random(0, -40),
-            rotate: () => anime.random(-15, 15),
-            duration: () => anime.random(5000, 6000),
-            delay: () => anime.random(0, 1000),
-            direction: 'alternate',
-            easing: 'linear',
-            loop: true,
-        });
-    }
-    setInterval(crypAnimations, 10000);
-    crypAnimations();
+    // // cryp animations
+    // function crypAnimations() {
+    //     const cryps = document.querySelectorAll('img');
+    //     if (!cryps.length) return window.requestAnimationFrame(crypAnimations);
+    //     return anime({
+    //         targets: 'img',
+    //         translateX: () => anime.random(-20, 20),
+    //         translateY: () => anime.random(0, -40),
+    //         rotate: () => anime.random(-15, 15),
+    //         duration: () => anime.random(5000, 6000),
+    //         delay: () => anime.random(0, 1000),
+    //         direction: 'alternate',
+    //         easing: 'linear',
+    //         loop: true,
+    //     });
+    // }
+    // setInterval(crypAnimations, 10000);
+    // crypAnimations();
 
     function setPing(ping) {
         store.dispatch(actions.setPing(ping));
@@ -141,8 +141,6 @@ function registerEvents(store) {
 
     function setInstance(v) {
         const { account, ws } = store.getState();
-        const player = v.players.find(p => p.id === account.id);
-        if (player) store.dispatch(actions.setPlayer(player));
         if (v) ws.startInstanceStateTimeout(v.id);
         return store.dispatch(actions.setInstance(v));
     }
diff --git a/client/src/reducers.jsx b/client/src/reducers.jsx
index 6df16115..981e9435 100644
--- a/client/src/reducers.jsx
+++ b/client/src/reducers.jsx
@@ -26,7 +26,6 @@ module.exports = {
     itemUnequip:        createReducer(null, 'SET_ITEM_UNEQUIP'),
     nav:                createReducer(null, 'SET_NAV'),
     ping:               createReducer(null, 'SET_PING'),
-    player:             createReducer(null, 'SET_PLAYER'),
     reclaiming:         createReducer(false, 'SET_RECLAIMING'),
     resolution:         createReducer(null, 'SET_RESOLUTION'),
     showLog:            createReducer(false, 'SET_SHOW_LOG'),
diff --git a/server/src/skill.rs b/server/src/skill.rs
index eee15e6c..99d08f9e 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -895,11 +895,11 @@ impl Skill {
             Skill::StrikeII => Skill::Strike.speed(),
             Skill::StrikeIII => Skill::Strike.speed(),
 
-            Skill::SiphonTick => Item::from(Skill::Siphon).speed(),
-            Skill::DecayTick => Item::from(Skill::Decay).speed(),
-            Skill::TriageTick => Item::from(Skill::Triage).speed(),
-            Skill::StrangleTick => Item::from(Skill::Strangle).speed(),
-            Skill::CorruptionTick => Item::from(Skill::Corrupt).speed(),
+            Skill::SiphonTick => Skill::Siphon.speed(),
+            Skill::DecayTick => Skill::Decay.speed(),
+            Skill::TriageTick => Skill::Triage.speed(),
+            Skill::StrangleTick => Skill::Strangle.speed(),
+            Skill::CorruptionTick => Skill::Corrupt.speed(),
 
             _ => Item::from(*self).speed(),
         }