diff --git a/FurCData.lua b/FurCData.lua index 07522dd..b8ed9a0 100644 --- a/FurCData.lua +++ b/FurCData.lua @@ -472,10 +472,7 @@ local function scanFromFiles(shouldScanCharacter) startupMessage(GetString(SI_FURC_VERBOSE_DB_UPTODATE)) end - -function FurC.ScanFromFiles(scanCharacterKnowledge) - return scanFromFiles(scanCharacterKnowledge) -end +FurC.ScanFromFiles = scanFromFiles local function getScanFromFiles() diff --git a/FurnitureCatalogue.txt b/FurnitureCatalogue.txt index eaf72f7..a69da23 100644 --- a/FurnitureCatalogue.txt +++ b/FurnitureCatalogue.txt @@ -1,6 +1,6 @@ ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.5.131 +## Version: 2.5.14 ## APIVersion: 100023 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat diff --git a/FurnitureCatalogue_DevUtility/ContextMenu.lua b/FurnitureCatalogue_DevUtility/ContextMenu.lua index ee871fe..18514d3 100644 --- a/FurnitureCatalogue_DevUtility/ContextMenu.lua +++ b/FurnitureCatalogue_DevUtility/ContextMenu.lua @@ -10,7 +10,6 @@ this.textbox = this.textbox or FurCDevControl local textbox = this.textbox local cachedItemLink -local cachedControl local cachedName local cachedPrice local cachedCanBuy @@ -27,7 +26,7 @@ function this.clearControl() if not isMana then return end this.textbox:Clear() ZO_ClearTable(cachedItemIds) - this.control():SetHidden(true) + this.control:SetHidden(true) end function this.selectEntireTextbox() if (not isMana) or this.control:IsHidden() then return end @@ -42,14 +41,16 @@ function this.onTextboxTextChanged() this.clearControl() end +local s3 = " " local s4 = " " local s8 = " " -local s_default = (s4 .. "[%d] = GetString(SI_FURC_EXISITING_ITEMSOURCE_UNKNOWN_YET)," .. s8 .. "-- %w") +-- local s_default = (s4 .. "[%d] = GetString(SI_FURC_EXISITING_ITEMSOURCE_UNKNOWN_YET)," .. s4 .. "-- %s\n") +local s_default = (s4 .. "[%d] = getCrownStorePrice(99)," .. s8 .. " " .. "-- %s") local s_withPrice = (s4 .. "[%d] = {" .. s8 .. "-- %s\n" .. s8 .. - "itemPrice = %d,\n" .. s4 .. + "itemPrice" .. s3 .. "= %d,\n" .. s4 .. "},") -local s_withAchievement = (s4 .. "[%d] = {" .. s8 .. "--%w\n" .. s8 .. - "itemPrice = %d,\n" .. s8 .. +local s_withAchievement = (s4 .. "[%d] = {" .. s8 .. "--%s\n" .. s8 .. + "itemPrice" .. s3 .. "= %d,\n" .. s8 .. "achievement = 0,\n" .. s4 .. "},") local s_forRecipe = (s4 .. "%d, -- %s") @@ -60,21 +61,16 @@ local function makeOutput() local isRecipe = IsItemLinkFurnitureRecipe(cachedItemLink) local debugString = (isRecipe and s_forRecipe) or s_default - cachedPrice = cachedPrice or 0 cachedName = cachedName or GetItemLinkName(cachedItemLink) + if 0 < (cachedPrice or 0) then debugString = s_withPrice end + if not (cachedCanBuy or isRecipe) then debugString = s_withAchievement end - - if 0 < cachedPrice then - debugString = s_withPrice + if #(textbox:GetText() or "") == 0 then + debugString = debugString:sub(5, #debugString) end - if not (cachedCanBuy or isRecipe) then - debugString = s_withAchievement - end - - - return string.format(debugString, FurC.GetItemId(cachedItemLink), cachedName, cachedPrice) + return string.format(debugString .. "\n", FurC.GetItemId(cachedItemLink), cachedName, cachedPrice) end local function isItemIdCached() @@ -84,15 +80,24 @@ local function isItemIdCached() return false end -local linebreak = "\n" -local function concatToTextbox() - if not isMana then return end - if isItemIdCached() then return end +local function concatToTextbox(itemId) + + if (not isMana) or isItemIdCached() then return end local textSoFar = this.textbox:GetText() or "" - textSoFar = (#textSoFar > 0 and textSoFar .. linebreak) or textSoFar this.textbox:SetText(textSoFar .. makeOutput()) showTextbox() end +function this.concatToTextbox (itemId) + if itemId then + cachedItemLink = FurC.GetItemLink(itemId) + cachedCanBuy = true + cachedName = GetItemLinkName(cachedItemLink) + cachedPrice = 0 + end + concatToTextbox() +end + + local function doNothing() return end local S_ADD_TO_BOX = "Add data to textbox" @@ -123,7 +128,7 @@ end function FurCDevControl_HandleInventoryContextMenu(control) if not isMana then return end control = control or moc() - local name, price, meetsRequirementsToBuy, currencyQuantity1, currencyQuantity2 + local name, price, canBuy, currencyQuantity1, currencyQuantity2 local st = ZO_InventorySlot_GetType(control) cachedItemLink = nil @@ -135,24 +140,24 @@ function FurCDevControl_HandleInventoryContextMenu(control) cachedItemLink = GetItemLink(bagId, slotId, linkStyle) name = GetItemLinkName(cachedItemLink) price = 0 + canBuy = true elseif st == SLOT_TYPE_STORE_BUY then local storeEntryIndex = control.index or 0 - _, name, _, price, _, meetsRequirementsToBuy, _, _, _, + _, name, _, price, _, canBuy, _, _, _, _, currencyQuantity1, _, currencyQuantity2 = GetStoreEntryInfo(storeEntryIndex) cachedItemLink = GetStoreItemLink(storeEntryIndex) end - cachedControl = control cachedName = name - cachedPrice = price - cachedCanBuy = meetsRequirementsToBuy + cachedPrice = price or 0 + cachedCanBuy = canBuy if not FurC.Find(cachedItemLink) then return end zo_callLater(function() addMenuItems() ShowMenu() - end, 100) + end, 80) end @@ -165,7 +170,6 @@ function this.OnControlMouseUp(control, button) if not control.itemLink or #control.itemLink == 0 then return end cachedItemLink = control.itemLink - cachedControl = control zo_callLater(function() ItemTooltip:SetHidden(true) diff --git a/data/01_Homestead/H_Recipes.lua b/data/01_Homestead/H_Recipes.lua index 0c4934a..9fe36f6 100644 --- a/data/01_Homestead/H_Recipes.lua +++ b/data/01_Homestead/H_Recipes.lua @@ -43,7 +43,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 115759, -- Argonian Bar, Woven Corner 115760, -- Argonian Snakes in a Basket 115761, -- Argonian Bed, Woven - 115762, -- Argonian Bench", Woven + 115762, -- Argonian Bench, Woven 115763, -- Argonian Chair, Woven 115764, -- Argonian Trunk, Sturdy 115765, -- Argonian Bookshelf, Woven @@ -169,7 +169,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 115888, -- Wood Elf Rack, Meat 115889, -- Wood Elf Totem, Framed 115890, -- Wood Elf Totem, Skull - 115891, -- Wood Elf Trough", Slop + 115891, -- Wood Elf Trough, Slop 115892, -- Wood Elf Bin, Blue Feathers 115893, -- Wood Elf Bin, Feathers 115894, -- Wood Elf Cask, Painted @@ -190,7 +190,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 115908, -- Breton Bed, Bunk 115909, -- Breton Bed, Single 115910, -- Breton Pew, Windowed - 115911, -- Breton Bench", Plain + 115911, -- Breton Bench, Plain 115912, -- Breton Nightstand, Open 115913, -- Breton Bookcase, Tall 115914, -- Breton Chair, Slatted @@ -216,11 +216,11 @@ FurC.Recipes[FURC_HOMESTEAD] = { 115934, -- Breton Bed, Four-poster 115935, -- Breton Bed, Full 115936, -- Breton Pew, Knotwork - 115937, -- Breton Bench", Knotwork + 115937, -- Breton Bench, Knotwork 115938, -- Breton Bookcase, Knotwork 115939, -- Breton Chair, Rocking 115940, -- Breton Chest, Knotwork - 115941, -- Breton Hutch", Knotwork + 115941, -- Breton Hutch, Knotwork 115942, -- Breton Cupboard, Knotwork 115943, -- Breton Chest of Drawers 115944, -- Breton Counter, Long Cabinet @@ -271,9 +271,9 @@ FurC.Recipes[FURC_HOMESTEAD] = { 115991, -- Breton Runner, Bordered 115992, -- Breton Carpet, Bordered 115993, -- Breton Medallion, Lion - 115994, -- Breton Tablecloth", Blue + 115994, -- Breton Tablecloth, Blue 115995, -- Breton Lamp, Oil - 115996, -- Breton Tablecloth", Striped + 115996, -- Breton Tablecloth, Striped 115997, -- Breton Footlocker, Knotwork 115998, -- Breton Armoire, Knotwork 115999, -- Breton Cart, Palanquin @@ -376,7 +376,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 116097, -- Khajiit Bedding, Padded 116098, -- Khajiit Signpost, Fortified 116099, -- Khajiit Bed, Faded - 116100, -- Khajiit Bench", Padded + 116100, -- Khajiit Bench, Padded 116101, -- Khajiit Bookshelf, Arched 116102, -- Khajiit Trunk, Arched 116103, -- Khajiit Counter, Faded @@ -402,7 +402,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 116123, -- Khajiit Skooma Bubbler 116124, -- Khajiit Tent, Vacation 116125, -- Khajiit Bed, Canopy - 116126, -- Khajiit Couch", Padded + 116126, -- Khajiit Couch, Padded 116127, -- Khajiit Bookcase, Arched 116128, -- Khajiit Footlocker, Arched 116129, -- Khajiit Counter, Long Cabinet @@ -425,14 +425,14 @@ FurC.Recipes[FURC_HOMESTEAD] = { 116146, -- Khajiit Candle-Filled Lamp 116147, -- Nord Cart, Hay 116148, -- Nord Trunk, Heavy - 116149, -- Nord Hutch", Rough + 116149, -- Nord Hutch, Rough 116150, -- Nord Dresser, Rough 116151, -- Nord Nightstand, Rough 116152, -- Nord Lantern, Cage 116153, -- Nord Pot, Ceramic 116154, -- Nord Urn, Ceramic 116155, -- Nord Bed, Single - 116156, -- Nord Bench", Braced + 116156, -- Nord Bench, Braced 116157, -- Nord Stool, Rough 116158, -- Nord Table, Kitchen 116159, -- Nord Shelf, Wall @@ -441,7 +441,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 116162, -- Nord Pot, Stew 116163, -- Nord Candle, Tealight 116164, -- Nord Candleholder, Cup - 116165, -- Nord Torch", Triple + 116165, -- Nord Torch, Triple 116166, -- Nord Cart, Cargo 116167, -- Nord Trunk, Faded 116168, -- Nord Cauldron, Glazed @@ -449,7 +449,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 116170, -- Nord Amphora, Glazed 116171, -- Nord Vase, Bent 116172, -- Nord Bed, Sleigh - 116173, -- Nord Bench", Plank + 116173, -- Nord Bench, Plank 116174, -- Nord Bookshelf, Alcove 116175, -- Nord Chair, Braced 116176, -- Nord Counter, Long @@ -493,7 +493,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 116216, -- Nord Trunk, Buckled 118916, -- High Elf Wagon, Covered 118917, -- High Elf Bed, Winged Double - 118918, -- High Elf Bench", Covered + 118918, -- High Elf Bench, Covered 118919, -- High Elf Bookshelf, Winged 118920, -- High Elf Armoire, Winged 118921, -- High Elf Bookcase, Winged @@ -561,7 +561,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 118983, -- High Elf Lamp, Oil 118984, -- High Elf Bed, Bunk 118985, -- High Elf Bed, Single - 118986, -- High Elf Bench", Curved + 118986, -- High Elf Bench, Curved 118987, -- High Elf Bookshelf, Verdant 118988, -- High Elf Counter, Long Cabinet 118989, -- High Elf Desk, Sturdy @@ -590,7 +590,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119012, -- Orcish Table, Braced Formal 119013, -- Orcish Table, Braced Kitchen 119014, -- Orcish Trunk, Braced - 119015, -- Orcish Bench", Cabled + 119015, -- Orcish Bench, Cabled 119016, -- Orcish Shelves, Braced 119017, -- Orcish Bar, Long Block 119018, -- Orcish Counter, Block @@ -660,13 +660,13 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119082, -- Orcish Bookshelf, Peaked 119083, -- Orcish Sideboard, Engraved 119084, -- Orcish Cabinet, Engraved - 119085, -- Orcish Hutch", Engraved + 119085, -- Orcish Hutch, Engraved 119086, -- Orcish Coffer, Bolted 119087, -- Orcish Cupboards, Peaked 119088, -- Orcish Dresser, Engraved 119089, -- Orcish Cabinet, Bedside 119090, -- Orcish Counter, Corner - 119091, -- Orcish Hutch", Storage + 119091, -- Orcish Hutch, Storage 119092, -- Orcish Shelves, Storage 119093, -- Orcish Nightstand, Engraved 119094, -- Orcish Divider, Folded @@ -714,8 +714,8 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119135, -- Redguard Trunk, Heavy 119136, -- Redguard Bed, Wide 119137, -- Redguard Bed, Full - 119138, -- Redguard Couch", Bolted - 119139, -- Redguard Bench", Slatted + 119138, -- Redguard Couch, Bolted + 119139, -- Redguard Bench, Slatted 119140, -- Redguard Armchair, Slatted 119141, -- Redguard Chair, Backless 119142, -- Redguard Chair, Slatted @@ -746,7 +746,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119167, -- Redguard Amphora, Polished 119168, -- Redguard Cask, Sealed 119169, -- Redguard Keg, Hefty - 119170, -- Redguard Couch", Padded + 119170, -- Redguard Couch, Padded 119171, -- Redguard Cabinet, Inlaid 119172, -- Redguard Armchair, Cushioned 119173, -- Redguard Cupboard, Lattice @@ -813,8 +813,8 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119235, -- Redguard Pillow Roll, Oasis 119236, -- Redguard Throw Pillow, Oasis 119238, -- Redguard Bed, Wide Canopy - 119239, -- Redguard Couch", Slatted - 119240, -- Redguard Bench", Padded + 119239, -- Redguard Couch, Slatted + 119240, -- Redguard Bench, Padded 119241, -- Redguard Wardrobe, Braced 119242, -- Redguard Bookcase, Arched 119243, -- Redguard Wardrobe, Sturdy @@ -834,7 +834,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119257, -- Redguard Cupboard, Sturdy 119258, -- Redguard Shelf, Bolted 119259, -- Redguard Wine Rack, Inlaid - 119260, -- Redguard Bench", Arc + 119260, -- Redguard Bench, Arc 119261, -- Redguard Pot, Mosaic 119262, -- Redguard Pot, Hanging Mosaic 119263, -- Redguard Slices, Wax @@ -899,9 +899,8 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119350, -- Rough Bedroll, Basic 119351, -- Lettuce, Display 119352, -- Pumpkin, Display - 119353, -- Winter Squash", Display + 119353, -- Winter Squash, Display 119354, -- Beet String, Display - 119355, -- Garlic String, Display 119356, -- Beets, Display 119357, -- Common Counter, Island Stall 119358, -- Common Barrel, Sealed @@ -932,7 +931,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119383, -- Common Plate, Simple 119384, -- Common Plate, Setting 119385, -- Sugar Pumpkin, Wax - 119386, -- Radish", Wax + 119386, -- Radish, Wax 119387, -- Bowl, Serving 119388, -- Common Bowl of Stew, Display 119389, -- Common Platter, Serving @@ -953,7 +952,6 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119405, -- Common Trap, Hunting 119406, -- Common Cargo, Sealed 119407, -- Common Cargo, Reinforced - 119408, -- Simple Blue Banner 119413, -- Cauldron of Soup 119416, -- Cauldron of Stew 119418, -- Cauldron, Covered @@ -963,22 +961,16 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119423, -- Keg 119424, -- Cleaver, Butcher's 119425, -- Hearty Bread - 119426, -- Bread, Plain 119427, -- Cheese Wedge - 119428, -- Common Bowl, Serving 119429, -- Ham, Display 119432, -- Hourglass, Common 119438, -- Baked Potato, Display 119439, -- Pot Pie, Display - 119440, -- Pie Dish", Empty + 119440, -- Pie Dish, Empty 119443, -- Drumstick 119444, -- Candle, Group 119445, -- Lantern, Stationary 119446, -- Lantern, Hanging - 119447, -- Candles, Lasting - 119448, -- Minecart, Empty - 119449, -- Minecart, Push - 119450, -- Knife, Carving 119451, -- Kennel, Locked 119462, -- Plums, Bunch 119463, -- Tangerines, Bunch @@ -1001,7 +993,7 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119484, -- Bottle, Elixir 119485, -- Bottle, Liquor 119486, -- Vial, Delicate - 119487, -- Pie Dish", Display + 119487, -- Pie Dish, Display 119488, -- Bottle, Wine 119489, -- Candle Set, Ritual 119490, -- Horn, Ritual @@ -1017,25 +1009,9 @@ FurC.Recipes[FURC_HOMESTEAD] = { 119533, -- Box of Plums 119539, -- Sweetroll 119540, -- Desk, Engraved - 119541, -- Fish", Small - 119542, -- Fish", Medium - 119543, -- Fish", Large - 119592, -- Target Skeleton, Humanoid - - - -- Rolis's recipes - 121200, -- Cabinet, Poisonmaker's - 121166, -- Podium, Skinning - 121168, -- Tools, Case - 121199, -- Mortar and Pestle - 121214, -- Orcish Skull Goblet, Full - 121163, -- Apparatus, Boiler - 121197, -- Bottle, Poison Elixir - 121164, -- Case of Vials - 121209, -- Orcish Tapestry, Spear - 121207, -- Orcish Table with Fur - 121207, -- Orcish Table with Fur - 121315, -- Target Skeleton, Robust Humanoid + 119541, -- Fish, Small + 119542, -- Fish, Medium + 119543, -- Fish, Large 119592, -- Target Skeleton, Humanoid 121311, -- Breton Throne @@ -1044,27 +1020,15 @@ FurC.Recipes[FURC_HOMESTEAD] = { 121546, -- Argonian Box, Woven 121374, -- Redguard Censer, Hanging Disc - 121108, -- Simple Brown Banner 121310, -- High Elf Sconce, Winged 121307, -- Orcish Brazier, Pillar -- 116214, -- Nord Banner, Bear -- 115786, -- Argonian Skiff, Common Reed + 121207, -- Orcish Table with Fur - 121207, -- Orcish Table with Fur - 121203, -- Khajiit Brazier, Enchanted - 121201, -- Sack of Beans - - - 121111, -- Simple Red Banner - 121110, -- Simple Purple Banner - 121109, -- Simple Gray Banner 121372, -- Noble Standing Cauldron - - 121101, -- Sack of Millet, - 121100, -- Common Stewpot, Hanging - 121091, -- Stool, Carved 121059, -- Rough Cup, Empty 121313, -- Wood Elf Throne, Vine @@ -1074,5 +1038,21 @@ FurC.Recipes[FURC_HOMESTEAD] = { 121304, -- Redguard Chandelier, Grated 121366, -- Orcish Tapestry, Hunt 121365, -- High Elf Tapestry, Gilded + + -- Rolis's recipes + 121200, -- Cabinet, Poisonmaker's + 121166, -- Podium, Skinning + 121168, -- Tools, Case + 121199, -- Mortar and Pestle + 121214, -- Orcish Skull Goblet, Full + 121163, -- Apparatus, Boiler + 121197, -- Bottle, Poison Elixir + 121164, -- Case of Vials + 121209, -- Orcish Tapestry, Spear + 121207, -- Orcish Table with Fur + 121207, -- Orcish Table with Fur + 121315, -- Target Skeleton, Robust Humanoid + 119592, -- Target Skeleton, Humanoid + } diff --git a/data/04_Clockwork/CC_AchievementVendors.lua b/data/04_Clockwork/CC_AchievementVendors.lua index ca9c90c..f42ea2b 100644 --- a/data/04_Clockwork/CC_AchievementVendors.lua +++ b/data/04_Clockwork/CC_AchievementVendors.lua @@ -33,22 +33,22 @@ local bookList = { }, } -FurC.Books[FURC_CLOCKWORK ] = bookList +FurC.Books[FURC_CLOCKWORK] = bookList FurC.AchievementVendors[FURC_CLOCKWORK] = { - - + ["The Brass Citadel, Market"] = { + ["Razoufa as part of a collection"] = bookList, ["Razoufa"] = { [134285] = { -- Active Fabrication Tank itemPrice = 75000, achievement = 2049, -- Hero of Clockwork City }, [134286] = { -- Clockwork Stylus - itemPrice = 3000, + itemPrice = 3000, achievement = 2068, -- CC Adventurer }, [134289] = { -- Energetic Anima Core - itemPrice = 15000, + itemPrice = 15000, achievement = 2072, -- Brass Fortress Quarter Master }, [134284] = { -- Mysterious Clockwork Sphere diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua index da5b04d..0c20f52 100644 --- a/data/MiscItemSources.lua +++ b/data/MiscItemSources.lua @@ -278,6 +278,7 @@ FurC.MiscItemSources[FURC_CLOCKWORK] = { -- Reach } } + FurC.MiscItemSources[FURC_REACH] = { -- Reach [FURC_JUSTICE] = { @@ -509,6 +510,8 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118060] = getCrownPrice(20), -- Sack of Grain [118059] = getCrownPrice(20), -- Sack of Millet, [118058] = getCrownPrice(20), -- Sack of Rice + [118351] = getCrownPrice(25), -- Box of Peaches + [134473] = getScamboxString(SI_FURC_FLAME_ATRONACH), -- Malacath Banner @@ -516,7 +519,7 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118065] = getCrownPrice(45), -- Common Cargo Crate, Dry [118064] = getCrownPrice(45), -- Common Barrel, Dry - [118054] = getCrownPrice(80), -- Common Firepit, Outdoor + [118054] = getCrownPrice(80), -- Common Firepit, Outdoor [118055] = getCrownPrice(80), -- Common Firepit, Piled [118126] = getCrownPrice(95), -- Plaque, Standard @@ -525,10 +528,44 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118071] = getCrownPrice(120), -- Simple Red Banner [118070] = getCrownPrice(120), -- Simple Purple Banner - + + [94098] = getCrownPrice(95), -- Imperial Bed, Single + [120607] = getCrownPrice(50), -- Sapling, Lanky Ash [115698] = getCrownPrice(1100), -- Khajiit Statue, Guardian + }, + [FURC_RUMOUR] = { + + [118290] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Antlers, Wall Mount + [118299] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Bottle, Beaker + [118300] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Bottle, Poison + [118291] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Durzog Head, Wall Mount + [118294] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Echatere Horns, Wall Mount + [118293] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Echatere, Wall Mount + [118295] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Haj Mota Head, Wall Mount + [118289] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Haj Mota Shell, Wall Mount + [118284] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Horn, Display, Cracked + [118283] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Horn, Display, Huge + [118296] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Mantikora Head, Wall Mount + [118297] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Mantikora Horns, Wall Mount + [118242] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Rug, Bearskin + [116473] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Orcish Effigy, Mammoth + [116474] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Orcish Effigy, Bear + [116433] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Orcish Desk with Furs + [118065] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Common Cargo Crate, Dry + [118054] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Common Firepit, Outdoor + [118055] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Common Firepit, Piled + [118000] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Garlic String, Display + [118119] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Minecart, Empty + [118120] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Minecart, Push + [117991] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Stool, Carved + [118278] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Plaque, Bordered Deer Antlers + [118304] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Shelf, Poison + [118118] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Candles, Lasting + [115395] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Nord Drinking Horn, Display + [118127] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Plaque, Small + [118288] = GetString(SI_FURC_RUMOUR_SOURCE_ITEM), -- Deer Carcass, Hanging } } diff --git a/data/RumourRecipes.lua b/data/RumourRecipes.lua index 7dc2d7f..e95afa4 100644 --- a/data/RumourRecipes.lua +++ b/data/RumourRecipes.lua @@ -1,71 +1,41 @@ -FurC.RumourRecipes = { - 118290, -- Antlers, Wall Mount - 118299, -- Bottle, Beaker - 118300, -- Bottle, Poison - - 118291, -- Durzog Head, Wall Mount - 118294, -- Echatere Horns, Wall Mount - 118293, -- Echatere, Wall Mount - 118295, -- Haj Mota Head, Wall Mount - 118289, -- Haj Mota Shell, Wall Mount - 118284, -- Horn, Display, Cracked - 118283, -- Horn, Display, Huge - - 118296, -- Mantikora Head, Wall Mount - 118297, -- Mantikora Horns, Wall Mount - 118242, -- Rug, Bearskin - - 121208, -- Recipe: Orcish Table with Fur_S_ - 121210, -- Recipe: Orcish Throne, Skull - 121212, -- Recipe: Orcish Effigy, Bear - 121213, -- Recipe: Orcish Skull Goblet, Empty - - 116473, -- Orcish Effigy, Mammoth - 116474, -- Orcish Effigy, Bear - 116433, -- Orcish Table with Fur_S - - 118065, -- Common Cargo Crate, Dry - 118054, -- Common Firepit, Outdoor - 118055, -- Common Firepit, Piled - - 118000, -- Garlic String, Display - - 118119, -- Minecart, Empty - 118120, -- Minecart, Push - 117991, -- Stool, Carved - 118278, -- Plaque, Bordered Deer Antlers - -- 132199, -- Telvanni Tower, Miniature - -- 132197, -- Death Skeleton, Shrouded - 121198, -- Shelf, Poison - 118304, -- Shelf, Poison - - 119441, -- Steak, Display - 119442, -- Teapot, Common - - 119454, -- Plaque, Large - 119455, -- Plaque, Standard - - 119466, -- Podium, Engraved - - 119437, -- Pie, Display - - 121161, -- Ram Horns, Mounted - 121216, -- Redguard Divider, Gilded - - 118118, -- Candles, Lasting - 115395, -- Nord Drinking Horn, Display - 121203, -- Khajiit Brazier, Enchanted - - - 121217, -- Redguard Lamp, Oil - 121215, -- Redguard Canopy, Dusk - - +FurC.RumourRecipes = { + 121198, -- Formula: Shelf, Poison + 119441, -- Design: Steak, Display + 119442, -- Diagram: Teapot, Common + 121208, -- Praxis: Orcish Table with Furs + 121210, -- Praxis: Orcish Throne, Skull + 121212, -- Praxis: Orcish Effigy, Bear + 121213, -- Diagram: Orcish Skull Goblet, Empty + 119454, -- Blueprint: Plaque, Large + 119455, -- Blueprint: Plaque, Standard + 119466, -- Blueprint: Podium, Engraved + 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 + 121102, -- Design: Chicken Dinner, Display + 121103, -- Design: Chicken Meal, Display 119426, -- Bread, Plain - 121102, -- Chicken Dinner, Display - 121103, -- Chicken Meal, Display + 119448, -- Minecart, Empty + 119449, -- Minecart, Push + 119450, -- Knife, Carving + 121100, -- Common Stewpot, Hanging + 119428, -- Common Bowl, Serving + 121201, -- Sack of Beans + 121101, -- Sack of Millet, + 121111, -- Simple Red Banner + 121110, -- Simple Purple Banner + 121109, -- Simple Gray Banner + 119408, -- Simple Blue Banner + 121108, -- Simple Brown Banner + 119355, -- Garlic String, Display + 121203, -- Khajiit Brazier, Enchanted + 121091, -- Stool, Carved + 119447, -- Candles, Lasting - 118127, -- Plaque, Small - 118288, -- Deer Carcass, Hanging } diff --git a/locale/en.lua b/locale/en.lua index 53faa66..bc503e4 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -248,6 +248,7 @@ local strings = { 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_VV_PAINTING = "Extremely rarely from chests or lockboxes on Vvardenfell", SI_FURC_DROP = "This item is a drop ", SI_FURC_DROP_ALTMER = "This item is a drop on Summerset", SI_FURC_FLAME_ATRONACH = "Flame Atronach", diff --git a/startup.lua b/startup.lua index bffba15..501e097 100644 --- a/startup.lua +++ b/startup.lua @@ -1,7 +1,7 @@ FurnitureCatalogue = {} FurnitureCatalogue.name = "FurnitureCatalogue" FurnitureCatalogue.author = "manavortex" -FurnitureCatalogue.version = "2.5.131" +FurnitureCatalogue.version = "2.5.14" FurnitureCatalogue.CharacterName = nil FurnitureCatalogue.settings = {}