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

v1.3.0: fixed beacon of returning treated as inter-floor in all cases

Browse Source
This commit is contained in:
Evan Debenham
2022-06-30 15:14:01 -04:00
parent ea8b7ae3ce
commit af514c3a3d
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java
View File

@@ -109,41 +109,41 @@ public class BeaconOfReturning extends Spell {
} }
private void returnBeacon( Hero hero ){ private void returnBeacon( Hero hero ){
if (!Dungeon.interfloorTeleportAllowed()) {
GLog.w( Messages.get(this, "preventing") );
return;
}
for (int i = 0; i < PathFinder.NEIGHBOURS8.length; i++) {
Char ch = Actor.findChar(hero.pos + PathFinder.NEIGHBOURS8[i]);
if (ch != null && ch.alignment == Char.Alignment.ENEMY) {
GLog.w( Messages.get(this, "creatures") );
return;
}
}
if (returnDepth == Dungeon.depth && returnBranch == Dungeon.branch) { if (returnDepth == Dungeon.depth && returnBranch == Dungeon.branch) {
if (!Dungeon.level.passable[returnPos] && !Dungeon.level.avoid[returnPos]){
returnPos = Dungeon.level.entrance(); Char moving = Actor.findChar(returnPos);
if (moving != null){
moving.pos = returnPos+1;
} }
ScrollOfTeleportation.appear( hero, returnPos );
for(Mob m : Dungeon.level.mobs){ if (ScrollOfTeleportation.teleportToLocation(hero, returnPos)){
if (m.pos == hero.pos){ if (moving != null){
//displace mob moving.pos = returnPos;
for(int i : PathFinder.NEIGHBOURS8){ for(int i : PathFinder.NEIGHBOURS8){
if (Actor.findChar(m.pos+i) == null && Dungeon.level.passable[m.pos + i]){ if (Actor.findChar(moving.pos+i) == null
m.pos += i; && Dungeon.level.passable[moving.pos + i]
m.sprite.point(m.sprite.worldToCamera(m.pos)); && (!Char.hasProp(moving, Char.Property.LARGE) || Dungeon.level.openSpace[moving.pos + i])){
moving.pos += i;
moving.sprite.point(moving.sprite.worldToCamera(moving.pos));
break; break;
} }
} }
} }
} else {
if (moving != null) {
moving.pos = returnPos;
}
return;
} }
Dungeon.level.occupyCell(hero );
Dungeon.observe();
GameScene.updateFog();
} else { } else {
if (!Dungeon.interfloorTeleportAllowed()) {
GLog.w( Messages.get(this, "preventing") );
return;
}
TimekeepersHourglass.timeFreeze timeFreeze = Dungeon.hero.buff(TimekeepersHourglass.timeFreeze.class); TimekeepersHourglass.timeFreeze timeFreeze = Dungeon.hero.buff(TimekeepersHourglass.timeFreeze.class);
if (timeFreeze != null) timeFreeze.disarmPressedTraps(); if (timeFreeze != null) timeFreeze.disarmPressedTraps();
Swiftthistle.TimeBubble timeBubble = Dungeon.hero.buff(Swiftthistle.TimeBubble.class); Swiftthistle.TimeBubble timeBubble = Dungeon.hero.buff(Swiftthistle.TimeBubble.class);
@@ -155,6 +155,7 @@ public class BeaconOfReturning extends Spell {
InterlevelScene.returnPos = returnPos; InterlevelScene.returnPos = returnPos;
Game.switchScene( InterlevelScene.class ); Game.switchScene( InterlevelScene.class );
} }
hero.spendAndNext( 1f );
detach(hero.belongings.backpack); detach(hero.belongings.backpack);
} }