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

2019-05-02 13:26:57 +10:00
parent 85a1cfe6b8 b368ada693
commit e4c8190cad
3 changed files with 36 additions and 18 deletions
@@ -218,6 +218,9 @@ function getCombatSequence(event) {
    if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL'];
    if (['Healing'].includes(event[0]) && event[1].skill === 'Slay') return ['POST_SKILL'];

+    if (['Effect'].includes(event[0])
+        && event[1].skill === 'Decay' && event[1].effect === 'Wither') return ['POST_SKILL'];
+
    if (['Damage'].includes(event[0])
        && event[1].skill === 'Chaos' && event[1].colour === 'RedDamage') return ['POST_SKILL'];