diff --git a/FurCData.lua b/FurCData.lua index b8ed9a0..34d425e 100644 --- a/FurCData.lua +++ b/FurCData.lua @@ -462,12 +462,12 @@ local function scanFromFiles(shouldScanCharacter) FurC.IsLoading(true) task:Call(scanMiscItemFile) - :Then(scanRumourRecipes) :Then(scanRecipeFile) :Then(scanVendorFiles) :Then(scanRolis) :Then(scanFestivalFiles) :Then(scanCharacterOrMaybeNot) + :Then(scanRumourRecipes) :Then(FurC.UpdateGui) startupMessage(GetString(SI_FURC_VERBOSE_DB_UPTODATE)) diff --git a/FurCMenu.lua b/FurCMenu.lua index b5ff477..9bc0b99 100644 --- a/FurCMenu.lua +++ b/FurCMenu.lua @@ -328,31 +328,6 @@ function FurC.CreateSettings(savedVars, defaults) getFunc = function() return FurC.GetHideCrownStoreItems() end, setFunc = function(value) FurC.SetHideCrownStoreItems(value) end }, - --[[ - { -- header: rumour recipes - type = "header", - name = GetString(SI_FURC_STRING_MENU_HIDE_MENU), - }, - { -- checkbox: Hide doubtful recipes - type = "description", - name = GetString(SI_FURC_STRING_MENU_HIDE_MENU), - text = GetString(SI_FURC_STRING_MENU_HIDE_MENU_TT), - }, - { -- checkbox: Hide rumour recipes menu entry - type = "checkbox", - name = GetString(SI_FURC_STRING_MENU_HIDE_MENU_RUMOUR), - warning = GetString(SI_FURC_STRING_MENU_HIDE_MENU_TT), - getFunc = function() return FurC.GetHideRumourRecipesEntry() end, - setFunc = function(value) FurC.SetHideRumourRecipesEntry(value) end - }, - { -- checkbox: Hide doubtful recipes - type = "checkbox", - name = GetString(SI_FURC_STRING_MENU_HIDE_MENU_CROWN), - warning = GetString(SI_FURC_STRING_MENU_HIDE_MENU_TT), - getFunc = function() return FurC.GetHideCrownStoreEntry() end, - setFunc = function(value) FurC.SetHideCrownStoreEntry(value) end - }, - ]] }, }, diff --git a/FurCSettingsAdapter.lua b/FurCSettingsAdapter.lua index f4fdb8c..60af629 100644 --- a/FurCSettingsAdapter.lua +++ b/FurCSettingsAdapter.lua @@ -1,14 +1,6 @@ local task = LibStub("LibAsync"):Create("FurnitureCatalogue_Settings") - local p = FurC.DebugOut -- debug function calling zo_strformat with up to 10 args -function FurC.GetDontScanTradingHouse() - return FurC.settings["dontScanTradingHouse"] -end -function FurC.SetDontScanTradingHouse(value) - FurC.settings["dontScanTradingHouse"] = value -end - function FurC.GetEnableDebug() return FurC.settings["enableDebug"] end @@ -31,23 +23,6 @@ function FurC.SetHideCrownStoreItems(value) FurC.updateDropdownData() FurC.UpdateGui() end -function FurC.GetHideRumourRecipesEntry() - return FurC.settings["hideRumourEntry"] -end -function FurC.SetHideRumourRecipesEntry(value) - FurC.settings["hideRumourEntry"] = value - FurC.updateDropdownData() - FurC.UpdateGui() -end -function FurC.GetHideCrownStoreEntry() - return FurC.settings["hideCrownStoreEntry"] -end -function FurC.SetHideCrownStoreEntry(value) - FurC.settings["hideCrownStoreEntry"] = value - FurC.updateDropdownData() - FurC.UpdateGui() -end - function FurC.GetFilterAllOnText() return FurC.settings["filterAllOnText"] diff --git a/FurCTooltip.lua b/FurCTooltip.lua index 544a864..c7acbb0 100644 --- a/FurCTooltip.lua +++ b/FurCTooltip.lua @@ -8,24 +8,6 @@ local function tryColorize(text) return text:gsub("cannot craft", "|cFF0000cannot craft|r"):gsub("Can be crafted", "|c00FF00Can be crafted|r") end -local defaultDebugString = "[<<1>>] = <<2>>, -- <<3>>" -local function tryCreateDebugOutput(itemId, itemLink) - if not (FurC.DevDebug and FurCGui:IsHidden()) then return end - itemId = itemId or FurC.GetItemId(itemLink) - local price = 0 - local control = moc() - local debugString = defaultDebugString - if control and control.dataEntry then - local data = control.dataEntry.data or {} - if 0 == data.currencyQuantity1 then - price = data.stackBuyPrice - debugString = "[<<1>>] = { -- <<3>>\n\titemPrice = <<2>>,\n\t--achievement = 0, \n}," - else - price = data.currencyQuantity1 - end - end - d(zo_strformat(debugString, itemId, price, GetItemLinkName(itemLink))) -end local function addTooltipData(control, itemLink) @@ -34,8 +16,6 @@ local function addTooltipData(control, itemLink) if nil == itemLink or FURC_EMPTY_STRING == itemLink then return end local isRecipe = IsItemLinkFurnitureRecipe(itemLink) - -- tryCreateDebugOutput(itemId, itemLink) - itemLink = (isRecipe and GetItemLinkRecipeResultItemLink(itemLink)) or itemLink if not (isRecipe or IsItemLinkPlaceableFurniture(itemLink)) then return end diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt index a69da23..41f8a83 100644 --- a/FurnitureCatalogue.txt +++ b/FurnitureCatalogue.txt @@ -1,6 +1,6 @@ ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.5.14 +## Version: 2.5.15 ## APIVersion: 100023 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat diff --git a/data/02_Morrowind/M_LuxuryFurnisher.lua b/data/02_Morrowind/M_LuxuryFurnisher.lua index 2e10253..6fdaae7 100644 --- a/data/02_Morrowind/M_LuxuryFurnisher.lua +++ b/data/02_Morrowind/M_LuxuryFurnisher.lua @@ -20,24 +20,6 @@ FurC.LuxuryFurnisher[FURC_MORROWIND] = { itemDate = "2017-08-11", }, - -- August 5+6 - [126611] = { -- Vvardenfell Anemone, Sprout - itemPrice = 5417, - itemDate = "2017-08-04", - }, - [126612] = { -- Vvardenfell Anemone, Strong - itemPrice = 27084, - itemDate = "2017-08-04", - }, - [126610] = { -- Vvardenfell Coral Plant, - itemPrice = 10834, - itemDate = "2017-08-04", - }, - [126591] = { -- Vvardenfell Coral Plant, Young - itemPrice = 5417, - itemDate = "2017-08-04", - }, - diff --git a/data/100023.lua b/data/100023.lua deleted file mode 100644 index b0ee8a6..0000000 --- a/data/100023.lua +++ /dev/null @@ -1,48 +0,0 @@ -local function getCrownStorePriceString(price) - return string.format("%s (%u)", GetString(SI_FURC_CROWNSTORESOURCE), price) -end - -FurC.MiscItemSources[FURC_ALTMER] = FurC.MiscItemSources[FURC_ALTMER] or {} -FurC.MiscItemSources[FURC_ALTMER][FURC_RUMOUR] = { - - [139093] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Dwarven Centurion Hammer, Detached - - [139095] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Daedric Drinking Bowl, Ritual - [139096] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Daedric Urn, Sealed - - [139098] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Darkshade Glowstalks, Inquisitive - [139099] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Dark Elf Brazier, Ancestral Tomb - [139100] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Dark Elf Ash Garden, Familial - - [139101] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Blue Crystal Cluster, Large - [139102] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Blue Crystal Spire, Large - - [139103] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Craglorn Display Case, Sealed - [139104] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Craglorn Relief, Serpent - - [139105] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Reach Grinding Stones, Nirncrux - [139106] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Reach Briarheart, Corpse Blue - - [139137] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tapestry, Nocturnal - [139138] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner, Nocturnal - [139139] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Nocturnal, Mistress of Shadows - - [139147] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plants, Scarlet Sawleaf - [139149] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plant, Scarlet Fleshfrond - - [139351] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Monument, Marble - - [139366] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Fountain, Regal - [139367] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Regal Sauna Pool, Two Person - - [139369] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Abyssal Pearl, Sealed - -} - -FurC.EventItems[FURC_ALTMER] = {} - - -FurC.Books[FURC_ALTMER] = {} - - - diff --git a/data/100024.lua b/data/100024.lua new file mode 100644 index 0000000..af93d32 --- /dev/null +++ b/data/100024.lua @@ -0,0 +1,93 @@ +local function getCrownStorePriceString(price) + return string.format("%s (%u)", GetString(SI_FURC_CROWNSTORESOURCE), price) +end + +FurC.MiscItemSources[FURC_WEREWOLF] = FurC.MiscItemSources[FURC_WEREWOLF] or {} +FurC.MiscItemSources[FURC_WEREWOLF][FURC_RUMOUR] = { + [141824] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Vines, Sun-Bronzed Ivy Cluster", + [141825] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Relic Vault, Impenetrable", + [141826] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Bed, Levitating", + [141827] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Bookshelf, Grand Full", + [141828] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Gaming Table, Punctilious Conflict", + [141829] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Artist's Palette, Pigment", + [141830] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Grape Stomping Tub", + [141831] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Figurine, The Dragon's Glare", + [141832] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree, Robust Fig", + [141833] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree, Ancient Fig", + [141834] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree, Towering Fig", + [141835] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree, Whorled Fig", + [141836] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Monolith, Lord Hircine Ritual", + [141837] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Obelisk, Lord Hircine Ritual", + [141838] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Ritual Stone, Hircine", + [141839] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Sacrificial Altar, Hircine", + [141841] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree Ferns, Cluster", + [141842] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree Ferns, Juvenile Cluster", + [141843] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plants, Yellow Frond Cluster", + [141844] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plants, Amber Spadeleaf Cluster", + [141845] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Mushrooms, Climbing Ambershine", + [141846] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Mushrooms, Ambershine Cluster", + [141847] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Animal Bones, Gnawed", + [141848] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Animal Bones, Jumbled", + [141849] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Animal Bones, Fresh", + [141850] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Bear Skeleton, Picked Clean", + [141851] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Bear Skull, Fresh", + [141852] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Ritual Fetish, Hircine", + [141853] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Statue of Hircine's Bitter Mercy", + [141854] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Decorative Hollowjack Flame-Skull", + [141855] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Decorative Hollowjack Wraith-Lantern", + [141856] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Decorative Hollowjack Daedra-Skull", + [141857] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Ritual Chalice, Hircine", + [141858] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner of the Silver Dawn", + [141869] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Potted Plant, Cypress", + [141870] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Raven-Perch Cemetery Wreath", + [141875] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Witches Festival Scarecrow", + [142004] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Specimen Jar, Spare Brain", + [142005] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Specimen Jar, Monstrous Remains", + [141752] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plant, Cerulean Spadeleaf", + [141753] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plants, Cerulean Spadeleaf Cluster", + [141754] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Skull Totem, Hircine Worship", + [141755] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Mushrooms, Aether Cup Ring", + [141756] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Mushrooms, Aether Cup Cluster", + [141757] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Mushrooms, Climbing Aether Cup", + [141758] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Orcish Wagon, Merchant", + [141759] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Orcish Gazebo, Orsinium", + [141760] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Witch's Tree, Charred", + [141761] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Reach Sapling, Contorted Briarheart", + [141762] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Animal Trap, Welded Open", + [141763] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner, Outfit", + [141764] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner, Outfit Small", + [141765] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner, Transmute", + [141766] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner, Transmute Small", + [141767] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Ayleid Constellation Stele, The Lady", + [141778] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Target Wraith-of-Crows", + [141920] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Brazier, Ceremonial", + [141921] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Bowl, Geometric Pattern", + [141922] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Dish, Geometric Pattern", + [141923] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Amphora, Seed Pattern", + [141924] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Vase, Scale Pattern", + [141925] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Hearth Shrine, Sithis Relief", + [141926] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Murkmire Hearth Shrine, Sithis Figure", + [142003] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Specimen Jar, Eyes", + [141939] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Grave, Grasping", + [141976] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Pumpkin Patch, Display", + [141967] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Hollowjack Lantern, Ouroboros", + [141966] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Hollowjack Lantern, Toothy Grin", + [141965] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Hollowjack Lantern, Soaring Dragon", + [141816] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree, Ginkgo", + [141817] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tree, Ancient Ginkgo", + [141818] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Shrubs, Dormant Sunbird Cluster", + [141819] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Shrub, Blooming Sunbird", + [141768] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Ayleid Constellation Stele, The Lover", + [141822] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Psijic Banner, Long", + [141769] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Ayleid Constellation Stele, The Atronach", + + +} + +FurC.EventItems[FURC_WEREWOLF] = {} + + +FurC.Books[FURC_WEREWOLF] = {} + + + diff --git a/data/LuxuryFurnisher.lua b/data/LuxuryFurnisher.lua index a709f02..cd4c4ab 100644 --- a/data/LuxuryFurnisher.lua +++ b/data/LuxuryFurnisher.lua @@ -1,6 +1,28 @@ FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {} FurC.LuxuryFurnisher[FURC_ALTMER] = { - + [139098] = { -- Darkshade Glowstalks, Inquisitive + itemPrice = 45000, + itemDate = "2018-07-21", + }, + -- August 5+6 + [126611] = { -- Vvardenfell Anemone, Sprout + itemPrice = 5417, + itemDate = "2018-07-21", + }, + [126612] = { -- Vvardenfell Anemone, Strong + itemPrice = 27084, + itemDate = "2018-07-21", + }, + [126610] = { -- Vvardenfell Coral Plant, + itemPrice = 10834, + itemDate = "2018-07-21", + }, + [126591] = { -- Vvardenfell Coral Plant, Young + itemPrice = 5417, + itemDate = "2018-07-21", + }, + + [139097] = { -- Spiral Skein Glowstalks, Sprouts itemPrice = 8000, itemDate = "2018-07-14", diff --git a/data/Recipes.lua b/data/Recipes.lua index 42fe140..70dab72 100644 --- a/data/Recipes.lua +++ b/data/Recipes.lua @@ -1,5 +1,19 @@ FurC.Recipes = FurC.Recipes or {} +FurC.Recipes[FURC_WEREWOLF] = { + 141904, -- Blueprint: Alinor Bookshelf, Grand Full", + 141905, -- Praxis: Alinor Gaming Table, Punctilious Conflict", + 141906, -- Formula: Artist's Palette, Pigment", + 141907, -- Design: Alinor Grape Stomping Tub", + 141896, -- Sketch: Figurine, The Dragon's Glare", + 141897, -- Praxis: Obelisk, Lord Hircine Ritual", + 141898, -- Praxis: Ritual Stone, Hircine", + 141899, -- Praxis: Sacrificial Altar, Hircine", + 141900, -- Blueprint: Ritual Fetish, Hircine", + 141901, -- Pattern: Psijic Banner, Long", + 141902, -- Schematic: Relic Vault, Impenetrable", + 141903, -- Pattern: Alinor Bed, Levitating", +} FurC.Recipes[FURC_ALTMER] = { 139573, --Sketch: Figurine, the Fish and the Unicorn diff --git a/data/RumourRecipes.lua b/data/RumourRecipes.lua index e95afa4..5bb4a0f 100644 --- a/data/RumourRecipes.lua +++ b/data/RumourRecipes.lua @@ -37,5 +37,47 @@ FurC.RumourRecipes = { 121091, -- Stool, Carved 119447, -- Candles, Lasting + +} +local function getCrownStorePriceString(price) + return string.format("%s (%u)", GetString(SI_FURC_CROWNSTORESOURCE), price) +end + + +FurC.MiscItemSources[FURC_ALTMER] = FurC.MiscItemSources[FURC_ALTMER] or {} +FurC.MiscItemSources[FURC_ALTMER][FURC_RUMOUR] = { + + + [139099] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Dark Elf Brazier, Ancestral Tomb + [139100] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Dark Elf Ash Garden, Familial + + [139101] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Blue Crystal Cluster, Large + [139102] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Blue Crystal Spire, Large + + [139103] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Craglorn Display Case, Sealed + [139104] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Craglorn Relief, Serpent + + [139105] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Reach Grinding Stones, Nirncrux + [139106] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Reach Briarheart, Corpse Blue + + [139137] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Tapestry, Nocturnal + [139138] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Banner, Nocturnal + [139139] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Nocturnal, Mistress of Shadows + + [139147] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plants, Scarlet Sawleaf + [139149] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Plant, Scarlet Fleshfrond + + [139351] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Monument, Marble + + [139366] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Alinor Fountain, Regal + [139367] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Regal Sauna Pool, Two Person + + [139369] = GetString(SI_FURC_ITEMSOURCE_UNKNOWN_YET), -- Abyssal Pearl, Sealed + } +FurC.EventItems[FURC_ALTMER] = {} + + +FurC.Books[FURC_ALTMER] = {} + diff --git a/locale/en.lua b/locale/en.lua index bc503e4..53a278a 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -192,7 +192,8 @@ local strings = { SI_FURC_FILTER_VERSION_CC = "Clockwork City", SI_FURC_FILTER_VERSION_DRAGON = "Dragon Bones", SI_FURC_FILTER_VERSION_ALTMER = "Summerset", - SI_FURC_FILTER_VERSION_ALTMER_TT = "", + SI_FURC_FILTER_VERSION_WEREWOLF = "Wolfhunter", + -- =============================== -- -- = GUI: Dropdown entry tooltip = -- @@ -216,7 +217,8 @@ local strings = { SI_FURC_FILTER_VERSION_R_TT = "Because all we needed were more Reachmen", SI_FURC_FILTER_VERSION_CC_TT = "Where the flywheels churn and the brass is pretty", SI_FURC_FILTER_VERSION_DRAGON_TT = "If you got this from Narsis Dren, well...", - + SI_FURC_FILTER_VERSION_ALTMER_TT = "Still think the Dunmer are bad?", + SI_FURC_FILTER_VERSION_WEREWOLF_TT = "In Soviet Hunting Ground, werewolf hunt you", SI_FURC_FILTER_CHAR_OFF = "Character filter: off", SI_FURC_FILTER_CHAR_OFF_TT = filterDisabled, diff --git a/startup.lua b/startup.lua index 501e097..3ccbb9a 100644 --- a/startup.lua +++ b/startup.lua @@ -1,13 +1,11 @@ FurnitureCatalogue = {} FurnitureCatalogue.name = "FurnitureCatalogue" FurnitureCatalogue.author = "manavortex" -FurnitureCatalogue.version = "2.5.14" +FurnitureCatalogue.version = "2.5.15" FurnitureCatalogue.CharacterName = nil FurnitureCatalogue.settings = {} FurC = FurnitureCatalogue -FurC.DevDebug = GetUnitDisplayName("player") == "@manavortex" -FurC.AccountName = GetDisplayName() FurC.AchievementVendors = {} FurC.LuxuryFurnisher = {} @@ -21,7 +19,6 @@ FurC.EventItems = {} FurC.PVP = {} FurC.MiscItemSources = {} - -- versioning FURC_HOMESTEAD = 2 FURC_MORROWIND = 3 @@ -29,6 +26,7 @@ FURC_REACH = 4 FURC_CLOCKWORK = 5 FURC_DRAGONS = 6 FURC_ALTMER = 7 +FURC_WEREWOLF = 8 FurC.Const = { vendorColor = "d68957", @@ -46,6 +44,7 @@ local defaults = { dontScanTradingHouse = false, enableDebug = false, + data = {}, filterCraftingType = {}, filterQuality = {}, @@ -60,6 +59,7 @@ local defaults = { width = 650, height = 550, }, + dropdownDefaults = { Source = 1, Character = 1, @@ -83,10 +83,6 @@ local defaults = { wipeDatabase = false, startupSilently = true, - visibility = { - hud = true, - hudui = true, - } } FURC_NONE = 1 @@ -172,6 +168,7 @@ FurnitureCatalogue.DropdownData = { [4] = GetString(SI_FURC_FILTER_VERSION_R ), [5] = GetString(SI_FURC_FILTER_VERSION_CC ), [6] = GetString(SI_FURC_FILTER_VERSION_DRAGON), + [7] = GetString(SI_FURC_FILTER_VERSION_ALTMER), }, TooltipsVersion = { [1] = GetString(SI_FURC_FILTER_VERSION_OFF_TT), @@ -180,6 +177,7 @@ FurnitureCatalogue.DropdownData = { [4] = GetString(SI_FURC_FILTER_VERSION_R_TT), [5] = GetString(SI_FURC_FILTER_VERSION_CC_TT), [6] = GetString(SI_FURC_FILTER_VERSION_DRAGON_TT), + [7] = GetString(SI_FURC_FILTER_VERSION_ALTMER_TT), }, ChoicesCharacter = { [1] = GetString(SI_FURC_FILTER_CHAR_OFF), @@ -192,9 +190,9 @@ FurnitureCatalogue.DropdownData = { ChoicesSource = {}, TooltipsSource = {}, } -if GetAPIVersion() == 100023 then - FurnitureCatalogue.DropdownData.ChoicesVersion[FURC_ALTMER] = GetString(SI_FURC_FILTER_VERSION_ALTMER) - FurnitureCatalogue.DropdownData.TooltipsVersion[FURC_ALTMER] = GetString(SI_FURC_FILTER_VERSION_ALTMER_TT) +if GetAPIVersion() == 100024 then + FurnitureCatalogue.DropdownData.ChoicesVersion[FURC_WEREWOLF] = GetString(SI_FURC_FILTER_VERSION_WEREWOLF) + FurnitureCatalogue.DropdownData.TooltipsVersion[FURC_WEREWOLF] = GetString(SI_FURC_FILTER_VERSION_WEREWOLF_TT) end local function updateDropdownData() @@ -257,10 +255,7 @@ function FurnitureCatalogue_Initialize(eventCode, addOnName) FurnitureCatalogue.settings = ZO_SavedVars:NewAccountWide("FurnitureCatalogue_Settings", 2, nil, defaults) - -- initialise setting, also setup the "source" dropdown for the menu - FurC.settings.data = FurC.settings.data or {} - FurC.settings.filterCraftingType = {} - FurC.settings.filterQuality = {} + -- setup the "source" dropdown for the menu setupSourceDropdown() FurnitureCatalogue.CreateSettings(FurnitureCatalogue.settings, defaults, FurnitureCatalogue) @@ -269,9 +264,7 @@ function FurnitureCatalogue_Initialize(eventCode, addOnName) FurC.RegisterEvents() - FurnitureCatalogue.InitGui() - FurC.SetHideRumourRecipesEntry(false) - FurC.SetHideCrownStoreEntry(false) + FurC.InitGui() FurnitureCatalogue.CreateTooltips() FurC.InitRightclickMenu()