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

v2.0.0: fixed magicImmune not blocking cursed artifacts or wand charging

Browse Source
This commit is contained in:
Evan Debenham
2022-11-03 14:10:13 -04:00
parent d41f68bb96
commit 0a85d4ef41
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
+2 -1
View File
@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.artifacts;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.KindofMisc; import com.shatteredpixel.shatteredpixeldungeon.items.KindofMisc;
@@ -230,7 +231,7 @@ public class Artifact extends KindofMisc {
} }
public boolean isCursed() { public boolean isCursed() {
return cursed; return target.buff(MagicImmune.class) == null && cursed;
} }
public void charge(Hero target, float amount){ public void charge(Hero target, float amount){
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+1 -1
View File
@@ -682,7 +682,7 @@ public abstract class Wand extends Item {
@Override @Override
public boolean act() { public boolean act() {
if (curCharges < maxCharges) if (curCharges < maxCharges && target.buff(MagicImmune.class) == null)
recharge(); recharge();
while (partialCharge >= 1 && curCharges < maxCharges) { while (partialCharge >= 1 && curCharges < maxCharges) {