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

v2.0.0: fixed freezes with DM-300 abilities if its target just died

Browse Source
This commit is contained in:
Evan Debenham
2023-03-06 13:57:22 -05:00
parent 94f047eddc
commit 21a9320b17
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java
+6 -4
View File
@@ -176,7 +176,7 @@ public class DM300 extends Mob {
//determine if DM can reach its enemy //determine if DM can reach its enemy
boolean canReach; boolean canReach;
if (enemy == null){ if (enemy == null || !enemy.isAlive()){
if (Dungeon.level.adjacent(pos, Dungeon.hero.pos)){ if (Dungeon.level.adjacent(pos, Dungeon.hero.pos)){
canReach = true; canReach = true;
} else { } else {
@@ -196,10 +196,12 @@ public class DM300 extends Mob {
} }
} else { } else {
if (enemy == null && Dungeon.hero.invisible <= 0) enemy = Dungeon.hero; if ((enemy == null || !enemy.isAlive()) && Dungeon.hero.invisible <= 0) {
enemy = Dungeon.hero;
}
//more aggressive ability usage when DM can't reach its target //more aggressive ability usage when DM can't reach its target
if (enemy != null && !canReach){ if (enemy != null && enemy.isAlive() && !canReach){
//try to fire gas at an enemy we can't reach //try to fire gas at an enemy we can't reach
if (turnsSinceLastAbility >= MIN_COOLDOWN){ if (turnsSinceLastAbility >= MIN_COOLDOWN){
@@ -236,7 +238,7 @@ public class DM300 extends Mob {
} }
} else if (enemy != null && fieldOfView[enemy.pos]) { } else if (enemy != null && enemy.isAlive() && fieldOfView[enemy.pos]) {
if (turnsSinceLastAbility > abilityCooldown) { if (turnsSinceLastAbility > abilityCooldown) {
if (lastAbility == NONE) { if (lastAbility == NONE) {