LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.2a: removed a leftover TODO from combo

Browse Source
This commit is contained in:
Evan Debenham 2021-03-07 19:29:52 -05:00
parent 771a028419
commit 5b083c2b7b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
View File

@ -184,7 +184,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
SLAM (4, 0xFFCCFF00), SLAM (4, 0xFFCCFF00),
PARRY (6, 0xFFFFFF00), PARRY (6, 0xFFFFFF00),
CRUSH (8, 0xFFFFCC00), CRUSH (8, 0xFFFFCC00),
FURY (10, 0xFFFF0000); //TODO can currently input other actions while attacking with fury FURY (10, 0xFFFF0000);
public int comboReq, tintColor; public int comboReq, tintColor;
@ -404,7 +404,8 @@ public class Combo extends Buff implements ActionIndicator.Action {
case FURY: case FURY:
count--; count--;
//fury attacks as many times as you have combo 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() { target.sprite.attack(enemy.pos, new Callback() {
@Override @Override
public void call() { public void call() {