diff --git a/core/src/main/assets/interfaces/buffs.png b/core/src/main/assets/interfaces/buffs.png index 9deb4d3b0..5b5084448 100644 Binary files a/core/src/main/assets/interfaces/buffs.png and b/core/src/main/assets/interfaces/buffs.png differ diff --git a/core/src/main/assets/interfaces/large_buffs.png b/core/src/main/assets/interfaces/large_buffs.png index 0a9003d2d..49c96da62 100644 Binary files a/core/src/main/assets/interfaces/large_buffs.png and b/core/src/main/assets/interfaces/large_buffs.png differ diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index d8edbf88b..09c672959 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -609,6 +609,9 @@ actors.hero.spells.guidinglight.desc=The Cleric fires a bolt of magical energy w actors.hero.spells.guidinglight.desc_priest=_This spell is more powerful when cast by the Priest._ The first cast of the spell every 100 turns costs no tome charges, and illumination can be triggered by wands, other characters, and artifacts that directly affect enemies. When triggered in this way, illuminated deals bonus magic damage equal to the Priest's level. actors.hero.spells.guidinglight$guidinglightpriestcooldown.name=Guiding Light actors.hero.spells.guidinglight$guidinglightpriestcooldown.desc=The Priest will be able to cast Guiding Light for free again after 100 turns elapse.\n\nTurns remaining: %s. +actors.hero.spells.guidinglight$illuminated.name=Illuminated +actors.hero.spells.guidinglight$illuminated.desc=This character is glowing as a result of being struck by guiding light. While the glow isn't strong enough to brighten the surrounding area, the magical effect will make landing blows on them much easier for the Cleric. +actors.hero.spells.guidinglight$illuminated.desc_priest=The Priest can additionally trigger illuminated with a wand zap, strike from an ally, or effects from some artifacts. Triggering illuminated in this way will deal bonus damage. actors.hero.spells.hallowedground.name=hallowed ground actors.hero.spells.hallowedground.prompt=Choose a location diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/GuidingLight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/GuidingLight.java index bab80e999..91794c966 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/GuidingLight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/GuidingLight.java @@ -119,12 +119,12 @@ public class GuidingLight extends TargetedClericSpell { @Override public int icon() { - return BuffIndicator.TIME; + return BuffIndicator.ILLUMINATED; } @Override public void tintIcon(Image icon) { - icon.hardlight(0.67f, 0.67f, 0); + icon.brightness(0.5f); } public float iconFadePercent() { return Math.max(0, visualcooldown() / 100); } @@ -137,11 +137,27 @@ public class GuidingLight extends TargetedClericSpell { type = buffType.NEGATIVE; } + @Override + public int icon() { + return BuffIndicator.ILLUMINATED; + } + @Override public void fx(boolean on) { if (on) target.sprite.add(CharSprite.State.ILLUMINATED); else target.sprite.remove(CharSprite.State.ILLUMINATED); } + + @Override + public String desc() { + String desc = super.desc(); + + if (Dungeon.hero.subClass == HeroSubClass.PRIEST){ + desc += "\n\n" + Messages.get(this, "desc_priest"); + } + + return desc; + } } public static class WasIlluminatedTracker extends Buff {} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index 67ad57419..63982801c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -130,6 +130,7 @@ public class BuffIndicator extends Component { public static final int GLYPH_RECALL= 78; public static final int ASCEND = 79; public static final int PROT_AURA = 80; + public static final int ILLUMINATED = 81; public static final int SIZE_SMALL = 7; public static final int SIZE_LARGE = 16;