From ea041928972cdbd4c959d3f05ace53753e11f2fd Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 30 May 2019 20:22:54 +1000
Subject: [PATCH] fix resolutions skill checks

---
 client/src/events.jsx | 10 ++++++----
 client/src/utils.jsx  | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/client/src/events.jsx b/client/src/events.jsx
index 74e012de..c0dcd3f2 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -119,13 +119,15 @@ function registerEvents(store) {
     }
 
     function setInstance(v) {
-        const { account, ws } = store.getState();
+        const { account, ws, instance } = store.getState();
         if (v) {
             ws.startInstanceStateTimeout(v.id);
-            store.dispatch(actions.setNav('vbox'));
 
-            const first = v.players.find(p => p.id === account.id).constructs[0];
-            store.dispatch(actions.setActiveConstruct(first));
+            if (!instance || v.id !== instance.id) {
+                store.dispatch(actions.setNav('vbox'));
+                const first = v.players.find(p => p.id === account.id).constructs[0];
+                store.dispatch(actions.setActiveConstruct(first));
+            }
         }
         return store.dispatch(actions.setInstance(v));
     }
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index 6d9d452a..004a419d 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -313,26 +313,26 @@ function getCombatSequence(event) {
     if (['Removal'].includes(event[0])) return ['POST_SKILL'];
 
     if (['Healing'].includes(event[0])
-        && (event[1].skill === 'Slay'
-            || event[1].skill === 'SiphonTick'
-            || event[1].skill === 'Purify'
-            || event[1].skill === 'Sleep')) return ['POST_SKILL'];
+        && (event[1].skill.includes('Slay')
+            || event[1].skill.includes('SiphonTick')
+            || event[1].skill.includes('Purify')
+            || event[1].skill.includes('Sleep'))) return ['POST_SKILL'];
 
     if (['Recharge'].includes(event[0])
-        && (event[1].skill === 'Reflect')) return ['POST_SKILL'];
+        && (event[1].skill.includes('Reflect'))) return ['POST_SKILL'];
 
 
     if (event[0] === 'Effect'
         && (['Ruin', 'Taunt', 'Strangling', 'Parry'].includes(event[1].skill)
-        || (event[1].skill === 'Decay' && event[1].effect === 'Wither'))) return ['POST_SKILL'];
+        || (event[1].skill.includes('Decay') && event[1].effect === 'Wither'))) return ['POST_SKILL'];
 
     if (['Power'].includes(event[0])
-        && ((event[1].skill === 'Chaos' && event[1].colour === 'Red')
-            || event[1].skill === 'Silence'
-            || event[1].skill === 'Snare')) return ['POST_SKILL'];
+        && ((event[1].skill.includes('Chaos') && event[1].colour === 'Red')
+            || event[1].skill.includes('Silence')
+            || event[1].skill.includes('Snare'))) return ['POST_SKILL'];
 
     if (['Ko'].includes(event[0])
-        || (event[1].skill === 'Throw' && event[1].effect === 'Vulnerable')) return ['POST_SKILL'];
+        || (event[1].skill.includes('Throw') && event[1].effect === 'Vulnerable')) return ['POST_SKILL'];
 
     if (dotTicks.includes(event[1].skill)) return ['END_SKILL', 'POST_SKILL'];
     return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];