v0.9.1: improved quickslot targeting logic in edge cases

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java

@@ -509,6 +509,10 @@ public class Item implements Bundlable {
 		}
 	}
 
+	public int targetingPos( Hero user, int dst ){
+		return throwPos( user, dst );
+	}
+
 	public int throwPos( Hero user, int dst){
 		return new Ballistica( user.pos, dst, Ballistica.PROJECTILE ).collisionPos;
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java

@@ -106,8 +106,13 @@ public abstract class Wand extends Item {
 			
 		}
 	}
-	
+
-	protected abstract void onZap( Ballistica attack );
+	@Override
+	public int targetingPos(Hero user, int dst) {
+		return new Ballistica( user.pos, dst, collisionProperties ).collisionPos;
+	}
+
+	protected abstract void onZap(Ballistica attack );
 
 	public abstract void onHit( MagesStaff staff, Char attacker, Char defender, int damage);
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java

@@ -143,6 +143,11 @@ public class SpiritBow extends Weapon {
 				+ 2*RingOfSharpshooting.levelDamageBonus(Dungeon.hero)
 				+ (curseInfusionBonus ? 2 : 0);
 	}
+
+	@Override
+	public int targetingPos(Hero user, int dst) {
+		return knockArrow().targetingPos(user, dst);
+	}
 	
 	private int targetPos;
 	
@@ -255,7 +260,7 @@ public class SpiritBow extends Weapon {
 		public int STRReq(int lvl) {
 			return SpiritBow.this.STRReq(lvl);
 		}
-		
+
 		@Override
 		protected void onThrow( int cell ) {
 			Char enemy = Actor.findChar( cell );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java

@@ -233,7 +233,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 	public static int autoAim(Char target, Item item){
 
 		//first try to directly target
-		if (item.throwPos(Dungeon.hero, target.pos) == target.pos) {
+		if (item.targetingPos(Dungeon.hero, target.pos) == target.pos) {
 			return target.pos;
 		}