From a6b54900506cfec5bdec53124bc5eed3c7b65d11 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 21 May 2021 14:09:34 -0400 Subject: [PATCH] v0.9.3: fixed nature's power triggering with sniper specials --- core/src/main/assets/messages/actors/actors.properties | 2 +- .../shatteredpixeldungeon/items/weapon/SpiritBow.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 6c2a024b0..ed9872945 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -390,7 +390,7 @@ actors.hero.abilities.huntress.naturespower.name=nature's power actors.hero.abilities.huntress.naturespower$naturespowertracker.name=nature's power actors.hero.abilities.huntress.naturespower$naturespowertracker.desc=The Huntress is briefly empowered, increasing her movement speed and attack speed with her bow.\n\nTurns Left: %s. actors.hero.abilities.huntress.naturespower.short_desc=The Huntress calls upon _Nature's Power_, increasing her movement speed and her bow's rate of fire for a short time. -actors.hero.abilities.huntress.naturespower.desc=The Huntress temporarily empowers herself and her bow with the power of nature! This lasts for 8 turns.\n\nDuring this time, the huntress moves at 2x speed, and attacks 33% faster with her bow.\n\nThis ability costs 35 charge. +actors.hero.abilities.huntress.naturespower.desc=The Huntress temporarily empowers herself and her bow with the power of nature! This lasts for 8 turns.\n\nDuring this time, the huntress moves at 2x speed, and attacks 33% faster with her bow. The bonus bow effects do not trigger if the sniper is using her special attacks.\n\nThis ability costs 35 charge. actors.hero.abilities.huntress.spirithawk.name=spirit hawk actors.hero.abilities.huntress.spirithawk.short_desc=The Huntress summons a _Spirit Hawk_ familiar, which can help her scout locations and distract enemies. actors.hero.abilities.huntress.spirithawk.desc=TODO diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java index b399b997a..b6f75628f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java @@ -101,7 +101,7 @@ public class SpiritBow extends Weapon { @Override public int proc(Char attacker, Char defender, int damage) { - if (attacker.buff(NaturesPower.naturesPowerTracker.class) != null){ + if (attacker.buff(NaturesPower.naturesPowerTracker.class) != null && !sniperSpecial){ Actor.add(new Actor() { { @@ -291,7 +291,7 @@ public class SpiritBow extends Weapon { @Override public Emitter emitter() { - if (Dungeon.hero.buff(NaturesPower.naturesPowerTracker.class) != null){ + if (Dungeon.hero.buff(NaturesPower.naturesPowerTracker.class) != null && !sniperSpecial){ Emitter e = new Emitter(); e.pos(5, 5); e.fillTarget = false;