diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 36436e12c..10bfacf7b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -646,7 +646,7 @@ public class Item implements Bundlable { Char enemy = Actor.findChar( cell ); QuickSlotButton.target(enemy); - final float delay = castDelay(user, dst); + final float delay = castDelay(user, cell); if (enemy != null) { ((MissileSprite) user.sprite.parent.recycle(MissileSprite.class)). @@ -694,7 +694,7 @@ public class Item implements Bundlable { } } - public float castDelay( Char user, int dst ){ + public float castDelay( Char user, int cell ){ return TIME_TO_THROW; } 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 571d83402..0fb411b50 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 @@ -387,7 +387,7 @@ public class SpiritBow extends Weapon { user.buff(Talent.LethalMomentumTracker.class).detach(); user.next(); } else { - user.spendAndNext(castDelay(user, dst)); + user.spendAndNext(castDelay(user, cell)); } sniperSpecial = false; flurryCount = -1; @@ -442,7 +442,7 @@ public class SpiritBow extends Weapon { user.buff(Talent.LethalMomentumTracker.class).detach(); user.next(); } else { - user.spendAndNext(castDelay(user, dst)); + user.spendAndNext(castDelay(user, cell)); } sniperSpecial = false; flurryCount = -1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java index 471bdc688..c9485d9f7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java @@ -59,12 +59,12 @@ public class ForceCube extends MissileWeapon { } @Override - public float castDelay(Char user, int dst) { + public float castDelay(Char user, int cell) { //special rules as throwing this onto empty space or yourself does trigger it - if (!Dungeon.level.pit[dst] && Actor.findChar(dst) == null){ + if (!Dungeon.level.pit[cell] && Actor.findChar(cell) == null){ return delayFactor( user ); } else { - return super.castDelay(user, dst); + return super.castDelay(user, cell); } } 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 13e3a4888..ba0b9f64f 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 @@ -391,12 +391,11 @@ abstract public class MissileWeapon extends Weapon { } @Override - public float castDelay(Char user, int dst) { - if (Actor.findChar(dst) != null && Actor.findChar(dst) != user){ - //TODO force cube + public float castDelay(Char user, int cell) { + if (Actor.findChar(cell) != null && Actor.findChar(cell) != user){ return delayFactor( user ); } else { - return super.castDelay(user, dst); + return super.castDelay(user, cell); } }