LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3f: fixed yet more quickslot issues, this should be all of them.

Browse Source
This commit is contained in:
Evan Debenham 2015-01-26 02:11:39 -05:00
parent d0e6aa6c1f
commit 944d2d33a2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -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);
}

4
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
View File

@ -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();