LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.5.0: improved visuals for locked doors

Browse Source
This commit is contained in:
Evan Debenham 2017-01-04 22:31:47 -05:00
parent 26daff58b2
commit 78fae52786
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/tiles_caves.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
core/src/main/assets/tiles_city.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
core/src/main/assets/tiles_halls.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
core/src/main/assets/tiles_prison.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
core/src/main/assets/tiles_sewers.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

22
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java
View File

@ -259,15 +259,17 @@ public class DungeonTileSheet {
//+1 for open to the down-right, +2 for open to the down-left //+1 for open to the down-right, +2 for open to the down-left
private static final int WALLS_OVERHANG = xy(1, 14); //32 slots private static final int WALLS_OVERHANG = xy(1, 14); //32 slots
public static final int WALL_OVERHANG = WALLS_OVERHANG+0; public static final int WALL_OVERHANG = WALLS_OVERHANG+0;
public static final int DOOR_SIDEWAYS_OVERHANG = WALLS_OVERHANG+4; public static final int DOOR_SIDEWAYS_OVERHANG = WALLS_OVERHANG+4;
public static final int DOOR_SIDEWAYS_OVERHANG_OPEN = WALLS_OVERHANG+8; public static final int DOOR_SIDEWAYS_OVERHANG_OPEN = WALLS_OVERHANG+8;
public static final int WALL_OVERHANG_WOODEN = WALLS_OVERHANG+12; public static final int DOOR_SIDEWAYS_OVERHANG_LOCKED = WALLS_OVERHANG+12;
public static final int WALL_OVERHANG_WOODEN = WALLS_OVERHANG+16;
public static int stitchWallOverhangTile(int tile, int rightBelow, int below, int leftBelow){ public static int stitchWallOverhangTile(int tile, int rightBelow, int below, int leftBelow){
int visual; int visual;
if (tile == Terrain.DOOR || tile == Terrain.LOCKED_DOOR) visual = DOOR_SIDEWAYS_OVERHANG; if (tile == Terrain.DOOR) visual = DOOR_SIDEWAYS_OVERHANG;
else if (tile == Terrain.OPEN_DOOR) visual = DOOR_SIDEWAYS_OVERHANG_OPEN; else if (tile == Terrain.OPEN_DOOR) visual = DOOR_SIDEWAYS_OVERHANG_OPEN;
else if (tile == Terrain.LOCKED_DOOR) visual = DOOR_SIDEWAYS_OVERHANG_LOCKED;
else if (below == Terrain.BOOKSHELF) visual = WALL_OVERHANG_WOODEN; else if (below == Terrain.BOOKSHELF) visual = WALL_OVERHANG_WOODEN;
else visual = WALL_OVERHANG; else visual = WALL_OVERHANG;
@ -278,12 +280,12 @@ public class DungeonTileSheet {
} }
//no attachment to adjacent walls //no attachment to adjacent walls
public static final int DOOR_OVERHANG = WALL_OVERHANG+16; public static final int DOOR_OVERHANG = WALL_OVERHANG+21;
public static final int DOOR_OVERHANG_OPEN = WALL_OVERHANG+17; public static final int DOOR_OVERHANG_OPEN = WALL_OVERHANG+22;
public static final int DOOR_SIDEWAYS = WALL_OVERHANG+18; public static final int DOOR_SIDEWAYS = WALL_OVERHANG+23;
public static final int DOOR_SIDEWAYS_LOCKED = WALL_OVERHANG+19; public static final int DOOR_SIDEWAYS_LOCKED = WALL_OVERHANG+24;
public static final int BARRICADE_OVERHANG = WALL_OVERHANG+21; public static final int BARRICADE_OVERHANG = WALL_OVERHANG+26;
/********************************************************************** /**********************************************************************
* Logic for the selection of tile visuals * Logic for the selection of tile visuals