From 1298ab426c44c35cfbbe3219016491b5209f76dc Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 21 Oct 2020 13:24:01 -0400 Subject: [PATCH] v0.9.1: tweaked grass/water/trap placement logic for room merges --- .../shatteredpixeldungeon/levels/rooms/Room.java | 6 +++--- .../levels/rooms/standard/BurnedRoom.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java index fa112f632..a83475f92 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java @@ -265,7 +265,7 @@ public abstract class Room extends Rect implements Graph.Node, Bundlable { //whether or not a painter can make its own modifications to a specific point public boolean canPlaceWater(Point p){ - return inside(p); + return true; } public final ArrayList waterPlaceablePoints(){ @@ -281,7 +281,7 @@ public abstract class Room extends Rect implements Graph.Node, Bundlable { //whether or not a painter can make place grass at a specific point public boolean canPlaceGrass(Point p){ - return inside(p); + return true; } public final ArrayList grassPlaceablePoints(){ @@ -297,7 +297,7 @@ public abstract class Room extends Rect implements Graph.Node, Bundlable { //whether or not a painter can place a trap at a specific point public boolean canPlaceTrap(Point p){ - return inside(p); + return true; } public final ArrayList trapPlaceablePoints(){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BurnedRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BurnedRoom.java index 003ac3d51..262ea8590 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BurnedRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BurnedRoom.java @@ -83,17 +83,17 @@ public class BurnedRoom extends PatchRoom { @Override public boolean canPlaceWater(Point p) { - return super.canPlaceWater(p) && !patch[xyToPatchCoords(p.x, p.y)]; + return !inside(p) || !patch[xyToPatchCoords(p.x, p.y)]; } @Override public boolean canPlaceGrass(Point p) { - return super.canPlaceGrass(p) && !patch[xyToPatchCoords(p.x, p.y)]; + return !inside(p) || !patch[xyToPatchCoords(p.x, p.y)]; } @Override public boolean canPlaceTrap(Point p) { - return super.canPlaceTrap(p) && !patch[xyToPatchCoords(p.x, p.y)]; + return !inside(p) || !patch[xyToPatchCoords(p.x, p.y)]; } }