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

v3.0.0: fixed runestones working with magic immune buff

Browse Source
This commit is contained in:
Evan Debenham
2024-11-17 15:32:16 -05:00
parent 402a04cf7d
commit 5be44cdfae
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/InventoryStone.java
+2 -1
View File
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.stones;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
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.bags.Bag; import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
@@ -51,7 +52,7 @@ public abstract class InventoryStone extends Runestone {
@Override @Override
public void execute(Hero hero, String action) { public void execute(Hero hero, String action) {
super.execute(hero, action); super.execute(hero, action);
if (action.equals(AC_USE)){ if (action.equals(AC_USE) && hero.buff(MagicImmune.class) == null){
activate(curUser.pos); activate(curUser.pos);
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java
+2
View File
@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.stones;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog; import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog;
@@ -48,6 +49,7 @@ public abstract class Runestone extends Item {
protected void onThrow(int cell) { protected void onThrow(int cell) {
///inventory stones are thrown like normal items, other stones don't trigger when thrown into pits ///inventory stones are thrown like normal items, other stones don't trigger when thrown into pits
if (this instanceof InventoryStone || if (this instanceof InventoryStone ||
Dungeon.hero.buff(MagicImmune.class) != null ||
(Dungeon.level.pit[cell] && Actor.findChar(cell) == null)){ (Dungeon.level.pit[cell] && Actor.findChar(cell) == null)){
if (!anonymous) super.onThrow( cell ); if (!anonymous) super.onThrow( cell );
} else { } else {