mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-03-22 23:30:14 +00:00
feat: add Sort Bags button to backpack window
Adds Inventory::sortBags() which collects all items from the backpack and equip bags, sorts them client-side by quality descending → item ID ascending → stack count descending, then writes them back. A "Sort Bags" SmallButton is rendered in the backpack footer with a tooltip explaining the sort order. The sort is purely local (no server packets) since the WoW protocol has no sort-bags opcode; it provides an instant, session-persistent visual reorder.
This commit is contained in:
parent
3e3bbf915e
commit
d99fe8de0f
3 changed files with 66 additions and 10 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#include "game/inventory.hpp"
|
||||
#include "core/logger.hpp"
|
||||
#include <algorithm>
|
||||
|
||||
namespace wowee {
|
||||
namespace game {
|
||||
|
|
@ -185,6 +186,44 @@ bool Inventory::addItem(const ItemDef& item) {
|
|||
return true;
|
||||
}
|
||||
|
||||
void Inventory::sortBags() {
|
||||
// Collect all items from backpack and equip bags into a flat list.
|
||||
std::vector<ItemDef> items;
|
||||
items.reserve(BACKPACK_SLOTS + NUM_BAG_SLOTS * MAX_BAG_SIZE);
|
||||
|
||||
for (int i = 0; i < BACKPACK_SLOTS; ++i) {
|
||||
if (!backpack[i].empty())
|
||||
items.push_back(backpack[i].item);
|
||||
}
|
||||
for (int b = 0; b < NUM_BAG_SLOTS; ++b) {
|
||||
for (int s = 0; s < bags[b].size; ++s) {
|
||||
if (!bags[b].slots[s].empty())
|
||||
items.push_back(bags[b].slots[s].item);
|
||||
}
|
||||
}
|
||||
|
||||
// Sort: quality descending → itemId ascending → stackCount descending.
|
||||
std::stable_sort(items.begin(), items.end(), [](const ItemDef& a, const ItemDef& b) {
|
||||
if (a.quality != b.quality)
|
||||
return static_cast<int>(a.quality) > static_cast<int>(b.quality);
|
||||
if (a.itemId != b.itemId)
|
||||
return a.itemId < b.itemId;
|
||||
return a.stackCount > b.stackCount;
|
||||
});
|
||||
|
||||
// Write sorted items back, filling backpack first then equip bags.
|
||||
int idx = 0;
|
||||
int n = static_cast<int>(items.size());
|
||||
|
||||
for (int i = 0; i < BACKPACK_SLOTS; ++i)
|
||||
backpack[i].item = (idx < n) ? items[idx++] : ItemDef{};
|
||||
|
||||
for (int b = 0; b < NUM_BAG_SLOTS; ++b) {
|
||||
for (int s = 0; s < bags[b].size; ++s)
|
||||
bags[b].slots[s].item = (idx < n) ? items[idx++] : ItemDef{};
|
||||
}
|
||||
}
|
||||
|
||||
void Inventory::populateTestItems() {
|
||||
// Equipment
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1019,7 +1019,7 @@ void InventoryScreen::renderBagWindow(const char* title, bool& isOpen,
|
|||
float contentH = rows * (slotSize + 4.0f) + 10.0f;
|
||||
if (bagIndex < 0) {
|
||||
int keyringRows = (inventory.getKeyringSize() + columns - 1) / columns;
|
||||
contentH += 25.0f; // money display for backpack
|
||||
contentH += 36.0f; // separator + sort button + money display
|
||||
contentH += 30.0f + keyringRows * (slotSize + 4.0f); // keyring header + slots
|
||||
}
|
||||
float gridW = columns * (slotSize + 4.0f) + 30.0f;
|
||||
|
|
@ -1094,16 +1094,29 @@ void InventoryScreen::renderBagWindow(const char* title, bool& isOpen,
|
|||
}
|
||||
}
|
||||
|
||||
// Money display at bottom of backpack
|
||||
if (bagIndex < 0 && moneyCopper > 0) {
|
||||
// Footer for backpack: sort button + money display
|
||||
if (bagIndex < 0) {
|
||||
ImGui::Spacing();
|
||||
uint64_t gold = moneyCopper / 10000;
|
||||
uint64_t silver = (moneyCopper / 100) % 100;
|
||||
uint64_t copper = moneyCopper % 100;
|
||||
ImGui::TextColored(ImVec4(1.0f, 0.84f, 0.0f, 1.0f), "%llug %llus %lluc",
|
||||
static_cast<unsigned long long>(gold),
|
||||
static_cast<unsigned long long>(silver),
|
||||
static_cast<unsigned long long>(copper));
|
||||
ImGui::Separator();
|
||||
|
||||
// Sort Bags button — client-side reorder by quality/type
|
||||
if (ImGui::SmallButton("Sort Bags")) {
|
||||
inventory.sortBags();
|
||||
}
|
||||
if (ImGui::IsItemHovered()) {
|
||||
ImGui::SetTooltip("Sort all bag slots by quality (highest first),\nthen by item ID, then by stack size.");
|
||||
}
|
||||
|
||||
if (moneyCopper > 0) {
|
||||
ImGui::SameLine();
|
||||
uint64_t gold = moneyCopper / 10000;
|
||||
uint64_t silver = (moneyCopper / 100) % 100;
|
||||
uint64_t copper = moneyCopper % 100;
|
||||
ImGui::TextColored(ImVec4(1.0f, 0.84f, 0.0f, 1.0f), "%llug %llus %lluc",
|
||||
static_cast<unsigned long long>(gold),
|
||||
static_cast<unsigned long long>(silver),
|
||||
static_cast<unsigned long long>(copper));
|
||||
}
|
||||
}
|
||||
|
||||
ImGui::End();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue