From ccba55ce6999993dcb3a74b932c43d9760ff1e5e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 26 Mar 2016 19:45:45 -0400 Subject: [PATCH] v0.3.5: (sort of) fixed distortion traps messing with weak floor rooms --- .../shatteredpixel/shatteredpixeldungeon/levels/Level.java | 5 +++-- .../shatteredpixeldungeon/scenes/InterlevelScene.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 9cf3d44c7..95d265d8f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -167,9 +167,10 @@ public abstract class Level implements Bundlable { public int color1 = 0x004400; public int color2 = 0x88CC44; - + + //FIXME this is sloppy. Should be able to keep track of this without static variables protected static boolean pitRoomNeeded = false; - protected static boolean weakFloorCreated = false; + public static boolean weakFloorCreated = false; private static final String VERSION = "version"; private static final String MAP = "map"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java index 97a2ff06f..c30f324df 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java @@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.RegularLevel; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.ui.GameLog; import com.shatteredpixel.shatteredpixeldungeon.windows.WndError; @@ -279,6 +280,8 @@ public class InterlevelScene extends PixelScene { Dungeon.depth--; Level level = Dungeon.newLevel(); + //FIXME this only partially addresses issues regarding weak floors. + RegularLevel.weakFloorCreated = false; Dungeon.switchLevel( level, level.entrance ); }