From 417ac5ccccdd44ebee2063aa6a271b11d57da143 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 23 Feb 2025 14:56:02 -0500 Subject: [PATCH] v3.0.0: metamorphed cleric talents can no longer affect allies --- .../shatteredpixeldungeon/items/artifacts/Artifact.java | 6 ++++-- .../shatteredpixeldungeon/items/wands/Wand.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java index cc5c8fcf9..49661e55b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java @@ -153,14 +153,16 @@ public class Artifact extends KindofMisc { target.damage(Dungeon.hero.lvl, GuidingLight.INSTANCE); } - if (Dungeon.hero.heroClass != HeroClass.CLERIC + if (target.alignment != Char.Alignment.ALLY + && Dungeon.hero.heroClass != HeroClass.CLERIC && Dungeon.hero.hasTalent(Talent.SEARING_LIGHT) && Dungeon.hero.buff(Talent.SearingLightCooldown.class) == null){ Buff.affect(target, GuidingLight.Illuminated.class); Buff.affect(Dungeon.hero, Talent.SearingLightCooldown.class, 20f); } - if (Dungeon.hero.heroClass != HeroClass.CLERIC + if (target.alignment != Char.Alignment.ALLY + && Dungeon.hero.heroClass != HeroClass.CLERIC && Dungeon.hero.hasTalent(Talent.SUNRAY)){ // 15/25% chance if (Random.Int(20) < 1 + 2*Dungeon.hero.pointsInTalent(Talent.SUNRAY)){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index ed0e887f4..67da7638b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -224,14 +224,16 @@ public abstract class Wand extends Item { target.damage(Dungeon.hero.lvl, GuidingLight.INSTANCE); } - if (Dungeon.hero.heroClass != HeroClass.CLERIC + if (target.alignment != Char.Alignment.ALLY + && Dungeon.hero.heroClass != HeroClass.CLERIC && Dungeon.hero.hasTalent(Talent.SEARING_LIGHT) && Dungeon.hero.buff(Talent.SearingLightCooldown.class) == null){ Buff.affect(target, GuidingLight.Illuminated.class); Buff.affect(Dungeon.hero, Talent.SearingLightCooldown.class, 20f); } - if (Dungeon.hero.heroClass != HeroClass.CLERIC + if (target.alignment != Char.Alignment.ALLY + && Dungeon.hero.heroClass != HeroClass.CLERIC && Dungeon.hero.hasTalent(Talent.SUNRAY)){ // 15/25% chance if (Random.Int(20) < 1 + 2*Dungeon.hero.pointsInTalent(Talent.SUNRAY)){