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

v3.3.0: fixed allies coming with you into new quest area

Browse Source
This commit is contained in:
Evan Debenham
2025-11-30 14:01:24 -05:00
parent e9dca7480b
commit 1e17a264f9
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@@ -581,6 +581,8 @@ public class DriedRose extends Artifact {
private void updateRose(){ private void updateRose(){
if (rose == null) { if (rose == null) {
rose = Dungeon.hero.belongings.getItem(DriedRose.class); rose = Dungeon.hero.belongings.getItem(DriedRose.class);
rose.ghost = this;
rose.ghostID = id();
} }
//same dodge as the hero //same dodge as the hero

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
View File

@@ -645,7 +645,12 @@ public class InterlevelScene extends PixelScene {
Level level = Dungeon.newLevel(); Level level = Dungeon.newLevel();
Dungeon.switchLevel( level, -1 ); Dungeon.switchLevel( level, -1 );
} else { } else {
Mob.holdAllies( Dungeon.level ); if (curTransition.destBranch != Dungeon.branch && Dungeon.depth >= 16 && Dungeon.depth <= 20) {
//FIXME avoids holding allies when entering city quest area, this is very sloppy though
// perhaps holding allies could be a property of the transition?
} else {
Mob.holdAllies(Dungeon.level);
}
Dungeon.saveAll(); Dungeon.saveAll();
Level level; Level level;
@@ -684,7 +689,12 @@ public class InterlevelScene extends PixelScene {
} }
private void ascend() throws IOException { private void ascend() throws IOException {
Mob.holdAllies( Dungeon.level ); if (curTransition.destBranch != Dungeon.branch && Dungeon.depth >= 16 && Dungeon.depth <= 20) {
//FIXME avoids holding allies when entering city quest area, this is very sloppy though
// perhaps holding allies could be a property of the transition?
} else {
Mob.holdAllies(Dungeon.level);
}
Dungeon.saveAll(); Dungeon.saveAll();
Level level; Level level;