diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 7078c609e..bce0c0639 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -535,7 +535,7 @@ actors.hero.abilities.ratmogrify$transmograt.rankings_desc=Slain by: ratmogrifie ##Cleric Spells actors.hero.spells.guidinglight.name=guiding light actors.hero.spells.guidinglight.prompt=choose a target -actors.hero.spells.guidinglight.desc=The Cleric files a bolt of magical energy which strikes a target, dealing 2-6 damage and illuminating them. The next melee attack made against an illuminated enemy is guaranteed to hit them.\n\nThis spell costs 1 charge. +actors.hero.spells.guidinglight.desc=The Cleric files a bolt of magical energy which strikes a target, dealing 2-6 damage and illuminating them. The next physical attack made against an illuminated enemy is guaranteed to hit them.\n\nThis spell costs 1 charge. actors.hero.spells.holyward.name=holy ward actors.hero.spells.holyward.glyph_name=%s of light @@ -986,8 +986,8 @@ actors.hero.talent.clerict1a.title=fasting actors.hero.talent.clerict1a.desc=_+1:_ The Cleric can cast _???_ at the cost of 1 charge. This spell restores _30 turns of satiety_, grants _3 shielding_, and is cast instantly.\n\n_+2:_ The Cleric can cast _???_ at the cost of 1 charge. This spell restores _50 turns of satiety_, grants _5 shielding_, and is cast instantly. actors.hero.talent.clerict1b.title=detect curse actors.hero.talent.clerict1b.desc=_+1:_ The Cleric can cast _Detect Curse,_ a spell that reveals whether an item is cursed at the cost of _3 charges._\n\n_+2:_ The Cleric can cast _Detect Curse,_ a spell that reveals whether an item is cursed at the cost of _2 charges._ -actors.hero.talent.clerict1c.title=searing light -actors.hero.talent.clerict1c.desc=_+1:_ Attacks on enemies illuminated by _Guiding Light_ deal an extra _+3 magic damage._\n\n_+2:_ Attacks on enemies illuminated by _Guiding Light_ deal an extra _+5 magic damage._ +actors.hero.talent.searing_light.title=searing light +actors.hero.talent.searing_light.desc=_+1:_ Physical attacks on enemies illuminated by _Guiding Light_ deal _+3 damage._\n\n_+2:_ Physical attacks on enemies illuminated by _Guiding Light_ deal _+5 damage._ actors.hero.talent.clerict1d.title=circle of healing actors.hero.talent.clerict1d.desc=_+1:_ The Cleric can cast _Circle of Healing_ at the cost of 2 charges. This spell surrounds the Cleric in a healing aura, restoring 1 HP per turn for _10 turns_ to the Cleric and anything adjacent to them.\n\n_+2:_ The Cleric can cast _Circle of Healing_ at the cost of 2 charges. This spell surrounds the Cleric in a healing aura, restoring 1 HP per turn for _15 turns_ to the Cleric and anything adjacent to them. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java index 11cc55020..1ed3ee2b0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java @@ -43,6 +43,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ScrollEmpower; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.WandEmpower; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.Ratmogrify; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.GuidingLight; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText; @@ -171,7 +172,7 @@ public enum Talent { FEIGNED_RETREAT(151, 4), EXPOSE_WEAKNESS(152, 4), COUNTER_ABILITY(153, 4), //Cleric T1 - CLERICT1A(160), CLERICT1B(161), CLERICT1C(162), CLERICT1D(163), + CLERICT1A(160), CLERICT1B(161), SEARING_LIGHT(162), CLERICT1D(163), //Cleric T2 CLERICT2A(164), CLERICT2B(165), CLERICT2C(166), CLERICT2D(167), CLERICT2E(168), //Cleric T3 @@ -791,6 +792,13 @@ public enum Talent { } } + if (enemy.buff(GuidingLight.GuidingLightDebuff.class) != null){ + enemy.buff(GuidingLight.GuidingLightDebuff.class).detach(); + if (hero.hasTalent(Talent.SEARING_LIGHT)){ + dmg += 1 + 2*hero.pointsInTalent(Talent.SEARING_LIGHT); + } + } + return dmg; } @@ -861,7 +869,7 @@ public enum Talent { Collections.addAll(tierTalents, STRENGTHENING_MEAL, ADVENTURERS_INTUITION, PATIENT_STRIKE, AGGRESSIVE_BARRIER); break; case CLERIC: - Collections.addAll(tierTalents, CLERICT1A, CLERICT1B, CLERICT1C, CLERICT1D); + Collections.addAll(tierTalents, CLERICT1A, CLERICT1B, SEARING_LIGHT, CLERICT1D); break; } for (Talent talent : tierTalents){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index 34675a523..1f4cf367c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -664,11 +664,8 @@ public abstract class Mob extends Char { public int defenseSkill( Char enemy ) { if ( !surprisedBy(enemy) && paralysed == 0 + && buff(GuidingLight.GuidingLightDebuff.class) == null && !(alignment == Alignment.ALLY && enemy == Dungeon.hero)) { - if (buff(GuidingLight.GuidingLightDebuff.class) != null){ - buff(GuidingLight.GuidingLightDebuff.class).detach(); - return 0; - } return this.defenseSkill; } else { return 0;