M#erge branch 'master' of ssh://cryps.gg:40022/~/cryps

This commit is contained in:
ntr
2019-05-02 09:49:28 +10:00
3 changed files with 59 additions and 14 deletions
+4
View File
@@ -216,6 +216,10 @@ function getCombatSequence(event) {
if (dotTicks.includes(event[1].skill)) return ['END_SKILL', 'POST_SKILL'];
if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL'];
if (['Healing'].includes(event[0]) && event[1].skill === 'Slay') return ['POST_SKILL'];
if (['Damage'].includes(event[0])
&& event[1].skill === 'Chaos' && event[1].colour === 'RedDamage') return ['POST_SKILL'];
if (['Ko'].includes(event[0])
|| (event[1].skill === 'Throw' && event[1].effect === 'Vulnerable')) return ['POST_SKILL'];