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

V0.2.1 : Unblessed Ankh will now only reset a boss level when the level is locked.

Browse Source
This commit is contained in:
Evan Debenham 2014-10-13 03:19:35 -04:00
parent dd2ddf6f81
commit 0e0faecc25
6 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
View File

@ -218,6 +218,7 @@ public class CavesBossLevel extends Level {
if (!enteredArena && outsideEntraceRoom( cell ) && hero == Dungeon.hero) {
enteredArena = true;
locked = true;
Mob boss = Bestiary.mob( Dungeon.depth );
boss.state = Mob.State.HUNTING;
@ -245,6 +246,7 @@ public class CavesBossLevel extends Level {
if (!keyDropped && item instanceof SkeletonKey) {
keyDropped = true;
locked = false;
CellEmitter.get( arenaDoor ).start( Speck.factory( Speck.ROCK ), 0.07f, 10 );

2
src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java
View File

@ -176,6 +176,7 @@ public class CityBossLevel extends Level {
if (!enteredArena && outsideEntraceRoom( cell ) && hero == Dungeon.hero) {
enteredArena = true;
locked = true;
Mob boss = Bestiary.mob( Dungeon.depth );
boss.state = Mob.State.HUNTING;
@ -199,6 +200,7 @@ public class CityBossLevel extends Level {
if (!keyDropped && item instanceof SkeletonKey) {
keyDropped = true;
locked = false;
set( arenaDoor, Terrain.DOOR );
GameScene.updateMap( arenaDoor );

2
src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java
View File

@ -167,6 +167,7 @@ public class HallsBossLevel extends Level {
if (!enteredArena && hero == Dungeon.hero && cell != entrance) {
enteredArena = true;
locked = true;
for (int i=ROOM_LEFT-1; i <= ROOM_RIGHT + 1; i++) {
doMagic( (ROOM_TOP - 1) * WIDTH + i );
@ -205,6 +206,7 @@ public class HallsBossLevel extends Level {
if (!keyDropped && item instanceof SkeletonKey) {
keyDropped = true;
locked = false;
entrance = stairs;
set( entrance, Terrain.ENTRANCE );

7
src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -133,6 +133,9 @@ public abstract class Level implements Bundlable {
public int entrance;
public int exit;
//when a boss level has become locked.
public boolean locked = false;
public HashSet<Mob> mobs;
public SparseArray<Heap> heaps;
public HashMap<Class<? extends Blob>,Blob> blobs;
@ -151,6 +154,7 @@ public abstract class Level implements Bundlable {
private static final String MAPPED = "mapped";
private static final String ENTRANCE = "entrance";
private static final String EXIT = "exit";
private static final String LOCKED = "locked";
private static final String HEAPS = "heaps";
private static final String PLANTS = "plants";
private static final String MOBS = "mobs";
@ -257,6 +261,8 @@ public abstract class Level implements Bundlable {
entrance = bundle.getInt( ENTRANCE );
exit = bundle.getInt( EXIT );
locked = bundle.getBoolean( LOCKED );
weakFloorCreated = false;
adjustMapSize();
@ -308,6 +314,7 @@ public abstract class Level implements Bundlable {
bundle.put( MAPPED, mapped );
bundle.put( ENTRANCE, entrance );
bundle.put( EXIT, exit );
bundle.put( LOCKED, locked );
bundle.put( HEAPS, heaps.values() );
bundle.put( PLANTS, plants.values() );
bundle.put( MOBS, mobs );

3
src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
View File

@ -309,6 +309,7 @@ public class PrisonBossLevel extends RegularLevel {
if (ch == Dungeon.hero && !enteredArena && roomExit.inside( cell )) {
enteredArena = true;
locked = true;
int pos;
do {
@ -326,6 +327,7 @@ public class PrisonBossLevel extends RegularLevel {
set( arenaDoor, Terrain.LOCKED_DOOR );
GameScene.updateMap( arenaDoor );
Dungeon.observe();
}
}
@ -335,6 +337,7 @@ public class PrisonBossLevel extends RegularLevel {
if (!keyDropped && item instanceof SkeletonKey) {
keyDropped = true;
locked = false;
set( arenaDoor, Terrain.DOOR );
GameScene.updateMap( arenaDoor );

5
src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java
View File

@ -233,6 +233,8 @@ public class SewerBossLevel extends RegularLevel {
public void seal() {
if (entrance != 0) {
locked = true;
set( entrance, Terrain.WATER_TILES );
GameScene.updateMap( entrance );
GameScene.ripple( entrance );
@ -245,11 +247,14 @@ public class SewerBossLevel extends RegularLevel {
public void unseal() {
if (stairs != 0) {
locked = false;
entrance = stairs;
stairs = 0;
set( entrance, Terrain.ENTRANCE );
GameScene.updateMap( entrance );
}
}