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

v0.9.1: fixed further layout bugs in pipe and perimeter rooms

Browse Source
This commit is contained in:
Evan Debenham
2020-10-24 18:51:36 -04:00
parent 81156427bb
commit 5437e58045
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/PerimeterRoom.java
+2 -2
View File
@@ -92,8 +92,8 @@ public class PerimeterRoom extends ConnectionRoom {
//gets the path distance between two points //gets the path distance between two points
private static int distanceBetweenPoints(Room r, Point a, Point b){ private static int distanceBetweenPoints(Room r, Point a, Point b){
//on the same side //on the same side
if (((a.x == r.left || a.x == r.right) && a.y == b.y) if (((a.x == r.left+1 || a.x == r.right-1) && a.y == b.y)
|| ((a.y == r.top || a.y == r.bottom) && a.x == b.x)){ || ((a.y == r.top+1 || a.y == r.bottom-1) && a.x == b.x)){
return Math.max(spaceBetween(a.x, b.x), spaceBetween(a.y, b.y)); return Math.max(spaceBetween(a.x, b.x), spaceBetween(a.y, b.y));
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/SewerPipeRoom.java
+4 -4
View File
@@ -212,8 +212,8 @@ public class SewerPipeRoom extends StandardRoom {
//gets the path distance between two points //gets the path distance between two points
private int distanceBetweenPoints(Point a, Point b){ private int distanceBetweenPoints(Point a, Point b){
//on the same side //on the same side
if (((a.x == left || a.x == right) && a.y == b.y) if (((a.x == left+2 || a.x == right-2) && a.y == b.y)
|| ((a.y == top || a.y == bottom) && a.x == b.x)){ || ((a.y == top+2 || a.y == bottom-2) && a.x == b.x)){
return Math.max(spaceBetween(a.x, b.x), spaceBetween(a.y, b.y)); return Math.max(spaceBetween(a.x, b.x), spaceBetween(a.y, b.y));
} }
@@ -235,8 +235,8 @@ public class SewerPipeRoom extends StandardRoom {
private void fillBetweenPoints(Level level, Point from, Point to, int floor){ private void fillBetweenPoints(Level level, Point from, Point to, int floor){
//doors are along the same side //doors are along the same side
if (((from.x == left+1 || from.x == right-1) && from.x == to.x) if (((from.x == left+2 || from.x == right-2) && from.x == to.x)
|| ((from.y == top+1 || from.y == bottom-1) && from.y == to.y)){ || ((from.y == top+2 || from.y == bottom-2) && from.y == to.y)){
Painter.fill(level, Painter.fill(level,
Math.min(from.x, to.x), Math.min(from.x, to.x),
Math.min(from.y, to.y), Math.min(from.y, to.y),