diff --git a/core/src/main/assets/tiles_caves.png b/core/src/main/assets/tiles_caves.png index 34ac960e5..0356ea080 100644 Binary files a/core/src/main/assets/tiles_caves.png and b/core/src/main/assets/tiles_caves.png differ diff --git a/core/src/main/assets/tiles_city.png b/core/src/main/assets/tiles_city.png index e05e2a209..b362c45f3 100644 Binary files a/core/src/main/assets/tiles_city.png and b/core/src/main/assets/tiles_city.png differ diff --git a/core/src/main/assets/tiles_halls.png b/core/src/main/assets/tiles_halls.png index bd68f69de..6c7260343 100644 Binary files a/core/src/main/assets/tiles_halls.png and b/core/src/main/assets/tiles_halls.png differ diff --git a/core/src/main/assets/tiles_prison.png b/core/src/main/assets/tiles_prison.png index 3679aaa32..888806cc1 100644 Binary files a/core/src/main/assets/tiles_prison.png and b/core/src/main/assets/tiles_prison.png differ diff --git a/core/src/main/assets/tiles_sewers.png b/core/src/main/assets/tiles_sewers.png index d467e3b36..09c80a2a6 100644 Binary files a/core/src/main/assets/tiles_sewers.png and b/core/src/main/assets/tiles_sewers.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTerrainTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTerrainTilemap.java index 99330d70c..62091fd7f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTerrainTilemap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTerrainTilemap.java @@ -73,6 +73,8 @@ public class DungeonTerrainTilemap extends DungeonTilemap { return DungeonTileSheet.RAISED_STATUE; } else if (tile == Terrain.STATUE_SP) { return DungeonTileSheet.RAISED_STATUE_SP; + } else if (tile == Terrain.ALCHEMY) { + return DungeonTileSheet.RAISED_ALCHEMY_POT; } else if (tile == Terrain.BARRICADE) { return DungeonTileSheet.RAISED_BARRICADE; } else if (tile == Terrain.HIGH_GRASS) { 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 651e4fc6c..b5a056c51 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java @@ -66,8 +66,7 @@ public class DungeonTileSheet { public static final int EXIT = GROUND +17; public static final int WELL = GROUND +18; public static final int EMPTY_WELL = GROUND +19; - public static final int ALCHEMY_POT = GROUND +20; - public static final int PEDESTAL = GROUND +21; + public static final int PEDESTAL = GROUND +20; @@ -179,10 +178,11 @@ public class DungeonTileSheet { public static final int FLAT_SIGN = FLAT_OTHER+0; public static final int FLAT_STATUE = FLAT_OTHER+1; public static final int FLAT_STATUE_SP = FLAT_OTHER+2; - public static final int FLAT_BARRICADE = FLAT_OTHER+3; - public static final int FLAT_HIGH_GRASS = FLAT_OTHER+4; + public static final int FLAT_ALCHEMY_POT = FLAT_OTHER+3; + public static final int FLAT_BARRICADE = FLAT_OTHER+4; + public static final int FLAT_HIGH_GRASS = FLAT_OTHER+5; - public static final int FLAT_HIGH_GRASS_ALT = FLAT_OTHER+6; + public static final int FLAT_HIGH_GRASS_ALT = FLAT_OTHER+7; /********************************************************************** @@ -263,10 +263,11 @@ public class DungeonTileSheet { public static final int RAISED_SIGN = RAISED_OTHER+0; public static final int RAISED_STATUE = RAISED_OTHER+1; public static final int RAISED_STATUE_SP = RAISED_OTHER+2; - public static final int RAISED_BARRICADE = RAISED_OTHER+3; - public static final int RAISED_HIGH_GRASS = RAISED_OTHER+4; + public static final int RAISED_ALCHEMY_POT = RAISED_OTHER+3; + public static final int RAISED_BARRICADE = RAISED_OTHER+4; + public static final int RAISED_HIGH_GRASS = RAISED_OTHER+5; - public static final int RAISED_HIGH_GRASS_ALT = RAISED_OTHER+6; + public static final int RAISED_HIGH_GRASS_ALT = RAISED_OTHER+7; @@ -321,10 +322,11 @@ public class DungeonTileSheet { public static final int DOOR_SIDEWAYS_LOCKED = WALL_OVERHANG+24; public static final int STATUE_OVERHANG = WALL_OVERHANG+26; - public static final int BARRICADE_OVERHANG = WALL_OVERHANG+27; - public static final int HIGH_GRASS_OVERHANG = WALL_OVERHANG+28; + public static final int ALCHEMY_POT_OVERHAND = WALL_OVERHANG+27; + public static final int BARRICADE_OVERHANG = WALL_OVERHANG+28; + public static final int HIGH_GRASS_OVERHANG = WALL_OVERHANG+29; - public static final int HIGH_GRASS_OVERHANG_ALT = WALL_OVERHANG+30; + public static final int HIGH_GRASS_OVERHANG_ALT = WALL_OVERHANG+31; /********************************************************************** * Logic for the selection of tile visuals @@ -350,7 +352,6 @@ public class DungeonTileSheet { directVisuals.put(Terrain.LOCKED_EXIT, LOCKED_EXIT); directVisuals.put(Terrain.UNLOCKED_EXIT, UNLOCKED_EXIT); directVisuals.put(Terrain.WELL, WELL); - directVisuals.put(Terrain.ALCHEMY, ALCHEMY_POT); } @@ -366,6 +367,7 @@ public class DungeonTileSheet { directFlatVisuals.put(Terrain.SIGN, FLAT_SIGN); directFlatVisuals.put(Terrain.STATUE, FLAT_STATUE); directFlatVisuals.put(Terrain.STATUE_SP, FLAT_STATUE_SP); + directFlatVisuals.put(Terrain.ALCHEMY, FLAT_ALCHEMY_POT); directFlatVisuals.put(Terrain.BARRICADE, FLAT_BARRICADE); directFlatVisuals.put(Terrain.HIGH_GRASS, FLAT_HIGH_GRASS); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonWallsTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonWallsTilemap.java index 12fe1b938..59afa7d8c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonWallsTilemap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonWallsTilemap.java @@ -75,6 +75,8 @@ public class DungeonWallsTilemap extends DungeonTilemap { return DungeonTileSheet.DOOR_OVERHANG_OPEN; } else if (pos + mapWidth < size && (map[pos+mapWidth] == Terrain.STATUE || map[pos+mapWidth] == Terrain.STATUE_SP)){ return DungeonTileSheet.STATUE_OVERHANG; + } else if (pos + mapWidth < size && map[pos+mapWidth] == Terrain.ALCHEMY){ + return DungeonTileSheet.ALCHEMY_POT_OVERHAND; } else if (pos + mapWidth < size && map[pos+mapWidth] == Terrain.BARRICADE){ return DungeonTileSheet.BARRICADE_OVERHANG; } else if (pos + mapWidth < size && map[pos+mapWidth] == Terrain.HIGH_GRASS){