diff --git a/core/src/main/assets/environment/tiles_caves.png b/core/src/main/assets/environment/tiles_caves.png index 578462edd..726ef8558 100644 Binary files a/core/src/main/assets/environment/tiles_caves.png and b/core/src/main/assets/environment/tiles_caves.png differ diff --git a/core/src/main/assets/environment/tiles_caves_crystal.png b/core/src/main/assets/environment/tiles_caves_crystal.png index 694deea2d..1fd03fe8b 100644 Binary files a/core/src/main/assets/environment/tiles_caves_crystal.png and b/core/src/main/assets/environment/tiles_caves_crystal.png differ diff --git a/core/src/main/assets/environment/tiles_caves_gnoll.png b/core/src/main/assets/environment/tiles_caves_gnoll.png index f79df4258..0ae42f910 100644 Binary files a/core/src/main/assets/environment/tiles_caves_gnoll.png and b/core/src/main/assets/environment/tiles_caves_gnoll.png differ diff --git a/core/src/main/assets/environment/tiles_city.png b/core/src/main/assets/environment/tiles_city.png index 8ec92c092..c82d66a1a 100644 Binary files a/core/src/main/assets/environment/tiles_city.png and b/core/src/main/assets/environment/tiles_city.png differ diff --git a/core/src/main/assets/environment/tiles_halls.png b/core/src/main/assets/environment/tiles_halls.png index 560d508ff..8f288cf35 100644 Binary files a/core/src/main/assets/environment/tiles_halls.png and b/core/src/main/assets/environment/tiles_halls.png differ diff --git a/core/src/main/assets/environment/tiles_prison.png b/core/src/main/assets/environment/tiles_prison.png index ed0bf7a54..668902af9 100644 Binary files a/core/src/main/assets/environment/tiles_prison.png and b/core/src/main/assets/environment/tiles_prison.png differ diff --git a/core/src/main/assets/environment/tiles_sewers.png b/core/src/main/assets/environment/tiles_sewers.png index 1fc5959a0..083273c97 100644 Binary files a/core/src/main/assets/environment/tiles_sewers.png and b/core/src/main/assets/environment/tiles_sewers.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java index ee8dde9e2..326c52254 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java @@ -58,7 +58,8 @@ public class Dewdrop extends Item { } else { int terr = Dungeon.level.map[pos]; - if (!consumeDew(1, hero, terr == Terrain.ENTRANCE|| terr == Terrain.EXIT || terr == Terrain.UNLOCKED_EXIT)){ + if (!consumeDew(1, hero, terr == Terrain.ENTRANCE || terr == Terrain.ENTRANCE_SP + || terr == Terrain.EXIT || terr == Terrain.UNLOCKED_EXIT)){ return false; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java index 5dcd84c23..c93d2c860 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java @@ -426,6 +426,7 @@ public class CavesBossLevel extends Level { case Terrain.WATER: return super.tileDesc( tile ) + "\n\n" + Messages.get(CavesBossLevel.class, "water_desc"); case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(CavesLevel.class, "entrance_desc"); case Terrain.EXIT: //city exit is used diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java index 33205b0f9..14f3ed4ce 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java @@ -210,6 +210,7 @@ public class CavesLevel extends RegularLevel { public String tileDesc( int tile ) { switch (tile) { case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(CavesLevel.class, "entrance_desc"); case Terrain.EXIT: return Messages.get(CavesLevel.class, "exit_desc"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java index 23b3a828a..1b5674b32 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java @@ -388,6 +388,7 @@ public class CityBossLevel extends Level { public String tileDesc(int tile) { switch (tile) { case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(CityLevel.class, "entrance_desc"); case Terrain.EXIT: return Messages.get(CityLevel.class, "exit_desc"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java index c03fd3ea9..1022748b7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java @@ -145,6 +145,7 @@ public class CityLevel extends RegularLevel { public String tileDesc(int tile) { switch (tile) { case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(CityLevel.class, "entrance_desc"); case Terrain.EXIT: return Messages.get(CityLevel.class, "exit_desc"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java index 1147f076e..e46e94f7e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java @@ -167,6 +167,7 @@ public class LastShopLevel extends RegularLevel { public String tileDesc(int tile) { switch (tile) { case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(CityLevel.class, "entrance_desc"); case Terrain.EXIT: return Messages.get(CityLevel.class, "exit_desc"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index c80bde435..bd9f1b3c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -1493,6 +1493,7 @@ public abstract class Level implements Bundlable { case Terrain.OPEN_DOOR: return Messages.get(Level.class, "open_door_name"); case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(Level.class, "entrace_name"); case Terrain.EXIT: return Messages.get(Level.class, "exit_name"); @@ -1540,6 +1541,7 @@ public abstract class Level implements Bundlable { case Terrain.WATER: return Messages.get(Level.class, "water_desc"); case Terrain.ENTRANCE: + case Terrain.ENTRANCE_SP: return Messages.get(Level.class, "entrance_desc"); case Terrain.EXIT: case Terrain.UNLOCKED_EXIT: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java index ae9f8f27e..cfae6e4d1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java @@ -31,6 +31,7 @@ public class Terrain { public static final int DOOR = 5; public static final int OPEN_DOOR = 6; public static final int ENTRANCE = 7; + public static final int ENTRANCE_SP = 37; public static final int EXIT = 8; public static final int EMBERS = 9; public static final int LOCKED_DOOR = 10; @@ -85,7 +86,8 @@ public class Terrain { flags[WALL] = LOS_BLOCKING | SOLID; flags[DOOR] = PASSABLE | LOS_BLOCKING | FLAMABLE | SOLID; flags[OPEN_DOOR] = PASSABLE | FLAMABLE; - flags[ENTRANCE] = PASSABLE/* | SOLID*/; + flags[ENTRANCE] = PASSABLE; + flags[ENTRANCE_SP] = flags[ENTRANCE]; flags[EXIT] = PASSABLE; flags[EMBERS] = PASSABLE; flags[LOCKED_DOOR] = LOS_BLOCKING | SOLID; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/CircleBasinEntranceRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/CircleBasinEntranceRoom.java index d64e2058f..0db51d57e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/CircleBasinEntranceRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/CircleBasinEntranceRoom.java @@ -45,7 +45,7 @@ public class CircleBasinEntranceRoom extends CircleBasinRoom { super.paint(level); int entrance = level.pointToCell(center()); - Painter.set( level, entrance, Terrain.ENTRANCE ); + Painter.set( level, entrance, Terrain.ENTRANCE_SP ); level.transitions.add(new LevelTransition(level, entrance, LevelTransition.Type.REGULAR_ENTRANCE)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/HallwayEntranceRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/HallwayEntranceRoom.java index 53eaa4ee4..779d25db1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/HallwayEntranceRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/HallwayEntranceRoom.java @@ -46,7 +46,7 @@ public class HallwayEntranceRoom extends HallwayRoom { break; } } - Painter.set( level, entrance, Terrain.ENTRANCE ); + Painter.set( level, entrance, Terrain.ENTRANCE_SP ); level.transitions.add(new LevelTransition(level, entrance, LevelTransition.Type.REGULAR_ENTRANCE)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java index be6af3888..a0712f3bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java @@ -68,6 +68,8 @@ public class DungeonTileSheet { public static final int EMPTY_WELL = GROUND +19; public static final int PEDESTAL = GROUND +20; + public static final int ENTRANCE_SP = GROUND +22; + public static final int CHASM = xy(9, 2); //8 slots //chasm stitching visuals... public static final int CHASM_FLOOR = CHASM+1; @@ -394,6 +396,7 @@ public class DungeonTileSheet { directVisuals.put(Terrain.EMBERS, EMBERS); directVisuals.put(Terrain.PEDESTAL, PEDESTAL); directVisuals.put(Terrain.EMPTY_SP, FLOOR_SP); + directVisuals.put(Terrain.ENTRANCE_SP, ENTRANCE_SP); directVisuals.put(Terrain.SECRET_TRAP, directVisuals.get(Terrain.EMPTY)); directVisuals.put(Terrain.TRAP, directVisuals.get(Terrain.EMPTY));