diff --git a/FurCFilter.lua b/FurCFilter.lua
index 13f1e1e..c4af6d1 100644
--- a/FurCFilter.lua
+++ b/FurCFilter.lua
@@ -87,6 +87,14 @@ local function shouldBeHidden()
(ddSource ~= FURC_CROWN and recipeArray.origin == FURC_CROWN and hideCrownStore)
end
+local validSourcesForOther = {
+ [FURC_FESTIVAL_DROP] = true,
+ [FURC_DROP] = true,
+ [FURC_FISHING] = true,
+ [FURC_JUSTICE] = true,
+ [FURC_GUILDSTORE] = true,
+}
+
-- Source: All, All (craftable), Craftable (known), craftable (unknown), purchaseable
local function matchSourceDropdown()
@@ -95,27 +103,21 @@ local function matchSourceDropdown()
return true
end
if recipeArray.origin == FURC_CRAFTING then
- return ddSource == FURC_CRAFTING
- or (FURC_CRAFTING_KNOWN == ddSource and isRecipeArrayKnown(recipeArray))
- or (FURC_CRAFTING_UNKNOWN == ddSource)
+ if ddSource == FURC_CRAFTING then return true end
+ local matchingDropdownSource = (isRecipeArrayKnown(recipeArray) and FURC_CRAFTING_KNOWN) or FURC_CRAFTING_UNKNOWN
+ return matchingDropdownSource == ddSource
end
- if FURC_FAVE == ddSource then
+ if FURC_FAVE == ddSource then
return recipeArray.favorite
end
- if FURC_VENDOR == ddSource then
+ if FURC_VENDOR == ddSource then
return (recipeArray.origin == FURC_VENDOR or (mergeLuxuryAndSales and recipeArray.origin == FURC_LUXURY))
end
- if FURC_WRIT_VENDOR == ddSource then
+ if FURC_WRIT_VENDOR == ddSource then
return recipeArray.origin == FURC_ROLIS
end
- if FURC_OTHER == ddSource then
- return (
- recipeArray.origin == FURC_FESTIVAL_DROP or
- recipeArray.origin == FURC_DROP or
- recipeArray.origin == FURC_FISHING or
- recipeArray.origin == FURC_JUSTICE or
- recipeArray.origin == FURC_GUILDSTORE
- )
+ if FURC_OTHER == ddSource then
+ return validSourcesForOther[recipeArray.origin]
end
-- we're checking character knowledge
return recipeArray.origin == ddSource
diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt
index d13a0cc..fb3cc71 100644
--- a/FurnitureCatalogue.txt
+++ b/FurnitureCatalogue.txt
@@ -1,6 +1,6 @@
## Title: FurnitureCatalogue
## Author: manavortex
-## Version: 2.5.12
+## Version: 2.5.13
## APIVersion: 100023
## SavedVariables: FurnitureCatalogue_Settings
## OptionalDependsOn: pChat
diff --git a/data/01_Homestead/H_Rolis.lua b/data/01_Homestead/H_Rolis.lua
new file mode 100644
index 0000000..131ec7c
--- /dev/null
+++ b/data/01_Homestead/H_Rolis.lua
@@ -0,0 +1,34 @@
+FurC.Rolis = FurC.Rolis or {}
+FurC.Rolis_Recipes = FurC.Rolis_Recipes or {}
+
+
+FurC.Rolis[FURC_HOMESTEAD] = {
+ -- Alchemy station
+ [118328] = 35,
+ -- Blacksmithing station
+ [119781] = 35,
+ -- Clothing station
+ [119707] = 35,
+ -- Dye Station
+ [118329] = 35,
+ -- Enchanting station
+ [118330] = 35,
+ -- Provisioning station
+ [118327] = 35,
+ -- Woodworking station
+ [119744] = 35,
+
+ -- Attunable Blacksmithing station
+ [119594] = 250,
+ -- Attunable Clothing station
+ [119821] = 250,
+ -- Attunable Woodworking station
+ [119822] = 250,
+}
+
+FurC.Rolis_Recipes[FURC_HOMESTEAD] = {
+ 121207, -- Target Skeleton
+ 121315, -- Robust Target Skeleton
+ 126582, -- Target Centurion
+ 126583, -- Robust Target Centurion
+}
diff --git a/data/02_Morrowind/M_LuxuryFurnisher.lua b/data/02_Morrowind/M_LuxuryFurnisher.lua
index 0ff0c97..2e10253 100644
--- a/data/02_Morrowind/M_LuxuryFurnisher.lua
+++ b/data/02_Morrowind/M_LuxuryFurnisher.lua
@@ -38,27 +38,6 @@ FurC.LuxuryFurnisher[FURC_MORROWIND] = {
itemDate = "2017-08-04",
},
- --July 29 + 30
- [126587] = { -- Vvardenfell Glowstalk, Sprout
- itemPrice = 2500,
- itemDate = "2017-07-28",
- },
- [126585] = { -- Vvardenfell Glowstalk, Strong
- itemPrice = 10834,
- itemDate = "2017-07-28",
- },
- [126580] = { -- Vvardenfell Glowstalk, Towering
- itemPrice = 16250,
- itemDate = "2017-07-28",
- },
- [126586] = { -- Vvardenfell Glowstalk, Young
- itemPrice = 5417,
- itemDate = "2017-07-28",
- },
-
-
-
-
diff --git a/data/LuxuryFurnisher.lua b/data/LuxuryFurnisher.lua
index 7fd0e3a..10c1142 100644
--- a/data/LuxuryFurnisher.lua
+++ b/data/LuxuryFurnisher.lua
@@ -1,6 +1,30 @@
FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {}
FurC.LuxuryFurnisher[FURC_ALTMER] = {
+ [139097] = { -- Spiral Skein Glowstalks, Sprouts
+ itemPrice = 8000,
+ itemDate = "2018-07-14",
+ },
+
+ --July 29 + 30
+ [126587] = { -- Vvardenfell Glowstalk, Sprout
+ itemPrice = 2500,
+ itemDate = "2018-07-14",
+ },
+ [126585] = { -- Vvardenfell Glowstalk, Strong
+ itemPrice = 10000,
+ itemDate = "2018-07-14",
+ },
+ [126580] = { -- Vvardenfell Glowstalk, Towering
+ itemPrice = 15000,
+ itemDate = "2018-07-14",
+ },
+ [126586] = { -- Vvardenfell Glowstalk, Young
+ itemPrice = 5000,
+ itemDate = "2018-07-14",
+ },
+
+
[139096] = { -- Daedric Urn, Sealed
itemPrice = 1000,
diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua
index b80b899..da5b04d 100644
--- a/data/MiscItemSources.lua
+++ b/data/MiscItemSources.lua
@@ -524,6 +524,10 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = {
[118069] = getCrownPrice(120), -- Simple Gray Banner
[118071] = getCrownPrice(120), -- Simple Red Banner
[118070] = getCrownPrice(120), -- Simple Purple Banner
+
+
+ [120607] = getCrownPrice(50), -- Sapling, Lanky Ash
+
[115698] = getCrownPrice(1100), -- Khajiit Statue, Guardian
}
diff --git a/startup.lua b/startup.lua
index a6d775a..6b5eb05 100644
--- a/startup.lua
+++ b/startup.lua
@@ -1,7 +1,7 @@
FurnitureCatalogue = {}
FurnitureCatalogue.name = "FurnitureCatalogue"
FurnitureCatalogue.author = "manavortex"
-FurnitureCatalogue.version = "2.5.12"
+FurnitureCatalogue.version = "2.5.13"
FurnitureCatalogue.CharacterName = nil
FurnitureCatalogue.settings = {}