diff --git a/ARLDatamine.lua b/ARLDatamine.lua index 4f1917c..0cb133b 100644 --- a/ARLDatamine.lua +++ b/ARLDatamine.lua @@ -51,16 +51,16 @@ local function LoadRecipe() return else addon:AddRecipeData(GetSpellInfo(51304)) - addon:AddRecipeData(GetSpellInfo(2018)) + addon:AddRecipeData(GetSpellInfo(51300)) addon:AddRecipeData(GetSpellInfo(51296)) - addon:AddRecipeData(GetSpellInfo(7411)) + addon:AddRecipeData(GetSpellInfo(51313)) addon:AddRecipeData(GetSpellInfo(51306)) addon:AddRecipeData(GetSpellInfo(45542)) addon:AddRecipeData(GetSpellInfo(51302)) - addon:AddRecipeData(GetSpellInfo(2575)) - addon:AddRecipeData(GetSpellInfo(3908)) - addon:AddRecipeData(GetSpellInfo(25229)) - addon:AddRecipeData(GetSpellInfo(45357)) + addon:AddRecipeData(GetSpellInfo(61422)) + addon:AddRecipeData(GetSpellInfo(51309)) + addon:AddRecipeData(GetSpellInfo(51311)) + addon:AddRecipeData(GetSpellInfo(45363)) addon:AddRecipeData(GetSpellInfo(53428)) end else @@ -71,16 +71,16 @@ local function LoadRecipe() -- Recipe DB exists, we just need to populate it now if (addon.db.profile.autoloaddb) then addon:AddRecipeData(GetSpellInfo(51304)) - addon:AddRecipeData(GetSpellInfo(2018)) + addon:AddRecipeData(GetSpellInfo(51300)) addon:AddRecipeData(GetSpellInfo(51296)) - addon:AddRecipeData(GetSpellInfo(7411)) + addon:AddRecipeData(GetSpellInfo(51313)) addon:AddRecipeData(GetSpellInfo(51306)) addon:AddRecipeData(GetSpellInfo(45542)) addon:AddRecipeData(GetSpellInfo(51302)) - addon:AddRecipeData(GetSpellInfo(2575)) - addon:AddRecipeData(GetSpellInfo(3908)) - addon:AddRecipeData(GetSpellInfo(25229)) - addon:AddRecipeData(GetSpellInfo(45357)) + addon:AddRecipeData(GetSpellInfo(61422)) + addon:AddRecipeData(GetSpellInfo(51309)) + addon:AddRecipeData(GetSpellInfo(51311)) + addon:AddRecipeData(GetSpellInfo(45363)) addon:AddRecipeData(GetSpellInfo(53428)) end end @@ -253,15 +253,20 @@ function addon:GenerateLinks() local playerGUID = string.gsub(guid,"0x0+", "") -- Listing of all tradeskill professions - --local tradelist = {51304, 2018, 7411, 51306, 45357, 25229, 51302, 3908, 51296, 45542} - local tradelist = {51304, 51306, 51302, 51296, 45542} + local tradelist = {51304, 51300, 51313, 51306, 45363, 51311, 51302, 51309, 51296, 45542} local bitmap = {} bitmap[45542] = "8bffAA" -- First Aid bitmap[51296] = "2/7///7///9////7//////////g+/B" -- Cooking bitmap[51306] = "4/////////////3nFA+///9+/P7//f//n//9dgdJgHA87/3f/TolD" -- Engineering bitmap[51302] = "e+//////////////v//P+f///3///7/9f9//////////f///////HQ5+////B4//+///////5///////PA/Eg//" -- LW - bitmap[51304] = "2//v//////f////3//v///////6//////////9////X" + bitmap[51304] = "2//v//////f////3//v///////6//////////9////X" -- Alchemy + --bitmap[51300] = "" -- Blacksmithing + -- Tailoring + -- JC + -- Inscription + --bitmap[51313] = "4//////////7///////////w//++/9vn7///////3P/t/n//BAB" -- Enchanting + bitmap[51313] = "4//////////7///////////w//++/9vn7///////3P/t/n//BAD" -- Enchanting for i in pairs(tradelist) do diff --git a/ARLFrame.lua b/ARLFrame.lua index 216f2e6..493638b 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -114,19 +114,18 @@ local ARL_ExpGeneralOptCB,ARL_ExpObtainOptCB,ARL_ExpBindingOptCB,ARL_ExpItemOptC -- To make tabbing between professions easier local SortedProfessions = { - { name = GetSpellInfo(2259), texture = "alchemy" }, -- 1 - { name = GetSpellInfo(2018), texture = "blacksmith" }, -- 2 - { name = GetSpellInfo(2550), texture = "cooking" }, -- 3 - { name = GetSpellInfo(7411), texture = "enchant" }, -- 4 - { name = GetSpellInfo(4036), texture = "engineer" }, -- 5 - { name = GetSpellInfo(746), texture = "firstaid" }, -- 6 - { name = GetSpellInfo(45357), texture = "inscribe" }, -- 7 - { name = GetSpellInfo(25229), texture = "jewel" }, -- 8 - { name = GetSpellInfo(2108), texture = "leather" }, -- 9 + { name = GetSpellInfo(51304), texture = "alchemy" }, -- 1 + { name = GetSpellInfo(51300), texture = "blacksmith" }, -- 2 + { name = GetSpellInfo(51296), texture = "cooking" }, -- 3 + { name = GetSpellInfo(51313), texture = "enchant" }, -- 4 + { name = GetSpellInfo(51306), texture = "engineer" }, -- 5 + { name = GetSpellInfo(45542), texture = "firstaid" }, -- 6 + { name = GetSpellInfo(45363), texture = "inscribe" }, -- 7 + { name = GetSpellInfo(51311), texture = "jewel" }, -- 8 + { name = GetSpellInfo(51302), texture = "leather" }, -- 9 { name = GetSpellInfo(53428), texture = "runeforge" }, -- 10 - { name = GetSpellInfo(2575), texture = "smelting" }, -- 11 - --{ name = GetSpellInfo(2656), texture = "smelting" }, -- 11 - { name = GetSpellInfo(3908), texture = "tailor" }, -- 12 + { name = GetSpellInfo(61422), texture = "smelting" }, -- 11 + { name = GetSpellInfo(51309), texture = "tailor" }, -- 12 } local MaxProfessions = 12 diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index af6da53..fd21619 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -541,7 +541,7 @@ do end if (ProfTable[spellName] == false or spellName == GetSpellInfo(2656)) then if spellName == GetSpellInfo(2656) then - ProfTable[GetSpellInfo(2575)] = true + ProfTable[GetSpellInfo(61422)] = true else ProfTable[spellName] = true end @@ -1486,18 +1486,18 @@ local function InitializeRecipes(RecipeDB, playerProfession) local professiontable = { [GetSpellInfo(51304)] = addon.InitAlchemy, - [GetSpellInfo(2018)] = addon.InitBlacksmithing, + [GetSpellInfo(51300)] = addon.InitBlacksmithing, [GetSpellInfo(51296)] = addon.InitCooking, - [GetSpellInfo(7411)] = addon.InitEnchanting, + [GetSpellInfo(51313)] = addon.InitEnchanting, [GetSpellInfo(51306)] = addon.InitEngineering, [GetSpellInfo(45542)] = addon.InitFirstAid, -- Hack to get first aid working on frFR since I can't seem to get a proper spell ID :P ["Premiers soins"] = addon.InitFirstAid, [GetSpellInfo(51302)] = addon.InitLeatherworking, - [GetSpellInfo(2575)] = addon.InitSmelting, - [GetSpellInfo(3908)] = addon.InitTailoring, - [GetSpellInfo(25229)] = addon.InitJewelcrafting, - [GetSpellInfo(45357)] = addon.InitInscription, + [GetSpellInfo(61422)] = addon.InitSmelting, + [GetSpellInfo(51309)] = addon.InitTailoring, + [GetSpellInfo(51311)] = addon.InitJewelcrafting, + [GetSpellInfo(45363)] = addon.InitInscription, [GetSpellInfo(53428)] = addon.InitRuneforging, } @@ -1709,17 +1709,17 @@ do pData["Professions"] = { [GetSpellInfo(51304)] = false, -- Alchemy - [GetSpellInfo(2018)] = false, -- Blacksmithing + [GetSpellInfo(51300)] = false, -- Blacksmithing [GetSpellInfo(51296)] = false, -- Cooking - [GetSpellInfo(7411)] = false, -- Enchanting + [GetSpellInfo(51313)] = false, -- Enchanting [GetSpellInfo(51306)] = false, -- Engineering [GetSpellInfo(45542)] = false, -- First Aid --["Premiers soins"] = false, -- First Aid (Hack for frFR local) [GetSpellInfo(51302)] = false, -- Leatherworking - [GetSpellInfo(2575)] = false, -- Mining - [GetSpellInfo(3908)] = false, -- Tailoring - [GetSpellInfo(25229)] = false, -- Jewelcrafting - [GetSpellInfo(45357)] = false, -- Inscription + [GetSpellInfo(61422)] = false, -- Mining + [GetSpellInfo(51309)] = false, -- Tailoring + [GetSpellInfo(51311)] = false, -- Jewelcrafting + [GetSpellInfo(45363)] = false, -- Inscription [GetSpellInfo(53428)] = false, -- Runeforging } @@ -1764,10 +1764,10 @@ do -- List of classes which have Specialties SpecialtyTable = { [GetSpellInfo(51304)] = AlchemySpec, - [GetSpellInfo(2018)] = BlacksmithSpec, + [GetSpellInfo(51300)] = BlacksmithSpec, [GetSpellInfo(51306)] = EngineeringSpec, [GetSpellInfo(51302)] = LeatherworkSpec, - [GetSpellInfo(3908)] = TailorSpec, + [GetSpellInfo(51309)] = TailorSpec, } -- List containing all possible Specialties diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua index a29e8c3..68eb532 100644 --- a/RecipeDB/ARL-Enchant.lua +++ b/RecipeDB/ARL-Enchant.lua @@ -232,7 +232,7 @@ function addon:InitEnchanting(RecipeDB) -- Enchant 2H Weapon - Lesser Impact -- 13529 recipecount = recipecount + 1 - self:addTradeSkill(RecipeDB,13529,130,nil,1,7411) + self:addTradeSkill(RecipeDB,13529,145,nil,1,7411) self:addTradeFlags(RecipeDB,13529,1,2,3,21,22,23,24,25,26,27,28,29,30,36,40) self:addTradeAcquire(RecipeDB,13529,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19249,1,19250,1,19251) @@ -1768,7 +1768,7 @@ function addon:InitEnchanting(RecipeDB) -- Enchant Boots - Lesser Accuracy -- 63746 recipecount = recipecount + 1 - self:addTradeSkill(RecipeDB,63746,245,nil,2,7411) + self:addTradeSkill(RecipeDB,63746,225,nil,2,7411) self:addTradeFlags(RecipeDB,63746,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,51) self:addTradeAcquire(RecipeDB,63746,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,1,11065,1,11066,1,11067,1,11068,1,11070,1,11071,1,11072,1,11073,1,11074,1,16160,1,16633,1,16634,1,16725,1,16742,1,19248,1,19249,1,19250,1,19251)