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

v0.6.0: fixed bugs in pathfinder and patch systems

Browse Source
This commit is contained in:
Evan Debenham 2017-05-09 21:29:30 -04:00
parent 7029f5d6ef
commit eeec924f75
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
SPD-classes/src/main/java/com/watabou/utils/PathFinder.java
View File

@ -33,8 +33,10 @@ public class PathFinder {
private static int[] queue; private static int[] queue;
private static int size = 0; private static int size = 0;
private static int width = 0;
private static int[] dir; private static int[] dir;
private static int[] dirLR;
//performance-light shortcuts for some common pathfinder cases //performance-light shortcuts for some common pathfinder cases
//they are in array-access order for increased memory performance //they are in array-access order for increased memory performance
@ -49,9 +51,9 @@ public class PathFinder {
public static void setMapSize( int width, int height ) { public static void setMapSize( int width, int height ) {
int size = width * height; PathFinder.width = width;
PathFinder.size = width * height;
PathFinder.size = size;
distance = new int[size]; distance = new int[size];
goals = new boolean[size]; goals = new boolean[size];
queue = new int[size]; queue = new int[size];
@ -60,6 +62,7 @@ public class PathFinder {
Arrays.fill(maxVal, Integer.MAX_VALUE); Arrays.fill(maxVal, Integer.MAX_VALUE);
dir = new int[]{-1, +1, -width, +width, -width-1, -width+1, +width-1, +width+1}; dir = new int[]{-1, +1, -width, +width, -width-1, -width+1, +width-1, +width+1};
dirLR = new int[]{-1-width, -1, -1+width, -width, +width, +1-width, +1, +1+width};
NEIGHBOURS4 = new int[]{-width, -1, +1, +width}; NEIGHBOURS4 = new int[]{-width, -1, +1, +width};
NEIGHBOURS8 = new int[]{-width-1, -width, -width+1, -1, +1, +width-1, +width, +width+1}; NEIGHBOURS8 = new int[]{-width-1, -width, -width+1, -1, +1, +width-1, +width, +width+1};
@ -181,9 +184,11 @@ public class PathFinder {
} }
int nextDistance = distance[step] + 1; int nextDistance = distance[step] + 1;
for (int i=0; i < dir.length; i++) { int start = (step % width == 0 ? 3 : 0);
int end = ((step+1) % width == 0 ? 3 : 0);
for (int i = start; i < dirLR.length - end; i++) {
int n = step + dir[i]; int n = step + dirLR[i];
if (n == from || (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance))) { if (n == from || (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance))) {
// Add to queue // Add to queue
queue[tail++] = n; queue[tail++] = n;
@ -217,9 +222,11 @@ public class PathFinder {
return; return;
} }
for (int i=0; i < dir.length; i++) { int start = (step % width == 0 ? 3 : 0);
int end = ((step+1) % width == 0 ? 3 : 0);
for (int i = start; i < dirLR.length - end; i++) {
int n = step + dir[i]; int n = step + dirLR[i];
if (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance)) { if (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance)) {
// Add to queue // Add to queue
queue[tail++] = n; queue[tail++] = n;
@ -261,9 +268,11 @@ public class PathFinder {
} }
int nextDistance = distance[step] + 1; int nextDistance = distance[step] + 1;
for (int i=0; i < dir.length; i++) { int start = (step % width == 0 ? 3 : 0);
int end = ((step+1) % width == 0 ? 3 : 0);
for (int i = start; i < dirLR.length - end; i++) {
int n = step + dir[i]; int n = step + dirLR[i];
if (n == from || (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance))) { if (n == from || (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance))) {
// Add to queue // Add to queue
queue[tail++] = n; queue[tail++] = n;
@ -307,9 +316,11 @@ public class PathFinder {
int nextDistance = dist + 1; int nextDistance = dist + 1;
for (int i=0; i < dir.length; i++) { int start = (step % width == 0 ? 3 : 0);
int end = ((step+1) % width == 0 ? 3 : 0);
for (int i = start; i < dirLR.length - end; i++) {
int n = step + dir[i]; int n = step + dirLR[i];
if (n >= 0 && n < size && passable[n] && distance[n] > nextDistance) { if (n >= 0 && n < size && passable[n] && distance[n] > nextDistance) {
// Add to queue // Add to queue
queue[tail++] = n; queue[tail++] = n;
@ -322,8 +333,7 @@ public class PathFinder {
return dist; return dist;
} }
@SuppressWarnings("unused") public static void buildDistanceMap( int to, boolean[] passable ) {
private static void buildDistanceMap( int to, boolean[] passable ) {
System.arraycopy(maxVal, 0, distance, 0, maxVal.length); System.arraycopy(maxVal, 0, distance, 0, maxVal.length);
@ -340,9 +350,11 @@ public class PathFinder {
int step = queue[head++]; int step = queue[head++];
int nextDistance = distance[step] + 1; int nextDistance = distance[step] + 1;
for (int i=0; i < dir.length; i++) { int start = (step % width == 0 ? 3 : 0);
int end = ((step+1) % width == 0 ? 3 : 0);
for (int i = start; i < dirLR.length - end; i++) {
int n = step + dir[i]; int n = step + dirLR[i];
if (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance)) { if (n >= 0 && n < size && passable[n] && (distance[n] > nextDistance)) {
// Add to queue // Add to queue
queue[tail++] = n; queue[tail++] = n;

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Patch.java
View File

@ -35,7 +35,7 @@ public class Patch {
* The closer the fill rate is to 0.5f the weaker this pushing will be. * The closer the fill rate is to 0.5f the weaker this pushing will be.
* *
* forceFillRate adjusts the algorithm to force fill rate to be consistent despite clustering. * forceFillRate adjusts the algorithm to force fill rate to be consistent despite clustering.
* this is achived by firstly pulling the initial fill value towards 0.5f * this is achieved by firstly pulling the initial fill value towards 0.5f
* and then by manually filling in or emptying cells after clustering, until the fill rate is * and then by manually filling in or emptying cells after clustering, until the fill rate is
* achieved. This is tracked with the fillDiff variable. * achieved. This is tracked with the fillDiff variable.
*/ */
@ -114,7 +114,8 @@ public class Patch {
off = tmp; off = tmp;
} }
if (forceFillRate) { //even if force fill rate is on, only do this if we have some kind of border
if (forceFillRate && Math.min(w, h) > 2) {
int[] neighbours = new int[]{-w - 1, -w, -w + 1, -1, 0, +1, +w - 1, +w, +w + 1}; int[] neighbours = new int[]{-w - 1, -w, -w + 1, -1, 0, +1, +w - 1, +w, +w + 1};
boolean growing = fillDiff < 0; boolean growing = fillDiff < 0;