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

v0.8.2c: bags now try to grab new items when an item leaves them

Browse Source
This commit is contained in:
Evan Debenham 2020-08-22 20:20:39 -04:00
parent 0608a5447d
commit 39c5da6061
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -270,6 +270,7 @@ public class Item implements Bundlable {
if (item == this) {
container.items.remove(this);
item.onDetach();
container.grabItems(); //try to put more items into the bag as it now has free space
return this;
} else if (item instanceof Bag) {
Bag bag = (Bag)item;

34
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
View File

@ -69,18 +69,7 @@ public class Bag extends Item implements Iterable<Item> {
@Override
public boolean collect( Bag container ) {
for (Item item : container.items.toArray( new Item[0] )) {
if (canHold( item )) {
int slot = Dungeon.quickslot.getSlot(item);
item.detachAll(container);
if (!item.collect(this)) {
item.collect(container);
}
if (slot != -1) {
Dungeon.quickslot.setSlot(slot, item);
}
}
}
grabItems(container);
if (super.collect( container )) {
@ -102,6 +91,27 @@ public class Bag extends Item implements Iterable<Item> {
updateQuickslot();
}
public void grabItems(){
if (this != Dungeon.hero.belongings.backpack) {
grabItems(Dungeon.hero.belongings.backpack);
}
}
public void grabItems( Bag container ){
for (Item item : container.items.toArray( new Item[0] )) {
if (canHold( item )) {
int slot = Dungeon.quickslot.getSlot(item);
item.detachAll(container);
if (!item.collect(this)) {
item.collect(container);
}
if (slot != -1) {
Dungeon.quickslot.setSlot(slot, item);
}
}
}
}
@Override
public boolean isUpgradable() {
return false;