From 7a19fa1a1434d0cca4ed76fa4cfbff7722e8fd48 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 22 Jan 2025 10:50:44 -0500 Subject: [PATCH] v3.0.0: fixed a typo and an error with phantom piranhas and cleric spell --- core/src/main/assets/messages/actors/actors.properties | 2 +- .../shatteredpixeldungeon/actors/mobs/PhantomPiranha.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 1a0a5e4f0..2f53d077e 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -697,7 +697,7 @@ actors.hero.spells.walloflight.name=wall of light actors.hero.spells.walloflight.short_desc=Creates a wall that blocks enemies. actors.hero.spells.walloflight.desc=The Paladin creates a wall made out of panels of solid light directly in front of themselves which is 1 tile thick, %1$d tiles wide, and lasts for 20 turns.\n\nThis wall acts just like a regular once, except it can be seen through. Enemies that are caught in the wall when its created will be momentarily stunned and pushed back if possible. Anything stuck in the wall will be able to move out of it.\n\nThe wall can be cast in any of the four cardinal or four diagonal directions. If a wall is already active, the spell can be re-used for free to instantly clear the wall. actors.hero.spells.walloflight.early_end=You dispel the wall of light. -actors.hero.spells.walloflight$lightwall.desc=Shimmering panels are light are blocking passage here. +actors.hero.spells.walloflight$lightwall.desc=Shimmering panels of light are blocking passage here. ##main hero actors.hero.hero.name=you diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/PhantomPiranha.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/PhantomPiranha.java index 16d933e94..580915fa4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/PhantomPiranha.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/PhantomPiranha.java @@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corruption; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.ClericSpell; import com.shatteredpixel.shatteredpixeldungeon.items.food.PhantomMeat; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; @@ -49,7 +50,7 @@ public class PhantomPiranha extends Piranha { public void damage(int dmg, Object src) { Char dmgSource = null; if (src instanceof Char) dmgSource = (Char)src; - if (src instanceof Wand) dmgSource = Dungeon.hero; + if (src instanceof Wand || src instanceof ClericSpell) dmgSource = Dungeon.hero; if (dmgSource == null || !Dungeon.level.adjacent(pos, dmgSource.pos)){ dmg = Math.round(dmg/2f); //halve damage taken if we are going to teleport