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

v2.1.0: fixed char swapping placing both chars in same cell briefly

Browse Source
This commit is contained in:
Evan Debenham
2023-04-27 13:15:08 -04:00
parent aed47bc3a3
commit 6b88ea9369
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+15 -8
View File
@@ -213,7 +213,10 @@ public abstract class Char extends Actor {
return true; return true;
} }
int curPos = pos; //we do a little raw position shuffling here so that the characters are never
// on the same cell when logic such as occupyCell() is triggered
int oldPos = pos;
int newPos = c.pos;
//warp instantly with allies in this case //warp instantly with allies in this case
if (c == Dungeon.hero && Dungeon.hero.hasTalent(Talent.ALLY_WARP)){ if (c == Dungeon.hero && Dungeon.hero.hasTalent(Talent.ALLY_WARP)){
@@ -221,8 +224,10 @@ public abstract class Char extends Actor {
if (PathFinder.distance[pos] == Integer.MAX_VALUE){ if (PathFinder.distance[pos] == Integer.MAX_VALUE){
return true; return true;
} }
ScrollOfTeleportation.appear(this, c.pos); pos = newPos;
ScrollOfTeleportation.appear(c, curPos); c.pos = oldPos;
ScrollOfTeleportation.appear(this, newPos);
ScrollOfTeleportation.appear(c, oldPos);
Dungeon.observe(); Dungeon.observe();
GameScene.updateFog(); GameScene.updateFog();
return true; return true;
@@ -233,11 +238,13 @@ public abstract class Char extends Actor {
return true; return true;
} }
moveSprite( pos, c.pos ); c.pos = oldPos;
move( c.pos ); moveSprite( oldPos, newPos );
move( newPos );
c.sprite.move( c.pos, curPos );
c.move( curPos ); c.pos = newPos;
c.sprite.move( newPos, oldPos );
c.move( oldPos );
c.spend( 1 / c.speed() ); c.spend( 1 / c.speed() );