From d76e81d27eea0f88465438df03b35caf6959e5ba Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 8 Jun 2020 19:06:24 -0400 Subject: [PATCH] v0.8.1: fixed cleave not triggering if enemy was corrupted --- .../shatteredpixeldungeon/actors/buffs/Combo.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index b31f015cb..0f1d1a440 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -264,6 +264,7 @@ public class Combo extends Buff implements ActionIndicator.Action { } dmg = target.attackProc(enemy, dmg); + boolean wasAlly = enemy.alignment == target.alignment; enemy.damage( dmg, this ); //special effects @@ -323,8 +324,9 @@ public class Combo extends Buff implements ActionIndicator.Action { //Post-attack behaviour switch(type){ case CLEAVE: - if (!enemy.isAlive()) { - //combo isn't reset, but rather increments with a cleave kill, and grants more time. + //combo isn't reset, but rather increments with a cleave kill, and grants more time. + //this includes corrupting kills (which is why we check alignment + if (!enemy.isAlive() || (!wasAlly && enemy.alignment == target.alignment)) { hit( enemy ); comboTime = 12f; } else {