diff --git a/FurnitureCatalogue/FurnitureCatalogue.txt b/FurnitureCatalogue/FurnitureCatalogue.txt index f5a10a0..0e789ed 100644 --- a/FurnitureCatalogue/FurnitureCatalogue.txt +++ b/FurnitureCatalogue/FurnitureCatalogue.txt @@ -1,6 +1,6 @@ ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.2.8 +## Version: 2.2.9 ## APIVersion: 100022 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat diff --git a/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua b/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua index 394eb21..bb1bb91 100644 --- a/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua +++ b/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua @@ -53,12 +53,7 @@ FurC.LuxuryFurnisher[FURC_HOMESTEAD] = { itemDate = "2017-05-05", }, - - - - - - + [120803] = { -- Hews Bane Bed, Royal itemPrice = 20000, itemDate = "2018-02-24", diff --git a/FurnitureCatalogue/data/MiscItemSources.lua b/FurnitureCatalogue/data/MiscItemSources.lua index f76e1f0..32b8ce9 100644 --- a/FurnitureCatalogue/data/MiscItemSources.lua +++ b/FurnitureCatalogue/data/MiscItemSources.lua @@ -11,6 +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_WROTHGAR = GetString(SI_FURC_CANBESTOLEN) .. " in Wrothgar" local FURC_AUTOMATON_CC = GetString(SI_FURC_AUTOMATON) .. " in Clockwork City" local FURC_AUTOMATON_VV = GetString(SI_FURC_AUTOMATON) .. " on Vvardenfell" @@ -20,7 +23,6 @@ local FURC_HARVEST_CHARBOR = GetString(SI_FURC_HARVEST) .. " in Coldharbour" local FURC_SCAMBOX_F_ATRO = zo_strformat("<<1>> (<<2>>)", GetString(SI_FURC_SCAMBOX), GetString(SI_FURC_FLAME_ATRONACH)) - local FURC_DB_POISON = zo_strformat("<<1>> <<2>>", GetString(SI_FURC_DB), GetString(SI_FURC_DB_POISON)) local FURC_DB_SNEAKY = zo_strformat("<<1>> <<2>>", GetString(SI_FURC_DB), GetString(SI_FURC_DB_STEALTH)) @@ -36,7 +38,15 @@ end FurC.MiscItemSources = { [FURC_DRAGONS] = { -- Reach - [FURC_DROP] = {}, + [FURC_DROP] = { + [130209] = GetString(SI_FURC_DRAGON_DUNGEON_DROP), -- Mushrooms, Puspocket Group + [130210] = GetString(SI_FURC_DRAGON_DUNGEON_DROP), -- Mushrooms, Puspocket Cluster + [130211] = GetString(SI_FURC_DRAGON_DUNGEON_DROP), -- Mushroom, Puspocket Sporecap + [130212] = GetString(SI_FURC_DRAGON_DUNGEON_DROP), -- Mushroom, Large Puspocket + [130213] = GetString(SI_FURC_DRAGON_DUNGEON_DROP), -- Mushroom, Tall Puspocket + [130214] = GetString(SI_FURC_DRAGON_DUNGEON_DROP), -- Mushrooms, Large Puspocket Cluster + }, + [FURC_JUSTICE] = {}, [FURC_CROWN] = { [130212] = getCrownStorePriceString(1000), -- Daedric Worship: The Ayleids @@ -63,12 +73,13 @@ FurC.MiscItemSources = { }, [FURC_JUSTICE] = { - [134411] = FURC_CANBESTOLENINCC, -- Ventilation shaft - [134415] = FURC_CANBESTOLENINCC, -- Clockwork Dial Calipers, Handheld - [134413] = FURC_CANBESTOLENINCC, -- Clockwork Magnifier, Handheld - [134412] = FURC_CANBESTOLENINCC, -- Clockwork Piston, Miniature [134410] = FURC_CANBESTOLENINCC, -- Clockwork Crank, Miniature [134411] = FURC_CANBESTOLENINCC, -- Clockwork Gear Shaft, Miniature + [134412] = FURC_CANBESTOLENINCC, -- Clockwork Piston, Miniature + [134413] = FURC_CANBESTOLENINCC, -- Clockwork Magnifier, Handheld + [134414] = FURC_CANBESTOLENINCC, -- Clockwork Micrometer, Handheld + [134415] = FURC_CANBESTOLENINCC, -- Clockwork Dial Calipers, Handheld + [134416] = FURC_CANBESTOLENINCC, -- Clockwork Slide Calipers, Handheld [134402] = GetString(SI_FURC_CANBESTOLEN), -- Spool, Empty [134400] = GetString(SI_FURC_CANBESTOLEN), -- Soft Leather, Stacked [134401] = GetString(SI_FURC_CANBESTOLEN), -- Soft Leather, Folded @@ -130,8 +141,34 @@ FurC.MiscItemSources = { [126757] = GetString(SI_FURC_TOMBS), - [126467] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Modest Valley - [126464] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Oversized Valley + [126462] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Oversized Volcanic + [126463] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Oversized Forest + [126464] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Oversized Valley + + [126465] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Modest Volcanic + [126466] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Modest Forest + [126467] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Modest Valley + + [126468] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Classic Volcanic + [126469] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Classic Forest + [126470] = GetString(SI_FURC_DROP_CHEST_VVARDENFELL), -- Telvanni Painting, Classic Valley + + + [126592] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Panels, Volcano + [126593] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tryptich, Volcano + [126594] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Classic Volcano + [126595] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Modest Volcano + [126596] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Tapestry, Volcano + [126597] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Oversized Volcano + + [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 + [126601] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Oversized Geyser + [126602] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Classic Geyser + [126603] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Painting, Modest Geyser + [126604] = GetString(SI_FURC_VVARDENFELL_PAINTING), -- Velothi Panels, Geyser + -- Ashlander dailies [126119] = GetString(SI_FURC_DAILY_ASHLANDERS), -- Crimson Shard of Moonshadow @@ -146,6 +183,9 @@ FurC.MiscItemSources = { [125543] = GetString(SI_FURC_PLANTS), -- Fern, Ashen [125633] = GetString(SI_FURC_PLANTS), -- Plants, Hanging Pitcher Pair + + [126592] = GetString(SI_FURC_PLANTS), -- Plants, Hanging Pitcher Pair + }, [FURC_CROWN] = { }, @@ -173,6 +213,9 @@ FurC.MiscItemSources = { [118713] = FURC_CANBEPICKED_GUARD, -- Khajiiti Male [118716] = FURC_CANBEPICKED_GUARD, -- Orc Female [118717] = FURC_CANBEPICKED_GUARD, -- Orc Male + + [116512] = FURC_CANBESTOLEN_WROTHGAR, -- Orcish Carpet Blood + }, [FURC_FISHING] = { @@ -189,14 +232,29 @@ FurC.MiscItemSources = { [120754] = GetString(SI_FURC_CANBEFISHED), -- Kelp, Small Pile [118897] = GetString(SI_FURC_CANBEFISHED), -- Seashell, Pink Scallop [118898] = GetString(SI_FURC_CANBEFISHED), -- Seashell, White Scallop + [118899] = GetString(SI_FURC_CANBEFISHED), -- Seashell, Starfish + [118900] = GetString(SI_FURC_CANBEFISHED), -- Seashell, Noble Starfish + }, [FURC_DROP] = { [121058] = FURC_DB_SNEAKY, -- Candles of Silence [119936] = FURC_DB_POISON, -- Poisoned Blood [119938] = FURC_DB_POISON, -- Light and Shadow - [119952] = FURC_DB_POISON, -- Sacrificial Heart - }, + [119952] = FURC_DB_POISON, -- Sacrificial Heart + + -- Paintings + [118216] = GetString(SI_FURC_CHESTS), -- Painting of Spring, Sturdy + [118217] = GetString(SI_FURC_CHESTS), -- Painting of Pasture, Sturdy + [118218] = GetString(SI_FURC_CHESTS), -- Painting of Creek, Sturdy + [118219] = GetString(SI_FURC_CHESTS), -- Painting of Lakes, Sturdy + [118220] = GetString(SI_FURC_CHESTS), -- Painting of Crags, Sturdy + [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 + [190912] = GetString(SI_FURC_CHESTS), -- Painting of Lake, Sturdy + + }, [FURC_CROWN] = { [118096] = getCrownStorePriceString(10), -- Bread, Plain [118098] = getCrownStorePriceString(10), -- Common Bowl, Serving diff --git a/FurnitureCatalogue/data/RumourRecipes.lua b/FurnitureCatalogue/data/RumourRecipes.lua index 32cb800..765f9c7 100644 --- a/FurnitureCatalogue/data/RumourRecipes.lua +++ b/FurnitureCatalogue/data/RumourRecipes.lua @@ -56,4 +56,5 @@ FurC.RumourRecipes = { 115395, -- Nord Drinking Horn, Display 121203, -- Khajiit Brazier, Enchanted + } \ No newline at end of file diff --git a/FurnitureCatalogue/locale/de.lua b/FurnitureCatalogue/locale/de.lua index ad33923..00dfad3 100644 --- a/FurnitureCatalogue/locale/de.lua +++ b/FurnitureCatalogue/locale/de.lua @@ -44,7 +44,9 @@ local strings = { SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>", SI_FURC_STRING_VENDOR = "Sold by <<1>> (<<2>><<3>>)", SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio", - + SI_FURC_CHESTS = "From treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests", + -- =============================== -- -- ============ MENU ============= -- -- =============================== -- @@ -175,6 +177,31 @@ local strings = { -- =============================== -- SI_FURC_LABEL_ENTRIES = " entries -", + + + -- =============================== -- + -- ========= Item Sources ======== -- + -- =============================== -- + SI_FURC_CANBEPICKED = "can be pickpocketed", + SI_FURC_CANBESTOLEN = "can be stolen", + SI_FURC_CROWNSTORESOURCE = "Crown Store ", + SI_FURC_CANBEFISHED = "can be fished", + SI_FURC_HARVEST = "from harvesting nodes", + SI_FURC_PLANTS = "from harvesting plants", + SI_FURC_SCAMBOX = "Crown Crates", + SI_FURC_AUTOMATON = "from automatons", + SI_FURC_TOMBS = "Ancestor tombs and ruins on Vvardenfell", + SI_FURC_DAEDRA_SOURCE = "from Daedra and Dolmen chests", + SI_FURC_DB = "The Dark Brotherhood supplies vendor hands these out ", + SI_FURC_DB_POISON = "with poison", + SI_FURC_DB_STEALTH = "as a way to be less obtrusive", + SI_FURC_DAILY_ASHLANDERS = "Ashlander daily quest rewards", + SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival", + SI_FURC_DROP_CHEST_VVARDENFELL = "Extremely rarely from chests on Vvardenfell", + SI_FURC_FLAME_ATRONACH = "Flame Atronach", + SI_FURC_CHESTS = "from treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes", + SI_FURC_DRAGON_DUNGEON_DROP = "Fang Lair/Scalecaller Peak", } diff --git a/FurnitureCatalogue/locale/en.lua b/FurnitureCatalogue/locale/en.lua index 2172dd2..c6aa4f8 100644 --- a/FurnitureCatalogue/locale/en.lua +++ b/FurnitureCatalogue/locale/en.lua @@ -230,8 +230,11 @@ local strings = { SI_FURC_DB_STEALTH = "as a way to be less obtrusive", SI_FURC_DAILY_ASHLANDERS = "Ashlander daily quest rewards", SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival", - SI_FURC_DROP_CHEST_VVARDENFELL = "From chests on Vvardenfell", + SI_FURC_DROP_CHEST_VVARDENFELL = "Extremely rarely from chests on Vvardenfell", SI_FURC_FLAME_ATRONACH = "Flame Atronach", + SI_FURC_CHESTS = "from treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes", + SI_FURC_DRAGON_DUNGEON_DROP = "Fang Lair/Scalecaller Peak", } diff --git a/FurnitureCatalogue/locale/fr.lua b/FurnitureCatalogue/locale/fr.lua index f7de8da..31bc2bd 100644 --- a/FurnitureCatalogue/locale/fr.lua +++ b/FurnitureCatalogue/locale/fr.lua @@ -45,6 +45,8 @@ local strings = { SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>", SI_FURC_STRING_VENDOR = "Sold by <<1>> (<<2>><<3>>)", SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio", + SI_FURC_CHESTS = "From treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests", -- =============================== -- -- ============ MENU ============= -- @@ -176,6 +178,32 @@ local strings = { -- =============================== -- SI_FURC_LABEL_ENTRIES = " entries -", + + + + -- =============================== -- + -- ========= Item Sources ======== -- + -- =============================== -- + SI_FURC_CANBEPICKED = "can be pickpocketed", + SI_FURC_CANBESTOLEN = "can be stolen", + SI_FURC_CROWNSTORESOURCE = "Crown Store ", + SI_FURC_CANBEFISHED = "can be fished", + SI_FURC_HARVEST = "from harvesting nodes", + SI_FURC_PLANTS = "from harvesting plants", + SI_FURC_SCAMBOX = "Crown Crates", + SI_FURC_AUTOMATON = "from automatons", + SI_FURC_TOMBS = "Ancestor tombs and ruins on Vvardenfell", + SI_FURC_DAEDRA_SOURCE = "from Daedra and Dolmen chests", + SI_FURC_DB = "The Dark Brotherhood supplies vendor hands these out ", + SI_FURC_DB_POISON = "with poison", + SI_FURC_DB_STEALTH = "as a way to be less obtrusive", + SI_FURC_DAILY_ASHLANDERS = "Ashlander daily quest rewards", + SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival", + SI_FURC_DROP_CHEST_VVARDENFELL = "Extremely rarely from chests on Vvardenfell", + SI_FURC_FLAME_ATRONACH = "Flame Atronach", + SI_FURC_CHESTS = "from treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes", + SI_FURC_DRAGON_DUNGEON_DROP = "Fang Lair/Scalecaller Peak", } diff --git a/FurnitureCatalogue/locale/jp.lua b/FurnitureCatalogue/locale/jp.lua index b231d86..f69c004 100644 --- a/FurnitureCatalogue/locale/jp.lua +++ b/FurnitureCatalogue/locale/jp.lua @@ -45,6 +45,8 @@ local strings = { SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>", SI_FURC_STRING_VENDOR = "Sold by <<1>> (<<2>><<3>>)", SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio", + SI_FURC_CHESTS = "From treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests", -- =============================== -- -- ============ MENU ============= -- @@ -176,6 +178,32 @@ local strings = { -- =============================== -- SI_FURC_LABEL_ENTRIES = " entries -", + + + + -- =============================== -- + -- ========= Item Sources ======== -- + -- =============================== -- + SI_FURC_CANBEPICKED = "can be pickpocketed", + SI_FURC_CANBESTOLEN = "can be stolen", + SI_FURC_CROWNSTORESOURCE = "Crown Store ", + SI_FURC_CANBEFISHED = "can be fished", + SI_FURC_HARVEST = "from harvesting nodes", + SI_FURC_PLANTS = "from harvesting plants", + SI_FURC_SCAMBOX = "Crown Crates", + SI_FURC_AUTOMATON = "from automatons", + SI_FURC_TOMBS = "Ancestor tombs and ruins on Vvardenfell", + SI_FURC_DAEDRA_SOURCE = "from Daedra and Dolmen chests", + SI_FURC_DB = "The Dark Brotherhood supplies vendor hands these out ", + SI_FURC_DB_POISON = "with poison", + SI_FURC_DB_STEALTH = "as a way to be less obtrusive", + SI_FURC_DAILY_ASHLANDERS = "Ashlander daily quest rewards", + SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival", + SI_FURC_DROP_CHEST_VVARDENFELL = "Extremely rarely from chests on Vvardenfell", + SI_FURC_FLAME_ATRONACH = "Flame Atronach", + SI_FURC_CHESTS = "from treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes", + SI_FURC_DRAGON_DUNGEON_DROP = "Fang Lair/Scalecaller Peak", } diff --git a/FurnitureCatalogue/locale/ru.lua b/FurnitureCatalogue/locale/ru.lua index 920c51c..75f52e7 100644 --- a/FurnitureCatalogue/locale/ru.lua +++ b/FurnitureCatalogue/locale/ru.lua @@ -45,6 +45,8 @@ local strings = { SI_FURC_STRING_RECIPESFORCHAR = "recipes for <<1>>", SI_FURC_STRING_VENDOR = "Sold by <<1>> (<<2>><<3>>)", SI_FURC_STRING_VOUCHER_VENDOR = "Sold by either Rollis Hlaalu or Faustina Curio", + SI_FURC_CHESTS = "From treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes or treasure chests", -- =============================== -- -- ============ MENU ============= -- @@ -176,6 +178,31 @@ local strings = { -- =============================== -- SI_FURC_LABEL_ENTRIES = " entries -", + + + -- =============================== -- + -- ========= Item Sources ======== -- + -- =============================== -- + SI_FURC_CANBEPICKED = "can be pickpocketed", + SI_FURC_CANBESTOLEN = "can be stolen", + SI_FURC_CROWNSTORESOURCE = "Crown Store ", + SI_FURC_CANBEFISHED = "can be fished", + SI_FURC_HARVEST = "from harvesting nodes", + SI_FURC_PLANTS = "from harvesting plants", + SI_FURC_SCAMBOX = "Crown Crates", + SI_FURC_AUTOMATON = "from automatons", + SI_FURC_TOMBS = "Ancestor tombs and ruins on Vvardenfell", + SI_FURC_DAEDRA_SOURCE = "from Daedra and Dolmen chests", + SI_FURC_DB = "The Dark Brotherhood supplies vendor hands these out ", + SI_FURC_DB_POISON = "with poison", + SI_FURC_DB_STEALTH = "as a way to be less obtrusive", + SI_FURC_DAILY_ASHLANDERS = "Ashlander daily quest rewards", + SI_FURC_PLUNDERSKULL = "Drops from Plunder Skulls during Witches' Festival", + SI_FURC_DROP_CHEST_VVARDENFELL = "Extremely rarely from chests on Vvardenfell", + SI_FURC_FLAME_ATRONACH = "Flame Atronach", + SI_FURC_CHESTS = "from treasure chests", + SI_FURC_VVARDENFELL_PAINTING = "extremely rarely from safeboxes", + SI_FURC_DRAGON_DUNGEON_DROP = "Fang Lair/Scalecaller Peak", }