diff --git a/FurCDatabaseQuery.lua b/FurCDatabaseQuery.lua index d4a838c..d1f585c 100644 --- a/FurCDatabaseQuery.lua +++ b/FurCDatabaseQuery.lua @@ -159,10 +159,11 @@ function FurC.GetMiscItemSource(recipeKey, recipeArray, attachItemLink) end local versionFiles = FurC.MiscItemSources[recipeArray.version] - if not versionFiles then return end - local originData = versionFiles[recipeArray.origin] - if nil == originData then return end - return (not attachItemLink and originData[recipeKey]) or string.format("%s: %s", FurC.GetItemLink(recipeKey), originData[recipeKey]) + if not versionFiles or not versionFiles[recipeArray.origin] then return end + local originData = versionFiles[recipeArray.origin][recipeKey] + if not originData then return end + + return (attachItemLink and string.format("%s: %s", FurC.GetItemLink(recipeKey), originData)) or originData end local function getRecipeSource(recipeKey, recipeArray) diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua index db44182..74fedfd 100644 --- a/data/MiscItemSources.lua +++ b/data/MiscItemSources.lua @@ -16,22 +16,13 @@ local scambox_string = GetString(SI_FURC_SCAMBOX) local sinister_hollowjack = "Sinister Hollowjack Items" local itemPackMoonBishop = zo_strformat(GetString(SI_FURC_ITEMSOURCE_ITEMPACK), "Moon Bishop’s Sanctuary") -local itemPackMoonBishop = zo_strformat(GetString(SI_FURC_ITEMSOURCE_ITEMPACK), "Moons-Blessed Oasis") - -local stealable = GetString(SI_FURC_CANBESTOLEN) - -local stealable_scholars = stealable .. " from scholars" -local stealable_nerds = stealable_scholars .. " and mages" -local stealable_priests = stealable .. " from priests and pilgrims" -local stealable_thief = stealable .. " from thieves" -local stealable_woodworkers = stealable .. " from woodworkers" -local stealable_drunkards = stealable .. " from drunkards" +local itemPackOasis = zo_strformat(GetString(SI_FURC_ITEMSOURCE_ITEMPACK), "Moons-Blessed Oasis") local elsewhere = " in Elsweyr" -local fishing_elsewhere = GetString(SI_FURC_CANBEFISHED) .. elsewhere -local drop_elsewhere = GetString(SI_FURC_DROP) .. elsewhere -local stealable_elsewhere = stealable .. elsewhere +local fishing_elsewhere = GetString(SI_FURC_CANBEFISHED) .. elsewhere +local drop_elsewhere = GetString(SI_FURC_DROP) .. elsewhere +local stealable_elsewhere = GetString(SI_FURC_CANBESTOLEN) .. elsewhere local rumourSource = GetString(SI_FURC_RUMOUR_SOURCE_ITEM) local dataminedUnclear = GetString(SI_FURC_DATAMINED_UNCLEAR) @@ -129,12 +120,11 @@ FurC.MiscItemSources[FURC_KITTY] = { }, [FURC_DROP] = { - [121203] = daily_reward , -- Praxis: Khajiit Brazier, Enchanted + [121203] = daily_reward , -- Praxis: Khajiit Brazier, Enchanted }, [FURC_CROWN] = { - [151838] = itemPackOasis, -- Elsweyr Fountain, Moons-Blessed, [151840] = itemPackOasis, -- Plant, Desert Fan, [151841] = itemPackOasis, -- Plant, Tall Desert Fan, diff --git a/data/RecipeSources.lua b/data/RecipeSources.lua index 97d15b0..ca7e098 100644 --- a/data/RecipeSources.lua +++ b/data/RecipeSources.lua @@ -12,23 +12,26 @@ local function colorise(str, col, ret) end local requires = GetString(SI_FURC_REQUIRES_ACHIEVEMENT) -local psijicRank = GetString(SI_FURC_PSIJIC_RANK) +local requiresPsijicRank = string.format("%s %s", requires, GetString(SI_FURC_PSIJIC_RANK)) +local rankFormattingString = requiresPsijicRank .. "%d" -local function rank(aNumber) return requires .. psijicRank .. aNumber end +local function rank(aNumber) return string.format(requiresPsijicRank, aNumber) end + +local vendorString = GetString(SI_FURC_STRING_VENDOR) local function soldBy(vendorName, locationName, price, requirement) return zo_strformat( - GetString(SI_FURC_STRING_VENDOR), - colorise(vendorName, vendorColor, stripColor), - colorise(locationName, vendorColor, stripColor), - colorise(price, goldColor, stripColor), + vendorString, + colorise(vendorName, colorVendor, stripColor), + colorise(locationName, colorVendor, stripColor), + colorise(price, colorGold, stripColor), requirement ) end - -local artaeum = GetString(FURC_AV_ARTAEUM) -local nalirsewen = GetString(FURC_AV_NAL) +local daily_reward_elswhere = GetString(SI_FURC_DAILY_ELSWEYR) +local artaeum = GetString(FURC_AV_ARTAEUM) +local nalirsewen = GetString(FURC_AV_NAL) FurC.RecipeSources = { [139489] = soldBy(nalirsewen, artaeum, 5000, rank(2)), -- Blueprint: Psijic Chair, Arched @@ -43,6 +46,8 @@ FurC.RecipeSources = { [139497] = soldBy(nalirsewen, artaeum, 100000, rank(10)), -- Praxis: Psijic Table, Grand [139492] = soldBy(nalirsewen, artaeum, 20000, rank(5)), -- Praxis: Psijic Table, Scalloped [139494] = soldBy(nalirsewen, artaeum, 20000, rank(7)), -- Praxis: Psijic Table, Six-Fold Symmetry + + [121203] = daily_reward_elswhere, -- Praxis: Khajiit Brazier, Enchanted } diff --git a/package.manifest b/package.manifest index 363ec88..0dfc770 100644 --- a/package.manifest +++ b/package.manifest @@ -1,3 +1,10 @@ FurnitureCatalogue_Export/FurnitureCatalogue_Export.txt FurnitureCatalogue_Export/FurCDataExport_Menu.lua -FurnitureCatalogue_Export/FurCDataExport.lua \ No newline at end of file +FurnitureCatalogue_Export/FurCDataExport.lua +FurnitureCatalogue_Export/FurCDataExport.lua + +FurnitureCatalogue_DevUtility/FurnitureCatalogue_DevUtility.txt +FurnitureCatalogue_DevUtility/ContextMenu.lua +FurnitureCatalogue_DevUtility/Bindings.lua +FurnitureCatalogue_DevUtility/00_startup.lua +