From 944d2d33a231fab994ddbf59746bbaf12823f88e Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 26 Jan 2015 02:11:39 -0500
Subject: [PATCH] v0.2.3f: fixed yet more quickslot issues, this should be all
of them.
---
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java | 4 ++--
.../items/weapon/missiles/Boomerang.java | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
index f9de9002e..170aaa913 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
@@ -179,7 +179,7 @@ public class Item implements Bundlable {
}
items.add( this );
- Dungeon.quickslot.replaceSimilar(this);
+ if (stackable || this instanceof Boomerang) Dungeon.quickslot.replaceSimilar(this);
updateQuickslot();
Collections.sort( items, itemComparator );
return true;
@@ -205,7 +205,7 @@ public class Item implements Bundlable {
} else
if (quantity == 1) {
- if (stackable == true || this instanceof Boomerang){
+ if (stackable || this instanceof Boomerang){
Dungeon.quickslot.convertToPlaceholder(this);
}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
index 1729e339f..02135f995 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
@@ -36,7 +36,7 @@ public class Boomerang extends MissileWeapon {
MIN = 1;
MAX = 4;
-
+
stackable = false;
bones = false;
@@ -100,6 +100,8 @@ public class Boomerang extends MissileWeapon {
if (throwEquiped) {
owner.belongings.weapon = this;
owner.spend( -TIME_TO_EQUIP );
+ Dungeon.quickslot.replaceSimilar(this);
+ updateQuickslot();
} else
if (!collect( curUser.belongings.backpack )) {
Dungeon.level.drop( this, owner.pos ).sprite.drop();