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

v0.7.5a: adjusted stairs at the end of the Tengu fight, now more visible

Browse Source
This commit is contained in:
Evan Debenham 2019-10-04 15:10:46 -04:00
parent e4bf20bc98
commit 219f648732
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/src/main/assets/custom_tiles/prison_exit_new.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 10 KiB

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -845,7 +845,7 @@ public class Hero extends Char {
private boolean actDescend( HeroAction.Descend action ) { private boolean actDescend( HeroAction.Descend action ) {
int stairs = action.dst; int stairs = action.dst;
if (pos == stairs && pos == Dungeon.level.exit) { if (pos == stairs) {
curAction = null; curAction = null;
@ -871,7 +871,7 @@ public class Hero extends Char {
private boolean actAscend( HeroAction.Ascend action ) { private boolean actAscend( HeroAction.Ascend action ) {
int stairs = action.dst; int stairs = action.dst;
if (pos == stairs && pos == Dungeon.level.entrance) { if (pos == stairs) {
if (Dungeon.depth == 1) { if (Dungeon.depth == 1) {
@ -1231,11 +1231,12 @@ public class Hero extends Char {
curAction = new HeroAction.Unlock( cell ); 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 ); 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 ); curAction = new HeroAction.Ascend( cell );

54
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java
View File

@ -131,6 +131,18 @@ public class NewPrisonBossLevel extends Level {
} }
triggered = bundle.getBooleanArray(TRIGGERED); 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 @Override
@ -260,10 +272,11 @@ public class NewPrisonBossLevel extends Level {
private static int W = Terrain.WALL; private static int W = Terrain.WALL;
private static int D = Terrain.WALL_DECO; private static int D = Terrain.WALL_DECO;
private static int e = Terrain.EMPTY; private static int e = Terrain.EMPTY;
private static int E = Terrain.EXIT;
private static int C = Terrain.CHASM; private static int C = Terrain.CHASM;
private static final Point endStart = new Point( startHallway.left+2, startHallway.top+2); 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[]{ private static final int[] endMap = new int[]{
W, W, W, W, W, W, W, W, W, W, W, W, W, W, 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, 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, W, W,
e, e, e, e, e, e, e, e, e, e, e, e, e, 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, 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, W, C, C, C, C, C, C, C, C, C, E, E, W,
e, e, e, C, C, C, C, C, C, C, C, C, 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, C, 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, 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, e, W, W, W, W, C, C, C, W,
W, e, e, e, e, W, W, W, W, W, W, 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); 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. //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, 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, 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, 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, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 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, 0, 0, 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, 1, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 0, 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, 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, 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, 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, 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, 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, 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, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 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, 0, 0, 1
}; };
@Override @Override