diff --git a/FurCContextMenu.lua b/FurCContextMenu.lua
index c03bab6..e72ce0a 100644
--- a/FurCContextMenu.lua
+++ b/FurCContextMenu.lua
@@ -35,46 +35,39 @@ function AddFurnitureShoppingListMenuEntry(itemId, calledFromFurC)
end
+local cachedItemLink, cachedRecipeArray
+
+local function toChat() FurC.ToChat(cachedItemLink) end
+local function fave() FurC.Fave(cachedItemLink) end
+local function postItemSource() FurC.ToChat(GetItemLinkRecipeResultItemLink(cachedItemLink)) end
+local function postRecipe() FurC.ToChat(FurC.GetItemLink(cachedRecipeArray.blueprint)) end
+local function postRecipeResult() FurC.ToChat(GetItemLinkRecipeResultItemLink(cachedItemLink)) end
+local function postMaterial() FurC.ToChat(itemLink .. ": " .. FurC.GetMats(cachedItemLink, cachedRecipeArray, true)) end
+
+
local function addMenuItems(itemLink, recipeArray)
recipeArray = recipeArray or FurC.Find(itemLink)
- if (nil == recipeArray) then return end
- -- ClearMenu()
-
- AddCustomMenuItem(GetString(SI_FURC_MENU_HEADER),
- function() FurC.ToChat(itemLink) end,
- MENU_ADD_OPTION_LABEL
- )
+ if not recipeArray or recipeArray == {} then return end
+
+ cachedItemLink = itemLink
+ cachedRecipeArray = recipeArray
+
+ AddCustomMenuItem(GetString(SI_FURC_MENU_HEADER), toChat, MENU_ADD_OPTION_LABEL)
+
local faveText = FurC.IsFavorite(itemLink, recipeArray) and GetString(SI_FURC_REMOVE_FAVE) or GetString(SI_FURC_ADD_FAVE)
- AddCustomMenuItem(faveText,
- function() FurC.Fave(itemLink, recipeArray) end,
- MENU_ADD_OPTION_LABEL
- )
+ AddCustomMenuItem(faveText, fave, MENU_ADD_OPTION_LABEL)
if recipeArray.origin ~= FURC_CRAFTING then
- AddCustomMenuItem(GetString(SI_FURC_POST_ITEMSOURCE),
- function() FurC.PrintSource(itemLink, recipeArray) end,
- MENU_ADD_OPTION_LABEL
- )
+ AddCustomMenuItem(GetString(SI_FURC_POST_ITEMSOURCE), postItemSource, MENU_ADD_OPTION_LABEL)
else
if IsItemLinkFurnitureRecipe(itemLink) then
- AddCustomMenuItem(GetString(SI_FURC_POST_ITEM),
- function() FurC.ToChat(GetItemLinkRecipeResultItemLink(itemLink)) end,
- MENU_ADD_OPTION_LABEL
- )
- elseif nil ~= recipeArray.blueprint then
- AddCustomMenuItem(GetString(SI_FURC_POST_RECIPE),
- function() FurC.ToChat(FurC.GetItemLink(recipeArray.blueprint)) end,
- MENU_ADD_OPTION_LABEL
- )
- end
- AddCustomMenuItem(GetString(SI_FURC_POST_MATERIAL),
- function() FurC.ToChat(itemLink .. ": " .. FurC.GetMats(itemLink, recipeArray, true)) end,
- MENU_ADD_OPTION_LABEL
- )
+ AddCustomMenuItem(GetString(SI_FURC_POST_ITEM), postRecipeResult, MENU_ADD_OPTION_LABEL)
+ AddCustomMenuItem(GetString(SI_FURC_POST_RECIPE), postRecipe, MENU_ADD_OPTION_LABEL)
+ end
+ AddCustomMenuItem(GetString(SI_FURC_POST_MATERIAL), postMaterial, MENU_ADD_OPTION_LABEL)
AddFurnitureShoppingListMenuEntry(itemLink, true)
end
- -- ShowMenu()
end
diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt
index dd12564..5c4a254 100644
--- a/FurnitureCatalogue.txt
+++ b/FurnitureCatalogue.txt
@@ -1,6 +1,6 @@
## Title: FurnitureCatalogue
## Author: manavortex
-## Version: 2.5.2
+## Version: 2.5.3
## APIVersion: 100023
## SavedVariables: FurnitureCatalogue_Settings
## OptionalDependsOn: pChat
diff --git a/data/02_Morrowind/M_LuxuryFurnisher.lua b/data/02_Morrowind/M_LuxuryFurnisher.lua
index b411219..9307e52 100644
--- a/data/02_Morrowind/M_LuxuryFurnisher.lua
+++ b/data/02_Morrowind/M_LuxuryFurnisher.lua
@@ -100,20 +100,6 @@ FurC.LuxuryFurnisher[FURC_MORROWIND] = {
},
- -- July 1st - 2nd
- [126560] = { -- Dwarven fountain, forged
- itemPrice = 53571,
- itemDate = "2017-06-30",
- },
- [126564] = { -- Dwarven Clock, Deactivated
- itemPrice = 16250,
- itemDate = "2017-06-30",
- },
- [126561] = { -- Dwarven Pillar, Forged
- itemPrice = 10834,
- itemDate = "2017-06-30",
- },
-
diff --git a/data/LuxuryFurnisher.lua b/data/LuxuryFurnisher.lua
index 6bcf544..fd9b997 100644
--- a/data/LuxuryFurnisher.lua
+++ b/data/LuxuryFurnisher.lua
@@ -1,6 +1,24 @@
FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {}
FurC.LuxuryFurnisher[FURC_ALTMER] = {
+ --
+ [126560] = { -- Dwarven fountain, forged
+ itemPrice = 50000,
+ itemDate = "2017-06-16",
+ },
+ [126564] = { -- Dwarven Clock, Deactivated
+ itemPrice = 15000,
+ itemDate = "2017-06-16",
+ },
+ [126561] = { -- Dwarven Pillar, Forged
+ itemPrice = 10000,
+ itemDate = "2017-06-16",
+ },
+ [139092] = { -- Dwarven Engine, Fused
+ itemPrice = 24000,
+ itemDate = "2017-06-16",
+ },
+
-- June, 23 - 26
[121270] = { -- Brotherhood Banner, Large
itemPrice = 25000,
diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua
index 074c600..d82c8df 100644
--- a/data/MiscItemSources.lua
+++ b/data/MiscItemSources.lua
@@ -50,12 +50,13 @@ FurC.MiscItemSources[FURC_ALTMER] = {
[130206] = getCrownStorePriceString(370), -- Ayleid Apparatus, Welkynd
},
[FURC_DROP] = {
-
- [139059] = GetString(FURC_DROP_ALTMER), -- Ivory, Polished - Foryn had one, can't remember where I got it
+
+ [139059] = GetString(FURC_DROP), -- Ivory, Polished - Foryn had one, can't remember where I got it
[139066] = GetString(SI_FURC_HARVEST), -- Plant, Redtop Grass
- [139060] = GetString(SI_FURC_GIANT_CLAM), -- Giant Clam, Ancient
- [139062] = GetString(SI_FURC_GIANT_CLAM), -- Pearl, Large
+ [139060] = GetString(SI_FURC_GIANT_CLAM), -- Giant Clam, Ancient
+ [139062] = GetString(SI_FURC_GIANT_CLAM), -- Pearl, Large
+
[139073] = GetString(SI_FURC_QUESTREWARD) .. "Lilandril" -- Painting of Summerset Coast, Refined
},
[FURC_FISHING] = {
diff --git a/locale/en.lua b/locale/en.lua
index 71bf75e..afa9335 100644
--- a/locale/en.lua
+++ b/locale/en.lua
@@ -247,6 +247,7 @@ local strings = {
SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival",
SI_FURC_DROP_CHEST_VVARDENFELL = "Extremely rarely from chests on Vvardenfell",
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_CHESTS = "from treasure chests",
SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes",
diff --git a/startup.lua b/startup.lua
index 06f165d..9733e4b 100644
--- a/startup.lua
+++ b/startup.lua
@@ -1,7 +1,7 @@
FurnitureCatalogue = {}
FurnitureCatalogue.name = "FurnitureCatalogue"
FurnitureCatalogue.author = "manavortex"
-FurnitureCatalogue.version = "2.5.2"
+FurnitureCatalogue.version = "2.5.3"
FurnitureCatalogue.CharacterName = nil
FurnitureCatalogue.settings = {}