diff --git a/FurCData.lua b/FurCData.lua
index fcd1a13..47ca386 100644
--- a/FurCData.lua
+++ b/FurCData.lua
@@ -344,7 +344,7 @@ local function scanFromFiles(shouldScanCharacter)
end
local function scanRollis()
- for versionNumber, versionData in pairs(FurC.Rollis) do
+ for versionNumber, versionData in pairs(FurC.Rolis) do
for itemId, itemSource in pairs(versionData) do
recipeArray = parseFurnitureItem(FurC.GetItemLink(recipeId), true)
if nil ~= recipeArray then
diff --git a/FurCDatabaseQuery.lua b/FurCDatabaseQuery.lua
index ad9d372..89b4e24 100644
--- a/FurCDatabaseQuery.lua
+++ b/FurCDatabaseQuery.lua
@@ -24,7 +24,7 @@ local function getRollisSource(recipeKey, recipeArray)
recipeArray = recipeArray or FurC.Find(recipeKey)
if not recipeArray then return end
- local versionData = FurC.Rollis[recipeArray.version]
+ local versionData = FurC.Rolis[recipeArray.version]
if nil ~= versionData and nil ~= versionData[recipeKey] then
local itemPrice = zo_strformat(GetString(SI_FURC_STRING_FOR_VOUCHERS), colorise(versionData[recipeKey], voucherColor))
diff --git a/FurCTooltip.lua b/FurCTooltip.lua
index 5a2d193..116dda0 100644
--- a/FurCTooltip.lua
+++ b/FurCTooltip.lua
@@ -9,6 +9,25 @@ local function tryColorize(text, datInteger)
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.IsDebugging then return end
+ 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)
if FurC.GetDisableTooltips() then return end
@@ -25,7 +44,8 @@ local function addTooltipData(control, itemLink)
if not recipeArray then return end
- if FurC.IsDebugging then d(zo_strformat("<<1>>: <<2>>", itemId, itemLink)) end
+ tryCreateDebugOutput(itemId, itemLink)
+
local unknown = not FurC.CanCraft(itemId, recipeArray)
local stringTable = {}
diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt
index f1b9241..6715a3c 100644
--- a/FurnitureCatalogue.txt
+++ b/FurnitureCatalogue.txt
@@ -1,7 +1,7 @@
## Title: FurnitureCatalogue
## Author: manavortex
-## Version: 2.3.0
-## APIVersion: 100022
+## Version: 2.3.1
+## APIVersion: 100022 100023
## SavedVariables: FurnitureCatalogue_Settings
## OptionalDependsOn: pChat
diff --git a/data/100023.lua b/data/100023.lua
index d15d274..e1cc790 100644
--- a/data/100023.lua
+++ b/data/100023.lua
@@ -738,4 +738,10 @@ FurC.Recipes[FURC_ALTMER] = {
FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {}
FurC.LuxuryFurnisher[FURC_ALTMER] = {
+}
+
+
+FurC.Faustina[FURC_ALTMER] = {
+ [139391] = 10, -- Master Craftsman's Banner, Hanging
+ [137870] = 125, -- Basic Jewelry Crafting Station
}
\ No newline at end of file
diff --git a/data/Homestead/H_AchievementVendors.lua b/data/Homestead/H_AchievementVendors.lua
index b6e5f43..4481e9b 100644
--- a/data/Homestead/H_AchievementVendors.lua
+++ b/data/Homestead/H_AchievementVendors.lua
@@ -1963,93 +1963,104 @@ FurC.AchievementVendors[FURC_HOMESTEAD] = {
["Reaper's March, Rawl'Kha, Market"] = {
[GetString(FURC_AV_MAL)] = {
-
+ [120998] = { -- Block, Wood Cutting
+ itemPrice = 100,
+ },
+ [120511] = { -- Bush, Mountain Scrub
+ itemPrice = 100,
+ },
+ [120690] = { -- Fern Plant, Hardy
+ itemPrice = 100,
+ },
+ [120510] = { -- Fern Plant, Sturdy Towering
+ itemPrice = 100,
+ },
+ [120512] = { -- Fern, Fragile
+ itemPrice = 100,
+ },
+ [120521] = { -- Fern, Withering
+ itemPrice = 100,
+ },
+ [120691] = { -- Fern, Young Sunburnt
+ itemPrice = 100,
+ },
+ [120703] = { -- Khajiit Column, Spiked
+ itemPrice = 4000,
+ },
+ [120561] = { -- Plant, Jungle Leaf
+ itemPrice = 100,
+ },
+ [120697] = { -- Plant, Leafy Sprouts
+ itemPrice = 100,
+ },
+ [120560] = { -- Plant, Squat Jungle Leaf
+ itemPrice = 100,
+ },
+ [120562] = { -- Plant, Towering Jungle Leaf
+ itemPrice = 100,
+ },
+ [120699] = { -- Platform, Weathered Dock
+ itemPrice = 250,
+ },
+ [120700] = { -- Post, Barnacle Covered
+ itemPrice = 100,
+ },
+ [120515] = { -- Shrub, Lanky Highland
+ itemPrice = 100,
+ },
+ [120522] = { -- Shrub, Tender Privet
+ itemPrice = 100,
+ },
+ [117990] = { -- Tea Table, Carved
+ itemPrice = 250,
+ },
+ [121282] = { -- Tree, Ancient Jungle
+ itemPrice = 5000,
+ },
+ [121283] = { -- Tree, Healthy Jungle
+ itemPrice = 250,
+ },
+ [120519] = { -- Tree, Healthy Privet
+ itemPrice = 250,
+ },
+ [120687] = { -- Tree, Sturdy Shade
+ itemPrice = 250,
+ },
[120558] = { -- Sapling, Eucalyptus Shrub
itemPrice = 100,
- },
- [120511] = { -- Bush, Mountain Scrub
- itemPrice = 100,
- },
- [120690] = { -- Fern Plant, Hardy
- itemPrice = 100,
- },
- [120510] = { -- Fern Plant, Sturdy Towering
- itemPrice = 100,
- },
- [120512] = { -- Fern, Fragile
- itemPrice = 100,
- },
- [120521] = { -- Fern, Withering
- itemPrice = 100,
- },
- [120691] = { -- Fern, Young Sunburnt
- itemPrice = 100,
- },
- [120561] = { -- Plant, Jungle Leaf
- itemPrice = 100,
- },
- [120697] = { -- Plant, Leafy Sprouts
- itemPrice = 100,
- },
- [120560] = { -- Plant, Squat Jungle Leaf
- itemPrice = 100,
- },
- [120562] = { -- Plant, Towering Jungle Leaf
- itemPrice = 100,
- },
- [120699] = { -- Platform, Weathered Dock
- itemPrice = 250,
- },
- [120700] = { -- Post, Barnacle Covered
- itemPrice = 100,
- },
- [120515] = { -- Shrub, Lanky Highland
- itemPrice = 100,
- },
- [120522] = { -- Shrub, Tender Privet
- itemPrice = 100,
- },
- [121282] = { -- Tree, Ancient Jungle
- itemPrice = 5000,
- },
- [121283] = { -- Tree, Healthy Jungle
- itemPrice = 250,
- },
- [120519] = { -- Tree, Healthy Privet
- itemPrice = 250,
- },
- [120687] = { -- Tree, Sturdy Shade
- itemPrice = 250,
- },
-
+ },
},
[GetString(FURC_AV_ATH)] = {
- [120703] = { -- Khajiiti Column, Spiked
- itemPrice = 4000,
- },
- [119848] = { -- Colovian Projection Crystal
- itemPrice = 5000,
- },
- [119853] = { -- Full Moons Tile
- itemPrice = 5000,
- },
- [119850] = { -- Khajiiti Shrine Guardian Statue
- itemPrice = 20000,
- },
- [119849] = { -- Moonmont Lunar Altar
- itemPrice = 15000,
- },
- [119854] = { -- New Moon Tile
- itemPrice = 5000,
- },
- [119852] = { -- Waning Moons Tile
- itemPrice = 5000,
- },
- [119851] = { -- Waxing Moons Wall Tile
- itemPrice = 5000,
- },
- },
+ [119848] = { -- Colovian Projection Crystal
+ itemPrice = 5000,
+ achievement = 536,
+ },
+ [119853] = { -- Full Moons Tile
+ itemPrice = 5000,
+ achievement = 602,
+ },
+ [119850] = { -- Khajiiti Shrine Guardian Statue
+ itemPrice = 20000,
+ achievement = 538,
+ },
+ [119849] = { -- Moonmont Lunar Altar
+ itemPrice = 15000,
+ achievement = 537,
+ },
+ [119854] = { -- New Moons Tile
+ itemPrice = 5000,
+ achievement = 602,
+ },
+ [119852] = { -- Waning Moons Tile
+ itemPrice = 5000,
+ achievement = 602,
+ },
+ [119851] = { -- Waxing Moons Wall Tile
+ itemPrice = 5000,
+ achievement = 602,
+ },
+ },
},
["Craglorn, Belkarth Woodworking store"] = {
[GetString(FURC_AV_LOT)] = {
diff --git a/data/Homestead/H_Rollis.lua b/data/Homestead/H_Rollis.lua
index 3a6f647..8f0f38e 100644
--- a/data/Homestead/H_Rollis.lua
+++ b/data/Homestead/H_Rollis.lua
@@ -1,8 +1,8 @@
-FurC.Rollis = FurC.Rollis or {}
+FurC.Rolis = FurC.Rolis or {}
FurC.Rollis_Recipes = FurC.Rollis_Recipes or {}
-FurC.Rollis[FURC_HOMESTEAD] = {
+FurC.Rolis[FURC_HOMESTEAD] = {
-- Alchemy station
[118328] = 35,
-- Blacksmithing station
diff --git a/data/Rollis.lua b/data/Rollis.lua
index d946a5d..19d006c 100644
--- a/data/Rollis.lua
+++ b/data/Rollis.lua
@@ -26,11 +26,12 @@ FurC.FaustinaRecipes[FURC_DRAGONS] = {
132195, -- Telvanni Candelabra
121166, -- Podium, Skinning
}
+
FurC.Faustina[FURC_DRAGONS] = {
[134675] = 1500,
}
-FurC.Rollis[FURC_DRAGONS] = {
+FurC.Rolis[FURC_DRAGONS] = {
134983,
134984,
134985,
diff --git a/startup.lua b/startup.lua
index 1c44180..dcec582 100644
--- a/startup.lua
+++ b/startup.lua
@@ -1,7 +1,7 @@
FurnitureCatalogue = {}
FurnitureCatalogue.name = "FurnitureCatalogue"
FurnitureCatalogue.author = "manavortex"
-FurnitureCatalogue.version = "2.3.0"
+FurnitureCatalogue.version = "2.3.1"
FurnitureCatalogue.CharacterName = nil
FurnitureCatalogue.settings = {}
@@ -12,7 +12,7 @@ FurC.AccountName = GetDisplayName()
FurC.AchievementVendors = {}
FurC.LuxuryFurnisher = {}
FurC.Recipes = {}
-FurC.Rollis = {}
+FurC.Rolis = {}
FurC.RollisRecipes = {}
FurC.Books = {}
FurC.EventItems = {}