diff --git a/FurnitureCatalogue/FurnitureCatalogue.txt b/FurnitureCatalogue/FurnitureCatalogue.txt index acdb5af..d9a0ef2 100644 --- a/FurnitureCatalogue/FurnitureCatalogue.txt +++ b/FurnitureCatalogue/FurnitureCatalogue.txt @@ -1,7 +1,7 @@ ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.1.1 -## APIVersion: 100021 +## Version: 2.1.3 +## APIVersion: 100021 100022 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat diff --git a/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua b/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua index 65eb1cc..bb4d55c 100644 --- a/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua +++ b/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua @@ -165,19 +165,19 @@ FurC.LuxuryFurnisher[FURC_HOMESTEAD] = { [120798] = { -- Wedding Blossoms, Blue itemPrice = 2500, - itemDate = "2017-02-24", + itemDate = "2018-02-10", }, [120800] = { -- Wedding Curtain itemPrice = 7500, - itemDate = "2017-02-24", + itemDate = "2018-02-10", }, [120801] = { -- Wedding Lantern itemPrice = 5000, - itemDate = "2017-02-24", + itemDate = "2018-02-10", }, [120797] = { -- Wedding Flower Trellis itemPrice = 10000, - itemDate = "2017-02-24", + itemDate = "2018-02-10", }, } diff --git a/FurnitureCatalogue/data/Homestead/H_Recipes.lua b/FurnitureCatalogue/data/Homestead/H_Recipes.lua index 6c0f3a3..8be51c8 100644 --- a/FurnitureCatalogue/data/Homestead/H_Recipes.lua +++ b/FurnitureCatalogue/data/Homestead/H_Recipes.lua @@ -968,7 +968,6 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119428, -- Common Bowl, Serving 119429, -- Ham, Display 119432, -- Hourglass, Common - 119437, -- Pie, Display 119438, -- Baked Potato, Display 119439, -- Pot Pie, Display 119440, -- Pie Dish", Empty diff --git a/FurnitureCatalogue/data/Homestead/H_Rollis.lua b/FurnitureCatalogue/data/Homestead/H_Rollis.lua index 3c48f70..3a6f647 100644 --- a/FurnitureCatalogue/data/Homestead/H_Rollis.lua +++ b/FurnitureCatalogue/data/Homestead/H_Rollis.lua @@ -26,30 +26,10 @@ FurC.Rollis[FURC_HOMESTEAD] = { [119822] = 250, } - -FurC.Rollis_Recipes[FURC_HOMESTEAD] = { - 121200, -- Cabinet, Poisonmaker's - 121166, -- Heirloom Podium, Skinning - 121168, -- Tools, Case - 121214, -- Mortar + Pestle - 121163, -- Orcish Skull Goblet, Full - 121163, -- Apparatus, Boiler - 121165, -- Apparatus, Gem Caliper - 121197, -- Bottle, Poison Elixir - 121164, -- Case of Vials - 121209, -- Orcish Tapestry, Spear - 121207, -- Target Skeleton - 121315, -- Robust Target Skeleton - 126582, -- Target Centurion - 126583, -- Robust Target Centurion +FurC.Rollis_Recipes[FURC_HOMESTEAD] = { + 121207, -- Target Skeleton + 121315, -- Robust Target Skeleton + 126582, -- Target Centurion + 126583, -- Robust Target Centurion } -if GetAPIVersion() == 100022 then - FurC.Rollis_Recipes[FURC_HOMESTEAD] = { - 121207, -- Target Skeleton - 121315, -- Robust Target Skeleton - 126582, -- Target Centurion - 126583, -- Robust Target Centurion - } - -end diff --git a/FurnitureCatalogue/data/LuxuryFurnisher.lua b/FurnitureCatalogue/data/LuxuryFurnisher.lua index 412b4fd..d3e3969 100644 --- a/FurnitureCatalogue/data/LuxuryFurnisher.lua +++ b/FurnitureCatalogue/data/LuxuryFurnisher.lua @@ -3,7 +3,10 @@ FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {} FurC.LuxuryFurnisher[FURC_CLOCKWORK] = { - + [117876] = { -- Wedding Curtain, Wide + itemPrice = 7500, + itemDate = "2018-02-10", + }, [134469] = { -- Ayleid Constellation Stele, the Mage itemPrice = 20000, diff --git a/FurnitureCatalogue/data/MiscItemSources.lua b/FurnitureCatalogue/data/MiscItemSources.lua index ad44379..09e57a4 100644 --- a/FurnitureCatalogue/data/MiscItemSources.lua +++ b/FurnitureCatalogue/data/MiscItemSources.lua @@ -153,6 +153,10 @@ FurC.MiscItemSources = { [126700] = FURC_TOMBS, -- Velothi Shroud, Honor [126703] = FURC_TOMBS, + -- Velothi Shroud, Mourning + [126572] = FURC_TOMBS, + -- Velothi Shroud, Mysteries + [126757] = FURC_TOMBS, -- Ashlander dailies [126119] = FURC_DAILY_ASHLANDERS, -- Crimson Shard of Moonshadow @@ -255,7 +259,3 @@ FurC.MiscItemSources = { } }, } - -if GetAPIVersion() ~= 100022 then - FurC.MiscItemSources[FURC_DRAGONS] = {} -end \ No newline at end of file diff --git a/FurnitureCatalogue/data/Rollis.lua b/FurnitureCatalogue/data/Rollis.lua index ac98bd5..d946a5d 100644 --- a/FurnitureCatalogue/data/Rollis.lua +++ b/FurnitureCatalogue/data/Rollis.lua @@ -39,21 +39,4 @@ FurC.Rollis[FURC_DRAGONS] = { } FurC.Rollis_Recipes[FURC_DRAGONS] = { [133576] = 50, -} - - - -if GetAPIVersion() ~= 100022 then - FurC.FaustinaRecipes[FURC_DRAGONS] = {} - FurC.Rollis_Recipes[FURC_DRAGONS] = {} - FurC.Rollis[FURC_DRAGONS] = {} - FurC.Faustina[FURC_DRAGONS] = {} - FurC.Rollis_Recipes[FURC_MORROWIND] = { - 132194, -- Mammoth Cheese - 132191, -- Dwarven Gyroscope, Masterwork - 132190, -- Mages' Apparatus, Master - 132192, -- Dres Sewing Kit - 132193, -- Hlaalu Bathtub - 132195, -- Telvanni Candelabra - } -end \ No newline at end of file +} \ No newline at end of file diff --git a/FurnitureCatalogue/data/RumourRecipes.lua b/FurnitureCatalogue/data/RumourRecipes.lua index 925a0dc..c070ade 100644 --- a/FurnitureCatalogue/data/RumourRecipes.lua +++ b/FurnitureCatalogue/data/RumourRecipes.lua @@ -42,4 +42,9 @@ FurC.RumourRecipes = { 119466, -- Podium, Engraved + 119437, -- Pie, Display + + 121161, -- Ram Horns, Mounted + 121216, -- Redguard Divider, Gilded + } \ No newline at end of file