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

v0.7.3a: adjusted tengu boss logic.

Browse Source 
- Items now drop in the final arena on tengu death.
- Fixed thrown weapons sometimes being lost at the end of the fight.
This commit is contained in:
Evan Debenham 2019-05-25 17:35:20 -04:00
parent 412b729ff2
commit d71fcdadeb
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,9 @@ public class PrisonBossLevel extends Level {
WON WON
} }
private static final int ARENA_CENTER = 5+28*32;
private static final int ARENA_DOOR = 5+25*32;
private State state; private State state;
private Tengu tengu; private Tengu tengu;
@ -173,6 +176,17 @@ public class PrisonBossLevel extends Level {
return pos; return pos;
} }
private int randomTenguArenaCell(){
int pos = ARENA_CENTER - 2 - (2*32);//initial position at top-left of room
pos += Random.Int(5)*32;
pos += Random.Int(5);
//cannot choose the center
if (pos == ARENA_CENTER) return randomTenguArenaCell();
else return pos;
}
@Override @Override
public void press( int cell, Char ch ) { public void press( int cell, Char ch ) {
@ -287,25 +301,25 @@ public class PrisonBossLevel extends Level {
case START: case START:
//if something is occupying Tengu's space, wait and do nothing. //if something is occupying Tengu's space, wait and do nothing.
if (Actor.findChar(5 + 28*32) != null){ if (Actor.findChar(ARENA_CENTER) != null){
return; return;
} }
seal(); seal();
set(5 + 25 * 32, Terrain.LOCKED_DOOR); set(ARENA_DOOR, Terrain.LOCKED_DOOR);
GameScene.updateMap(5 + 25 * 32); GameScene.updateMap(ARENA_DOOR);
for (Mob m : mobs){ for (Mob m : mobs){
//bring the first ally with you //bring the first ally with you
if (m.alignment == Char.Alignment.ALLY){ if (m.alignment == Char.Alignment.ALLY){
m.pos = 5 + 25 * 32; //they should immediately walk out of the door m.pos = ARENA_DOOR; //they should immediately walk out of the door
m.sprite.place(m.pos); m.sprite.place(m.pos);
break; break;
} }
} }
tengu.state = tengu.HUNTING; tengu.state = tengu.HUNTING;
tengu.pos = 5 + 28*32; //in the middle of the fight room tengu.pos = ARENA_CENTER; //in the middle of the fight room
GameScene.add( tengu ); GameScene.add( tengu );
tengu.notice(); tengu.notice();
@ -388,8 +402,8 @@ public class PrisonBossLevel extends Level {
Dungeon.hero.sprite.interruptMotion(); Dungeon.hero.sprite.interruptMotion();
Dungeon.hero.sprite.place(Dungeon.hero.pos); Dungeon.hero.sprite.place(Dungeon.hero.pos);
tengu.pos = 5+28*32; tengu.pos = ARENA_CENTER;
tengu.sprite.place(5 + 28 * 32); tengu.sprite.place(ARENA_CENTER);
//remove all mobs, but preserve allies //remove all mobs, but preserve allies
ArrayList<Mob> allies = new ArrayList<>(); ArrayList<Mob> allies = new ArrayList<>();
@ -399,13 +413,12 @@ public class PrisonBossLevel extends Level {
mobs.remove(m); mobs.remove(m);
} }
} }
clearEntities(null);
changeMap(MAP_END); changeMap(MAP_END);
for (Mob m : allies){ for (Mob m : allies){
do{ do{
m.pos = Random.IntRange(3, 7) + Random.IntRange(26, 30)*32; m.pos = randomTenguArenaCell();
} while (findMob(m.pos) != null); } while (findMob(m.pos) != null);
m.sprite().place(m.pos); m.sprite().place(m.pos);
mobs.add(m); mobs.add(m);
@ -413,8 +426,10 @@ public class PrisonBossLevel extends Level {
tengu.die(Dungeon.hero); tengu.die(Dungeon.hero);
clearEntities((Room) new EmptyRoom().set(3, 26, 7, 30)); //arena is safe
for (Item item : storedItems) for (Item item : storedItems)
drop(item, randomPrisonCell()); drop(item, randomTenguArenaCell());
GameScene.flash(0xFFFFFF); GameScene.flash(0xFFFFFF);
Sample.INSTANCE.play(Assets.SND_BLAST); Sample.INSTANCE.play(Assets.SND_BLAST);