diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt
index 152ef63..43c1b0d 100644
--- a/FurnitureCatalogue.txt
+++ b/FurnitureCatalogue.txt
@@ -1,6 +1,6 @@
## Title: FurnitureCatalogue
## Author: manavortex
-## Version: 3.41
+## Version: 3.411
## APIVersion: 100027
## SavedVariables: FurnitureCatalogue_Settings
## DependsOn: LibStub LibCustomMenu LibAddonMenu-2.0 LibAsync
diff --git a/_Constants.lua b/_Constants.lua
index 9337e17..5bab53d 100644
--- a/_Constants.lua
+++ b/_Constants.lua
@@ -1,21 +1,34 @@
--- constants for filtering
-
+-- constants for filtering
+-- item sources
FURC_NONE = 1
-FURC_FAVE = FURC_NONE +1
-FURC_CRAFTING = FURC_FAVE +1
-FURC_CRAFTING_KNOWN = FURC_CRAFTING +1
-FURC_CRAFTING_UNKNOWN = FURC_CRAFTING_KNOWN +1
-FURC_VENDOR = FURC_CRAFTING_UNKNOWN +1
-FURC_PVP = FURC_VENDOR +1
-FURC_CROWN = FURC_PVP +1
-FURC_RUMOUR = FURC_CROWN +1
-FURC_LUXURY = FURC_RUMOUR +1
-FURC_OTHER = FURC_LUXURY +1
-FURC_ROLIS = FURC_OTHER +1
-FURC_DROP = FURC_ROLIS +1
-FURC_WRIT_VENDOR = FURC_DROP +1
-FURC_JUSTICE = FURC_WRIT_VENDOR +1
-FURC_FISHING = FURC_JUSTICE +1
-FURC_GUILDSTORE = FURC_FISHING +1
-FURC_FESTIVAL_DROP = FURC_GUILDSTORE +1
-FURC_EMPTY_STRING = ""
\ No newline at end of file
+FURC_FAVE = FURC_NONE +1 -- 2
+FURC_CRAFTING = FURC_FAVE +1 -- 3
+FURC_CRAFTING_KNOWN = FURC_CRAFTING +1 -- 4
+FURC_CRAFTING_UNKNOWN = FURC_CRAFTING_KNOWN +1 -- 5
+FURC_VENDOR = FURC_CRAFTING_UNKNOWN +1 -- 6
+FURC_PVP = FURC_VENDOR +1 -- 7
+FURC_CROWN = FURC_PVP +1 -- 8
+FURC_RUMOUR = FURC_CROWN +1 -- 9
+FURC_LUXURY = FURC_RUMOUR +1 -- 10
+FURC_OTHER = FURC_LUXURY +1 -- 12
+FURC_ROLIS = FURC_OTHER +1 -- 13
+FURC_DROP = FURC_ROLIS +1 -- 14
+FURC_WRIT_VENDOR = FURC_DROP +1 -- 15
+FURC_JUSTICE = FURC_WRIT_VENDOR +1 -- 16
+FURC_FISHING = FURC_JUSTICE +1 -- 17
+FURC_GUILDSTORE = FURC_FISHING +1 -- 18
+FURC_FESTIVAL_DROP = FURC_GUILDSTORE +1 -- 19
+FURC_EMPTY_STRING = ""
+
+
+-- versioning
+FURC_HOMESTEAD = 2
+FURC_MORROWIND = FURC_HOMESTEAD +1 -- 3
+FURC_REACH = FURC_MORROWIND +1 -- 4
+FURC_CLOCKWORK = FURC_REACH +1 -- 5
+FURC_DRAGONS = FURC_CLOCKWORK +1 -- 6
+FURC_ALTMER = FURC_DRAGONS +1 -- 7
+FURC_WEREWOLF = FURC_ALTMER +1 -- 8
+FURC_SLAVES = FURC_WEREWOLF +1 -- 9
+FURC_WOTL = FURC_SLAVES +1 -- 10
+FURC_KITTY = FURC_WOTL + 1 -- 11
\ No newline at end of file
diff --git a/data/06_2018/MiscItemSources.lua b/data/06_2018/MiscItemSources.lua
index be617dd..4977f29 100644
--- a/data/06_2018/MiscItemSources.lua
+++ b/data/06_2018/MiscItemSources.lua
@@ -83,11 +83,7 @@ FurC.MiscItemSources[FURC_WOTL] = {
[147589] = rumourSource, -- Dwarven Brazier, Open,
[147590] = rumourSource, -- Dwarven Bust, Forge-Lord,
[147591] = rumourSource, -- Namira, Mistress of Decay,
- [147592] = rumourSource, -- Silver Kettle, Masterworked,
[140297] = rumourSource, -- Replica Throne of Alinor,
- [147594] = rumourSource, -- Pottery Wheel, Ever-Turning,
- [147595] = rumourSource, -- Alchemical Apparatus, Condenser,
- [147596] = rumourSource, -- Hlaalu Salt Lamp, Enchanted,
[130189] = rumourSource, -- Tapestry of Sheogorath,
[130190] = rumourSource, -- Banner of Sheogorath,
[134287] = rumourSource, -- Projector TBD,
diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua
index be8e311..9b46e86 100644
--- a/data/MiscItemSources.lua
+++ b/data/MiscItemSources.lua
@@ -46,6 +46,8 @@ local stealable_elsewhere = stealable .. elsewhere
local rumourSource = GetString(SI_FURC_RUMOUR_SOURCE_ITEM)
local dataminedUnclear = GetString(SI_FURC_DATAMINED_UNCLEAR)
+local daily_reward = GetString(SI_FURC_DAILY_ELSWEYR)
+
local crownstoresource = GetString(SI_FURC_CROWNSTORESOURCE)
local function getCrownPrice(price)
@@ -151,6 +153,7 @@ FurC.MiscItemSources[FURC_KITTY] = {
},
[FURC_DROP] = {
+ [121203] = daily_reward , -- Praxis: Khajiit Brazier, Enchanted
},
diff --git a/data/RecipeSources.lua b/data/RecipeSources.lua
index e61eb63..97d15b0 100644
--- a/data/RecipeSources.lua
+++ b/data/RecipeSources.lua
@@ -1,6 +1,8 @@
-local vendorColor = FurC.Const.vendorColor
-local goldColor = FurC.Const.goldColor
-local voucherColor = FurC.Const.voucherColor
+local colorVendor = "d68957"
+local colorGold = "e5da40"
+local colorVoucher = "25C31E"
+local colorAP = "5EA4FF"
+local colorTelVar = "82BCFF"
local function colorise(str, col, ret)
str = tostring(str)
@@ -17,9 +19,9 @@ local function rank(aNumber) return requires .. psijicRank .. aNumber end
local function soldBy(vendorName, locationName, price, requirement)
return zo_strformat(
GetString(SI_FURC_STRING_VENDOR),
- colorise(vendorName, vendorColor, stripColor),
- colorise(locationName, vendorColor, stripColor),
- colorise(price, goldColor, stripColor),
+ colorise(vendorName, vendorColor, stripColor),
+ colorise(locationName, vendorColor, stripColor),
+ colorise(price, goldColor, stripColor),
requirement
)
end
diff --git a/data/RumourRecipes.lua b/data/RumourRecipes.lua
index 534c8c9..bf2e639 100644
--- a/data/RumourRecipes.lua
+++ b/data/RumourRecipes.lua
@@ -13,7 +13,6 @@ FurC.RumourRecipes = {
119437, -- Design: Pie, Display
121161, -- Design: Ram Horns, Mounted
121216, -- Blueprint: Redguard Divider, Gilded
- 121203, -- Praxis: Khajiit Brazier, Enchanted
121217, -- Formula: Redguard Lamp, Oil
121215, -- Pattern: Redguard Canopy, Dusk
119426, -- Design: Bread, Plain
@@ -32,7 +31,6 @@ FurC.RumourRecipes = {
121109, -- Simple Gray Banner
121108, -- Simple Brown Banner
119355, -- Garlic String, Display
- 121203, -- Khajiit Brazier, Enchanted
121091, -- Stool, Carved
119447, -- Candles, Lasting
}
diff --git a/locale/de.lua b/locale/de.lua
index 8ab1d7b..548ca90 100644
--- a/locale/de.lua
+++ b/locale/de.lua
@@ -259,6 +259,7 @@ local strings = {
SI_FURC_DB_POISON = "with poison",
SI_FURC_DB_STEALTH = "as a way to be less obtrusive",
SI_FURC_DAILY_ASH = "Ashlander daily quest rewards",
+ SI_FURC_DAILY_ELSWEYR = "Elsweyr daily quest rewards",
SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival",
SI_FURC_VV_PAINTING = "Extremely rarely from chests or lockboxes on Vvardenfell",
SI_FURC_DROP = "This item is a drop ",
diff --git a/startup.lua b/startup.lua
index 6effa4b..6a68b4f 100644
--- a/startup.lua
+++ b/startup.lua
@@ -1,7 +1,7 @@
FurnitureCatalogue = {}
FurnitureCatalogue.name = "FurnitureCatalogue"
FurnitureCatalogue.author = "manavortex"
-FurnitureCatalogue.version = 3.41
+FurnitureCatalogue.version = 3.411
FurnitureCatalogue.CharacterName = nil
FurnitureCatalogue.settings = {}
@@ -20,26 +20,11 @@ FurC.PVP = {}
FurC.MiscItemSources = {}
FurC.RumourRecipes = {}
--- versioning
-FURC_HOMESTEAD = 2
-FURC_MORROWIND = 3
-FURC_REACH = 4
-FURC_CLOCKWORK = 5
-FURC_DRAGONS = 6
-FURC_ALTMER = 7
-FURC_WEREWOLF = 8
-FURC_SLAVES = 9
-FURC_WOTL = 10
-FURC_KITTY = 11
-
-FurC.Const = {
- vendorColor = "d68957",
- goldColor = "e5da40",
- apColor = "25C31E",
- tvColor = "5EA4FF",
- voucherColor = "82BCFF",
-}
+
+
+
+-- TODO: set up the filtering for FURC_RUMOUR and FURC_CROWN in submenus by origin
local defaults = {
hideMats = true,
@@ -70,8 +55,6 @@ local defaults = {
accountCharacters = {},
- version = 2.0,
-
-- tooltips
disableTooltips = false,
coloredTooltips = true,