From ec6ca8647456b5b572eedb309f4cc9336b521003 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 11 Mar 2017 16:37:21 -0500 Subject: [PATCH] v0.6.0: fixed incorrect grass rendering on floor 21 --- .../tiles/TerrainFeaturesTilemap.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java index 31e531e5b..4583d87c4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java @@ -27,10 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.watabou.noosa.Image; -import com.watabou.noosa.TextureFilm; -import com.watabou.noosa.Tilemap; import com.watabou.noosa.tweeners.ScaleTweener; -import com.watabou.utils.PathFinder; import com.watabou.utils.PointF; import com.watabou.utils.SparseArray; @@ -66,10 +63,12 @@ public class TerrainFeaturesTilemap extends DungeonTilemap { return plants.get(pos).image + 7*16; } + int stage = (Dungeon.depth-1)/5; + if (Dungeon.depth == 21) stage--; if (tile == Terrain.HIGH_GRASS){ - return 9 + 16*((Dungeon.depth-1)/5) + (DungeonTileSheet.tileVariance[pos] >= 50 ? 1 : 0); + return 9 + 16*stage + (DungeonTileSheet.tileVariance[pos] >= 50 ? 1 : 0); } else if (tile == Terrain.GRASS) { - return 11 + 16*((Dungeon.depth-1)/5) + (DungeonTileSheet.tileVariance[pos] >= 50 ? 1 : 0); + return 11 + 16*stage + (DungeonTileSheet.tileVariance[pos] >= 50 ? 1 : 0); } else if (tile == Terrain.EMBERS) { return 13 + (DungeonTileSheet.tileVariance[pos] >= 50 ? 1 : 0); }