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

2019-04-17 15:17:09 +10:00
parent d87cb44e7f d686cc58c2
commit 6a719dbb9d
2 changed files with 11 additions and 1 deletions
@@ -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'];
 }