external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Sort inventory by item type

Browse Source
This commit is contained in:
Chris H
2025-05-08 22:55:39 -04:00
parent d84712b65d
commit 15d49bc1b1
1 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
View File

@@ -286,12 +286,44 @@ public class InventoryScene extends UIScene {
clearSelectable(); clearSelectable();
inventoryButtons.clear(); inventoryButtons.clear();
inventory.clear(); inventory.clear();
Current.player().getItems().sort();
int itemSlotsUsed = 0; int itemSlotsUsed = 0;
// Turn item strings into actual ItemData
// THen sort but these by slot type and name
Array<ItemData> items = new Array<>();
for (int i = 0; i < Current.player().getItems().size; i++) { for (int i = 0; i < Current.player().getItems().size; i++) {
String name = Current.player().getItems().get(i);
ItemData item = ItemData.getItem(name);
if (item == null) {
System.err.print("Can not find item name " + name + "\n");
continue;
}
if (item.sprite() == null) {
System.err.print("Can not find sprite name " + item.iconName + "\n");
continue;
}
items.add(item);
}
items.sort((o1, o2) -> {
if (o1.equipmentSlot == null && o2.equipmentSlot == null) {
return o1.name.compareTo(o2.name);
} else if (o1.equipmentSlot == null) {
return 1;
} else if (o2.equipmentSlot == null) {
return -1;
} else {
int slotCompare = o1.equipmentSlot.compareTo(o2.equipmentSlot);
if (slotCompare != 0) {
return slotCompare;
}
return o1.name.compareTo(o2.name);
}
});
for (int i = 0; i < items.size; i++) {
if (i % columns == 0) if (i % columns == 0)
inventory.row(); inventory.row();
Button newActor = createInventorySlot(); Button newActor = createInventorySlot();
@@ -304,20 +336,13 @@ public class InventoryScene extends UIScene {
} }
}); });
inventoryButtons.add(newActor); inventoryButtons.add(newActor);
ItemData item = ItemData.getItem(Current.player().getItems().get(i));
if (item == null) { ItemData item = items.get(i);
System.err.print("Can not find item name " + Current.player().getItems().get(i) + "\n");
continue;
}
if (item.sprite() == null) {
System.err.print("Can not find sprite name " + item.iconName + "\n");
continue;
}
Image img = new Image(item.sprite()); Image img = new Image(item.sprite());
img.setX((newActor.getWidth() - img.getWidth()) / 2); img.setX((newActor.getWidth() - img.getWidth()) / 2);
img.setY((newActor.getHeight() - img.getHeight()) / 2); img.setY((newActor.getHeight() - img.getHeight()) / 2);
newActor.addActor(img); newActor.addActor(img);
itemLocation.put(newActor, Current.player().getItems().get(i)); itemLocation.put(newActor, item.name);
if (Current.player().getEquippedItems().contains(item.name)) { if (Current.player().getEquippedItems().contains(item.name)) {
Image overlay = new Image(equipOverlay); Image overlay = new Image(equipOverlay);
overlay.setX((newActor.getWidth() - img.getWidth()) / 2); overlay.setX((newActor.getWidth() - img.getWidth()) / 2);