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

v2.4.2: cursed wands can no longer sheepify important NPCs

Browse Source
This commit is contained in:
Evan Debenham
2024-06-02 14:00:37 -04:00
parent 753b340f06
commit c7337e90c1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java
View File

@@ -42,6 +42,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.GoldenMimic;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NPC;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Sheep;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Flare;
@@ -280,8 +281,10 @@ public class CursedWand {
Char ch = Actor.findChar( targetPos );
if (ch != null && !(ch instanceof Hero)
//ignores bosses, questgivers, rat king, etc.
&& !ch.properties().contains(Char.Property.BOSS)
&& !ch.properties().contains(Char.Property.MINIBOSS)){
&& !ch.properties().contains(Char.Property.MINIBOSS)
&& !(ch instanceof NPC && ch.alignment == Char.Alignment.NEUTRAL)){
Sheep sheep = new Sheep();
sheep.lifespan = 10;
sheep.pos = ch.pos;