From 5b083c2b7b6cd9de065801749902b645fe27e012 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 7 Mar 2021 19:29:52 -0500 Subject: [PATCH] v0.9.2a: removed a leftover TODO from combo --- .../shatteredpixeldungeon/actors/buffs/Combo.java | 5 +++-- 1 file changed, 3 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 03aa747d5..af9a41131 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 @@ -184,7 +184,7 @@ public class Combo extends Buff implements ActionIndicator.Action { SLAM (4, 0xFFCCFF00), PARRY (6, 0xFFFFFF00), CRUSH (8, 0xFFFFCC00), - FURY (10, 0xFFFF0000); //TODO can currently input other actions while attacking with fury + FURY (10, 0xFFFF0000); public int comboReq, tintColor; @@ -404,7 +404,8 @@ public class Combo extends Buff implements ActionIndicator.Action { case FURY: count--; //fury attacks as many times as you have combo count - if (count > 0 && enemy.isAlive() && (wasAlly || enemy.alignment != target.alignment)){ + if (count > 0 && enemy.isAlive() && hero.canAttack(enemy) && + (wasAlly || enemy.alignment != target.alignment)){ target.sprite.attack(enemy.pos, new Callback() { @Override public void call() {