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

v0.9.1b: fixed various rare errors with fury combo attacks

Browse Source
This commit is contained in:
Evan Debenham 2021-01-01 16:13:41 -05:00
parent 97c4ac5a66
commit bf878ee5c4
1 changed files with 76 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,21 +214,17 @@ public class Combo extends Buff implements ActionIndicator.Action {
AttackIndicator.target(enemy); AttackIndicator.target(enemy);
boolean wasAlly = enemy.alignment == target.alignment;
if (enemy.defenseSkill(target) >= Char.INFINITE_EVASION){ if (enemy.defenseSkill(target) >= Char.INFINITE_EVASION){
enemy.sprite.showStatus( CharSprite.NEUTRAL, enemy.defenseVerb() ); enemy.sprite.showStatus( CharSprite.NEUTRAL, enemy.defenseVerb() );
Sample.INSTANCE.play(Assets.Sounds.MISS); Sample.INSTANCE.play(Assets.Sounds.MISS);
detach();
ActionIndicator.clearAction(Combo.this);
((Hero)target).spendAndNext(((Hero)target).attackDelay());
return;
} else if (enemy.isInvulnerable(target.getClass())){ } else if (enemy.isInvulnerable(target.getClass())){
enemy.sprite.showStatus( CharSprite.POSITIVE, Messages.get(Char.class, "invulnerable") ); enemy.sprite.showStatus( CharSprite.POSITIVE, Messages.get(Char.class, "invulnerable") );
Sample.INSTANCE.play(Assets.Sounds.MISS); Sample.INSTANCE.play(Assets.Sounds.MISS);
detach();
ActionIndicator.clearAction(Combo.this); } else {
((Hero)target).spendAndNext(((Hero)target).attackDelay());
return;
}
int dmg = target.damageRoll(); int dmg = target.damageRoll();
@ -263,7 +259,6 @@ public class Combo extends Buff implements ActionIndicator.Action {
dmg *= 1.33f; dmg *= 1.33f;
} }
boolean wasAlly = enemy.alignment == target.alignment;
dmg = target.attackProc(enemy, dmg); dmg = target.attackProc(enemy, dmg);
enemy.damage(dmg, target); enemy.damage(dmg, target);
@ -307,6 +302,8 @@ public class Combo extends Buff implements ActionIndicator.Action {
GLog.i(Messages.capitalize(Messages.get(Char.class, "defeat", enemy.name()))); GLog.i(Messages.capitalize(Messages.get(Char.class, "defeat", enemy.name())));
} }
}
Hero hero = (Hero)target; Hero hero = (Hero)target;
//Post-attack behaviour //Post-attack behaviour
@ -327,7 +324,7 @@ 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()){ if (count > 0 && enemy.isAlive() && (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() {