Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

client/src/utils.jsx

@@ -203,9 +203,13 @@ function getCombatSequence(event) {
     if (!event) return false;
     // Skip combat animations depending on event type, expandable in future
     const dotTicks = ['DecayTick', 'CorruptionTick', 'TriageTick', 'SiphonTick', 'StrangleTick'];
+    if (dotTicks.includes(event[1].skill)) return ['END_SKILL', 'POST_SKILL'];
+
+    if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL'];
+
     if (['Ko'].includes(event[0])
         || (event[1].skill === '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'];
 }
 

server/WORKLOG.md

@@ -30,6 +30,7 @@ authentication endpoint
     generate new token and return
   attach token to websocket
   ez
+Base Items - Buff / Debuff / Stun should be equippable / usable skills
 
 var / skill info rpc
   thresholds / bonuses
@@ -43,11 +44,16 @@ push events
 make strike *really* hit first / resolve at same time?
 
 ## SOON
+
+* Add missing combo - (Red + Blue + Attack) - Duplicated ???
+* Client side confirmation that you've made all decisions
+
 * vbox drops chances
   * 50% spec, 25% colour etc
 
 * confirm cryp without skill ready
   * draw big warning !
+  * confirm all (turn timeouts) 10 - 15 seconds
 
 * iconography
 * combo skills