diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt index 11d3794..c198d23 100644 --- a/FurnitureCatalogue.txt +++ b/FurnitureCatalogue.txt @@ -1,7 +1,7 @@ ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.4.2 -## APIVersion: 100022 100023 +## Version: 2.4.3 +## APIVersion: 100023 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat @@ -59,7 +59,7 @@ data\01_Homestead\H_LuxuryFurnisher.lua data\02_Morrowind\M_LuxuryFurnisher.lua data\03_Reach\HotR_LuxuryFurnisher.lua data\04_Clockwork\CC_LuxuryFurnisher.lua -data\04_Clockwork\DragonB_LuxuryFurnisher.lua +data\05_Dragonbones\DragonB_LuxuryFurnisher.lua data\01_Homestead\H_Rolis.lua data\03_Reach\HotR_Rolis.lua diff --git a/data/02_Morrowind/M_LuxuryFurnisher.lua b/data/02_Morrowind/M_LuxuryFurnisher.lua index d236508..d575545 100644 --- a/data/02_Morrowind/M_LuxuryFurnisher.lua +++ b/data/02_Morrowind/M_LuxuryFurnisher.lua @@ -11,12 +11,12 @@ FurC.LuxuryFurnisher[FURC_MORROWIND] = { itemPrice = 5417, itemDate = "2017-08-11", }, - [126575] = { -- Velothi Shroud, Mourning - itemPrice = 5417, + [126575] = { -- Velothi Seat, Meditation + itemPrice = 10834, itemDate = "2017-08-11", }, - [126576] = { -- Velothi Seat, Meditation - itemPrice = 10834, + [126572] = { -- Velothi Shroud, Mourning + itemPrice = 5417, itemDate = "2017-08-11", }, @@ -152,7 +152,7 @@ FurC.LuxuryFurnisher[FURC_MORROWIND] = { -- June, 9-11 [120808] = { -- Statue Base, Circular - itemPrice = 10000, + itemPrice = 5417, itemDate = "2017-06-09", }, [120811] = { -- Statue, Justice diff --git a/data/03_Reach/HotR_LuxuryFurnisher.lua b/data/03_Reach/HotR_LuxuryFurnisher.lua index 4fe627b..87d4752 100644 --- a/data/03_Reach/HotR_LuxuryFurnisher.lua +++ b/data/03_Reach/HotR_LuxuryFurnisher.lua @@ -29,10 +29,27 @@ FurC.LuxuryFurnisher[FURC_REACH] = { itemPrice = 10000, itemDate = "2017-10-13", }, + + [132149] = { -- Orcish War Totem + itemPrice = 20000, + itemDate = "2017-10-13", + }, + [132150] = { -- Orcish Battle Totem + itemPrice = 20000, + itemDate = "2017-10-13", + }, + [132151] = { -- Orchish Totem + itemPrice = 20000, + itemDate = "2017-10-13", + }, + [132152] = { -- Orchish Totem + itemPrice = 35000, + itemDate = "2017-10-13", + }, -- Oct. 7 [132145] = { -- Orsinium Tent, Chief’s - itemPrice = 5000, + itemPrice = 15000, itemDate = "2017-10-06", }, [132146] = { -- Orsinium Relief, Malacath @@ -77,7 +94,7 @@ FurC.LuxuryFurnisher[FURC_REACH] = { itemDate = "2017-09-22", }, [131437] = { -- Reach Vine, Bloodroot Tendril - itemPrice = 20000, + itemPrice = 25000, itemDate = "2017-09-22", }, diff --git a/data/05_Dragonbones/DragonB_LuxuryFurnisher.lua b/data/05_Dragonbones/DragonB_LuxuryFurnisher.lua index bbf84f5..bb4648a 100644 --- a/data/05_Dragonbones/DragonB_LuxuryFurnisher.lua +++ b/data/05_Dragonbones/DragonB_LuxuryFurnisher.lua @@ -10,7 +10,7 @@ FurC.LuxuryFurnisher[FURC_DRAGONS] = { itemDate = "2018-05-19", }, [120809] = { -- Statue Base, Square - itemPrice = 10000, + itemPrice = 5000, itemDate = "2018-05-19", }, [120810] = { -- Statue, Faith @@ -27,7 +27,7 @@ FurC.LuxuryFurnisher[FURC_DRAGONS] = { itemDate = "2018-05-12", }, [134840] = { -- Necromancer's Spire, Compact - itemPrice = 75000, + itemPrice = 25000, itemDate = "2018-05-12", }, [134841] = { -- Necromancer's Spire, Huge @@ -147,7 +147,7 @@ FurC.LuxuryFurnisher[FURC_DRAGONS] = { itemDate = "2018-03-31", }, [120888] = { -- Bat Bloom - itemPrice = 10000, + itemPrice = 15000, itemDate = "2018-03-31", }, [120887] = { -- Fan Bush diff --git a/data/EventItems.lua b/data/EventItems.lua index 7139671..775bdd8 100644 --- a/data/EventItems.lua +++ b/data/EventItems.lua @@ -29,7 +29,12 @@ FurC.EventItems[FURC_MORROWIND] = { [126162] = true, -- Song of Pelinal, #6 [126163] = true, -- Song of Pelinal, #7 [126164] = true, -- Song of Pelinal, #8 + }, + }, + ["New Life"] = { + ["Gift Box"] = { [118053] = true, -- Common Campfire, Outdoor + [130326] = true, -- Witches Brazier, Primitive Log", }, }, } @@ -37,7 +42,7 @@ FurC.EventItems[FURC_REACH] = { ["Witches' Festival"] = { ["Plunder Skull"] = { - [130326] = true, -- Witches Brazier, Primitive Log", + [130337] = true, -- Witches Corpse, Wrapped", [130336] = true, -- Witches Remains, Hagraven", [130325] = true, -- Witches Totem, Emphatic Warning", @@ -49,17 +54,17 @@ FurC.EventItems[FURC_REACH] = { [130339] = true, -- Witches Totem, Twisted Vines and Skull [130338] = true, -- Witches Bones, Offering", [131434] = true, -- Witch's Festival, Cursed Totem, - [132154] = true, -- Witch's Totem, Bog", [130302] = GetString(SI_FURC_WW), -- Shrub, Burnt Brush" [130298] = GetString(SI_FURC_WW), -- Branch, Curved Laurel [130296] = GetString(SI_FURC_WW), -- Branch, Sturdy Laurel [130295] = GetString(SI_FURC_WW), -- Branch, Sturdy Burnt - [130293] = GetString(SI_FURC_WW), -- Branch, Forked Burnt + [130294] = GetString(SI_FURC_WW), -- Branch, Forked Burnt [130293] = GetString(SI_FURC_WW), -- Branch, Curved Burnt [130301] = GetString(SI_FURC_WW), -- Saplings, Burnt Sparse [130299] = GetString(SI_FURC_WW), -- Saplings, Burnt Cluster [130300] = GetString(SI_FURC_WW), -- Saplings, Burnt Tall [130297] = GetString(SI_FURC_WW), -- Branch, Forked Laurel + [130280] = GetString(SI_FURC_WW), -- Sapling, Petrified Ashen } } } diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua index f7c8ee0..c0d95de 100644 --- a/data/MiscItemSources.lua +++ b/data/MiscItemSources.lua @@ -11,8 +11,9 @@ local FURC_CANBESTOLEN_NERDS = FURC_CANBESTOLEN_SCHOLARS .. " and mages" local FURC_CANBESTOLEN_RELIG = GetString(SI_FURC_CANBESTOLEN) .. " from priests and pilgrims" local FURC_CANBESTOLEN_THIEF = GetString(SI_FURC_CANBESTOLEN) .. " from thieves" local FURC_CANBESTOLEN_WW = GetString(SI_FURC_CANBESTOLEN) .. " from woodworkers" +local FURC_CANBESTOLEN_WW = GetString(FURC_CANBESTOLEN_DRUNKARDS) .. " from drunkards" - +local FURC_PLANTS_VVARDENFELL = GetString(FURC_PLANTS) .. " on Vvardenfell" local FURC_CANBESTOLEN_WROTHGAR = GetString(SI_FURC_CANBESTOLEN) .. " in Wrothgar" local FURC_AUTOMATON_CC = GetString(SI_FURC_AUTOMATON) .. " in Clockwork City" @@ -33,6 +34,11 @@ end local function getScamboxString(scamboxVersion) return string.format("%s (%s)", GetString(SI_FURC_SCAMBOX), GetString(scamboxVersion)) end +local function getHouseString(houseId1, houseId2) + local houseName = GetCollectibleName(houseId1) + if houseId2 then houseName = houseName .. ", " .. GetCollectibleName(houseId2) end + return zo_strformat(GetString(SI_FURC_HOUSE), houseName) +end FurC.MiscItemSources[FURC_DRAGONS] = { -- Reach [FURC_DROP] = { @@ -102,13 +108,13 @@ FurC.MiscItemSources[FURC_REACH] = { -- Reach }, [FURC_DROP] = { -- Coldharbour items - [130284] = FURC_HARVEST_CHARBOR, -- Glowstalk, Seedlings - [131422] = FURC_HARVEST_CHARBOR, -- Flower Patch, Glowstalks - [130283] = FURC_HARVEST_CHARBOR, -- Glowstalk, Sprout - [130285] = FURC_HARVEST_CHARBOR, -- Glowstalk, Young - [131420] = FURC_HARVEST_CHARBOR, -- Shrub, Glowing Thistle - [130281] = FURC_HARVEST_CHARBOR, -- Glowstalk, Towering - [130282] = FURC_HARVEST_CHARBOR, -- Glowstalk, Strong + [130284] = GetString(SI_FURC_HARVEST), -- Glowstalk, Seedlings + [131422] = GetString(SI_FURC_HARVEST), -- Flower Patch, Glowstalks + [130283] = GetString(SI_FURC_HARVEST), -- Glowstalk, Sprout + [130285] = GetString(SI_FURC_HARVEST), -- Glowstalk, Young + [131420] = GetString(SI_FURC_HARVEST), -- Shrub, Glowing Thistle + [130281] = GetString(SI_FURC_HARVEST), -- Glowstalk, Towering + [130282] = GetString(SI_FURC_HARVEST), -- Glowstalk, Strong [130067] = GetString(SI_FURC_DAEDRA_SOURCE), -- Daedric Chain Segment }, @@ -129,8 +135,10 @@ FurC.MiscItemSources[FURC_MORROWIND] = { -- Morrowind [126764] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Prowess [126702] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Reverance [126700] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Honor - [126703] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Mourning - [126572] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Mysteries + [126703] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Mysteries + [126752] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Discovery + [126755] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Change + [126756] = GetString(SI_FURC_TOMBS), -- Velothi Shroud, Mercy [126773] = GetString(SI_FURC_TOMBS), -- Velothi Caisson, Crypt [126753] = GetString(SI_FURC_TOMBS), -- Velothi Cerecloth, Austere @@ -158,6 +166,11 @@ FurC.MiscItemSources[FURC_MORROWIND] = { -- Morrowind [126596] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tapestry, Volcano [126597] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Oversized Volcano + [126605] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tryptich, Waterfall + [126606] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tapestry, Waterfall + [126607] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Oversized Waterfall + [126608] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Classic Waterfall + [126609] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Modest Waterfall [126598] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Panels, Waterfall [126599] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tryptich, Geyser [126600] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tapestry, Geyser @@ -172,25 +185,69 @@ FurC.MiscItemSources[FURC_MORROWIND] = { -- Morrowind [126393] = GetString(SI_FURC_DAILY_ASHLANDERS), -- Crimson Shard of Moonshadow -- drops from plants - [125631] = GetString(SI_FURC_PLANTS), -- Plants, Ash Frond - [125647] = GetString(SI_FURC_PLANTS), -- Plants, Ash Frond - [131420] = GetString(SI_FURC_PLANTS), -- Plants, Ash Frond - [125553] = GetString(SI_FURC_PLANTS), -- Flowers, Netch Cabbage Stalks - [125551] = GetString(SI_FURC_PLANTS), -- Flowers, Netch Cabbage - [125552] = GetString(SI_FURC_PLANTS), -- Flowers, Netch Cabbage Patch - [125543] = GetString(SI_FURC_PLANTS), -- Fern, Ashen - [125633] = GetString(SI_FURC_PLANTS), -- Plants, Hanging Pitcher Pair - - [130280] = GetString(SI_FURC_WW), -- Sapling, Petrified Ashen - + [125631] = FURC_PLANTS_VVARDENFELL, -- Plants, Ash Frond + [125647] = FURC_PLANTS_VVARDENFELL, -- Plants, Ash Frond + [131420] = FURC_PLANTS_VVARDENFELL, -- Plants, Ash Frond + [125553] = FURC_PLANTS_VVARDENFELL, -- Flowers, Netch Cabbage Stalks + [125551] = FURC_PLANTS_VVARDENFELL, -- Flowers, Netch Cabbage + [125552] = FURC_PLANTS_VVARDENFELL, -- Flowers, Netch Cabbage Patch + [125543] = FURC_PLANTS_VVARDENFELL, -- Fern, Ashen + [125633] = FURC_PLANTS_VVARDENFELL, -- Plants, Hanging Pitcher Pair + + [125551] = FURC_PLANTS_VVARDENFELL, -- Flowers, Netch Cabbage + [125552] = FURC_PLANTS_VVARDENFELL, -- Flowers, Netch Cabbage Patch + [125553] = FURC_PLANTS_VVARDENFELL, -- Flowers, Netch Cabbage Stalks + [125562] = FURC_PLANTS_VVARDENFELL, -- Grass, Foxtail Cluster + [125595] = FURC_PLANTS_VVARDENFELL, -- Mushroom, Poison Pax Shelf + [125596] = FURC_PLANTS_VVARDENFELL, -- Mushroom, Poison Pax Stool + [125600] = FURC_PLANTS_VVARDENFELL, -- Mushroom, Spongecap Patch + [125606] = FURC_PLANTS_VVARDENFELL, -- Mushroom, Young Milkcap + [125608] = FURC_PLANTS_VVARDENFELL, -- Mushrooms, Buttercake Cluster + [125609] = FURC_PLANTS_VVARDENFELL, -- Mushrooms, Buttercake Stack + [125613] = FURC_PLANTS_VVARDENFELL, -- Mushrooms, Lavaburst Sprouts + [125590] = FURC_PLANTS_VVARDENFELL, -- Mushrooms, Lavaburst Cluster + [125617] = FURC_PLANTS_VVARDENFELL, -- Plant, Bitter Stalk + [125618] = FURC_PLANTS_VVARDENFELL, -- Plant, Golden Lichen + [125619] = FURC_PLANTS_VVARDENFELL, -- Plant, Hanging Pitcher + [125620] = FURC_PLANTS_VVARDENFELL, -- Plant, Hefty Elkhorn + [125621] = FURC_PLANTS_VVARDENFELL, -- Plant, Lava Brier + [125622] = FURC_PLANTS_VVARDENFELL, -- Plant, Lava Leaf + [125630] = FURC_PLANTS_VVARDENFELL, -- Plant, Young Elkhorn + [125631] = FURC_PLANTS_VVARDENFELL, -- Plants, Ash Frond + [125632] = FURC_PLANTS_VVARDENFELL, -- Plants, Hanging Pitcher Cluster + [125633] = FURC_PLANTS_VVARDENFELL, -- Plants, Hanging Pitcher Pair + [125634] = FURC_PLANTS_VVARDENFELL, -- Plants, Lava Pitcher Cluster + [125635] = FURC_PLANTS_VVARDENFELL, -- Plants, Lava Pitcher Shoots + [125636] = FURC_PLANTS_VVARDENFELL, -- Plants, Swamp Pitcher Cluster + [125637] = FURC_PLANTS_VVARDENFELL, -- Plants, Swamp Pitcher Shoots + [125647] = FURC_PLANTS_VVARDENFELL, -- Shrub, Bitter Brush + [125648] = FURC_PLANTS_VVARDENFELL, -- Shrub, Bitter Cluster + [125649] = FURC_PLANTS_VVARDENFELL, -- Shrub, Flowering Dusk + [125650] = FURC_PLANTS_VVARDENFELL, -- Shrub, Golden Lichen + [125670] = FURC_PLANTS_VVARDENFELL, -- Toadstool, Bloodtooth + [125671] = FURC_PLANTS_VVARDENFELL, -- Toadstool, Bloodtooth Cap + [125672] = FURC_PLANTS_VVARDENFELL, -- Toadstool, Bloodtooth Cluster + + [126759] = GetString(SI_FURC_QUESTREWARD) .. " Suran", -- Sir Sock's Ball of Yarn [126592] = GetString(SI_FURC_PLANTS), -- Plants, Hanging Pitcher Pair }, [FURC_CROWN] = { + [125566] = getHouseString(1243), -- Hlaalu Shed, Enclosed + [125568] = getHouseString(1243), -- Hlaalu Sidewalk, Sillar Stone + [125577] = getHouseString(1243), -- Hlaalu Wall Post, Sillar Stone + [125579] = getHouseString(1243), -- Hlaalu Well, Braced Sillar Stone + [125573] = getHouseString(1243, 1244), -- Hlaalu Streetlamp, Paper + [125565] = getHouseString(1244), -- Hlaalu Lantern, Hanging Paper + [125567] = getHouseString(1244), -- Hlaalu Shed, Open + [125580] = getHouseString(1244), -- Hlaalu Well, Covered Sillar Stone + [118663] = getHouseString(1078, 1079), -- Dark Elf Bed of Coals + }, [FURC_JUSTICE] = { - [126481] = FURC_CANBESTOLEN_RELIG, -- Indoril Incense, Burning + [126481] = FURC_CANBESTOLEN_RELIG .. " on Vvardenfell", -- Indoril Incense, Burning + [126772] = FURC_CANBESTOLEN_THIEF -- Khajiiti Ponder sphere }, } FurC.MiscItemSources[FURC_HOMESTEAD] = { @@ -213,6 +270,9 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118713] = FURC_CANBEPICKED_GUARD, -- Khajiiti Male [118716] = FURC_CANBEPICKED_GUARD, -- Orc Female [118717] = FURC_CANBEPICKED_GUARD, -- Orc Male + + + [121055] = FURC_CANBESTOLEN_DRUNKARDS, -- Breton Mug, Full [116512] = FURC_CANBESTOLEN_WROTHGAR, -- Orcish Carpet Blood @@ -252,6 +312,11 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118221] = GetString(SI_FURC_CHESTS), -- Painting of Summer, Sturdy [118222] = GetString(SI_FURC_CHESTS), -- Painting of Jungle, Sturdy [118223] = GetString(SI_FURC_CHESTS), -- Painting of Palms, Sturdy + [118265] = GetString(SI_FURC_CHESTS), -- Painting of Winter, Bolted + [118266] = GetString(SI_FURC_CHESTS), -- Painting of Bridge, Bolted + [118267] = GetString(SI_FURC_CHESTS), -- Painting of Autumn, Bolted + [118268] = GetString(SI_FURC_CHESTS), -- Painting of Great Ruins, Bolted + }, diff --git a/locale/en.lua b/locale/en.lua index 638f105..c226c05 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -66,13 +66,14 @@ 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_Rolis = "Sold by |cd68957Rolis Hlaalu|r <<1>>", + SI_FURC_STRING_Rolis = "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 Rolis Hlaalu or Faustina Curio", + SI_FURC_QUESTREWARD = "Reward for a quest in ", -- =============================== -- -- ============ MENU ============= -- @@ -234,6 +235,7 @@ local strings = { SI_FURC_WW = "occasionally found in wood nodes", SI_FURC_PLANTS = "from harvesting plants", SI_FURC_SCAMBOX = "Crown Crates", + SI_FURC_HOUSE = "From a furnished purchase of <<1>>", SI_FURC_AUTOMATON = "from automatons", SI_FURC_TOMBS = "Ancestor tombs and ruins on Vvardenfell", SI_FURC_DAEDRA_SOURCE = "from Daedra and Dolmen chests", diff --git a/startup.lua b/startup.lua index ee1ca84..d71966d 100644 --- a/startup.lua +++ b/startup.lua @@ -1,7 +1,7 @@ FurnitureCatalogue = {} FurnitureCatalogue.name = "FurnitureCatalogue" FurnitureCatalogue.author = "manavortex" -FurnitureCatalogue.version = "2.4.2" +FurnitureCatalogue.version = "2.4.3" FurnitureCatalogue.CharacterName = nil FurnitureCatalogue.settings = {}