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

v2.0.0: fixed rare pathfinding bugs with flying enemies

Browse Source
This commit is contained in:
Evan Debenham
2022-12-01 17:00:21 -05:00
parent 3b68e92837
commit e757d3a17f
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
View File

@@ -409,7 +409,27 @@ public abstract class Mob extends Char {
} }
return false; return false;
} }
private boolean cellIsPathable( int cell ){
if (!Dungeon.level.passable[cell]){
if (flying || buff(Amok.class) != null){
if (!Dungeon.level.avoid[cell]){
return false;
}
} else {
return false;
}
}
if (Char.hasProp(this, Char.Property.LARGE) && !Dungeon.level.openSpace[cell]){
return false;
}
if (Actor.findChar(cell) != null){
return false;
}
return true;
}
protected boolean getCloser( int target ) { protected boolean getCloser( int target ) {
if (rooted || target == pos) { if (rooted || target == pos) {
@@ -422,9 +442,7 @@ public abstract class Mob extends Char {
path = null; path = null;
if (Actor.findChar( target ) == null if (cellIsPathable(target)) {
&& (Dungeon.level.passable[target] || (flying && Dungeon.level.avoid[target]))
&& (!Char.hasProp(this, Char.Property.LARGE) || Dungeon.level.openSpace[target])) {
step = target; step = target;
} }
@@ -478,20 +496,14 @@ public abstract class Mob extends Char {
//checks if the next cell along the current path can be stepped into //checks if the next cell along the current path can be stepped into
if (!newPath) { if (!newPath) {
int nextCell = path.removeFirst(); int nextCell = path.removeFirst();
if (!Dungeon.level.passable[nextCell] if (!cellIsPathable(nextCell)) {
|| (!flying && Dungeon.level.avoid[nextCell])
|| (Char.hasProp(this, Char.Property.LARGE) && !Dungeon.level.openSpace[nextCell])
|| Actor.findChar(nextCell) != null) {
newPath = true; newPath = true;
//If the next cell on the path can't be moved into, see if there is another cell that could replace it //If the next cell on the path can't be moved into, see if there is another cell that could replace it
if (!path.isEmpty()) { if (!path.isEmpty()) {
for (int i : PathFinder.NEIGHBOURS8) { for (int i : PathFinder.NEIGHBOURS8) {
if (Dungeon.level.adjacent(pos, nextCell + i) && Dungeon.level.adjacent(nextCell + i, path.getFirst())) { if (Dungeon.level.adjacent(pos, nextCell + i) && Dungeon.level.adjacent(nextCell + i, path.getFirst())) {
if (Dungeon.level.passable[nextCell+i] if (cellIsPathable(nextCell+i)){
&& (flying || !Dungeon.level.avoid[nextCell+i])
&& (!Char.hasProp(this, Char.Property.LARGE) || Dungeon.level.openSpace[nextCell+i])
&& Actor.findChar(nextCell+i) == null){
path.addFirst(nextCell+i); path.addFirst(nextCell+i);
newPath = false; newPath = false;
break; break;
@@ -517,10 +529,7 @@ public abstract class Mob extends Char {
if (ignoreChars != null && (full == null || full.size() > 2*ignoreChars.size())){ if (ignoreChars != null && (full == null || full.size() > 2*ignoreChars.size())){
//check if first cell of shorter path is valid. If it is, use new shorter path. Otherwise do nothing and wait. //check if first cell of shorter path is valid. If it is, use new shorter path. Otherwise do nothing and wait.
path = ignoreChars; path = ignoreChars;
if (!Dungeon.level.passable[ignoreChars.getFirst()] if (!cellIsPathable(ignoreChars.getFirst())) {
|| (!flying && Dungeon.level.avoid[ignoreChars.getFirst()])
|| (Char.hasProp(this, Char.Property.LARGE) && !Dungeon.level.openSpace[ignoreChars.getFirst()])
|| Actor.findChar(ignoreChars.getFirst()) != null) {
return false; return false;
} }
} else { } else {