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

v0.4.2: fixed bugs with mob pathfinding

Browse Source
This commit is contained in:
Evan Debenham 2016-08-31 00:37:28 -04:00
parent 01aad4196c
commit 67f435319f
1 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,68 +294,82 @@ public abstract class Mob extends Char {
return false; return false;
} }
boolean newPath = false; int step = -1;
if (path == null || path.isEmpty())
newPath = true;
else if (path.getLast() != target) {
//if the new target is adjacent to the end of the path, adjust for that
//rather than scrapping the whole path
if (Dungeon.level.adjacent(target, path.getLast())){
int last = path.removeLast();
if (path.isEmpty()) { if (Dungeon.level.adjacent( pos, target )) {
//shorten for a closer one path = null;
if (Dungeon.level.adjacent(target, pos)) {
path.add(target);
//extend the path for a further target
} else {
path.add(last);
path.add(target);
}
} else if (!path.isEmpty()){ if (Actor.findChar( target ) == null && Level.passable[target]) {
//if the new target is simply 1 earlier in the path shorten the path step = target;
if (path.getLast() == target) { }
//if the new target is closer/same, need to modify end of path } else {
} else if (Dungeon.level.adjacent(target, path.getLast())){
path.add(target);
//if the new target is further away, need to extend the path boolean newPath = false;
} else { if (path == null || path.isEmpty())
path.add(last);
path.add(target);
}
}
} else {
newPath = true; newPath = true;
else if (path.getLast() != target) {
//if the new target is adjacent to the end of the path, adjust for that
//rather than scrapping the whole path
if (Dungeon.level.adjacent(target, path.getLast())) {
int last = path.removeLast();
if (path.isEmpty()) {
//shorten for a closer one
if (Dungeon.level.adjacent(target, pos)) {
path.add(target);
//extend the path for a further target
} else {
path.add(last);
path.add(target);
}
} else if (!path.isEmpty()) {
//if the new target is simply 1 earlier in the path shorten the path
if (path.getLast() == target) {
//if the new target is closer/same, need to modify end of path
} else if (Dungeon.level.adjacent(target, path.getLast())) {
path.add(target);
//if the new target is further away, need to extend the path
} else {
path.add(last);
path.add(target);
}
}
} else {
newPath = true;
}
} }
}
if (!newPath){ if (!newPath) {
//checks the next 4 cells in the path for validity //checks the next 4 cells in the path for validity
for (int i = 0; i < Math.min(path.size(), 4); i++){ for (int i = 0; i < Math.min(path.size(), 4); i++) {
int cell = path.get(i); int cell = path.get(i);
if (!Level.passable[cell] || ((i != path.size()-1) && Dungeon.visible[cell] && Actor.findChar(cell) != null)) { if (!Level.passable[cell] || ((i != path.size() - 1) && Dungeon.visible[cell] && Actor.findChar(cell) != null)) {
newPath = true; newPath = true;
break; break;
}
} }
} }
if (newPath) {
path = Dungeon.findPath(this, pos, target,
Level.passable,
Level.fieldOfView);
}
if (path == null)
return false;
step = path.removeFirst();
} }
if (newPath) {
path = Dungeon.findPath(this, pos, target,
Level.passable,
Level.fieldOfView);
}
if (path == null)
return false;
int step = path.removeFirst();
if (step != -1) { if (step != -1) {
move( step ); move( step );
return true; return true;