diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiMagic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiMagic.java index a7df694dd..99ff32b31 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiMagic.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiMagic.java @@ -29,6 +29,16 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Shaman; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Warlock; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Yog; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFrost; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLightning; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPrismaticLight; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTransfusion; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfWarding; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.DisintegrationTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrimTrap; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; @@ -47,6 +57,17 @@ public class AntiMagic extends Armor.Glyph { RESISTS.add( DisintegrationTrap.class ); RESISTS.add( GrimTrap.class ); + + RESISTS.add( WandOfBlastWave.class ); + RESISTS.add( WandOfDisintegration.class ); + RESISTS.add( WandOfFireblast.class ); + RESISTS.add( WandOfFrost.class ); + RESISTS.add( WandOfLightning.class ); + RESISTS.add( WandOfLivingEarth.class ); + RESISTS.add( WandOfMagicMissile.class ); + RESISTS.add( WandOfPrismaticLight.class ); + RESISTS.add( WandOfTransfusion.class ); + RESISTS.add( WandOfWarding.Ward.class ); RESISTS.add( Shaman.LightningBolt.class ); RESISTS.add( Warlock.DarkBolt.class ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java index 591f3f525..9902d6496 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java @@ -37,6 +37,16 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Shaman; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Warlock; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Yog; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFrost; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLightning; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPrismaticLight; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTransfusion; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfWarding; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.DisintegrationTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrimTrap; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -58,7 +68,8 @@ public class RingOfElements extends Ring { protected RingBuff buff( ) { return new Resistance(); } - + + //FIXME probably should add wands here public static final HashSet RESISTS = new HashSet<>(); static { RESISTS.add( Burning.class ); @@ -73,6 +84,17 @@ public class RingOfElements extends Ring { RESISTS.add( DisintegrationTrap.class ); RESISTS.add( GrimTrap.class ); + + RESISTS.add( WandOfBlastWave.class ); + RESISTS.add( WandOfDisintegration.class ); + RESISTS.add( WandOfFireblast.class ); + RESISTS.add( WandOfFrost.class ); + RESISTS.add( WandOfLightning.class ); + RESISTS.add( WandOfLivingEarth.class ); + RESISTS.add( WandOfMagicMissile.class ); + RESISTS.add( WandOfPrismaticLight.class ); + RESISTS.add( WandOfTransfusion.class ); + RESISTS.add( WandOfWarding.Ward.class ); RESISTS.add( ToxicGas.class ); RESISTS.add( Electricity.class );