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

v2.1.0: fixed ratmogrify not working correctly with multiplicity glyph

Browse Source
This commit is contained in:
Evan Debenham
2023-05-03 14:01:54 -04:00
parent e36c604147
commit aa968d5e61
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java
+3
View File
@@ -213,6 +213,9 @@ public class Ratmogrify extends ArmorAbility {
} }
public Mob getOriginal(){ public Mob getOriginal(){
original.HP = HP;
original.pos = pos;
original.clearTime();
return original; return original;
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/curses/Multiplicity.java
+12 -5
View File
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PinCushion; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PinCushion;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.Ratmogrify;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Statue; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Statue;
@@ -69,15 +70,21 @@ public class Multiplicity extends Armor.Glyph {
((MirrorImage)m).duplicate( (Hero)defender ); ((MirrorImage)m).duplicate( (Hero)defender );
} else { } else {
Char toDuplicate = attacker;
if (toDuplicate instanceof Ratmogrify.TransmogRat){
toDuplicate = ((Ratmogrify.TransmogRat)attacker).getOriginal();
}
//FIXME should probably have a mob property for this //FIXME should probably have a mob property for this
if (!(attacker instanceof Mob) if (!(toDuplicate instanceof Mob)
|| attacker.properties().contains(Char.Property.BOSS) || attacker.properties().contains(Char.Property.MINIBOSS) || toDuplicate.properties().contains(Char.Property.BOSS) || toDuplicate.properties().contains(Char.Property.MINIBOSS)
|| attacker instanceof Mimic || attacker instanceof Statue || attacker instanceof NPC){ || toDuplicate instanceof Mimic || toDuplicate instanceof Statue || toDuplicate instanceof NPC) {
m = Dungeon.level.createMob(); m = Dungeon.level.createMob();
} else { } else {
Actor.fixTime(); Actor.fixTime();
m = (Mob)Reflection.newInstance(attacker.getClass()); m = (Mob)Reflection.newInstance(toDuplicate.getClass());
if (m != null) { if (m != null) {