From ff5cb26a92a7ee4c6ec407ca6279f397736eaa93 Mon Sep 17 00:00:00 2001 From: ErodeesFleurs <862959461@qq.com> Date: Tue, 11 Feb 2025 00:46:30 +0800 Subject: Fix bug. --- source/game/StarItemDatabase.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/game/StarItemDatabase.cpp') diff --git a/source/game/StarItemDatabase.cpp b/source/game/StarItemDatabase.cpp index 30e8c5e..dc0238f 100644 --- a/source/game/StarItemDatabase.cpp +++ b/source/game/StarItemDatabase.cpp @@ -214,8 +214,11 @@ ItemDatabase::ItemConfig ItemDatabase::itemConfig(String const& itemName, Json p } Maybe ItemDatabase::itemFile(String const& itemName) const { + if (!hasItem(itemName)) { + return {} + } auto const& data = itemData(itemName); - return itemData(itemName).assetsConfig; + return data->directory + "/" + data->filename; } ItemPtr ItemDatabase::itemShared(ItemDescriptor descriptor, Maybe level, Maybe seed) const { @@ -568,6 +571,7 @@ void ItemDatabase::addItemSet(ItemType type, String const& extension) { data.itemTags = config.opt("itemTags").apply(jsonToStringSet).value(); data.agingScripts = config.opt("itemAgingScripts").apply(jsonToStringList).value(); data.directory = AssetPath::directory(file); + data.filename = AssetPath::filename(file); data.agingScripts = data.agingScripts.transformed(bind(&AssetPath::relativeTo, data.directory, _1)); } catch (std::exception const& e) { @@ -591,6 +595,7 @@ void ItemDatabase::addObjectDropItem(String const& objectPath, Json const& objec data.itemTags = objectConfig.opt("itemTags").apply(jsonToStringSet).value(); data.agingScripts = objectConfig.opt("itemAgingScripts").apply(jsonToStringList).value(); data.directory = AssetPath::directory(objectPath); + data.filename = AssetPath::filename(objectPath); JsonObject customConfig = objectConfig.toObject(); if (!customConfig.contains("inventoryIcon")) { customConfig["inventoryIcon"] = assets->json("/objects/defaultParameters.config:missingIcon"); -- cgit v1.2.3