v3.2.0: fixed body form working on all armor wielders

This commit is contained in:
Evan Debenham
2025-07-28 14:49:06 -04:00
parent 72f5786e6d
commit 334f3a460a

View File

@@ -33,10 +33,12 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.rogue.ShadowClone;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.AuraOfProtection;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.BodyForm;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.HolyWard;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.LifeLinkSpell;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.PrismaticImage;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
@@ -497,7 +499,9 @@ public class Armor extends EquipableItem {
if (defender.buff(MagicImmune.class) == null) {
Glyph trinityGlyph = null;
if (Dungeon.hero.buff(BodyForm.BodyFormBuff.class) != null){
//only when it's the hero or a char that uses the hero's armor
if (Dungeon.hero.buff(BodyForm.BodyFormBuff.class) != null
&& (defender == Dungeon.hero || defender instanceof PrismaticImage || defender instanceof ShadowClone.ShadowAlly)){
trinityGlyph = Dungeon.hero.buff(BodyForm.BodyFormBuff.class).glyph();
if (glyph != null && trinityGlyph != null && trinityGlyph.getClass() == glyph.getClass()){
trinityGlyph = null;