From 91f31aef9ff8152f7e51f31092c1d21f0c33bfef Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 20 Jan 2018 15:34:38 -0500 Subject: [PATCH] v0.6.3: corrected some minor bugs with some missile weapons --- .../items/weapon/missiles/Boomerang.java | 6 +++--- .../items/weapon/missiles/MissileWeapon.java | 9 ++------- .../items/weapon/missiles/TippedDart.java | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java index 9dcfbae8e..063a8e002 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java @@ -95,8 +95,8 @@ public class Boomerang extends MissileWeapon { } @Override - public void rangedHit( Char enemy ) { - circleBack(enemy.pos, curUser); + public void rangedHit( Char enemy, int cell ) { + circleBack(cell, curUser); } @Override @@ -107,7 +107,7 @@ public class Boomerang extends MissileWeapon { private void circleBack( int from, Hero owner ) { ((MissileSprite)curUser.sprite.parent.recycle( MissileSprite.class )). - reset( from, curUser.pos, curItem, null ); + reset( from, owner.sprite, curItem, null ); if (throwEquiped) { owner.belongings.weapon = this; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index 10cd81fea..4f36cf052 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -82,13 +82,8 @@ abstract public class MissileWeapon extends Weapon { if (!curUser.shoot( enemy, this )) { rangedMiss( cell ); } else { - - //int bonus = RingOfSharpshooting.getBonus(curUser, RingOfSharpshooting.Aim.class); - - //if (curUser.heroClass == HeroClass.HUNTRESS && enemy.buff(PinCushion.class) == null) - // bonus += 3; - rangedHit( enemy ); + rangedHit( enemy, cell ); } } @@ -129,7 +124,7 @@ abstract public class MissileWeapon extends Weapon { return delay; } - protected void rangedHit( Char enemy ){ + protected void rangedHit( Char enemy, int cell ){ //if this weapon was thrown from a source stack, degrade that stack. //unless a weapon is about to break, then break the one being thrown if (parent != null){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/TippedDart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/TippedDart.java index 8a9242fe6..8e582311a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/TippedDart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/TippedDart.java @@ -38,11 +38,11 @@ public abstract class TippedDart extends Dart { } @Override - protected void rangedHit(Char enemy) { + protected void rangedHit(Char enemy, int cell) { if (enemy.isAlive()) Buff.affect(enemy, PinCushion.class).stick(new Dart()); else - Dungeon.level.drop( new Dart(), enemy.pos).sprite.drop(); + Dungeon.level.drop( new Dart(), cell ).sprite.drop(); } @Override