diff --git a/FurCContextMenu.lua b/FurCContextMenu.lua index e72ce0a..440eaf4 100644 --- a/FurCContextMenu.lua +++ b/FurCContextMenu.lua @@ -39,7 +39,7 @@ local cachedItemLink, cachedRecipeArray local function toChat() FurC.ToChat(cachedItemLink) end local function fave() FurC.Fave(cachedItemLink) end -local function postItemSource() FurC.ToChat(GetItemLinkRecipeResultItemLink(cachedItemLink)) end +local function postItemSource() FurC.ToChat(FurC.GetItemDescription(cachedItemLink, cachedRecipeArray, true)) end local function postRecipe() FurC.ToChat(FurC.GetItemLink(cachedRecipeArray.blueprint)) end local function postRecipeResult() FurC.ToChat(GetItemLinkRecipeResultItemLink(cachedItemLink)) end local function postMaterial() FurC.ToChat(itemLink .. ": " .. FurC.GetMats(cachedItemLink, cachedRecipeArray, true)) end @@ -59,13 +59,13 @@ local function addMenuItems(itemLink, recipeArray) AddCustomMenuItem(faveText, fave, MENU_ADD_OPTION_LABEL) if recipeArray.origin ~= FURC_CRAFTING then - AddCustomMenuItem(GetString(SI_FURC_POST_ITEMSOURCE), postItemSource, MENU_ADD_OPTION_LABEL) + AddCustomMenuItem(GetString(SI_FURC_POST_ITEMSOURCE), postItemSource, MENU_ADD_OPTION_LABEL) else if IsItemLinkFurnitureRecipe(itemLink) then - AddCustomMenuItem(GetString(SI_FURC_POST_ITEM), postRecipeResult, MENU_ADD_OPTION_LABEL) - AddCustomMenuItem(GetString(SI_FURC_POST_RECIPE), postRecipe, MENU_ADD_OPTION_LABEL) + AddCustomMenuItem(GetString(SI_FURC_POST_ITEM), postRecipeResult, MENU_ADD_OPTION_LABEL) + AddCustomMenuItem(GetString(SI_FURC_POST_RECIPE), postRecipe, MENU_ADD_OPTION_LABEL) end - AddCustomMenuItem(GetString(SI_FURC_POST_MATERIAL), postMaterial, MENU_ADD_OPTION_LABEL) + AddCustomMenuItem(GetString(SI_FURC_POST_MATERIAL), postMaterial, MENU_ADD_OPTION_LABEL) AddFurnitureShoppingListMenuEntry(itemLink, true) end diff --git a/FurCData.lua b/FurCData.lua index d9e2be9..0f58e72 100644 --- a/FurCData.lua +++ b/FurCData.lua @@ -353,20 +353,20 @@ local function scanFromFiles(shouldScanCharacter) local function scanRolis() for versionNumber, versionData in pairs(FurC.Rolis) do for itemId, itemSource in pairs(versionData) do - recipeArray = parseFurnitureItem(FurC.GetItemLink(recipeId), true) + recipeArray = parseFurnitureItem(FurC.GetItemLink(itemId), true) if nil ~= recipeArray then recipeArray.version = versionNumber - recipeArray.origin = FURC_Rolis + recipeArray.origin = FURC_ROLIS addDatabaseEntry(itemId, recipeArray) end end end for versionNumber, versionData in pairs(FurC.Faustina) do for itemId, itemSource in pairs(versionData) do - recipeArray = parseFurnitureItem(FurC.GetItemLink(recipeId), true) + recipeArray = parseFurnitureItem(FurC.GetItemLink(itemId), true) if nil ~= recipeArray then recipeArray.version = versionNumber - recipeArray.origin = FURC_Rolis + recipeArray.origin = FURC_ROLIS addDatabaseEntry(itemId, recipeArray) end end @@ -455,7 +455,6 @@ local function scanFromFiles(shouldScanCharacter) task:Call(scanRecipeFile) :Then(scanMiscItemFile) - :Then(scanRolis) :Then(scanVendorFiles) :Then(scanRolis) :Then(scanFestivalFiles) @@ -514,7 +513,7 @@ FurC.settings.emptyItemSources = FurC.settings.emptyItemSources or {} local origin = recipeArray.origin if origin == FURC_CRAFTING or origin == FURC_WRIT_VENDOR then return FurC.GetMats(recipeKey, recipeArray, stripColor) - elseif origin == FURC_Rolis then + elseif origin == FURC_ROLIS then return FurC.getRolisSource(recipeKey, recipeArray, stripColor) elseif origin == FURC_LUXURY then return FurC.getLuxurySource(recipeKey, recipeArray, stripColor) diff --git a/FurCFilter.lua b/FurCFilter.lua index c064329..8202486 100644 --- a/FurCFilter.lua +++ b/FurCFilter.lua @@ -103,7 +103,7 @@ local function matchSourceDropdown() elseif FURC_RUMOUR == ddSource then return recipeArray.origin == FURC_RUMOUR elseif FURC_WRIT_VENDOR == ddSource then - return recipeArray.origin == FURC_Rolis + return recipeArray.origin == FURC_ROLIS elseif FURC_OTHER == ddSource then return ( recipeArray.origin == FURC_FESTIVAL_DROP or diff --git a/data/01_Homestead/H_Rollis.lua b/data/01_Homestead/H_Rollis.lua deleted file mode 100644 index 5889c69..0000000 --- a/data/01_Homestead/H_Rollis.lua +++ /dev/null @@ -1,34 +0,0 @@ -FurC.Rolis = FurC.Rolis or {} -FurC.Rolis_Recipes = FurC.Rolis_Recipes or {} - - -FurC.Rolis[FURC_HOMESTEAD] = { - -- Alchemy station - [118328] = 35, - -- Blacksmithing station - [119781] = 35, - -- Clothing station - [119707] = 35, - -- Dye Station - [118329] = 35, - -- Enchanting station - [118330] = 35, - -- Provisioning station - [118327] = 35, - -- Woodworking station - [119744] = 35, - - -- Attunable Blacksmithing station - [119594] = 250, - -- Attunable Clothing station - [119821] = 250, - -- Attunable Woodworking station - [119822] = 250, -} - -FurC.Rolis_Recipes[FURC_HOMESTEAD] = { - 121207, -- Target Skeleton - 121315, -- Robust Target Skeleton - 126582, -- Target Centurion - 126583, -- Robust Target Centurion -} diff --git a/startup.lua b/startup.lua index b60903b..407d54d 100644 --- a/startup.lua +++ b/startup.lua @@ -100,8 +100,8 @@ 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_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