konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.2.0: fixed intense music not playing correctly for newborn elemental

Browse Source
This commit is contained in:
Evan Debenham
2023-09-11 09:54:55 -04:00
parent 4fa5256e76
commit 27e0aacd93
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
View File

@@ -378,7 +378,14 @@ public class Wandmaker extends NPC {
return false;
} else if (type == 2){
//hero is in the ritual room and all 4 candles are with them
//hero has summoned the newborn elemental
for (Mob m : Dungeon.level.mobs) {
if (m instanceof Elemental.NewbornFireElemental) {
return true;
}
}
//or hero is in the ritual room and all 4 candles are with them
if (((RegularLevel) Dungeon.level).room(Dungeon.hero.pos) instanceof RitualSiteRoom) {
int candles = 0;
if (Dungeon.hero.belongings.getItem(CeremonialCandle.class) != null){
@@ -403,14 +410,6 @@ public class Wandmaker extends NPC {
return true;
}
return false;
}
//or they have summoned but not killed the newborn elemental
for (Mob m : Dungeon.level.mobs) {
if (m instanceof Elemental.NewbornFireElemental) {
return true;
}
}
return false;