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

v2.1.1: fixed errors with ratmogrify expiring during ascension

Browse Source
This commit is contained in:
Evan Debenham
2023-06-05 20:43:43 -04:00
parent e0ca11e307
commit c9bed0e0cb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AscensionChallenge.java
+1
View File
@@ -137,6 +137,7 @@ public class AscensionChallenge extends Buff {
if (enemy instanceof Ratmogrify.TransmogRat){ if (enemy instanceof Ratmogrify.TransmogRat){
enemy = ((Ratmogrify.TransmogRat) enemy).getOriginal(); enemy = ((Ratmogrify.TransmogRat) enemy).getOriginal();
if (enemy == null) return;
} }
//only enemies that are boosted count //only enemies that are boosted count
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java
+6 -6
View File
@@ -213,9 +213,10 @@ public class Ratmogrify extends ArmorAbility {
} }
public Mob getOriginal(){ public Mob getOriginal(){
original.HP = HP; if (original != null) {
original.pos = pos; original.HP = HP;
original.clearTime(); original.pos = pos;
}
return original; return original;
} }
@@ -224,9 +225,8 @@ public class Ratmogrify extends ArmorAbility {
@Override @Override
protected boolean act() { protected boolean act() {
if (timeLeft <= 0){ if (timeLeft <= 0){
original.HP = HP; Mob original = getOriginal();
original.pos = pos; this.original = null;
original.clearTime();
GameScene.add(original); GameScene.add(original);
EXP = 0; EXP = 0;