diff --git a/ARLColour.lua b/ARLColour.lua index dcbbc6f..0b9c7d0 100644 --- a/ARLColour.lua +++ b/ARLColour.lua @@ -281,38 +281,38 @@ end -- used for tooltip rgb stuff function addon:hexcolor(colorstring) if (colorstring == "NEUTRAL") then return NEUTRAL - elseif (colorstring == "FRIENDLY") then return FRIENDLY + elseif (colorstring == "FRIENDLY") then return FRIENDLY elseif (colorstring == "HONORED") then return HONORED elseif (colorstring == "REVERED") then return REVERED elseif (colorstring == "EXALTED") then return EXALTED elseif (colorstring == "TRAINER") then return TRAINER elseif (colorstring == "VENDOR") then return VENDOR - elseif (colorstring == "QUEST") then return QUEST + elseif (colorstring == "QUEST") then return QUEST elseif (colorstring == "REP") then return REP elseif (colorstring == "SEASON") then return SEASON elseif (colorstring == "MOBDROP") then return MOBDROP - elseif (colorstring == "POOR") then return POOR + elseif (colorstring == "POOR") then return POOR elseif (colorstring == "COMMON") then return COMMON - elseif (colorstring == "UNCOMMON") then return UNCOMMON - elseif (colorstring == "RARE") then return RARE - elseif (colorstring == "EPIC") then return EPIC - elseif (colorstring == "LEGENDARY") then return LEGENDARY - elseif (colorstring == "ARTIFACT") then return ARTIFACT + elseif (colorstring == "UNCOMMON") then return UNCOMMON + elseif (colorstring == "RARE") then return RARE + elseif (colorstring == "EPIC") then return EPIC + elseif (colorstring == "LEGENDARY") then return LEGENDARY + elseif (colorstring == "ARTIFACT") then return ARTIFACT - elseif (colorstring == "HORDE") then return HORDE - elseif (colorstring == "ALLIANCE") then return ALLIANCE + elseif (colorstring == "HORDE") then return HORDE + elseif (colorstring == "ALLIANCE") then return ALLIANCE - elseif (colorstring == "BLACK") then return BLACK + elseif (colorstring == "BLACK") then return BLACK elseif (colorstring == "ORANGE") then return ORANGE - elseif (colorstring == "GREEN") then return GREEN + elseif (colorstring == "GREEN") then return GREEN elseif (colorstring == "YELLOW") then return YELLOW elseif (colorstring == "GREY") then return GREY elseif (colorstring == "MIDGREY") then return MIDGREY elseif (colorstring == "RED") then return RED - elseif (colorstring == "HIGH") then return HIGH + elseif (colorstring == "HIGH") then return HIGH -- elseif (colorstring == "NORMAL") then return NORMAL else return NORMAL diff --git a/RecipeDB/ARL-Smelt.lua b/RecipeDB/ARL-Smelt.lua index 24c90d6..96a4bd1 100644 --- a/RecipeDB/ARL-Smelt.lua +++ b/RecipeDB/ARL-Smelt.lua @@ -50,56 +50,56 @@ function addon:InitSmelting(RecipeDB) self:addTradeFlags(RecipeDB,2658,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,2658,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Bronze -- 2659 self:addTradeSkill(RecipeDB,2659,65,2841,1,32606,nil,0,0,65,90,115) self:addTradeFlags(RecipeDB,2659,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,2659,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Tin -- 3304 self:addTradeSkill(RecipeDB,3304,65,3576,1,32606,nil,0,0,65,70,75) self:addTradeFlags(RecipeDB,3304,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,3304,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Iron -- 3307 self:addTradeSkill(RecipeDB,3307,125,3575,1,32606,nil,0,125,130,145,160) self:addTradeFlags(RecipeDB,3307,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,3307,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Gold -- 3308 self:addTradeSkill(RecipeDB,3308,155,3577,1,32606,nil,0,155,170,177,185) self:addTradeFlags(RecipeDB,3308,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,3308,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Steel -- 3569 self:addTradeSkill(RecipeDB,3569,165,3859,1,32606,nil,0,0,0,0,165) self:addTradeFlags(RecipeDB,3569,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,3569,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Mithril -- 10097 self:addTradeSkill(RecipeDB,10097,175,3860,1,32606,nil,0,0,175,202,230) self:addTradeFlags(RecipeDB,10097,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,10097,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Truesilver -- 10098 self:addTradeSkill(RecipeDB,10098,230,6037,1,32606,nil,0,230,235,242,250) self:addTradeFlags(RecipeDB,10098,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,10098,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Dark Iron -- 14891 self:addTradeSkill(RecipeDB,14891,230,11371,1,32606,nil,0,230,300,305,310) @@ -111,7 +111,7 @@ function addon:InitSmelting(RecipeDB) self:addTradeFlags(RecipeDB,16153,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,16153,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392, 1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976, - 1,33682) + 1,33682,1,26912) -- Smelt Elementium -- 22967 self:addTradeSkill(RecipeDB,22967,300,17771,5,32606,nil,0,300,350,362,375) @@ -121,42 +121,42 @@ function addon:InitSmelting(RecipeDB) -- Smelt Fel Iron -- 29356 self:addTradeSkill(RecipeDB,29356,300,23445,1,32606,nil,1,0,300,307,315) self:addTradeFlags(RecipeDB,29356,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,29356,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,29356,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Smelt Adamantite -- 29358 self:addTradeSkill(RecipeDB,29358,325,23446,1,32606,nil,1,0,325,332,340) self:addTradeFlags(RecipeDB,29358,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,29358,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,29358,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Smelt Eternium -- 29359 self:addTradeSkill(RecipeDB,29359,350,23447,1,32606,nil,1,0,350,357,365) self:addTradeFlags(RecipeDB,29359,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,29359,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,29359,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Smelt Felsteel -- 29360 self:addTradeSkill(RecipeDB,29360,350,23448,1,32606,nil,1,0,350,357,375) self:addTradeFlags(RecipeDB,29360,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,29360,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,29360,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Smelt Khorium -- 29361 self:addTradeSkill(RecipeDB,29361,375,23449,1,32606,nil,1,0,0,0,375) self:addTradeFlags(RecipeDB,29361,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,29361,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,29361,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Smelt Hardened Adamantite -- 29686 self:addTradeSkill(RecipeDB,29686,375,23573,1,32606,nil,1,0,0,0,375) self:addTradeFlags(RecipeDB,29686,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,29686,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,29686,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Earth Shatter -- 35750 self:addTradeSkill(RecipeDB,35750,300,22573,1,32606,nil,1,0,0,0,300) self:addTradeFlags(RecipeDB,35750,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,35750,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,35750,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Fire Sunder -- 35751 self:addTradeSkill(RecipeDB,35751,300,22574,1,32606,nil,1,0,0,0,300) self:addTradeFlags(RecipeDB,35751,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,35751,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682) + self:addTradeAcquire(RecipeDB,35751,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912) -- Smelt Cobalt -- 49252 self:addTradeSkill(RecipeDB,49252,350,36916,1,32606,nil,2,0,350,362,375) diff --git a/RecipeDB/ARL-Trainer.lua b/RecipeDB/ARL-Trainer.lua index a42c6ba..7765c5f 100644 --- a/RecipeDB/ARL-Trainer.lua +++ b/RecipeDB/ARL-Trainer.lua @@ -345,7 +345,7 @@ function addon:InitTrainer(TrainerDB) self:addLookupList(TrainerDB,26906,L["Elizabeth Jackson"],BZONE["Howling Fjord"],59.24,62.30,1) self:addLookupList(TrainerDB,26907,L["Tisha Longbridge"],BZONE["Howling Fjord"],60.18,64.07,1) self:addLookupList(TrainerDB,26911,L["Bernadette Dexter"],BZONE["Howling Fjord"],60.10,63.02,1) - self:addLookupList(TrainerDB,26912,L["Grumbol Stoutpick"],BZONE["Howling Fjord"],60.06,64.10,1) + self:addLookupList(TrainerDB,26912,L["Grumbol Stoutpick"],BZONE["Howling Fjord"],59.9,63.9,1) self:addLookupList(TrainerDB,26914,L["Benjamin Clegg"],BZONE["Howling Fjord"],58.83,63.11,1) self:addLookupList(TrainerDB,26915,L["Ounhulo"],BZONE["Howling Fjord"],59.64,63.94,1) self:addLookupList(TrainerDB,26916,L["Mindri Dinkles"],BZONE["Howling Fjord"],58.47,62.78,1)