LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0: fixed elements and antimagic not applying to new debuffs

Browse Source
This commit is contained in:
Evan Debenham 2019-12-01 13:47:48 -05:00
parent 4941e2afaa
commit 826b33a59d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiMagic.java
View File

@ -23,6 +23,9 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Degrade;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hex;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vulnerable;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM100; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM100;
@ -55,6 +58,9 @@ public class AntiMagic extends Armor.Glyph {
static { static {
RESISTS.add( Charm.class ); RESISTS.add( Charm.class );
RESISTS.add( Weakness.class ); RESISTS.add( Weakness.class );
RESISTS.add( Vulnerable.class );
RESISTS.add( Hex.class );
RESISTS.add( Degrade.class );
RESISTS.add( DisintegrationTrap.class ); RESISTS.add( DisintegrationTrap.class );
RESISTS.add( GrimTrap.class ); RESISTS.add( GrimTrap.class );

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java
View File

@ -28,10 +28,13 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Chill; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Chill;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corrosion; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corrosion;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Degrade;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hex;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vulnerable;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM100; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM100;
@ -73,14 +76,18 @@ public class RingOfElements extends Ring {
public static final HashSet<Class> RESISTS = new HashSet<>(); public static final HashSet<Class> RESISTS = new HashSet<>();
static { static {
RESISTS.add( Burning.class ); RESISTS.add( Burning.class );
RESISTS.add( Charm.class );
RESISTS.add( Chill.class ); RESISTS.add( Chill.class );
RESISTS.add( Frost.class ); RESISTS.add( Frost.class );
RESISTS.add( Ooze.class ); RESISTS.add( Ooze.class );
RESISTS.add( Paralysis.class ); RESISTS.add( Paralysis.class );
RESISTS.add( Poison.class ); RESISTS.add( Poison.class );
RESISTS.add( Corrosion.class ); RESISTS.add( Corrosion.class );
RESISTS.add( Charm.class );
RESISTS.add( Weakness.class ); RESISTS.add( Weakness.class );
RESISTS.add( Vulnerable.class );
RESISTS.add( Hex.class );
RESISTS.add( Degrade.class );
RESISTS.add( DisintegrationTrap.class ); RESISTS.add( DisintegrationTrap.class );
RESISTS.add( GrimTrap.class ); RESISTS.add( GrimTrap.class );