diff --git a/FurnitureCatalogue/FurCDatabaseQuery.lua b/FurnitureCatalogue/FurCDatabaseQuery.lua index d83be25..8e87d7a 100644 --- a/FurnitureCatalogue/FurCDatabaseQuery.lua +++ b/FurnitureCatalogue/FurCDatabaseQuery.lua @@ -7,7 +7,6 @@ local tvColor = "5EA4FF" local voucherColor = "82BCFF" local p = FurC.DebugOut -- debug function calling zo_strformat with up to 10 args - local function colorise(str, col, ret) str = tostring(str) if str:find("%d000$") then str = str:gsub("000$", "k") end @@ -158,9 +157,14 @@ end local function getRecipeSource(recipeKey, recipeArray) if nil == recipeKey and nil == recipeArray then return end if nil == FurC.RecipeSources then return end - return FurC.RecipeSources[recipeKey] + recipeArray = recipeArray or FurC.Find(recipeKey) + + recipeKey = recipeArray.blueprint or recipeKey + + return FurC.getRumourSource(recipeKey, recipeArray) or FurC.RecipeSources[recipeKey] end FurC.getRecipeSource = getRecipeSource + function FurC.getRumourSource(recipeKey, recipeArray) return (recipeArray.blueprint and GetString(SI_FURC_RUMOUR_SOURCE_RECIPE)) or GetString(SI_FURC_RUMOUR_SOURCE_ITEM) end diff --git a/FurnitureCatalogue/data/EventItems.lua b/FurnitureCatalogue/data/EventItems.lua index d8fbe8b..8f4a094 100644 --- a/FurnitureCatalogue/data/EventItems.lua +++ b/FurnitureCatalogue/data/EventItems.lua @@ -15,20 +15,20 @@ FurC.EventItems[FURC_REACH] = { ]] ["Witches' Festival"] = { ["Plunder Skull"] = { - [130326] = true, --Witches Brazier, Primitive Log", - [130337] = true, --Witches Corpse, Wrapped", - [130336] = true, --Witches Remains, Hagraven", - [130325] = true, --Witches Totem, Emphatic Warning", - [130334] = true, --Witches Totem, Antler Charms", - [130327] = true, --Witches Totem, Wooden Rack", - [130328] = true, --Witches Skull, Horned Ram", - [130332] = true, --Witches Totem, Bone Charms", - [130340] = true, --Witches Totem, Gnarled Vines and Skull", - [130339] = true, --Witches Totem, Twisted Vines and Skull - [130338] = true, --Witches Bones, Offering", - [131434] = true, -- Witch's Festival, Cursed Totem, - [132154] = true, -- Witch's Totem, Bog", - [130302] = true, -- Shrub, Burnt Brush" + [130326] = true, -- Witches Brazier, Primitive Log", + [130337] = true, -- Witches Corpse, Wrapped", + [130336] = true, -- Witches Remains, Hagraven", + [130325] = true, -- Witches Totem, Emphatic Warning", + [130334] = true, -- Witches Totem, Antler Charms", + [130327] = true, -- Witches Totem, Wooden Rack", + [130328] = true, -- Witches Skull, Horned Ram", + [130332] = true, -- Witches Totem, Bone Charms", + [130340] = true, -- Witches Totem, Gnarled Vines and Skull", + [130339] = true, -- Witches Totem, Twisted Vines and Skull + [130338] = true, -- Witches Bones, Offering", + [131434] = true, -- Witch's Festival, Cursed Totem, + [132154] = true, -- Witch's Totem, Bog", + [130302] = true, -- Shrub, Burnt Brush" [130298] = true, -- Branch, Curved Laurel [130296] = true, -- Branch, Sturdy Laurel [130295] = true, -- Branch, Sturdy Burnt