From e9421f0e439c5fd2e7b8ac0a20580bd71d68b35d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 13 Feb 2016 16:56:03 -0500 Subject: [PATCH] v0.3.4a: boomerang can be equipped as a melee weapon again --- .../items/weapon/missiles/Boomerang.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java index dd862aec5..9c2fd498a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java @@ -29,6 +29,8 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite; +import java.util.ArrayList; + public class Boomerang extends MissileWeapon { { @@ -42,6 +44,13 @@ public class Boomerang extends MissileWeapon { bones = false; } + @Override + public ArrayList actions(Hero hero) { + ArrayList actions = super.actions( hero ); + if (!isEquipped(hero)) actions.add(AC_EQUIP); + return actions; + } + @Override public int min() { return 1 + level();