diff --git a/FurCContextMenu.lua b/FurCContextMenu.lua index 644669f..9246463 100644 --- a/FurCContextMenu.lua +++ b/FurCContextMenu.lua @@ -41,10 +41,10 @@ local cachedItemLink, cachedRecipeArray local function toChat() FurC.ToChat(cachedItemLink) end local function fave() FurC.Fave(cachedItemLink) end -local function postItemSource() FurC.ToChat(FurC.GetItemDescription(cachedItemLink, cachedRecipeArray, true)) end +local function postItemSource() FurC.ToChat(FurC.GetItemDescription(cachedItemLink, cachedRecipeArray, true, true)) end local function postRecipe() FurC.ToChat(FurC.GetItemLink(cachedRecipeArray.blueprint)) end local function postRecipeResult() FurC.ToChat(GetItemLinkRecipeResultItemLink(cachedItemLink)) end -local function postMaterial() FurC.ToChat(cachedItemLink .. ": " .. FurC.GetMats(cachedItemLink, cachedRecipeArray, true)) end +local function postMaterial() FurC.ToChat(FurC.GetMats(cachedItemLink, cachedRecipeArray, true, true)) end local function doNothing() return end diff --git a/FurCData.lua b/FurCData.lua index 8279ea2..c7d17d3 100644 --- a/FurCData.lua +++ b/FurCData.lua @@ -515,30 +515,30 @@ function FurC.ScanRecipes(shouldScanFiles, shouldScanCharacter) -- return end end -function FurC.GetItemDescription(recipeKey, recipeArray, stripColor) +function FurC.GetItemDescription(recipeKey, recipeArray, stripColor, attachItemLink) recipeKey = FurC.GetItemId(recipeKey) FurC.settings.emptyItemSources = FurC.settings.emptyItemSources or {} recipeArray = recipeArray or FurC.Find(recipeKey, recipeArray) if not recipeArray then return "" end local origin = recipeArray.origin if origin == FURC_CRAFTING or origin == FURC_WRIT_VENDOR then - return FurC.GetMats(recipeKey, recipeArray, stripColor) + return FurC.GetMats(recipeKey, recipeArray, stripColor, attachItemLink) elseif origin == FURC_ROLIS then - return FurC.getRolisSource(recipeKey, recipeArray, stripColor) + return FurC.getRolisSource(recipeKey, recipeArray, stripColor, attachItemLink) elseif origin == FURC_LUXURY then - return FurC.getLuxurySource(recipeKey, recipeArray, stripColor) + return FurC.getLuxurySource(recipeKey, recipeArray, stripColor, attachItemLink) elseif origin == FURC_GUILDSTORE then return GetString(SI_FURC_SEEN_IN_GUILDSTORE) elseif origin == FURC_VENDOR then - return FurC.getAchievementVendorSource(recipeKey, recipeArray, stripColor) + return FurC.getAchievementVendorSource(recipeKey, recipeArray, stripColor, attachItemLink) elseif origin == FURC_FESTIVAL_DROP then - return FurC.getEventDropSource(recipeKey, recipeArray, stripColor) + return FurC.getEventDropSource(recipeKey, recipeArray, stripColor, attachItemLink) elseif origin == FURC_PVP then - return FurC.getPvpSource(recipeKey, recipeArray, stripColor) + return FurC.getPvpSource(recipeKey, recipeArray, stripColor, attachItemLink) elseif origin == FURC_RUMOUR then - return FurC.getRumourSource(recipeKey, recipeArray, stripColor) + return FurC.getRumourSource(recipeKey, recipeArray, stripColor, attachItemLink) else - itemSource = FurC.GetMiscItemSource(recipeKey, recipeArray, stripColor) + itemSource = FurC.GetMiscItemSource(recipeKey, recipeArray, stripColor, attachItemLink) end if not itemSource then FurC.settings.emptyItemSources[recipeKey] = ", --" .. GetItemLinkName(FurC.GetItemLink(recipeKey)) diff --git a/FurCDatabaseQuery.lua b/FurCDatabaseQuery.lua index a8f5ad1..52f9a31 100644 --- a/FurCDatabaseQuery.lua +++ b/FurCDatabaseQuery.lua @@ -151,7 +151,7 @@ local function getEventDropSource(recipeKey, recipeArray, stripColor) end FurC.getEventDropSource = getEventDropSource -function FurC.GetMiscItemSource(recipeKey, recipeArray) +function FurC.GetMiscItemSource(recipeKey, recipeArray, attachItemLink) if not recipeArray or not recipeArray.version or not recipeArray.origin then return end if recipeArray.origin == FURC_RUMOUR then @@ -162,7 +162,7 @@ function FurC.GetMiscItemSource(recipeKey, recipeArray) if not versionFiles then return end local originData = versionFiles[recipeArray.origin] if nil == originData then return end - return string.format("%s: %s", FurC.GetItemLink(recipeKey), originData[recipeKey]) + return (not attachItemLink and originData[recipeKey]) or string.format("%s: %s", FurC.GetItemLink(recipeKey), originData[recipeKey]) end local function getRecipeSource(recipeKey, recipeArray) diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt index 04c2b49..5972aa6 100644 --- a/FurnitureCatalogue.txt +++ b/FurnitureCatalogue.txt @@ -1,6 +1,6 @@ -## Title: FurnitureCatalogue + ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.6.1 +## Version: 2.6.2 ## APIVersion: 100024 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat diff --git a/data/03_Reach/HotR_LuxuryFurnisher.lua b/data/03_Reach/HotR_LuxuryFurnisher.lua index dd86bc2..090f6ca 100644 --- a/data/03_Reach/HotR_LuxuryFurnisher.lua +++ b/data/03_Reach/HotR_LuxuryFurnisher.lua @@ -113,18 +113,6 @@ FurC.LuxuryFurnisher[FURC_REACH] = { }, - [120842] = { -- Craglorn Chair, Serpent - itemPrice = 2500, - itemDate = "2017-09-08, 2017-04-21", - }, - [120841] = { -- Craglorn Urn, Standing - itemPrice = 7500, - itemDate = "2017-09-08, 2017-04-21", - }, - [120840] = { -- Craglorn Coffer, Ornate - itemPrice = 5000, - itemDate = "2017-09-08, 2017-04-21", - }, diff --git a/data/AchievementVendors.lua b/data/AchievementVendors.lua index 870c0d3..09b22f3 100644 --- a/data/AchievementVendors.lua +++ b/data/AchievementVendors.lua @@ -13,13 +13,12 @@ FurC.AchievementVendors[FURC_WEREWOLF] = { }, }, - GetString(FURC_AV_ALI)] = { - [GetString(FURC_AV_UNW)] = { - + [GetString(FURC_AV_ALI)] = { + [GetString(FURC_AV_UNW)] = { [141824] = { itemPrice = 100, - } - } + }, + }, } } diff --git a/data/LuxuryFurnisher.lua b/data/LuxuryFurnisher.lua index 8616888..e6db464 100644 --- a/data/LuxuryFurnisher.lua +++ b/data/LuxuryFurnisher.lua @@ -1,4 +1,26 @@ FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {} + + +FurC.LuxuryFurnisher[FURC_WEREWOLF] = { + + [139103] = { -- Craglorn Display Case, Sealed + itemPrice = 10000, + itemDate = "2018-08-25", + }, + + [120842] = { -- Craglorn Chair, Serpent + itemPrice = 2500, + itemDate = "2018-08-25", + }, + [120841] = { -- Craglorn Urn, Standing + itemPrice = 7500, + itemDate = "2018-08-25", + }, + [120840] = { -- Craglorn Coffer, Ornate + itemPrice = 5000, + itemDate = "2018-08-25", + }, +} FurC.LuxuryFurnisher[FURC_ALTMER] = { diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua index 48ce489..eca4649 100644 --- a/data/MiscItemSources.lua +++ b/data/MiscItemSources.lua @@ -21,6 +21,7 @@ local FURC_AUTOMATON_VV = GetString(SI_FURC_AUTOMATON) .. " on Vvardenfell" local FURC_HARVEST_CHARBOR = GetString(SI_FURC_HARVEST) .. " in Coldharbour" local FURC_SCAMBOX_F_ATRO = zo_strformat("<<1>> (<<2>>)", GetString(SI_FURC_SCAMBOX), GetString(SI_FURC_FLAME_ATRONACH)) +local FURC_SCAMBOX_DWEMER = zo_strformat("<<1>> (<<2>>)", GetString(SI_FURC_SCAMBOX), GetString(SI_FURC_DWEMER)) local FURC_DB_POISON = zo_strformat("<<1>> <<2>>", GetString(SI_FURC_DB), GetString(SI_FURC_DB_POISON)) local FURC_DB_SNEAKY = zo_strformat("<<1>> <<2>>", GetString(SI_FURC_DB), GetString(SI_FURC_DB_STEALTH)) @@ -34,9 +35,6 @@ local function getCrownPrice(price) return string.format("%s (%u)", GetString(SI_FURC_CROWNSTORESOURCE), price) end -local function getScamboxString(scamboxVersion) - return string.format("%s (%s)", GetString(SI_FURC_SCAMBOX), GetString(scamboxVersion)) -end local function getHouseString(houseId1, houseId2) local houseName = GetCollectibleName(houseId1) if houseId2 then houseName = houseName .. ", " .. GetCollectibleName(houseId2) end @@ -494,6 +492,8 @@ FurC.MiscItemSources[FURC_MORROWIND] = { -- Morrowind [126759] = questRewardSuran, -- Sir Sock's Ball of Yarn [126592] = GetString(SI_FURC_PLANTS), -- Plants, Hanging Pitcher Pair + + [126039] = FURC_SCAMBOX_DWEMER, -- Statue of masked Clavicus Vile with Barbas }, [FURC_CROWN] = { @@ -595,7 +595,7 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118351] = getCrownPrice(25), -- Box of Peaches - [134473] = getScamboxString(SI_FURC_FLAME_ATRONACH), -- Malacath Banner + [134473] = FURC_SCAMBOX_F_ATRO, -- Malacath Banner [118064] = getCrownPrice(45), -- Common Barrel, Dry [118065] = getCrownPrice(45), -- Common Cargo Crate, Dry diff --git a/locale/en.lua b/locale/en.lua index 50b31fb..a94a3d5 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -255,6 +255,7 @@ local strings = { SI_FURC_DROP = "This item is a drop ", SI_FURC_DROP_ALTMER = "This item is a drop on Summerset", SI_FURC_FLAME_ATRONACH = "Flame Atronach", + SI_FURC_DWEMER = "Dwemer", SI_FURC_CHESTS = "from treasure chests", SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes", SI_FURC_DRAGON_DUNGEON_DROP = "Fang Lair/Scalecaller Peak", diff --git a/startup.lua b/startup.lua index dd2a9eb..00e0c7d 100644 --- a/startup.lua +++ b/startup.lua @@ -1,7 +1,7 @@ FurnitureCatalogue = {} FurnitureCatalogue.name = "FurnitureCatalogue" FurnitureCatalogue.author = "manavortex" -FurnitureCatalogue.version = "2.6.1" +FurnitureCatalogue.version = "2.6.2" FurnitureCatalogue.CharacterName = nil FurnitureCatalogue.settings = {} @@ -36,8 +36,6 @@ FurC.Const = { voucherColor = "82BCFF", } -FurC.version = 2.2 - local defaults = { hideMats = true,