From 219f648732601049fab3a7b422c86cc4a06b30f1 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 4 Oct 2019 15:10:46 -0400 Subject: [PATCH] v0.7.5a: adjusted stairs at the end of the Tengu fight, now more visible --- .../assets/custom_tiles/prison_exit_new.png | Bin 8921 -> 10500 bytes .../actors/hero/Hero.java | 9 +-- .../levels/NewPrisonBossLevel.java | 54 +++++++++++------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/android/src/main/assets/custom_tiles/prison_exit_new.png b/android/src/main/assets/custom_tiles/prison_exit_new.png index ffe7a681c43e89ab214e9ff8d315aff58d816757..4ef5d56e8bd97354dddc3a12782261ff36705497 100644 GIT binary patch literal 10500 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 literal 8921 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 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 53bf0ff0b..c4501bcd2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -845,7 +845,7 @@ public class Hero extends Char { private boolean actDescend( HeroAction.Descend action ) { int stairs = action.dst; - if (pos == stairs && pos == Dungeon.level.exit) { + if (pos == stairs) { curAction = null; @@ -871,7 +871,7 @@ public class Hero extends Char { private boolean actAscend( HeroAction.Ascend action ) { int stairs = action.dst; - if (pos == stairs && pos == Dungeon.level.entrance) { + if (pos == stairs) { if (Dungeon.depth == 1) { @@ -1231,11 +1231,12 @@ public class Hero extends Char { curAction = new HeroAction.Unlock( cell ); - } else if (cell == Dungeon.level.exit && Dungeon.depth < 26) { + } else if ((cell == Dungeon.level.exit || Dungeon.level.map[cell] == Terrain.EXIT || Dungeon.level.map[cell] == Terrain.UNLOCKED_EXIT) + && Dungeon.depth < 26) { curAction = new HeroAction.Descend( cell ); - } else if (cell == Dungeon.level.entrance) { + } else if (cell == Dungeon.level.entrance || Dungeon.level.map[cell] == Terrain.ENTRANCE) { curAction = new HeroAction.Ascend( cell ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java index 16ad898a9..9aadcbf5a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java @@ -131,6 +131,18 @@ public class NewPrisonBossLevel extends Level { } triggered = bundle.getBooleanArray(TRIGGERED); + + //compatibility with pre-0.7.5a saves + if (state == State.WON){ + int cell = pointToCell(endStart); + int i = 0; + while (cell < length()){ + System.arraycopy(endMap, i, map, cell, 14); + i += 14; + cell += width(); + } + exit = pointToCell(levelExit); + } } @Override @@ -260,10 +272,11 @@ public class NewPrisonBossLevel extends Level { private static int W = Terrain.WALL; private static int D = Terrain.WALL_DECO; private static int e = Terrain.EMPTY; + private static int E = Terrain.EXIT; private static int C = Terrain.CHASM; private static final Point endStart = new Point( startHallway.left+2, startHallway.top+2); - private static final Point levelExit = new Point( endStart.x+12, endStart.y+8); + private static final Point levelExit = new Point( endStart.x+12, endStart.y+6); private static final int[] endMap = new int[]{ W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, @@ -271,9 +284,9 @@ public class NewPrisonBossLevel extends Level { e, e, e, e, e, e, e, e, e, e, e, e, W, W, e, e, e, e, e, e, e, e, e, e, e, e, e, W, e, e, e, C, C, C, C, C, C, C, C, e, e, W, - e, W, C, C, C, C, C, C, C, C, C, C, e, W, - e, e, e, C, C, C, C, C, C, C, C, C, e, W, - e, e, e, e, e, C, C, C, C, C, C, C, e, W, + e, W, C, C, C, C, C, C, C, C, C, E, E, W, + e, e, e, C, C, C, C, C, C, C, C, E, E, W, + e, e, e, e, e, C, C, C, C, C, C, E, E, W, e, e, e, e, e, e, e, W, W, W, C, C, C, W, W, e, e, e, e, e, W, W, W, W, C, C, C, W, W, e, e, e, e, W, W, W, W, W, W, C, C, W, @@ -323,7 +336,6 @@ public class NewPrisonBossLevel extends Level { } exit = pointToCell(levelExit); - Painter.set(this, exit, Terrain.EXIT); } //keep track of removed items as the level is changed. Dump them back into the level at the end. @@ -806,9 +818,9 @@ public class NewPrisonBossLevel extends Level { 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, - 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, + 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, + 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -841,24 +853,24 @@ public class NewPrisonBossLevel extends Level { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, - 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 + 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1 }; @Override