evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

items can now override inventory filters

Browse Source
This commit is contained in:
Kae 2024-12-26 20:12:15 +11:00
parent 6a1ea4aa30
commit 5de1e6cbc9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/game/StarPlayerInventory.cpp
View File

@ -943,11 +943,24 @@ void PlayerInventory::cleanup() {
} }
bool PlayerInventory::checkInventoryFilter(ItemPtr const& items, String const& filterName) { bool PlayerInventory::checkInventoryFilter(ItemPtr const& items, String const& filterName) {
auto config = Root::singleton().assets()->json("/player.config:inventoryFilters"); Json filterConfig;
auto itemFilters = items->instanceValue("inventoryFilters");
if (itemFilters.isType(Json::Type::Object)) {
filterConfig = itemFilters.get(filterName);
if (!filterConfig.isType(Json::Type::Object))
filterConfig = itemFilters.get("default");
}
if (!filterConfig.isType(Json::Type::Object)) {
auto config = Root::singleton().assets()->json("/player.config:inventoryFilters");
filterConfig = config.get(filterName);
if (!filterConfig.isType(Json::Type::Object))
filterConfig = config.get("default");
}
// filter by item type if an itemTypes filter is set // filter by item type if an itemTypes filter is set
auto itemDatabase = Root::singleton().itemDatabase(); auto itemDatabase = Root::singleton().itemDatabase();
auto filterConfig = config.get(filterName);
auto itemTypeName = ItemTypeNames.getRight(itemDatabase->itemType(items->name())); auto itemTypeName = ItemTypeNames.getRight(itemDatabase->itemType(items->name()));
if (filterConfig.contains("typeWhitelist") && !filterConfig.getArray("typeWhitelist").contains(itemTypeName)) if (filterConfig.contains("typeWhitelist") && !filterConfig.getArray("typeWhitelist").contains(itemTypeName))
return false; return false;