diff --git a/FurCDatabaseQuery.lua b/FurCDatabaseQuery.lua
index 89b4e24..2524a62 100644
--- a/FurCDatabaseQuery.lua
+++ b/FurCDatabaseQuery.lua
@@ -168,7 +168,9 @@ end
local function getRecipeSource(recipeKey, recipeArray)
if nil == recipeKey and nil == recipeArray then return end
if nil == FurC.RecipeSources then return end
- recipeArray = recipeArray or FurC.Find(recipeKey)
+ if nil ~= FurC.RecipeSources[recipeKey] then return FurC.RecipeSources[recipeKey] end
+
+ recipeArray = recipeArray or FurC.Find(recipeKey)
recipeKey = recipeArray.blueprint or recipeKey
diff --git a/FurCTooltip.lua b/FurCTooltip.lua
index 116dda0..12a77d6 100644
--- a/FurCTooltip.lua
+++ b/FurCTooltip.lua
@@ -12,6 +12,7 @@ end
local defaultDebugString = "[<<1>>] = <<2>>, -- <<3>>"
local function tryCreateDebugOutput(itemId, itemLink)
if not FurC.IsDebugging then return end
+ itemId = itemId or FurC.GetItemId(itemLink)
local price = 0
local control = moc()
local debugString = defaultDebugString
@@ -35,6 +36,10 @@ local function addTooltipData(control, itemLink)
if nil == itemLink or FURC_EMPTY_STRING == itemLink then return end
local isRecipe = IsItemLinkFurnitureRecipe(itemLink)
+ if not isRecipe or IsItemLinkPlaceableFurniture(itemLink) then return end
+
+ tryCreateDebugOutput(itemId, itemLink)
+
itemLink = (isRecipe and GetItemLinkRecipeResultItemLink(itemLink)) or itemLink
itemId = FurC.GetItemId(itemLink)
@@ -44,7 +49,6 @@ local function addTooltipData(control, itemLink)
if not recipeArray then return end
- tryCreateDebugOutput(itemId, itemLink)
local unknown = not FurC.CanCraft(itemId, recipeArray)
@@ -63,7 +67,7 @@ local function addTooltipData(control, itemLink)
if crafterList then
stringTable = add(stringTable, tryColorize(crafterList))
end
- end
+ end
if not isRecipe and (not FurC.GetHideCraftingStation()) then
stringTable = add(stringTable, FurC.PrintCraftingStation(itemId, recipeArray))
end
diff --git a/data/RecipeSources.lua b/data/RecipeSources.lua
index f329823..5175713 100644
--- a/data/RecipeSources.lua
+++ b/data/RecipeSources.lua
@@ -27,6 +27,8 @@ local function soldBy(vendorName, locationName, price, requirement)
requirement
)
end
+
+
local artaeum = GetString(FURC_AV_ARTAEUM)
local nalirsewen = GetString(FURC_AV_NAL)
@@ -41,5 +43,49 @@ FurC.RecipeSources = {
[139491] = soldBy(nalirsewen, artaeum, 10000, rank(4)), -- Praxis: Psijic Lighting Globe, Small
[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
-}
\ No newline at end of file
+ [139494] = soldBy(nalirsewen, artaeum, 20000, rank(7)), -- Praxis: Psijic Table, Six-Fold Symmetry
+}
+
+local rolisRecipes = {
+ [134987] = 125, -- Blueprint: Hlaalu Gaming Table, "Foxes & Felines"
+ [134986] = 125, -- Design: Miniature Garden, Bottled
+ [134983] = 125, -- Diagram: Hlaalu Gong
+ [134982] = 125, -- Formula: Alchemical Apparatus, Master
+ [134984] = 125, -- Pattern: Clothier's Form, Brass
+ [134985] = 125, -- Praxis: Hlaalu Trinket Box, Curious Turtle
+ [126582] = 275, -- Praxis: Target Centurion, Dwarf-Brass
+ [126583] = 450, -- Praxis: Target Centurion, Robust Refabricated
+ [119592] = 125, -- Praxis: Target Skeleton, Humanoid
+ [121315] = 200, -- Praxis: Target Skeleton, Robust Humanoid
+ [139486] = 125, -- Sketch: High Elf Ancestor Clock, Celestial
+}
+local faustinaRecipes = {
+ [121200] = 100, -- Blueprint: Cabinet, Poisonmaker's
+ [121166] = 100, -- Blueprint: Podium, Skinning
+ [132195] = 100, -- Blueprint: Telvanni Candelabra, Masterwork
+ [121168] = 100, -- Blueprint: Tools, Case
+ [132194] = 100, -- Design: Mammoth Cheese, Mastercrafted
+ [121199] = 100, -- Design: Mortar and Pestle
+ [121214] = 100, -- Design: Orcish Skull Goblet, Full
+ [121163] = 100, -- Diagram: Apparatus, Boiler
+ [121165] = 100, -- Diagram: Apparatus, Gem Calipers
+ [132191] = 100, -- Diagram: Dwarven Gyroscope, Masterwork
+ [121197] = 100, -- Formula: Bottle, Poison Elixir
+ [121164] = 100, -- Formula: Case of Vials
+ [132190] = 100, -- Formula: Mages Apparatus, Master
+ [132192] = 100, -- Pattern: Dres Sewing Kit, Master's
+ [121209] = 100, -- Pattern: Orcish Tapestry, Spear
+ [132193] = 100, -- Praxis: Hlaalu Bath Tub, Masterwork
+ [121207] = 100, -- Praxis: Orcish Table with Fur
+}
+
+for itemId, itemPrice in pairs(rolisRecipes) do
+ local priceString = zo_strformat(GetString(SI_FURC_STRING_FOR_VOUCHERS), itemPrice, voucherColor)
+ FurC.RecipeSources[itemId] = zo_strformat(GetString(SI_FURC_STRING_ROLLIS), priceString)
+end
+local unsurpassedCrafter = GetAchievementLink(1801)
+for itemId, itemPrice in pairs(faustinaRecipes) do
+ local priceString = zo_strformat(GetString(SI_FURC_STRING_FOR_VOUCHERS), itemPrice, voucherColor)
+ local soldByFaustinaFor = zo_strformat(GetString(SI_FURC_STRING_FAUSTINA), priceString)
+ FurC.RecipeSources[itemId] = soldByFaustinaFor .. requires .. unsurpassedCrafter
+end
\ No newline at end of file
diff --git a/locale/de.lua b/locale/de.lua
index f132bdf..9cf5eaf 100644
--- a/locale/de.lua
+++ b/locale/de.lua
@@ -35,7 +35,7 @@ local strings = {
SI_FURC_STRING_WRIT_VENDOR = "Master Writ Vendor",
SI_FURC_STRING_WRIT_VENDOR_TT = "Obtainable for Master Writs in your alliance's capital",
- SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rollis Hlaalu|r <<1>>",
+ SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rolis Hlaalu|r <<1>>",
SI_FURC_STRING_FAUSTINA = "Sold by |cd68957Faustina Curio|r <<1>>",
SI_FURC_STRING_FOR_VOUCHERS = "for <<1>> vouchers",
@@ -43,7 +43,7 @@ local strings = {
SI_FURC_STRING_RECIPELEARNED = "Recipe learned: <<1>> <<2>> <<3>>",
SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>",
- SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio",
+ SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rolis Hlaalu or Faustina Curio",
SI_FURC_CHESTS = "From treasure chests",
SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests",
diff --git a/locale/en.lua b/locale/en.lua
index 8188818..8d64897 100644
--- a/locale/en.lua
+++ b/locale/en.lua
@@ -66,13 +66,13 @@ local strings = {
SI_FURC_PSIJIC_RANK = "Psijic Order Rank ",
SI_FURC_STRING_WRIT_VENDOR = "Master Writ Vendor",
SI_FURC_STRING_WRIT_VENDOR_TT = "Obtainable for Master Writs in your alliance's capital",
- SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rollis Hlaalu|r <<1>>",
+ SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rolis Hlaalu|r <<1>>",
SI_FURC_STRING_FAUSTINA = "Sold by |cd68957Faustina Curio|r <<1>>",
SI_FURC_STRING_FOR_VOUCHERS = "for <<1>> vouchers",
SI_FURC_FESTIVAL_DROP = "can be acquired during <<1>> (<<2>>)",
SI_FURC_STRING_RECIPELEARNED = "Recipe learned: <<1>> <<2>> <<3>>",
SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>",
- SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio",
+ SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rolis Hlaalu or Faustina Curio",
-- =============================== --
-- ============ MENU ============= --
diff --git a/locale/fr.lua b/locale/fr.lua
index 6b08e2c..9987044 100644
--- a/locale/fr.lua
+++ b/locale/fr.lua
@@ -36,7 +36,7 @@ local strings = {
SI_FURC_STRING_WRIT_VENDOR = "Master Writ Vendor",
SI_FURC_STRING_WRIT_VENDOR_TT = "Obtainable for Master Writs in your alliance's capital",
- SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rollis Hlaalu|r <<1>>",
+ SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rolis Hlaalu|r <<1>>",
SI_FURC_STRING_FAUSTINA = "Sold by |cd68957Faustina Curio|r <<1>>",
SI_FURC_STRING_FOR_VOUCHERS = "for <<1>> vouchers",
@@ -44,7 +44,7 @@ local strings = {
SI_FURC_STRING_RECIPELEARNED = "Recipe learned: <<1>> <<2>> <<3>>",
SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>",
- SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio",
+ SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rolis Hlaalu or Faustina Curio",
SI_FURC_CHESTS = "From treasure chests",
SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests",
diff --git a/locale/jp.lua b/locale/jp.lua
index ad1fe71..2662925 100644
--- a/locale/jp.lua
+++ b/locale/jp.lua
@@ -36,7 +36,7 @@ local strings = {
SI_FURC_STRING_WRIT_VENDOR = "Master Writ Vendor",
SI_FURC_STRING_WRIT_VENDOR_TT = "Obtainable for Master Writs in your alliance's capital",
- SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rollis Hlaalu|r <<1>>",
+ SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rolis Hlaalu|r <<1>>",
SI_FURC_STRING_FAUSTINA = "Sold by |cd68957Faustina Curio|r <<1>>",
SI_FURC_STRING_FOR_VOUCHERS = "for <<1>> vouchers",
@@ -44,7 +44,7 @@ local strings = {
SI_FURC_STRING_RECIPELEARNED = "Recipe learned: <<1>> <<2>> <<3>>",
SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>",
- SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio",
+ SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rolis Hlaalu or Faustina Curio",
SI_FURC_CHESTS = "From treasure chests",
SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests",
diff --git a/locale/ru.lua b/locale/ru.lua
index 0a3f7d0..8bd56d3 100644
--- a/locale/ru.lua
+++ b/locale/ru.lua
@@ -36,7 +36,7 @@ local strings = {
SI_FURC_STRING_WRIT_VENDOR = "Master Writ Vendor",
SI_FURC_STRING_WRIT_VENDOR_TT = "Obtainable for Master Writs in your alliance's capital",
- SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rollis Hlaalu|r <<1>>",
+ SI_FURC_STRING_ROLLIS = "Sold by |cd68957Rolis Hlaalu|r <<1>>",
SI_FURC_STRING_FAUSTINA = "Sold by |cd68957Faustina Curio|r <<1>>",
SI_FURC_STRING_FOR_VOUCHERS = "for <<1>> vouchers",
@@ -44,7 +44,7 @@ local strings = {
SI_FURC_STRING_RECIPELEARNED = "Recipe learned: <<1>> <<2>> <<3>>",
SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>",
- SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio",
+ SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rolis Hlaalu or Faustina Curio",
SI_FURC_CHESTS = "From treasure chests",
SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests",