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

v0.6.0: fixed edge cases in diagonal wall cleaning logic

Browse Source
This commit is contained in:
Evan Debenham
2017-05-19 03:03:37 -04:00
parent 9f4e6e4ad9
commit 3b4c78cfff
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PatchRoom.java
+2 -18
View File
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Patch; import com.shatteredpixel.shatteredpixeldungeon.levels.Patch;
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
import com.watabou.utils.PathFinder; import com.watabou.utils.PathFinder;
import com.watabou.utils.Random;
//This room type uses the patch system to fill itself in in some manner //This room type uses the patch system to fill itself in in some manner
//it's still up to the specific room to implement paint, but utility methods are provided //it's still up to the specific room to implement paint, but utility methods are provided
@@ -84,41 +83,26 @@ public abstract class PatchRoom extends StandardRoom {
int pWidth = width()-2; int pWidth = width()-2;
boolean badLeft, badRight;
for (int i = 0; i < patch.length - pWidth; i++){ for (int i = 0; i < patch.length - pWidth; i++){
if (!patch[i]) continue; if (!patch[i]) continue;
//we don't need to check above because we are either at the top //we don't need to check above because we are either at the top
// or have already dealt with those tiles // or have already dealt with those tiles
badLeft = badRight = false;
//down-left //down-left
if (i % pWidth != 0){ if (i % pWidth != 0){
if (patch[i - 1 + pWidth] && !(patch[i - 1] || patch[i + pWidth])){ if (patch[i - 1 + pWidth] && !(patch[i - 1] || patch[i + pWidth])){
badLeft = true; patch[i - 1 + pWidth] = false;
} }
} }
//down-right //down-right
if ((i + 1) % pWidth != 0){ if ((i + 1) % pWidth != 0){
if (patch[i + 1 + pWidth] && !(patch[i + 1] || patch[i + pWidth])){ if (patch[i + 1 + pWidth] && !(patch[i + 1] || patch[i + pWidth])){
badRight = true; patch[i + 1 + pWidth] = false;
} }
} }
if (badLeft && badRight){
patch[i] = false;
} else if (badLeft){
if (Random.Int(2) == 0) patch[i] = false;
else patch[i - 1 + pWidth] = false;
} else if (badRight){
if (Random.Int(2) == 0) patch[i] = false;
else patch[i + 1 + pWidth] = false;
}
} }
} }