konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.4.0: fixed errors when challenge is used on neutral mobs

Browse Source
This commit is contained in:
Evan Debenham
2024-04-30 13:10:06 -04:00
parent 919f1428e4
commit 3f8973743f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Challenge.java
+12 -9
View File
@@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NPC;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
@@ -99,7 +100,8 @@ public class Challenge extends ArmorAbility {
return;
}
if (targetCh.alignment == hero.alignment){
if (targetCh.alignment != Char.Alignment.ENEMY
&& !(targetCh instanceof Mimic && targetCh.alignment == Char.Alignment.NEUTRAL)){
GLog.w(Messages.get(this, "ally_target"));
return;
}
@@ -275,14 +277,6 @@ public class Challenge extends ArmorAbility {
}
}
for (Char ch : Actor.chars()) {
if (ch.buff(SpectatorFreeze.class) != null) {
ch.buff(SpectatorFreeze.class).detach();
}
if (ch.buff(DuelParticipant.class) != null && ch != target) {
ch.buff(DuelParticipant.class).detach();
}
}
} else {
if (Dungeon.hero.isAlive()) {
GameScene.flash(0x80FFFFFF);
@@ -292,6 +286,15 @@ public class Challenge extends ArmorAbility {
}
}
}
for (Char ch : Actor.chars()) {
if (ch.buff(SpectatorFreeze.class) != null) {
ch.buff(SpectatorFreeze.class).detach();
}
if (ch.buff(DuelParticipant.class) != null && ch != target) {
ch.buff(DuelParticipant.class).detach();
}
}
}
@Override