v0.9.2: fixed some remaining bugs:

- artifact recharge not accounting for horn anymore
- timing issues with parry
- combo moves not clearing invis/timefreeze
This commit is contained in:
Evan Debenham
2021-02-25 22:20:44 -05:00
parent a9d7906140
commit fedc9dac03
2 changed files with 13 additions and 3 deletions
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.HornOfPlenty;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
@@ -46,6 +47,9 @@ public class ArtifactRecharge extends Buff {
float chargeAmount = Math.min(1, left); float chargeAmount = Math.min(1, left);
for (Buff b : target.buffs()) { for (Buff b : target.buffs()) {
if (b instanceof Artifact.ArtifactBuff) { if (b instanceof Artifact.ArtifactBuff) {
if (b instanceof HornOfPlenty.hornRecharge && ignoreHornOfPlenty){
continue;
}
((Artifact.ArtifactBuff) b).charge((Hero) target, chargeAmount); ((Artifact.ArtifactBuff) b).charge((Hero) target, chargeAmount);
} }
} }
@@ -260,11 +260,15 @@ public class Combo extends Buff implements ActionIndicator.Action {
@Override @Override
public void call() { public void call() {
target.buff(Combo.class).doAttack(enemy); target.buff(Combo.class).doAttack(enemy);
next();
} }
}); });
detach();
return false;
} else {
detach();
return true;
} }
detach();
return true;
} }
} }
@@ -383,6 +387,8 @@ public class Combo extends Buff implements ActionIndicator.Action {
} }
Invisibility.dispel();
//Post-attack behaviour //Post-attack behaviour
switch(moveBeingUsed){ switch(moveBeingUsed){
case CLOBBER: case CLOBBER:
@@ -392,7 +398,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
break; break;
case PARRY: case PARRY:
hero.next(); //do nothing
break; break;
case FURY: case FURY: