From d78a9b567c7f2ad97b6789811b345f5076e3a7e6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 14 Dec 2020 20:57:36 -0500 Subject: [PATCH] v0.9.1a: fixed errors with previous autotargeting changes --- .../items/wands/WandOfDisintegration.java | 6 ++++++ .../shatteredpixeldungeon/ui/QuickSlotButton.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java index e2e1178f0..7c9c7ea89 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java @@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Web; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.effects.Beam; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; @@ -56,6 +57,11 @@ public class WandOfDisintegration extends DamageWand { return 8+4*lvl; } + @Override + public int targetingPos(Hero user, int dst) { + return dst; + } + @Override protected void onZap( Ballistica beam ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java index 231103b0c..40424c727 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java @@ -244,7 +244,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener { PathFinder.buildDistanceMap( target.pos, BArray.not( new boolean[Dungeon.level.length()], null ), 2 ); for (int i = 0; i < PathFinder.distance.length; i++) { if (PathFinder.distance[i] < Integer.MAX_VALUE - && item.throwPos(Dungeon.hero, i) == target.pos) + && item.targetingPos(Dungeon.hero, i) == target.pos) return i; }