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

v0.6.5: corrected room declarations in prison boss level

Browse Source
This commit is contained in:
Evan Debenham 2018-04-24 14:26:31 -04:00 committed by Evan Debenham
parent 2cf3a16feb
commit cf766e9638
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
View File

@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.MazeRoom; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.MazeRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EmptyRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrippingTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrippingTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@ -180,13 +181,13 @@ public class PrisonBossLevel extends Level {
if (ch == Dungeon.hero){ if (ch == Dungeon.hero){
//hero enters tengu's chamber //hero enters tengu's chamber
if (state == State.START if (state == State.START
&& ((Room)new Room().set(2, 25, 8, 32)).inside(cellToPoint(cell))){ && (new EmptyRoom().set(2, 25, 8, 32)).inside(cellToPoint(cell))){
progress(); progress();
} }
//hero finishes the maze //hero finishes the maze
else if (state == State.MAZE else if (state == State.MAZE
&& ((Room)new Room().set(4, 0, 7, 4)).inside(cellToPoint(cell))){ && (new EmptyRoom().set(4, 0, 7, 4)).inside(cellToPoint(cell))){
progress(); progress();
} }
} }
@ -309,7 +310,7 @@ public class PrisonBossLevel extends Level {
case FIGHT_START: case FIGHT_START:
changeMap(MAP_MAZE); changeMap(MAP_MAZE);
clearEntities((Room) new Room().set(0, 5, 8, 32)); //clear the entrance clearEntities((Room) new EmptyRoom().set(0, 5, 8, 32)); //clear the entrance
Actor.remove(tengu); Actor.remove(tengu);
mobs.remove(tengu); mobs.remove(tengu);
@ -339,7 +340,7 @@ public class PrisonBossLevel extends Level {
Dungeon.hero.sprite.place(Dungeon.hero.pos); Dungeon.hero.sprite.place(Dungeon.hero.pos);
changeMap(MAP_ARENA); changeMap(MAP_ARENA);
clearEntities( (Room) new Room().set(0, 0, 10, 4)); //clear all but the area right around the teleport spot clearEntities( (Room) new EmptyRoom().set(0, 0, 10, 4)); //clear all but the area right around the teleport spot
//if any allies are left over, move them along the same way as the hero //if any allies are left over, move them along the same way as the hero
for (Mob m : mobs){ for (Mob m : mobs){