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

v0.9.1: fixed antimagic not applying to magical sleep or wards

Browse Source
This commit is contained in:
Evan Debenham 2020-12-05 00:04:16 -05:00
parent 8c1372aa27
commit 13a2ada076
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,10 +25,11 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
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.MagicalSleep;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vulnerable;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM100;
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;
@ -57,6 +58,7 @@ public class AntiMagic extends Armor.Glyph {
public static final HashSet<Class> RESISTS = new HashSet<>();
static {
RESISTS.add( MagicalSleep.class );
RESISTS.add( Charm.class );
RESISTS.add( Weakness.class );
RESISTS.add( Vulnerable.class );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java
View File

@ -305,7 +305,7 @@ public class WandOfWarding extends Wand {
//always hits
int dmg = Random.NormalIntRange( 2 + wandLevel, 8 + 4*wandLevel );
enemy.damage( dmg, WandOfWarding.class );
enemy.damage( dmg, this );
if (enemy.isAlive()){
Wand.processSoulMark(enemy, wandLevel, 1);
}