diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicWellRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicWellRoom.java index 6191008d0..7d761b37e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicWellRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicWellRoom.java @@ -54,7 +54,7 @@ public class MagicWellRoom extends SpecialRoom { (Class)Random.element( WATERS ); if (waterClass == WaterOfTransmutation.class) { - SpecialRoom.disableGaranteedWell(); + SpecialRoom.disableGuaranteedWell(); } WellWater water = (WellWater)level.blobs.get( waterClass ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java index ddc11dca4..50eb3c40a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java @@ -67,7 +67,7 @@ public class SpecialRoom extends Room { public static ArrayList> runSpecials = new ArrayList<>(); public static ArrayList> floorSpecials = new ArrayList<>(); - private static int pitNeededDepth = Integer.MAX_VALUE; + private static int pitNeededDepth = -1; private static int guaranteedWellDepth = Integer.MAX_VALUE; public static void initForRun() { @@ -83,6 +83,7 @@ public class SpecialRoom extends Room { runSpecials.remove( GardenRoom.class ); } + pitNeededDepth = -1; guaranteedWellDepth = Random.IntRange( 6, 14 ); Random.shuffle(runSpecials); } @@ -99,10 +100,10 @@ public class SpecialRoom extends Room { } public static void resetPitRoom(int depth){ - if (pitNeededDepth == depth) pitNeededDepth = Integer.MAX_VALUE; + if (pitNeededDepth == depth) pitNeededDepth = -1; } - public static void disableGaranteedWell(){ + public static void disableGuaranteedWell(){ guaranteedWellDepth = Integer.MAX_VALUE; }