From be3ee48b7c865995eb15ed2d4a37763425675894 Mon Sep 17 00:00:00 2001 From: Anch Date: Wed, 28 Sep 2022 17:54:46 +1300 Subject: [PATCH 01/33] update wishlist delete item -Updated wishlist delete item to resort items on delete --- AtlasLoot/Core/WishList.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index 7994e9d..25cd679 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -256,7 +256,7 @@ end --[[ AtlasLoot_DeleteFromWishList(itemID) Deletes the specified items from the wishlist -]] +]] function AtlasLoot_DeleteFromWishList(itemID) if itemID and itemID == 0 then return end if AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList" then @@ -264,6 +264,10 @@ function AtlasLoot_DeleteFromWishList(itemID) if v[2] == itemID then DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot_FixText(v[4])..GREY..AL[" deleted from the WishList."]..WHITE.." (".._G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]].Name..")"); table.remove(_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]], i); + --Sort wishlist after deleting an item + for n,table in ipairs(_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]]) do + table[1] = n; + end break; end end From d8bacdb3e40d7cbed9645a6e39e52c568fdb4992 Mon Sep 17 00:00:00 2001 From: Anch Date: Sun, 2 Oct 2022 04:16:55 +1300 Subject: [PATCH 02/33] updated items -Added missing ZA loot item -Removed Undaunted from Mag as it doesn't drop there anymore -Removed Executioner from all bosses but zuljin as it only drops from him now -Updated drop rates of formulas to show N:2%/H:5%/A:10% as they have different drop rates for each difficulty --- AtlasLoot/Core/AtlasLoot.lua | 2 +- AtlasLoot/Core/ItemIDsDatabaseFixes.lua | 1 + AtlasLoot_BurningCrusade/burningcrusade.lua | 31 ++++++++------------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 70b0503..cf844dc 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -136,7 +136,7 @@ function AtlasLoot:OnEnable() if AtlasLoot_Data then AtlasLoot_Data["EmptyTable"] = { Name = AL["Select a Loot Table..."]; - {Name = ""}; + {Name = AL["Select a Loot Table..."]}; }; end diff --git a/AtlasLoot/Core/ItemIDsDatabaseFixes.lua b/AtlasLoot/Core/ItemIDsDatabaseFixes.lua index 2d3644c..78c1d3b 100644 --- a/AtlasLoot/Core/ItemIDsDatabaseFixes.lua +++ b/AtlasLoot/Core/ItemIDsDatabaseFixes.lua @@ -110,6 +110,7 @@ ItemIDsDatabase[33483] = {6033483, 33483, 333483, 233483}; ItemIDsDatabase[33493] = {6033493, 33493, 333493, 233493}; ItemIDsDatabase[33497] = {6033497, 33497, 333497, 233497}; ItemIDsDatabase[33494] = {6033494, 33494, 333494, 233494}; +ItemIDsDatabase[24537] = {6024537, 24537, 324537, 224537}; --ZA Bears ItemIDsDatabase[1333809] = {1333809, 1333809, 1433809, 1233809}; diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index b032dc0..de7020f 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -1228,7 +1228,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 20, 30049, "", "=q4=Fathomstone", "=ds=#s15#", "", "19%"}; { 21, 30051, "", "=q4=Idol of the Crescent Goddess", "=ds=#s16#, #w14#", "", "11%"}; { 23, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 24, 816254, "", "=q3=Formula: Enchant Cloak - Crushing Wave", "=ds=#p4# (350)", "", "5%"}; + { 24, 816254, "", "=q3=Formula: Enchant Cloak - Crushing Wave", "=ds=#p4# (350)", "", "N:2%/H:5%/A:10%"}; }; { Name = BabbleBoss["The Lurker Below"]; @@ -1353,7 +1353,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 6, 28800, "", "=q4=Hammer of the Naaru", "=ds=#h2#, #w6#", "", "15.87%"}; { 16, 29764, "", "=q4=Pauldrons of the Fallen Defender", "=ds=#tt4#", "", "100%", "=LT=T4SHOULDER"}; { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 19, 816252, "", "=q3=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "5%"}; + { 19, 816252, "", "=q3=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; }; { Name = BabbleBoss["Gruul the Dragonkiller"]; @@ -1679,9 +1679,8 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 21, 28790, "", "=q4=Naaru Lightwarden's Band", "=q1=#m4#: =ds=#s13#"}; { 22, 28793, "", "=q4=Band of Crimson Fury", "=q1=#m4#: =ds=#s13#"}; { 23, 28792, "", "=q4=A'dal's Signet of Defense", "=q1=#m4#: =ds=#s13#"}; - { 25, 816252, "", "=q3=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "5%"}; - { 26, 428775, "", "=q4=Bor -o G'urth, the Hand of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; - { 27, 428776, "", "=q4=Lebed -o G'urth, the Finger of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; + { 25, 428775, "", "=q4=Bor -o G'urth, the Hand of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; + { 26, 428776, "", "=q4=Lebed -o G'urth, the Finger of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; }; }; ---------------- @@ -1748,7 +1747,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 18, 28525, "", "=q4=Signet of Unshakable Faith", "=ds=#s15#", "", "14.54%"}; { 19, 28568, "", "=q4=Idol of the Avian Heart", "=ds=#s16#, #w14#", "", "14.08%"}; { 20, 28524, "", "=q4=Emerald Ripper", "=ds=#h1#, #w4#", "", "12.90%"}; - { 22, 22559, "", "=q3=Formula: Enchant Weapon - Mongoose", "=ds=#p4# (375)", "", "1.05%"}; + { 22, 22559, "", "=q3=Formula: Enchant Weapon - Mongoose", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; }; { Name = "Keanna's Log ("..AL["Quest Item"]..")"; @@ -1769,7 +1768,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 17, 28523, "", "=q4=Totem of Healing Rains", "=ds=#s16#, #w15#", "", "14.58%"}; { 18, 28522, "", "=q4=Shard of the Virtuous", "=ds=#h3#, #w6#", "", "10.69%"}; { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 21, 816253, "", "=q3=Formula: Enchant Weapon - Faith", "=ds=#p4# (375)", "", "5%"}; + { 21, 816253, "", "=q3=Formula: Enchant Weapon - Faith", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; }; { Name = "Opera Event"; @@ -1841,7 +1840,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 18, 28657, "", "=q4=Fool's Bane", "=ds=#h1#, #w6#", "", "14.63%"}; { 19, 28658, "", "=q4=Terestian's Stranglestaff", "=ds=#h2#, #w9#", "", "7.46%"}; { 20, 28659, "", "=q4=Xavian Stiletto", "=ds=#w11#", "", "13.43%"}; - { 22, 22561, "", "=q3=Formula: Enchant Weapon - Soulfrost", "=ds=#p4# (375)", "", "0.30%"}; + { 22, 22561, "", "=q3=Formula: Enchant Weapon - Soulfrost", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; }; { Name = BabbleBoss["Shade of Aran"]; @@ -1859,7 +1858,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 18, 28727, "", "=q4=Pendant of the Violet Eye", "=ds=#s14#", "", "15.39%"}; { 19, 28728, "", "=q4=Aran's Soothing Sapphire", "=ds=#s15#", "", "12.72%"}; { 20, 28673, "", "=q4=Tirisfal Wand of Ascendancy", "=ds=#w12#", "", "7.25%"}; - { 22, 22560, "", "=q3=Formula: Enchant Weapon - Sunfire", "=ds=#p4# (375)", "", "0.76%"}; + { 22, 22560, "", "=q3=Formula: Enchant Weapon - Sunfire", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; }; { Name = BabbleBoss["Netherspite"]; @@ -1984,7 +1983,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 5, 434789, "", "=q3=Bracers of Slaughter", "=ds=#s8#, #a4#", "", "17%"}; { 6, 434790, "", "=q3=Battle-mace of the High Priestess", "=ds=#h3#, #w6#", "", "16%"}; { 7, 434783, "", "=q3=Nightstrike", "=ds=#w11#", "", "17%"}; - { 9, 35756, "", "=q3=Formula: Enchant Cloak - Steelweave", "=ds=#p4# (375)", "", "14%"}; + { 9, 35756, "", "=q3=Formula: Enchant Cloak - Steelweave", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; { 16, 0, "INV_Box_01", "#j27#", ""}; { 17, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; { 18, 434473, "", "=q4=Commendation of Kael'thas", "=ds=#s14#", "", "19%"}; @@ -2665,7 +2664,6 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 6, 33327, "", "=q4=Mask of Introspection", "=ds=#s1#, #a4#", "", "13%"}; { 7, 33191, "", "=q4=Jungle Stompers", "=ds=#s12#, #a4#", "", "13%"}; { 8, 33640, "", "=q4=Fury", "=ds=#h4#, #w13#", "", "14%"}; - { 10, 33307, "", "=q3=Formula: Enchant Weapon - Executioner", "=ds=#p4# (375)", "", "3%"}; { 16, 33496, "", "=q4=Signet of Primal Wrath", "=ds=#s13#", "", "23%"}; { 17, 33498, "", "=q4=Signet of the Quiet Forest", "=ds=#s13#", "", "21%"}; { 18, 33971, "", "=q4=Elunite Imbued Leggings", "=ds=#s11#, #a2#", "", "10%"}; @@ -2683,15 +2681,11 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 6, 33293, "", "=q4=Signet of Ancient Magics", "=ds=#s13#", "", "13%"}; { 7, 33214, "", "=q4=Akil'zon's Talonblade", "=ds=#h1#, #w10#", "", "13%"}; { 8, 33283, "", "=q4=Amani Punisher", "=ds=#h3#, #w6#", "", "14%"}; - { 10, 33307, "", "=q3=Formula: Enchant Weapon - Executioner", "=ds=#p4# (375)", "", "3%"}; { 16, 33591, "", "=q4=Shadowcaster's Drape", "=ds=#s4#", "", "11%"}; { 17, 33590, "", "=q4=Cloak of Fiends", "=ds=#s4#", "", "10%"}; { 18, 33481, "", "=q4=Pauldrons of Stone Resolve", "=ds=#s3#, #a4#", "", "11%"}; { 19, 33492, "", "=q4=Trollbane", "=ds=#h2#, #w1#", "", "11%"}; { 20, 33500, "", "=q4=Signet of Eternal Life", "=ds=#s13#", "", "20%"}; - - - }; { Name = BabbleBoss["Jan'alai"]; @@ -2703,7 +2697,6 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 6, 33354, "", "=q4=Wub's Cursed Hexblade", "=ds=#h3#, #w4#", "", "14%"}; { 7, 33326, "", "=q4=Bulwark of the Amani Empire", "=ds=#w8#", "", "13%"}; { 8, 33332, "", "=q4=Enamelled Disc of Mojo", "=ds=#w8#", "", "12%"}; - { 10, 33307, "", "=q3=Formula: Enchant Weapon - Executioner", "=ds=#p4# (375)", "", "3%"}; { 16, 33499, "", "=q4=Signet of the Last Defender", "=ds=#s13#", "", "18%"}; { 17, 33805, "", "=q4=Shadowhunter's Treads", "=ds=#s12#, #a3#", "", "10%"}; { 18, 33491, "", "=q4=Tuskbreaker", "=ds=#w5#", "", "12%"}; @@ -2720,7 +2713,6 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 6, 33299, "", "=q4=Spaulders of the Advocate", "=ds=#s3#, #a4#", "", "13%"}; { 7, 33303, "", "=q4=Skullshatter Warboots", "=ds=#s12#, #a4#", "", "14%"}; { 8, 33297, "", "=q4=The Savage's Choker", "=ds=#s2#", "", "13%"}; - { 10, 33307, "", "=q3=Formula: Enchant Weapon - Executioner", "=ds=#p4# (375)", "", "3%"}; { 16, 33483, "", "=q4=Life-step Belt", "=ds=#s10#, #a2#", "", "12%"}; { 17, 33493, "", "=q4=Umbral Shiv", "=ds=#h1#, #w4#", "", "12%"}; { 18, 33497, "", "=q4=Mana Attuned Band", "=ds=#s13#", "", "18%"}; @@ -2737,7 +2729,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 6, 33464, "", "=q4=Hex Lord's Voodoo Pauldrons", "=ds=#s3#, #a3#", "", "13%"}; { 7, 33421, "", "=q4=Battleworn Tuskguard", "=ds=#s1#, #a4#", "", "15%"}; { 8, 33446, "", "=q4=Girdle of Stromgarde's Hope", "=ds=#s10#, #a4#", "", "15%"}; - { 10, 2033307, "", "=q3=Formula: Enchant Weapon - Witchdoctor", "=ds=#p4# (375)", "", "3%"}; + { 10, 2033307, "", "=q3=Formula: Enchant Weapon - Witchdoctor", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; { 16, 34029, "", "=q4=Tiny Voodoo Mask", "=ds=#s14#", "", "25%"}; { 17, 33828, "", "=q4=Tome of Diabolic Remedy", "=ds=#s14#", "", "13%"}; { 18, 38634, "", "=q4=Troll Dice", "=ds=#s14#", "", "11%"}; @@ -2758,7 +2750,8 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 7, 33830, "", "=q4=Ancient Aqir Artifact", "=ds=#s14#", "", "14%"}; { 8, 33831, "", "=q4=Berserker's Call", "=ds=#s14#", "", "14%"}; { 9, 33829, "", "=q4=Hex Shrunken Head", "=ds=#s14#", "", "14%"}; - { 11, 33307, "", "=q3=Formula: Enchant Weapon - Executioner", "=ds=#p4# (375)", "", "3%"}; + { 10, 24537, "", "=q4=Waistband of Crushed Skulls", "=ds=#s10#", "", "14%"}; + { 12, 33307, "", "=q3=Formula: Enchant Weapon - Executioner", "=ds=#p4# (375)", "", "N:2%/H:5%/A:10%"}; { 16, 33467, "", "=q4=Blade of Twisted Visions", "=ds=#h3#, #w10#", "", "14%"}; { 17, 33478, "", "=q4=Jin'rohk, The Great Apocalypse", "=ds=#h2#, #w10#", "", "14%"}; { 18, 33476, "", "=q4=Cleaver of the Unforgiving", "=ds=#h1#, #w1#", "", "15%"}; From c2ece5ee3da6f36d931331f1171c66015e83b7d2 Mon Sep 17 00:00:00 2001 From: Anch Date: Sun, 2 Oct 2022 04:18:05 +1300 Subject: [PATCH 03/33] Update AtlasLoot.toc --- AtlasLoot/AtlasLoot.toc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasLoot/AtlasLoot.toc b/AtlasLoot/AtlasLoot.toc index fd3ac1f..0ae1e0a 100644 --- a/AtlasLoot/AtlasLoot.toc +++ b/AtlasLoot/AtlasLoot.toc @@ -2,7 +2,7 @@ ## Title: AtlasLoot Ascension Edition ## Notes: Shows the possible loot from the bosses ## Author: v7 Rebuid Done by: Anch/Rvng (Original: Hegarol, Ascension: Skray/Szyler/Anch/Rvng) -## Version: v7.0.1 +## Version: v7.0.2 ## X-eMail: ## X-Credits: Daviesh, Lag, Cellelach, Asurn, Pernicus and many others. ## X-Category: Map From cca5cc7cbfa9d64cad30df39679ae3f9cbb86dff Mon Sep 17 00:00:00 2001 From: Anch Date: Sun, 2 Oct 2022 15:47:39 +1300 Subject: [PATCH 04/33] Swaped s2/s3 arena lables --- AtlasLoot_BurningCrusade/burningcrusade.lua | 68 ++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index de7020f..6137e3e 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -4348,13 +4348,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 28130, "", "=q4=Gladiator's Dragonhide Tunic", "=ds=#s5#"}; { 5, 28126, "", "=q4=Gladiator's Dragonhide Gloves", "=ds=#s9#"}; { 6, 28128, "", "=q4=Gladiator's Dragonhide Legguards", "=ds=#s11#"}; - { 8, 0, "Ability_Druid_Maul", "=q6=#arenas1_1#", "=q1=#arenas2L#"}; + { 8, 0, "Ability_Druid_Maul", "=q6=#arenas1_1#", "=q1=#arenas3L#"}; { 9, 31968, "", "=q4=Merciless Gladiator's Dragonhide Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 31971, "", "=q4=Merciless Gladiator's Dragonhide Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 31972, "", "=q4=Merciless Gladiator's Dragonhide Tunic", "=ds=#s5#", "15000 #faction#"}; { 12, 31967, "", "=q4=Merciless Gladiator's Dragonhide Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 31969, "", "=q4=Merciless Gladiator's Dragonhide Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Ability_Druid_Maul", "=q6=#arenas1_1#", "=q1=#arenas3L#"}; + { 16, 0, "Ability_Druid_Maul", "=q6=#arenas1_1#", "=q1=#arenas2L#"}; { 17, 33672, "", "=q4=Vengeful Gladiator's Dragonhide Helm", "=ds=#s1#", ""}; { 18, 33674, "", "=q4=Vengeful Gladiator's Dragonhide Spaulders", "=ds=#s3#", ""}; { 19, 33675, "", "=q4=Vengeful Gladiator's Dragonhide Tunic", "=ds=#s5#", ""}; @@ -4375,13 +4375,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 28140, "", "=q4=Gladiator's Wyrmhide Tunic", "=ds=#s5#"}; { 5, 28136, "", "=q4=Gladiator's Wyrmhide Gloves", "=ds=#s9#"}; { 6, 28138, "", "=q4=Gladiator's Wyrmhide Legguards", "=ds=#s11#"}; - { 8, 0, "Spell_Nature_InsectSwarm", "=q6=#arenas1_2#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Nature_InsectSwarm", "=q6=#arenas1_2#", "=q1=#arenas3L#"}; { 9, 32057, "", "=q4=Merciless Gladiator's Wyrmhide Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 32059, "", "=q4=Merciless Gladiator's Wyrmhide Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32060, "", "=q4=Merciless Gladiator's Wyrmhide Tunic", "=ds=#s5#", "15000 #faction#"}; { 12, 32056, "", "=q4=Merciless Gladiator's Wyrmhide Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 32058, "", "=q4=Merciless Gladiator's Wyrmhide Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Nature_InsectSwarm", "=q6=#arenas1_2#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Nature_InsectSwarm", "=q6=#arenas1_2#", "=q1=#arenas2L#"}; { 17, 33768, "", "=q4=Vengeful Gladiator's Wyrmhide Helm", "=ds=#s1#", ""}; { 18, 33770, "", "=q4=Vengeful Gladiator's Wyrmhide Spaulders", "=ds=#s3#", ""}; { 19, 33771, "", "=q4=Vengeful Gladiator's Wyrmhide Tunic", "=ds=#s5#", ""}; @@ -4402,13 +4402,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 31379, "", "=q4=Gladiator's Kodohide Tunic", "=ds=#s5#"}; { 5, 31375, "", "=q4=Gladiator's Kodohide Gloves", "=ds=#s9#"}; { 6, 31377, "", "=q4=Gladiator's Kodohide Legguards", "=ds=#s11#"}; - { 8, 0, "Spell_Nature_Regeneration", "=q6=#arenas1_3#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Nature_Regeneration", "=q6=#arenas1_3#", "=q1=#arenas3L#"}; { 9, 31988, "", "=q4=Merciless Gladiator's Kodohide Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 31990, "", "=q4=Merciless Gladiator's Kodohide Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 31991, "", "=q4=Merciless Gladiator's Kodohide Tunic", "=ds=#s5#", "15000 #faction#"}; { 12, 31987, "", "=q4=Merciless Gladiator's Kodohide Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 31989, "", "=q4=Merciless Gladiator's Kodohide Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Nature_Regeneration", "=q6=#arenas1_3#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Nature_Regeneration", "=q6=#arenas1_3#", "=q1=#arenas2L#"}; { 17, 33691, "", "=q4=Vengeful Gladiator's Kodohide Helm", "=ds=#s1#", ""}; { 18, 33693, "", "=q4=Vengeful Gladiator's Kodohide Spaulders", "=ds=#s3#", ""}; { 19, 33694, "", "=q4=Vengeful Gladiator's Kodohide Tunic", "=ds=#s5#", ""}; @@ -4433,13 +4433,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 28334, "", "=q4=Gladiator's Chain Armor", "=ds=#s5#"}; { 5, 28335, "", "=q4=Gladiator's Chain Gauntlets", "=ds=#s9#"}; { 6, 28332, "", "=q4=Gladiator's Chain Leggings", "=ds=#s11#"}; - { 8, 0, "Ability_Hunter_RunningShot", "=q6=#arenas2#", "=q1=#arenas2L#"}; + { 8, 0, "Ability_Hunter_RunningShot", "=q6=#arenas2#", "=q1=#arenas3L#"}; { 9, 31962, "", "=q4=Merciless Gladiator's Chain Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 31964, "", "=q4=Merciless Gladiator's Chain Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 31960, "", "=q4=Merciless Gladiator's Chain Armor", "=ds=#s5#", "15000 #faction#"}; { 12, 31961, "", "=q4=Merciless Gladiator's Chain Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 31963, "", "=q4=Merciless Gladiator's Chain Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Ability_Hunter_RunningShot", "=q6=#arenas2#", "=q1=#arenas3L#"}; + { 16, 0, "Ability_Hunter_RunningShot", "=q6=#arenas2#", "=q1=#arenas2L#"}; { 17, 33666, "", "=q4=Vengeful Gladiator's Chain Helm", "=ds=#s1#", ""}; { 18, 33668, "", "=q4=Vengeful Gladiator's Chain Spaulders", "=ds=#s3#", ""}; { 19, 33664, "", "=q4=Vengeful Gladiator's Chain Armor", "=ds=#s5#", ""}; @@ -4465,13 +4465,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 25856, "", "=q4=Gladiator's Silk Raiment", "=ds=#s5#"}; { 5, 25857, "", "=q4=Gladiator's Silk Handguards", "=ds=#s9#"}; { 6, 25858, "", "=q4=Gladiator's Silk Trousers", "=ds=#s11#"}; - { 8, 0, "Spell_Frost_IceStorm", "=q6=#arenas3#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Frost_IceStorm", "=q6=#arenas3#", "=q1=#arenas3L#"}; { 9, 32048, "", "=q4=Merciless Gladiator's Silk Cowl", "=ds=#s1#", "15000 #faction#"}; { 10, 32047, "", "=q4=Merciless Gladiator's Silk Amice", "=ds=#s3#", "13000 #faction#"}; { 11, 32050, "", "=q4=Merciless Gladiator's Silk Raiment", "=ds=#s5#", "15000 #faction#"}; { 12, 32049, "", "=q4=Merciless Gladiator's Silk Handguards", "=ds=#s9#", "12000 #faction#"}; { 13, 32051, "", "=q4=Merciless Gladiator's Silk Trousers", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Frost_IceStorm", "=q6=#arenas3#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Frost_IceStorm", "=q6=#arenas3#", "=q1=#arenas2L#"}; { 17, 33758, "", "=q4=Vengeful Gladiator's Silk Cowl", "=ds=#s1#", ""}; { 18, 33757, "", "=q4=Vengeful Gladiator's Silk Amice", "=ds=#s3#", ""}; { 19, 33760, "", "=q4=Vengeful Gladiator's Silk Raiment", "=ds=#s5#", ""}; @@ -4497,13 +4497,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 27702, "", "=q4=Gladiator's Lamellar Chestpiece", "=ds=#s5#"}; { 5, 27703, "", "=q4=Gladiator's Lamellar Gauntlets", "=ds=#s9#"}; { 6, 27705, "", "=q4=Gladiator's Lamellar Legguards", "=ds=#s11#"}; - { 8, 0, "Spell_Holy_SealOfMight", "=q6=#arenas4_1#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Holy_SealOfMight", "=q6=#arenas4_1#", "=q1=#arenas3L#"}; { 9, 31997, "", "=q4=Merciless Gladiator's Lamellar Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 31996, "", "=q4=Merciless Gladiator's Lamellar Shoulders", "=ds=#s3#", "13000 #faction#"}; { 11, 31992, "", "=q4=Merciless Gladiator's Lamellar Chestpiece", "=ds=#s5#", "15000 #faction#"}; { 12, 31993, "", "=q4=Merciless Gladiator's Lamellar Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 31995, "", "=q4=Merciless Gladiator's Lamellar Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Holy_SealOfMight", "=q6=#arenas4_1#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Holy_SealOfMight", "=q6=#arenas4_1#", "=q1=#arenas2L#"}; { 17, 33697, "", "=q4=Vengeful Gladiator's Lamellar Helm", "=ds=#s1#", ""}; { 18, 33699, "", "=q4=Vengeful Gladiator's Lamellar Shoulders", "=ds=#s3#", ""}; { 19, 33695, "", "=q4=Vengeful Gladiator's Lamellar Chestpiece", "=ds=#s5#", ""}; @@ -4524,13 +4524,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 27879, "", "=q4=Gladiator's Scaled Chestpiece", "=ds=#s5#"}; { 5, 27880, "", "=q4=Gladiator's Scaled Gauntlets", "=ds=#s9#"}; { 6, 27882, "", "=q4=Gladiator's Scaled Legguards", "=ds=#s11#"}; - { 8, 0, "Spell_Holy_AuraOfLight", "=q6=#arenas4_2#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Holy_AuraOfLight", "=q6=#arenas4_2#", "=q1=#arenas3L#"}; { 9, 32041, "", "=q4=Merciless Gladiator's Scaled Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 32043, "", "=q4=Merciless Gladiator's Scaled Shoulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32039, "", "=q4=Merciless Gladiator's Scaled Chestpiece", "=ds=#s5#", "15000 #faction#"}; { 12, 32040, "", "=q4=Merciless Gladiator's Scaled Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 32042, "", "=q4=Merciless Gladiator's Scaled Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Holy_AuraOfLight", "=q6=#arenas4_2#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Holy_AuraOfLight", "=q6=#arenas4_2#", "=q1=#arenas2L#"}; { 17, 33751, "", "=q4=Vengeful Gladiator's Scaled Helm", "=ds=#s1#", ""}; { 18, 33753, "", "=q4=Vengeful Gladiator's Scaled Shoulders", "=ds=#s3#", ""}; { 19, 33749, "", "=q4=Vengeful Gladiator's Scaled Chestpiece", "=ds=#s5#", ""}; @@ -4551,13 +4551,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 31613, "", "=q4=Gladiator's Ornamented Chestguard", "=ds=#s5#"}; { 5, 31614, "", "=q4=Gladiator's Ornamented Gloves", "=ds=#s9#"}; { 6, 31618, "", "=q4=Gladiator's Ornamented Legplates", "=ds=#s11#"}; - { 8, 0, "Spell_Holy_HolyBolt", "=q6=#arenas4_3#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Holy_HolyBolt", "=q6=#arenas4_3#", "=q1=#arenas3L#"}; { 9, 32022, "", "=q4=Merciless Gladiator's Ornamented Headcover", "=ds=#s1#", "15000 #faction#"}; { 10, 32024, "", "=q4=Merciless Gladiator's Ornamented Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32020, "", "=q4=Merciless Gladiator's Ornamented Chestguard", "=ds=#s5#", "15000 #faction#"}; { 12, 32021, "", "=q4=Merciless Gladiator's Ornamented Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 32023, "", "=q4=Merciless Gladiator's Ornamented Legplates", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Holy_HolyBolt", "=q6=#arenas4_3#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Holy_HolyBolt", "=q6=#arenas4_3#", "=q1=#arenas2L#"}; { 17, 33724, "", "=q4=Vengeful Gladiator's Ornamented Headcover", "=ds=#s1#", ""}; { 18, 33726, "", "=q4=Vengeful Gladiator's Ornamented Spaulders", "=ds=#s3#", ""}; { 19, 33722, "", "=q4=Vengeful Gladiator's Ornamented Chestguard", "=ds=#s5#", ""}; @@ -4582,13 +4582,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 27711, "", "=q4=Gladiator's Satin Robe", "=ds=#s5#"}; { 5, 27707, "", "=q4=Gladiator's Satin Gloves", "=ds=#s9#"}; { 6, 27709, "", "=q4=Gladiator's Satin Leggings", "=ds=#s11#"}; - { 8, 0, "Spell_Shadow_AntiShadow", "=q6=#arenas5_1#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Shadow_AntiShadow", "=q6=#arenas5_1#", "=q1=#arenas3L#"}; { 9, 32035, "", "=q4=Merciless Gladiator's Satin Hood", "=ds=#s1#", "15000 #faction#"}; { 10, 32037, "", "=q4=Merciless Gladiator's Satin Mantle", "=ds=#s3#", "13000 #faction#"}; { 11, 32038, "", "=q4=Merciless Gladiator's Satin Robe", "=ds=#s5#", "15000 #faction#"}; { 12, 32034, "", "=q4=Merciless Gladiator's Satin Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 32036, "", "=q4=Merciless Gladiator's Satin Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Shadow_AntiShadow", "=q6=#arenas5_1#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Shadow_AntiShadow", "=q6=#arenas5_1#", "=q1=#arenas2L#"}; { 17, 33745, "", "=q4=Vengeful Gladiator's Satin Hood", "=ds=#s1#", ""}; { 18, 33747, "", "=q4=Vengeful Gladiator's Satin Mantle", "=ds=#s3#", ""}; { 19, 33748, "", "=q4=Vengeful Gladiator's Satin Robe", "=ds=#s5#", ""}; @@ -4609,13 +4609,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 31413, "", "=q4=Gladiator's Mooncloth Robe", "=ds=#s5#"}; { 5, 31409, "", "=q4=Gladiator's Mooncloth Gloves", "=ds=#s9#"}; { 6, 31411, "", "=q4=Gladiator's Mooncloth Leggings", "=ds=#s11#"}; - { 8, 0, "Spell_Holy_PowerWordShield", "=q6=#arenas5_2#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Holy_PowerWordShield", "=q6=#arenas5_2#", "=q1=#arenas3L#"}; { 9, 32016, "", "=q4=Merciless Gladiator's Mooncloth Hood", "=ds=#s1#", "15000 #faction#"}; { 10, 32018, "", "=q4=Merciless Gladiator's Mooncloth Mantle", "=ds=#s3#", "13000 #faction#"}; { 11, 32019, "", "=q4=Merciless Gladiator's Mooncloth Robe", "=ds=#s5#", "15000 #faction#"}; { 12, 32015, "", "=q4=Merciless Gladiator's Mooncloth Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 32017, "", "=q4=Merciless Gladiator's Mooncloth Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Holy_PowerWordShield", "=q6=#arenas5_2#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Holy_PowerWordShield", "=q6=#arenas5_2#", "=q1=#arenas2L#"}; { 17, 33718, "", "=q4=Vengeful Gladiator's Mooncloth Hood", "=ds=#s1#", ""}; { 18, 33720, "", "=q4=Vengeful Gladiator's Mooncloth Mantle", "=ds=#s3#", ""}; { 19, 33721, "", "=q4=Vengeful Gladiator's Mooncloth Robe", "=ds=#s5#", ""}; @@ -4640,13 +4640,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 25831, "", "=q4=Gladiator's Leather Tunic", "=ds=#s5#"}; { 5, 25834, "", "=q4=Gladiator's Leather Gloves", "=ds=#s9#"}; { 6, 25833, "", "=q4=Gladiator's Leather Legguards", "=ds=#s11#"}; - { 8, 0, "Ability_BackStab", "=q6=#arenas6#", "=q1=#arenas2L#"}; + { 8, 0, "Ability_BackStab", "=q6=#arenas6#", "=q1=#arenas3L#"}; { 9, 31999, "", "=q4=Merciless Gladiator's Leather Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 32001, "", "=q4=Merciless Gladiator's Leather Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32002, "", "=q4=Merciless Gladiator's Leather Tunic", "=ds=#s5#", "15000 #faction#"}; { 12, 31998, "", "=q4=Merciless Gladiator's Leather Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 32000, "", "=q4=Merciless Gladiator's Leather Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Ability_BackStab", "=q6=#arenas6#", "=q1=#arenas3L#"}; + { 16, 0, "Ability_BackStab", "=q6=#arenas6#", "=q1=#arenas2L#"}; { 17, 33701, "", "=q4=Vengeful Gladiator's Leather Helm", "=ds=#s1#", ""}; { 18, 33703, "", "=q4=Vengeful Gladiator's Leather Spaulders", "=ds=#s3#", ""}; { 19, 33704, "", "=q4=Vengeful Gladiator's Leather Tunic", "=ds=#s5#", ""}; @@ -4671,13 +4671,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 24552, "", "=q4=Gladiator's Dreadweave Robe", "=ds=#s5#"}; { 5, 24556, "", "=q4=Gladiator's Dreadweave Gloves", "=ds=#s9#"}; { 6, 24555, "", "=q4=Gladiator's Dreadweave Leggings", "=ds=#s11#"}; - { 8, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_1#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_1#", "=q1=#arenas3L#"}; { 9, 31974, "", "=q4=Merciless Gladiator's Dreadweave Hood", "=ds=#s1#", "15000 #faction#"}; { 10, 31976, "", "=q4=Merciless Gladiator's Dreadweave Mantle", "=ds=#s3#", "13000 #faction#"}; { 11, 31977, "", "=q4=Merciless Gladiator's Dreadweave Robe", "=ds=#s5#", "15000 #faction#"}; { 12, 31973, "", "=q4=Merciless Gladiator's Dreadweave Gloves", "=ds=#s9#", "12000 #faction#"}; { 13, 31975, "", "=q4=Merciless Gladiator's Dreadweave Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_1#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_1#", "=q1=#arenas2L#"}; { 17, 33677, "", "=q4=Vengeful Gladiator's Dreadweave Hood", "=ds=#s1#", ""}; { 18, 33679, "", "=q4=Vengeful Gladiator's Dreadweave Mantle", "=ds=#s3#", ""}; { 19, 33680, "", "=q4=Vengeful Gladiator's Dreadweave Robe", "=ds=#s5#", ""}; @@ -4698,13 +4698,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 30200, "", "=q4=Gladiator's Felweave Raiment", "=ds=#s5#"}; { 5, 30188, "", "=q4=Gladiator's Felweave Handguards", "=ds=#s9#"}; { 6, 30201, "", "=q4=Gladiator's Felweave Trousers", "=ds=#s11#"}; - { 8, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_2#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_2#", "=q1=#arenas3L#"}; { 9, 31980, "", "=q4=Merciless Gladiator's Felweave Cowl", "=ds=#s1#", "15000 #faction#"}; { 10, 31979, "", "=q4=Merciless Gladiator's Felweave Amice", "=ds=#s3#", "13000 #faction#"}; { 11, 31982, "", "=q4=Merciless Gladiator's Felweave Raiment", "=ds=#s5#", "15000 #faction#"}; { 12, 31981, "", "=q4=Merciless Gladiator's Felweave Handguards", "=ds=#s9#", "12000 #faction#"}; { 13, 31983, "", "=q4=Merciless Gladiator's Felweave Trousers", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_2#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Shadow_CurseOfTounges", "=q6=#arenas8_2#", "=q1=#arenas2L#"}; { 17, 33683, "", "=q4=Vengeful Gladiator's Felweave Cowl", "=ds=#s1#", ""}; { 18, 33682, "", "=q4=Vengeful Gladiator's Felweave Amice", "=ds=#s3#", ""}; { 19, 33685, "", "=q4=Vengeful Gladiator's Felweave Raiment", "=ds=#s5#", ""}; @@ -4730,13 +4730,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 25997, "", "=q4=Gladiator's Linked Armor", "=ds=#s5#"}; { 5, 26000, "", "=q4=Gladiator's Linked Gauntlets", "=ds=#s9#"}; { 6, 26001, "", "=q4=Gladiator's Linked Leggings", "=ds=#s11#"}; - { 8, 0, "Spell_FireResistanceTotem_01", "=q6=#arenas7_1#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_FireResistanceTotem_01", "=q6=#arenas7_1#", "=q1=#arenas3L#"}; { 9, 32006, "", "=q4=Merciless Gladiator's Linked Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 32008, "", "=q4=Merciless Gladiator's Linked Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32004, "", "=q4=Merciless Gladiator's Linked Armor", "=ds=#s5#", "15000 #faction#"}; { 12, 32005, "", "=q4=Merciless Gladiator's Linked Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 32007, "", "=q4=Merciless Gladiator's Linked Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_FireResistanceTotem_01", "=q6=#arenas7_1#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_FireResistanceTotem_01", "=q6=#arenas7_1#", "=q1=#arenas2L#"}; { 17, 33708, "", "=q4=Vengeful Gladiator's Linked Helm", "=ds=#s1#", ""}; { 18, 33710, "", "=q4=Vengeful Gladiator's Linked Spaulders", "=ds=#s3#", ""}; { 19, 33706, "", "=q4=Vengeful Gladiator's Linked Armor", "=ds=#s5#", ""}; @@ -4757,13 +4757,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 27469, "", "=q4=Gladiator's Mail Armor", "=ds=#s5#"}; { 5, 27470, "", "=q4=Gladiator's Mail Gauntlets", "=ds=#s9#"}; { 6, 27472, "", "=q4=Gladiator's Mail Leggings", "=ds=#s11#"}; - { 8, 0, "Spell_Nature_Lightning", "=q6=#arenas7_2#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Nature_Lightning", "=q6=#arenas7_2#", "=q1=#arenas3L#"}; { 9, 32011, "", "=q4=Merciless Gladiator's Mail Helm", "=ds=#s1#", ""}; { 10, 32013, "", "=q4=Merciless Gladiator's Mail Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32009, "", "=q4=Merciless Gladiator's Mail Armor", "=ds=#s5#", "15000 #faction#"}; { 12, 32010, "", "=q4=Merciless Gladiator's Mail Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 32012, "", "=q4=Merciless Gladiator's Mail Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Nature_Lightning", "=q6=#arenas7_2#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Nature_Lightning", "=q6=#arenas7_2#", "=q1=#arenas2L#"}; { 17, 33713, "", "=q4=Vengeful Gladiator's Mail Helm", "=ds=#s1#", ""}; { 18, 33715, "", "=q4=Vengeful Gladiator's Mail Spaulders", "=ds=#s3#", ""}; { 19, 33711, "", "=q4=Vengeful Gladiator's Mail Armor", "=ds=#s5#", ""}; @@ -4784,13 +4784,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 31396, "", "=q4=Gladiator's Ringmail Armor", "=ds=#s5#"}; { 5, 31397, "", "=q4=Gladiator's Ringmail Gauntlets", "=ds=#s9#"}; { 6, 31406, "", "=q4=Gladiator's Ringmail Leggings", "=ds=#s11#"}; - { 8, 0, "Spell_Nature_HealingWaveGreater", "=q6=#arenas7_3#", "=q1=#arenas2L#"}; + { 8, 0, "Spell_Nature_HealingWaveGreater", "=q6=#arenas7_3#", "=q1=#arenas3L#"}; { 9, 32031, "", "=q4=Merciless Gladiator's Ringmail Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 32033, "", "=q4=Merciless Gladiator's Ringmail Spaulders", "=ds=#s3#", "13000 #faction#"}; { 11, 32029, "", "=q4=Merciless Gladiator's Ringmail Armor", "=ds=#s5#", "15000 #faction#"}; { 12, 32030, "", "=q4=Merciless Gladiator's Ringmail Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 32032, "", "=q4=Merciless Gladiator's Ringmail Leggings", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Spell_Nature_HealingWaveGreater", "=q6=#arenas7_3#", "=q1=#arenas3L#"}; + { 16, 0, "Spell_Nature_HealingWaveGreater", "=q6=#arenas7_3#", "=q1=#arenas2L#"}; { 17, 33740, "", "=q4=Vengeful Gladiator's Ringmail Helm", "=ds=#s1#", ""}; { 18, 33742, "", "=q4=Vengeful Gladiator's Ringmail Spaulders", "=ds=#s3#", ""}; { 19, 33738, "", "=q4=Vengeful Gladiator's Ringmail Armor", "=ds=#s5#", ""}; @@ -4815,13 +4815,13 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); { 4, 24544, "", "=q4=Gladiator's Plate Chestpiece", "=ds=#s5#"}; { 5, 24549, "", "=q4=Gladiator's Plate Gauntlets", "=ds=#s9#"}; { 6, 24547, "", "=q4=Gladiator's Plate Legguards", "=ds=#s11#"}; - { 8, 0, "Ability_Warrior_BattleShout", "=q6=#arenas9#", "=q1=#arenas2L#"}; + { 8, 0, "Ability_Warrior_BattleShout", "=q6=#arenas9#", "=q1=#arenas3L#"}; { 9, 30488, "", "=q4=Merciless Gladiator's Plate Helm", "=ds=#s1#", "15000 #faction#"}; { 10, 30490, "", "=q4=Merciless Gladiator's Plate Shoulders", "=ds=#s3#", "13000 #faction#"}; { 11, 30486, "", "=q4=Merciless Gladiator's Plate Chestpiece", "=ds=#s5#", "15000 #faction#"}; { 12, 30487, "", "=q4=Merciless Gladiator's Plate Gauntlets", "=ds=#s9#", "12000 #faction#"}; { 13, 30489, "", "=q4=Merciless Gladiator's Plate Legguards", "=ds=#s11#", "15000 #faction#"}; - { 16, 0, "Ability_Warrior_BattleShout", "=q6=#arenas9#", "=q1=#arenas3L#"}; + { 16, 0, "Ability_Warrior_BattleShout", "=q6=#arenas9#", "=q1=#arenas2L#"}; { 17, 33730, "", "=q4=Vengeful Gladiator's Plate Helm", "=ds=#s1#", ""}; { 18, 33732, "", "=q4=Vengeful Gladiator's Plate Shoulders", "=ds=#s3#", ""}; { 19, 33728, "", "=q4=Vengeful Gladiator's Plate Chestpiece", "=ds=#s5#", ""}; From 0cbdc9f2e92f4f70bf2701d1744f3016bed2bec5 Mon Sep 17 00:00:00 2001 From: Anch Date: Sun, 2 Oct 2022 17:32:42 +1300 Subject: [PATCH 05/33] difficulty frame overlap -fixed difficulty's being shown while a map was open --- AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index af9d82f..112c131 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -458,7 +458,7 @@ local scrollFrame = CreateFrame("Frame", "Atlasloot_Difficulty_ScrollFrame", Atl scrollFrame.Lable:SetJustifyH("LEFT"); scrollFrame.Lable:SetFont("GameFontNormal", 24); -function AtlasLoot:ScrollFrameUpdate() +function AtlasLoot:ScrollFrameUpdate(hide) if AtlasLoot_Difficulty then local maxValue = #AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE]; FauxScrollFrame_Update(scrollFrame.scrollBar, maxValue, MAX_ROWS, ROW_HEIGHT); From 5f497918857c30b04173b6a68b4872f1f4759bea Mon Sep 17 00:00:00 2001 From: Anch Date: Sat, 8 Oct 2022 17:51:02 +1300 Subject: [PATCH 06/33] New Wishlist system -Added auto sort button -Added pages -Repurposed difficulty select for selecting wishlists -Added lock toggle button making it so left click will move an item up right click down and alt left click to add divider or blank line --- AtlasLoot/Core/AtlasLoot.lua | 79 +++++-- AtlasLoot/Core/LootButtons.lua | 23 +- AtlasLoot/Core/WishList.lua | 210 ++++++++++++++---- .../AtlaslootDefaultFrameCreate.lua | 111 +++++++-- AtlasLoot/Locales/constants.en.lua | 2 + 5 files changed, 337 insertions(+), 88 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index cf844dc..b5b00d0 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -399,7 +399,6 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) local spellName, spellIcon; SearchPrevData = {dataID, dataSource_backup, tablenum}; - --If the loot table name has not been passed, throw up a debugging statement if dataID == nil then @@ -444,6 +443,13 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) AtlasLootDefaultFrame_MapButton:Disable(); AtlasLootDefaultFrame_MapSelectButton:SetText("No Map"); end + + if dataSource_backup == "AtlasLoot_CurrentWishList" then + ATLASLOOT_CURRENT_WISHLIST_NUM = AtlasLoot_CurrentWishList["Show"].ListNum; + else + ATLASLOOT_ITEM_UNLOCK = false; + end + local difType = false; -- Checks to see if type is the same if ATLASLOOT_CURRENTTYPE ~= dataSource[dataID].Type then @@ -465,7 +471,11 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) ATLASLOOT_CURRENTTYPE = dataSource[dataID].Type or "Default"; -- Loads the difficultys into the scrollFrame - AtlasLoot:ScrollFrameUpdate(); + if dataSource[dataID].ListType then + AtlasLoot:ScrollFrameUpdate(nil,dataSource[dataID].ListType); + else + AtlasLoot:ScrollFrameUpdate(); + end -- Sets the main page lable AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name); @@ -476,6 +486,12 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) AtlasLootDefaultFrameScrollScrollBar:SetValue(ItemindexID * (max / #AtlasLoot_Difficulty[dataSource[dataID].Type])); end + -- Moves the difficulty scrollslider if wishlist + if dataSource_backup == "AtlasLoot_CurrentWishList" and dataSource[dataID].ListNum > 5 then + local min, max = AtlasLootDefaultFrameScrollScrollBar:GetMinMaxValues(); + AtlasLootDefaultFrameScrollScrollBar:SetValue(tablenum * (max / #AtlasLootWishList[dataSource[dataID].ListType][dataSource[dataID].ListNum])); + end + --For stopping the subtable from changing if its a token table if dataSource[dataID].NoSubt == nil and dataID ~= "FilterList" then if dataSource[dataID].DisplayName then @@ -542,7 +558,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) end -- Create the loottable - if (dataID == "SearchResult") or (dataID == "WishList") or dataSource[dataID][tablenum] then + if (dataID == "SearchResult") or (dataSource_backup == "AtlasLoot_CurrentWishList") or dataSource[dataID][tablenum] then --Iterate through each item object and set its properties for i = 1, 30, 1 do --Check for a valid object (that it exists, and that it has a name @@ -583,7 +599,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) AtlasLootItemsFrame.refreshFilter = {dataID, dataSource_backup, tablenum}; end - if dataID ~= "WishList" and dataID ~= "FilterList" and dataSource[dataID].Back ~= true then + if dataID ~= "FilterList" and dataSource[dataID].Back ~= true then AtlasLootItemsFrame.refreshOri = {dataID, dataSource_backup, tablenum}; end @@ -604,7 +620,9 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) extraFrame = _G["AtlasLootItem_"..dataSource[dataID][tablenum][i][1].."_Extra"]; --If there is no data on the texture an item should have, show a big red question mark - if dataSource[dataID][tablenum][i][3] == "?" then + if dataSource[dataID][tablenum][i][3] == "Blank" then + iconFrame:SetTexture(nil); + elseif dataSource[dataID][tablenum][i][3] == "?" then iconFrame:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark"); elseif dataSource[dataID][tablenum][i][3] == "" then iconFrame:SetTexture(GetItemIcon(IDfound)); @@ -623,14 +641,14 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) iconFrame:SetTexture("Interface\\Icons\\"..dataSource[dataID][tablenum][i][3]); end itemButton.itemTexture = dataSource[dataID][tablenum][i][3]; - if iconFrame:GetTexture() == nil then + if iconFrame:GetTexture() == nil and dataSource[dataID][tablenum][i][3] ~= "Blank" then iconFrame:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark"); end itemButton.name = text; itemButton.extra = extra; --Highlight items in the wishlist - if IDfound ~= "" and IDfound ~= 0 and dataSource_backup ~= "AtlasLootWishList" and AtlasLootWishList["Options"][UnitName("player")]["Mark"] == true then + if IDfound ~= "" and IDfound ~= 0 and dataSource_backup ~= "AtlasLoot_CurrentWishList" and AtlasLootWishList["Options"][UnitName("player")]["Mark"] == true then local xitemexistwish, itemwishicons = AtlasLoot_WishListCheck(IDfound, true) if xitemexistwish then text = itemwishicons.." "..text; @@ -675,7 +693,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) itemButton.price = dataSource[dataID][tablenum][i][6] or nil; itemButton.droprate = dataSource[dataID][tablenum][i][7] or nil; - if (dataID == "SearchResult" or dataSource_backup == "AtlasLootWishList") and dataSource[dataID][tablenum][i][8] then + if (dataID == "SearchResult" or dataSource_backup == "AtlasLoot_CurrentWishList") and dataSource[dataID][tablenum][i][8] then itemButton.sourcePage = dataSource[dataID][tablenum][i][8]; elseif dataSource[dataID][tablenum][i][8] ~= nil and dataSource[dataID][tablenum][i][8]:match("=LT=") then itemButton.sourcePage = string.sub(dataSource[dataID][tablenum][i][8], 5); @@ -702,8 +720,11 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) AtlasLootItemsFrame.refreshFilter = {dataID, dataSource_backup, tablenum}; end - if dataSource_backup ~= "AtlasLootWishList" and dataID ~= "FilterList" and dataSource[dataID].Back ~= true and dataID ~= "EmptyTable" then + if dataID ~= "FilterList" and dataSource[dataID].Back ~= true and dataID ~= "EmptyTable" then AtlasLootItemsFrame.refreshOri = {dataID, dataSource_backup, tablenum}; + end + + if dataSource_backup ~= "AtlasLoot_CurrentWishList" and dataID ~= "FilterList" and dataSource[dataID].Back ~= true and dataID ~= "EmptyTable" then AtlasLoot.db.profile.LastBoss = {dataID, dataSource_backup, tablenum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE}; AtlasLoot.db.profile[ATLASLOOT_CURRENTTABLE] = {dataID, dataSource_backup, tablenum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE}; end @@ -724,7 +745,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) end -- Show the Filter Check-Box - if dataID ~= "SearchResult" and filterCheck(dataID) ~= true and dataSource_backup ~= "AtlasLoot_TokenData" and dataSource_backup ~= "AtlasLootWishList" then + if dataID ~= "SearchResult" and filterCheck(dataID) ~= true and dataSource_backup ~= "AtlasLoot_TokenData" and dataSource_backup ~= "AtlasLoot_CurrentWishList" then AtlasLootFilterCheck:Show(); end @@ -735,15 +756,17 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) _G["AtlasLootItemsFrame_Wishlist_Options"]:Hide(); _G["AtlasLootItemsFrame_Wishlist_Share"]:Hide(); _G["AtlasLootItemsFrame_Wishlist_Swap"]:Hide(); + _G["AtlasLootItemsFrame_Wishlist_UnLock"]:Hide(); -- Show Wishlist buttons when a wishlist in showing - if dataSource_backup == "AtlasLootWishList" then + if dataSource_backup == "AtlasLoot_CurrentWishList" then _G["AtlasLootItemsFrame_Wishlist_Options"]:Show(); _G["AtlasLootItemsFrame_Wishlist_Share"]:Show(); _G["AtlasLootItemsFrame_Wishlist_Swap"]:Show(); - if dataID == "Shared" then + _G["AtlasLootItemsFrame_Wishlist_UnLock"]:Show(); + if dataSource[dataID].ListType == "Shared" then AtlasLootItemsFrame_Wishlist_Swap:SetText("Own"); - elseif dataID == "Own" then + elseif dataSource[dataID].ListType == "Own" then AtlasLootItemsFrame_Wishlist_Swap:SetText("Shared"); end end @@ -892,7 +915,11 @@ function AtlasLoot:ShowQuickLooks(button) "tooltipTitle", AL["QuickLook"].." 1", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 1", "func", function() - AtlasLootCharDB["QuickLooks"][1]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLootCharDB["QuickLooks"][1]={AtlasLoot_CurrentWishList["Show"].ListType, "AtlasLootWishList", AtlasLoot_CurrentWishList["Show"].ListNum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G["AtlasLootWishList"][AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name}; + else + AtlasLootCharDB["QuickLooks"][1]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; + end AtlasLoot:RefreshQuickLookButtons(); dewdrop:Close(1); end @@ -902,8 +929,12 @@ function AtlasLoot:ShowQuickLooks(button) "tooltipTitle", AL["QuickLook"].." 2", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 2", "func", function() - AtlasLootCharDB["QuickLooks"][2]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; - AtlasLoot:RefreshQuickLookButtons(); + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLootCharDB["QuickLooks"][2]={AtlasLoot_CurrentWishList["Show"].ListType, "AtlasLootWishList", AtlasLoot_CurrentWishList["Show"].ListNum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G["AtlasLootWishList"][AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name}; + else + AtlasLootCharDB["QuickLooks"][2]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; + end + AtlasLoot:RefreshQuickLookButtons(); dewdrop:Close(1); end ); @@ -912,8 +943,12 @@ function AtlasLoot:ShowQuickLooks(button) "tooltipTitle", AL["QuickLook"].." 3", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 3", "func", function() - AtlasLootCharDB["QuickLooks"][3]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; - AtlasLoot:RefreshQuickLookButtons(); + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLootCharDB["QuickLooks"][3]={AtlasLoot_CurrentWishList["Show"].ListType, "AtlasLootWishList", AtlasLoot_CurrentWishList["Show"].ListNum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G["AtlasLootWishList"][AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name}; + else + AtlasLootCharDB["QuickLooks"][3]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; + end + AtlasLoot:RefreshQuickLookButtons(); dewdrop:Close(1); end ); @@ -922,8 +957,12 @@ function AtlasLoot:ShowQuickLooks(button) "tooltipTitle", AL["QuickLook"].." 4", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 4", "func", function() - AtlasLootCharDB["QuickLooks"][4]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; - AtlasLoot:RefreshQuickLookButtons(); + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLootCharDB["QuickLooks"][4]={AtlasLoot_CurrentWishList["Show"].ListType, "AtlasLootWishList", AtlasLoot_CurrentWishList["Show"].ListNum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G["AtlasLootWishList"][AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name}; + else + AtlasLootCharDB["QuickLooks"][4]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE, _G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]][AtlasLootItemsFrame.refreshOri[3]].Name}; + end + AtlasLoot:RefreshQuickLookButtons(); dewdrop:Close(1); end ); diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua index 8cf5f6a..5ccbbf2 100644 --- a/AtlasLoot/Core/LootButtons.lua +++ b/AtlasLoot/Core/LootButtons.lua @@ -221,7 +221,14 @@ function AtlasLootItem_OnClick(self ,arg1) local iteminfo = GetItemInfo(self.itemID); local itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemCount, itemEquipLoc, itemTexture = GetItemInfo(self.itemID); --If shift-clicked, link in the chat window - if(arg1=="RightButton" and not iteminfo and self.itemID ~= 0) then + if arg1=="RightButton" and ATLASLOOT_ITEM_UNLOCK then + AtlasLoot:MoveWishlistItem("Down",self.number); + elseif IsAltKeyDown() and arg1=="LeftButton" and ATLASLOOT_ITEM_UNLOCK then + StaticPopup_Show ("ATLASLOOT_ADD_DIVIDER"); + StaticPopupDialogs.ATLASLOOT_ADD_DIVIDER.num = self.number; + elseif (arg1=="LeftButton") and ATLASLOOT_ITEM_UNLOCK then + AtlasLoot:MoveWishlistItem("Up",self.number); + elseif(arg1=="RightButton" and not iteminfo and self.itemID ~= 0) then AtlasLootTooltip:SetHyperlink("item:"..self.itemID..":0:0:0:0:0:0:0"); if not AtlasLoot.db.profile.ItemSpam then DEFAULT_CHAT_FRAME:AddMessage(AL["Server queried for "]..color.."["..name.."]".."|r"..AL[". Right click on any other item to refresh the loot page."]); @@ -239,9 +246,9 @@ function AtlasLootItem_OnClick(self ,arg1) --If control-clicked, use the dressing room elseif(IsControlKeyDown() and iteminfo) then DressUpItemLink(itemLink); - elseif(IsAltKeyDown() and (self.itemID ~= 0)) then - if AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList" then - AtlasLoot_DeleteFromWishList(self.itemID); + elseif IsAltKeyDown() then + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLoot_DeleteFromWishList(self.itemID,self.number); else if(AtlasLootItemsFrame.refresh[1] == "SearchResult") then local datID, _, datPage = strsplit("|", self.sourcePage); @@ -252,7 +259,7 @@ function AtlasLootItem_OnClick(self ,arg1) AtlasLoot_BossName:GetText(), self.dataID .. "|" .. "AtlasLoot_Data" .. "|" .. tostring(self.tablenum), self); end end - elseif((AtlasLootItemsFrame.refresh[1] == "SearchResult" or AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList") and self.sourcePage) then + elseif((AtlasLootItemsFrame.refresh[1] == "SearchResult" or AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList") and self.sourcePage) then local dataID, dataSource, dataPage = strsplit("|", self.sourcePage); if(dataID and dataSource) then AtlasLoot:ShowItemsFrame(dataID, "AtlasLoot_Data", tonumber(dataPage)); @@ -269,9 +276,9 @@ function AtlasLootItem_OnClick(self ,arg1) if IsShiftKeyDown() then spellID = string.sub(self.itemID, 2); ChatEdit_InsertLink(AtlasLoot_GetEnchantLink(spellID)); - elseif(IsAltKeyDown() and (self.itemID ~= 0)) then - if AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList" then - AtlasLoot_DeleteFromWishList(self.itemID); + elseif IsAltKeyDown() then + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLoot_DeleteFromWishList(self.itemID, self.number); else spellName, _, _, _, _, _, _, _, _ = GetSpellInfo(string.sub(self.itemID, 2)); --spellIcon = GetItemIcon(self.dressingroomID); diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index 25cd679..fe4a210 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -39,6 +39,26 @@ local PURPLE = "|cff9F3FFF"; local BLUE = "|cff0070dd"; local ORANGE = "|cffFF8400"; +function AtlasLoot:ShowWishList(listType,arg2,arg3) + AtlasLoot_CurrentWishList = {["Show"] = {ListType = listType, ListNum = arg2 ,Name = "WishLists", Icon = AtlasLootWishList[listType][arg2].Icon}}; + if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then + AtlasLoot:SortWishList(true); + end + local numPages = math.ceil(#AtlasLootWishList[listType][arg2]/30); + for n = 1 ,numPages, 1 do + table.insert(AtlasLoot_CurrentWishList["Show"], {Name = "Page "..n}) + end + for i,v in ipairs(AtlasLootWishList[listType][arg2]) do + local itemNum = v[1]; + if v[1] >= 31 then + itemNum = v[1]-(math.floor(v[1]/30)*30); + end + table.insert(AtlasLoot_CurrentWishList["Show"][math.ceil(v[1]/30)], {itemNum,v[2],v[3],v[4],v[5],v[6],v[7],v[8]}); + end + AtlasLoot:ShowItemsFrame("Show", "AtlasLoot_CurrentWishList", arg3 or 1); + AtlasLoot_WishListDrop:Close(1) +end + --[[ AtlasLoot_WishListAddDropClick(typ, arg2, arg3, arg4) Add a item too the wishlist or show the selected wishlist @@ -46,11 +66,9 @@ Add a item too the wishlist or show the selected wishlist function AtlasLoot_WishListAddDropClick(typ, arg2, arg3, arg4) if arg4 == true then if typ == "addOwn" then - AtlasLoot:ShowItemsFrame("Own", "AtlasLootWishList", arg2); - AtlasLoot_WishListDrop:Close(1) + AtlasLoot:ShowWishList("Own",arg2); elseif typ == "addShared" then - AtlasLoot:ShowItemsFrame("Shared", "AtlasLootWishList", arg2); - AtlasLoot_WishListDrop:Close(1) + AtlasLoot:ShowWishList("Shared",arg2); end else xtyp = typ @@ -60,7 +78,7 @@ function AtlasLoot_WishListAddDropClick(typ, arg2, arg3, arg4) DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..RED..AL[" already in the WishList!"]..WHITE.." ("..AtlasLootWishList["Own"][arg2].Name..")"); return; end - table.insert(AtlasLootWishList["Own"][arg2], { #AtlasLootWishList["Own"][arg2] + 1, itemID, itemTexture, itemName, lootPage, "", "", sourcePage}); + table.insert(AtlasLootWishList["Own"][arg2], { #AtlasLootWishList["Own"][arg2] + 1, itemID, itemTexture, itemName, AtlasLoot_Data[AtlasLootItemsFrame.refresh[1]].Name, "", "", sourcePage}); DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..GREY..AL[" added to the WishList."]..WHITE.." ("..AtlasLootWishList["Own"][arg2].Name..")"); AtlasLoot_WishListDrop:Close(1) elseif typ == "addShared" then @@ -81,23 +99,87 @@ local function CloneTable(t) -- return a copy of the table t while i do if type(v)=="table" then v=CloneTable(v); - end + end new[i] = v; i, v = next(t, i); -- get next index end return new; end +-- Add divider +function AtlasLoot:AddItemDivider(num,text) + for i,v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do + if num <= v[1] then + v[1] = v[1] + 1; + end + end + if text == "" or text == nil then + table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num, 0, "Blank", WHITE..text, ""}); + else + table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num, 0, "INV_Box_01", WHITE..text, ""}); + end + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum,AtlasLootItemsFrame.refresh[3]); +end + -- Opens edit wishlist name/icon window function AtlasLoot:EditWishList() AtlasLootWishList_AddFrame:Show() AtlasLottAddEditWishList:SetText(AL["Edit Wishlist"]); - AtlasLootWishListNewName:SetText(AtlasLootWishList[AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]].Name); - curaddicon = AtlasLootWishList[AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]].Icon; + AtlasLootWishListNewName:SetText(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name); + curaddicon = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon; editName = true; AtlasLoot_WishListDrop:Close(1); end +-- Moves wishlist item +function AtlasLoot:MoveWishlistItem(pos,itemNum,replaceNum,replaceNum2) + itemNum = itemNum + ((AtlasLootItemsFrame.refresh[3]-1)*30); + if pos == "Up" then replaceNum = itemNum - 1; replaceNum2 = 1 elseif pos == "Down" then replaceNum = itemNum + 1; replaceNum2 = -1 end + if replaceNum ~= 0 then + for i,v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do + if itemNum == v[1] then + v[1] = replaceNum; + elseif v[1] == replaceNum then + v[1] = v[1] + replaceNum2; + end + end + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum,AtlasLootItemsFrame.refresh[3]); + end +end + +--Sort wishlist +function AtlasLoot:SortWishList(refresh) + local sorted = {}; + local name = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name; + local icon = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon; + for i,v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do + if sorted[v[5]] and v[2] ~= 0 then + table.insert(sorted[v[5]],v); + elseif v[2] ~= 0 then + sorted[v[5]] = {}; + table.insert(sorted[v[5]],{0, 0, "INV_Box_01", WHITE..v[5], ""}); + table.insert(sorted[v[5]],v); + end + end + AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum] = {}; + local num = 1 + for i,v in pairs(sorted) do + for n,t in ipairs(v) do + if num ~= 1 and t[3] == "INV_Box_01" then + table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num, 0, "Blank", WHITE.." ", ""}); + num = num + 1; + end + table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num,t[2],t[3],t[4],t[5],t[6],t[7],t[8]}); + num = num + 1; + end + end + AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name = name; + AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon = icon; + if refresh == nil then + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum); + end +end + -- Opens add wishlist name/icon window function AtlasLoot:AddWishList() AtlasLootWishList_AddFrame:Show(); @@ -113,15 +195,15 @@ end -- Clones a shared wishlist to personal table function AtlasLoot:SetDefaultWishList() - if AtlasLootItemsFrame.refresh[1] == "Own" then - AtlasLootWishList["Options"][playerName]["DefaultWishList"] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]}; + if AtlasLoot_CurrentWishList["Show"].ListType == "Own" then + AtlasLootWishList["Options"][playerName]["DefaultWishList"] = {AtlasLoot_CurrentWishList["Show"].ListType, "AtlasLootWishList", AtlasLoot_CurrentWishList["Show"].ListNum}; end AtlasLoot_WishListDrop:Close(1); end -- Deletes current wishlist function AtlasLoot:DeleteWishList() - if AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList" then + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then StaticPopup_Show("ATLASLOOT_DELETE_WISHLIST"); AtlasLoot_WishListDrop:Close(1); end @@ -129,7 +211,7 @@ end -- Share current wishlist function AtlasLoot:ShareWishList() - StaticPopup_Show ("ATLASLOOT_SEND_WISHLIST",AtlasLootWishList["Own"][AtlasLootItemsFrame.refresh[3]].Name); + StaticPopup_Show ("ATLASLOOT_SEND_WISHLIST",AtlasLootWishList["Own"][AtlasLoot_CurrentWishList["Show"].ListNum].Name); end --[[ @@ -137,12 +219,12 @@ AtlasLoot:WishListSwapButton Main panel wishlistswap button ]] function AtlasLoot:WishListSwapButton(xitemID, xitemTexture, xitemName, xlootPage, xsourcePage, button, show) - if AtlasLootItemsFrame.refresh[1] == "Own" then + if AtlasLoot_CurrentWishList["Show"].ListType == "Own" then if AtlasLootWishList["Shared"][1] then AtlasLoot_WishListAddDropClick("addShared", 1, "", show); AtlasLootItemsFrame_Wishlist_Swap:SetText("Own"); end - elseif AtlasLootItemsFrame.refresh[1] == "Shared" then + elseif AtlasLoot_CurrentWishList["Show"].ListType == "Shared" then AtlasLoot_WishListAddDropClick("addOwn", AtlasLootWishList["Options"][playerName]["DefaultWishList"][3] or 1, "", show); AtlasLootItemsFrame_Wishlist_Swap:SetText("Shared"); end @@ -257,24 +339,27 @@ end AtlasLoot_DeleteFromWishList(itemID) Deletes the specified items from the wishlist ]] -function AtlasLoot_DeleteFromWishList(itemID) - if itemID and itemID == 0 then return end - if AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList" then - for i, v in ipairs(_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]]) do - if v[2] == itemID then - DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot_FixText(v[4])..GREY..AL[" deleted from the WishList."]..WHITE.." (".._G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]].Name..")"); - table.remove(_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]], i); - --Sort wishlist after deleting an item - for n,table in ipairs(_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]]) do - table[1] = n; +function AtlasLoot_DeleteFromWishList(itemID,btnNumber) + btnNumber = btnNumber + ((AtlasLootItemsFrame.refresh[3] - 1) * 30); + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + for i, v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do + if v[1] == btnNumber then + local numPos = v[1]; + DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot_FixText(v[4])..GREY..AL[" deleted from the WishList."]..WHITE.." ("..AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name..")"); + table.remove(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum], i); + --Sort wishlist after deleting an item + for n,table in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do + if numPos <= table[1] then + table[1] = table[1] - 1; end + end break; end - end + end end AtlasLootItemsFrame:Hide(); - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); -end + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum,AtlasLootItemsFrame.refresh[3]); + end --[[ AtlasLoot_WishListCheck(itemID, all): @@ -372,14 +457,19 @@ function AtlasLoot:WishListOptionsRegister() "func", function() AtlasLoot:EditWishList() end, "notCheckable", true ); - if AtlasLootItemsFrame.refresh[1] == "Shared" then + AtlasLoot_WishListOptions:AddLine( + "text", AL["Sort Wishlist"], + "func", function() AtlasLoot:SortWishList() end, + "notCheckable", true + ); + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" and AtlasLoot_CurrentWishList["Show"].ListType == "Shared" then AtlasLoot_WishListOptions:AddLine( "text", AL["Copy Wishlist To Own"], "func", function() AtlasLoot:CloneSharedWishList() end, "notCheckable", true ); end - if AtlasLootItemsFrame.refresh[1] == "Own" then + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" and AtlasLoot_CurrentWishList["Show"].ListType == "Own" then AtlasLoot_WishListOptions:AddLine( "text", AL["Make Wishlist Default"], "func", function() AtlasLoot:SetDefaultWishList() end, @@ -434,12 +524,12 @@ StaticPopupDialogs["ATLASLOOT_DELETE_WISHLIST"] = { this:SetFrameStrata("TOOLTIP"); end, OnAccept = function() - table.remove(AtlasLootWishList[AtlasLootItemsFrame.refresh[1]], AtlasLootItemsFrame.refresh[3]); + table.remove(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType], AtlasLoot_CurrentWishList["Show"].ListNum); AtlasLootWishList["Options"][playerName]["DefaultWishList"][3] = 1; - if AtlasLootWishList[AtlasLootItemsFrame.refresh[1]][1] == nil then + if AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][1] == nil then AtlasLoot:ShowItemsFrame("EmptyTable", "AtlasLoot_Data", 1); else - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], 1); + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, 1); end AtlasLoot_WishListDrop:Close(1); end, @@ -519,8 +609,7 @@ function AtlasLoot:WishlistSetup() if AtlasLootWishList["Options"][playerName]["AllowShareWishlist"] ~= true and AtlasLootWishList["Options"][playerName]["AllowShareWishlist"] ~= false then AtlasLootWishList["Options"][playerName]["AllowShareWishlist"] = true end if AtlasLootWishList["Options"][playerName]["AllowShareWishlistInCombat"] ~= true and AtlasLootWishList["Options"][playerName]["AllowShareWishlistInCombat"] ~= false then AtlasLootWishList["Options"][playerName]["AllowShareWishlistInCombat"] = true end if AtlasLootWishList["Options"][playerName]["UseDefaultWishlist"] ~= true and AtlasLootWishList["Options"][playerName]["UseDefaultWishlist"] ~= false then AtlasLootWishList["Options"][playerName]["UseDefaultWishlist"] = false end - if AtlasLootWishList["Options"][playerName]["DefaultWishList"] ~= true then AtlasLootWishList["Options"][playerName]["DefaultWishList"] = {"Own", "AtlasLootWishList", 1} end - + if not AtlasLootWishList["Options"][playerName]["DefaultWishList"] then AtlasLootWishList["Options"][playerName]["DefaultWishList"] = {"Own", "AtlasLootWishList", 1} end end --[[ AtlasLoot_CreateWishlistOptions() @@ -606,10 +695,10 @@ function AtlasLoot_CreateWishlistOptions() if curaddicon == "" then curaddicon = "Interface\\Icons\\INV_Misc_QuestionMark" elseif curaddicon ~= "" then - AtlasLootWishList[AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]].Name = curaddname; - AtlasLootWishList[AtlasLootItemsFrame.refresh[1]][AtlasLootItemsFrame.refresh[3]].Icon = curaddicon; + AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name = curaddname; + AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon = curaddicon; WishListAddFrame:Hide(); - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum); end else if curaddicon == "" then @@ -617,8 +706,8 @@ function AtlasLoot_CreateWishlistOptions() elseif curaddicon ~= "" then table.insert( AtlasLootWishList["Own"],{Name = curaddname, Icon = curaddicon}) WishListAddFrame:Hide(); - if AtlasLootItemsFrame.refresh[2] == "AtlasLootWishList" then - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); + if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then + AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum); end end end @@ -791,6 +880,26 @@ function AtlasLoot_CreateWishlistOptions() AtlasLootWishList["Options"][playerName]["UseDefaultWishlist"] = true; end end) + + local WishListAutoSort = CreateFrame("CheckButton", "AtlasLootOptionsWishListAutoSort", WishlistOptionsFrame, "OptionsCheckButtonTemplate") + WishListAutoSort:SetPoint("LEFT", WishlistOptionsFrame, "TOPLEFT", 5, -135) + WishListAutoSort:SetWidth(25) + WishListAutoSort:SetHeight(25) + WishListAutoSort:SetScript("OnShow", function() + _G[this:GetName().."Text"]:SetText(AL["Auto Sort WishLists"]); + if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] == true then + this:SetChecked(1); + else + this:SetChecked(nil); + end + end) + WishListAutoSort:SetScript("OnClick", function() + if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then + AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] = false; + else + AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] = true; + end + end) InterfaceOptions_AddCategory(WishlistOptionsFrame) OptionsLoadet = true @@ -926,7 +1035,7 @@ StaticPopupDialogs["ATLASLOOT_SEND_WISHLIST"] = { else if SpamProtect(string.lower(name)) then - curtable = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]}; + curtable = {AtlasLoot_CurrentWishList["Show"].ListType, "AtlasLootWishList", AtlasLoot_CurrentWishList["Show"].ListNum}; ALModule:SendCommMessage("AtlasLootWishlist", "WishlistRequest", "WHISPER", name); else local _,_,timeleft = string.find( 10-(GetTime() - SpamFilter[string.lower(name)]), "(%d+)%.") @@ -939,3 +1048,24 @@ StaticPopupDialogs["ATLASLOOT_SEND_WISHLIST"] = { whileDead = 1, hideOnEscape = 1 }; + +--[[ +StaticPopupDialogs["ATLASLOOT_ADD_DIVIDER"] +This is shown, if you want too add a divider to a wishlist +]] +StaticPopupDialogs["ATLASLOOT_ADD_DIVIDER"] = { + text = "Add text for a divider or leave blank for a blank", + button1 = "Set Text", + button2 = AL["Cancel"], + OnShow = function(self) + self:SetFrameStrata("TOOLTIP"); + end, + OnAccept = function() + local text = _G[this:GetParent():GetName().."EditBox"]:GetText(); + AtlasLoot:AddItemDivider(StaticPopupDialogs.ATLASLOOT_ADD_DIVIDER.num,text); + end, + hasEditBox = 1, + timeout = 0, + whileDead = 1, + hideOnEscape = 1 +}; diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index 112c131..2318613 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -105,6 +105,7 @@ local function createLootItemButtons(num) button.extra:SetPoint("TOPLEFT","AtlasLootItem_"..num.."_Name","BOTTOMLEFT",0,-1); button.extra:SetJustifyH("LEFT"); button:RegisterForClicks("AnyDown"); + button.number = num; button:SetScript("OnEnter", function(self) AtlasLootItem_OnEnter(self) end); button:SetScript("OnLeave", function(self) AtlasLootItem_OnLeave(self) end); button:SetScript("OnClick", function(self, arg1) AtlasLootItem_OnClick(self, arg1) end); @@ -179,7 +180,7 @@ local backbtn = CreateFrame("Button", "AtlasLootItemsFrame_BACK", AtlasLootItems -- Wishlist Own/Swap button local swapbtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_Swap", AtlasLootItemsFrame, "OptionsButtonTemplate"); - swapbtn:SetPoint("BOTTOM", "AtlasLootItemsFrame", "BOTTOM",0,4); + swapbtn:SetPoint("BOTTOM", "AtlasLootItemsFrame", "BOTTOM",50,4); swapbtn:SetScript("OnClick", function(self) AtlasLoot:WishListSwapButton("","","","","",self,true) end) swapbtn:Hide(); @@ -187,7 +188,7 @@ local swapbtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_Swap", Atlas local optionsbtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_Options", AtlasLootItemsFrame, "OptionsButtonTemplate"); optionsbtn:SetPoint("BOTTOM", "AtlasLootItemsFrame_Wishlist_Swap", "BOTTOM",-100,0); optionsbtn:SetText(AL["Options"]); - optionsbtn:SetScript("OnClick", function(self) + optionsbtn:SetScript("OnClick", function(self) if AtlasLoot_WishListOptions:IsOpen() then AtlasLoot_WishListOptions:Close(); else @@ -196,13 +197,41 @@ local optionsbtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_Options", end); optionsbtn:Hide(); - -- Wishlist Share button + -- Wishlist Item Lock button +ATLASLOOT_ITEM_UNLOCK = false; +local lockbtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_UnLock", AtlasLootItemsFrame, "OptionsButtonTemplate"); + lockbtn:SetPoint("BOTTOM", "AtlasLootItemsFrame_Wishlist_Options", "BOTTOM",-100,0); + lockbtn:SetScript("OnClick", function(self) + if ATLASLOOT_ITEM_UNLOCK then + ATLASLOOT_ITEM_UNLOCK = false; + lockbtn:SetText("Locked"); + else + ATLASLOOT_ITEM_UNLOCK = true; + lockbtn:SetText("UnLocked"); + end + end) + lockbtn:SetScript("OnEnter", function(self) + GameTooltip:ClearLines(); + GameTooltip:SetOwner(self, "ANCHOR_RIGHT", -(self:GetWidth() / 2), 5); + GameTooltip:AddLine("Toggle Item Moving"); + GameTooltip:AddLine("Left Click to move item up"); + GameTooltip:AddLine("Right Click to move item down"); + GameTooltip:AddLine("Alt + Left Click to add a divider"); + GameTooltip:Show(); + end); + lockbtn:SetScript("OnLeave", function() + if(GameTooltip:IsVisible()) then + GameTooltip:Hide(); + end + end); + lockbtn:SetText("Locked"); + lockbtn:Hide(); + -- Wishlist Share button local sharebtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_Share", AtlasLootItemsFrame, "OptionsButtonTemplate"); sharebtn:SetPoint("BOTTOM", "AtlasLootItemsFrame_Wishlist_Swap", "BOTTOM",100,0); sharebtn:SetText(AL["Share"]); sharebtn:SetScript("OnClick", function() AtlasLoot:ShareWishList() end) sharebtn:Hide(); - -- Filter Button local filterbtn = CreateFrame("CheckButton","AtlasLootFilterCheck",AtlasLootItemsFrame,"OptionsCheckButtonTemplate"); filterbtn:SetPoint("BOTTOM", "AtlasLootItemsFrame", "BOTTOM",85 ,27); @@ -351,7 +380,11 @@ local function presetcreate(preset,num) if AtlasLoot:IsLootTableAvailable(AtlasLootCharDB["QuickLooks"][num][4]) then ATLASLOOT_LASTMODULE = AtlasLootCharDB["QuickLooks"][num][4]; ATLASLOOT_CURRENTTABLE = AtlasLootCharDB["QuickLooks"][num][5]; - AtlasLoot:ShowItemsFrame(AtlasLootCharDB["QuickLooks"][num][1], AtlasLootCharDB["QuickLooks"][num][2], AtlasLootCharDB["QuickLooks"][num][3]); + if AtlasLootCharDB["QuickLooks"][num][2] == "AtlasLootWishList" then + AtlasLoot:ShowWishList(AtlasLootCharDB["QuickLooks"][num][1], AtlasLootCharDB["QuickLooks"][num][3]); + else + AtlasLoot:ShowItemsFrame(AtlasLootCharDB["QuickLooks"][num][1], AtlasLootCharDB["QuickLooks"][num][2], AtlasLootCharDB["QuickLooks"][num][3]); + end end end); preset:SetScript("OnShow", function(self) @@ -458,17 +491,40 @@ local scrollFrame = CreateFrame("Frame", "Atlasloot_Difficulty_ScrollFrame", Atl scrollFrame.Lable:SetJustifyH("LEFT"); scrollFrame.Lable:SetFont("GameFontNormal", 24); -function AtlasLoot:ScrollFrameUpdate(hide) - if AtlasLoot_Difficulty then - local maxValue = #AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE]; +function AtlasLoot:ScrollFrameUpdate(hide,wishlist) + local maxValue,offset,row,value; + scrollFrame.wishList = nil; + if wishlist then + scrollFrame.wishList = wishlist; + maxValue = #AtlasLootWishList[wishlist]; FauxScrollFrame_Update(scrollFrame.scrollBar, maxValue, MAX_ROWS, ROW_HEIGHT); - local offset = FauxScrollFrame_GetOffset(scrollFrame.scrollBar); + offset = FauxScrollFrame_GetOffset(scrollFrame.scrollBar); for i = 1, MAX_ROWS do - local value = i + offset + value = i + offset + scrollFrame.rows[i]:SetChecked(false); + scrollFrame.rows[i]:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); + if value <= maxValue and AtlasLootWishList[wishlist][value] then + row = scrollFrame.rows[i] + row:SetText("|cffFFd200"..AtlasLootWishList[wishlist][value].Name); + row.itemIndex = value; + if row.itemIndex == ATLASLOOT_CURRENT_WISHLIST_NUM then + row:SetChecked(true); + end + row:Show() + else + scrollFrame.rows[i]:Hide() + end + end + elseif AtlasLoot_Difficulty then + maxValue = #AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE]; + FauxScrollFrame_Update(scrollFrame.scrollBar, maxValue, MAX_ROWS, ROW_HEIGHT); + offset = FauxScrollFrame_GetOffset(scrollFrame.scrollBar); + for i = 1, MAX_ROWS do + value = i + offset scrollFrame.rows[i]:SetChecked(false); scrollFrame.rows[i]:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); if value <= maxValue and AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value] and hide == nil then - local row = scrollFrame.rows[i] + row = scrollFrame.rows[i] row:SetText("|cffFFd200"..AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value][1]); row.itemIndex = AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value][2]; if row.itemIndex == ItemindexID then @@ -483,15 +539,23 @@ function AtlasLoot:ScrollFrameUpdate(hide) end local scrollSlider = CreateFrame("ScrollFrame","AtlasLootDefaultFrameScroll", Atlasloot_Difficulty_ScrollFrame, "FauxScrollFrameTemplate"); - scrollSlider:SetPoint("TOPLEFT", 0, -8) - scrollSlider:SetPoint("BOTTOMRIGHT", -30, 8) + scrollSlider:SetPoint("TOPLEFT", 0, -8); + scrollSlider:SetPoint("BOTTOMRIGHT", -30, 8); scrollSlider:SetScript("OnVerticalScroll", function(self, offset) - self.offset = math.floor(offset / ROW_HEIGHT + 0.5) - AtlasLoot:ScrollFrameUpdate() + self.offset = math.floor(offset / ROW_HEIGHT + 0.5); + if scrollFrame.wishList then + AtlasLoot:ScrollFrameUpdate(nil,scrollFrame.wishList); + else + AtlasLoot:ScrollFrameUpdate(); + end end) scrollSlider:SetScript("OnShow", function() - AtlasLoot:ScrollFrameUpdate() + if scrollFrame.wishList then + AtlasLoot:ScrollFrameUpdate(nil,scrollFrame.wishList); + else + AtlasLoot:ScrollFrameUpdate() + end end) scrollFrame.scrollBar = scrollSlider @@ -502,11 +566,18 @@ local rows = setmetatable({}, { __index = function(t, i) row:SetNormalFontObject(GameFontHighlightLeft); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row:SetScript("OnClick", function() - ItemindexID = row.itemIndex; - if not AtlasLootDefaultFrame_AdvancedSearchPanel:IsVisible() then - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); + if scrollFrame.wishList then + AtlasLoot:ShowWishList(scrollFrame.wishList,row.itemIndex); + AtlasLoot_CurrentWishList["Show"].ListNum = row.itemIndex; + AtlasLoot:ScrollFrameUpdate(nil,scrollFrame.wishList); + else + ItemindexID = row.itemIndex; + if not AtlasLootDefaultFrame_AdvancedSearchPanel:IsVisible() then + AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); + end + AtlasLoot:ScrollFrameUpdate(); end - AtlasLoot:ScrollFrameUpdate(); + end) if i == 1 then row:SetPoint("TOPLEFT", scrollFrame, 8, -8) diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 3162e85..1c2b992 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -299,6 +299,8 @@ if AL then AL["Always use default Wishlist"] = true; AL["Add Wishlist"] = true; AL["Edit Wishlist"] = true; + AL["Sort Wishlist"] = true; + AL["Auto Sort WishLists"] = true; AL["Copy Wishlist To Own"] = true; AL["Make Wishlist Default"] = true; AL["Delete Wishlist"] = true; From 847294076e8c527fa28c2acf51ef18793ec8353d Mon Sep 17 00:00:00 2001 From: Anch Date: Wed, 12 Oct 2022 19:24:48 +1300 Subject: [PATCH 07/33] renamed divider customheader renamed divider customheader and added setframestrata to scroll frames --- AtlasLoot/Core/LootButtons.lua | 4 ++-- AtlasLoot/Core/WishList.lua | 14 +++++++------- .../DefaultFrame/AtlaslootDefaultFrameCreate.lua | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua index 5ccbbf2..c0f7489 100644 --- a/AtlasLoot/Core/LootButtons.lua +++ b/AtlasLoot/Core/LootButtons.lua @@ -224,8 +224,8 @@ function AtlasLootItem_OnClick(self ,arg1) if arg1=="RightButton" and ATLASLOOT_ITEM_UNLOCK then AtlasLoot:MoveWishlistItem("Down",self.number); elseif IsAltKeyDown() and arg1=="LeftButton" and ATLASLOOT_ITEM_UNLOCK then - StaticPopup_Show ("ATLASLOOT_ADD_DIVIDER"); - StaticPopupDialogs.ATLASLOOT_ADD_DIVIDER.num = self.number; + StaticPopup_Show ("ATLASLOOT_ADD_CUSTOMHEADER"); + StaticPopupDialogs.ATLASLOOT_ADD_CUSTOMHEADER.num = self.number; elseif (arg1=="LeftButton") and ATLASLOOT_ITEM_UNLOCK then AtlasLoot:MoveWishlistItem("Up",self.number); elseif(arg1=="RightButton" and not iteminfo and self.itemID ~= 0) then diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index fe4a210..14a23b0 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -106,8 +106,8 @@ local function CloneTable(t) -- return a copy of the table t return new; end --- Add divider -function AtlasLoot:AddItemDivider(num,text) +-- Add CustomHeader +function AtlasLoot:AddItemCustomHeader(num,text) for i,v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do if num <= v[1] then v[1] = v[1] + 1; @@ -1050,11 +1050,11 @@ StaticPopupDialogs["ATLASLOOT_SEND_WISHLIST"] = { }; --[[ -StaticPopupDialogs["ATLASLOOT_ADD_DIVIDER"] -This is shown, if you want too add a divider to a wishlist +StaticPopupDialogs["ATLASLOOT_ADD_CUSTOMHEADER"] +This is shown, if you want too add a CustomHeader to a wishlist ]] -StaticPopupDialogs["ATLASLOOT_ADD_DIVIDER"] = { - text = "Add text for a divider or leave blank for a blank", +StaticPopupDialogs["ATLASLOOT_ADD_CUSTOMHEADER"] = { + text = "Add text for a Custom Header or leave blank for a blank", button1 = "Set Text", button2 = AL["Cancel"], OnShow = function(self) @@ -1062,7 +1062,7 @@ StaticPopupDialogs["ATLASLOOT_ADD_DIVIDER"] = { end, OnAccept = function() local text = _G[this:GetParent():GetName().."EditBox"]:GetText(); - AtlasLoot:AddItemDivider(StaticPopupDialogs.ATLASLOOT_ADD_DIVIDER.num,text); + AtlasLoot:AddItemCustomHeader(StaticPopupDialogs.ATLASLOOT_ADD_CUSTOMHEADER.num,text); end, hasEditBox = 1, timeout = 0, diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index 2318613..37e3da5 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -216,7 +216,7 @@ local lockbtn = CreateFrame("Button", "AtlasLootItemsFrame_Wishlist_UnLock", Atl GameTooltip:AddLine("Toggle Item Moving"); GameTooltip:AddLine("Left Click to move item up"); GameTooltip:AddLine("Right Click to move item down"); - GameTooltip:AddLine("Alt + Left Click to add a divider"); + GameTooltip:AddLine("Alt + Left Click to add a Custom Header"); GameTooltip:Show(); end); lockbtn:SetScript("OnLeave", function() @@ -563,6 +563,7 @@ scrollFrame.scrollBar = scrollSlider local rows = setmetatable({}, { __index = function(t, i) local row = CreateFrame("CheckButton", "$parentRow"..i, scrollFrame) row:SetSize(230, ROW_HEIGHT); + row:SetFrameStrata("Dialog"); row:SetNormalFontObject(GameFontHighlightLeft); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row:SetScript("OnClick", function() @@ -655,8 +656,9 @@ local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableSc local rows2 = setmetatable({}, { __index = function(t, i) local row = CreateFrame("CheckButton", "$parentRow"..i, subtableFrame) - row:SetSize(230, ROW_HEIGHT) - row:SetNormalFontObject(GameFontHighlightLeft) + row:SetSize(230, ROW_HEIGHT); + row:SetFrameStrata("Dialog"); + row:SetNormalFontObject(GameFontHighlightLeft); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row.Text = row:CreateFontString("$parentRow"..i.."Text","OVERLAY","GameFontNormal"); row.Text:SetSize(230, ROW_HEIGHT); From 6203669eb7dfc20c24f3fbf4ff8783cd3bfb3feb Mon Sep 17 00:00:00 2001 From: Anch Date: Thu, 13 Oct 2022 01:52:57 +1300 Subject: [PATCH 08/33] fixed error with more then 1 page --- AtlasLoot/Core/WishList.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index 14a23b0..4776348 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -49,9 +49,11 @@ function AtlasLoot:ShowWishList(listType,arg2,arg3) table.insert(AtlasLoot_CurrentWishList["Show"], {Name = "Page "..n}) end for i,v in ipairs(AtlasLootWishList[listType][arg2]) do - local itemNum = v[1]; - if v[1] >= 31 then - itemNum = v[1]-(math.floor(v[1]/30)*30); + local itemNum + if (v[1]-(math.floor(v[1]/30)*30)) == 0 then + itemNum = 30; + else + itemNum = v[1]-(math.floor(v[1]/30)*30); end table.insert(AtlasLoot_CurrentWishList["Show"][math.ceil(v[1]/30)], {itemNum,v[2],v[3],v[4],v[5],v[6],v[7],v[8]}); end From c19860c16db0f979b6f459f23b895423b8adbda7 Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 14 Oct 2022 15:05:45 +1300 Subject: [PATCH 09/33] auto load instance loottable -Added a system for autoloading the loottable of the instance you are currently in it can be enabled/disabled in the settings page --- AtlasLoot/Core/Atlasloot_Maps.lua | 3030 ++++++++--------- AtlasLoot/Core/Options.lua | 10 + .../DefaultFrame/AtlaslootDefaultFrame.lua | 21 +- AtlasLoot/Locales/constants.en.lua | 1552 ++++++++- AtlasLoot/Menus/DungeonRaidMenus.lua | 111 +- 5 files changed, 3146 insertions(+), 1578 deletions(-) diff --git a/AtlasLoot/Core/Atlasloot_Maps.lua b/AtlasLoot/Core/Atlasloot_Maps.lua index 9e59845..b6b4758 100644 --- a/AtlasLoot/Core/Atlasloot_Maps.lua +++ b/AtlasLoot/Core/Atlasloot_Maps.lua @@ -158,273 +158,273 @@ AtlasLoot_MapData = { --************************************************ ["AuchindounEnt"] = { - ZoneName = {AtlasLocale["Entrance"]}; + ZoneName = {AL["Entrance"]}; Location = { BabbleZone["Terokkar Forest"], 3519 }; LevelRange = "63-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["Auch"]; + Acronym = AL["Auch"]; { BLUE.."A) "..BabbleZone["Auchenai Crypts"], ZONE, 3790 }; { BLUE.."B) "..BabbleZone["Mana-Tombs"], ZONE, 3792 }; { BLUE.."C) "..BabbleZone["Sethekk Halls"], ZONE, 3791 }; { BLUE.."D) "..BabbleZone["Shadow Labyrinth"], ZONE, 3789 }; - { BLUE.."E) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Ha'Lei"], NPC, 19697 }; - { WHITE..INDENT..AtlasLocale["Greatfather Aldrimus"], NPC, 19698 }; - { WHITE..INDENT..AtlasLocale["Clarissa"], NPC, 19693 }; - { WHITE..INDENT..AtlasLocale["Ramdor the Mad"], NPC, 19417 }; - { WHITE..INDENT..AtlasLocale["Horvon the Armorer "], NPC, 19879 }; - { WHITE.."2) "..AtlasLocale["Nexus-Prince Haramad"], NPC, 19674 }; - { WHITE..INDENT..AtlasLocale["Artificer Morphalius"], NPC, 19670 }; - { WHITE..INDENT..AtlasLocale["Mamdy the \"Ologist\""], NPC, 19669 }; - { WHITE..INDENT..AtlasLocale["\"Slim\" "], NPC, 19679 }; - { WHITE..INDENT..AtlasLocale["\"Captain\" Kaftiz"], NPC, 19676 }; - { WHITE.."3) "..AtlasLocale["Isfar"], NPC, 18933 }; - { WHITE.."4) "..AtlasLocale["Field Commander Mahfuun"], NPC, 19542 }; - { WHITE..INDENT..AtlasLocale["Spy Grik'tha"], NPC, 19496 }; - { WHITE..INDENT..AtlasLocale["Provisioner Tsaalt"], NPC, 19718 }; - { WHITE..INDENT..AtlasLocale["Dealer Tariq "], NPC, 20986 }; - { WHITE.."5) "..AtlasLocale["Meeting Stone"] }; + { BLUE.."E) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Ha'Lei"], NPC, 19697 }; + { WHITE..INDENT..AL["Greatfather Aldrimus"], NPC, 19698 }; + { WHITE..INDENT..AL["Clarissa"], NPC, 19693 }; + { WHITE..INDENT..AL["Ramdor the Mad"], NPC, 19417 }; + { WHITE..INDENT..AL["Horvon the Armorer "], NPC, 19879 }; + { WHITE.."2) "..AL["Nexus-Prince Haramad"], NPC, 19674 }; + { WHITE..INDENT..AL["Artificer Morphalius"], NPC, 19670 }; + { WHITE..INDENT..AL["Mamdy the \"Ologist\""], NPC, 19669 }; + { WHITE..INDENT..AL["\"Slim\" "], NPC, 19679 }; + { WHITE..INDENT..AL["\"Captain\" Kaftiz"], NPC, 19676 }; + { WHITE.."3) "..AL["Isfar"], NPC, 18933 }; + { WHITE.."4) "..AL["Field Commander Mahfuun"], NPC, 19542 }; + { WHITE..INDENT..AL["Spy Grik'tha"], NPC, 19496 }; + { WHITE..INDENT..AL["Provisioner Tsaalt"], NPC, 19718 }; + { WHITE..INDENT..AL["Dealer Tariq "], NPC, 20986 }; + { WHITE.."5) "..AL["Meeting Stone"] }; }; ["BlackfathomDeepsEnt"] = { - ZoneName = {AtlasLocale["Entrance"], 719 }; + ZoneName = {AL["Entrance"], 719 }; Location = { BabbleZone["Ashenvale"], 331 }; LevelRange = "20-28"; MinLevel = "19"; PlayerLimit = "5"; - Acronym = AtlasLocale["BFD"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["BFD"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Blackfathom Deeps"], ZONE, 719 }; }; ["BlackrockSpireEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 25 }; + ZoneName = { AL["Entrance"], 25 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "54-60"; MinLevel = "45"; PlayerLimit = "5/10/40"; - Acronym = AtlasLocale["BRM"]; + Acronym = AL["BRM"]; { BLUE.."A) "..BabbleZone["Searing Gorge"], ZONE, 51 }; { BLUE.."B) "..BabbleZone["Burning Steppes"], ZONE, 46 }; - { BLUE.."C) "..BabbleZone["Blackrock Depths"].." ("..AtlasLocale["BRD"]..")", ZONE, 1584 }; - { BLUE..INDENT..BabbleZone["Molten Core"].." ("..AtlasLocale["MC"]..")", ZONE, 2717 }; - { BLUE.."D) "..BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["LBRS"]..")", ZONE, 1583 }; - { BLUE..INDENT..BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Upper"]..", "..AtlasLocale["UBRS"]..")", ZONE, 1583 }; - { BLUE..INDENT..BabbleZone["Blackwing Lair"].." ("..AtlasLocale["BWL"]..")", ZONE, 2677 }; - { BLUE..INDENT..AtlasLocale["Bodley"].." ("..AtlasLocale["Ghost"]..")", NPC, 16033 }; - { WHITE.."1) "..AtlasLocale["Overmaster Pyron"].." ("..AtlasLocale["Wanders"]..")", NPC, 9026 }; - { WHITE.."2) "..AtlasLocale["Lothos Riftwaker"], NPC, 14387 }; - { WHITE.."3) "..AtlasLocale["Franclorn Forgewright"].." ("..AtlasLocale["Ghost"]..")", NPC, 8888 }; - { WHITE.."4) "..AtlasLocale["Meeting Stone"].." ("..AtlasLocale["BRD"]..")" }; - { WHITE.."5) "..AtlasLocale["Orb of Command"], OBJECT, 179879 }; - { WHITE.."6) "..AtlasLocale["Meeting Stone"].." ("..AtlasLocale["LBRS"]..", "..AtlasLocale["UBRS"]..")" }; - { WHITE.."7) "..AtlasLocale["Scarshield Quartermaster "], NPC, 9046 }; + { BLUE.."C) "..BabbleZone["Blackrock Depths"].." ("..AL["BRD"]..")", ZONE, 1584 }; + { BLUE..INDENT..BabbleZone["Molten Core"].." ("..AL["MC"]..")", ZONE, 2717 }; + { BLUE.."D) "..BabbleZone["Blackrock Spire"].." ("..AL["Lower"]..", "..AL["LBRS"]..")", ZONE, 1583 }; + { BLUE..INDENT..BabbleZone["Blackrock Spire"].." ("..AL["Upper"]..", "..AL["UBRS"]..")", ZONE, 1583 }; + { BLUE..INDENT..BabbleZone["Blackwing Lair"].." ("..AL["BWL"]..")", ZONE, 2677 }; + { BLUE..INDENT..AL["Bodley"].." ("..AL["Ghost"]..")", NPC, 16033 }; + { WHITE.."1) "..AL["Overmaster Pyron"].." ("..AL["Wanders"]..")", NPC, 9026 }; + { WHITE.."2) "..AL["Lothos Riftwaker"], NPC, 14387 }; + { WHITE.."3) "..AL["Franclorn Forgewright"].." ("..AL["Ghost"]..")", NPC, 8888 }; + { WHITE.."4) "..AL["Meeting Stone"].." ("..AL["BRD"]..")" }; + { WHITE.."5) "..AL["Orb of Command"], OBJECT, 179879 }; + { WHITE.."6) "..AL["Meeting Stone"].." ("..AL["LBRS"]..", "..AL["UBRS"]..")" }; + { WHITE.."7) "..AL["Scarshield Quartermaster "], NPC, 9046 }; }; ["CoilfangReservoirEnt"] = { - ZoneName = { AtlasLocale["Entrance"]}; + ZoneName = { AL["Entrance"]}; Location = { BabbleZone["Zangarmarsh"], 3521 }; LevelRange = "61-70"; MinLevel = "55"; PlayerLimit = "5/25"; - Acronym = AtlasLocale["CR"]; + Acronym = AL["CR"]; { BLUE.."A) "..BabbleZone["The Slave Pens"], ZONE, 3717 }; { BLUE.."B) "..BabbleZone["The Steamvault"], ZONE, 3715 }; { BLUE.."C) "..BabbleZone["Serpentshrine Cavern"], ZONE, 3607 }; { BLUE.."D) "..BabbleZone["The Underbog"], ZONE, 3716 }; - { BLUE.."E) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Underwater"]..")" }; - { WHITE.."1) "..AtlasLocale["Watcher Jhang"], NPC, 17884 }; - { WHITE..INDENT..AtlasLocale["Meeting Stone"] }; - { WHITE.."2) "..AtlasLocale["Mortog Steamhead"], NPC, 23373 }; + { BLUE.."E) "..AL["Entrance"].." ("..AL["Underwater"]..")" }; + { WHITE.."1) "..AL["Watcher Jhang"], NPC, 17884 }; + { WHITE..INDENT..AL["Meeting Stone"] }; + { WHITE.."2) "..AL["Mortog Steamhead"], NPC, 23373 }; }; ["CoTEnt"] = { - ZoneName = { AtlasLocale["Entrance"]}; + ZoneName = { AL["Entrance"]}; Location = { BabbleZone["Tanaris"], 440 }; LevelRange = "66-70"; MinLevel = "66"; PlayerLimit = "5/25"; - Acronym = AtlasLocale["CoT"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["CoT"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Hyjal Summit"], ZONE, 3606 }; { BLUE.."C) "..BabbleZone["Old Hillsbrad Foothills"], ZONE, 2367 }; { BLUE.."D) "..BabbleZone["The Black Morass"], ZONE, 2366 }; { BLUE.."E) "..BabbleZone["The Culling of Stratholme"], ZONE, 4100 }; - { WHITE.."1) "..AtlasLocale["Steward of Time "], NPC, 20142 }; - { WHITE.."2) "..AtlasLocale["Alexston Chrome "], NPC, 18542 }; + { WHITE.."1) "..AL["Steward of Time "], NPC, 20142 }; + { WHITE.."2) "..AL["Alexston Chrome "], NPC, 18542 }; { WHITE.."3) "..BabbleZone["Graveyard"] }; - { WHITE.."4) "..AtlasLocale["Yarley "], NPC, 20082 }; - { WHITE.."5) "..AtlasLocale["Bortega "], NPC, 20081 }; - { WHITE..INDENT..AtlasLocale["Galgrom "], NPC, 20080 }; - { WHITE..INDENT..AtlasLocale["Alurmi "], NPC, 21643 }; - { WHITE.."6) "..AtlasLocale["Zaladormu"], NPC, 19934 }; - { WHITE..INDENT..AtlasLocale["Soridormi "].." ("..AtlasLocale["Wanders"]..")", NPC, 19935 }; - { WHITE..INDENT..AtlasLocale["Arazmodu "].." ("..AtlasLocale["Wanders"]..")", NPC, 19936 }; - { WHITE.."7) "..AtlasLocale["Moonwell"] }; - { WHITE.."8) "..AtlasLocale["Andormu "].." ("..AtlasLocale["Child"]..")", NPC, 19932 }; - { WHITE..INDENT..AtlasLocale["Nozari "].." ("..AtlasLocale["Child"]..")", NPC, 19933 }; - { WHITE.."9) "..AtlasLocale["Andormu "].." ("..AtlasLocale["Adult"]..")", NPC, 20130 }; - { WHITE..INDENT..AtlasLocale["Nozari "].." ("..AtlasLocale["Adult"]..")", NPC, 20131 }; + { WHITE.."4) "..AL["Yarley "], NPC, 20082 }; + { WHITE.."5) "..AL["Bortega "], NPC, 20081 }; + { WHITE..INDENT..AL["Galgrom "], NPC, 20080 }; + { WHITE..INDENT..AL["Alurmi "], NPC, 21643 }; + { WHITE.."6) "..AL["Zaladormu"], NPC, 19934 }; + { WHITE..INDENT..AL["Soridormi "].." ("..AL["Wanders"]..")", NPC, 19935 }; + { WHITE..INDENT..AL["Arazmodu "].." ("..AL["Wanders"]..")", NPC, 19936 }; + { WHITE.."7) "..AL["Moonwell"] }; + { WHITE.."8) "..AL["Andormu "].." ("..AL["Child"]..")", NPC, 19932 }; + { WHITE..INDENT..AL["Nozari "].." ("..AL["Child"]..")", NPC, 19933 }; + { WHITE.."9) "..AL["Andormu "].." ("..AL["Adult"]..")", NPC, 20130 }; + { WHITE..INDENT..AL["Nozari "].." ("..AL["Adult"]..")", NPC, 20131 }; }; ["DireMaulEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 2557 }; + ZoneName = { AL["Entrance"], 2557 }; Location = { BabbleZone["Feralas"], 357 }; LevelRange = "55-60"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["DM"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["DM"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Dire Maul (East)"], ZONE, 2557 }; { BLUE.."C) "..BabbleZone["Dire Maul (North)"], ZONE, 2557 }; { BLUE.."D) "..BabbleZone["Dire Maul (West)"], ZONE, 2557 }; - { WHITE.."1) "..AtlasLocale["Dire Pool"] }; - { WHITE.."2) "..AtlasLocale["Dire Maul Arena"] }; - { WHITE..INDENT..AtlasLocale["Mushgog"].." ("..AtlasLocale["Random"]..")", NPC, 11447 }; - { WHITE..INDENT..AtlasLocale["Skarr the Unbreakable"].." ("..AtlasLocale["Random"]..")", NPC, 11498 }; - { WHITE..INDENT..AtlasLocale["The Razza"].." ("..AtlasLocale["Random"]..")", NPC, 11497 }; - { WHITE..INDENT..AtlasLocale["Elder Mistwalker"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15587 }; + { WHITE.."1) "..AL["Dire Pool"] }; + { WHITE.."2) "..AL["Dire Maul Arena"] }; + { WHITE..INDENT..AL["Mushgog"].." ("..AL["Random"]..")", NPC, 11447 }; + { WHITE..INDENT..AL["Skarr the Unbreakable"].." ("..AL["Random"]..")", NPC, 11498 }; + { WHITE..INDENT..AL["The Razza"].." ("..AL["Random"]..")", NPC, 11497 }; + { WHITE..INDENT..AL["Elder Mistwalker"].." ("..AL["Lunar Festival"]..")", NPC, 15587 }; }; ["GnomereganEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 133 }; + ZoneName = { AL["Entrance"], 133 }; Location = { BabbleZone["Dun Morogh"], 1 }; LevelRange = "24-32"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["Gnome"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Meeting Stone"] }; - { BLUE.."B) "..BabbleZone["Gnomeregan"].." ("..AtlasLocale["Front"]..")", ZONE, 133 }; - { BLUE.."C) "..BabbleZone["Gnomeregan"].." ("..AtlasLocale["Back"]..")", ZONE, 133 }; - { WHITE.."1) "..AtlasLocale["Elevator"] }; - { WHITE.."2) "..AtlasLocale["Transpolyporter"] }; - { WHITE..INDENT..AtlasLocale["Sprok "], NPC, 8320 }; - { WHITE.."3) "..AtlasLocale["Matrix Punchograph 3005-A"], OBJECT, 142345 }; - { WHITE..INDENT..AtlasLocale["Namdo Bizzfizzle "], NPC, 2683 }; - { WHITE.."4) "..AtlasLocale["Techbot"], NPC, 6231 }; + Acronym = AL["Gnome"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Meeting Stone"] }; + { BLUE.."B) "..BabbleZone["Gnomeregan"].." ("..AL["Front"]..")", ZONE, 133 }; + { BLUE.."C) "..BabbleZone["Gnomeregan"].." ("..AL["Back"]..")", ZONE, 133 }; + { WHITE.."1) "..AL["Elevator"] }; + { WHITE.."2) "..AL["Transpolyporter"] }; + { WHITE..INDENT..AL["Sprok "], NPC, 8320 }; + { WHITE.."3) "..AL["Matrix Punchograph 3005-A"], OBJECT, 142345 }; + { WHITE..INDENT..AL["Namdo Bizzfizzle "], NPC, 2683 }; + { WHITE.."4) "..AL["Techbot"], NPC, 6231 }; }; ["HCEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 3545 }; + ZoneName = { AL["Entrance"], 3545 }; Location = { BabbleZone["Hellfire Peninsula"], 3483 }; LevelRange = "59-70"; MinLevel = "55"; PlayerLimit = "5/25"; - Acronym = AtlasLocale["HC"]; + Acronym = AL["HC"]; { BLUE.."A) "..BabbleZone["Hellfire Ramparts"], ZONE, 3562 }; { BLUE.."B) "..BabbleZone["The Shattered Halls"], ZONE, 3714 }; { BLUE.."C) "..BabbleZone["The Blood Furnace"], ZONE, 3713 }; { BLUE.."D) "..BabbleZone["Magtheridon's Lair"], ZONE, 3836 }; - { WHITE.."1) "..AtlasLocale["Meeting Stone of Magtheridon's Lair"] }; - { WHITE.."2) "..AtlasLocale["Meeting Stone of Hellfire Citadel"] }; - { GREN.."1') "..AtlasLocale["Steps and path to the Blood Furnace"] }; - { GREN.."2') "..AtlasLocale["Path to the Hellfire Ramparts and Shattered Halls"] }; + { WHITE.."1) "..AL["Meeting Stone of Magtheridon's Lair"] }; + { WHITE.."2) "..AL["Meeting Stone of Hellfire Citadel"] }; + { GREN.."1') "..AL["Steps and path to the Blood Furnace"] }; + { GREN.."2') "..AL["Path to the Hellfire Ramparts and Shattered Halls"] }; }; ["KarazhanEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 2562 }; + ZoneName = { AL["Entrance"], 2562 }; Location = { BabbleZone["Deadwind Pass"], 41 }; LevelRange = "70"; MinLevel = "68"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["Kara"]; - { BLUE.."A) "..BabbleZone["Karazhan"].." ("..AtlasLocale["Front"]..")", ZONE, 2562 }; - { BLUE.."B) "..BabbleZone["Karazhan"].." ("..AtlasLocale["Back"]..")", ZONE, 2562 }; - { BLUE.."C) "..AtlasLocale["Meeting Stone"] }; + Acronym = AL["Kara"]; + { BLUE.."A) "..BabbleZone["Karazhan"].." ("..AL["Front"]..")", ZONE, 2562 }; + { BLUE.."B) "..BabbleZone["Karazhan"].." ("..AL["Back"]..")", ZONE, 2562 }; + { BLUE.."C) "..AL["Meeting Stone"] }; { BLUE.."D) "..BabbleZone["Graveyard"] }; - { WHITE.."1) "..AtlasLocale["Archmage Leryda"], NPC, 18253 }; - { WHITE.."2) "..AtlasLocale["Apprentice Darius"], NPC, 18255 }; - { WHITE.."3) "..AtlasLocale["Archmage Alturus"], NPC, 17613 }; - { WHITE.."4) "..AtlasLocale["Stairs to Underground Pond"] }; - { WHITE.."5) "..AtlasLocale["Stairs to Underground Well"] }; - { WHITE.."6) "..AtlasLocale["Charred Bone Fragment"], OBJECT, 181963 }; + { WHITE.."1) "..AL["Archmage Leryda"], NPC, 18253 }; + { WHITE.."2) "..AL["Apprentice Darius"], NPC, 18255 }; + { WHITE.."3) "..AL["Archmage Alturus"], NPC, 17613 }; + { WHITE.."4) "..AL["Stairs to Underground Pond"] }; + { WHITE.."5) "..AL["Stairs to Underground Well"] }; + { WHITE.."6) "..AL["Charred Bone Fragment"], OBJECT, 181963 }; }; ["MaraudonEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 2100 }; + ZoneName = { AL["Entrance"], 2100 }; Location = { BabbleZone["Desolace"], 405 }; LevelRange = "42-51"; MinLevel = "30"; PlayerLimit = "5"; - Acronym = AtlasLocale["Mara"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["The Nameless Prophet"], NPC, 13718 }; - { BLUE.."B) "..BabbleZone["Maraudon"].." ("..AtlasLocale["Purple"]..")", ZONE, 2100 }; - { BLUE.."C) "..BabbleZone["Maraudon"].." ("..AtlasLocale["Orange"]..")", ZONE, 2100 }; - { BLUE.."D) "..BabbleZone["Maraudon"].." ("..AtlasLocale["Portal"]..")", ZONE, 2100 }; - { WHITE.."1) "..AtlasLocale["Kolk "], NPC, 13742 }; - { WHITE.."2) "..AtlasLocale["Gelk "], NPC, 13741 }; - { WHITE.."3) "..AtlasLocale["Magra "], NPC, 13740 }; - { WHITE.."4) "..AtlasLocale["Cavindra"], NPC, 13697 }; + Acronym = AL["Mara"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["The Nameless Prophet"], NPC, 13718 }; + { BLUE.."B) "..BabbleZone["Maraudon"].." ("..AL["Purple"]..")", ZONE, 2100 }; + { BLUE.."C) "..BabbleZone["Maraudon"].." ("..AL["Orange"]..")", ZONE, 2100 }; + { BLUE.."D) "..BabbleZone["Maraudon"].." ("..AL["Portal"]..")", ZONE, 2100 }; + { WHITE.."1) "..AL["Kolk "], NPC, 13742 }; + { WHITE.."2) "..AL["Gelk "], NPC, 13741 }; + { WHITE.."3) "..AL["Magra "], NPC, 13740 }; + { WHITE.."4) "..AL["Cavindra"], NPC, 13697 }; }; ["SMEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 796 }; + ZoneName = { AL["Entrance"], 796 }; Location = { BabbleZone["Tirisfal Glades"], 85 }; LevelRange = "28-42"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["SM"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["SM"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Graveyard"], ZONE, 796 }; { BLUE.."C) "..BabbleZone["Cathedral"], ZONE, 796 }; { BLUE.."D) "..BabbleZone["Armory"], ZONE, 796 }; { BLUE.."E) "..BabbleZone["Library"], ZONE, 796 }; }; ["TheDeadminesEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 1581 }; + ZoneName = { AL["Entrance"], 1581 }; Location = { BabbleZone["Westfall"], 40 }; LevelRange = "16-22"; MinLevel = "10"; PlayerLimit = "5"; - Acronym = AtlasLocale["VC"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["VC"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["The Deadmines"], ZONE, 1581 }; - { WHITE.."1) "..AtlasLocale["Marisa du'Paige"].." ("..AtlasLocale["Varies"]..")", NPC, 599 }; - { WHITE.."2) "..AtlasLocale["Brainwashed Noble"].." ("..AtlasLocale["Rare"]..")", NPC, 596 }; - { WHITE.."3) "..AtlasLocale["Foreman Thistlenettle"], NPC, 626 }; + { WHITE.."1) "..AL["Marisa du'Paige"].." ("..AL["Varies"]..")", NPC, 599 }; + { WHITE.."2) "..AL["Brainwashed Noble"].." ("..AL["Rare"]..")", NPC, 596 }; + { WHITE.."3) "..AL["Foreman Thistlenettle"], NPC, 626 }; }; ["TheSunkenTempleEnt"] = { - ZoneName = {AtlasLocale["Entrance"], 1417 }; + ZoneName = {AL["Entrance"], 1417 }; Location = { BabbleZone["Swamp of Sorrows"], 8 }; LevelRange = "46-53"; MinLevel = "35"; PlayerLimit = "5"; - Acronym = AtlasLocale["ST"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Meeting Stone"] }; - { BLUE..INDENT..AtlasLocale["Jade"].." ("..AtlasLocale["Rare"]..")", NPC, 1063 }; + Acronym = AL["ST"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Meeting Stone"] }; + { BLUE..INDENT..AL["Jade"].." ("..AL["Rare"]..")", NPC, 1063 }; { BLUE.."B) "..BabbleZone["Sunken Temple"], ZONE, 1417 }; - { WHITE.."1) "..AtlasLocale["Kazkaz the Unholy"].." ("..AtlasLocale["Upper"]..")", NPC, 5401 }; - { WHITE.."2) "..AtlasLocale["Veyzhak the Cannibal"], NPC, 5399 }; - { WHITE.."3) "..AtlasLocale["Zekkis"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Lower"]..")", NPC, 5400 }; + { WHITE.."1) "..AL["Kazkaz the Unholy"].." ("..AL["Upper"]..")", NPC, 5401 }; + { WHITE.."2) "..AL["Veyzhak the Cannibal"], NPC, 5399 }; + { WHITE.."3) "..AL["Zekkis"].." ("..AL["Rare"]..", "..AL["Lower"]..")", NPC, 5400 }; }; ["UldamanEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 1337 }; + ZoneName = { AL["Entrance"], 1337 }; Location = { BabbleZone["Badlands"], 3 }; LevelRange = "36-42"; MinLevel = "30"; PlayerLimit = "5"; - Acronym = AtlasLocale["Ulda"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["Ulda"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Uldaman"], ZONE, 1337 }; - { WHITE.."1) "..AtlasLocale["Hammertoe Grez"], NPC, 2909 }; - { WHITE.."2) "..AtlasLocale["Magregan Deepshadow"].." ("..AtlasLocale["Wanders"]..")", NPC, 2932 }; - { WHITE.."3) "..AtlasLocale["Tablet of Ryun'Eh"], ITEM, 4631 }; - { WHITE.."4) "..AtlasLocale["Krom Stoutarm's Chest"], OBJECT, 124389 }; - { WHITE.."5) "..AtlasLocale["Garrett Family Chest"], OBJECT, 124388 }; - { GREN.."1') "..AtlasLocale["Digmaster Shovelphlange"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Varies"]..")", NPC, 7057 }; + { WHITE.."1) "..AL["Hammertoe Grez"], NPC, 2909 }; + { WHITE.."2) "..AL["Magregan Deepshadow"].." ("..AL["Wanders"]..")", NPC, 2932 }; + { WHITE.."3) "..AL["Tablet of Ryun'Eh"], ITEM, 4631 }; + { WHITE.."4) "..AL["Krom Stoutarm's Chest"], OBJECT, 124389 }; + { WHITE.."5) "..AL["Garrett Family Chest"], OBJECT, 124388 }; + { GREN.."1') "..AL["Digmaster Shovelphlange"].." ("..AL["Rare"]..", "..AL["Varies"]..")", NPC, 7057 }; }; ["WailingCavernsEnt"] = { - ZoneName = { AtlasLocale["Entrance"], 718 }; + ZoneName = { AL["Entrance"], 718 }; Location = { BabbleZone["The Barrens"], 17 }; LevelRange = "16-25"; MinLevel = "10"; PlayerLimit = "5"; - Acronym = AtlasLocale["WC"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["WC"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Wailing Caverns"], ZONE, 718 }; - { WHITE.."1) "..AtlasLocale["Mad Magglish"].." ("..AtlasLocale["Varies"]..")", NPC, 3655 }; - { WHITE.."2) "..AtlasLocale["Trigore the Lasher"].." ("..AtlasLocale["Rare"]..")", NPC, 3652 }; - { WHITE.."3) "..AtlasLocale["Boahn "].." ("..AtlasLocale["Rare"]..")", NPC, 3672 }; + { WHITE.."1) "..AL["Mad Magglish"].." ("..AL["Varies"]..")", NPC, 3655 }; + { WHITE.."2) "..AL["Trigore the Lasher"].." ("..AL["Rare"]..")", NPC, 3652 }; + { WHITE.."3) "..AL["Boahn "].." ("..AL["Rare"]..")", NPC, 3672 }; { "" }; - { ORNG..AtlasLocale["Above the Entrance:"] }; - { WHITE..INDENT..AtlasLocale["Ebru "], NPC, 5768 }; - { WHITE..INDENT..AtlasLocale["Nalpak "], NPC, 5767 }; - { WHITE..INDENT..AtlasLocale["Kalldan Felmoon "], NPC, 5783 }; - { WHITE..INDENT..AtlasLocale["Waldor "], NPC, 5784 }; + { ORNG..AL["Above the Entrance:"] }; + { WHITE..INDENT..AL["Ebru "], NPC, 5768 }; + { WHITE..INDENT..AL["Nalpak "], NPC, 5767 }; + { WHITE..INDENT..AL["Kalldan Felmoon "], NPC, 5783 }; + { WHITE..INDENT..AL["Waldor "], NPC, 5784 }; }; --************************************************ @@ -437,22 +437,22 @@ AtlasLoot_MapData = { LevelRange = "20-28"; MinLevel = "19"; PlayerLimit = "5"; - Acronym = AtlasLocale["BFD"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Ghamoo-ra"], NPC, 4887 }; - { WHITE.."2) "..AtlasLocale["Lorgalis Manuscript"], ITEM, 5359 }; - { WHITE.."3) "..AtlasLocale["Lady Sarevess"], NPC, 4831 }; - { WHITE.."4) "..AtlasLocale["Argent Guard Thaelrid "], NPC, 4787 }; - { WHITE.."5) "..AtlasLocale["Gelihast"], NPC, 6243 }; - { WHITE..INDENT..AtlasLocale["Shrine of Gelihast"] }; - { WHITE.."6) "..AtlasLocale["Lorgus Jett"].." ("..AtlasLocale["Varies"]..")", NPC, 12902 }; - { WHITE.."7) "..AtlasLocale["Fathom Stone"], OBJECT, 177964 }; - { WHITE..INDENT..AtlasLocale["Baron Aquanis"], NPC, 12876 }; - { WHITE.."8) "..AtlasLocale["Twilight Lord Kelris"], NPC, 4832 }; - { WHITE.."9) "..AtlasLocale["Old Serra'kis"], NPC, 4830 }; - { WHITE.."10) "..AtlasLocale["Aku'mai"], NPC, 4829 }; - { WHITE..INDENT..AtlasLocale["Morridune"], NPC, 6729 }; - { WHITE..INDENT..AtlasLocale["Altar of the Deeps"] }; + Acronym = AL["BFD"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Ghamoo-ra"], NPC, 4887 }; + { WHITE.."2) "..AL["Lorgalis Manuscript"], ITEM, 5359 }; + { WHITE.."3) "..AL["Lady Sarevess"], NPC, 4831 }; + { WHITE.."4) "..AL["Argent Guard Thaelrid "], NPC, 4787 }; + { WHITE.."5) "..AL["Gelihast"], NPC, 6243 }; + { WHITE..INDENT..AL["Shrine of Gelihast"] }; + { WHITE.."6) "..AL["Lorgus Jett"].." ("..AL["Varies"]..")", NPC, 12902 }; + { WHITE.."7) "..AL["Fathom Stone"], OBJECT, 177964 }; + { WHITE..INDENT..AL["Baron Aquanis"], NPC, 12876 }; + { WHITE.."8) "..AL["Twilight Lord Kelris"], NPC, 4832 }; + { WHITE.."9) "..AL["Old Serra'kis"], NPC, 4830 }; + { WHITE.."10) "..AL["Aku'mai"], NPC, 4829 }; + { WHITE..INDENT..AL["Morridune"], NPC, 6729 }; + { WHITE..INDENT..AL["Altar of the Deeps"] }; }; ["DireMaulEast"] = { ZoneName = { BabbleZone["Dire Maul (East)"], 2557 }; @@ -460,21 +460,21 @@ AtlasLoot_MapData = { LevelRange = "55-58"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["DM"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Entrance"] }; - { BLUE.."C) "..AtlasLocale["Entrance"] }; - { BLUE.."D) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Pusillin"].." ("..AtlasLocale["Chase Begins"]..")", NPC, 14354 }; - { WHITE.."2) "..AtlasLocale["Pusillin"].." ("..AtlasLocale["Chase Ends"]..")", NPC, 14354 }; - { WHITE.."3) "..AtlasLocale["Zevrim Thornhoof"], NPC, 11490 }; - { WHITE..INDENT..AtlasLocale["Hydrospawn"], NPC, 13280 }; - { WHITE..INDENT..AtlasLocale["Lethtendris"], NPC, 14327 }; - { WHITE..INDENT..AtlasLocale["Pimgib"], NPC, 14349 }; - { WHITE.."4) "..AtlasLocale["Old Ironbark"], NPC, 11491 }; - { WHITE.."5) "..AtlasLocale["Alzzin the Wildshaper"], NPC, 11492 }; - { WHITE..INDENT..AtlasLocale["Isalien"].." ("..AtlasLocale["Summon"]..")", NPC, 16097 }; + Acronym = AL["DM"]; + { ORNG..AL["Key"]..": "..AL["Brazier of Invocation"].." ("..AL["DS2"]..")", ITEM, 22057 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Entrance"] }; + { BLUE.."C) "..AL["Entrance"] }; + { BLUE.."D) "..AL["Exit"] }; + { WHITE.."1) "..AL["Pusillin"].." ("..AL["Chase Begins"]..")", NPC, 14354 }; + { WHITE.."2) "..AL["Pusillin"].." ("..AL["Chase Ends"]..")", NPC, 14354 }; + { WHITE.."3) "..AL["Zevrim Thornhoof"], NPC, 11490 }; + { WHITE..INDENT..AL["Hydrospawn"], NPC, 13280 }; + { WHITE..INDENT..AL["Lethtendris"], NPC, 14327 }; + { WHITE..INDENT..AL["Pimgib"], NPC, 14349 }; + { WHITE.."4) "..AL["Old Ironbark"], NPC, 11491 }; + { WHITE.."5) "..AL["Alzzin the Wildshaper"], NPC, 11492 }; + { WHITE..INDENT..AL["Isalien"].." ("..AL["Summon"]..")", NPC, 16097 }; }; ["DireMaulNorth"] = { ZoneName = { BabbleZone["Dire Maul (North)"], 2557 }; @@ -482,18 +482,18 @@ AtlasLoot_MapData = { LevelRange = "57-60"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["DM"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Crescent Key"], ITEM, 18249 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["DM"]; + { ORNG..AL["Key"]..": "..AL["Crescent Key"], ITEM, 18249 }; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleZone["Library"] }; - { WHITE.."1) "..AtlasLocale["Guard Mol'dar"], NPC, 14326 }; - { WHITE.."2) "..AtlasLocale["Stomper Kreeg "], NPC, 14322 }; - { WHITE.."3) "..AtlasLocale["Guard Fengus"], NPC, 14321 }; - { WHITE.."4) "..AtlasLocale["Knot Thimblejack"], NPC, 14338 }; - { WHITE..INDENT..AtlasLocale["Guard Slip'kik"], NPC, 14323 }; - { WHITE.."5) "..AtlasLocale["Captain Kromcrush"], NPC, 14325 }; - { WHITE.."6) "..AtlasLocale["King Gordok"], NPC, 11501 }; - { WHITE..INDENT..AtlasLocale["Cho'Rush the Observer"], NPC, 14324 }; + { WHITE.."1) "..AL["Guard Mol'dar"], NPC, 14326 }; + { WHITE.."2) "..AL["Stomper Kreeg "], NPC, 14322 }; + { WHITE.."3) "..AL["Guard Fengus"], NPC, 14321 }; + { WHITE.."4) "..AL["Knot Thimblejack"], NPC, 14338 }; + { WHITE..INDENT..AL["Guard Slip'kik"], NPC, 14323 }; + { WHITE.."5) "..AL["Captain Kromcrush"], NPC, 14325 }; + { WHITE.."6) "..AL["King Gordok"], NPC, 11501 }; + { WHITE..INDENT..AL["Cho'Rush the Observer"], NPC, 14324 }; }; ["DireMaulWest"] = { ZoneName = { BabbleZone["Dire Maul (West)"], 2557 }; @@ -501,29 +501,29 @@ AtlasLoot_MapData = { LevelRange = "57-60"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["DM"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Crescent Key"], ITEM, 18249 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["J'eevee's Jar"].." ("..AtlasLocale["Lord Hel'nurath"]..")", ITEM, 18663 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Pylons"] }; - { WHITE.."1) "..AtlasLocale["Shen'dralar Ancient"], NPC, 14358 }; - { WHITE.."2) "..AtlasLocale["Tendris Warpwood"], NPC, 11489 }; - { WHITE..INDENT..AtlasLocale["Ancient Equine Spirit"], NPC, 14566 }; - { WHITE.."3) "..AtlasLocale["Illyanna Ravenoak"], NPC, 11488 }; - { WHITE..INDENT..AtlasLocale["Ferra"], NPC, 14308 }; - { WHITE.."4) "..AtlasLocale["Magister Kalendris"], NPC, 11487 }; - { WHITE.."5) "..AtlasLocale["Tsu'zee"].." ("..AtlasLocale["Rare"]..")", NPC, 11467 }; - { WHITE.."6) "..AtlasLocale["Immol'thar"], NPC, 11496 }; - { WHITE..INDENT..AtlasLocale["Lord Hel'nurath"].." ("..AtlasLocale["Summon"]..")", NPC, 14506 }; - { WHITE.."7) "..AtlasLocale["Prince Tortheldrin"], NPC, 11486 }; + Acronym = AL["DM"]; + { ORNG..AL["Key"]..": "..AL["Crescent Key"], ITEM, 18249 }; + { ORNG..AL["Key"]..": "..AL["J'eevee's Jar"].." ("..AL["Lord Hel'nurath"]..")", ITEM, 18663 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Pylons"] }; + { WHITE.."1) "..AL["Shen'dralar Ancient"], NPC, 14358 }; + { WHITE.."2) "..AL["Tendris Warpwood"], NPC, 11489 }; + { WHITE..INDENT..AL["Ancient Equine Spirit"], NPC, 14566 }; + { WHITE.."3) "..AL["Illyanna Ravenoak"], NPC, 11488 }; + { WHITE..INDENT..AL["Ferra"], NPC, 14308 }; + { WHITE.."4) "..AL["Magister Kalendris"], NPC, 11487 }; + { WHITE.."5) "..AL["Tsu'zee"].." ("..AL["Rare"]..")", NPC, 11467 }; + { WHITE.."6) "..AL["Immol'thar"], NPC, 11496 }; + { WHITE..INDENT..AL["Lord Hel'nurath"].." ("..AL["Summon"]..")", NPC, 14506 }; + { WHITE.."7) "..AL["Prince Tortheldrin"], NPC, 11486 }; { GREN.."1') "..BabbleZone["Library"] }; - { GREN..INDENT..AtlasLocale["Falrin Treeshaper"], NPC, 16032 }; - { GREN..INDENT..AtlasLocale["Lorekeeper Lydros"], NPC, 14368 }; - { GREN..INDENT..AtlasLocale["Lorekeeper Javon"], NPC, 14381 }; - { GREN..INDENT..AtlasLocale["Lorekeeper Kildrath"], NPC, 14383 }; - { GREN..INDENT..AtlasLocale["Lorekeeper Mykos"], NPC, 14382 }; - { GREN..INDENT..AtlasLocale["Shen'dralar Provisioner"], NPC, 14371 }; - { GREN..INDENT..AtlasLocale["Skeletal Remains of Kariel Winthalus"], OBJECT, 179544 }; + { GREN..INDENT..AL["Falrin Treeshaper"], NPC, 16032 }; + { GREN..INDENT..AL["Lorekeeper Lydros"], NPC, 14368 }; + { GREN..INDENT..AL["Lorekeeper Javon"], NPC, 14381 }; + { GREN..INDENT..AL["Lorekeeper Kildrath"], NPC, 14383 }; + { GREN..INDENT..AL["Lorekeeper Mykos"], NPC, 14382 }; + { GREN..INDENT..AL["Shen'dralar Provisioner"], NPC, 14371 }; + { GREN..INDENT..AL["Skeletal Remains of Kariel Winthalus"], OBJECT, 179544 }; }; ["Maraudon"] = { ZoneName = { BabbleZone["Maraudon"], 2100 }; @@ -531,22 +531,22 @@ AtlasLoot_MapData = { LevelRange = "42-51"; MinLevel = "30"; PlayerLimit = "5"; - Acronym = AtlasLocale["Mara"]; - { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Orange"]..")" }; - { BLUE.."B) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Purple"]..")" }; - { BLUE.."C) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Portal"]..")" }; - { WHITE.."1) "..AtlasLocale["Veng "], NPC, 13738 }; - { WHITE.."2) "..AtlasLocale["Noxxion"], NPC, 13282 }; - { WHITE.."3) "..AtlasLocale["Razorlash"], NPC, 12258 }; - { WHITE.."4) "..AtlasLocale["Maraudos "], NPC, 13739 }; - { WHITE.."5) "..AtlasLocale["Lord Vyletongue"], NPC, 12236 }; - { WHITE.."6) "..AtlasLocale["Meshlok the Harvester"].." ("..AtlasLocale["Rare"]..")", NPC, 12237 }; - { WHITE.."7) "..AtlasLocale["Celebras the Cursed"], NPC, 12225 }; - { WHITE.."8) "..AtlasLocale["Landslide"], NPC, 12203 }; - { WHITE.."9) "..AtlasLocale["Tinkerer Gizlock"], NPC, 13601 }; - { WHITE.."10) "..AtlasLocale["Rotgrip"], NPC, 13596 }; - { WHITE.."11) "..AtlasLocale["Princess Theradras"], NPC, 12201 }; - { WHITE.."12) "..AtlasLocale["Elder Splitrock"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15556 }; + Acronym = AL["Mara"]; + { BLUE.."A) "..AL["Entrance"].." ("..AL["Orange"]..")" }; + { BLUE.."B) "..AL["Entrance"].." ("..AL["Purple"]..")" }; + { BLUE.."C) "..AL["Entrance"].." ("..AL["Portal"]..")" }; + { WHITE.."1) "..AL["Veng "], NPC, 13738 }; + { WHITE.."2) "..AL["Noxxion"], NPC, 13282 }; + { WHITE.."3) "..AL["Razorlash"], NPC, 12258 }; + { WHITE.."4) "..AL["Maraudos "], NPC, 13739 }; + { WHITE.."5) "..AL["Lord Vyletongue"], NPC, 12236 }; + { WHITE.."6) "..AL["Meshlok the Harvester"].." ("..AL["Rare"]..")", NPC, 12237 }; + { WHITE.."7) "..AL["Celebras the Cursed"], NPC, 12225 }; + { WHITE.."8) "..AL["Landslide"], NPC, 12203 }; + { WHITE.."9) "..AL["Tinkerer Gizlock"], NPC, 13601 }; + { WHITE.."10) "..AL["Rotgrip"], NPC, 13596 }; + { WHITE.."11) "..AL["Princess Theradras"], NPC, 12201 }; + { WHITE.."12) "..AL["Elder Splitrock"].." ("..AL["Lunar Festival"]..")", NPC, 15556 }; }; ["RagefireChasm"] = { ZoneName = { BabbleZone["Ragefire Chasm"], 2437 }; @@ -554,14 +554,14 @@ AtlasLoot_MapData = { LevelRange = "12-18"; MinLevel = "8"; PlayerLimit = "5"; - Acronym = AtlasLocale["RFC"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Maur Grimtotem"], NPC, 11834 }; - { WHITE..INDENT..AtlasLocale["Oggleflint "], NPC, 11517 }; - { WHITE.."2) "..AtlasLocale["Taragaman the Hungerer"], NPC, 11520 }; - { WHITE.."3) "..AtlasLocale["Jergosh the Invoker"], NPC, 11518 }; - { WHITE..INDENT..AtlasLocale["Zelemar the Wrathful"].." ("..AtlasLocale["Summon"]..")", NPC, 17830 }; - { WHITE.."4) "..AtlasLocale["Bazzalan"], NPC, 11519 }; + Acronym = AL["RFC"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Maur Grimtotem"], NPC, 11834 }; + { WHITE..INDENT..AL["Oggleflint "], NPC, 11517 }; + { WHITE.."2) "..AL["Taragaman the Hungerer"], NPC, 11520 }; + { WHITE.."3) "..AL["Jergosh the Invoker"], NPC, 11518 }; + { WHITE..INDENT..AL["Zelemar the Wrathful"].." ("..AL["Summon"]..")", NPC, 17830 }; + { WHITE.."4) "..AL["Bazzalan"], NPC, 11519 }; }; ["RazorfenDowns"] = { ZoneName = { BabbleZone["Razorfen Downs"], 722 }; @@ -569,17 +569,17 @@ AtlasLoot_MapData = { LevelRange = "33-42"; MinLevel = "25"; PlayerLimit = "5"; - Acronym = AtlasLocale["RFD"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Tuten'kash"], NPC, 7355 }; - { WHITE.."2) "..AtlasLocale["Henry Stern"], NPC, 8696 }; - { WHITE..INDENT..AtlasLocale["Belnistrasz"], NPC, 8516 }; - { WHITE..INDENT..AtlasLocale["Sah'rhee"], NPC, 8767 }; - { WHITE.."3) "..AtlasLocale["Mordresh Fire Eye"], NPC, 7357 }; - { WHITE.."4) "..AtlasLocale["Glutton"], NPC, 8567 }; - { WHITE.."5) "..AtlasLocale["Ragglesnout"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Varies"]..")", NPC, 7354 }; - { WHITE.."6) "..AtlasLocale["Amnennar the Coldbringer"], NPC, 7358 }; - { WHITE.."7) "..AtlasLocale["Plaguemaw the Rotting"], NPC, 7356 }; + Acronym = AL["RFD"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Tuten'kash"], NPC, 7355 }; + { WHITE.."2) "..AL["Henry Stern"], NPC, 8696 }; + { WHITE..INDENT..AL["Belnistrasz"], NPC, 8516 }; + { WHITE..INDENT..AL["Sah'rhee"], NPC, 8767 }; + { WHITE.."3) "..AL["Mordresh Fire Eye"], NPC, 7357 }; + { WHITE.."4) "..AL["Glutton"], NPC, 8567 }; + { WHITE.."5) "..AL["Ragglesnout"].." ("..AL["Rare"]..", "..AL["Varies"]..")", NPC, 7354 }; + { WHITE.."6) "..AL["Amnennar the Coldbringer"], NPC, 7358 }; + { WHITE.."7) "..AL["Plaguemaw the Rotting"], NPC, 7356 }; }; ["RazorfenKraul"] = { ZoneName = { BabbleZone["Razorfen Kraul"], 491 }; @@ -587,19 +587,19 @@ AtlasLoot_MapData = { LevelRange = "23-33"; MinLevel = "17"; PlayerLimit = "5"; - Acronym = AtlasLocale["RFK"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Roogug"], NPC, 6168 }; - { WHITE.."2) "..AtlasLocale["Aggem Thorncurse "], NPC, 4424 }; - { WHITE.."3) "..AtlasLocale["Death Speaker Jargba "], NPC, 4428 }; - { WHITE.."4) "..AtlasLocale["Overlord Ramtusk"], NPC, 4420 }; - { WHITE..INDENT..AtlasLocale["Razorfen Spearhide"], NPC, 4438 }; - { WHITE.."5) "..AtlasLocale["Agathelos the Raging"], NPC, 4422 }; - { WHITE.."6) "..AtlasLocale["Blind Hunter"].." ("..AtlasLocale["Rare"]..")", NPC, 4425 }; - { WHITE.."7) "..AtlasLocale["Charlga Razorflank "], NPC, 4421 }; - { WHITE.."8) "..AtlasLocale["Willix the Importer"], NPC, 4508 }; - { WHITE..INDENT..AtlasLocale["Heralath Fallowbrook"], NPC, 4510 }; - { WHITE.."9) "..AtlasLocale["Earthcaller Halmgar"].." ("..AtlasLocale["Rare"]..")", NPC, 4842 }; + Acronym = AL["RFK"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Roogug"], NPC, 6168 }; + { WHITE.."2) "..AL["Aggem Thorncurse "], NPC, 4424 }; + { WHITE.."3) "..AL["Death Speaker Jargba "], NPC, 4428 }; + { WHITE.."4) "..AL["Overlord Ramtusk"], NPC, 4420 }; + { WHITE..INDENT..AL["Razorfen Spearhide"], NPC, 4438 }; + { WHITE.."5) "..AL["Agathelos the Raging"], NPC, 4422 }; + { WHITE.."6) "..AL["Blind Hunter"].." ("..AL["Rare"]..")", NPC, 4425 }; + { WHITE.."7) "..AL["Charlga Razorflank "], NPC, 4421 }; + { WHITE.."8) "..AL["Willix the Importer"], NPC, 4508 }; + { WHITE..INDENT..AL["Heralath Fallowbrook"], NPC, 4510 }; + { WHITE.."9) "..AL["Earthcaller Halmgar"].." ("..AL["Rare"]..")", NPC, 4842 }; }; ["TheRuinsofAhnQiraj"] = { ZoneName = { BabbleZone["Ruins of Ahn'Qiraj"], 3429 }; @@ -607,25 +607,25 @@ AtlasLoot_MapData = { LevelRange = "60-70"; MinLevel = "50"; PlayerLimit = "20"; - Acronym = AtlasLocale["AQ20"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Cenarion Circle"], FACTION, 609 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Kurinnaxx"], NPC, 15348 }; - { WHITE..INDENT..AtlasLocale["Lieutenant General Andorov"], NPC, 15471 }; - { WHITE..INDENT..AtlasLocale["Four Kaldorei Elites"], NPC, 15473 }; - { WHITE.."2) "..AtlasLocale["General Rajaxx"], NPC, 15341 }; - { WHITE..INDENT..AtlasLocale["Captain Qeez"], NPC, 15391 }; - { WHITE..INDENT..AtlasLocale["Captain Tuubid"], NPC, 15392 }; - { WHITE..INDENT..AtlasLocale["Captain Drenn"], NPC, 15389 }; - { WHITE..INDENT..AtlasLocale["Captain Xurrem"], NPC, 15390 }; - { WHITE..INDENT..AtlasLocale["Major Yeggeth"], NPC, 15386 }; - { WHITE..INDENT..AtlasLocale["Major Pakkon"], NPC, 15388 }; - { WHITE..INDENT..AtlasLocale["Colonel Zerran"], NPC, 15385 }; - { WHITE.."3) "..AtlasLocale["Moam"].." ("..AtlasLocale["Optional"]..")", NPC, 15340 }; - { WHITE.."4) "..AtlasLocale["Buru the Gorger"].." ("..AtlasLocale["Optional"]..")", NPC, 15370 }; - { WHITE.."5) "..AtlasLocale["Ayamiss the Hunter"].." ("..AtlasLocale["Optional"]..")", NPC, 15369 }; - { WHITE.."6) "..AtlasLocale["Ossirian the Unscarred"], NPC, 15339 }; - { GREN.."1') "..AtlasLocale["Safe Room"] }; + Acronym = AL["AQ20"]; + { ORNG..AL["Reputation"]..": "..AL["Cenarion Circle"], FACTION, 609 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Kurinnaxx"], NPC, 15348 }; + { WHITE..INDENT..AL["Lieutenant General Andorov"], NPC, 15471 }; + { WHITE..INDENT..AL["Four Kaldorei Elites"], NPC, 15473 }; + { WHITE.."2) "..AL["General Rajaxx"], NPC, 15341 }; + { WHITE..INDENT..AL["Captain Qeez"], NPC, 15391 }; + { WHITE..INDENT..AL["Captain Tuubid"], NPC, 15392 }; + { WHITE..INDENT..AL["Captain Drenn"], NPC, 15389 }; + { WHITE..INDENT..AL["Captain Xurrem"], NPC, 15390 }; + { WHITE..INDENT..AL["Major Yeggeth"], NPC, 15386 }; + { WHITE..INDENT..AL["Major Pakkon"], NPC, 15388 }; + { WHITE..INDENT..AL["Colonel Zerran"], NPC, 15385 }; + { WHITE.."3) "..AL["Moam"].." ("..AL["Optional"]..")", NPC, 15340 }; + { WHITE.."4) "..AL["Buru the Gorger"].." ("..AL["Optional"]..")", NPC, 15370 }; + { WHITE.."5) "..AL["Ayamiss the Hunter"].." ("..AL["Optional"]..")", NPC, 15369 }; + { WHITE.."6) "..AL["Ossirian the Unscarred"], NPC, 15339 }; + { GREN.."1') "..AL["Safe Room"] }; }; ["TheTempleofAhnQiraj"] = { ZoneName = { BabbleZone["Temple of Ahn'Qiraj"], 3428 }; @@ -633,30 +633,30 @@ AtlasLoot_MapData = { LevelRange = "60-70"; MinLevel = "50"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["AQ40"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Brood of Nozdormu"], FACTION, 910 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["The Prophet Skeram"].." ("..AtlasLocale["Outside"]..")", NPC, 15263 }; - { WHITE.."2) "..AtlasLocale["The Bug Family"].." ("..AtlasLocale["Optional"]..")" }; - { WHITE..INDENT..AtlasLocale["Vem"], NPC, 15544 }; - { WHITE..INDENT..AtlasLocale["Lord Kri"], NPC, 15511 }; - { WHITE..INDENT..AtlasLocale["Princess Yauj"], NPC, 15543 }; - { WHITE.."3) "..AtlasLocale["Battleguard Sartura"], NPC, 15516 }; - { WHITE.."4) "..AtlasLocale["Fankriss the Unyielding"], NPC, 15510 }; - { WHITE.."5) "..AtlasLocale["Viscidus"].." ("..AtlasLocale["Optional"]..")", NPC, 15299 }; - { WHITE.."6) "..AtlasLocale["Princess Huhuran"], NPC, 15509 }; - { WHITE.."7) "..AtlasLocale["Twin Emperors"] }; - { WHITE..INDENT..AtlasLocale["Emperor Vek'lor"], NPC, 15276 }; - { WHITE..INDENT..AtlasLocale["Emperor Vek'nilash"], NPC, 15275 }; - { WHITE.."8) "..AtlasLocale["Ouro"].." ("..AtlasLocale["Optional"]..")", NPC, 15517 }; - { WHITE.."9) "..AtlasLocale["Eye of C'Thun"], NPC, 15589 }; - { WHITE..INDENT..AtlasLocale["C'Thun"], NPC, 15727 }; - { GREN.."1') "..AtlasLocale["Andorgos "], NPC, 15502 }; - { GREN..INDENT..AtlasLocale["Vethsera "], NPC, 15504 }; - { GREN..INDENT..AtlasLocale["Kandrostrasz "], NPC, 15503 }; - { GREN.."2') "..AtlasLocale["Arygos"], NPC, 15380 }; - { GREN..INDENT..AtlasLocale["Caelestrasz"], NPC, 15379 }; - { GREN..INDENT..AtlasLocale["Merithra of the Dream"], NPC, 15378 }; + Acronym = AL["AQ40"]; + { ORNG..AL["Reputation"]..": "..AL["Brood of Nozdormu"], FACTION, 910 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["The Prophet Skeram"].." ("..AL["Outside"]..")", NPC, 15263 }; + { WHITE.."2) "..AL["The Bug Family"].." ("..AL["Optional"]..")" }; + { WHITE..INDENT..AL["Vem"], NPC, 15544 }; + { WHITE..INDENT..AL["Lord Kri"], NPC, 15511 }; + { WHITE..INDENT..AL["Princess Yauj"], NPC, 15543 }; + { WHITE.."3) "..AL["Battleguard Sartura"], NPC, 15516 }; + { WHITE.."4) "..AL["Fankriss the Unyielding"], NPC, 15510 }; + { WHITE.."5) "..AL["Viscidus"].." ("..AL["Optional"]..")", NPC, 15299 }; + { WHITE.."6) "..AL["Princess Huhuran"], NPC, 15509 }; + { WHITE.."7) "..AL["Twin Emperors"] }; + { WHITE..INDENT..AL["Emperor Vek'lor"], NPC, 15276 }; + { WHITE..INDENT..AL["Emperor Vek'nilash"], NPC, 15275 }; + { WHITE.."8) "..AL["Ouro"].." ("..AL["Optional"]..")", NPC, 15517 }; + { WHITE.."9) "..AL["Eye of C'Thun"], NPC, 15589 }; + { WHITE..INDENT..AL["C'Thun"], NPC, 15727 }; + { GREN.."1') "..AL["Andorgos "], NPC, 15502 }; + { GREN..INDENT..AL["Vethsera "], NPC, 15504 }; + { GREN..INDENT..AL["Kandrostrasz "], NPC, 15503 }; + { GREN.."2') "..AL["Arygos"], NPC, 15380 }; + { GREN..INDENT..AL["Caelestrasz"], NPC, 15379 }; + { GREN..INDENT..AL["Merithra of the Dream"], NPC, 15378 }; }; ["WailingCaverns"] = { ZoneName = { BabbleZone["Wailing Caverns"], 718 }; @@ -664,19 +664,19 @@ AtlasLoot_MapData = { LevelRange = "16-25"; MinLevel = "10"; PlayerLimit = "5"; - Acronym = AtlasLocale["WC"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Disciple of Naralex"], NPC, 3678 }; - { WHITE.."2) "..AtlasLocale["Lord Cobrahn "], NPC, 3669 }; - { WHITE.."3) "..AtlasLocale["Lady Anacondra "].." ("..AtlasLocale["Varies"]..")", NPC, 3671 }; - { WHITE.."4) "..AtlasLocale["Kresh"].." ("..AtlasLocale["Varies"]..")", NPC, 3653 }; - { WHITE.."5) "..AtlasLocale["Lord Pythas "], NPC, 3670 }; - { WHITE.."6) "..AtlasLocale["Skum"], NPC, 3674 }; - { WHITE.."7) "..AtlasLocale["Lord Serpentis "].." ("..AtlasLocale["Upper"]..")", NPC, 3673 }; - { WHITE.."8) "..AtlasLocale["Verdan the Everliving"].." ("..AtlasLocale["Upper"]..")", NPC, 5775 }; - { WHITE.."9) "..AtlasLocale["Mutanus the Devourer"], NPC, 3654 }; - { WHITE..INDENT..AtlasLocale["Naralex"], NPC, 3679 }; - { WHITE.."10) "..AtlasLocale["Deviate Faerie Dragon"].." ("..AtlasLocale["Rare"]..")", NPC, 5912 }; + Acronym = AL["WC"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Disciple of Naralex"], NPC, 3678 }; + { WHITE.."2) "..AL["Lord Cobrahn "], NPC, 3669 }; + { WHITE.."3) "..AL["Lady Anacondra "].." ("..AL["Varies"]..")", NPC, 3671 }; + { WHITE.."4) "..AL["Kresh"].." ("..AL["Varies"]..")", NPC, 3653 }; + { WHITE.."5) "..AL["Lord Pythas "], NPC, 3670 }; + { WHITE.."6) "..AL["Skum"], NPC, 3674 }; + { WHITE.."7) "..AL["Lord Serpentis "].." ("..AL["Upper"]..")", NPC, 3673 }; + { WHITE.."8) "..AL["Verdan the Everliving"].." ("..AL["Upper"]..")", NPC, 5775 }; + { WHITE.."9) "..AL["Mutanus the Devourer"], NPC, 3654 }; + { WHITE..INDENT..AL["Naralex"], NPC, 3679 }; + { WHITE.."10) "..AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")", NPC, 5912 }; }; ["ZulFarrak"] = { ZoneName = { BabbleZone["Zul'Farrak"], 978 }; @@ -684,28 +684,28 @@ AtlasLoot_MapData = { LevelRange = "42-48"; MinLevel = "35"; PlayerLimit = "5"; - Acronym = AtlasLocale["ZF"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Antu'sul "], NPC, 8127 }; - { WHITE.."2) "..AtlasLocale["Theka the Martyr"], NPC, 7272 }; - { WHITE.."3) "..AtlasLocale["Witch Doctor Zum'rah"], NPC, 7271 }; - { WHITE..INDENT..AtlasLocale["Zul'Farrak Dead Hero"], NPC, 7276 }; - { WHITE.."4) "..AtlasLocale["Nekrum Gutchewer"], NPC, 7796 }; - { WHITE..INDENT..AtlasLocale["Shadowpriest Sezz'ziz"], NPC, 7275 }; - { WHITE..INDENT..AtlasLocale["Dustwraith"].." ("..AtlasLocale["Rare"]..")", NPC, 10081 }; - { WHITE.."5) "..AtlasLocale["Sergeant Bly"], NPC, 7604 }; - { WHITE..INDENT..AtlasLocale["Weegli Blastfuse"], NPC, 7607 }; - { WHITE..INDENT..AtlasLocale["Murta Grimgut"], NPC, 7608 }; - { WHITE..INDENT..AtlasLocale["Raven"], NPC, 7605 }; - { WHITE..INDENT..AtlasLocale["Oro Eyegouge"], NPC, 7606 }; - { WHITE..INDENT..AtlasLocale["Sandfury Executioner"], NPC, 7274 }; - { WHITE.."6) "..AtlasLocale["Hydromancer Velratha"], NPC, 7795 }; - { WHITE..INDENT..AtlasLocale["Gahz'rilla"].." ("..AtlasLocale["Summon"]..")", NPC, 7273 }; - { WHITE..INDENT..AtlasLocale["Elder Wildmane"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15578 }; - { WHITE.."7) "..AtlasLocale["Chief Ukorz Sandscalp"], NPC, 7267 }; - { WHITE..INDENT..AtlasLocale["Ruuzlu"], NPC, 7797 }; - { WHITE.."8) "..AtlasLocale["Zerillis"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Wanders"]..")", NPC, 10082 }; - { WHITE.."9) "..AtlasLocale["Sandarr Dunereaver"].." ("..AtlasLocale["Rare"]..")", NPC, 10080 }; + Acronym = AL["ZF"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Antu'sul "], NPC, 8127 }; + { WHITE.."2) "..AL["Theka the Martyr"], NPC, 7272 }; + { WHITE.."3) "..AL["Witch Doctor Zum'rah"], NPC, 7271 }; + { WHITE..INDENT..AL["Zul'Farrak Dead Hero"], NPC, 7276 }; + { WHITE.."4) "..AL["Nekrum Gutchewer"], NPC, 7796 }; + { WHITE..INDENT..AL["Shadowpriest Sezz'ziz"], NPC, 7275 }; + { WHITE..INDENT..AL["Dustwraith"].." ("..AL["Rare"]..")", NPC, 10081 }; + { WHITE.."5) "..AL["Sergeant Bly"], NPC, 7604 }; + { WHITE..INDENT..AL["Weegli Blastfuse"], NPC, 7607 }; + { WHITE..INDENT..AL["Murta Grimgut"], NPC, 7608 }; + { WHITE..INDENT..AL["Raven"], NPC, 7605 }; + { WHITE..INDENT..AL["Oro Eyegouge"], NPC, 7606 }; + { WHITE..INDENT..AL["Sandfury Executioner"], NPC, 7274 }; + { WHITE.."6) "..AL["Hydromancer Velratha"], NPC, 7795 }; + { WHITE..INDENT..AL["Gahz'rilla"].." ("..AL["Summon"]..")", NPC, 7273 }; + { WHITE..INDENT..AL["Elder Wildmane"].." ("..AL["Lunar Festival"]..")", NPC, 15578 }; + { WHITE.."7) "..AL["Chief Ukorz Sandscalp"], NPC, 7267 }; + { WHITE..INDENT..AL["Ruuzlu"], NPC, 7797 }; + { WHITE.."8) "..AL["Zerillis"].." ("..AL["Rare"]..", "..AL["Wanders"]..")", NPC, 10082 }; + { WHITE.."9) "..AL["Sandarr Dunereaver"].." ("..AL["Rare"]..")", NPC, 10080 }; }; --************************************************ @@ -718,138 +718,138 @@ AtlasLoot_MapData = { LevelRange = "52-58"; MinLevel = "10-25"; PlayerLimit = "5"; - Acronym = AtlasLocale["BRD"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Shadowforge Key"], ITEM, 11000 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Prison Cell Key"].." ("..AtlasLocale["Jail Break!"]..")", ITEM, 11140 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Banner of Provocation"].." ("..AtlasLocale["Theldren"]..")", ITEM, 21986 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Lord Roccor"], NPC, 9025 }; - { WHITE.."2) "..AtlasLocale["Kharan Mighthammer"], NPC, 9021 }; - { WHITE.."3) "..AtlasLocale["Commander Gor'shak "], NPC, 9020 }; - { WHITE.."4) "..AtlasLocale["Marshal Windsor"], NPC, 9023 }; - { WHITE.."5) "..AtlasLocale["High Interrogator Gerstahn "], NPC, 9018 }; - { WHITE.."6) "..AtlasLocale["Ring of Law"] }; - { WHITE..INDENT..AtlasLocale["Anub'shiah"].." ("..AtlasLocale["Random"]..")", NPC, 9031 }; - { WHITE..INDENT..AtlasLocale["Eviscerator"].." ("..AtlasLocale["Random"]..")", NPC, 9029 }; - { WHITE..INDENT..AtlasLocale["Gorosh the Dervish"].." ("..AtlasLocale["Random"]..")", NPC, 9027 }; - { WHITE..INDENT..AtlasLocale["Grizzle"].." ("..AtlasLocale["Random"]..")", NPC, 9028 }; - { WHITE..INDENT..AtlasLocale["Hedrum the Creeper"].." ("..AtlasLocale["Random"]..")", NPC, 9032 }; - { WHITE..INDENT..AtlasLocale["Ok'thor the Breaker"].." ("..AtlasLocale["Random"]..")", NPC, 9030 }; - { WHITE..INDENT..AtlasLocale["Theldren"].." ("..AtlasLocale["Summon"]..")", NPC, 16059 }; - { WHITE..INDENT..AtlasLocale["Lefty"], NPC, 16049 }; - { WHITE..INDENT..AtlasLocale["Malgen Longspear"], NPC, 16052 }; - { WHITE..INDENT..AtlasLocale["Gnashjaw "], NPC, 16095 }; - { WHITE..INDENT..AtlasLocale["Rotfang"], NPC, 16050 }; - { WHITE..INDENT..AtlasLocale["Va'jashni"], NPC, 16055 }; - { WHITE..INDENT..AtlasLocale["Houndmaster Grebmar"].." ("..AtlasLocale["Lower"]..")", NPC, 9319 }; - { WHITE..INDENT..AtlasLocale["Elder Morndeep"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15549 }; - { WHITE..INDENT..AtlasLocale["High Justice Grimstone"], NPC, 10096 }; - { WHITE.."7) "..AtlasLocale["Monument of Franclorn Forgewright"], OBJECT, 164689 }; - { WHITE..INDENT..AtlasLocale["Pyromancer Loregrain"], NPC, 9024 }; - { WHITE.."8) "..AtlasLocale["The Vault"] }; - { WHITE..INDENT..AtlasLocale["Warder Stilgiss"], NPC, 9041 }; - { WHITE..INDENT..AtlasLocale["Verek"], NPC, 9042 }; - { WHITE..INDENT..AtlasLocale["Watchman Doomgrip"], NPC, 9476 }; - { WHITE.."9) "..AtlasLocale["Fineous Darkvire "], NPC, 9056 }; - { WHITE.."10) "..AtlasLocale["The Black Anvil"] }; - { WHITE..INDENT..AtlasLocale["Lord Incendius"], NPC, 9017 }; - { WHITE.."11) "..AtlasLocale["Bael'Gar"], NPC, 9016 }; - { WHITE.."12) "..AtlasLocale["Shadowforge Lock"] }; - { WHITE.."13) "..AtlasLocale["General Angerforge"], NPC, 9033 }; - { WHITE.."14) "..AtlasLocale["Golem Lord Argelmach"], NPC, 8983 }; - { WHITE..INDENT..AtlasLocale["Field Repair Bot 74A"], NPC, 14337 }; - { WHITE..INDENT..AtlasLocale["Blacksmithing Plans"], OBJECT, 173232 }; - { WHITE.."15) "..AtlasLocale["The Grim Guzzler"] }; - { WHITE..INDENT..AtlasLocale["Hurley Blackbreath"], NPC, 9537 }; - { WHITE..INDENT..AtlasLocale["Lokhtos Darkbargainer "], NPC, 12944 }; - { WHITE..INDENT..AtlasLocale["Mistress Nagmara"], NPC, 9500 }; - { WHITE..INDENT..AtlasLocale["Phalanx"], NPC, 9502 }; - { WHITE..INDENT..AtlasLocale["Plugger Spazzring"], NPC, 9499 }; - { WHITE..INDENT..AtlasLocale["Private Rocknot"], NPC, 9503 }; - { WHITE..INDENT..AtlasLocale["Ribbly Screwspigot"], NPC, 9543 }; - { WHITE..INDENT..AtlasLocale["Coren Direbrew"].." ("..AtlasLocale["Brewfest"]..")", NPC, 23872 }; - { WHITE..INDENT..AtlasLocale["Griz Gutshank "], NPC, 28225 }; - { WHITE.."16) "..AtlasLocale["Ambassador Flamelash"], NPC, 9156 }; - { WHITE.."17) "..AtlasLocale["Panzor the Invincible"].." ("..AtlasLocale["Rare"]..")", NPC, 8923 }; - { WHITE..INDENT..AtlasLocale["Blacksmithing Plans"], OBJECT, 173232 }; - { WHITE.."18) "..AtlasLocale["Summoner's Tomb"] }; - { WHITE.."19) "..AtlasLocale["The Lyceum"] }; - { WHITE.."20) "..AtlasLocale["Magmus"], NPC, 9938 }; - { WHITE.."21) "..AtlasLocale["Emperor Dagran Thaurissan"], NPC, 9019 }; - { WHITE..INDENT..AtlasLocale["Princess Moira Bronzebeard "], NPC, 8929 }; - { WHITE..INDENT..AtlasLocale["High Priestess of Thaurissan"], NPC, 10076 }; - { WHITE.."22) "..AtlasLocale["The Black Forge"] }; + Acronym = AL["BRD"]; + { ORNG..AL["Key"]..": "..AL["Shadowforge Key"], ITEM, 11000 }; + { ORNG..AL["Key"]..": "..AL["Prison Cell Key"].." ("..AL["Jail Break!"]..")", ITEM, 11140 }; + { ORNG..AL["Key"]..": "..AL["Banner of Provocation"].." ("..AL["Theldren"]..")", ITEM, 21986 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Lord Roccor"], NPC, 9025 }; + { WHITE.."2) "..AL["Kharan Mighthammer"], NPC, 9021 }; + { WHITE.."3) "..AL["Commander Gor'shak "], NPC, 9020 }; + { WHITE.."4) "..AL["Marshal Windsor"], NPC, 9023 }; + { WHITE.."5) "..AL["High Interrogator Gerstahn "], NPC, 9018 }; + { WHITE.."6) "..AL["Ring of Law"] }; + { WHITE..INDENT..AL["Anub'shiah"].." ("..AL["Random"]..")", NPC, 9031 }; + { WHITE..INDENT..AL["Eviscerator"].." ("..AL["Random"]..")", NPC, 9029 }; + { WHITE..INDENT..AL["Gorosh the Dervish"].." ("..AL["Random"]..")", NPC, 9027 }; + { WHITE..INDENT..AL["Grizzle"].." ("..AL["Random"]..")", NPC, 9028 }; + { WHITE..INDENT..AL["Hedrum the Creeper"].." ("..AL["Random"]..")", NPC, 9032 }; + { WHITE..INDENT..AL["Ok'thor the Breaker"].." ("..AL["Random"]..")", NPC, 9030 }; + { WHITE..INDENT..AL["Theldren"].." ("..AL["Summon"]..")", NPC, 16059 }; + { WHITE..INDENT..AL["Lefty"], NPC, 16049 }; + { WHITE..INDENT..AL["Malgen Longspear"], NPC, 16052 }; + { WHITE..INDENT..AL["Gnashjaw "], NPC, 16095 }; + { WHITE..INDENT..AL["Rotfang"], NPC, 16050 }; + { WHITE..INDENT..AL["Va'jashni"], NPC, 16055 }; + { WHITE..INDENT..AL["Houndmaster Grebmar"].." ("..AL["Lower"]..")", NPC, 9319 }; + { WHITE..INDENT..AL["Elder Morndeep"].." ("..AL["Lunar Festival"]..")", NPC, 15549 }; + { WHITE..INDENT..AL["High Justice Grimstone"], NPC, 10096 }; + { WHITE.."7) "..AL["Monument of Franclorn Forgewright"], OBJECT, 164689 }; + { WHITE..INDENT..AL["Pyromancer Loregrain"], NPC, 9024 }; + { WHITE.."8) "..AL["The Vault"] }; + { WHITE..INDENT..AL["Warder Stilgiss"], NPC, 9041 }; + { WHITE..INDENT..AL["Verek"], NPC, 9042 }; + { WHITE..INDENT..AL["Watchman Doomgrip"], NPC, 9476 }; + { WHITE.."9) "..AL["Fineous Darkvire "], NPC, 9056 }; + { WHITE.."10) "..AL["The Black Anvil"] }; + { WHITE..INDENT..AL["Lord Incendius"], NPC, 9017 }; + { WHITE.."11) "..AL["Bael'Gar"], NPC, 9016 }; + { WHITE.."12) "..AL["Shadowforge Lock"] }; + { WHITE.."13) "..AL["General Angerforge"], NPC, 9033 }; + { WHITE.."14) "..AL["Golem Lord Argelmach"], NPC, 8983 }; + { WHITE..INDENT..AL["Field Repair Bot 74A"], NPC, 14337 }; + { WHITE..INDENT..AL["Blacksmithing Plans"], OBJECT, 173232 }; + { WHITE.."15) "..AL["The Grim Guzzler"] }; + { WHITE..INDENT..AL["Hurley Blackbreath"], NPC, 9537 }; + { WHITE..INDENT..AL["Lokhtos Darkbargainer "], NPC, 12944 }; + { WHITE..INDENT..AL["Mistress Nagmara"], NPC, 9500 }; + { WHITE..INDENT..AL["Phalanx"], NPC, 9502 }; + { WHITE..INDENT..AL["Plugger Spazzring"], NPC, 9499 }; + { WHITE..INDENT..AL["Private Rocknot"], NPC, 9503 }; + { WHITE..INDENT..AL["Ribbly Screwspigot"], NPC, 9543 }; + { WHITE..INDENT..AL["Coren Direbrew"].." ("..AL["Brewfest"]..")", NPC, 23872 }; + { WHITE..INDENT..AL["Griz Gutshank "], NPC, 28225 }; + { WHITE.."16) "..AL["Ambassador Flamelash"], NPC, 9156 }; + { WHITE.."17) "..AL["Panzor the Invincible"].." ("..AL["Rare"]..")", NPC, 8923 }; + { WHITE..INDENT..AL["Blacksmithing Plans"], OBJECT, 173232 }; + { WHITE.."18) "..AL["Summoner's Tomb"] }; + { WHITE.."19) "..AL["The Lyceum"] }; + { WHITE.."20) "..AL["Magmus"], NPC, 9938 }; + { WHITE.."21) "..AL["Emperor Dagran Thaurissan"], NPC, 9019 }; + { WHITE..INDENT..AL["Princess Moira Bronzebeard "], NPC, 8929 }; + { WHITE..INDENT..AL["High Priestess of Thaurissan"], NPC, 10076 }; + { WHITE.."22) "..AL["The Black Forge"] }; { WHITE.."23) "..BabbleZone["Molten Core"], ZONE, 2717 }; - { WHITE..INDENT..AtlasLocale["Core Fragment"], OBJECT, 179553 }; - { WHITE.."24) "..AtlasLocale["Overmaster Pyron"], NPC, 9026 }; - { WHITE.."25) "..AtlasLocale["Blacksmithing Plans"], OBJECT, 173232 }; + { WHITE..INDENT..AL["Core Fragment"], OBJECT, 179553 }; + { WHITE.."24) "..AL["Overmaster Pyron"], NPC, 9026 }; + { WHITE.."25) "..AL["Blacksmithing Plans"], OBJECT, 173232 }; }; ["BlackrockSpireLower"] = { - ZoneName = { BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Lower"]..")", 1583 }; + ZoneName = { BabbleZone["Blackrock Spire"].." ("..AL["Lower"]..")", 1583 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "54-60"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["LBRS"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Upper"]..")", ZONE, 1583 }; - { BLUE.."C-F) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Vaelan"].." ("..AtlasLocale["Upper"]..")", NPC, 10296 }; - { WHITE.."2) "..AtlasLocale["Warosh "].." ("..AtlasLocale["Wanders"]..")", NPC, 10799 }; - { WHITE..INDENT..AtlasLocale["Elder Stonefort"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15560 }; - { WHITE.."3) "..AtlasLocale["Roughshod Pike"], OBJECT, 175886 }; - { WHITE.."4) "..AtlasLocale["Spirestone Butcher"].." ("..AtlasLocale["Rare"]..")", NPC, 9219 }; - { WHITE.."5) "..AtlasLocale["Highlord Omokk"], NPC, 9196 }; - { WHITE.."6) "..AtlasLocale["Spirestone Battle Lord"].." ("..AtlasLocale["Rare"]..")", NPC, 9218 }; - { WHITE..INDENT..AtlasLocale["Spirestone Lord Magus"].." ("..AtlasLocale["Rare"]..")", NPC, 9217 }; - { WHITE.."7) "..AtlasLocale["Shadow Hunter Vosh'gajin"], NPC, 9236 }; - { WHITE..INDENT..AtlasLocale["Fifth Mosh'aru Tablet"], OBJECT, 175949 }; - { WHITE.."8) "..AtlasLocale["Bijou"], NPC, 10257 }; - { WHITE.."9) "..AtlasLocale["War Master Voone"], NPC, 9237 }; - { WHITE..INDENT..AtlasLocale["Mor Grayhoof"].." ("..AtlasLocale["Summon"]..")", NPC, 16080 }; - { WHITE..INDENT..AtlasLocale["Sixth Mosh'aru Tablet"], OBJECT, 175950 }; - { WHITE.."10) "..AtlasLocale["Bijou's Belongings"], OBJECT, 175334 }; - { WHITE.."11) "..AtlasLocale["Human Remains"].." ("..AtlasLocale["Lower"]..")", OBJECT, 176090 }; - { WHITE..INDENT..AtlasLocale["Unfired Plate Gauntlets"].." ("..AtlasLocale["Lower"]..")", OBJECT, 176089 }; - { WHITE.."12) "..AtlasLocale["Bannok Grimaxe "].." ("..AtlasLocale["Rare"]..")", NPC, 9596 }; - { WHITE.."13) "..AtlasLocale["Mother Smolderweb"], NPC, 10596 }; - { WHITE.."14) "..AtlasLocale["Crystal Fang"].." ("..AtlasLocale["Rare"]..")", NPC, 10376 }; - { WHITE.."15) "..AtlasLocale["Urok's Tribute Pile"], OBJECT, 175621 }; - { WHITE..INDENT..AtlasLocale["Urok Doomhowl"].." ("..AtlasLocale["Summon"]..")", NPC, 10584 }; - { WHITE.."16) "..AtlasLocale["Quartermaster Zigris "], NPC, 9736 }; - { WHITE.."17) "..AtlasLocale["Halycon"], NPC, 10220 }; - { WHITE..INDENT..AtlasLocale["Gizrul the Slavener"], NPC, 10268 }; - { WHITE.."18) "..AtlasLocale["Ghok Bashguud "].." ("..AtlasLocale["Rare"]..")", NPC, 9718 }; - { WHITE.."19) "..AtlasLocale["Overlord Wyrmthalak"], NPC, 9568 }; - { GREN.."1') "..AtlasLocale["Burning Felguard"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Summon"]..")", NPC, 10263 }; + Acronym = AL["LBRS"]; + { ORNG..AL["Key"]..": "..AL["Brazier of Invocation"].." ("..AL["DS2"]..")", ITEM, 22057 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..BabbleZone["Blackrock Spire"].." ("..AL["Upper"]..")", ZONE, 1583 }; + { BLUE.."C-F) "..AL["Connection"] }; + { WHITE.."1) "..AL["Vaelan"].." ("..AL["Upper"]..")", NPC, 10296 }; + { WHITE.."2) "..AL["Warosh "].." ("..AL["Wanders"]..")", NPC, 10799 }; + { WHITE..INDENT..AL["Elder Stonefort"].." ("..AL["Lunar Festival"]..")", NPC, 15560 }; + { WHITE.."3) "..AL["Roughshod Pike"], OBJECT, 175886 }; + { WHITE.."4) "..AL["Spirestone Butcher"].." ("..AL["Rare"]..")", NPC, 9219 }; + { WHITE.."5) "..AL["Highlord Omokk"], NPC, 9196 }; + { WHITE.."6) "..AL["Spirestone Battle Lord"].." ("..AL["Rare"]..")", NPC, 9218 }; + { WHITE..INDENT..AL["Spirestone Lord Magus"].." ("..AL["Rare"]..")", NPC, 9217 }; + { WHITE.."7) "..AL["Shadow Hunter Vosh'gajin"], NPC, 9236 }; + { WHITE..INDENT..AL["Fifth Mosh'aru Tablet"], OBJECT, 175949 }; + { WHITE.."8) "..AL["Bijou"], NPC, 10257 }; + { WHITE.."9) "..AL["War Master Voone"], NPC, 9237 }; + { WHITE..INDENT..AL["Mor Grayhoof"].." ("..AL["Summon"]..")", NPC, 16080 }; + { WHITE..INDENT..AL["Sixth Mosh'aru Tablet"], OBJECT, 175950 }; + { WHITE.."10) "..AL["Bijou's Belongings"], OBJECT, 175334 }; + { WHITE.."11) "..AL["Human Remains"].." ("..AL["Lower"]..")", OBJECT, 176090 }; + { WHITE..INDENT..AL["Unfired Plate Gauntlets"].." ("..AL["Lower"]..")", OBJECT, 176089 }; + { WHITE.."12) "..AL["Bannok Grimaxe "].." ("..AL["Rare"]..")", NPC, 9596 }; + { WHITE.."13) "..AL["Mother Smolderweb"], NPC, 10596 }; + { WHITE.."14) "..AL["Crystal Fang"].." ("..AL["Rare"]..")", NPC, 10376 }; + { WHITE.."15) "..AL["Urok's Tribute Pile"], OBJECT, 175621 }; + { WHITE..INDENT..AL["Urok Doomhowl"].." ("..AL["Summon"]..")", NPC, 10584 }; + { WHITE.."16) "..AL["Quartermaster Zigris "], NPC, 9736 }; + { WHITE.."17) "..AL["Halycon"], NPC, 10220 }; + { WHITE..INDENT..AL["Gizrul the Slavener"], NPC, 10268 }; + { WHITE.."18) "..AL["Ghok Bashguud "].." ("..AL["Rare"]..")", NPC, 9718 }; + { WHITE.."19) "..AL["Overlord Wyrmthalak"], NPC, 9568 }; + { GREN.."1') "..AL["Burning Felguard"].." ("..AL["Rare"]..", "..AL["Summon"]..")", NPC, 10263 }; }; ["BlackrockSpireUpper"] = { - ZoneName = { BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Upper"]..")", 1583 }; + ZoneName = { BabbleZone["Blackrock Spire"].." ("..AL["Upper"]..")", 1583 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "56-61"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["UBRS"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Lower"]..")", ZONE, 1583 }; - { BLUE.."C-E) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Pyroguard Emberseer"], NPC, 9816 }; - { WHITE.."2) "..AtlasLocale["Solakar Flamewreath"], NPC, 10264 }; - { WHITE..INDENT..AtlasLocale["Father Flame"], OBJECT, 175245 }; - { WHITE.."3) "..AtlasLocale["Darkstone Tablet"], OBJECT, 175385 }; - { WHITE..INDENT..AtlasLocale["Doomrigger's Coffer"], OBJECT, 175382 }; - { WHITE.."4) "..AtlasLocale["Jed Runewatcher "].." ("..AtlasLocale["Rare"]..")", NPC, 10509 }; - { WHITE.."5) "..AtlasLocale["Goraluk Anvilcrack "], NPC, 10899 }; - { WHITE.."6) "..AtlasLocale["Warchief Rend Blackhand"], NPC, 10429 }; - { WHITE..INDENT..AtlasLocale["Gyth "], NPC, 10339 }; - { WHITE.."7) "..AtlasLocale["Awbee"], NPC, 10740 }; - { WHITE.."8) "..AtlasLocale["The Beast"], NPC, 10430 }; - { WHITE..INDENT..AtlasLocale["Lord Valthalak"].." ("..AtlasLocale["Summon"]..")", NPC, 16042 }; - { WHITE..INDENT..AtlasLocale["Finkle Einhorn"], NPC, 10776 }; - { WHITE.."9) "..AtlasLocale["General Drakkisath"], NPC, 10363 }; - { WHITE..INDENT..AtlasLocale["Drakkisath's Brand"], OBJECT, 179880 }; + Acronym = AL["UBRS"]; + { ORNG..AL["Key"]..": "..AL["Brazier of Invocation"].." ("..AL["DS2"]..")", ITEM, 22057 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..BabbleZone["Blackrock Spire"].." ("..AL["Lower"]..")", ZONE, 1583 }; + { BLUE.."C-E) "..AL["Connection"] }; + { WHITE.."1) "..AL["Pyroguard Emberseer"], NPC, 9816 }; + { WHITE.."2) "..AL["Solakar Flamewreath"], NPC, 10264 }; + { WHITE..INDENT..AL["Father Flame"], OBJECT, 175245 }; + { WHITE.."3) "..AL["Darkstone Tablet"], OBJECT, 175385 }; + { WHITE..INDENT..AL["Doomrigger's Coffer"], OBJECT, 175382 }; + { WHITE.."4) "..AL["Jed Runewatcher "].." ("..AL["Rare"]..")", NPC, 10509 }; + { WHITE.."5) "..AL["Goraluk Anvilcrack "], NPC, 10899 }; + { WHITE.."6) "..AL["Warchief Rend Blackhand"], NPC, 10429 }; + { WHITE..INDENT..AL["Gyth "], NPC, 10339 }; + { WHITE.."7) "..AL["Awbee"], NPC, 10740 }; + { WHITE.."8) "..AL["The Beast"], NPC, 10430 }; + { WHITE..INDENT..AL["Lord Valthalak"].." ("..AL["Summon"]..")", NPC, 16042 }; + { WHITE..INDENT..AL["Finkle Einhorn"], NPC, 10776 }; + { WHITE.."9) "..AL["General Drakkisath"], NPC, 10363 }; + { WHITE..INDENT..AL["Drakkisath's Brand"], OBJECT, 179880 }; { WHITE.."10) "..BabbleZone["Blackwing Lair"], ZONE, 2677 }; }; ["BlackwingLair"] = { @@ -858,21 +858,21 @@ AtlasLoot_MapData = { LevelRange = "60-70"; MinLevel = "60"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["BWL"]; - { ORNG..AtlasLocale["Attunement Required"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Connection"] }; - { BLUE.."C) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Razorgore the Untamed"], NPC, 12435 }; - { WHITE.."2) "..AtlasLocale["Vaelastrasz the Corrupt"], NPC, 13020 }; - { WHITE.."3) "..AtlasLocale["Broodlord Lashlayer"], NPC, 12017 }; - { WHITE.."4) "..AtlasLocale["Firemaw"], NPC, 11983 }; - { WHITE.."5) "..AtlasLocale["Draconic for Dummies (Chapter VII)"], ITEM, 21109 }; - { WHITE.."6) "..AtlasLocale["Master Elemental Shaper Krixix"], NPC, 14401 }; - { WHITE.."7) "..AtlasLocale["Ebonroc"], NPC, 14601 }; - { WHITE.."8) "..AtlasLocale["Flamegor"], NPC, 11981 }; - { WHITE.."9) "..AtlasLocale["Chromaggus"], NPC, 14020 }; - { WHITE.."10) "..AtlasLocale["Nefarian"], NPC, 11583 }; + Acronym = AL["BWL"]; + { ORNG..AL["Attunement Required"] }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Connection"] }; + { BLUE.."C) "..AL["Connection"] }; + { WHITE.."1) "..AL["Razorgore the Untamed"], NPC, 12435 }; + { WHITE.."2) "..AL["Vaelastrasz the Corrupt"], NPC, 13020 }; + { WHITE.."3) "..AL["Broodlord Lashlayer"], NPC, 12017 }; + { WHITE.."4) "..AL["Firemaw"], NPC, 11983 }; + { WHITE.."5) "..AL["Draconic for Dummies (Chapter VII)"], ITEM, 21109 }; + { WHITE.."6) "..AL["Master Elemental Shaper Krixix"], NPC, 14401 }; + { WHITE.."7) "..AL["Ebonroc"], NPC, 14601 }; + { WHITE.."8) "..AL["Flamegor"], NPC, 11981 }; + { WHITE.."9) "..AL["Chromaggus"], NPC, 14020 }; + { WHITE.."10) "..AL["Nefarian"], NPC, 11583 }; }; ["Gnomeregan"] = { ZoneName = { BabbleZone["Gnomeregan"], 133 }; @@ -880,27 +880,27 @@ AtlasLoot_MapData = { LevelRange = "24-32"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["Gnome"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Workshop Key"].." ("..AtlasLocale["Back"]..")", ITEM, 6893 }; - { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Front"]..")" }; - { BLUE.."B) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Back"]..")" }; - { WHITE.."1) "..AtlasLocale["Blastmaster Emi Shortfuse"], NPC, 7998 }; - { WHITE..INDENT..AtlasLocale["Grubbis"], NPC, 7361 }; - { WHITE..INDENT..AtlasLocale["Chomper"], NPC, 6215 }; - { WHITE.."2) "..AtlasLocale["Clean Room"] }; - { WHITE..INDENT..AtlasLocale["Tink Sprocketwhistle "], NPC, 9676 }; - { WHITE..INDENT..AtlasLocale["The Sparklematic 5200"], OBJECT, 142487 }; - { WHITE..INDENT..AtlasLocale["Mail Box"] }; - { WHITE.."3) "..AtlasLocale["Kernobee"], NPC, 7850 }; - { WHITE..INDENT..AtlasLocale["Alarm-a-bomb 2600"], NPC, 7897 }; - { WHITE..INDENT..AtlasLocale["Matrix Punchograph 3005-B"], OBJECT, 142475 }; - { WHITE.."4) "..AtlasLocale["Viscous Fallout"], NPC, 7079 }; - { WHITE.."5) "..AtlasLocale["Electrocutioner 6000"], NPC, 6235 }; - { WHITE..INDENT..AtlasLocale["Matrix Punchograph 3005-C"], OBJECT, 142476 }; - { WHITE.."6) "..AtlasLocale["Crowd Pummeler 9-60"].." ("..AtlasLocale["Upper"]..")", NPC, 6229 }; - { WHITE..INDENT..AtlasLocale["Matrix Punchograph 3005-D"], OBJECT, 142696 }; - { WHITE.."7) "..AtlasLocale["Dark Iron Ambassador"], NPC, 6228 }; - { WHITE.."8) "..AtlasLocale["Mekgineer Thermaplugg"], NPC, 7800 }; + Acronym = AL["Gnome"]; + { ORNG..AL["Key"]..": "..AL["Workshop Key"].." ("..AL["Back"]..")", ITEM, 6893 }; + { BLUE.."A) "..AL["Entrance"].." ("..AL["Front"]..")" }; + { BLUE.."B) "..AL["Entrance"].." ("..AL["Back"]..")" }; + { WHITE.."1) "..AL["Blastmaster Emi Shortfuse"], NPC, 7998 }; + { WHITE..INDENT..AL["Grubbis"], NPC, 7361 }; + { WHITE..INDENT..AL["Chomper"], NPC, 6215 }; + { WHITE.."2) "..AL["Clean Room"] }; + { WHITE..INDENT..AL["Tink Sprocketwhistle "], NPC, 9676 }; + { WHITE..INDENT..AL["The Sparklematic 5200"], OBJECT, 142487 }; + { WHITE..INDENT..AL["Mail Box"] }; + { WHITE.."3) "..AL["Kernobee"], NPC, 7850 }; + { WHITE..INDENT..AL["Alarm-a-bomb 2600"], NPC, 7897 }; + { WHITE..INDENT..AL["Matrix Punchograph 3005-B"], OBJECT, 142475 }; + { WHITE.."4) "..AL["Viscous Fallout"], NPC, 7079 }; + { WHITE.."5) "..AL["Electrocutioner 6000"], NPC, 6235 }; + { WHITE..INDENT..AL["Matrix Punchograph 3005-C"], OBJECT, 142476 }; + { WHITE.."6) "..AL["Crowd Pummeler 9-60"].." ("..AL["Upper"]..")", NPC, 6229 }; + { WHITE..INDENT..AL["Matrix Punchograph 3005-D"], OBJECT, 142696 }; + { WHITE.."7) "..AL["Dark Iron Ambassador"], NPC, 6228 }; + { WHITE.."8) "..AL["Mekgineer Thermaplugg"], NPC, 7800 }; }; ["MoltenCore"] = { ZoneName = { BabbleZone["Molten Core"], 2717 }; @@ -908,20 +908,20 @@ AtlasLoot_MapData = { LevelRange = "60-70"; MinLevel = "50"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["MC"]; - { ORNG..AtlasLocale["Attunement Required"] }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Hydraxian Waterlords"], FACTION, 749 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Lucifron"], NPC, 12118 }; - { WHITE.."2) "..AtlasLocale["Magmadar"], NPC, 11982 }; - { WHITE.."3) "..AtlasLocale["Gehennas"], NPC, 12259 }; - { WHITE.."4) "..AtlasLocale["Garr"], NPC, 12057 }; - { WHITE.."5) "..AtlasLocale["Shazzrah"], NPC, 12264 }; - { WHITE.."6) "..AtlasLocale["Baron Geddon"], NPC, 12056 }; - { WHITE.."7) "..AtlasLocale["Golemagg the Incinerator"], NPC, 11988 }; - { WHITE.."8) "..AtlasLocale["Sulfuron Harbinger"], NPC, 12098 }; - { WHITE.."9) "..AtlasLocale["Majordomo Executus"], NPC, 12018 }; - { WHITE.."10) "..AtlasLocale["Ragnaros"], NPC, 11502 }; + Acronym = AL["MC"]; + { ORNG..AL["Attunement Required"] }; + { ORNG..AL["Reputation"]..": "..AL["Hydraxian Waterlords"], FACTION, 749 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Lucifron"], NPC, 12118 }; + { WHITE.."2) "..AL["Magmadar"], NPC, 11982 }; + { WHITE.."3) "..AL["Gehennas"], NPC, 12259 }; + { WHITE.."4) "..AL["Garr"], NPC, 12057 }; + { WHITE.."5) "..AL["Shazzrah"], NPC, 12264 }; + { WHITE.."6) "..AL["Baron Geddon"], NPC, 12056 }; + { WHITE.."7) "..AL["Golemagg the Incinerator"], NPC, 11988 }; + { WHITE.."8) "..AL["Sulfuron Harbinger"], NPC, 12098 }; + { WHITE.."9) "..AL["Majordomo Executus"], NPC, 12018 }; + { WHITE.."10) "..AL["Ragnaros"], NPC, 11502 }; }; ["Scholomance"] = { ZoneName = { BabbleZone["Scholomance"], 2057 }; @@ -929,39 +929,39 @@ AtlasLoot_MapData = { LevelRange = "58-60"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["Scholo"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Argent Dawn"], FACTION, 529 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Skeleton Key"], ITEM, 13704 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Viewing Room Key"].." ("..AtlasLocale["Viewing Room"]..")", ITEM, 13873 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Blood of Innocents"].." ("..AtlasLocale["Kirtonos the Herald"]..")", ITEM, 13523 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Divination Scryer"].." ("..AtlasLocale["Death Knight Darkreaver"]..")", ITEM, 18746 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Connection"] }; - { BLUE.."C) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Blood Steward of Kirtonos"], NPC, 14861 }; - { WHITE..INDENT..AtlasLocale["The Deed to Southshore"], OBJECT, 176486 }; - { WHITE.."2) "..AtlasLocale["Kirtonos the Herald"].." ("..AtlasLocale["Summon"]..")", NPC, 10506 }; - { WHITE.."3) "..AtlasLocale["Jandice Barov"], NPC, 10503 }; - { WHITE.."4) "..AtlasLocale["The Deed to Tarren Mill"], OBJECT, 176487 }; - { WHITE.."5) "..AtlasLocale["Rattlegore"].." ("..AtlasLocale["Lower"]..")", NPC, 11622 }; - { WHITE..INDENT..AtlasLocale["Death Knight Darkreaver"].." ("..AtlasLocale["Summon"]..")", NPC, 14516 }; - { WHITE.."6) "..AtlasLocale["Marduk Blackpool"], NPC, 10433 }; - { WHITE..INDENT..AtlasLocale["Vectus"], NPC, 10432 }; - { WHITE.."7) "..AtlasLocale["Ras Frostwhisper"], NPC, 10508 }; - { WHITE..INDENT..AtlasLocale["The Deed to Brill"], OBJECT, 176484 }; - { WHITE..INDENT..AtlasLocale["Kormok"].." ("..AtlasLocale["Summon"]..")", NPC, 16118 }; - { WHITE.."8) "..AtlasLocale["Instructor Malicia"], NPC, 10505 }; - { WHITE.."9) "..AtlasLocale["Doctor Theolen Krastinov "], NPC, 11261 }; - { WHITE.."10) "..AtlasLocale["Lorekeeper Polkelt"], NPC, 10901 }; - { WHITE.."11) "..AtlasLocale["The Ravenian"], NPC, 10507 }; - { WHITE.."12) "..AtlasLocale["Lord Alexei Barov"], NPC, 10504 }; - { WHITE..INDENT..AtlasLocale["The Deed to Caer Darrow"], OBJECT, 176485 }; - { WHITE.."13) "..AtlasLocale["Lady Illucia Barov"], NPC, 10502 }; - { WHITE.."14) "..AtlasLocale["Darkmaster Gandling"], NPC, 1853 }; - { GREN.."1') "..AtlasLocale["Torch Lever"] }; - { GREN.."2') "..AtlasLocale["Secret Chest"] }; - { GREN.."3') "..AtlasLocale["Alchemy Lab"] }; + Acronym = AL["Scholo"]; + { ORNG..AL["Reputation"]..": "..AL["Argent Dawn"], FACTION, 529 }; + { ORNG..AL["Key"]..": "..AL["Skeleton Key"], ITEM, 13704 }; + { ORNG..AL["Key"]..": "..AL["Viewing Room Key"].." ("..AL["Viewing Room"]..")", ITEM, 13873 }; + { ORNG..AL["Key"]..": "..AL["Blood of Innocents"].." ("..AL["Kirtonos the Herald"]..")", ITEM, 13523 }; + { ORNG..AL["Key"]..": "..AL["Brazier of Invocation"].." ("..AL["DS2"]..")", ITEM, 22057 }; + { ORNG..AL["Key"]..": "..AL["Divination Scryer"].." ("..AL["Death Knight Darkreaver"]..")", ITEM, 18746 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Connection"] }; + { BLUE.."C) "..AL["Connection"] }; + { WHITE.."1) "..AL["Blood Steward of Kirtonos"], NPC, 14861 }; + { WHITE..INDENT..AL["The Deed to Southshore"], OBJECT, 176486 }; + { WHITE.."2) "..AL["Kirtonos the Herald"].." ("..AL["Summon"]..")", NPC, 10506 }; + { WHITE.."3) "..AL["Jandice Barov"], NPC, 10503 }; + { WHITE.."4) "..AL["The Deed to Tarren Mill"], OBJECT, 176487 }; + { WHITE.."5) "..AL["Rattlegore"].." ("..AL["Lower"]..")", NPC, 11622 }; + { WHITE..INDENT..AL["Death Knight Darkreaver"].." ("..AL["Summon"]..")", NPC, 14516 }; + { WHITE.."6) "..AL["Marduk Blackpool"], NPC, 10433 }; + { WHITE..INDENT..AL["Vectus"], NPC, 10432 }; + { WHITE.."7) "..AL["Ras Frostwhisper"], NPC, 10508 }; + { WHITE..INDENT..AL["The Deed to Brill"], OBJECT, 176484 }; + { WHITE..INDENT..AL["Kormok"].." ("..AL["Summon"]..")", NPC, 16118 }; + { WHITE.."8) "..AL["Instructor Malicia"], NPC, 10505 }; + { WHITE.."9) "..AL["Doctor Theolen Krastinov "], NPC, 11261 }; + { WHITE.."10) "..AL["Lorekeeper Polkelt"], NPC, 10901 }; + { WHITE.."11) "..AL["The Ravenian"], NPC, 10507 }; + { WHITE.."12) "..AL["Lord Alexei Barov"], NPC, 10504 }; + { WHITE..INDENT..AL["The Deed to Caer Darrow"], OBJECT, 176485 }; + { WHITE.."13) "..AL["Lady Illucia Barov"], NPC, 10502 }; + { WHITE.."14) "..AL["Darkmaster Gandling"], NPC, 1853 }; + { GREN.."1') "..AL["Torch Lever"] }; + { GREN.."2') "..AL["Secret Chest"] }; + { GREN.."3') "..AL["Alchemy Lab"] }; }; ["ShadowfangKeep"] = { ZoneName = { BabbleZone["Shadowfang Keep"], 209 }; @@ -969,31 +969,31 @@ AtlasLoot_MapData = { LevelRange = "17-25"; MinLevel = "10"; PlayerLimit = "5"; - Acronym = AtlasLocale["SFK"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Rethilgore "], NPC, 3914 }; - { WHITE..INDENT..AtlasLocale["Sorcerer Ashcrombe"], NPC, 3850 }; - { WHITE..INDENT..AtlasLocale["Deathstalker Adamant"], NPC, 3849 }; - { WHITE..INDENT..AtlasLocale["Landen Stilwell"], NPC, 17822 }; - { WHITE.."2) "..AtlasLocale["Investigator Fezzen Brasstacks"].." ("..AtlasLocale["Love is in the Air"]..")", NPC, 38208 }; - { WHITE.."3) "..AtlasLocale["Deathstalker Vincent"], NPC, 4444 }; - { WHITE.."4) "..AtlasLocale["Apothecary Trio"].." ("..AtlasLocale["Love is in the Air"]..")" }; - { WHITE..INDENT..AtlasLocale["Apothecary Hummel "], NPC, 36296 }; - { WHITE..INDENT..AtlasLocale["Apothecary Baxter "], NPC, 36565 }; - { WHITE..INDENT..AtlasLocale["Apothecary Frye "], NPC, 36272 }; - { WHITE.."5) "..AtlasLocale["Fel Steed"], NPC, 3864 }; - { WHITE..INDENT..AtlasLocale["Jordan's Hammer"], OBJECT, 91138 }; - { WHITE..INDENT..AtlasLocale["Crate of Ingots"], OBJECT, 182011 }; - { WHITE.."6) "..AtlasLocale["Razorclaw the Butcher"], NPC, 3886 }; - { WHITE.."7) "..AtlasLocale["Baron Silverlaine"], NPC, 3887 }; - { WHITE.."8) "..AtlasLocale["Commander Springvale"], NPC, 4278 }; - { WHITE.."9) "..AtlasLocale["Odo the Blindwatcher"], NPC, 4279 }; - { WHITE.."10) "..AtlasLocale["Deathsworn Captain"].." ("..AtlasLocale["Rare"]..")", NPC, 3872 }; - { WHITE.."11) "..AtlasLocale["Fenrus the Devourer"], NPC, 4274 }; - { WHITE..INDENT..AtlasLocale["Arugal's Voidwalker"], NPC, 4627 }; - { WHITE..INDENT..AtlasLocale["The Book of Ur"], OBJECT, 36738 }; - { WHITE.."12) "..AtlasLocale["Wolf Master Nandos"], NPC, 3927 }; - { WHITE.."13) "..AtlasLocale["Archmage Arugal"], NPC, 4275 }; + Acronym = AL["SFK"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Rethilgore "], NPC, 3914 }; + { WHITE..INDENT..AL["Sorcerer Ashcrombe"], NPC, 3850 }; + { WHITE..INDENT..AL["Deathstalker Adamant"], NPC, 3849 }; + { WHITE..INDENT..AL["Landen Stilwell"], NPC, 17822 }; + { WHITE.."2) "..AL["Investigator Fezzen Brasstacks"].." ("..AL["Love is in the Air"]..")", NPC, 38208 }; + { WHITE.."3) "..AL["Deathstalker Vincent"], NPC, 4444 }; + { WHITE.."4) "..AL["Apothecary Trio"].." ("..AL["Love is in the Air"]..")" }; + { WHITE..INDENT..AL["Apothecary Hummel "], NPC, 36296 }; + { WHITE..INDENT..AL["Apothecary Baxter "], NPC, 36565 }; + { WHITE..INDENT..AL["Apothecary Frye "], NPC, 36272 }; + { WHITE.."5) "..AL["Fel Steed"], NPC, 3864 }; + { WHITE..INDENT..AL["Jordan's Hammer"], OBJECT, 91138 }; + { WHITE..INDENT..AL["Crate of Ingots"], OBJECT, 182011 }; + { WHITE.."6) "..AL["Razorclaw the Butcher"], NPC, 3886 }; + { WHITE.."7) "..AL["Baron Silverlaine"], NPC, 3887 }; + { WHITE.."8) "..AL["Commander Springvale"], NPC, 4278 }; + { WHITE.."9) "..AL["Odo the Blindwatcher"], NPC, 4279 }; + { WHITE.."10) "..AL["Deathsworn Captain"].." ("..AL["Rare"]..")", NPC, 3872 }; + { WHITE.."11) "..AL["Fenrus the Devourer"], NPC, 4274 }; + { WHITE..INDENT..AL["Arugal's Voidwalker"], NPC, 4627 }; + { WHITE..INDENT..AL["The Book of Ur"], OBJECT, 36738 }; + { WHITE.."12) "..AL["Wolf Master Nandos"], NPC, 3927 }; + { WHITE.."13) "..AL["Archmage Arugal"], NPC, 4275 }; }; ["SMArmory"] = { ZoneName = { BabbleZone["Armory"], 796 }; @@ -1001,10 +1001,10 @@ AtlasLoot_MapData = { LevelRange = "33-40"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["Armory"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Scarlet Key"], ITEM, 7146 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Herod "], NPC, 3975 }; + Acronym = AL["Armory"]; + { ORNG..AL["Key"]..": "..AL["The Scarlet Key"], ITEM, 7146 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Herod "], NPC, 3975 }; }; ["SMCathedral"] = { ZoneName = { BabbleZone["Cathedral"], 796 }; @@ -1012,12 +1012,12 @@ AtlasLoot_MapData = { LevelRange = "36-42"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["Cath"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Scarlet Key"], ITEM, 7146 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["High Inquisitor Fairbanks"], NPC, 4542 }; - { WHITE.."2) "..AtlasLocale["Scarlet Commander Mograine"], NPC, 3976 }; - { WHITE..INDENT..AtlasLocale["High Inquisitor Whitemane"], NPC, 3977 }; + Acronym = AL["Cath"]; + { ORNG..AL["Key"]..": "..AL["The Scarlet Key"], ITEM, 7146 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["High Inquisitor Fairbanks"], NPC, 4542 }; + { WHITE.."2) "..AL["Scarlet Commander Mograine"], NPC, 3976 }; + { WHITE..INDENT..AL["High Inquisitor Whitemane"], NPC, 3977 }; }; ["SMGraveyard"] = { ZoneName = { BabbleZone["Graveyard"], 796 }; @@ -1025,16 +1025,16 @@ AtlasLoot_MapData = { LevelRange = "28-35"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["GY"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Interrogator Vishas"], NPC, 3983 }; - { WHITE..INDENT..AtlasLocale["Vorrel Sengutz"], NPC, 3981 }; - { WHITE.."2) "..AtlasLocale["Pumpkin Shrine"].." ("..AtlasLocale["Hallow's End"]..")", OBJECT, 186267 }; - { WHITE..INDENT..AtlasLocale["Headless Horseman"].." ("..AtlasLocale["Summon"]..")", NPC, 23682 }; - { WHITE.."3) "..AtlasLocale["Bloodmage Thalnos"], NPC, 4543 }; - { GREN.."1') "..AtlasLocale["Ironspine"].." ("..AtlasLocale["Rare"]..")", NPC, 6489 }; - { GREN..INDENT..AtlasLocale["Azshir the Sleepless"].." ("..AtlasLocale["Rare"]..")", NPC, 6490 }; - { GREN..INDENT..AtlasLocale["Fallen Champion"].." ("..AtlasLocale["Rare"]..")", NPC, 6488 }; + Acronym = AL["GY"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Interrogator Vishas"], NPC, 3983 }; + { WHITE..INDENT..AL["Vorrel Sengutz"], NPC, 3981 }; + { WHITE.."2) "..AL["Pumpkin Shrine"].." ("..AL["Hallow's End"]..")", OBJECT, 186267 }; + { WHITE..INDENT..AL["Headless Horseman"].." ("..AL["Summon"]..")", NPC, 23682 }; + { WHITE.."3) "..AL["Bloodmage Thalnos"], NPC, 4543 }; + { GREN.."1') "..AL["Ironspine"].." ("..AL["Rare"]..")", NPC, 6489 }; + { GREN..INDENT..AL["Azshir the Sleepless"].." ("..AL["Rare"]..")", NPC, 6490 }; + { GREN..INDENT..AL["Fallen Champion"].." ("..AL["Rare"]..")", NPC, 6488 }; }; ["SMLibrary"] = { ZoneName = { BabbleZone["Library"], 796 }; @@ -1042,10 +1042,10 @@ AtlasLoot_MapData = { LevelRange = "31-37"; MinLevel = "20"; PlayerLimit = "5"; - Acronym = AtlasLocale["Lib"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Houndmaster Loksey"], NPC, 3974 }; - { WHITE.."2) "..AtlasLocale["Arcanist Doan"], NPC, 6487 }; + Acronym = AL["Lib"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Houndmaster Loksey"], NPC, 3974 }; + { WHITE.."2) "..AL["Arcanist Doan"], NPC, 6487 }; }; ["Stratholme"] = { ZoneName = { BabbleZone["Stratholme"], 2017 }; @@ -1053,50 +1053,50 @@ AtlasLoot_MapData = { LevelRange = "58-60"; MinLevel = "45"; PlayerLimit = "5"; - Acronym = AtlasLocale["Strat"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Argent Dawn"], FACTION, 529 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Scarlet Key"].." ("..AtlasLocale["Living Side"]..")", ITEM, 7146 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Key to the City"].." ("..AtlasLocale["Undead Side"]..")", ITEM, 12382 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Various Postbox Keys"].." ("..AtlasLocale["Postmaster Malown"]..")" }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; - { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Front"]..")" }; - { BLUE.."B) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Side"]..")" }; - { WHITE.."1) "..AtlasLocale["Skul"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Varies"]..")", NPC, 10393 }; - { WHITE..INDENT..AtlasLocale["Stratholme Courier"], NPC, 11082 }; - { WHITE..INDENT..AtlasLocale["Fras Siabi"], NPC, 11058 }; - { WHITE.."2) "..AtlasLocale["Atiesh "].." ("..AtlasLocale["Summon"]..")", NPC, 16387 }; - { WHITE.."3) "..AtlasLocale["Hearthsinger Forresten"].." ("..AtlasLocale["Varies"]..")", NPC, 10558 }; - { WHITE.."4) "..AtlasLocale["The Unforgiven"], NPC, 10516 }; - { WHITE.."5) "..AtlasLocale["Elder Farwhisper"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15607 }; - { WHITE.."6) "..AtlasLocale["Timmy the Cruel"], NPC, 10808 }; - { WHITE.."7) "..AtlasLocale["Malor the Zealous"], NPC, 11032 }; - { WHITE..INDENT..AtlasLocale["Malor's Strongbox"], OBJECT, 176112 }; - { WHITE.."8) "..AtlasLocale["Crimson Hammersmith"].." ("..AtlasLocale["Summon"]..")", NPC, 11120 }; - { WHITE..INDENT..AtlasLocale["Blacksmithing Plans"], OBJECT, 173232 }; - { WHITE.."9) "..AtlasLocale["Cannon Master Willey"], NPC, 10997 }; - { WHITE.."10) "..AtlasLocale["Archivist Galford"], NPC, 10811 }; - { WHITE.."11) "..AtlasLocale["Grand Crusader Dathrohan"], NPC, 10812 }; - { WHITE..INDENT..AtlasLocale["Balnazzar"], NPC, 10813 }; - { WHITE..INDENT..AtlasLocale["Sothos"].." ("..AtlasLocale["Summon"]..")", NPC, 16102 }; - { WHITE..INDENT..AtlasLocale["Jarien"].." ("..AtlasLocale["Summon"]..")", NPC, 16101 }; - { WHITE.."12) "..AtlasLocale["Magistrate Barthilas"].." ("..AtlasLocale["Varies"]..")", NPC, 10435 }; - { WHITE.."13) "..AtlasLocale["Aurius"], NPC, 10917 }; - { WHITE.."14) "..AtlasLocale["Stonespine"].." ("..AtlasLocale["Rare"]..")", NPC, 10809 }; - { WHITE.."15) "..AtlasLocale["Baroness Anastari"], NPC, 10436 }; - { WHITE..INDENT..AtlasLocale["Black Guard Swordsmith"].." ("..AtlasLocale["Summon"]..")", NPC, 11121 }; - { WHITE..INDENT..AtlasLocale["Blacksmithing Plans"], OBJECT, 173232 }; - { WHITE.."16) "..AtlasLocale["Nerub'enkan"], NPC, 10437 }; - { WHITE.."17) "..AtlasLocale["Maleki the Pallid"], NPC, 10438 }; - { WHITE.."18) "..AtlasLocale["Ramstein the Gorger"], NPC, 10439 }; - { WHITE.."19) "..AtlasLocale["Baron Rivendare"], NPC, 10440 }; - { WHITE..INDENT..AtlasLocale["Ysida Harmon"], NPC, 16031 }; - { GREN.."1') "..AtlasLocale["Crusaders' Square Postbox"] }; - { GREN.."2') "..AtlasLocale["Market Row Postbox"] }; - { GREN.."3') "..AtlasLocale["Festival Lane Postbox"] }; - { GREN.."4') "..AtlasLocale["Elders' Square Postbox"] }; - { GREN.."5') "..AtlasLocale["King's Square Postbox"] }; - { GREN.."6') "..AtlasLocale["Fras Siabi's Postbox"] }; - { GREN..AtlasLocale["3rd Box Opened"]..": "..AtlasLocale["Postmaster Malown"], NPC, 11143 }; + Acronym = AL["Strat"]; + { ORNG..AL["Reputation"]..": "..AL["Argent Dawn"], FACTION, 529 }; + { ORNG..AL["Key"]..": "..AL["The Scarlet Key"].." ("..AL["Living Side"]..")", ITEM, 7146 }; + { ORNG..AL["Key"]..": "..AL["Key to the City"].." ("..AL["Undead Side"]..")", ITEM, 12382 }; + { ORNG..AL["Key"]..": "..AL["Various Postbox Keys"].." ("..AL["Postmaster Malown"]..")" }; + { ORNG..AL["Key"]..": "..AL["Brazier of Invocation"].." ("..AL["DS2"]..")", ITEM, 22057 }; + { BLUE.."A) "..AL["Entrance"].." ("..AL["Front"]..")" }; + { BLUE.."B) "..AL["Entrance"].." ("..AL["Side"]..")" }; + { WHITE.."1) "..AL["Skul"].." ("..AL["Rare"]..", "..AL["Varies"]..")", NPC, 10393 }; + { WHITE..INDENT..AL["Stratholme Courier"], NPC, 11082 }; + { WHITE..INDENT..AL["Fras Siabi"], NPC, 11058 }; + { WHITE.."2) "..AL["Atiesh "].." ("..AL["Summon"]..")", NPC, 16387 }; + { WHITE.."3) "..AL["Hearthsinger Forresten"].." ("..AL["Varies"]..")", NPC, 10558 }; + { WHITE.."4) "..AL["The Unforgiven"], NPC, 10516 }; + { WHITE.."5) "..AL["Elder Farwhisper"].." ("..AL["Lunar Festival"]..")", NPC, 15607 }; + { WHITE.."6) "..AL["Timmy the Cruel"], NPC, 10808 }; + { WHITE.."7) "..AL["Malor the Zealous"], NPC, 11032 }; + { WHITE..INDENT..AL["Malor's Strongbox"], OBJECT, 176112 }; + { WHITE.."8) "..AL["Crimson Hammersmith"].." ("..AL["Summon"]..")", NPC, 11120 }; + { WHITE..INDENT..AL["Blacksmithing Plans"], OBJECT, 173232 }; + { WHITE.."9) "..AL["Cannon Master Willey"], NPC, 10997 }; + { WHITE.."10) "..AL["Archivist Galford"], NPC, 10811 }; + { WHITE.."11) "..AL["Grand Crusader Dathrohan"], NPC, 10812 }; + { WHITE..INDENT..AL["Balnazzar"], NPC, 10813 }; + { WHITE..INDENT..AL["Sothos"].." ("..AL["Summon"]..")", NPC, 16102 }; + { WHITE..INDENT..AL["Jarien"].." ("..AL["Summon"]..")", NPC, 16101 }; + { WHITE.."12) "..AL["Magistrate Barthilas"].." ("..AL["Varies"]..")", NPC, 10435 }; + { WHITE.."13) "..AL["Aurius"], NPC, 10917 }; + { WHITE.."14) "..AL["Stonespine"].." ("..AL["Rare"]..")", NPC, 10809 }; + { WHITE.."15) "..AL["Baroness Anastari"], NPC, 10436 }; + { WHITE..INDENT..AL["Black Guard Swordsmith"].." ("..AL["Summon"]..")", NPC, 11121 }; + { WHITE..INDENT..AL["Blacksmithing Plans"], OBJECT, 173232 }; + { WHITE.."16) "..AL["Nerub'enkan"], NPC, 10437 }; + { WHITE.."17) "..AL["Maleki the Pallid"], NPC, 10438 }; + { WHITE.."18) "..AL["Ramstein the Gorger"], NPC, 10439 }; + { WHITE.."19) "..AL["Baron Rivendare"], NPC, 10440 }; + { WHITE..INDENT..AL["Ysida Harmon"], NPC, 16031 }; + { GREN.."1') "..AL["Crusaders' Square Postbox"] }; + { GREN.."2') "..AL["Market Row Postbox"] }; + { GREN.."3') "..AL["Festival Lane Postbox"] }; + { GREN.."4') "..AL["Elders' Square Postbox"] }; + { GREN.."5') "..AL["King's Square Postbox"] }; + { GREN.."6') "..AL["Fras Siabi's Postbox"] }; + { GREN..AL["3rd Box Opened"]..": "..AL["Postmaster Malown"], NPC, 11143 }; }; ["TheDeadmines"] = { ZoneName = { BabbleZone["The Deadmines"], 1581 }; @@ -1104,19 +1104,19 @@ AtlasLoot_MapData = { LevelRange = "16-22"; MinLevel = "10"; PlayerLimit = "5"; - Acronym = AtlasLocale["VC"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Rhahk'Zor "], NPC, 644 }; - { WHITE.."2) "..AtlasLocale["Miner Johnson"].." ("..AtlasLocale["Rare"]..")", NPC, 3586 }; - { WHITE.."3) "..AtlasLocale["Sneed "], NPC, 643 }; - { WHITE..INDENT..AtlasLocale["Sneed's Shredder "], NPC, 642 }; - { WHITE.."4) "..AtlasLocale["Gilnid "], NPC, 1763 }; - { WHITE.."5) "..AtlasLocale["Defias Gunpowder"], OBJECT, 17155 }; - { WHITE.."6) "..AtlasLocale["Captain Greenskin"], NPC, 647 }; - { WHITE..INDENT..AtlasLocale["Edwin VanCleef "], NPC, 639 }; - { WHITE..INDENT..AtlasLocale["Mr. Smite "], NPC, 646 }; - { WHITE..INDENT..AtlasLocale["Cookie "], NPC, 645 }; + Acronym = AL["VC"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Exit"] }; + { WHITE.."1) "..AL["Rhahk'Zor "], NPC, 644 }; + { WHITE.."2) "..AL["Miner Johnson"].." ("..AL["Rare"]..")", NPC, 3586 }; + { WHITE.."3) "..AL["Sneed "], NPC, 643 }; + { WHITE..INDENT..AL["Sneed's Shredder "], NPC, 642 }; + { WHITE.."4) "..AL["Gilnid "], NPC, 1763 }; + { WHITE.."5) "..AL["Defias Gunpowder"], OBJECT, 17155 }; + { WHITE.."6) "..AL["Captain Greenskin"], NPC, 647 }; + { WHITE..INDENT..AL["Edwin VanCleef "], NPC, 639 }; + { WHITE..INDENT..AL["Mr. Smite "], NPC, 646 }; + { WHITE..INDENT..AL["Cookie "], NPC, 645 }; }; ["TheStockade"] = { ZoneName = { BabbleZone["The Stockade"], 717 }; @@ -1124,14 +1124,14 @@ AtlasLoot_MapData = { LevelRange = "21-27"; MinLevel = "15"; PlayerLimit = "5"; - Acronym = AtlasLocale["Stocks"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Targorr the Dread"].." ("..AtlasLocale["Varies"]..")", NPC, 1696 }; - { WHITE.."2) "..AtlasLocale["Kam Deepfury"], NPC, 1666 }; - { WHITE.."3) "..AtlasLocale["Hamhock"], NPC, 1717 }; - { WHITE.."4) "..AtlasLocale["Bazil Thredd"], NPC, 1716 }; - { WHITE.."5) "..AtlasLocale["Dextren Ward"], NPC, 1663 }; - { WHITE.."6) "..AtlasLocale["Bruegal Ironknuckle"].." ("..AtlasLocale["Rare"]..")", NPC, 1720 }; + Acronym = AL["Stocks"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Targorr the Dread"].." ("..AL["Varies"]..")", NPC, 1696 }; + { WHITE.."2) "..AL["Kam Deepfury"], NPC, 1666 }; + { WHITE.."3) "..AL["Hamhock"], NPC, 1717 }; + { WHITE.."4) "..AL["Bazil Thredd"], NPC, 1716 }; + { WHITE.."5) "..AL["Dextren Ward"], NPC, 1663 }; + { WHITE.."6) "..AL["Bruegal Ironknuckle"].." ("..AL["Rare"]..")", NPC, 1720 }; }; ["TheSunkenTemple"] = { ZoneName = { BabbleZone["Sunken Temple"], 1417 }; @@ -1139,32 +1139,32 @@ AtlasLoot_MapData = { LevelRange = "46-53"; MinLevel = "35"; PlayerLimit = "5"; - Acronym = AtlasLocale["ST"]; - { ORNG..AtlasLocale["AKA"]..": "..BabbleZone["The Temple of Atal'Hakkar"] }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Yeh'kinya's Scroll"].." ("..AtlasLocale["Avatar of Hakkar"]..")", ITEM, 10818 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B-I) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Altar of Hakkar"], OBJECT, 148836 }; - { WHITE..INDENT..AtlasLocale["Atal'alarion "], NPC, 8580 }; - { WHITE.."2) "..AtlasLocale["Dreamscythe"], NPC, 5721 }; - { WHITE..INDENT..AtlasLocale["Weaver"], NPC, 5720 }; - { WHITE.."3) "..AtlasLocale["Avatar of Hakkar"], NPC, 8443 }; - { WHITE.."4) "..AtlasLocale["Jammal'an the Prophet"], NPC, 5710 }; - { WHITE..INDENT..AtlasLocale["Ogom the Wretched"], NPC, 5711 }; - { WHITE.."5) "..AtlasLocale["Morphaz"], NPC, 5719 }; - { WHITE..INDENT..AtlasLocale["Hazzas"], NPC, 5722 }; - { WHITE.."6) "..AtlasLocale["Shade of Eranikus"], NPC, 5709 }; - { WHITE..INDENT..AtlasLocale["Essence Font"], OBJECT, 148512 }; - { WHITE.."7) "..AtlasLocale["Spawn of Hakkar"].." ("..AtlasLocale["Rare"]..")", NPC, 5708 }; - { WHITE.."8) "..AtlasLocale["Elder Starsong"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15593 }; - { GREN.."1'-6') "..AtlasLocale["Statue Activation Order"] }; - { GREN.."7') "..AtlasLocale["Atal'ai Defenders"] }; - { GREN..INDENT..AtlasLocale["Gasher"], NPC, 5713 }; - { GREN..INDENT..AtlasLocale["Loro"], NPC, 5714 }; - { GREN..INDENT..AtlasLocale["Hukku"], NPC, 5715 }; - { GREN..INDENT..AtlasLocale["Zolo"], NPC, 5712 }; - { GREN..INDENT..AtlasLocale["Mijan"], NPC, 5717 }; - { GREN..INDENT..AtlasLocale["Zul'Lor"], NPC, 5716 }; + Acronym = AL["ST"]; + { ORNG..AL["AKA"]..": "..BabbleZone["The Temple of Atal'Hakkar"] }; + { ORNG..AL["Key"]..": "..AL["Yeh'kinya's Scroll"].." ("..AL["Avatar of Hakkar"]..")", ITEM, 10818 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B-I) "..AL["Connection"] }; + { WHITE.."1) "..AL["Altar of Hakkar"], OBJECT, 148836 }; + { WHITE..INDENT..AL["Atal'alarion "], NPC, 8580 }; + { WHITE.."2) "..AL["Dreamscythe"], NPC, 5721 }; + { WHITE..INDENT..AL["Weaver"], NPC, 5720 }; + { WHITE.."3) "..AL["Avatar of Hakkar"], NPC, 8443 }; + { WHITE.."4) "..AL["Jammal'an the Prophet"], NPC, 5710 }; + { WHITE..INDENT..AL["Ogom the Wretched"], NPC, 5711 }; + { WHITE.."5) "..AL["Morphaz"], NPC, 5719 }; + { WHITE..INDENT..AL["Hazzas"], NPC, 5722 }; + { WHITE.."6) "..AL["Shade of Eranikus"], NPC, 5709 }; + { WHITE..INDENT..AL["Essence Font"], OBJECT, 148512 }; + { WHITE.."7) "..AL["Spawn of Hakkar"].." ("..AL["Rare"]..")", NPC, 5708 }; + { WHITE.."8) "..AL["Elder Starsong"].." ("..AL["Lunar Festival"]..")", NPC, 15593 }; + { GREN.."1'-6') "..AL["Statue Activation Order"] }; + { GREN.."7') "..AL["Atal'ai Defenders"] }; + { GREN..INDENT..AL["Gasher"], NPC, 5713 }; + { GREN..INDENT..AL["Loro"], NPC, 5714 }; + { GREN..INDENT..AL["Hukku"], NPC, 5715 }; + { GREN..INDENT..AL["Zolo"], NPC, 5712 }; + { GREN..INDENT..AL["Mijan"], NPC, 5717 }; + { GREN..INDENT..AL["Zul'Lor"], NPC, 5716 }; }; ["Uldaman"] = { ZoneName = { BabbleZone["Uldaman"], 1337 }; @@ -1172,28 +1172,28 @@ AtlasLoot_MapData = { LevelRange = "36-42"; MinLevel = "30"; PlayerLimit = "5"; - Acronym = AtlasLocale["Ulda"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Staff of Prehistoria"].." ("..AtlasLocale["Ironaya"]..")", ITEM, 7733 }; - { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Front"]..")" }; - { BLUE.."B) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Back"]..")" }; - { WHITE.."1) "..AtlasLocale["Baelog"], NPC, 6906 }; - { WHITE..INDENT..AtlasLocale["Eric \"The Swift\""], NPC, 6907 }; - { WHITE..INDENT..AtlasLocale["Olaf"], NPC, 6908 }; - { WHITE..INDENT..AtlasLocale["Baelog's Chest"], OBJECT, 123329 }; - { WHITE..INDENT..AtlasLocale["Conspicuous Urn"], OBJECT, 125477 }; - { WHITE.."2) "..AtlasLocale["Remains of a Paladin"], NPC, 6912 }; - { WHITE.."3) "..AtlasLocale["Revelosh"], NPC, 6910 }; - { WHITE.."4) "..AtlasLocale["Ironaya"], NPC, 7228 }; - { WHITE.."5) "..AtlasLocale["Obsidian Sentinel"], NPC, 7023 }; - { WHITE.."6) "..AtlasLocale["Annora "], NPC, 11073 }; - { WHITE.."7) "..AtlasLocale["Ancient Stone Keeper"], NPC, 7206 }; - { WHITE.."8) "..AtlasLocale["Galgann Firehammer"], NPC, 7291 }; - { WHITE..INDENT..AtlasLocale["Tablet of Will"], OBJECT, 142088 }; - { WHITE..INDENT..AtlasLocale["Shadowforge Cache"], OBJECT, 113757 }; - { WHITE.."9) "..AtlasLocale["Grimlok "], NPC, 4854 }; - { WHITE.."10) "..AtlasLocale["Archaedas "].." ("..AtlasLocale["Lower"]..")", NPC, 2748 }; - { WHITE.."11) "..AtlasLocale["The Discs of Norgannon"].." ("..AtlasLocale["Lower"]..")", OBJECT, 131474 }; - { WHITE..INDENT..AtlasLocale["Ancient Treasure"].." ("..AtlasLocale["Lower"]..")", OBJECT, 141979 }; + Acronym = AL["Ulda"]; + { ORNG..AL["Key"]..": "..AL["Staff of Prehistoria"].." ("..AL["Ironaya"]..")", ITEM, 7733 }; + { BLUE.."A) "..AL["Entrance"].." ("..AL["Front"]..")" }; + { BLUE.."B) "..AL["Entrance"].." ("..AL["Back"]..")" }; + { WHITE.."1) "..AL["Baelog"], NPC, 6906 }; + { WHITE..INDENT..AL["Eric \"The Swift\""], NPC, 6907 }; + { WHITE..INDENT..AL["Olaf"], NPC, 6908 }; + { WHITE..INDENT..AL["Baelog's Chest"], OBJECT, 123329 }; + { WHITE..INDENT..AL["Conspicuous Urn"], OBJECT, 125477 }; + { WHITE.."2) "..AL["Remains of a Paladin"], NPC, 6912 }; + { WHITE.."3) "..AL["Revelosh"], NPC, 6910 }; + { WHITE.."4) "..AL["Ironaya"], NPC, 7228 }; + { WHITE.."5) "..AL["Obsidian Sentinel"], NPC, 7023 }; + { WHITE.."6) "..AL["Annora "], NPC, 11073 }; + { WHITE.."7) "..AL["Ancient Stone Keeper"], NPC, 7206 }; + { WHITE.."8) "..AL["Galgann Firehammer"], NPC, 7291 }; + { WHITE..INDENT..AL["Tablet of Will"], OBJECT, 142088 }; + { WHITE..INDENT..AL["Shadowforge Cache"], OBJECT, 113757 }; + { WHITE.."9) "..AL["Grimlok "], NPC, 4854 }; + { WHITE.."10) "..AL["Archaedas "].." ("..AL["Lower"]..")", NPC, 2748 }; + { WHITE.."11) "..AL["The Discs of Norgannon"].." ("..AL["Lower"]..")", OBJECT, 131474 }; + { WHITE..INDENT..AL["Ancient Treasure"].." ("..AL["Lower"]..")", OBJECT, 141979 }; }; ["ZulGurub"] = { ZoneName = { BabbleZone["Zul'Gurub"], 19 }; @@ -1201,30 +1201,30 @@ AtlasLoot_MapData = { LevelRange = "56-70"; MinLevel = "50"; PlayerLimit = "20"; - Acronym = AtlasLocale["ZG"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Zandalar Tribe"], FACTION, 270 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Mudskunk Lure"].." ("..AtlasLocale["Gahz'ranka"]..")", ITEM, 19974 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Gurubashi Mojo Madness"].." ("..AtlasLocale["Edge of Madness"]..")", ITEM, 19931 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["High Priestess Jeklik"].." ("..AtlasLocale["Bat"]..")", NPC, 14517 }; - { WHITE.."2) "..AtlasLocale["High Priest Venoxis"].." ("..AtlasLocale["Snake"]..")", NPC, 14507 }; - { WHITE.."3) "..AtlasLocale["Zanza the Restless"], NPC, 15042 }; - { WHITE.."4) "..AtlasLocale["High Priestess Mar'li"].." ("..AtlasLocale["Spider"]..")", NPC, 14510 }; - { WHITE.."5) "..AtlasLocale["Bloodlord Mandokir"].." ("..AtlasLocale["Raptor"]..", "..AtlasLocale["Optional"]..")", NPC, 11382 }; - { WHITE..INDENT..AtlasLocale["Ohgan"], NPC, 14988 }; - { WHITE.."6) "..AtlasLocale["Edge of Madness"].." ("..AtlasLocale["Optional"]..")" }; - { WHITE..INDENT..AtlasLocale["Gri'lek"].." ("..AtlasLocale["Random"]..")", NPC, 15082 }; - { WHITE..INDENT..AtlasLocale["Hazza'rah"].." ("..AtlasLocale["Random"]..")", NPC, 15083 }; - { WHITE..INDENT..AtlasLocale["Renataki"].." ("..AtlasLocale["Random"]..")", NPC, 15084 }; - { WHITE..INDENT..AtlasLocale["Wushoolay"].." ("..AtlasLocale["Random"]..")", NPC, 15085 }; - { WHITE.."7) "..AtlasLocale["Gahz'ranka"].." ("..AtlasLocale["Optional"]..", "..AtlasLocale["Summon"]..")", NPC, 15114 }; - { WHITE.."8) "..AtlasLocale["High Priest Thekal"].." ("..AtlasLocale["Tiger"]..")", NPC, 14509 }; - { WHITE..INDENT..AtlasLocale["Zealot Zath"], NPC, 11348 }; - { WHITE..INDENT..AtlasLocale["Zealot Lor'Khan"], NPC, 11347 }; - { WHITE.."9) "..AtlasLocale["High Priestess Arlokk"].." ("..AtlasLocale["Panther"]..")", NPC, 14515 }; - { WHITE.."10) "..AtlasLocale["Jin'do the Hexxer"].." ("..AtlasLocale["Undead"]..", "..AtlasLocale["Optional"]..")", NPC, 11380 }; - { WHITE.."11) "..AtlasLocale["Hakkar"], NPC, 14834 }; - { GREN.."1') "..AtlasLocale["Muddy Churning Waters"] }; + Acronym = AL["ZG"]; + { ORNG..AL["Reputation"]..": "..AL["Zandalar Tribe"], FACTION, 270 }; + { ORNG..AL["Key"]..": "..AL["Mudskunk Lure"].." ("..AL["Gahz'ranka"]..")", ITEM, 19974 }; + { ORNG..AL["Key"]..": "..AL["Gurubashi Mojo Madness"].." ("..AL["Edge of Madness"]..")", ITEM, 19931 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["High Priestess Jeklik"].." ("..AL["Bat"]..")", NPC, 14517 }; + { WHITE.."2) "..AL["High Priest Venoxis"].." ("..AL["Snake"]..")", NPC, 14507 }; + { WHITE.."3) "..AL["Zanza the Restless"], NPC, 15042 }; + { WHITE.."4) "..AL["High Priestess Mar'li"].." ("..AL["Spider"]..")", NPC, 14510 }; + { WHITE.."5) "..AL["Bloodlord Mandokir"].." ("..AL["Raptor"]..", "..AL["Optional"]..")", NPC, 11382 }; + { WHITE..INDENT..AL["Ohgan"], NPC, 14988 }; + { WHITE.."6) "..AL["Edge of Madness"].." ("..AL["Optional"]..")" }; + { WHITE..INDENT..AL["Gri'lek"].." ("..AL["Random"]..")", NPC, 15082 }; + { WHITE..INDENT..AL["Hazza'rah"].." ("..AL["Random"]..")", NPC, 15083 }; + { WHITE..INDENT..AL["Renataki"].." ("..AL["Random"]..")", NPC, 15084 }; + { WHITE..INDENT..AL["Wushoolay"].." ("..AL["Random"]..")", NPC, 15085 }; + { WHITE.."7) "..AL["Gahz'ranka"].." ("..AL["Optional"]..", "..AL["Summon"]..")", NPC, 15114 }; + { WHITE.."8) "..AL["High Priest Thekal"].." ("..AL["Tiger"]..")", NPC, 14509 }; + { WHITE..INDENT..AL["Zealot Zath"], NPC, 11348 }; + { WHITE..INDENT..AL["Zealot Lor'Khan"], NPC, 11347 }; + { WHITE.."9) "..AL["High Priestess Arlokk"].." ("..AL["Panther"]..")", NPC, 14515 }; + { WHITE.."10) "..AL["Jin'do the Hexxer"].." ("..AL["Undead"]..", "..AL["Optional"]..")", NPC, 11380 }; + { WHITE.."11) "..AL["Hakkar"], NPC, 14834 }; + { GREN.."1') "..AL["Muddy Churning Waters"] }; }; --************************************************ @@ -1237,14 +1237,14 @@ AtlasLoot_MapData = { LevelRange = "64-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["AC"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Lower City"], FACTION, 1011 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Auchenai Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30633 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Shirrak the Dead Watcher"], NPC, 18371 }; - { WHITE.."2) "..AtlasLocale["Exarch Maladaar"], NPC, 18373 }; - { WHITE..INDENT..AtlasLocale["Avatar of the Martyred"], NPC, 18478 }; - { WHITE..INDENT..AtlasLocale["D'ore"], NPC, 19412 }; + Acronym = AL["AC"]; + { ORNG..AL["Reputation"]..": "..AL["Lower City"], FACTION, 1011 }; + { ORNG..AL["Key"]..": "..AL["Auchenai Key"].." ("..AL["Heroic"]..")", ITEM, 30633 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Shirrak the Dead Watcher"], NPC, 18371 }; + { WHITE.."2) "..AL["Exarch Maladaar"], NPC, 18373 }; + { WHITE..INDENT..AL["Avatar of the Martyred"], NPC, 18478 }; + { WHITE..INDENT..AL["D'ore"], NPC, 19412 }; }; ["AuchManaTombs"] = { ZoneName = { BabbleZone["Mana-Tombs"], 3792 }; @@ -1252,19 +1252,19 @@ AtlasLoot_MapData = { LevelRange = "63-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["MT"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Consortium"], FACTION, 933 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Auchenai Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30633 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Eye of Haramad"].." ("..AtlasLocale["Exalted"]..", "..AtlasLocale["Yor "]..")", ITEM, 32092 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Pandemonius"], NPC, 18341 }; - { WHITE..INDENT..AtlasLocale["Shadow Lord Xiraxis"], NPC, 19666 }; - { WHITE.."2) "..AtlasLocale["Ambassador Pax'ivi"].." ("..AtlasLocale["Heroic"]..")", NPC, 22928 }; - { WHITE.."3) "..AtlasLocale["Tavarok"], NPC, 18343 }; - { WHITE.."4) "..AtlasLocale["Cryo-Engineer Sha'heen"], NPC, 19671 }; - { WHITE..INDENT..AtlasLocale["Ethereal Transporter Control Panel"], OBJECT, 183877 }; - { WHITE.."5) "..AtlasLocale["Nexus-Prince Shaffar"], NPC, 18344 }; - { WHITE..INDENT..AtlasLocale["Yor "].." ("..AtlasLocale["Summon"]..", "..AtlasLocale["Heroic"]..")", NPC, 22930 }; + Acronym = AL["MT"]; + { ORNG..AL["Reputation"]..": "..AL["The Consortium"], FACTION, 933 }; + { ORNG..AL["Key"]..": "..AL["Auchenai Key"].." ("..AL["Heroic"]..")", ITEM, 30633 }; + { ORNG..AL["Key"]..": "..AL["The Eye of Haramad"].." ("..AL["Exalted"]..", "..AL["Yor "]..")", ITEM, 32092 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Pandemonius"], NPC, 18341 }; + { WHITE..INDENT..AL["Shadow Lord Xiraxis"], NPC, 19666 }; + { WHITE.."2) "..AL["Ambassador Pax'ivi"].." ("..AL["Heroic"]..")", NPC, 22928 }; + { WHITE.."3) "..AL["Tavarok"], NPC, 18343 }; + { WHITE.."4) "..AL["Cryo-Engineer Sha'heen"], NPC, 19671 }; + { WHITE..INDENT..AL["Ethereal Transporter Control Panel"], OBJECT, 183877 }; + { WHITE.."5) "..AL["Nexus-Prince Shaffar"], NPC, 18344 }; + { WHITE..INDENT..AL["Yor "].." ("..AL["Summon"]..", "..AL["Heroic"]..")", NPC, 22930 }; }; ["AuchSethekkHalls"] = { ZoneName = {BabbleZone["Sethekk Halls"], 3791 }; @@ -1272,16 +1272,16 @@ AtlasLoot_MapData = { LevelRange = "66-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["Seth"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Lower City"], FACTION, 1011 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Auchenai Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30633 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Essence-Infused Moonstone"].." ("..AtlasLocale["Anzu"]..")", ITEM, 32449 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Darkweaver Syth"], NPC, 18472 }; - { WHITE..INDENT..AtlasLocale["Lakka"], NPC, 18956 }; - { WHITE.."2) "..AtlasLocale["The Saga of Terokk"], OBJECT, 183050 }; - { WHITE..INDENT..AtlasLocale["Anzu"].." ("..AtlasLocale["Summon"]..", "..AtlasLocale["Heroic"]..")", NPC, 23035 }; - { WHITE.."3) "..AtlasLocale["Talon King Ikiss"], NPC, 18473 }; + Acronym = AL["Seth"]; + { ORNG..AL["Reputation"]..": "..AL["Lower City"], FACTION, 1011 }; + { ORNG..AL["Key"]..": "..AL["Auchenai Key"].." ("..AL["Heroic"]..")", ITEM, 30633 }; + { ORNG..AL["Key"]..": "..AL["Essence-Infused Moonstone"].." ("..AL["Anzu"]..")", ITEM, 32449 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Darkweaver Syth"], NPC, 18472 }; + { WHITE..INDENT..AL["Lakka"], NPC, 18956 }; + { WHITE.."2) "..AL["The Saga of Terokk"], OBJECT, 183050 }; + { WHITE..INDENT..AL["Anzu"].." ("..AL["Summon"]..", "..AL["Heroic"]..")", NPC, 23035 }; + { WHITE.."3) "..AL["Talon King Ikiss"], NPC, 18473 }; }; ["AuchShadowLabyrinth"] = { ZoneName = { BabbleZone["Shadow Labyrinth"], 3789 }; @@ -1289,74 +1289,74 @@ AtlasLoot_MapData = { LevelRange = "69-70"; MinLevel = "65"; PlayerLimit = "5"; - Acronym = AtlasLocale["SL"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Lower City"], FACTION, 1011 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Shadow Labyrinth Key"], ITEM, 27991 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Auchenai Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30633 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Spy To'gun"], NPC, 18891 }; - { WHITE.."2) "..AtlasLocale["Ambassador Hellmaw"], NPC, 18731 }; - { WHITE.."3) "..AtlasLocale["Blackheart the Inciter"], NPC, 18667 }; - { WHITE.."4) "..AtlasLocale["Grandmaster Vorpil"], NPC, 18732 }; - { WHITE..INDENT..AtlasLocale["The Codex of Blood"], OBJECT, 182947 }; - { WHITE.."5) "..AtlasLocale["Murmur"], NPC, 18708 }; - { WHITE.."6) "..AtlasLocale["Arcane Container"], OBJECT, 182196 }; - { WHITE..INDENT..AtlasLocale["First Fragment Guardian"], NPC, 22890 }; + Acronym = AL["SL"]; + { ORNG..AL["Reputation"]..": "..AL["Lower City"], FACTION, 1011 }; + { ORNG..AL["Key"]..": "..AL["Shadow Labyrinth Key"], ITEM, 27991 }; + { ORNG..AL["Key"]..": "..AL["Auchenai Key"].." ("..AL["Heroic"]..")", ITEM, 30633 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Spy To'gun"], NPC, 18891 }; + { WHITE.."2) "..AL["Ambassador Hellmaw"], NPC, 18731 }; + { WHITE.."3) "..AL["Blackheart the Inciter"], NPC, 18667 }; + { WHITE.."4) "..AL["Grandmaster Vorpil"], NPC, 18732 }; + { WHITE..INDENT..AL["The Codex of Blood"], OBJECT, 182947 }; + { WHITE.."5) "..AL["Murmur"], NPC, 18708 }; + { WHITE.."6) "..AL["Arcane Container"], OBJECT, 182196 }; + { WHITE..INDENT..AL["First Fragment Guardian"], NPC, 22890 }; }; ["BlackTempleStart"] = { - ZoneName = { BabbleZone["Black Temple"].." [A] ("..AtlasLocale["Start"]..")", 3959 }; + ZoneName = { BabbleZone["Black Temple"].." [A] ("..AL["Start"]..")", 3959 }; Location = { BabbleZone["Shadowmoon Valley"], 3520 }; LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["BT"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Ashtongue Deathsworn"], FACTION, 1012 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Towards Reliquary of Souls"] }; - { BLUE.."C) "..AtlasLocale["Towards Teron Gorefiend"] }; - { BLUE.."D) "..AtlasLocale["Towards Illidan Stormrage"] }; - { WHITE.."1) "..AtlasLocale["Spirit of Olum"], NPC, 23411 }; - { WHITE.."2) "..AtlasLocale["High Warlord Naj'entus"], NPC, 22887 }; - { WHITE.."3) "..AtlasLocale["Supremus"], NPC, 22898 }; - { WHITE.."4) "..AtlasLocale["Shade of Akama"], NPC, 22841 }; - { WHITE.."5) "..AtlasLocale["Spirit of Udalo"], NPC, 23410 }; - { WHITE..INDENT..AtlasLocale["Aluyen "], NPC, 23157 }; - { WHITE..INDENT..AtlasLocale["Okuno "], NPC, 23159 }; - { WHITE..INDENT..AtlasLocale["Seer Kanai"], NPC, 23158 }; + Acronym = AL["BT"]; + { ORNG..AL["Reputation"]..": "..AL["Ashtongue Deathsworn"], FACTION, 1012 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Towards Reliquary of Souls"] }; + { BLUE.."C) "..AL["Towards Teron Gorefiend"] }; + { BLUE.."D) "..AL["Towards Illidan Stormrage"] }; + { WHITE.."1) "..AL["Spirit of Olum"], NPC, 23411 }; + { WHITE.."2) "..AL["High Warlord Naj'entus"], NPC, 22887 }; + { WHITE.."3) "..AL["Supremus"], NPC, 22898 }; + { WHITE.."4) "..AL["Shade of Akama"], NPC, 22841 }; + { WHITE.."5) "..AL["Spirit of Udalo"], NPC, 23410 }; + { WHITE..INDENT..AL["Aluyen "], NPC, 23157 }; + { WHITE..INDENT..AL["Okuno "], NPC, 23159 }; + { WHITE..INDENT..AL["Seer Kanai"], NPC, 23158 }; }; ["BlackTempleBasement"] = { - ZoneName = { BabbleZone["Black Temple"].." [B] ("..AtlasLocale["Basement"]..")", 3959 }; + ZoneName = { BabbleZone["Black Temple"].." [B] ("..AL["Basement"]..")", 3959 }; Location = { BabbleZone["Shadowmoon Valley"], 3520 }; LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["BT"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Ashtongue Deathsworn"], FACTION, 1012 }; - { BLUE.."B) "..AtlasLocale["Entrance"] }; - { BLUE.."C) "..AtlasLocale["Entrance"] }; - { WHITE.."6) "..AtlasLocale["Gurtogg Bloodboil"], NPC, 22948 }; - { WHITE.."7) "..AtlasLocale["Reliquary of Souls"] }; - { WHITE..INDENT..AtlasLocale["Essence of Suffering"], NPC, 23418 }; - { WHITE..INDENT..AtlasLocale["Essence of Desire"], NPC, 23419 }; - { WHITE..INDENT..AtlasLocale["Essence of Anger"], NPC, 23420 }; - { WHITE.."8) "..AtlasLocale["Teron Gorefiend"], NPC, 22871 }; + Acronym = AL["BT"]; + { ORNG..AL["Reputation"]..": "..AL["Ashtongue Deathsworn"], FACTION, 1012 }; + { BLUE.."B) "..AL["Entrance"] }; + { BLUE.."C) "..AL["Entrance"] }; + { WHITE.."6) "..AL["Gurtogg Bloodboil"], NPC, 22948 }; + { WHITE.."7) "..AL["Reliquary of Souls"] }; + { WHITE..INDENT..AL["Essence of Suffering"], NPC, 23418 }; + { WHITE..INDENT..AL["Essence of Desire"], NPC, 23419 }; + { WHITE..INDENT..AL["Essence of Anger"], NPC, 23420 }; + { WHITE.."8) "..AL["Teron Gorefiend"], NPC, 22871 }; }; ["BlackTempleTop"] = { - ZoneName = { BabbleZone["Black Temple"].." [C] ("..AtlasLocale["Top"]..")", 3959 }; + ZoneName = { BabbleZone["Black Temple"].." [C] ("..AL["Top"]..")", 3959 }; Location = { BabbleZone["Shadowmoon Valley"], 3520 }; LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["BT"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Ashtongue Deathsworn"], FACTION, 1012 }; - { BLUE.."D) "..AtlasLocale["Entrance"] }; - { WHITE.."9) "..AtlasLocale["Mother Shahraz"], NPC, 22947 }; - { WHITE.."10) "..AtlasLocale["The Illidari Council"], NPC, 23426 }; - { WHITE..INDENT..AtlasLocale["Lady Malande"].." ("..AtlasLocale["Priest"]..")", NPC, 22951 }; - { WHITE..INDENT..AtlasLocale["Gathios the Shatterer"].." ("..AtlasLocale["Paladin"]..")", NPC, 22949 }; - { WHITE..INDENT..AtlasLocale["High Nethermancer Zerevor"].." ("..AtlasLocale["Mage"]..")", NPC, 22950 }; - { WHITE..INDENT..AtlasLocale["Veras Darkshadow"].." ("..AtlasLocale["Rogue"]..")", NPC, 22952 }; - { WHITE.."11) "..AtlasLocale["Illidan Stormrage "], NPC, 22917 }; + Acronym = AL["BT"]; + { ORNG..AL["Reputation"]..": "..AL["Ashtongue Deathsworn"], FACTION, 1012 }; + { BLUE.."D) "..AL["Entrance"] }; + { WHITE.."9) "..AL["Mother Shahraz"], NPC, 22947 }; + { WHITE.."10) "..AL["The Illidari Council"], NPC, 23426 }; + { WHITE..INDENT..AL["Lady Malande"].." ("..AL["Priest"]..")", NPC, 22951 }; + { WHITE..INDENT..AL["Gathios the Shatterer"].." ("..AL["Paladin"]..")", NPC, 22949 }; + { WHITE..INDENT..AL["High Nethermancer Zerevor"].." ("..AL["Mage"]..")", NPC, 22950 }; + { WHITE..INDENT..AL["Veras Darkshadow"].." ("..AL["Rogue"]..")", NPC, 22952 }; + { WHITE.."11) "..AL["Illidan Stormrage "], NPC, 22917 }; }; ["CFRSerpentshrineCavern"] = { ZoneName = { BabbleZone["Serpentshrine Cavern"], 3607 }; @@ -1364,16 +1364,16 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["SC"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Cenarion Expedition"], FACTION, 942 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Hydross the Unstable "], NPC, 21216 }; - { WHITE.."2) "..AtlasLocale["The Lurker Below"], NPC, 21217 }; - { WHITE.."3) "..AtlasLocale["Leotheras the Blind"], NPC, 21215 }; - { WHITE.."4) "..AtlasLocale["Fathom-Lord Karathress"], NPC, 21214 }; - { WHITE..INDENT..AtlasLocale["Seer Olum"], NPC, 22820 }; - { WHITE.."5) "..AtlasLocale["Morogrim Tidewalker"], NPC, 21213 }; - { WHITE.."6) "..AtlasLocale["Lady Vashj "], NPC, 21212 }; + Acronym = AL["SC"]; + { ORNG..AL["Reputation"]..": "..AL["Cenarion Expedition"], FACTION, 942 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Hydross the Unstable "], NPC, 21216 }; + { WHITE.."2) "..AL["The Lurker Below"], NPC, 21217 }; + { WHITE.."3) "..AL["Leotheras the Blind"], NPC, 21215 }; + { WHITE.."4) "..AL["Fathom-Lord Karathress"], NPC, 21214 }; + { WHITE..INDENT..AL["Seer Olum"], NPC, 22820 }; + { WHITE.."5) "..AL["Morogrim Tidewalker"], NPC, 21213 }; + { WHITE.."6) "..AL["Lady Vashj "], NPC, 21212 }; }; ["CFRTheSlavePens"] = { ZoneName = { BabbleZone["The Slave Pens"], 3717 }; @@ -1381,17 +1381,17 @@ AtlasLoot_MapData = { LevelRange = "61-69"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["SP"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Cenarion Expedition"], FACTION, 942 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Reservoir Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30623 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Ahune "].." ("..AtlasLocale["Midsummer Festival"]..")", NPC, 25740 }; - { WHITE.."2) "..AtlasLocale["Mennu the Betrayer"], NPC, 17941 }; - { WHITE.."3) "..AtlasLocale["Weeder Greenthumb"], NPC, 17890 }; - { WHITE.."4) "..AtlasLocale["Skar'this the Heretic"].." ("..AtlasLocale["Heroic"]..")", NPC, 22421 }; - { WHITE.."5) "..AtlasLocale["Rokmar the Crackler"], NPC, 17991 }; - { WHITE.."6) "..AtlasLocale["Naturalist Bite"], NPC, 17893 }; - { WHITE.."7) "..AtlasLocale["Quagmirran"], NPC, 17942 }; + Acronym = AL["SP"]; + { ORNG..AL["Reputation"]..": "..AL["Cenarion Expedition"], FACTION, 942 }; + { ORNG..AL["Key"]..": "..AL["Reservoir Key"].." ("..AL["Heroic"]..")", ITEM, 30623 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Ahune "].." ("..AL["Midsummer Festival"]..")", NPC, 25740 }; + { WHITE.."2) "..AL["Mennu the Betrayer"], NPC, 17941 }; + { WHITE.."3) "..AL["Weeder Greenthumb"], NPC, 17890 }; + { WHITE.."4) "..AL["Skar'this the Heretic"].." ("..AL["Heroic"]..")", NPC, 22421 }; + { WHITE.."5) "..AL["Rokmar the Crackler"], NPC, 17991 }; + { WHITE.."6) "..AL["Naturalist Bite"], NPC, 17893 }; + { WHITE.."7) "..AL["Quagmirran"], NPC, 17942 }; }; ["CFRTheSteamvault"] = { ZoneName = { BabbleZone["The Steamvault"], 3715 }; @@ -1399,17 +1399,17 @@ AtlasLoot_MapData = { LevelRange = "69-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["SV"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Cenarion Expedition"], FACTION, 942 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Reservoir Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30623 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Hydromancer Thespia"], NPC, 17797 }; - { WHITE..INDENT..AtlasLocale["Main Chambers Access Panel"] }; - { WHITE.."2) "..AtlasLocale["Arcane Container"], OBJECT, 182196 }; - { WHITE..INDENT..AtlasLocale["Second Fragment Guardian"], NPC, 22891 }; - { WHITE.."3) "..AtlasLocale["Mekgineer Steamrigger"], NPC, 17796 }; - { WHITE..INDENT..AtlasLocale["Main Chambers Access Panel"] }; - { WHITE.."4) "..AtlasLocale["Warlord Kalithresh"], NPC, 17798 }; + Acronym = AL["SV"]; + { ORNG..AL["Reputation"]..": "..AL["Cenarion Expedition"], FACTION, 942 }; + { ORNG..AL["Key"]..": "..AL["Reservoir Key"].." ("..AL["Heroic"]..")", ITEM, 30623 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Hydromancer Thespia"], NPC, 17797 }; + { WHITE..INDENT..AL["Main Chambers Access Panel"] }; + { WHITE.."2) "..AL["Arcane Container"], OBJECT, 182196 }; + { WHITE..INDENT..AL["Second Fragment Guardian"], NPC, 22891 }; + { WHITE.."3) "..AL["Mekgineer Steamrigger"], NPC, 17796 }; + { WHITE..INDENT..AL["Main Chambers Access Panel"] }; + { WHITE.."4) "..AL["Warlord Kalithresh"], NPC, 17798 }; }; ["CFRTheUnderbog"] = { ZoneName = { BabbleZone["The Underbog"], 3716 }; @@ -1417,17 +1417,17 @@ AtlasLoot_MapData = { LevelRange = "62-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["UB"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Cenarion Expedition"], FACTION, 942 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Reservoir Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30623 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Hungarfen"], NPC, 17770 }; - { WHITE..INDENT..AtlasLocale["The Underspore"], OBJECT, 182054 }; - { WHITE.."2) "..AtlasLocale["Ghaz'an"], NPC, 18105 }; - { WHITE.."3) "..AtlasLocale["Earthbinder Rayge"], NPC, 17885 }; - { WHITE.."4) "..AtlasLocale["Swamplord Musel'ek"], NPC, 17826 }; - { WHITE..INDENT..AtlasLocale["Claw "], NPC, 17827 }; - { WHITE.."5) "..AtlasLocale["The Black Stalker"], NPC, 17882 }; + Acronym = AL["UB"]; + { ORNG..AL["Reputation"]..": "..AL["Cenarion Expedition"], FACTION, 942 }; + { ORNG..AL["Key"]..": "..AL["Reservoir Key"].." ("..AL["Heroic"]..")", ITEM, 30623 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Hungarfen"], NPC, 17770 }; + { WHITE..INDENT..AL["The Underspore"], OBJECT, 182054 }; + { WHITE.."2) "..AL["Ghaz'an"], NPC, 18105 }; + { WHITE.."3) "..AL["Earthbinder Rayge"], NPC, 17885 }; + { WHITE.."4) "..AL["Swamplord Musel'ek"], NPC, 17826 }; + { WHITE..INDENT..AL["Claw "], NPC, 17827 }; + { WHITE.."5) "..AL["The Black Stalker"], NPC, 17882 }; }; ["CoTBlackMorass"] = { ZoneName = { BabbleZone["The Black Morass"], 2366 }; @@ -1435,19 +1435,19 @@ AtlasLoot_MapData = { LevelRange = "68-70"; MinLevel = "66"; PlayerLimit = "5"; - Acronym = AtlasLocale["CoT2"]; - { PURP..AtlasLocale["Event"]..": "..AtlasLocale["Opening of the Dark Portal"] }; - { ORNG..AtlasLocale["Attunement Required"] }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Keepers of Time"], FACTION, 989 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Key of Time"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30635 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Sa'at "], NPC, 20201 }; - { ORNG.."X) "..AtlasLocale["Portal"].." ("..AtlasLocale["Spawn Point"]..")" }; - { ORNG..INDENT..AtlasLocale["Wave 6"]..": "..AtlasLocale["Chrono Lord Deja"], NPC, 17879 }; - { ORNG..INDENT..AtlasLocale["Wave 12"]..": "..AtlasLocale["Temporus"], NPC, 17880 }; - { ORNG..INDENT..AtlasLocale["Wave 18"]..": "..AtlasLocale["Aeonus"], NPC, 17881 }; - { WHITE.."1) "..AtlasLocale["The Dark Portal"] }; - { WHITE..INDENT..AtlasLocale["Medivh"], NPC, 15608 }; + Acronym = AL["CoT2"]; + { PURP..AL["Event"]..": "..AL["Opening of the Dark Portal"] }; + { ORNG..AL["Attunement Required"] }; + { ORNG..AL["Reputation"]..": "..AL["Keepers of Time"], FACTION, 989 }; + { ORNG..AL["Key"]..": "..AL["Key of Time"].." ("..AL["Heroic"]..")", ITEM, 30635 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Sa'at "], NPC, 20201 }; + { ORNG.."X) "..AL["Portal"].." ("..AL["Spawn Point"]..")" }; + { ORNG..INDENT..AL["Wave 6"]..": "..AL["Chrono Lord Deja"], NPC, 17879 }; + { ORNG..INDENT..AL["Wave 12"]..": "..AL["Temporus"], NPC, 17880 }; + { ORNG..INDENT..AL["Wave 18"]..": "..AL["Aeonus"], NPC, 17881 }; + { WHITE.."1) "..AL["The Dark Portal"] }; + { WHITE..INDENT..AL["Medivh"], NPC, 15608 }; }; ["CoTHyjal"] = { ZoneName = { BabbleZone["Hyjal Summit"], 3606 }; @@ -1455,22 +1455,22 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["CoT3"]; - { PURP..AtlasLocale["Event"]..": "..AtlasLocale["Battle for Mount Hyjal"] }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Scale of the Sands"], FACTION, 990 }; - { BLUE.."A) "..AtlasLocale["Alliance Base"] }; - { BLUE..INDENT..AtlasLocale["Lady Jaina Proudmoore"], NPC, 17772 }; - { BLUE.."B) "..AtlasLocale["Horde Encampment"] }; - { BLUE..INDENT..AtlasLocale["Thrall "], NPC, 17852 }; - { BLUE.."C) "..AtlasLocale["Night Elf Village"] }; - { BLUE..INDENT..AtlasLocale["Tyrande Whisperwind "], NPC, 7999 }; - { WHITE.."1) "..AtlasLocale["Rage Winterchill"], NPC, 17767 }; - { WHITE.."2) "..AtlasLocale["Anetheron"], NPC, 17808 }; - { WHITE.."3) "..AtlasLocale["Kaz'rogal"], NPC, 17888 }; - { WHITE.."4) "..AtlasLocale["Azgalor"], NPC, 17842 }; - { WHITE.."5) "..AtlasLocale["Archimonde"], NPC, 17968 }; - { WHITE.."?) "..AtlasLocale["Indormi "], NPC, 23437 }; - { WHITE..INDENT..AtlasLocale["Tydormu "], NPC, 23381 }; + Acronym = AL["CoT3"]; + { PURP..AL["Event"]..": "..AL["Battle for Mount Hyjal"] }; + { ORNG..AL["Reputation"]..": "..AL["The Scale of the Sands"], FACTION, 990 }; + { BLUE.."A) "..AL["Alliance Base"] }; + { BLUE..INDENT..AL["Lady Jaina Proudmoore"], NPC, 17772 }; + { BLUE.."B) "..AL["Horde Encampment"] }; + { BLUE..INDENT..AL["Thrall "], NPC, 17852 }; + { BLUE.."C) "..AL["Night Elf Village"] }; + { BLUE..INDENT..AL["Tyrande Whisperwind "], NPC, 7999 }; + { WHITE.."1) "..AL["Rage Winterchill"], NPC, 17767 }; + { WHITE.."2) "..AL["Anetheron"], NPC, 17808 }; + { WHITE.."3) "..AL["Kaz'rogal"], NPC, 17888 }; + { WHITE.."4) "..AL["Azgalor"], NPC, 17842 }; + { WHITE.."5) "..AL["Archimonde"], NPC, 17968 }; + { WHITE.."?) "..AL["Indormi "], NPC, 23437 }; + { WHITE..INDENT..AL["Tydormu "], NPC, 23381 }; }; ["CoTOldHillsbrad"] = { ZoneName = { BabbleZone["Old Hillsbrad Foothills"], 2367 }; @@ -1478,74 +1478,74 @@ AtlasLoot_MapData = { LevelRange = "66-70"; MinLevel = "66"; PlayerLimit = "5"; - Acronym = AtlasLocale["CoT1"]; - { PURP..AtlasLocale["Event"]..": "..AtlasLocale["Escape from Durnholde Keep"] }; - { ORNG..AtlasLocale["Attunement Required"] }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Keepers of Time"], FACTION, 989 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Key of Time"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30635 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Erozion"], NPC, 18723 }; - { BLUE..INDENT..AtlasLocale["Brazen"], NPC, 18725 }; - { BLUE.."B) "..AtlasLocale["Landing Spot"] }; + Acronym = AL["CoT1"]; + { PURP..AL["Event"]..": "..AL["Escape from Durnholde Keep"] }; + { ORNG..AL["Attunement Required"] }; + { ORNG..AL["Reputation"]..": "..AL["Keepers of Time"], FACTION, 989 }; + { ORNG..AL["Key"]..": "..AL["Key of Time"].." ("..AL["Heroic"]..")", ITEM, 30635 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Erozion"], NPC, 18723 }; + { BLUE..INDENT..AL["Brazen"], NPC, 18725 }; + { BLUE.."B) "..AL["Landing Spot"] }; { BLUE.."C) "..BabbleSubZone["Southshore"] }; { BLUE.."D) "..BabbleSubZone["Tarren Mill"] }; - { WHITE.."1) "..AtlasLocale["Lieutenant Drake"], NPC, 17848 }; - { WHITE.."2) "..AtlasLocale["Thrall"].." ("..AtlasLocale["Lower"]..")", NPC, 17876 }; - { WHITE.."3) "..AtlasLocale["Captain Skarloc"], NPC, 17862 }; - { WHITE..INDENT..AtlasLocale["Thrall"].." ("..AtlasLocale["Second Stop"]..")", NPC, 17876 }; - { WHITE.."4) "..AtlasLocale["Thrall"].." ("..AtlasLocale["Third Stop"]..")", NPC, 17876 }; - { WHITE.."5) "..AtlasLocale["Epoch Hunter"], NPC, 18096 }; - { WHITE..INDENT..AtlasLocale["Thrall"].." ("..AtlasLocale["Fourth Stop"]..", "..AtlasLocale["Upper"]..")", NPC, 17876 }; - { WHITE..INDENT..AtlasLocale["Taretha"].." ("..AtlasLocale["Upper"]..")", NPC, 18887 }; - { WHITE.."6) "..AtlasLocale["Jonathan Revah"], NPC, 20372 }; - { WHITE..INDENT..AtlasLocale["Jerry Carter"], NPC, 20376 }; + { WHITE.."1) "..AL["Lieutenant Drake"], NPC, 17848 }; + { WHITE.."2) "..AL["Thrall"].." ("..AL["Lower"]..")", NPC, 17876 }; + { WHITE.."3) "..AL["Captain Skarloc"], NPC, 17862 }; + { WHITE..INDENT..AL["Thrall"].." ("..AL["Second Stop"]..")", NPC, 17876 }; + { WHITE.."4) "..AL["Thrall"].." ("..AL["Third Stop"]..")", NPC, 17876 }; + { WHITE.."5) "..AL["Epoch Hunter"], NPC, 18096 }; + { WHITE..INDENT..AL["Thrall"].." ("..AL["Fourth Stop"]..", "..AL["Upper"]..")", NPC, 17876 }; + { WHITE..INDENT..AL["Taretha"].." ("..AL["Upper"]..")", NPC, 18887 }; + { WHITE.."6) "..AL["Jonathan Revah"], NPC, 20372 }; + { WHITE..INDENT..AL["Jerry Carter"], NPC, 20376 }; { "" }; - { ORNG..AtlasLocale["Traveling"] }; - { WHITE..INDENT..AtlasLocale["Thomas Yance "], NPC, 18672 }; - { WHITE..INDENT..AtlasLocale["Aged Dalaran Wizard"], NPC, 18664 }; - { WHITE..INDENT..AtlasLocale["Don Carlos"], NPC, 28132 }; - { WHITE..INDENT..AtlasLocale["Guerrero"], NPC, 28163 }; + { ORNG..AL["Traveling"] }; + { WHITE..INDENT..AL["Thomas Yance "], NPC, 18672 }; + { WHITE..INDENT..AL["Aged Dalaran Wizard"], NPC, 18664 }; + { WHITE..INDENT..AL["Don Carlos"], NPC, 28132 }; + { WHITE..INDENT..AL["Guerrero"], NPC, 28163 }; { "" }; { ORNG..BabbleSubZone["Southshore"] }; - { WHITE..INDENT..AtlasLocale["Kel'Thuzad "], NPC, 20350 }; - { WHITE..INDENT..AtlasLocale["Helcular"], NPC, 20353 }; - { WHITE..INDENT..AtlasLocale["Farmer Kent"], NPC, 20368 }; - { WHITE..INDENT..AtlasLocale["Sally Whitemane"], NPC, 20357 }; - { WHITE..INDENT..AtlasLocale["Renault Mograine"], NPC, 20358 }; - { WHITE..INDENT..AtlasLocale["Little Jimmy Vishas"], NPC, 20359 }; - { WHITE..INDENT..AtlasLocale["Herod the Bully"], NPC, 20360 }; - { WHITE..INDENT..AtlasLocale["Nat Pagle"], NPC, 20344 }; - { WHITE..INDENT..AtlasLocale["Hal McAllister"], NPC, 20342 }; - { WHITE..INDENT..AtlasLocale["Zixil "], NPC, 20419 }; - { WHITE..INDENT..AtlasLocale["Overwatch Mark 0 "], NPC, 20420 }; + { WHITE..INDENT..AL["Kel'Thuzad "], NPC, 20350 }; + { WHITE..INDENT..AL["Helcular"], NPC, 20353 }; + { WHITE..INDENT..AL["Farmer Kent"], NPC, 20368 }; + { WHITE..INDENT..AL["Sally Whitemane"], NPC, 20357 }; + { WHITE..INDENT..AL["Renault Mograine"], NPC, 20358 }; + { WHITE..INDENT..AL["Little Jimmy Vishas"], NPC, 20359 }; + { WHITE..INDENT..AL["Herod the Bully"], NPC, 20360 }; + { WHITE..INDENT..AL["Nat Pagle"], NPC, 20344 }; + { WHITE..INDENT..AL["Hal McAllister"], NPC, 20342 }; + { WHITE..INDENT..AL["Zixil "], NPC, 20419 }; + { WHITE..INDENT..AL["Overwatch Mark 0 "], NPC, 20420 }; { "" }; - { ORNG..AtlasLocale["Southshore Inn"] }; - { WHITE..INDENT..AtlasLocale["Captain Edward Hanes"], NPC, 20400 }; - { WHITE..INDENT..AtlasLocale["Captain Sanders"], NPC, 20351 }; - { WHITE..INDENT..AtlasLocale["Commander Mograine"], NPC, 20345 }; - { WHITE..INDENT..AtlasLocale["Isillien"], NPC, 20346 }; - { WHITE..INDENT..AtlasLocale["Abbendis"], NPC, 20347 }; - { WHITE..INDENT..AtlasLocale["Fairbanks"], NPC, 20348 }; - { WHITE..INDENT..AtlasLocale["Tirion Fordring"], NPC, 20349 }; - { WHITE..INDENT..AtlasLocale["Arcanist Doan"], NPC, 20352 }; - { WHITE..INDENT..AtlasLocale["Taelan"].." ("..AtlasLocale["Upper"]..")", NPC, 20361 }; - { WHITE..INDENT..AtlasLocale["Barkeep Kelly "], NPC, 20377 }; - { WHITE..INDENT..AtlasLocale["Frances Lin "], NPC, 20401 }; - { WHITE..INDENT..AtlasLocale["Chef Jessen "], NPC, 20378 }; - { WHITE..INDENT..AtlasLocale["Stalvan Mistmantle"].." ("..AtlasLocale["Upper"]..")", NPC, 20355 }; - { WHITE..INDENT..AtlasLocale["Phin Odelic "].." ("..AtlasLocale["Upper"]..")", NPC, 20370 }; + { ORNG..AL["Southshore Inn"] }; + { WHITE..INDENT..AL["Captain Edward Hanes"], NPC, 20400 }; + { WHITE..INDENT..AL["Captain Sanders"], NPC, 20351 }; + { WHITE..INDENT..AL["Commander Mograine"], NPC, 20345 }; + { WHITE..INDENT..AL["Isillien"], NPC, 20346 }; + { WHITE..INDENT..AL["Abbendis"], NPC, 20347 }; + { WHITE..INDENT..AL["Fairbanks"], NPC, 20348 }; + { WHITE..INDENT..AL["Tirion Fordring"], NPC, 20349 }; + { WHITE..INDENT..AL["Arcanist Doan"], NPC, 20352 }; + { WHITE..INDENT..AL["Taelan"].." ("..AL["Upper"]..")", NPC, 20361 }; + { WHITE..INDENT..AL["Barkeep Kelly "], NPC, 20377 }; + { WHITE..INDENT..AL["Frances Lin "], NPC, 20401 }; + { WHITE..INDENT..AL["Chef Jessen "], NPC, 20378 }; + { WHITE..INDENT..AL["Stalvan Mistmantle"].." ("..AL["Upper"]..")", NPC, 20355 }; + { WHITE..INDENT..AL["Phin Odelic "].." ("..AL["Upper"]..")", NPC, 20370 }; { "" }; { ORNG..BabbleSubZone["Southshore Town Hall"] }; - { WHITE..INDENT..AtlasLocale["Magistrate Henry Maleb"], NPC, 20373 }; - { WHITE..INDENT..AtlasLocale["Raleigh the True"], NPC, 20380 }; - { WHITE..INDENT..AtlasLocale["Nathanos Marris"], NPC, 20354 }; - { WHITE..INDENT..AtlasLocale["Bilger the Straight-laced"], NPC, 20379 }; + { WHITE..INDENT..AL["Magistrate Henry Maleb"], NPC, 20373 }; + { WHITE..INDENT..AL["Raleigh the True"], NPC, 20380 }; + { WHITE..INDENT..AL["Nathanos Marris"], NPC, 20354 }; + { WHITE..INDENT..AL["Bilger the Straight-laced"], NPC, 20379 }; { "" }; { ORNG..BabbleSubZone["Tarren Mill"] }; - { WHITE..INDENT..AtlasLocale["Innkeeper Monica"], NPC, 18649 }; - { WHITE..INDENT..AtlasLocale["Julie Honeywell"], NPC, 18656 }; - { WHITE..INDENT..AtlasLocale["Jay Lemieux"], NPC, 18655 }; - { WHITE..INDENT..AtlasLocale["Young Blanchy"], NPC, 18651 }; + { WHITE..INDENT..AL["Innkeeper Monica"], NPC, 18649 }; + { WHITE..INDENT..AL["Julie Honeywell"], NPC, 18656 }; + { WHITE..INDENT..AL["Jay Lemieux"], NPC, 18655 }; + { WHITE..INDENT..AL["Young Blanchy"], NPC, 18651 }; }; ["GruulsLair"] = { ZoneName = { BabbleZone["Gruul's Lair"], 3618 }; @@ -1553,14 +1553,14 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "65"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["GL"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["High King Maulgar "], NPC, 18831 }; - { WHITE..INDENT..AtlasLocale["Kiggler the Crazed"].." ("..AtlasLocale["Shaman"]..")", NPC, 18835 }; - { WHITE..INDENT..AtlasLocale["Blindeye the Seer"].." ("..AtlasLocale["Priest"]..")", NPC, 18836 }; - { WHITE..INDENT..AtlasLocale["Olm the Summoner"].." ("..AtlasLocale["Warlock"]..")", NPC, 18834 }; - { WHITE..INDENT..AtlasLocale["Krosh Firehand"].." ("..AtlasLocale["Mage"]..")", NPC, 18832 }; - { WHITE.."2) "..AtlasLocale["Gruul the Dragonkiller"], NPC, 19044 }; + Acronym = AL["GL"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["High King Maulgar "], NPC, 18831 }; + { WHITE..INDENT..AL["Kiggler the Crazed"].." ("..AL["Shaman"]..")", NPC, 18835 }; + { WHITE..INDENT..AL["Blindeye the Seer"].." ("..AL["Priest"]..")", NPC, 18836 }; + { WHITE..INDENT..AL["Olm the Summoner"].." ("..AL["Warlock"]..")", NPC, 18834 }; + { WHITE..INDENT..AL["Krosh Firehand"].." ("..AL["Mage"]..")", NPC, 18832 }; + { WHITE.."2) "..AL["Gruul the Dragonkiller"], NPC, 19044 }; }; ["HCBloodFurnace"] = { ZoneName = { BabbleZone["The Blood Furnace"], 3713 }; @@ -1568,14 +1568,14 @@ AtlasLoot_MapData = { LevelRange = "60-68"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["BF"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Thrallmar"].." ("..AtlasLocale["Horde"]..")", FACTION, 947 }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Honor Hold"].." ("..AtlasLocale["Alliance"]..")", FACTION, 946 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Flamewrought Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30637 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["The Maker"], NPC, 17381 }; - { WHITE.."2) "..AtlasLocale["Broggok"], NPC, 17380 }; - { WHITE.."3) "..AtlasLocale["Keli'dan the Breaker"], NPC, 17377 }; + Acronym = AL["BF"]; + { ORNG..AL["Reputation"]..": "..AL["Thrallmar"].." ("..AL["Horde"]..")", FACTION, 947 }; + { ORNG..AL["Reputation"]..": "..AL["Honor Hold"].." ("..AL["Alliance"]..")", FACTION, 946 }; + { ORNG..AL["Key"]..": "..AL["Flamewrought Key"].." ("..AL["Heroic"]..")", ITEM, 30637 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["The Maker"], NPC, 17381 }; + { WHITE.."2) "..AL["Broggok"], NPC, 17380 }; + { WHITE.."3) "..AL["Keli'dan the Breaker"], NPC, 17377 }; }; ["HCHellfireRamparts"] = { ZoneName = { BabbleZone["Hellfire Ramparts"], 3562 }; @@ -1583,16 +1583,16 @@ AtlasLoot_MapData = { LevelRange = "59-67"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["Ramp"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Thrallmar"].." ("..AtlasLocale["Horde"]..")", FACTION, 947 }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Honor Hold"].." ("..AtlasLocale["Alliance"]..")", FACTION, 946 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Flamewrought Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30637 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Watchkeeper Gargolmar"], NPC, 17306 }; - { WHITE.."2) "..AtlasLocale["Omor the Unscarred"], NPC, 17308 }; - { WHITE.."3) "..AtlasLocale["Vazruden"], NPC, 17537 }; - { WHITE..INDENT..AtlasLocale["Nazan "], NPC, 17536 }; - { WHITE..INDENT..AtlasLocale["Reinforced Fel Iron Chest"], OBJECT, 185168 }; + Acronym = AL["Ramp"]; + { ORNG..AL["Reputation"]..": "..AL["Thrallmar"].." ("..AL["Horde"]..")", FACTION, 947 }; + { ORNG..AL["Reputation"]..": "..AL["Honor Hold"].." ("..AL["Alliance"]..")", FACTION, 946 }; + { ORNG..AL["Key"]..": "..AL["Flamewrought Key"].." ("..AL["Heroic"]..")", ITEM, 30637 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Watchkeeper Gargolmar"], NPC, 17306 }; + { WHITE.."2) "..AL["Omor the Unscarred"], NPC, 17308 }; + { WHITE.."3) "..AL["Vazruden"], NPC, 17537 }; + { WHITE..INDENT..AL["Nazan "], NPC, 17536 }; + { WHITE..INDENT..AL["Reinforced Fel Iron Chest"], OBJECT, 185168 }; }; ["HCMagtheridonsLair"] = { ZoneName = { BabbleZone["Magtheridon's Lair"], 3836 }; @@ -1600,9 +1600,9 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "65"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["Mag"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Magtheridon"], NPC, 17257 }; + Acronym = AL["Mag"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Magtheridon"], NPC, 17257 }; }; ["HCTheShatteredHalls"] = { ZoneName = { BabbleZone["The Shattered Halls"], 3714 }; @@ -1610,112 +1610,112 @@ AtlasLoot_MapData = { LevelRange = "69-70"; MinLevel = "55"; PlayerLimit = "5"; - Acronym = AtlasLocale["SH"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Thrallmar"].." ("..AtlasLocale["Horde"]..")", FACTION, 947 }; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Honor Hold"].." ("..AtlasLocale["Alliance"]..")", FACTION, 946 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Shattered Halls Key"], ITEM, 28395 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Flamewrought Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30637 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Randy Whizzlesprocket"].." ("..AtlasLocale["Alliance"]..", "..AtlasLocale["Heroic"]..")", NPC, 17288 }; - { WHITE..INDENT..AtlasLocale["Drisella"].." ("..AtlasLocale["Horde"]..", "..AtlasLocale["Heroic"]..")", NPC, 17294 }; - { WHITE.."2) "..AtlasLocale["Grand Warlock Nethekurse"], NPC, 16807 }; - { WHITE.."3) "..AtlasLocale["Blood Guard Porung"].." ("..AtlasLocale["Heroic"]..")", NPC, 20923 }; - { WHITE.."4) "..AtlasLocale["Warbringer O'mrogg"], NPC, 16809 }; - { WHITE.."5) "..AtlasLocale["Warchief Kargath Bladefist"], NPC, 16808 }; - { WHITE..INDENT..AtlasLocale["Shattered Hand Executioner"].." ("..AtlasLocale["Heroic"]..")", NPC, 17301 }; - { WHITE..INDENT..AtlasLocale["Private Jacint"].." ("..AtlasLocale["Alliance"]..", "..AtlasLocale["Heroic"]..")", NPC, 17292 }; - { WHITE..INDENT..AtlasLocale["Rifleman Brownbeard"].." ("..AtlasLocale["Alliance"]..", "..AtlasLocale["Heroic"]..")", NPC, 17289 }; - { WHITE..INDENT..AtlasLocale["Captain Alina"].." ("..AtlasLocale["Alliance"]..", "..AtlasLocale["Heroic"]..")", NPC, 17290 }; - { WHITE..INDENT..AtlasLocale["Scout Orgarr"].." ("..AtlasLocale["Horde"]..", "..AtlasLocale["Heroic"]..")", NPC, 17297 }; - { WHITE..INDENT..AtlasLocale["Korag Proudmane"].." ("..AtlasLocale["Horde"]..", "..AtlasLocale["Heroic"]..")", NPC, 17295 }; - { WHITE..INDENT..AtlasLocale["Captain Boneshatter"].." ("..AtlasLocale["Horde"]..", "..AtlasLocale["Heroic"]..")", NPC, 17296 }; + Acronym = AL["SH"]; + { ORNG..AL["Reputation"]..": "..AL["Thrallmar"].." ("..AL["Horde"]..")", FACTION, 947 }; + { ORNG..AL["Reputation"]..": "..AL["Honor Hold"].." ("..AL["Alliance"]..")", FACTION, 946 }; + { ORNG..AL["Key"]..": "..AL["Shattered Halls Key"], ITEM, 28395 }; + { ORNG..AL["Key"]..": "..AL["Flamewrought Key"].." ("..AL["Heroic"]..")", ITEM, 30637 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Randy Whizzlesprocket"].." ("..AL["Alliance"]..", "..AL["Heroic"]..")", NPC, 17288 }; + { WHITE..INDENT..AL["Drisella"].." ("..AL["Horde"]..", "..AL["Heroic"]..")", NPC, 17294 }; + { WHITE.."2) "..AL["Grand Warlock Nethekurse"], NPC, 16807 }; + { WHITE.."3) "..AL["Blood Guard Porung"].." ("..AL["Heroic"]..")", NPC, 20923 }; + { WHITE.."4) "..AL["Warbringer O'mrogg"], NPC, 16809 }; + { WHITE.."5) "..AL["Warchief Kargath Bladefist"], NPC, 16808 }; + { WHITE..INDENT..AL["Shattered Hand Executioner"].." ("..AL["Heroic"]..")", NPC, 17301 }; + { WHITE..INDENT..AL["Private Jacint"].." ("..AL["Alliance"]..", "..AL["Heroic"]..")", NPC, 17292 }; + { WHITE..INDENT..AL["Rifleman Brownbeard"].." ("..AL["Alliance"]..", "..AL["Heroic"]..")", NPC, 17289 }; + { WHITE..INDENT..AL["Captain Alina"].." ("..AL["Alliance"]..", "..AL["Heroic"]..")", NPC, 17290 }; + { WHITE..INDENT..AL["Scout Orgarr"].." ("..AL["Horde"]..", "..AL["Heroic"]..")", NPC, 17297 }; + { WHITE..INDENT..AL["Korag Proudmane"].." ("..AL["Horde"]..", "..AL["Heroic"]..")", NPC, 17295 }; + { WHITE..INDENT..AL["Captain Boneshatter"].." ("..AL["Horde"]..", "..AL["Heroic"]..")", NPC, 17296 }; }; ["KarazhanStart"] = { - ZoneName = { BabbleZone["Karazhan"].." [A] ("..AtlasLocale["Start"]..")", 2562 }; + ZoneName = { BabbleZone["Karazhan"].." [A] ("..AL["Start"]..")", 2562 }; Location = { BabbleZone["Deadwind Pass"], 41 }; LevelRange = "70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["Kara"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Violet Eye"], FACTION, 967 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Master's Key"], ITEM, 24490 }; - { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Front"]..")" }; - { BLUE.."B) "..AtlasLocale["Staircase to the Ballroom"].." ("..AtlasLocale["Moroes "]..")" }; - { BLUE.."C) "..AtlasLocale["Stairs to Upper Stable"] }; - { BLUE.."D) "..AtlasLocale["Ramp to the Guest Chambers"].." ("..AtlasLocale["Maiden of Virtue"]..")" }; - { BLUE.."E) "..AtlasLocale["Stairs to Opera House Orchestra Level"] }; - { BLUE.."F) "..AtlasLocale["Ramp from Mezzanine to Balcony"] }; - { BLUE.."G) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Back"]..")" }; - { BLUE.."H) "..AtlasLocale["Connection to Master's Terrace"].." ("..AtlasLocale["Nightbane"]..")" }; - { BLUE.."I) "..AtlasLocale["Path to the Broken Stairs"] }; - { WHITE.."1) "..AtlasLocale["Hastings "], NPC, 16169 }; - { WHITE.."2) "..AtlasLocale["Servant Quarters"] }; - { WHITE..INDENT..AtlasLocale["Hyakiss the Lurker"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Random"]..")", NPC, 16179 }; - { WHITE..INDENT..AtlasLocale["Rokad the Ravager"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Random"]..")", NPC, 16181 }; - { WHITE..INDENT..AtlasLocale["Shadikith the Glider"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Random"]..")", NPC, 16180 }; - { WHITE.."3) "..AtlasLocale["Berthold "], NPC, 16153 }; - { WHITE.."4) "..AtlasLocale["Calliard "], NPC, 16159 }; - { WHITE.."5) "..AtlasLocale["Attumen the Huntsman"], NPC, 15550 }; - { WHITE..INDENT..AtlasLocale["Midnight"], NPC, 16151 }; - { WHITE.."6) "..AtlasLocale["Koren "], NPC, 16388 }; - { WHITE.."7) "..AtlasLocale["Moroes "], NPC, 15687 }; - { WHITE..INDENT..AtlasLocale["Baroness Dorothea Millstipe"].." ("..AtlasLocale["Random"]..", "..AtlasLocale["Shadow Priest"]..")", NPC, 19875 }; - { WHITE..INDENT..AtlasLocale["Lady Catriona Von'Indi"].." ("..AtlasLocale["Random"]..", "..AtlasLocale["Holy Priest"]..")", NPC, 19872 }; - { WHITE..INDENT..AtlasLocale["Lady Keira Berrybuck"].." ("..AtlasLocale["Random"]..", "..AtlasLocale["Holy Paladin"]..")", NPC, 17007 }; - { WHITE..INDENT..AtlasLocale["Baron Rafe Dreuger"].." ("..AtlasLocale["Random"]..", "..AtlasLocale["Retribution Paladin"]..")", NPC, 19874 }; - { WHITE..INDENT..AtlasLocale["Lord Robin Daris"].." ("..AtlasLocale["Random"]..", "..AtlasLocale["Arms Warrior"]..")", NPC, 19876 }; - { WHITE..INDENT..AtlasLocale["Lord Crispin Ference"].." ("..AtlasLocale["Random"]..", "..AtlasLocale["Protection Warrior"]..")", NPC, 19873 }; - { WHITE.."8) "..AtlasLocale["Bennett "], NPC, 16426 }; - { WHITE.."9) "..AtlasLocale["Ebonlocke "], NPC, 16806 }; - { WHITE.."10) "..AtlasLocale["Keanna's Log"], OBJECT, 182199 }; - { WHITE.."11) "..AtlasLocale["Maiden of Virtue"], NPC, 16457 }; - { WHITE.."12) "..AtlasLocale["Sebastian "], NPC, 16811 }; - { WHITE.."13) "..AtlasLocale["Barnes "], NPC, 16812 }; - { WHITE.."14) "..AtlasLocale["The Opera Event"] }; - { WHITE..INDENT..AtlasLocale["Red Riding Hood"].." ("..AtlasLocale["Random"]..")" }; - { WHITE..INDENT..INDENT..AtlasLocale["The Big Bad Wolf"], NPC, 17521 }; - { WHITE..INDENT..AtlasLocale["Wizard of Oz"].." ("..AtlasLocale["Random"]..")" }; - { WHITE..INDENT..INDENT..AtlasLocale["Dorothee"], NPC, 17535 }; - { WHITE..INDENT..INDENT..AtlasLocale["Tito"], NPC, 17548 }; - { WHITE..INDENT..INDENT..AtlasLocale["Strawman"], NPC, 17543 }; - { WHITE..INDENT..INDENT..AtlasLocale["Tinhead"], NPC, 17547 }; - { WHITE..INDENT..INDENT..AtlasLocale["Roar"], NPC, 17546 }; - { WHITE..INDENT..INDENT..AtlasLocale["The Crone"], NPC, 18168 }; - { WHITE..INDENT..AtlasLocale["Romulo and Julianne"].." ("..AtlasLocale["Random"]..")" }; - { WHITE..INDENT..INDENT..AtlasLocale["Romulo"], NPC, 17533 }; - { WHITE..INDENT..INDENT..AtlasLocale["Julianne"], NPC, 17534 }; - { WHITE.."15) "..AtlasLocale["The Master's Terrace"] }; - { WHITE..INDENT..AtlasLocale["Nightbane"].." ("..AtlasLocale["Summon"]..")", NPC, 17225 }; + Acronym = AL["Kara"]; + { ORNG..AL["Reputation"]..": "..AL["The Violet Eye"], FACTION, 967 }; + { ORNG..AL["Key"]..": "..AL["The Master's Key"], ITEM, 24490 }; + { BLUE.."A) "..AL["Entrance"].." ("..AL["Front"]..")" }; + { BLUE.."B) "..AL["Staircase to the Ballroom"].." ("..AL["Moroes "]..")" }; + { BLUE.."C) "..AL["Stairs to Upper Stable"] }; + { BLUE.."D) "..AL["Ramp to the Guest Chambers"].." ("..AL["Maiden of Virtue"]..")" }; + { BLUE.."E) "..AL["Stairs to Opera House Orchestra Level"] }; + { BLUE.."F) "..AL["Ramp from Mezzanine to Balcony"] }; + { BLUE.."G) "..AL["Entrance"].." ("..AL["Back"]..")" }; + { BLUE.."H) "..AL["Connection to Master's Terrace"].." ("..AL["Nightbane"]..")" }; + { BLUE.."I) "..AL["Path to the Broken Stairs"] }; + { WHITE.."1) "..AL["Hastings "], NPC, 16169 }; + { WHITE.."2) "..AL["Servant Quarters"] }; + { WHITE..INDENT..AL["Hyakiss the Lurker"].." ("..AL["Rare"]..", "..AL["Random"]..")", NPC, 16179 }; + { WHITE..INDENT..AL["Rokad the Ravager"].." ("..AL["Rare"]..", "..AL["Random"]..")", NPC, 16181 }; + { WHITE..INDENT..AL["Shadikith the Glider"].." ("..AL["Rare"]..", "..AL["Random"]..")", NPC, 16180 }; + { WHITE.."3) "..AL["Berthold "], NPC, 16153 }; + { WHITE.."4) "..AL["Calliard "], NPC, 16159 }; + { WHITE.."5) "..AL["Attumen the Huntsman"], NPC, 15550 }; + { WHITE..INDENT..AL["Midnight"], NPC, 16151 }; + { WHITE.."6) "..AL["Koren "], NPC, 16388 }; + { WHITE.."7) "..AL["Moroes "], NPC, 15687 }; + { WHITE..INDENT..AL["Baroness Dorothea Millstipe"].." ("..AL["Random"]..", "..AL["Shadow Priest"]..")", NPC, 19875 }; + { WHITE..INDENT..AL["Lady Catriona Von'Indi"].." ("..AL["Random"]..", "..AL["Holy Priest"]..")", NPC, 19872 }; + { WHITE..INDENT..AL["Lady Keira Berrybuck"].." ("..AL["Random"]..", "..AL["Holy Paladin"]..")", NPC, 17007 }; + { WHITE..INDENT..AL["Baron Rafe Dreuger"].." ("..AL["Random"]..", "..AL["Retribution Paladin"]..")", NPC, 19874 }; + { WHITE..INDENT..AL["Lord Robin Daris"].." ("..AL["Random"]..", "..AL["Arms Warrior"]..")", NPC, 19876 }; + { WHITE..INDENT..AL["Lord Crispin Ference"].." ("..AL["Random"]..", "..AL["Protection Warrior"]..")", NPC, 19873 }; + { WHITE.."8) "..AL["Bennett "], NPC, 16426 }; + { WHITE.."9) "..AL["Ebonlocke "], NPC, 16806 }; + { WHITE.."10) "..AL["Keanna's Log"], OBJECT, 182199 }; + { WHITE.."11) "..AL["Maiden of Virtue"], NPC, 16457 }; + { WHITE.."12) "..AL["Sebastian "], NPC, 16811 }; + { WHITE.."13) "..AL["Barnes "], NPC, 16812 }; + { WHITE.."14) "..AL["The Opera Event"] }; + { WHITE..INDENT..AL["Red Riding Hood"].." ("..AL["Random"]..")" }; + { WHITE..INDENT..INDENT..AL["The Big Bad Wolf"], NPC, 17521 }; + { WHITE..INDENT..AL["Wizard of Oz"].." ("..AL["Random"]..")" }; + { WHITE..INDENT..INDENT..AL["Dorothee"], NPC, 17535 }; + { WHITE..INDENT..INDENT..AL["Tito"], NPC, 17548 }; + { WHITE..INDENT..INDENT..AL["Strawman"], NPC, 17543 }; + { WHITE..INDENT..INDENT..AL["Tinhead"], NPC, 17547 }; + { WHITE..INDENT..INDENT..AL["Roar"], NPC, 17546 }; + { WHITE..INDENT..INDENT..AL["The Crone"], NPC, 18168 }; + { WHITE..INDENT..AL["Romulo and Julianne"].." ("..AL["Random"]..")" }; + { WHITE..INDENT..INDENT..AL["Romulo"], NPC, 17533 }; + { WHITE..INDENT..INDENT..AL["Julianne"], NPC, 17534 }; + { WHITE.."15) "..AL["The Master's Terrace"] }; + { WHITE..INDENT..AL["Nightbane"].." ("..AL["Summon"]..")", NPC, 17225 }; }; ["KarazhanEnd"] = { - ZoneName = { BabbleZone["Karazhan"].." [B] ("..AtlasLocale["End"]..")", 2562 }; + ZoneName = { BabbleZone["Karazhan"].." [B] ("..AL["End"]..")", 2562 }; Location = { BabbleZone["Deadwind Pass"], 41 }; LevelRange = "70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["Kara"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Violet Eye"], FACTION, 967 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Master's Key"], ITEM, 24490 }; - { BLUE.."I) "..AtlasLocale["Path to the Broken Stairs"] }; - { BLUE.."J) "..AtlasLocale["Broken Stairs"] }; - { BLUE.."K) "..AtlasLocale["Ramp to Guardian's Library"].." ("..AtlasLocale["Shade of Aran"]..")" }; - { BLUE.."L) "..AtlasLocale["Suspicious Bookshelf"].." ("..AtlasLocale["Terestian Illhoof"]..")" }; - { BLUE.."M) "..AtlasLocale["Ramp up to the Celestial Watch"].." ("..AtlasLocale["Netherspite"]..")" }; - { BLUE..INDENT..AtlasLocale["Ramp down to the Gamesman's Hall"].." ("..AtlasLocale["Chess Event"]..")" }; - { BLUE.."N) "..AtlasLocale["Ramp to Medivh's Chamber"] }; - { BLUE.."O) "..AtlasLocale["Spiral Stairs to Netherspace"].." ("..AtlasLocale["Prince Malchezaar"]..")" }; - { WHITE.."16) "..AtlasLocale["The Curator"], NPC, 15691 }; - { WHITE.."17) "..AtlasLocale["Wravien "], NPC, 16813 }; - { WHITE.."18) "..AtlasLocale["Gradav "], NPC, 16814 }; - { WHITE.."19) "..AtlasLocale["Kamsis "], NPC, 16815 }; - { WHITE.."20) "..AtlasLocale["Terestian Illhoof"], NPC, 15688 }; - { WHITE..INDENT..AtlasLocale["Kil'rek"].." ("..AtlasLocale["Imp"]..")", NPC, 17229 }; - { WHITE.."21) "..AtlasLocale["Shade of Aran"], NPC, 16524 }; - { WHITE.."22) "..AtlasLocale["Netherspite"], NPC, 15689 }; - { WHITE.."23) "..AtlasLocale["Ythyar"].." ("..AtlasLocale["Repair"]..", "..AtlasLocale["Rewards"]..")", NPC, 17518 }; - { WHITE.."24) "..AtlasLocale["Echo of Medivh"], NPC, 16816 }; - { WHITE.."25) "..AtlasLocale["Dust Covered Chest"].." ("..AtlasLocale["Chess Event"]..")", OBJECT, 185119 }; - { WHITE.."26) "..AtlasLocale["Prince Malchezaar"], NPC, 15690 }; + Acronym = AL["Kara"]; + { ORNG..AL["Reputation"]..": "..AL["The Violet Eye"], FACTION, 967 }; + { ORNG..AL["Key"]..": "..AL["The Master's Key"], ITEM, 24490 }; + { BLUE.."I) "..AL["Path to the Broken Stairs"] }; + { BLUE.."J) "..AL["Broken Stairs"] }; + { BLUE.."K) "..AL["Ramp to Guardian's Library"].." ("..AL["Shade of Aran"]..")" }; + { BLUE.."L) "..AL["Suspicious Bookshelf"].." ("..AL["Terestian Illhoof"]..")" }; + { BLUE.."M) "..AL["Ramp up to the Celestial Watch"].." ("..AL["Netherspite"]..")" }; + { BLUE..INDENT..AL["Ramp down to the Gamesman's Hall"].." ("..AL["Chess Event"]..")" }; + { BLUE.."N) "..AL["Ramp to Medivh's Chamber"] }; + { BLUE.."O) "..AL["Spiral Stairs to Netherspace"].." ("..AL["Prince Malchezaar"]..")" }; + { WHITE.."16) "..AL["The Curator"], NPC, 15691 }; + { WHITE.."17) "..AL["Wravien "], NPC, 16813 }; + { WHITE.."18) "..AL["Gradav "], NPC, 16814 }; + { WHITE.."19) "..AL["Kamsis "], NPC, 16815 }; + { WHITE.."20) "..AL["Terestian Illhoof"], NPC, 15688 }; + { WHITE..INDENT..AL["Kil'rek"].." ("..AL["Imp"]..")", NPC, 17229 }; + { WHITE.."21) "..AL["Shade of Aran"], NPC, 16524 }; + { WHITE.."22) "..AL["Netherspite"], NPC, 15689 }; + { WHITE.."23) "..AL["Ythyar"].." ("..AL["Repair"]..", "..AL["Rewards"]..")", NPC, 17518 }; + { WHITE.."24) "..AL["Echo of Medivh"], NPC, 16816 }; + { WHITE.."25) "..AL["Dust Covered Chest"].." ("..AL["Chess Event"]..")", OBJECT, 185119 }; + { WHITE.."26) "..AL["Prince Malchezaar"], NPC, 15690 }; }; ["MagistersTerrace"] = { ZoneName = { BabbleZone["Magisters' Terrace"], 4095 }; @@ -1723,27 +1723,27 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["MaT"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Shattered Sun Offensive"], FACTION, 1077 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Selin Fireheart"], NPC, 24723 }; - { WHITE..INDENT..AtlasLocale["Fel Crystals"], NPC, 24722 }; - { WHITE.."2) "..AtlasLocale["Tyrith"], NPC, 24822 }; - { WHITE.."3) "..AtlasLocale["Vexallus"], NPC, 24744 }; - { WHITE.."4) "..AtlasLocale["Scrying Orb"] }; - { WHITE..INDENT..AtlasLocale["Kalecgos"], NPC, 24850 }; - { WHITE.."5) "..AtlasLocale["Priestess Delrissa"].." ("..AtlasLocale["Lower"]..")", NPC, 24560 }; - { WHITE..INDENT..AtlasLocale["Apoko"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Shaman"]..")", NPC, 24553 }; - { WHITE..INDENT..AtlasLocale["Eramas Brightblaze"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Monk"]..")", NPC, 24554 }; - { WHITE..INDENT..AtlasLocale["Ellrys Duskhallow"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Warlock"]..")", NPC, 24558 }; - { WHITE..INDENT..INDENT..AtlasLocale["Fizzle"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..")", NPC, 24656 }; - { WHITE..INDENT..AtlasLocale["Garaxxas"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Hunter"]..")", NPC, 24555 }; - { WHITE..INDENT..INDENT..AtlasLocale["Sliver "].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..")", NPC, 24552 }; - { WHITE..INDENT..AtlasLocale["Kagani Nightstrike"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Rogue"]..")", NPC, 24557 }; - { WHITE..INDENT..AtlasLocale["Warlord Salaris"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Warrior"]..")", NPC, 24559 }; - { WHITE..INDENT..AtlasLocale["Yazzai"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Mage"]..")", NPC, 24561 }; - { WHITE..INDENT..AtlasLocale["Zelfan"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..", "..AtlasLocale["Engineer"]..")", NPC, 24556 }; - { WHITE.."6) "..AtlasLocale["Kael'thas Sunstrider "], NPC, 24664 }; + Acronym = AL["MaT"]; + { ORNG..AL["Reputation"]..": "..AL["Shattered Sun Offensive"], FACTION, 1077 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Selin Fireheart"], NPC, 24723 }; + { WHITE..INDENT..AL["Fel Crystals"], NPC, 24722 }; + { WHITE.."2) "..AL["Tyrith"], NPC, 24822 }; + { WHITE.."3) "..AL["Vexallus"], NPC, 24744 }; + { WHITE.."4) "..AL["Scrying Orb"] }; + { WHITE..INDENT..AL["Kalecgos"], NPC, 24850 }; + { WHITE.."5) "..AL["Priestess Delrissa"].." ("..AL["Lower"]..")", NPC, 24560 }; + { WHITE..INDENT..AL["Apoko"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Shaman"]..")", NPC, 24553 }; + { WHITE..INDENT..AL["Eramas Brightblaze"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Monk"]..")", NPC, 24554 }; + { WHITE..INDENT..AL["Ellrys Duskhallow"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Warlock"]..")", NPC, 24558 }; + { WHITE..INDENT..INDENT..AL["Fizzle"].." ("..AL["Lower"]..", "..AL["Random"]..")", NPC, 24656 }; + { WHITE..INDENT..AL["Garaxxas"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Hunter"]..")", NPC, 24555 }; + { WHITE..INDENT..INDENT..AL["Sliver "].." ("..AL["Lower"]..", "..AL["Random"]..")", NPC, 24552 }; + { WHITE..INDENT..AL["Kagani Nightstrike"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Rogue"]..")", NPC, 24557 }; + { WHITE..INDENT..AL["Warlord Salaris"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Warrior"]..")", NPC, 24559 }; + { WHITE..INDENT..AL["Yazzai"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Mage"]..")", NPC, 24561 }; + { WHITE..INDENT..AL["Zelfan"].." ("..AL["Lower"]..", "..AL["Random"]..", "..AL["Engineer"]..")", NPC, 24556 }; + { WHITE.."6) "..AL["Kael'thas Sunstrider "], NPC, 24664 }; }; ["SunwellPlateau"] = { ZoneName = { BabbleZone["Sunwell Plateau"], 4075 }; @@ -1751,19 +1751,19 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["SuP"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Kalecgos"], NPC, 24850 }; - { WHITE..INDENT..AtlasLocale["Sathrovarr the Corruptor"], NPC, 24892 }; - { WHITE.."2) "..AtlasLocale["Madrigosa"], NPC, 24895 }; - { WHITE..INDENT..AtlasLocale["Brutallus"], NPC, 24882 }; - { WHITE..INDENT..AtlasLocale["Felmyst"], NPC, 25038 }; - { WHITE.."3) "..AtlasLocale["Eredar Twins"].." ("..AtlasLocale["Lower"]..")" }; - { WHITE..INDENT..AtlasLocale["Grand Warlock Alythess"].." ("..AtlasLocale["Lower"]..")", NPC, 25166 }; - { WHITE..INDENT..AtlasLocale["Lady Sacrolash"].." ("..AtlasLocale["Lower"]..")", NPC, 25165 }; - { WHITE..INDENT..AtlasLocale["M'uru"].." ("..AtlasLocale["Upper"]..")", NPC, 25741 }; - { WHITE..INDENT..AtlasLocale["Entropius"].." ("..AtlasLocale["Upper"]..")", NPC, 25840 }; - { WHITE.."4) "..AtlasLocale["Kil'jaeden "], NPC, 25315 }; + Acronym = AL["SuP"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Kalecgos"], NPC, 24850 }; + { WHITE..INDENT..AL["Sathrovarr the Corruptor"], NPC, 24892 }; + { WHITE.."2) "..AL["Madrigosa"], NPC, 24895 }; + { WHITE..INDENT..AL["Brutallus"], NPC, 24882 }; + { WHITE..INDENT..AL["Felmyst"], NPC, 25038 }; + { WHITE.."3) "..AL["Eredar Twins"].." ("..AL["Lower"]..")" }; + { WHITE..INDENT..AL["Grand Warlock Alythess"].." ("..AL["Lower"]..")", NPC, 25166 }; + { WHITE..INDENT..AL["Lady Sacrolash"].." ("..AL["Lower"]..")", NPC, 25165 }; + { WHITE..INDENT..AL["M'uru"].." ("..AL["Upper"]..")", NPC, 25741 }; + { WHITE..INDENT..AL["Entropius"].." ("..AL["Upper"]..")", NPC, 25840 }; + { WHITE.."4) "..AL["Kil'jaeden "], NPC, 25315 }; }; ["TempestKeepArcatraz"] = { ZoneName = {BabbleZone["The Arcatraz"], 3846 }; @@ -1771,20 +1771,20 @@ AtlasLoot_MapData = { LevelRange = "69-70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["Arca"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Sha'tar"], FACTION, 935 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Key to the Arcatraz"], ITEM, 31084 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Warpforged Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30634 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Zereketh the Unbound"], NPC, 20870 }; - { WHITE.."2) "..AtlasLocale["Arcane Container"], OBJECT, 182196 }; - { WHITE..INDENT..AtlasLocale["Third Fragment Guardian"], NPC, 22892 }; - { WHITE.."3) "..AtlasLocale["Dalliah the Doomsayer"], NPC, 20885 }; - { WHITE.."4) "..AtlasLocale["Wrath-Scryer Soccothrates"], NPC, 20886 }; - { WHITE.."5) "..AtlasLocale["Udalo"], NPC, 21962 }; - { WHITE.."6) "..AtlasLocale["Harbinger Skyriss"], NPC, 20912 }; - { WHITE..INDENT..AtlasLocale["Warden Mellichar"], NPC, 20904 }; - { WHITE..INDENT..AtlasLocale["Millhouse Manastorm"], NPC, 20977 }; + Acronym = AL["Arca"]; + { ORNG..AL["Reputation"]..": "..AL["The Sha'tar"], FACTION, 935 }; + { ORNG..AL["Key"]..": "..AL["Key to the Arcatraz"], ITEM, 31084 }; + { ORNG..AL["Key"]..": "..AL["Warpforged Key"].." ("..AL["Heroic"]..")", ITEM, 30634 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Zereketh the Unbound"], NPC, 20870 }; + { WHITE.."2) "..AL["Arcane Container"], OBJECT, 182196 }; + { WHITE..INDENT..AL["Third Fragment Guardian"], NPC, 22892 }; + { WHITE.."3) "..AL["Dalliah the Doomsayer"], NPC, 20885 }; + { WHITE.."4) "..AL["Wrath-Scryer Soccothrates"], NPC, 20886 }; + { WHITE.."5) "..AL["Udalo"], NPC, 21962 }; + { WHITE.."6) "..AL["Harbinger Skyriss"], NPC, 20912 }; + { WHITE..INDENT..AL["Warden Mellichar"], NPC, 20904 }; + { WHITE..INDENT..AL["Millhouse Manastorm"], NPC, 20977 }; }; ["TempestKeepBotanica"] = { ZoneName = { BabbleZone["The Botanica"], 3847 }; @@ -1792,16 +1792,16 @@ AtlasLoot_MapData = { LevelRange = "69-70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["Bota"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Sha'tar"], FACTION, 935 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Warpforged Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30634 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Commander Sarannis"], NPC, 17976 }; - { WHITE.."2) "..AtlasLocale["High Botanist Freywinn"], NPC, 17975 }; - { WHITE.."3) "..AtlasLocale["Thorngrin the Tender"], NPC, 17978 }; - { WHITE.."4) "..AtlasLocale["Laj"], NPC, 17980 }; - { WHITE.."5) "..AtlasLocale["Warp Splinter"], NPC, 17977 }; + Acronym = AL["Bota"]; + { ORNG..AL["Reputation"]..": "..AL["The Sha'tar"], FACTION, 935 }; + { ORNG..AL["Key"]..": "..AL["Warpforged Key"].." ("..AL["Heroic"]..")", ITEM, 30634 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Exit"] }; + { WHITE.."1) "..AL["Commander Sarannis"], NPC, 17976 }; + { WHITE.."2) "..AL["High Botanist Freywinn"], NPC, 17975 }; + { WHITE.."3) "..AL["Thorngrin the Tender"], NPC, 17978 }; + { WHITE.."4) "..AL["Laj"], NPC, 17980 }; + { WHITE.."5) "..AL["Warp Splinter"], NPC, 17977 }; }; ["TempestKeepMechanar"] = { ZoneName = { BabbleZone["The Mechanar"], 3849 }; @@ -1809,18 +1809,18 @@ AtlasLoot_MapData = { LevelRange = "68-70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["Mech"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Sha'tar"], FACTION, 935 }; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Warpforged Key"].." ("..AtlasLocale["Heroic"]..")", ITEM, 30634 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Gatewatcher Gyro-Kill"], NPC, 19218 }; - { WHITE.."2) "..AtlasLocale["Gatewatcher Iron-Hand"], NPC, 19710 }; - { WHITE..INDENT..AtlasLocale["Cache of the Legion"], OBJECT, 184465 }; - { WHITE.."3) "..AtlasLocale["Mechano-Lord Capacitus"], NPC, 19219 }; - { WHITE..INDENT..AtlasLocale["Overcharged Manacell"], OBJECT, 185015 }; - { WHITE.."4) "..AtlasLocale["Nethermancer Sepethrea"], NPC, 19221 }; - { WHITE.."5) "..AtlasLocale["Pathaleon the Calculator"], NPC, 19220 }; + Acronym = AL["Mech"]; + { ORNG..AL["Reputation"]..": "..AL["The Sha'tar"], FACTION, 935 }; + { ORNG..AL["Key"]..": "..AL["Warpforged Key"].." ("..AL["Heroic"]..")", ITEM, 30634 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Exit"] }; + { WHITE.."1) "..AL["Gatewatcher Gyro-Kill"], NPC, 19218 }; + { WHITE.."2) "..AL["Gatewatcher Iron-Hand"], NPC, 19710 }; + { WHITE..INDENT..AL["Cache of the Legion"], OBJECT, 184465 }; + { WHITE.."3) "..AL["Mechano-Lord Capacitus"], NPC, 19219 }; + { WHITE..INDENT..AL["Overcharged Manacell"], OBJECT, 185015 }; + { WHITE.."4) "..AL["Nethermancer Sepethrea"], NPC, 19221 }; + { WHITE.."5) "..AL["Pathaleon the Calculator"], NPC, 19220 }; }; ["TempestKeepTheEye"] = { ZoneName = { BabbleZone["The Eye"], 3842 }; @@ -1828,17 +1828,17 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "70"; PlayerLimit = "10-25"; - Acronym = AtlasLocale["Eye"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Sha'tar"], FACTION, 935 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Al'ar "], NPC, 19514 }; - { WHITE.."2) "..AtlasLocale["Void Reaver"], NPC, 19516 }; - { WHITE.."3) "..AtlasLocale["High Astromancer Solarian"], NPC, 18805 }; - { WHITE.."4) "..AtlasLocale["Kael'thas Sunstrider "], NPC, 19622 }; - { WHITE..INDENT..AtlasLocale["Thaladred the Darkener "].." ("..AtlasLocale["Warrior"]..")", NPC, 20064 }; - { WHITE..INDENT..AtlasLocale["Master Engineer Telonicus "].." ("..AtlasLocale["Hunter"]..")", NPC, 20063 }; - { WHITE..INDENT..AtlasLocale["Grand Astromancer Capernian "].." ("..AtlasLocale["Mage"]..")", NPC, 20062 }; - { WHITE..INDENT..AtlasLocale["Lord Sanguinar "].." ("..AtlasLocale["Paladin"]..")", NPC, 20060 }; + Acronym = AL["Eye"]; + { ORNG..AL["Reputation"]..": "..AL["The Sha'tar"], FACTION, 935 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Al'ar "], NPC, 19514 }; + { WHITE.."2) "..AL["Void Reaver"], NPC, 19516 }; + { WHITE.."3) "..AL["High Astromancer Solarian"], NPC, 18805 }; + { WHITE.."4) "..AL["Kael'thas Sunstrider "], NPC, 19622 }; + { WHITE..INDENT..AL["Thaladred the Darkener "].." ("..AL["Warrior"]..")", NPC, 20064 }; + { WHITE..INDENT..AL["Master Engineer Telonicus "].." ("..AL["Hunter"]..")", NPC, 20063 }; + { WHITE..INDENT..AL["Grand Astromancer Capernian "].." ("..AL["Mage"]..")", NPC, 20062 }; + { WHITE..INDENT..AL["Lord Sanguinar "].." ("..AL["Paladin"]..")", NPC, 20060 }; }; ["ZulAman"] = { ZoneName = { BabbleZone["Zul'Aman"], 3805 }; @@ -1846,39 +1846,39 @@ AtlasLoot_MapData = { LevelRange = "70"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["ZA"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Harrison Jones"], NPC, 24358 }; - { WHITE.."1) "..AtlasLocale["Nalorakk "], NPC, 23576 }; - { WHITE..INDENT..AtlasLocale["Tanzar"], NPC, 23790 }; - { WHITE..INDENT..AtlasLocale["The Map of Zul'Aman"], OBJECT, 186733 }; - { WHITE.."2) "..AtlasLocale["Akil'Zon "], NPC, 23574 }; - { WHITE..INDENT..AtlasLocale["Harkor"], NPC, 23999 }; - { WHITE.."3) "..AtlasLocale["Jan'Alai "], NPC, 23578 }; - { WHITE..INDENT..AtlasLocale["Kraz"], NPC, 24024 }; - { WHITE.."4) "..AtlasLocale["Halazzi "], NPC, 23577 }; - { WHITE..INDENT..AtlasLocale["Ashli"], NPC, 24001 }; - { WHITE.."5) "..AtlasLocale["Zungam"], NPC, 23897 }; - { WHITE.."6) "..AtlasLocale["Hex Lord Malacrass"], NPC, 24239 }; - { WHITE..INDENT..AtlasLocale["Thurg"].." ("..AtlasLocale["Random"]..")", NPC, 24241 }; - { WHITE..INDENT..AtlasLocale["Gazakroth"].." ("..AtlasLocale["Random"]..")", NPC, 24244 }; - { WHITE..INDENT..AtlasLocale["Lord Raadan"].." ("..AtlasLocale["Random"]..")", NPC, 24243 }; - { WHITE..INDENT..AtlasLocale["Darkheart"].." ("..AtlasLocale["Random"]..")", NPC, 24246 }; - { WHITE..INDENT..AtlasLocale["Alyson Antille"].." ("..AtlasLocale["Random"]..")", NPC, 24240 }; - { WHITE..INDENT..AtlasLocale["Slither"].." ("..AtlasLocale["Random"]..")", NPC, 24242 }; - { WHITE..INDENT..AtlasLocale["Fenstalker"].." ("..AtlasLocale["Random"]..")", NPC, 24245 }; - { WHITE..INDENT..AtlasLocale["Koragg"].." ("..AtlasLocale["Random"]..")", NPC, 24247 }; - { WHITE.."7) "..AtlasLocale["Zul'jin"], NPC, 23863 }; - { GREN.."1') "..AtlasLocale["Forest Frogs"], NPC, 24396 }; - { GREN..INDENT..AtlasLocale["Kyren "], NPC, 24409 }; - { GREN..INDENT..AtlasLocale["Gunter "], NPC, 24408 }; - { GREN..INDENT..AtlasLocale["Adarrah"], NPC, 24405 }; - { GREN..INDENT..AtlasLocale["Brennan"], NPC, 24453 }; - { GREN..INDENT..AtlasLocale["Darwen"], NPC, 24407 }; - { GREN..INDENT..AtlasLocale["Deez"], NPC, 24403 }; - { GREN..INDENT..AtlasLocale["Galathryn"], NPC, 24404 }; - { GREN..INDENT..AtlasLocale["Mitzi"], NPC, 24445 }; - { GREN..INDENT..AtlasLocale["Mannuth"], NPC, 24397 }; + Acronym = AL["ZA"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Harrison Jones"], NPC, 24358 }; + { WHITE.."1) "..AL["Nalorakk "], NPC, 23576 }; + { WHITE..INDENT..AL["Tanzar"], NPC, 23790 }; + { WHITE..INDENT..AL["The Map of Zul'Aman"], OBJECT, 186733 }; + { WHITE.."2) "..AL["Akil'Zon "], NPC, 23574 }; + { WHITE..INDENT..AL["Harkor"], NPC, 23999 }; + { WHITE.."3) "..AL["Jan'Alai "], NPC, 23578 }; + { WHITE..INDENT..AL["Kraz"], NPC, 24024 }; + { WHITE.."4) "..AL["Halazzi "], NPC, 23577 }; + { WHITE..INDENT..AL["Ashli"], NPC, 24001 }; + { WHITE.."5) "..AL["Zungam"], NPC, 23897 }; + { WHITE.."6) "..AL["Hex Lord Malacrass"], NPC, 24239 }; + { WHITE..INDENT..AL["Thurg"].." ("..AL["Random"]..")", NPC, 24241 }; + { WHITE..INDENT..AL["Gazakroth"].." ("..AL["Random"]..")", NPC, 24244 }; + { WHITE..INDENT..AL["Lord Raadan"].." ("..AL["Random"]..")", NPC, 24243 }; + { WHITE..INDENT..AL["Darkheart"].." ("..AL["Random"]..")", NPC, 24246 }; + { WHITE..INDENT..AL["Alyson Antille"].." ("..AL["Random"]..")", NPC, 24240 }; + { WHITE..INDENT..AL["Slither"].." ("..AL["Random"]..")", NPC, 24242 }; + { WHITE..INDENT..AL["Fenstalker"].." ("..AL["Random"]..")", NPC, 24245 }; + { WHITE..INDENT..AL["Koragg"].." ("..AL["Random"]..")", NPC, 24247 }; + { WHITE.."7) "..AL["Zul'jin"], NPC, 23863 }; + { GREN.."1') "..AL["Forest Frogs"], NPC, 24396 }; + { GREN..INDENT..AL["Kyren "], NPC, 24409 }; + { GREN..INDENT..AL["Gunter "], NPC, 24408 }; + { GREN..INDENT..AL["Adarrah"], NPC, 24405 }; + { GREN..INDENT..AL["Brennan"], NPC, 24453 }; + { GREN..INDENT..AL["Darwen"], NPC, 24407 }; + { GREN..INDENT..AL["Deez"], NPC, 24403 }; + { GREN..INDENT..AL["Galathryn"], NPC, 24404 }; + { GREN..INDENT..AL["Mitzi"], NPC, 24445 }; + { GREN..INDENT..AL["Mannuth"], NPC, 24397 }; }; --************************************************ @@ -1891,15 +1891,15 @@ AtlasLoot_MapData = { LevelRange = "71-78"; MinLevel = "68"; PlayerLimit = "5"; - Acronym = AtlasLocale["AK, Kahet"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Elder Nadox"], NPC, 29309 }; - { WHITE.."2) "..AtlasLocale["Prince Taldaram"], NPC, 29308 }; - { WHITE.."3) "..AtlasLocale["Amanitar"].." ("..AtlasLocale["Heroic"]..")", NPC, 30258 }; - { WHITE.."4) "..AtlasLocale["Jedoga Shadowseeker"], NPC, 29310 }; - { WHITE.."5) "..AtlasLocale["Herald Volazj"], NPC, 29311 }; - { WHITE.."6) "..AtlasLocale["Ahn'kahet Brazier"] }; + Acronym = AL["AK, Kahet"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Exit"] }; + { WHITE.."1) "..AL["Elder Nadox"], NPC, 29309 }; + { WHITE.."2) "..AL["Prince Taldaram"], NPC, 29308 }; + { WHITE.."3) "..AL["Amanitar"].." ("..AL["Heroic"]..")", NPC, 30258 }; + { WHITE.."4) "..AL["Jedoga Shadowseeker"], NPC, 29310 }; + { WHITE.."5) "..AL["Herald Volazj"], NPC, 29311 }; + { WHITE.."6) "..AL["Ahn'kahet Brazier"] }; }; ["AzjolNerub"] = { ZoneName = { BabbleZone["Azjol-Nerub"], 3477 }; @@ -1907,17 +1907,17 @@ AtlasLoot_MapData = { LevelRange = "70-77"; MinLevel = "67"; PlayerLimit = "5"; - Acronym = AtlasLocale["AN, Nerub"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Connection"] }; - { BLUE.."C) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Krik'thir the Gatewatcher"], NPC, 28684 }; - { WHITE..INDENT..AtlasLocale["Watcher Gashra"], NPC, 28730 }; - { WHITE..INDENT..AtlasLocale["Watcher Narjil"], NPC, 28729 }; - { WHITE..INDENT..AtlasLocale["Watcher Silthik"], NPC, 28731 }; - { WHITE.."2) "..AtlasLocale["Hadronox"], NPC, 28921 }; - { WHITE.."3) "..AtlasLocale["Elder Nurgen"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 30533 }; - { WHITE.."4) "..AtlasLocale["Anub'arak"], NPC, 29120 }; + Acronym = AL["AN, Nerub"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Connection"] }; + { BLUE.."C) "..AL["Exit"] }; + { WHITE.."1) "..AL["Krik'thir the Gatewatcher"], NPC, 28684 }; + { WHITE..INDENT..AL["Watcher Gashra"], NPC, 28730 }; + { WHITE..INDENT..AL["Watcher Narjil"], NPC, 28729 }; + { WHITE..INDENT..AL["Watcher Silthik"], NPC, 28731 }; + { WHITE.."2) "..AL["Hadronox"], NPC, 28921 }; + { WHITE.."3) "..AL["Elder Nurgen"].." ("..AL["Lunar Festival"]..")", NPC, 30533 }; + { WHITE.."4) "..AL["Anub'arak"], NPC, 29120 }; }; ["CoTOldStratholme"] = { ZoneName = { BabbleZone["Caverns of Time"]..": "..BabbleZone["The Culling of Stratholme"], 4100 }; @@ -1925,20 +1925,20 @@ AtlasLoot_MapData = { LevelRange = "78-80"; MinLevel = "75"; PlayerLimit = "5"; - Acronym = AtlasLocale["CoT-Strat"]; - { PURP..AtlasLocale["Event"]..": "..AtlasLocale["The Culling of Stratholme"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Exit"].." ("..AtlasLocale["Portal"]..")" }; - { ORNG.."X) "..AtlasLocale["Scourge Invasion Points"] }; - { ORNG..INDENT..AtlasLocale["Wave 5"]..": "..AtlasLocale["Meathook"], NPC, 26529 }; - { ORNG..INDENT..AtlasLocale["Wave 10"]..": "..AtlasLocale["Salramm the Fleshcrafter"], NPC, 26530 }; - { WHITE.."1) "..AtlasLocale["Chromie"], NPC, 26527 }; - { WHITE.."2) "..AtlasLocale["Chromie"], NPC, 27915 }; - { WHITE.."3) "..AtlasLocale["Chrono-Lord Epoch"], NPC, 26532 }; - { WHITE.."4) "..AtlasLocale["Infinite Corruptor"].." ("..AtlasLocale["Heroic"]..")", NPC, 32273 }; - { WHITE..INDENT..AtlasLocale["Guardian of Time"], NPC, 32281 }; - { WHITE.."5) "..AtlasLocale["Mal'Ganis"], NPC, 26533 }; - { WHITE..INDENT..AtlasLocale["Chromie"], NPC, 30997 }; + Acronym = AL["CoT-Strat"]; + { PURP..AL["Event"]..": "..AL["The Culling of Stratholme"] }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Exit"].." ("..AL["Portal"]..")" }; + { ORNG.."X) "..AL["Scourge Invasion Points"] }; + { ORNG..INDENT..AL["Wave 5"]..": "..AL["Meathook"], NPC, 26529 }; + { ORNG..INDENT..AL["Wave 10"]..": "..AL["Salramm the Fleshcrafter"], NPC, 26530 }; + { WHITE.."1) "..AL["Chromie"], NPC, 26527 }; + { WHITE.."2) "..AL["Chromie"], NPC, 27915 }; + { WHITE.."3) "..AL["Chrono-Lord Epoch"], NPC, 26532 }; + { WHITE.."4) "..AL["Infinite Corruptor"].." ("..AL["Heroic"]..")", NPC, 32273 }; + { WHITE..INDENT..AL["Guardian of Time"], NPC, 32281 }; + { WHITE.."5) "..AL["Mal'Ganis"], NPC, 26533 }; + { WHITE..INDENT..AL["Chromie"], NPC, 30997 }; }; ["DrakTharonKeep"] = { ZoneName = { BabbleZone["Drak'Tharon Keep"], 4196 }; @@ -1946,17 +1946,17 @@ AtlasLoot_MapData = { LevelRange = "72-78"; MinLevel = "69"; PlayerLimit = "5"; - Acronym = AtlasLocale["DTK"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Connection"] }; - { BLUE.."C) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Trollgore"], NPC, 26630 }; - { WHITE.."2) "..AtlasLocale["Kurzel"], NPC, 26664 }; - { WHITE.."3) "..AtlasLocale["Novos the Summoner"], NPC, 26631 }; - { WHITE.."4) "..AtlasLocale["Elder Kilias"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 30534 }; - { WHITE.."5) "..AtlasLocale["King Dred"], NPC, 27483 }; - { WHITE.."6) "..AtlasLocale["The Prophet Tharon'ja"], NPC, 26632 }; - { WHITE.."7) "..AtlasLocale["Drakuru's Brazier"] }; + Acronym = AL["DTK"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Connection"] }; + { BLUE.."C) "..AL["Connection"] }; + { WHITE.."1) "..AL["Trollgore"], NPC, 26630 }; + { WHITE.."2) "..AL["Kurzel"], NPC, 26664 }; + { WHITE.."3) "..AL["Novos the Summoner"], NPC, 26631 }; + { WHITE.."4) "..AL["Elder Kilias"].." ("..AL["Lunar Festival"]..")", NPC, 30534 }; + { WHITE.."5) "..AL["King Dred"], NPC, 27483 }; + { WHITE.."6) "..AL["The Prophet Tharon'ja"], NPC, 26632 }; + { WHITE.."7) "..AL["Drakuru's Brazier"] }; }; ["FHHallsOfReflection"] = { ZoneName = { BabbleSubZone["The Frozen Halls"]..": "..BabbleZone["Halls of Reflection"], 4820 }; @@ -1964,18 +1964,18 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "5"; - Acronym = AtlasLocale["HoR"]..", "..AtlasLocale["FH3"]; - { ORNG..AtlasLocale["Attunement Required"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Portal"].." ("..BabbleZone["Dalaran"]..")", ZONE, 4395 }; - { WHITE.."1) "..AtlasLocale["Lady Jaina Proudmoore"].." ("..AtlasLocale["Alliance"]..")", NPC, 37221 }; - { WHITE..INDENT..AtlasLocale["Archmage Koreln "].." ("..AtlasLocale["Alliance"]..")", NPC, 37582 }; - { WHITE..INDENT..AtlasLocale["Lady Sylvanas Windrunner "].." ("..AtlasLocale["Horde"]..")", NPC, 37223 }; - { WHITE..INDENT..AtlasLocale["Dark Ranger Loralen"].." ("..AtlasLocale["Horde"]..")", NPC, 37779 }; - { WHITE.."2) "..AtlasLocale["Falric"].." ("..AtlasLocale["Wave 5"]..")", NPC, 38112 }; - { WHITE.."3) "..AtlasLocale["Marwyn"].." ("..AtlasLocale["Wave 10"]..")", NPC, 38113 }; - { WHITE.."4) "..AtlasLocale["Wrath of the Lich King"].." ("..AtlasLocale["Event"]..")", NPC, 37226 }; - { WHITE..INDENT..AtlasLocale["The Captain's Chest"], OBJECT, 201710 }; + Acronym = AL["HoR"]..", "..AL["FH3"]; + { ORNG..AL["Attunement Required"] }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Portal"].." ("..BabbleZone["Dalaran"]..")", ZONE, 4395 }; + { WHITE.."1) "..AL["Lady Jaina Proudmoore"].." ("..AL["Alliance"]..")", NPC, 37221 }; + { WHITE..INDENT..AL["Archmage Koreln "].." ("..AL["Alliance"]..")", NPC, 37582 }; + { WHITE..INDENT..AL["Lady Sylvanas Windrunner "].." ("..AL["Horde"]..")", NPC, 37223 }; + { WHITE..INDENT..AL["Dark Ranger Loralen"].." ("..AL["Horde"]..")", NPC, 37779 }; + { WHITE.."2) "..AL["Falric"].." ("..AL["Wave 5"]..")", NPC, 38112 }; + { WHITE.."3) "..AL["Marwyn"].." ("..AL["Wave 10"]..")", NPC, 38113 }; + { WHITE.."4) "..AL["Wrath of the Lich King"].." ("..AL["Event"]..")", NPC, 37226 }; + { WHITE..INDENT..AL["The Captain's Chest"], OBJECT, 201710 }; }; ["FHPitOfSaron"] = { ZoneName = { BabbleSubZone["The Frozen Halls"]..": "..BabbleZone["Pit of Saron"], 4813 }; @@ -1983,22 +1983,22 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "5"; - Acronym = AtlasLocale["PoS"]..", "..AtlasLocale["FH2"]; - { ORNG..AtlasLocale["Attunement Required"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Portal"].." ("..BabbleZone["Halls of Reflection"]..")", ZONE, 4820 }; - { WHITE.."1) "..AtlasLocale["Lady Jaina Proudmoore"].." ("..AtlasLocale["Alliance"]..")", NPC, 36993 }; - { WHITE..INDENT..AtlasLocale["Archmage Koreln "].." ("..AtlasLocale["Alliance"]..")", NPC, 37582 }; - { WHITE..INDENT..AtlasLocale["Archmage Elandra "].." ("..AtlasLocale["Alliance"]..")", NPC, 37774 }; - { WHITE..INDENT..AtlasLocale["Lady Sylvanas Windrunner "].." ("..AtlasLocale["Horde"]..")", NPC, 36990 }; - { WHITE..INDENT..AtlasLocale["Dark Ranger Loralen"].." ("..AtlasLocale["Horde"]..")", NPC, 37779 }; - { WHITE..INDENT..AtlasLocale["Dark Ranger Kalira"].." ("..AtlasLocale["Horde"]..")", NPC, 37583 }; - { WHITE.."2) "..AtlasLocale["Forgemaster Garfrost"], NPC, 36494 }; - { WHITE..INDENT..AtlasLocale["Martin Victus"].." ("..AtlasLocale["Alliance"]..")", NPC, 37591 }; - { WHITE..INDENT..AtlasLocale["Gorkun Ironskull"].." ("..AtlasLocale["Horde"]..")", NPC, 37592 }; - { WHITE.."3) "..AtlasLocale["Krick and Ick"], NPC, 36477 }; - { WHITE.."4) "..AtlasLocale["Scourgelord Tyrannus"], NPC, 36658 }; - { WHITE..INDENT..AtlasLocale["Rimefang"], NPC, 36661 }; + Acronym = AL["PoS"]..", "..AL["FH2"]; + { ORNG..AL["Attunement Required"] }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Portal"].." ("..BabbleZone["Halls of Reflection"]..")", ZONE, 4820 }; + { WHITE.."1) "..AL["Lady Jaina Proudmoore"].." ("..AL["Alliance"]..")", NPC, 36993 }; + { WHITE..INDENT..AL["Archmage Koreln "].." ("..AL["Alliance"]..")", NPC, 37582 }; + { WHITE..INDENT..AL["Archmage Elandra "].." ("..AL["Alliance"]..")", NPC, 37774 }; + { WHITE..INDENT..AL["Lady Sylvanas Windrunner "].." ("..AL["Horde"]..")", NPC, 36990 }; + { WHITE..INDENT..AL["Dark Ranger Loralen"].." ("..AL["Horde"]..")", NPC, 37779 }; + { WHITE..INDENT..AL["Dark Ranger Kalira"].." ("..AL["Horde"]..")", NPC, 37583 }; + { WHITE.."2) "..AL["Forgemaster Garfrost"], NPC, 36494 }; + { WHITE..INDENT..AL["Martin Victus"].." ("..AL["Alliance"]..")", NPC, 37591 }; + { WHITE..INDENT..AL["Gorkun Ironskull"].." ("..AL["Horde"]..")", NPC, 37592 }; + { WHITE.."3) "..AL["Krick and Ick"], NPC, 36477 }; + { WHITE.."4) "..AL["Scourgelord Tyrannus"], NPC, 36658 }; + { WHITE..INDENT..AL["Rimefang"], NPC, 36661 }; }; ["FHTheForgeOfSouls"] = { ZoneName = { BabbleSubZone["The Frozen Halls"]..": "..BabbleZone["The Forge of Souls"], 4809 }; @@ -2006,17 +2006,17 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "5"; - Acronym = AtlasLocale["FoS"]..", "..AtlasLocale["FH1"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Portal"].." ("..BabbleZone["Pit of Saron"]..")", ZONE, 4813 }; - { WHITE.."1) "..AtlasLocale["Lady Jaina Proudmoore"].." ("..AtlasLocale["Alliance"]..")", NPC, 37597 }; - { WHITE..INDENT..AtlasLocale["Archmage Koreln "].." ("..AtlasLocale["Alliance"]..")", NPC, 37582 }; - { WHITE..INDENT..AtlasLocale["Archmage Elandra "].." ("..AtlasLocale["Alliance"]..")", NPC, 37774 }; - { WHITE..INDENT..AtlasLocale["Lady Sylvanas Windrunner "].." ("..AtlasLocale["Horde"]..")", NPC, 37596 }; - { WHITE..INDENT..AtlasLocale["Dark Ranger Loralen"].." ("..AtlasLocale["Horde"]..")", NPC, 37779 }; - { WHITE..INDENT..AtlasLocale["Dark Ranger Kalira"].." ("..AtlasLocale["Horde"]..")", NPC, 37583 }; - { WHITE.."2) "..AtlasLocale["Bronjahm "], NPC, 36497 }; - { WHITE.."3) "..AtlasLocale["Devourer of Souls"], NPC, 36502 }; + Acronym = AL["FoS"]..", "..AL["FH1"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Portal"].." ("..BabbleZone["Pit of Saron"]..")", ZONE, 4813 }; + { WHITE.."1) "..AL["Lady Jaina Proudmoore"].." ("..AL["Alliance"]..")", NPC, 37597 }; + { WHITE..INDENT..AL["Archmage Koreln "].." ("..AL["Alliance"]..")", NPC, 37582 }; + { WHITE..INDENT..AL["Archmage Elandra "].." ("..AL["Alliance"]..")", NPC, 37774 }; + { WHITE..INDENT..AL["Lady Sylvanas Windrunner "].." ("..AL["Horde"]..")", NPC, 37596 }; + { WHITE..INDENT..AL["Dark Ranger Loralen"].." ("..AL["Horde"]..")", NPC, 37779 }; + { WHITE..INDENT..AL["Dark Ranger Kalira"].." ("..AL["Horde"]..")", NPC, 37583 }; + { WHITE.."2) "..AL["Bronjahm "], NPC, 36497 }; + { WHITE.."3) "..AL["Devourer of Souls"], NPC, 36502 }; }; ["Gundrak"] = { ZoneName = { BabbleZone["Gundrak"], 4375 }; @@ -2024,60 +2024,60 @@ AtlasLoot_MapData = { LevelRange = "76-80"; MinLevel = "71"; PlayerLimit = "5"; - Acronym = AtlasLocale["Gun"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Exit"] }; - { WHITE.."1) "..AtlasLocale["Slad'ran "], NPC, 29304 }; - { WHITE.."2) "..AtlasLocale["Drakkari Colossus"], NPC, 29307 }; - { WHITE.."3) "..AtlasLocale["Elder Ohanzee"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 30537 }; - { WHITE.."4) "..AtlasLocale["Moorabi "], NPC, 29305 }; - { WHITE.."5) "..AtlasLocale["Eck the Ferocious"].." ("..AtlasLocale["Heroic"]..", "..AtlasLocale["Summon"]..")", NPC, 29932 }; - { WHITE.."6) "..AtlasLocale["Gal'darah "], NPC, 29306 }; + Acronym = AL["Gun"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Exit"] }; + { WHITE.."1) "..AL["Slad'ran "], NPC, 29304 }; + { WHITE.."2) "..AL["Drakkari Colossus"], NPC, 29307 }; + { WHITE.."3) "..AL["Elder Ohanzee"].." ("..AL["Lunar Festival"]..")", NPC, 30537 }; + { WHITE.."4) "..AL["Moorabi "], NPC, 29305 }; + { WHITE.."5) "..AL["Eck the Ferocious"].." ("..AL["Heroic"]..", "..AL["Summon"]..")", NPC, 29932 }; + { WHITE.."6) "..AL["Gal'darah "], NPC, 29306 }; }; ["IcecrownCitadelA"] = { - ZoneName = { BabbleZone["Icecrown Citadel"].." [A] ("..AtlasLocale["Lower"]..")", 4812 }; + ZoneName = { BabbleZone["Icecrown Citadel"].." [A] ("..AL["Lower"]..")", 4812 }; Location = { BabbleZone["Icecrown"], 210 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["IC"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Ashen Verdict"], FACTION, 1156 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Connection"] }; - { BLUE.."C) "..AtlasLocale["To next map"] }; - { WHITE.."1) "..AtlasLocale["Lord Marrowgar"], NPC, 36612 }; - { WHITE.."2) "..AtlasLocale["Lady Deathwhisper"], NPC, 36855 }; - { WHITE.."3) "..AtlasLocale["Gunship Battle"].." ("..AtlasLocale["Alliance"]..")", OBJECT, 201873 }; - { WHITE.."4) "..AtlasLocale["Gunship Battle"].." ("..AtlasLocale["Horde"]..")", OBJECT, 201873 }; - { WHITE.."5) "..AtlasLocale["Deathbringer Saurfang"], NPC, 37813 }; - { GREN.."1') "..BabbleSubZone["Light's Hammer"].." ("..AtlasLocale["Teleporter"]..")" }; - { GREN.."2') "..BabbleSubZone["Oratory of the Damned"].." ("..AtlasLocale["Teleporter"]..")" }; - { GREN.."3') "..BabbleSubZone["Rampart of Skulls"].." ("..AtlasLocale["Teleporter"]..", "..AtlasLocale["Lower"]..")" }; - { GREN..INDENT..BabbleSubZone["Deathbringer's Rise"].." ("..AtlasLocale["Teleporter"]..", "..AtlasLocale["Upper"]..")" }; + Acronym = AL["IC"]; + { ORNG..AL["Reputation"]..": "..AL["The Ashen Verdict"], FACTION, 1156 }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Connection"] }; + { BLUE.."C) "..AL["To next map"] }; + { WHITE.."1) "..AL["Lord Marrowgar"], NPC, 36612 }; + { WHITE.."2) "..AL["Lady Deathwhisper"], NPC, 36855 }; + { WHITE.."3) "..AL["Gunship Battle"].." ("..AL["Alliance"]..")", OBJECT, 201873 }; + { WHITE.."4) "..AL["Gunship Battle"].." ("..AL["Horde"]..")", OBJECT, 201873 }; + { WHITE.."5) "..AL["Deathbringer Saurfang"], NPC, 37813 }; + { GREN.."1') "..BabbleSubZone["Light's Hammer"].." ("..AL["Teleporter"]..")" }; + { GREN.."2') "..BabbleSubZone["Oratory of the Damned"].." ("..AL["Teleporter"]..")" }; + { GREN.."3') "..BabbleSubZone["Rampart of Skulls"].." ("..AL["Teleporter"]..", "..AL["Lower"]..")" }; + { GREN..INDENT..BabbleSubZone["Deathbringer's Rise"].." ("..AL["Teleporter"]..", "..AL["Upper"]..")" }; }; ["IcecrownCitadelB"] = { - ZoneName = { BabbleZone["Icecrown Citadel"].." [B] ("..AtlasLocale["Upper"]..")", 4812 }; + ZoneName = { BabbleZone["Icecrown Citadel"].." [B] ("..AL["Upper"]..")", 4812 }; Location = { BabbleZone["Icecrown"], 210 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["IC"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Ashen Verdict"], FACTION, 1156 }; - { BLUE.."C) "..AtlasLocale["From previous map"] }; - { BLUE.."D-H) "..AtlasLocale["Connection"] }; - { BLUE.."I) "..AtlasLocale["To next map"] }; - { WHITE.."6) "..AtlasLocale["Festergut"], NPC, 36626 }; - { WHITE.."7) "..AtlasLocale["Rotface"], NPC, 36627 }; - { WHITE.."8) "..AtlasLocale["Professor Putricide"], NPC, 36678 }; - { WHITE.."9) "..AtlasLocale["Blood Prince Council"] }; - { WHITE..INDENT..AtlasLocale["Prince Keleseth"], NPC, 37972 }; - { WHITE..INDENT..AtlasLocale["Prince Taldaram"], NPC, 37973 }; - { WHITE..INDENT..AtlasLocale["Prince Valanar"], NPC, 37970 }; - { WHITE.."10) "..AtlasLocale["Blood-Queen Lana'thel"], NPC, 38004 }; - { WHITE.."11) "..AtlasLocale["Valithria Dreamwalker"], NPC, 36789 }; - { WHITE.."12) "..AtlasLocale["Sindragosa "], NPC, 37755 }; - { GREN.."4') "..AtlasLocale["Upper Spire"].." ("..AtlasLocale["Teleporter"]..")" }; - { GREN.."5') "..AtlasLocale["Sindragosa's Lair"].." ("..AtlasLocale["Teleporter"]..")" }; + Acronym = AL["IC"]; + { ORNG..AL["Reputation"]..": "..AL["The Ashen Verdict"], FACTION, 1156 }; + { BLUE.."C) "..AL["From previous map"] }; + { BLUE.."D-H) "..AL["Connection"] }; + { BLUE.."I) "..AL["To next map"] }; + { WHITE.."6) "..AL["Festergut"], NPC, 36626 }; + { WHITE.."7) "..AL["Rotface"], NPC, 36627 }; + { WHITE.."8) "..AL["Professor Putricide"], NPC, 36678 }; + { WHITE.."9) "..AL["Blood Prince Council"] }; + { WHITE..INDENT..AL["Prince Keleseth"], NPC, 37972 }; + { WHITE..INDENT..AL["Prince Taldaram"], NPC, 37973 }; + { WHITE..INDENT..AL["Prince Valanar"], NPC, 37970 }; + { WHITE.."10) "..AL["Blood-Queen Lana'thel"], NPC, 38004 }; + { WHITE.."11) "..AL["Valithria Dreamwalker"], NPC, 36789 }; + { WHITE.."12) "..AL["Sindragosa "], NPC, 37755 }; + { GREN.."4') "..AL["Upper Spire"].." ("..AL["Teleporter"]..")" }; + { GREN.."5') "..AL["Sindragosa's Lair"].." ("..AL["Teleporter"]..")" }; }; ["IcecrownCitadelC"] = { ZoneName = { BabbleZone["Icecrown Citadel"].." [C] ("..BabbleSubZone["The Frozen Throne"]..")", 4812 }; @@ -2085,10 +2085,10 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["IC"]; - { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Ashen Verdict"], FACTION, 1156 }; - { BLUE.."I) "..AtlasLocale["From previous map"] }; - { WHITE.."13) "..AtlasLocale["The Lich King"], NPC, 36597 }; + Acronym = AL["IC"]; + { ORNG..AL["Reputation"]..": "..AL["The Ashen Verdict"], FACTION, 1156 }; + { BLUE.."I) "..AL["From previous map"] }; + { WHITE.."13) "..AL["The Lich King"], NPC, 36597 }; }; ["Naxxramas60"] = { ZoneName = { BabbleZone["Naxxramas"], 3456 }; @@ -2097,22 +2097,22 @@ AtlasLoot_MapData = { MinLevel = "60"; PlayerLimit = "10-25"; Acronym = "Nax60"; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE..INDENT.."1) "..AtlasLocale["Patchwerk"], NPC, 16028 }; - { WHITE..INDENT.."2) "..AtlasLocale["Grobbulus"], NPC, 15931 }; - { WHITE..INDENT.."3) "..AtlasLocale["Gluth"], NPC, 15932 }; - { WHITE..INDENT.."4) "..AtlasLocale["Thaddius"], NPC, 15928 }; - { ORNG..INDENT.."1) "..AtlasLocale["Anub'Rekhan"], NPC, 15956 }; - { ORNG..INDENT.."2) "..AtlasLocale["Grand Widow Faerlina"], NPC, 15953 }; - { ORNG..INDENT.."3) "..AtlasLocale["Maexxna"], NPC, 15952 }; - { _RED..INDENT.."1) "..AtlasLocale["Instructor Razuvious"], NPC, 16061 }; - { _RED..INDENT.."2) "..AtlasLocale["Gothik the Harvester"], NPC, 16060 }; - { _RED..INDENT.."3) "..AtlasLocale["Four Horsemen Chest"], OBJECT, 181366 }; - { PURP..INDENT.."1) "..AtlasLocale["Noth the Plaguebringer"], NPC, 15954 }; - { PURP..INDENT.."2) "..AtlasLocale["Heigan the Unclean"], NPC, 15936 }; - { PURP..INDENT.."3) "..AtlasLocale["Loatheb"], NPC, 16011 }; - { GREN..INDENT.."1) "..AtlasLocale["Sapphiron"], NPC, 15989 }; - { GREN..INDENT.."2) "..AtlasLocale["Kel'Thuzad"], NPC, 15990 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE..INDENT.."1) "..AL["Patchwerk"], NPC, 16028 }; + { WHITE..INDENT.."2) "..AL["Grobbulus"], NPC, 15931 }; + { WHITE..INDENT.."3) "..AL["Gluth"], NPC, 15932 }; + { WHITE..INDENT.."4) "..AL["Thaddius"], NPC, 15928 }; + { ORNG..INDENT.."1) "..AL["Anub'Rekhan"], NPC, 15956 }; + { ORNG..INDENT.."2) "..AL["Grand Widow Faerlina"], NPC, 15953 }; + { ORNG..INDENT.."3) "..AL["Maexxna"], NPC, 15952 }; + { _RED..INDENT.."1) "..AL["Instructor Razuvious"], NPC, 16061 }; + { _RED..INDENT.."2) "..AL["Gothik the Harvester"], NPC, 16060 }; + { _RED..INDENT.."3) "..AL["Four Horsemen Chest"], OBJECT, 181366 }; + { PURP..INDENT.."1) "..AL["Noth the Plaguebringer"], NPC, 15954 }; + { PURP..INDENT.."2) "..AL["Heigan the Unclean"], NPC, 15936 }; + { PURP..INDENT.."3) "..AL["Loatheb"], NPC, 16011 }; + { GREN..INDENT.."1) "..AL["Sapphiron"], NPC, 15989 }; + { GREN..INDENT.."2) "..AL["Kel'Thuzad"], NPC, 15990 }; }; ["Naxxramas"] = { ZoneName = { BabbleZone["Naxxramas"], 3456 }; @@ -2120,34 +2120,34 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Nax"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Mr. Bigglesworth"].." ("..AtlasLocale["Wanders"]..")", NPC, 16998 }; + Acronym = AL["Nax"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Mr. Bigglesworth"].." ("..AL["Wanders"]..")", NPC, 16998 }; { WHITE..BabbleSubZone["The Construct Quarter"] }; - { WHITE..INDENT.."1) "..AtlasLocale["Patchwerk"], NPC, 16028 }; - { WHITE..INDENT.."2) "..AtlasLocale["Grobbulus"], NPC, 15931 }; - { WHITE..INDENT.."3) "..AtlasLocale["Gluth"], NPC, 15932 }; - { WHITE..INDENT.."4) "..AtlasLocale["Thaddius"], NPC, 15928 }; + { WHITE..INDENT.."1) "..AL["Patchwerk"], NPC, 16028 }; + { WHITE..INDENT.."2) "..AL["Grobbulus"], NPC, 15931 }; + { WHITE..INDENT.."3) "..AL["Gluth"], NPC, 15932 }; + { WHITE..INDENT.."4) "..AL["Thaddius"], NPC, 15928 }; { ORNG..BabbleSubZone["The Arachnid Quarter"] }; - { ORNG..INDENT.."1) "..AtlasLocale["Anub'Rekhan"], NPC, 15956 }; - { ORNG..INDENT.."2) "..AtlasLocale["Grand Widow Faerlina"], NPC, 15953 }; - { ORNG..INDENT.."3) "..AtlasLocale["Maexxna"], NPC, 15952 }; + { ORNG..INDENT.."1) "..AL["Anub'Rekhan"], NPC, 15956 }; + { ORNG..INDENT.."2) "..AL["Grand Widow Faerlina"], NPC, 15953 }; + { ORNG..INDENT.."3) "..AL["Maexxna"], NPC, 15952 }; { _RED..BabbleSubZone["The Military Quarter"] }; - { _RED..INDENT.."1) "..AtlasLocale["Instructor Razuvious"], NPC, 16061 }; - { _RED..INDENT.."2) "..AtlasLocale["Gothik the Harvester"], NPC, 16060 }; - { _RED..INDENT.."3) "..AtlasLocale["The Four Horsemen"] }; - { _RED..INDENT..INDENT..AtlasLocale["Thane Korth'azz"], NPC, 16064 }; - { _RED..INDENT..INDENT..AtlasLocale["Lady Blaumeux"], NPC, 16065 }; - { _RED..INDENT..INDENT..AtlasLocale["Baron Rivendare"], NPC, 30549 }; - { _RED..INDENT..INDENT..AtlasLocale["Sir Zeliek"], NPC, 16063 }; - { _RED..INDENT..INDENT..AtlasLocale["Four Horsemen Chest"], OBJECT, 181366 }; + { _RED..INDENT.."1) "..AL["Instructor Razuvious"], NPC, 16061 }; + { _RED..INDENT.."2) "..AL["Gothik the Harvester"], NPC, 16060 }; + { _RED..INDENT.."3) "..AL["The Four Horsemen"] }; + { _RED..INDENT..INDENT..AL["Thane Korth'azz"], NPC, 16064 }; + { _RED..INDENT..INDENT..AL["Lady Blaumeux"], NPC, 16065 }; + { _RED..INDENT..INDENT..AL["Baron Rivendare"], NPC, 30549 }; + { _RED..INDENT..INDENT..AL["Sir Zeliek"], NPC, 16063 }; + { _RED..INDENT..INDENT..AL["Four Horsemen Chest"], OBJECT, 181366 }; { PURP..BabbleSubZone["The Plague Quarter"] }; - { PURP..INDENT.."1) "..AtlasLocale["Noth the Plaguebringer"], NPC, 15954 }; - { PURP..INDENT.."2) "..AtlasLocale["Heigan the Unclean"], NPC, 15936 }; - { PURP..INDENT.."3) "..AtlasLocale["Loatheb"], NPC, 16011 }; - { GREN..AtlasLocale["Frostwyrm Lair"] }; - { GREN..INDENT.."1) "..AtlasLocale["Sapphiron"], NPC, 15989 }; - { GREN..INDENT.."2) "..AtlasLocale["Kel'Thuzad"], NPC, 15990 }; + { PURP..INDENT.."1) "..AL["Noth the Plaguebringer"], NPC, 15954 }; + { PURP..INDENT.."2) "..AL["Heigan the Unclean"], NPC, 15936 }; + { PURP..INDENT.."3) "..AL["Loatheb"], NPC, 16011 }; + { GREN..AL["Frostwyrm Lair"] }; + { GREN..INDENT.."1) "..AL["Sapphiron"], NPC, 15989 }; + { GREN..INDENT.."2) "..AL["Kel'Thuzad"], NPC, 15990 }; }; ["ObsidianSanctum"] = { ZoneName = { BabbleSubZone["Chamber of the Aspects"]..": "..BabbleZone["The Obsidian Sanctum"], 4493 }; @@ -2155,37 +2155,37 @@ AtlasLoot_MapData = { LevelRange = "80"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["OS"]; - { ORNG..AtlasLocale["AKA"]..": "..AtlasLocale["Black Dragonflight Chamber"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Tenebron"], NPC, 30452 }; - { WHITE.."2) "..AtlasLocale["Shadron"], NPC, 30451 }; - { WHITE.."3) "..AtlasLocale["Vesperon"], NPC, 30449 }; - { WHITE.."4) "..AtlasLocale["Sartharion "], NPC, 28860 }; + Acronym = AL["OS"]; + { ORNG..AL["AKA"]..": "..AL["Black Dragonflight Chamber"] }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Tenebron"], NPC, 30452 }; + { WHITE.."2) "..AL["Shadron"], NPC, 30451 }; + { WHITE.."3) "..AL["Vesperon"], NPC, 30449 }; + { WHITE.."4) "..AL["Sartharion "], NPC, 28860 }; }; ["OnyxiasLair"] = { ZoneName = { BabbleZone["Onyxia's Lair"], 2159 }; - Acronym = AtlasLocale["Ony"]; + Acronym = AL["Ony"]; Location = { BabbleZone["Dustwallow Marsh"], 15 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Onyxian Warders"], NPC, 12129 }; - { WHITE.."2) "..AtlasLocale["Whelp Eggs"] }; - { WHITE.."3) "..AtlasLocale["Onyxia"], NPC, 10184 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Onyxian Warders"], NPC, 12129 }; + { WHITE.."2) "..AL["Whelp Eggs"] }; + { WHITE.."3) "..AL["Onyxia"], NPC, 10184 }; }; ["Onyxia60"] = { ZoneName = { BabbleZone["Onyxia's Lair"], 2159 }; - Acronym = AtlasLocale["Ony"]; + Acronym = AL["Ony"]; Location = { BabbleZone["Dustwallow Marsh"], 15 }; LevelRange = "60+"; MinLevel = "60"; PlayerLimit = "10-25"; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Onyxian Warders"], NPC, 12129 }; - { WHITE.."2) "..AtlasLocale["Whelp Eggs"] }; - { WHITE.."3) "..AtlasLocale["Onyxia"], NPC, 10184 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Onyxian Warders"], NPC, 12129 }; + { WHITE.."2) "..AL["Whelp Eggs"] }; + { WHITE.."3) "..AL["Onyxia"], NPC, 10184 }; }; ["RubySanctum"] = { ZoneName = { BabbleSubZone["Chamber of the Aspects"]..": "..BabbleZone["The Ruby Sanctum"], 4987 }; @@ -2193,13 +2193,13 @@ AtlasLoot_MapData = { LevelRange = "80"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["RS"]; - { ORNG..AtlasLocale["AKA"]..": "..AtlasLocale["Red Dragonflight Chamber"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Baltharus the Warborn"], NPC, 39751 }; - { WHITE.."2) "..AtlasLocale["Saviana Ragefire"], NPC, 39747 }; - { WHITE.."3) "..AtlasLocale["General Zarithrian"], NPC, 39746 }; - { WHITE.."4) "..AtlasLocale["Halion "], NPC, 39863 }; + Acronym = AL["RS"]; + { ORNG..AL["AKA"]..": "..AL["Red Dragonflight Chamber"] }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Baltharus the Warborn"], NPC, 39751 }; + { WHITE.."2) "..AL["Saviana Ragefire"], NPC, 39747 }; + { WHITE.."3) "..AL["General Zarithrian"], NPC, 39746 }; + { WHITE.."4) "..AL["Halion "], NPC, 39863 }; }; ["TheEyeOfEternity"] = { ZoneName = { BabbleZone["The Nexus"]..": "..BabbleZone["The Eye of Eternity"], 4500 }; @@ -2207,9 +2207,9 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["TEoE"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Key to the Focusing Iris"], ITEM, 44582 }; - { WHITE.."1) "..AtlasLocale["Malygos"], NPC, 28859 }; + Acronym = AL["TEoE"]; + { ORNG..AL["Key"]..": "..AL["Key to the Focusing Iris"], ITEM, 44582 }; + { WHITE.."1) "..AL["Malygos"], NPC, 28859 }; }; ["TheNexus"] = { ZoneName = { BabbleZone["The Nexus"]..": "..BabbleZone["The Nexus"], 4120 }; @@ -2217,16 +2217,16 @@ AtlasLoot_MapData = { LevelRange = "70-75"; MinLevel = "66"; PlayerLimit = "5"; - Acronym = AtlasLocale["Nex, Nexus"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Berinand's Research"], OBJECT, 192788 }; - { WHITE..INDENT..AtlasLocale["Commander Stoutbeard"].." ("..AtlasLocale["Horde"]..", "..AtlasLocale["Heroic"]..")", NPC, 26796 }; - { WHITE..INDENT..AtlasLocale["Commander Kolurg"].." ("..AtlasLocale["Alliance"]..", "..AtlasLocale["Heroic"]..")", NPC, 26798 }; - { WHITE.."2) "..AtlasLocale["Grand Magus Telestra"], NPC, 26731 }; - { WHITE.."3) "..AtlasLocale["Anomalus"], NPC, 26763 }; - { WHITE.."4) "..AtlasLocale["Elder Igasho"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 30536 }; - { WHITE.."5) "..AtlasLocale["Ormorok the Tree-Shaper"], NPC, 26794 }; - { WHITE.."6) "..AtlasLocale["Keristrasza"], NPC, 26723 }; + Acronym = AL["Nex, Nexus"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Berinand's Research"], OBJECT, 192788 }; + { WHITE..INDENT..AL["Commander Stoutbeard"].." ("..AL["Horde"]..", "..AL["Heroic"]..")", NPC, 26796 }; + { WHITE..INDENT..AL["Commander Kolurg"].." ("..AL["Alliance"]..", "..AL["Heroic"]..")", NPC, 26798 }; + { WHITE.."2) "..AL["Grand Magus Telestra"], NPC, 26731 }; + { WHITE.."3) "..AL["Anomalus"], NPC, 26763 }; + { WHITE.."4) "..AL["Elder Igasho"].." ("..AL["Lunar Festival"]..")", NPC, 30536 }; + { WHITE.."5) "..AL["Ormorok the Tree-Shaper"], NPC, 26794 }; + { WHITE.."6) "..AL["Keristrasza"], NPC, 26723 }; }; ["TheOculus"] = { ZoneName = { BabbleZone["The Nexus"]..": "..BabbleZone["The Oculus"], 4228 }; @@ -2234,84 +2234,84 @@ AtlasLoot_MapData = { LevelRange = "78-80"; MinLevel = "75"; PlayerLimit = "5"; - Acronym = AtlasLocale["Ocu"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Portal"] }; - { WHITE.."1) "..AtlasLocale["Drakos the Interrogator"], NPC, 27654 }; - { WHITE.."2) "..AtlasLocale["Varos Cloudstrider "], NPC, 27447 }; - { WHITE.."3) "..AtlasLocale["Mage-Lord Urom"], NPC, 27655 }; - { WHITE.."4) "..AtlasLocale["Ley-Guardian Eregos"], NPC, 27656 }; - { WHITE.."5) "..AtlasLocale["Cache of Eregos"], OBJECT, 191349}; - { GREN.."1') "..AtlasLocale["Centrifuge Construct"], NPC, 27641 }; + Acronym = AL["Ocu"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Portal"] }; + { WHITE.."1) "..AL["Drakos the Interrogator"], NPC, 27654 }; + { WHITE.."2) "..AL["Varos Cloudstrider "], NPC, 27447 }; + { WHITE.."3) "..AL["Mage-Lord Urom"], NPC, 27655 }; + { WHITE.."4) "..AL["Ley-Guardian Eregos"], NPC, 27656 }; + { WHITE.."5) "..AL["Cache of Eregos"], OBJECT, 191349}; + { GREN.."1') "..AL["Centrifuge Construct"], NPC, 27641 }; }; ["TrialOfTheChampion"] = { - ZoneName = { AtlasLocale["Crusaders' Coliseum"]..": "..BabbleZone["Trial of the Champion"], 4723 }; + ZoneName = { AL["Crusaders' Coliseum"]..": "..BabbleZone["Trial of the Champion"], 4723 }; Location = { BabbleZone["Icecrown"], 210 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "5"; - Acronym = AtlasLocale["Champ"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Grand Champions"] }; - { WHITE..INDENT..AtlasLocale["Champions of the Alliance"] }; - { WHITE..INDENT..INDENT..AtlasLocale["Marshal Jacob Alerius"], NPC, 34705 }; - { WHITE..INDENT..INDENT..AtlasLocale["Ambrose Boltspark"], NPC, 34702 }; - { WHITE..INDENT..INDENT..AtlasLocale["Colosos"], NPC, 34701 }; - { WHITE..INDENT..INDENT..AtlasLocale["Jaelyne Evensong"], NPC, 34657 }; - { WHITE..INDENT..INDENT..AtlasLocale["Lana Stouthammer"], NPC, 34703 }; - { WHITE..INDENT..AtlasLocale["Champions of the Horde"] }; - { WHITE..INDENT..INDENT..AtlasLocale["Mokra the Skullcrusher"], NPC, 35572 }; - { WHITE..INDENT..INDENT..AtlasLocale["Eressea Dawnsinger"], NPC, 35569 }; - { WHITE..INDENT..INDENT..AtlasLocale["Runok Wildmane"], NPC, 35571 }; - { WHITE..INDENT..INDENT..AtlasLocale["Zul'tore"], NPC, 35570 }; - { WHITE..INDENT..INDENT..AtlasLocale["Deathstalker Visceri"], NPC, 35617 }; - { WHITE..INDENT..AtlasLocale["Eadric the Pure "], NPC, 35119 }; - { WHITE..INDENT..AtlasLocale["Argent Confessor Paletress"], NPC, 34928 }; - { WHITE..INDENT..AtlasLocale["The Black Knight"], NPC, 35451 }; + Acronym = AL["Champ"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Grand Champions"] }; + { WHITE..INDENT..AL["Champions of the Alliance"] }; + { WHITE..INDENT..INDENT..AL["Marshal Jacob Alerius"], NPC, 34705 }; + { WHITE..INDENT..INDENT..AL["Ambrose Boltspark"], NPC, 34702 }; + { WHITE..INDENT..INDENT..AL["Colosos"], NPC, 34701 }; + { WHITE..INDENT..INDENT..AL["Jaelyne Evensong"], NPC, 34657 }; + { WHITE..INDENT..INDENT..AL["Lana Stouthammer"], NPC, 34703 }; + { WHITE..INDENT..AL["Champions of the Horde"] }; + { WHITE..INDENT..INDENT..AL["Mokra the Skullcrusher"], NPC, 35572 }; + { WHITE..INDENT..INDENT..AL["Eressea Dawnsinger"], NPC, 35569 }; + { WHITE..INDENT..INDENT..AL["Runok Wildmane"], NPC, 35571 }; + { WHITE..INDENT..INDENT..AL["Zul'tore"], NPC, 35570 }; + { WHITE..INDENT..INDENT..AL["Deathstalker Visceri"], NPC, 35617 }; + { WHITE..INDENT..AL["Eadric the Pure "], NPC, 35119 }; + { WHITE..INDENT..AL["Argent Confessor Paletress"], NPC, 34928 }; + { WHITE..INDENT..AL["The Black Knight"], NPC, 35451 }; }; ["TrialOfTheCrusader"] = { - ZoneName = { AtlasLocale["Crusaders' Coliseum"]..": "..BabbleZone["Trial of the Crusader"], 4722 }; + ZoneName = { AL["Crusaders' Coliseum"]..": "..BabbleZone["Trial of the Crusader"], 4722 }; Location = { BabbleZone["Icecrown"], 210 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Crus"]; - { ORNG..AtlasLocale["Heroic: Trial of the Grand Crusader"] }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE.."B) "..AtlasLocale["Cavern Entrance"] }; - { WHITE.."1) "..AtlasLocale["Northrend Beasts"] }; - { WHITE..INDENT..INDENT..AtlasLocale["Gormok the Impaler"], NPC, 34796 }; - { WHITE..INDENT..INDENT..AtlasLocale["Acidmaw"], NPC, 35144 }; - { WHITE..INDENT..INDENT..AtlasLocale["Dreadscale"], NPC, 34799 }; - { WHITE..INDENT..INDENT..AtlasLocale["Icehowl"], NPC, 34797 }; - { WHITE..INDENT..AtlasLocale["Lord Jaraxxus"], NPC, 34780 }; - { WHITE..INDENT..AtlasLocale["Faction Champions"] }; - { WHITE..INDENT..AtlasLocale["Twin Val'kyr"] }; - { WHITE..INDENT..INDENT..AtlasLocale["Fjola Lightbane"], NPC, 34497 }; - { WHITE..INDENT..INDENT..AtlasLocale["Eydis Darkbane"], NPC, 34496 }; - { WHITE.."2) "..AtlasLocale["Anub'arak"], NPC, 34564 }; + Acronym = AL["Crus"]; + { ORNG..AL["Heroic: Trial of the Grand Crusader"] }; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE.."B) "..AL["Cavern Entrance"] }; + { WHITE.."1) "..AL["Northrend Beasts"] }; + { WHITE..INDENT..INDENT..AL["Gormok the Impaler"], NPC, 34796 }; + { WHITE..INDENT..INDENT..AL["Acidmaw"], NPC, 35144 }; + { WHITE..INDENT..INDENT..AL["Dreadscale"], NPC, 34799 }; + { WHITE..INDENT..INDENT..AL["Icehowl"], NPC, 34797 }; + { WHITE..INDENT..AL["Lord Jaraxxus"], NPC, 34780 }; + { WHITE..INDENT..AL["Faction Champions"] }; + { WHITE..INDENT..AL["Twin Val'kyr"] }; + { WHITE..INDENT..INDENT..AL["Fjola Lightbane"], NPC, 34497 }; + { WHITE..INDENT..INDENT..AL["Eydis Darkbane"], NPC, 34496 }; + { WHITE.."2) "..AL["Anub'arak"], NPC, 34564 }; }; ["UlduarA"] = { - ZoneName = { BabbleZone["Ulduar"].." [A] ("..AtlasLocale["The Siege"]..")", 4273 }; + ZoneName = { BabbleZone["Ulduar"].." [A] ("..AL["The Siege"]..")", 4273 }; Location = { BabbleZone["The Storm Peaks"], 67 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Uldu"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; + Acronym = AL["Uldu"]; + { BLUE.."A) "..AL["Entrance"] }; { BLUE.."B) "..BabbleSubZone["The Antechamber"] }; - { ORNG.."A') "..AtlasLocale["Tower of Life"] }; - { ORNG.."B') "..AtlasLocale["Tower of Flame"] }; - { ORNG.."C') "..AtlasLocale["Tower of Frost"] }; - { ORNG.."D') "..AtlasLocale["Tower of Storms"] }; - { WHITE.."1) "..AtlasLocale["Flame Leviathan"], NPC, 33113 }; - { WHITE.."2) "..AtlasLocale["Razorscale"].." ("..AtlasLocale["Optional"]..")", NPC, 33186 }; - { WHITE.."3) "..AtlasLocale["Ignis the Furnace Master"].." ("..AtlasLocale["Optional"]..")", NPC, 33118 }; - { WHITE.."4) "..AtlasLocale["XT-002 Deconstructor"], NPC, 33293 }; - { GREN.."1') "..BabbleSubZone["Expedition Base Camp"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; - { GREN.."2') "..BabbleSubZone["Formation Grounds"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; - { GREN.."3') "..BabbleSubZone["The Colossal Forge"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; - { GREN.."4') "..BabbleSubZone["The Scrapyard"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; + { ORNG.."A') "..AL["Tower of Life"] }; + { ORNG.."B') "..AL["Tower of Flame"] }; + { ORNG.."C') "..AL["Tower of Frost"] }; + { ORNG.."D') "..AL["Tower of Storms"] }; + { WHITE.."1) "..AL["Flame Leviathan"], NPC, 33113 }; + { WHITE.."2) "..AL["Razorscale"].." ("..AL["Optional"]..")", NPC, 33186 }; + { WHITE.."3) "..AL["Ignis the Furnace Master"].." ("..AL["Optional"]..")", NPC, 33118 }; + { WHITE.."4) "..AL["XT-002 Deconstructor"], NPC, 33293 }; + { GREN.."1') "..BabbleSubZone["Expedition Base Camp"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; + { GREN.."2') "..BabbleSubZone["Formation Grounds"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; + { GREN.."3') "..BabbleSubZone["The Colossal Forge"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; + { GREN.."4') "..BabbleSubZone["The Scrapyard"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; }; ["UlduarB"] = { ZoneName = { BabbleZone["Ulduar"].." [B] ("..BabbleSubZone["The Antechamber"]..")", 4273 }; @@ -2319,36 +2319,36 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Uldu"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Celestial Planetarium Key"], ITEM, 45796 }; - { BLUE.."B) "..AtlasLocale["The Siege"] }; - { BLUE.."C) "..AtlasLocale["The Keepers"] }; - { WHITE.."5) "..AtlasLocale["Assembly of Iron"].." ("..AtlasLocale["Optional"]..")" }; - { WHITE..INDENT..AtlasLocale["Steelbreaker"], NPC, 32867 }; - { WHITE..INDENT..AtlasLocale["Runemaster Molgeim"], NPC, 32867 }; - { WHITE..INDENT..AtlasLocale["Stormcaller Brundir"], NPC, 32867 }; - { WHITE.."6) "..AtlasLocale["Prospector Doren"], NPC, 33956 }; - { WHITE..INDENT..AtlasLocale["Archivum Console"], OBJECT, 194555 }; - { WHITE.."7) "..AtlasLocale["Kologarn"], NPC, 32930 }; - { WHITE.."8) "..AtlasLocale["Algalon the Observer"].." ("..AtlasLocale["Optional"]..")" }; - { GREN.."5') "..BabbleSubZone["The Antechamber"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; + Acronym = AL["Uldu"]; + { ORNG..AL["Key"]..": "..AL["Celestial Planetarium Key"], ITEM, 45796 }; + { BLUE.."B) "..AL["The Siege"] }; + { BLUE.."C) "..AL["The Keepers"] }; + { WHITE.."5) "..AL["Assembly of Iron"].." ("..AL["Optional"]..")" }; + { WHITE..INDENT..AL["Steelbreaker"], NPC, 32867 }; + { WHITE..INDENT..AL["Runemaster Molgeim"], NPC, 32867 }; + { WHITE..INDENT..AL["Stormcaller Brundir"], NPC, 32867 }; + { WHITE.."6) "..AL["Prospector Doren"], NPC, 33956 }; + { WHITE..INDENT..AL["Archivum Console"], OBJECT, 194555 }; + { WHITE.."7) "..AL["Kologarn"], NPC, 32930 }; + { WHITE.."8) "..AL["Algalon the Observer"].." ("..AL["Optional"]..")" }; + { GREN.."5') "..BabbleSubZone["The Antechamber"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; }; ["UlduarC"] = { - ZoneName = { BabbleZone["Ulduar"].." [C] ("..AtlasLocale["The Keepers"]..")", 4273 }; + ZoneName = { BabbleZone["Ulduar"].." [C] ("..AL["The Keepers"]..")", 4273 }; Location = { BabbleZone["The Storm Peaks"], 67 }; LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Uldu"]; + Acronym = AL["Uldu"]; { BLUE.."C) "..BabbleSubZone["The Antechamber"] }; { BLUE.."D) "..BabbleSubZone["The Spark of Imagination"] }; { BLUE.."E) "..BabbleSubZone["The Descent into Madness"] }; - { WHITE.."9) "..AtlasLocale["Auriaya"].." ("..AtlasLocale["Optional"]..")", NPC, 33515 }; - { WHITE.."10) "..AtlasLocale["Hodir"], NPC, 32845 }; - { WHITE.."11) "..AtlasLocale["Thorim"], NPC, 32865 }; - { WHITE.."12) "..AtlasLocale["Freya"], NPC, 32906 }; - { GREN.."6') "..BabbleSubZone["The Shattered Walkway"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; - { GREN.."7') "..BabbleSubZone["The Conservatory of Life"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; + { WHITE.."9) "..AL["Auriaya"].." ("..AL["Optional"]..")", NPC, 33515 }; + { WHITE.."10) "..AL["Hodir"], NPC, 32845 }; + { WHITE.."11) "..AL["Thorim"], NPC, 32865 }; + { WHITE.."12) "..AL["Freya"], NPC, 32906 }; + { GREN.."6') "..BabbleSubZone["The Shattered Walkway"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; + { GREN.."7') "..BabbleSubZone["The Conservatory of Life"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; }; ["UlduarD"] = { ZoneName = { BabbleZone["Ulduar"].." [D] ("..BabbleSubZone["The Spark of Imagination"]..")", 4273 }; @@ -2356,10 +2356,10 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Uldu"]; - { BLUE.."D) "..AtlasLocale["The Keepers"] }; - { WHITE.."13) "..AtlasLocale["Mimiron"], NPC, 33412 }; - { GREN.."8') "..BabbleSubZone["The Spark of Imagination"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; + Acronym = AL["Uldu"]; + { BLUE.."D) "..AL["The Keepers"] }; + { WHITE.."13) "..AL["Mimiron"], NPC, 33412 }; + { GREN.."8') "..BabbleSubZone["The Spark of Imagination"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; }; ["UlduarE"] = { ZoneName = { BabbleZone["Ulduar"].." [E] ("..BabbleSubZone["The Descent into Madness"]..")", 4273 }; @@ -2367,11 +2367,11 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["Uldu"]; - { BLUE.."E) "..AtlasLocale["The Keepers"] }; - { WHITE.."14) "..AtlasLocale["General Vezax"], NPC, 33271 }; - { WHITE.."15) "..AtlasLocale["Yogg-Saron"], NPC, 33288 }; - { GREN.."9') "..BabbleSubZone["The Prison of Yogg-Saron"].." ("..AtlasLocale["Teleporter"]..")", OBJECT, 194569 }; + Acronym = AL["Uldu"]; + { BLUE.."E) "..AL["The Keepers"] }; + { WHITE.."14) "..AL["General Vezax"], NPC, 33271 }; + { WHITE.."15) "..AL["Yogg-Saron"], NPC, 33288 }; + { GREN.."9') "..BabbleSubZone["The Prison of Yogg-Saron"].." ("..AL["Teleporter"]..")", OBJECT, 194569 }; }; ["UlduarHallsofLightning"] = { ZoneName = { BabbleZone["Ulduar"]..": "..BabbleZone["Halls of Lightning"], 4272 }; @@ -2379,12 +2379,12 @@ AtlasLoot_MapData = { LevelRange = "78-80"; MinLevel = "75"; PlayerLimit = "5"; - Acronym = AtlasLocale["HoL"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["General Bjarngrim"].." ("..AtlasLocale["Wanders"]..")", NPC, 28586 }; - { WHITE.."2) "..AtlasLocale["Volkhan"], NPC, 28587 }; - { WHITE.."3) "..AtlasLocale["Ionar"], NPC, 28546 }; - { WHITE.."4) "..AtlasLocale["Loken"], NPC, 28923 }; + Acronym = AL["HoL"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["General Bjarngrim"].." ("..AL["Wanders"]..")", NPC, 28586 }; + { WHITE.."2) "..AL["Volkhan"], NPC, 28587 }; + { WHITE.."3) "..AL["Ionar"], NPC, 28546 }; + { WHITE.."4) "..AL["Loken"], NPC, 28923 }; }; ["UlduarHallsofStone"] = { ZoneName = { BabbleZone["Ulduar"]..": "..BabbleZone["Halls of Stone"], 4264 }; @@ -2392,14 +2392,14 @@ AtlasLoot_MapData = { LevelRange = "75-80"; MinLevel = "72"; PlayerLimit = "5"; - Acronym = AtlasLocale["HoS"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Elder Yurauk"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 30535 }; - { WHITE.."2) "..AtlasLocale["Krystallus"], NPC, 27977 }; - { WHITE.."3) "..AtlasLocale["Maiden of Grief"], NPC, 27975 }; - { WHITE.."4) "..AtlasLocale["Brann Bronzebeard"], NPC, 28070 }; - { WHITE.."5) "..AtlasLocale["Tribunal Chest"], OBJECT, 190586 }; - { WHITE.."6) "..AtlasLocale["Sjonnir the Ironshaper"], NPC, 27978 }; + Acronym = AL["HoS"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Elder Yurauk"].." ("..AL["Lunar Festival"]..")", NPC, 30535 }; + { WHITE.."2) "..AL["Krystallus"], NPC, 27977 }; + { WHITE.."3) "..AL["Maiden of Grief"], NPC, 27975 }; + { WHITE.."4) "..AL["Brann Bronzebeard"], NPC, 28070 }; + { WHITE.."5) "..AL["Tribunal Chest"], OBJECT, 190586 }; + { WHITE.."6) "..AL["Sjonnir the Ironshaper"], NPC, 27978 }; }; ["UtgardeKeep"] = { ZoneName = { BabbleZone["Utgarde Keep"]..": "..BabbleZone["Utgarde Keep"], 206 }; @@ -2407,15 +2407,15 @@ AtlasLoot_MapData = { LevelRange = "68-75"; MinLevel = "65"; PlayerLimit = "5"; - Acronym = AtlasLocale["UK, Keep"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Dark Ranger Marrah"], NPC, 24137 }; - { BLUE.."B-C) "..AtlasLocale["Connection"] }; - { WHITE.."1) "..AtlasLocale["Prince Keleseth "], NPC, 23953 }; - { WHITE.."2) "..AtlasLocale["Elder Jarten"].." ("..AtlasLocale["Lunar Festival"]..", "..AtlasLocale["Lower"]..")", NPC, 30531 }; - { WHITE.."3) "..AtlasLocale["Dalronn the Controller"], NPC, 24201 }; - { WHITE..INDENT..AtlasLocale["Skarvald the Constructor"], NPC, 24200 }; - { WHITE.."4) "..AtlasLocale["Ingvar the Plunderer"], NPC, 23980 }; + Acronym = AL["UK, Keep"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Dark Ranger Marrah"], NPC, 24137 }; + { BLUE.."B-C) "..AL["Connection"] }; + { WHITE.."1) "..AL["Prince Keleseth "], NPC, 23953 }; + { WHITE.."2) "..AL["Elder Jarten"].." ("..AL["Lunar Festival"]..", "..AL["Lower"]..")", NPC, 30531 }; + { WHITE.."3) "..AL["Dalronn the Controller"], NPC, 24201 }; + { WHITE..INDENT..AL["Skarvald the Constructor"], NPC, 24200 }; + { WHITE.."4) "..AL["Ingvar the Plunderer"], NPC, 23980 }; }; ["UtgardePinnacle"] = { ZoneName = { BabbleZone["Utgarde Keep"]..": "..BabbleZone["Utgarde Pinnacle"], 1196 }; @@ -2423,14 +2423,14 @@ AtlasLoot_MapData = { LevelRange = "78-80"; MinLevel = "75"; PlayerLimit = "5"; - Acronym = AtlasLocale["UP, Pinn"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { BLUE..INDENT..AtlasLocale["Brigg Smallshanks"], NPC, 30871 }; - { WHITE.."1) "..AtlasLocale["Svala Sorrowgrave"], NPC, 26668 }; - { WHITE.."2) "..AtlasLocale["Gortok Palehoof"], NPC, 26687 }; - { WHITE.."3) "..AtlasLocale["Skadi the Ruthless"], NPC, 26693 }; - { WHITE.."4) "..AtlasLocale["Elder Chogan'gada"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 30538 }; - { WHITE.."5) "..AtlasLocale["King Ymiron"], NPC, 26861 }; + Acronym = AL["UP, Pinn"]; + { BLUE.."A) "..AL["Entrance"] }; + { BLUE..INDENT..AL["Brigg Smallshanks"], NPC, 30871 }; + { WHITE.."1) "..AL["Svala Sorrowgrave"], NPC, 26668 }; + { WHITE.."2) "..AL["Gortok Palehoof"], NPC, 26687 }; + { WHITE.."3) "..AL["Skadi the Ruthless"], NPC, 26693 }; + { WHITE.."4) "..AL["Elder Chogan'gada"].." ("..AL["Lunar Festival"]..")", NPC, 30538 }; + { WHITE.."5) "..AL["King Ymiron"], NPC, 26861 }; }; ["VaultOfArchavon"] = { ZoneName = { BabbleZone["Vault of Archavon"], 4603 }; @@ -2438,12 +2438,12 @@ AtlasLoot_MapData = { LevelRange = "80+"; MinLevel = "80"; PlayerLimit = "10/25"; - Acronym = AtlasLocale["VoA"]; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Archavon the Stone Watcher"], NPC, 31125 }; - { WHITE.."2) "..AtlasLocale["Emalon the Storm Watcher"], NPC, 33993 }; - { WHITE.."3) "..AtlasLocale["Koralon the Flame Watcher"], NPC, 35013 }; - { WHITE.."4) "..AtlasLocale["Toravon the Ice Watcher"], NPC, 38433 }; + Acronym = AL["VoA"]; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Archavon the Stone Watcher"], NPC, 31125 }; + { WHITE.."2) "..AL["Emalon the Storm Watcher"], NPC, 33993 }; + { WHITE.."3) "..AL["Koralon the Flame Watcher"], NPC, 35013 }; + { WHITE.."4) "..AL["Toravon the Ice Watcher"], NPC, 38433 }; }; ["VioletHold"] = { ZoneName = { BabbleZone["The Violet Hold"], 4415 }; @@ -2451,16 +2451,16 @@ AtlasLoot_MapData = { LevelRange = "73-79"; MinLevel = "70"; PlayerLimit = "5"; - Acronym = AtlasLocale["VH"]; - { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Violet Hold Key"], ITEM, 42482 }; - { BLUE.."A) "..AtlasLocale["Entrance"] }; - { WHITE.."1) "..AtlasLocale["Erekem"].." ("..AtlasLocale["Random"]..")", NPC, 29315 }; - { WHITE.."2) "..AtlasLocale["Zuramat the Obliterator"].." ("..AtlasLocale["Upper"]..", "..AtlasLocale["Random"]..")", NPC, 29314 }; - { WHITE..INDENT..AtlasLocale["Xevozz"].." ("..AtlasLocale["Lower"]..", "..AtlasLocale["Random"]..")", NPC, 29266 }; - { WHITE.."3) "..AtlasLocale["Ichoron"].." ("..AtlasLocale["Random"]..")", NPC, 29313 }; - { WHITE.."4) "..AtlasLocale["Moragg"].." ("..AtlasLocale["Random"]..")", NPC, 29316 }; - { WHITE.."5) "..AtlasLocale["Lavanthor"].." ("..AtlasLocale["Random"]..")", NPC, 29312 }; - { WHITE.."6) "..AtlasLocale["Cyanigosa"].." ("..AtlasLocale["Wave 18"]..")", NPC, 31134 }; + Acronym = AL["VH"]; + { ORNG..AL["Key"]..": "..AL["The Violet Hold Key"], ITEM, 42482 }; + { BLUE.."A) "..AL["Entrance"] }; + { WHITE.."1) "..AL["Erekem"].." ("..AL["Random"]..")", NPC, 29315 }; + { WHITE.."2) "..AL["Zuramat the Obliterator"].." ("..AL["Upper"]..", "..AL["Random"]..")", NPC, 29314 }; + { WHITE..INDENT..AL["Xevozz"].." ("..AL["Lower"]..", "..AL["Random"]..")", NPC, 29266 }; + { WHITE.."3) "..AL["Ichoron"].." ("..AL["Random"]..")", NPC, 29313 }; + { WHITE.."4) "..AL["Moragg"].." ("..AL["Random"]..")", NPC, 29316 }; + { WHITE.."5) "..AL["Lavanthor"].." ("..AL["Random"]..")", NPC, 29312 }; + { WHITE.."6) "..AL["Cyanigosa"].." ("..AL["Wave 18"]..")", NPC, 31134 }; }; }; end \ No newline at end of file diff --git a/AtlasLoot/Core/Options.lua b/AtlasLoot/Core/Options.lua index 8294e57..c132751 100644 --- a/AtlasLoot/Core/Options.lua +++ b/AtlasLoot/Core/Options.lua @@ -45,6 +45,7 @@ function AtlasLootOptions_Init() AtlasLootOptionsFrameItemSyncTT:SetChecked(AtlasLoot.db.profile.ItemSyncTT); AtlasLootOptionsFrameEquipCompare:SetChecked(AtlasLoot.db.profile.EquipCompare); AtlasLootOptionsFrameOpaque:SetChecked(AtlasLoot.db.profile.Opaque); + AtlasLootOptionsFrameAutoInstance:SetChecked(AtlasLoot.db.profile.AutoCurrentInstance); AtlasLootOptionsFrameItemID:SetChecked(AtlasLoot.db.profile.ItemIDs); AtlasLootOptionsFrameLoDStartup:SetChecked(AtlasLoot.db.profile.LoadAllLoDStartup); AtlasLootOptionsFrameLootBrowserScale:SetValue(AtlasLoot.db.profile.LootBrowserScale); @@ -106,6 +107,10 @@ function AtlasLootOptions_OpaqueToggle() AtlasLootOptions_Init(); end +function AtlasLoot:Options_AutoInstanceToggle() + AtlasLoot.db.profile.AutoCurrentInstance = AtlasLootOptionsFrameAutoInstance:GetChecked(); +end + function AtlasLootOptions_LoDStartup() if (AtlasLoot.db.profile.LoadAllLoDStartup) then AtlasLoot.db.profile.LoadAllLoDStartup = false; @@ -315,6 +320,11 @@ local opaque = CreateFrame("CheckButton", "AtlasLootOptionsFrameOpaque", AtlasLo AtlasLootOptionsFrameOpaqueText:SetText(AL["Make Loot Table Opaque"]); opaque:SetScript("OnClick", function() AtlasLootOptions_OpaqueToggle() end); +local autoInstance = CreateFrame("CheckButton", "AtlasLootOptionsFrameAutoInstance", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate"); + autoInstance:SetPoint("TOPLEFT",5,-160); + AtlasLootOptionsFrameAutoInstanceText:SetText(AL["Auto Load Instance Loot Pages"]); + autoInstance:SetScript("OnClick", function() AtlasLoot:Options_AutoInstanceToggle() end); + local itemid = CreateFrame("CheckButton", "AtlasLootOptionsFrameItemID", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate"); itemid:SetPoint("TOP",5,-130); AtlasLootOptionsFrameItemIDText:SetText(AL["Show itemIDs at all times"]); diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua index 466ebff..7aec4b5 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua @@ -36,10 +36,27 @@ function AtlasLootDefaultFrame_OnShow() --Definition of where I want the loot table to be shown --Remove the selection of a loot table in Atlas AtlasLootItemsFrame.activeBoss = nil; + -- checks to see if there is an instance to auto load its loottable + local function findInstance() + for i,v in pairs(AtlasLoot_SubMenus) do + for n,t in ipairs(v) do + if t[4] == BabbleZone[GetRealZoneText()] then + ATLASLOOT_CURRENTTABLE = v.SubMenu; + ATLASLOOT_LASTMODULE = v.Module; + AtlasLoot:IsLootTableAvailable(ATLASLOOT_LASTMODULE); + AtlasLoot:ShowItemsFrame(t[2], "AtlasLoot_Data", 1); + AtlasLoot_DewdropSubMenu:Unregister(AtlasLootDefaultFrame_SubMenu); + AtlasLoot:DewdropSubMenuRegister(AtlasLoot_SubMenus[ATLASLOOT_CURRENTTABLE]); + AtlasLoot:WishListOptionsRegister(); + return true; + end + end + end + end --Set the item table to the loot table - --Show the last displayed loot table + --Show the last displayed loot table local lastboss = AtlasLoot.db.profile.LastBoss; - if lastboss and lastboss[4] then + if AtlasLoot.db.profile.AutoCurrentInstance and findInstance() then elseif lastboss and lastboss[4] then ATLASLOOT_CURRENTTABLE = lastboss[5]; ATLASLOOT_LASTMODULE = lastboss[4]; AtlasLoot:IsLootTableAvailable(lastboss[4]); diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 3162e85..629b0b7 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -9,7 +9,6 @@ The AL["text"] = true; shortcut can ONLY be used for English (the root translati --Table holding all loot tables is initialised here as it loads early AtlasLoot_Data = {}; -AtlasLoot_TableNames = {}; --Create the library instance local AceLocale = LibStub:GetLibrary("AceLocale-3.0"); @@ -159,6 +158,7 @@ if AL then AL["PvP Rewards"] = true; AL["QuickLook"] = true; AL["World Events"] = true; + AL["Auto Load Instance Loot Pages"] = true; -- AtlasLoot Panel - Search AL["Clear"] = true; @@ -1609,12 +1609,6 @@ if AL then AL["Welcome to Atlasloot Enhanced. Please take a moment to set your preferences for tooltips and links in the chat window.\n\n This options screen can be reached again at any later time by typing '/atlasloot'."] = true; AL["Setup"] = true; - -- Old Atlas Detected - AL["It has been detected that your version of Atlas does not match the version that Atlasloot is tuned for ("] = true; - AL["). Depending on changes, there may be the occasional error, so please visit http://www.atlasmod.com as soon as possible to update."] = true; - AL["OK"] = true; - AL["Incompatible Atlas Detected"] = true; - -- Unsafe item tooltip AL["Unsafe Item"] = true; AL["Item Unavailable"] = true; @@ -1622,4 +1616,1548 @@ if AL then AL["This item is not available on your server or your battlegroup yet."] = true; AL["This item is unsafe. To view this item without the risk of disconnection, you need to have first seen it in the game world. This is a restriction enforced by Blizzard since Patch 1.10."] = true; AL["You can right-click to attempt to query the server. You may be disconnected."] = true; + + -- AtlasMap Info + AL["Brewfest"] = true; + AL["Hallow's End"] = true; + AL["Love is in the Air"] = true; + AL["Lunar Festival"] = true; + AL["Midsummer Festival"] = true; + --Misc strings + AL["Adult"] = true; + AL["AKA"] = true; + AL["Alliance"] = true; + AL["Arcane Container"] = true; + AL["Argent Dawn"] = true; + AL["Argent Crusade"] = true; + AL["Arms Warrior"] = true; + AL["Attunement Required"] = true; + AL["Back"] = true; + AL["Basement"] = true; + AL["Bat"] = true; + AL["Blacksmithing Plans"] = true; + AL["Boss"] = true; + AL["Brazier of Invocation"] = true; + AL["Chase Begins"] = true; + AL["Chase Ends"] = true; + AL["Child"] = true; + AL["Connection"] = true; + AL["DS2"] = true; + AL["Elevator"] = true; + AL["End"] = true; + AL["Engineer"] = true; + AL["Entrance"] = true; + AL["Event"] = true; + AL["Exalted"] = true; + AL["Exit"] = true; + AL["Fourth Stop"] = true; + AL["Front"] = true; + AL["Ghost"] = true; + AL["Heroic"] = true; + AL["Holy Paladin"] = true; + AL["Holy Priest"] = true; + AL["Horde"] = true; + AL["Hunter"] = true; + AL["Imp"] = true; + AL["Inside"] = true; + AL["Key"] = true; + AL["Lower"] = true; + AL["Mage"] = true; + AL["Meeting Stone"] = true; + AL["Monk"] = true; + AL["Moonwell"] = true; + AL["Optional"] = true; + AL["Orange"] = true; + AL["Outside"] = true; + AL["Paladin"] = true; + AL["Panther"] = true; + AL["Portal"] = true; + AL["Priest"] = true; + AL["Protection Warrior"] = true; + AL["Purple"] = true; + AL["Random"] = true; + AL["Raptor"] = true; + AL["Rare"] = true; + AL["Reputation"] = true; + AL["Repair"] = true; + AL["Retribution Paladin"] = true; + AL["Rewards"] = true; + AL["Rogue"] = true; + AL["Second Stop"] = true; + AL["Shadow Priest"] = true; + AL["Shaman"] = true; + AL["Side"] = true; + AL["Snake"] = true; + AL["Spawn Point"] = true; + AL["Spider"] = true; + AL["Start"] = true; + AL["Summon"] = true; + AL["Teleporter"] = true; + AL["Third Stop"] = true; + AL["Tiger"] = true; + AL["Top"] = true; + AL["Undead"] = true; + AL["Underwater"] = true; + AL["Unknown"] = true; + AL["Upper"] = true; + AL["Varies"] = true; + AL["Wanders"] = true; + AL["Warlock"] = true; + AL["Warrior"] = true; + AL["Wave 5"] = true; + AL["Wave 6"] = true; + AL["Wave 10"] = true; + AL["Wave 12"] = true; + AL["Wave 18"] = true; + + --Classic Acronyms + AL["AQ"] = true; + AL["AQ20"] = true; + AL["AQ40"] = true; + AL["Armory"] = true; + AL["BFD"] = true; + AL["BRD"] = true; + AL["BRM"] = true; + AL["BWL"] = true; + AL["Cath"] = true; + AL["DM"] = true; + AL["Gnome"] = true; + AL["GY"] = true; + AL["LBRS"] = true; + AL["Lib"] = true; + AL["Mara"] = true; + AL["MC"] = true; + AL["RFC"] = true; + AL["RFD"] = true; + AL["RFK"] = true; + AL["Scholo"] = true; + AL["SFK"] = true; + AL["SM"] = true; + AL["ST"] = true; + AL["Strat"] = true; + AL["Stocks"] = true; + AL["UBRS"] = true; + AL["Ulda"] = true; + AL["VC"] = true; + AL["WC"] = true; + AL["ZF"] = true; + AL["ZG"] = true; + AL["Ony60"] = true; + --BC Acronyms + AL["AC"] = true; + AL["Arca"] = true; + AL["Auch"] = true; + AL["BF"] = true; + AL["BT"] = true; + AL["Bota"] = true; + AL["CoT"] = true; + AL["CoT1"] = true; + AL["CoT2"] = true; + AL["CoT3"] = true; + AL["CR"] = true; + AL["Eye"] = true; + AL["GL"] = true; + AL["HC"] = true; + AL["Kara"] = true; + AL["MaT"] = true; + AL["Mag"] = true; + AL["Mech"] = true; + AL["MT"] = true; + AL["Ramp"] = true; + AL["SC"] = true; + AL["Seth"] = true; + AL["SH"] = true; + AL["SL"] = true; + AL["SP"] = true; + AL["SuP"] = true; + AL["SV"] = true; + AL["TK"] = true; + AL["UB"] = true; + AL["ZA"] = true; + + --WotLK Acronyms + AL["AK, Kahet"] = true; + AL["AN, Nerub"] = true; + AL["Champ"] = true; + AL["CoT-Strat"] = true; + AL["Crus"] = true; + AL["DTK"] = true; + AL["FoS"] = true; + AL["FH1"] = true; + AL["Gun"] = true; + AL["HoL"] = true; + AL["HoR"] = true; + AL["FH3"] = true; + AL["HoS"] = true; + AL["IC"] = true; + AL["Nax"] = true; + AL["Nex, Nexus"] = true; + AL["Ocu"] = true; + AL["Ony"] = true; + AL["OS"] = true; + AL["PoS"] = true; + AL["FH2"] = true; + AL["RS"] = true; + AL["TEoE"] = true; + AL["UK, Keep"] = true; + AL["Uldu"] = true; + AL["UP, Pinn"] = true; + AL["VH"] = true; + AL["VoA"] = true; + + --Zones not included in LibBabble-Zone + AL["Crusaders' Coliseum"] = true; + +--************************************************ +-- Instance Entrance Maps +--************************************************ + + --Auchindoun (Entrance) + AL["Ha'Lei"] = true; + AL["Greatfather Aldrimus"] = true; + AL["Clarissa"] = true; + AL["Ramdor the Mad"] = true; + AL["Horvon the Armorer "] = true; + AL["Nexus-Prince Haramad"] = true; + AL["Artificer Morphalius"] = true; + AL["Mamdy the \"Ologist\""] = true; + AL["\"Slim\" "] = true; + AL["\"Captain\" Kaftiz"] = true; + AL["Isfar"] =true; + AL["Field Commander Mahfuun"] = true; + AL["Spy Grik'tha"] = true; + AL["Provisioner Tsaalt"] = true; + AL["Dealer Tariq "] = true; + + --Blackfathom Deeps (Entrance) + --Nothing to translate! + + --Blackrock Mountain (Entrance) + AL["Bodley"] = true; + AL["Overmaster Pyron"] = true; + AL["Lothos Riftwaker"] = true; + AL["Franclorn Forgewright"] = true; + AL["Orb of Command"] = true; + AL["Scarshield Quartermaster "] = true; + + --Coilfang Reservoir (Entrance) + AL["Watcher Jhang"] = true; + AL["Mortog Steamhead"] = true; + + --Caverns of Time (Entrance) + AL["Steward of Time "] = true; + AL["Alexston Chrome "] = true; + AL["Yarley "] = true; + AL["Bortega "] = true; + AL["Galgrom "] = true; + AL["Alurmi "] = true; + AL["Zaladormu"] = true; + AL["Soridormi "] = true; + AL["Arazmodu "] = true; + AL["Andormu "] = true; + AL["Nozari "] = true; + + --Dire Maul (Entrance) + AL["Dire Pool"] = true; + AL["Dire Maul Arena"] = true; + AL["Mushgog"] = true; + AL["Skarr the Unbreakable"] = true; + AL["The Razza"] = true; + AL["Elder Mistwalker"] = true; + + --Gnomeregan (Entrance) + AL["Transpolyporter"] = true; + AL["Sprok "] = true; + AL["Matrix Punchograph 3005-A"] = true; + AL["Namdo Bizzfizzle "] = true; + AL["Techbot"] = true; + + -- Hellfire Citadel (Entrance) + AL["Steps and path to the Blood Furnace"] = true; + AL["Path to the Hellfire Ramparts and Shattered Halls"] = true; + AL["Meeting Stone of Magtheridon's Lair"] = true; + AL["Meeting Stone of Hellfire Citadel"] = true; + + --Karazhan (Entrance) + AL["Archmage Leryda"] = true; + AL["Apprentice Darius"] = true; + AL["Archmage Alturus"] = true; + AL["Stairs to Underground Pond"] = true; + AL["Stairs to Underground Well"] = true; + AL["Charred Bone Fragment"] = true; + + --Maraudon (Entrance) + AL["The Nameless Prophet"] = true; + AL["Kolk "] = true; + AL["Gelk "] = true; + AL["Magra "] = true; + AL["Cavindra"] = true; + + --The Deadmines (Entrance) + AL["Marisa du'Paige"] = true; + AL["Brainwashed Noble"] = true; + AL["Foreman Thistlenettle"] = true; + + --Sunken Temple (Entrance) + AL["Jade"] = true; + AL["Kazkaz the Unholy"] = true; + AL["Zekkis"] = true; + AL["Veyzhak the Cannibal"] = true; + + --Uldaman (Entrance) + AL["Hammertoe Grez"] = true; + AL["Magregan Deepshadow"] = true; + AL["Tablet of Ryun'Eh"] = true; + AL["Krom Stoutarm's Chest"] = true; + AL["Garrett Family Chest"] = true; + AL["Digmaster Shovelphlange"] = true; + + --Wailing Caverns (Entrance) + AL["Mad Magglish"] = true; + AL["Trigore the Lasher"] = true; + AL["Boahn "] = true; + AL["Above the Entrance:"] = true; + AL["Ebru "] = true; + AL["Nalpak "] = true; + AL["Kalldan Felmoon "] = true; + AL["Waldor "] = true; + +--**AL********************************************** +-- KALalimdor Instances (Classic) +--**AL********************************************** + + --Blackfathom Deeps + AL["Ghamoo-ra"] = true; + AL["Lorgalis Manuscript"] = true; + AL["Lady Sarevess"] = true; + AL["Argent Guard Thaelrid "] = true; + AL["Gelihast"] = true; + AL["Shrine of Gelihast"] = true; + AL["Lorgus Jett"] = true; + AL["Fathom Stone"] = true; + AL["Baron Aquanis"] = true; + AL["Twilight Lord Kelris"] = true; + AL["Old Serra'kis"] = true; + AL["Aku'mai"] = true; + AL["Morridune"] = true; + AL["Altar of the Deeps"] = true; + + --Dire Maul (East) + AL["Pusillin"] = true; + AL["Zevrim Thornhoof"] = true; + AL["Hydrospawn"] = true; + AL["Lethtendris"] = true; + AL["Pimgib"] = true; + AL["Old Ironbark"] = true; + AL["Alzzin the Wildshaper"] = true; + AL["Isalien"] = true; + + --Dire Maul (North) + AL["Crescent Key"] = true; + --"Library" omitted from here and DM West because of SM: "Library" duplicate + AL["Guard Mol'dar"] = true; + AL["Stomper Kreeg "] = true; + AL["Guard Fengus"] = true; + AL["Knot Thimblejack"] = true; + AL["Guard Slip'kik"] = true; + AL["Captain Kromcrush"] = true; + AL["King Gordok"] = true; + AL["Cho'Rush the Observer"] = true; + + --Dire Maul (West) + AL["J'eevee's Jar"] = true; + AL["Pylons"] = true; + AL["Shen'dralar Ancient"] = true; + AL["Tendris Warpwood"] = true; + AL["Ancient Equine Spirit"] = true; + AL["Illyanna Ravenoak"] = true; + AL["Ferra"] = true; + AL["Magister Kalendris"] = true; + AL["Tsu'zee"] = true; + AL["Immol'thar"] = true; + AL["Lord Hel'nurath"] = true; + AL["Prince Tortheldrin"] = true; + AL["Falrin Treeshaper"] = true; + AL["Lorekeeper Lydros"] = true; + AL["Lorekeeper Javon"] = true; + AL["Lorekeeper Kildrath"] = true; + AL["Lorekeeper Mykos"] = true; + AL["Shen'dralar Provisioner"] = true; + AL["Skeletal Remains of Kariel Winthalus"] = true; + + --Maraudon + AL["Scepter of Celebras"] = true; + AL["Veng "] = true; + AL["Noxxion"] = true; + AL["Razorlash"] = true; + AL["Maraudos "] = true; + AL["Lord Vyletongue"] = true; + AL["Meshlok the Harvester"] = true; + AL["Celebras the Cursed"] = true; + AL["Landslide"] = true; + AL["Tinkerer Gizlock"] = true; + AL["Rotgrip"] = true; + AL["Princess Theradras"] = true; + AL["Elder Splitrock"] = true; + + --Ragefire Chasm + AL["Maur Grimtotem"] = true; + AL["Oggleflint "] = true; + AL["Taragaman the Hungerer"] = true; + AL["Jergosh the Invoker"] = true; + AL["Zelemar the Wrathful"] = true; + AL["Bazzalan"] = true; + + --Razorfen Downs + AL["Tuten'kash"] = true; + AL["Henry Stern"] = true; + AL["Belnistrasz"] = true; + AL["Sah'rhee"] = true; + AL["Mordresh Fire Eye"] = true; + AL["Glutton"] = true; + AL["Ragglesnout"] = true; + AL["Amnennar the Coldbringer"] = true; + AL["Plaguemaw the Rotting"] = true; + + --Razorfen Kraul + AL["Roogug"] = true; + AL["Aggem Thorncurse "] = true; + AL["Death Speaker Jargba "] = true; + AL["Overlord Ramtusk"] = true; + AL["Razorfen Spearhide"] = true; + AL["Agathelos the Raging"] = true; + AL["Blind Hunter"] = true; + AL["Charlga Razorflank "] = true; + AL["Willix the Importer"] = true; + AL["Heralath Fallowbrook"] = true; + AL["Earthcaller Halmgar"] = true; + + --Ruins of Ahn'Qiraj + AL["Cenarion Circle"] = true; + AL["Kurinnaxx"] = true; + AL["Lieutenant General Andorov"] = true; + AL["Four Kaldorei Elites"] = true; + AL["General Rajaxx"] = true; + AL["Captain Qeez"] = true; + AL["Captain Tuubid"] = true; + AL["Captain Drenn"] = true; + AL["Captain Xurrem"] = true; + AL["Major Yeggeth"] = true; + AL["Major Pakkon"] = true; + AL["Colonel Zerran"] = true; + AL["Moam"] = true; + AL["Buru the Gorger"] = true; + AL["Ayamiss the Hunter"] = true; + AL["Ossirian the Unscarred"] = true; + AL["Safe Room"] = true; + + --Temple of Ahn'Qiraj + AL["Brood of Nozdormu"] = true; + AL["The Prophet Skeram"] = true; + AL["The Bug Family"] = true; + AL["Vem"] = true; + AL["Lord Kri"] = true; + AL["Princess Yauj"] = true; + AL["Battleguard Sartura"] = true; + AL["Fankriss the Unyielding"] = true; + AL["Viscidus"] = true; + AL["Princess Huhuran"] = true; + AL["Twin Emperors"] = true; + AL["Emperor Vek'lor"] = true; + AL["Emperor Vek'nilash"] = true; + AL["Ouro"] = true; + AL["Eye of C'Thun"] = true; + AL["C'Thun"] = true; + AL["Andorgos "] = true; + AL["Vethsera "] = true; + AL["Kandrostrasz "] = true; + AL["Arygos"] = true; + AL["Caelestrasz"] = true; + AL["Merithra of the Dream"] = true; + + --Wailing Caverns + AL["Disciple of Naralex"] = true; + AL["Lord Cobrahn "] = true; + AL["Lady Anacondra "] = true; + AL["Kresh"] = true; + AL["Lord Pythas "] = true; + AL["Skum"] = true; + AL["Lord Serpentis "] = true; + AL["Verdan the Everliving"] = true; + AL["Mutanus the Devourer"] = true; + AL["Naralex"] = true; + AL["Deviate Faerie Dragon"] = true; + + --Zul'Farrak + AL["Antu'sul "] = true; + AL["Theka the Martyr"] = true; + AL["Witch Doctor Zum'rah"] = true; + AL["Zul'Farrak Dead Hero"] = true; + AL["Nekrum Gutchewer"] = true; + AL["Shadowpriest Sezz'ziz"] = true; + AL["Dustwraith"] = true; + AL["Sergeant Bly"] = true; + AL["Weegli Blastfuse"] = true; + AL["Murta Grimgut"] = true; + AL["Raven"] = true; + AL["Oro Eyegouge"] = true; + AL["Sandfury Executioner"] = true; + AL["Hydromancer Velratha"] = true; + AL["Gahz'rilla"] = true; + AL["Elder Wildmane"] = true; + AL["Chief Ukorz Sandscalp"] = true; + AL["Ruuzlu"] = true; + AL["Zerillis"] = true; + AL["Sandarr Dunereaver"] = true; + +--**************************** +-- Eastern Kingdoms Instances (Classic) +--**************************** + + --Blackrock Depths + AL["Shadowforge Key"] = true; + AL["Prison Cell Key"] = true; + AL["Jail Break!"] = true; + AL["Banner of Provocation"] = true; + AL["Lord Roccor"] = true; + AL["Kharan Mighthammer"] = true; + AL["Commander Gor'shak "] = true; + AL["Marshal Windsor"] = true; + AL["High Interrogator Gerstahn "] = true; + AL["Ring of Law"] = true; + AL["Anub'shiah"] = true; + AL["Eviscerator"] = true; + AL["Gorosh the Dervish"] = true; + AL["Grizzle"] = true; + AL["Hedrum the Creeper"] = true; + AL["Ok'thor the Breaker"] = true; + AL["Theldren"] = true; + AL["Lefty"] = true; + AL["Malgen Longspear"] = true; + AL["Gnashjaw "] = true; + AL["Rotfang"] = true; + AL["Va'jashni"] = true; + AL["Houndmaster Grebmar"] = true; + AL["Elder Morndeep"] = true; + AL["High Justice Grimstone"] = true; + AL["Monument of Franclorn Forgewright"] = true; + AL["Pyromancer Loregrain"] = true; + AL["The Vault"] = true; + AL["Warder Stilgiss"] = true; + AL["Verek"] = true; + AL["Watchman Doomgrip"] = true; + AL["Fineous Darkvire "] = true; + AL["The Black Anvil"] = true; + AL["Lord Incendius"] = true; + AL["Bael'Gar"] = true; + AL["Shadowforge Lock"] = true; + AL["General Angerforge"] = true; + AL["Golem Lord Argelmach"] = true; + AL["Field Repair Bot 74A"] = true; + AL["The Grim Guzzler"] = true; + AL["Hurley Blackbreath"] = true; + AL["Lokhtos Darkbargainer "] = true; + AL["Mistress Nagmara"] = true; + AL["Phalanx"] = true; + AL["Plugger Spazzring"] = true; + AL["Private Rocknot"] = true; + AL["Ribbly Screwspigot"] = true; + AL["Coren Direbrew"] = true; + AL["Griz Gutshank "] = true; + AL["Ambassador Flamelash"] = true; + AL["Panzor the Invincible"] = true; + AL["Summoner's Tomb"] = true; + AL["The Lyceum"] = true; + AL["Magmus"] = true; + AL["Emperor Dagran Thaurissan"] = true; + AL["Princess Moira Bronzebeard "] = true; + AL["High Priestess of Thaurissan"] = true; + AL["The Black Forge"] = true; + AL["Core Fragment"] = true; + AL["Overmaster Pyron"] = true; + + --Blackrock Spire (Lower) + AL["Vaelan"] = true; + AL["Warosh "] = true; + AL["Elder Stonefort"] = true; + AL["Roughshod Pike"] = true; + AL["Spirestone Butcher"] = true; + AL["Highlord Omokk"] = true; + AL["Spirestone Battle Lord"] = true; + AL["Spirestone Lord Magus"] = true; + AL["Shadow Hunter Vosh'gajin"] = true; + AL["Fifth Mosh'aru Tablet"] = true; + AL["Bijou"] = true; + AL["War Master Voone"] = true; + AL["Mor Grayhoof"] = true; + AL["Sixth Mosh'aru Tablet"] = true; + AL["Bijou's Belongings"] = true; + AL["Human Remains"] = true; + AL["Unfired Plate Gauntlets"] = true; + AL["Bannok Grimaxe "] = true; + AL["Mother Smolderweb"] = true; + AL["Crystal Fang"] = true; + AL["Urok's Tribute Pile"] = true; + AL["Urok Doomhowl"] = true; + AL["Quartermaster Zigris "] = true; + AL["Halycon"] = true; + AL["Gizrul the Slavener"] = true; + AL["Ghok Bashguud "] = true; + AL["Overlord Wyrmthalak"] = true; + AL["Burning Felguard"] = true; + + --Blackrock Spire (Upper) + AL["Pyroguard Emberseer"] = true; + AL["Solakar Flamewreath"] = true; + AL["Father Flame"] = true; + AL["Darkstone Tablet"] = true; + AL["Doomrigger's Coffer"] = true; + AL["Jed Runewatcher "] = true; + AL["Goraluk Anvilcrack "] = true; + AL["Warchief Rend Blackhand"] = true; + AL["Gyth "] = true; + AL["Awbee"] = true; + AL["The Beast"] = true; + AL["Lord Valthalak"] = true; + AL["Finkle Einhorn"] = true; + AL["General Drakkisath"] = true; + AL["Drakkisath's Brand"] = true; + + --Blackwing Lair + AL["Razorgore the Untamed"] = true; + AL["Vaelastrasz the Corrupt"] = true; + AL["Broodlord Lashlayer"] = true; + AL["Firemaw"] = true; + AL["Draconic for Dummies (Chapter VII)"] = true; + AL["Master Elemental Shaper Krixix"] = true; + AL["Ebonroc"] = true; + AL["Flamegor"] = true; + AL["Chromaggus"] = true; + AL["Nefarian"] = true; + + --Gnomeregan + AL["Workshop Key"] = true; + AL["Blastmaster Emi Shortfuse"] = true; + AL["Grubbis"] = true; + AL["Chomper"] = true; + AL["Clean Room"] = true; + AL["Tink Sprocketwhistle "] = true; + AL["The Sparklematic 5200"] = true; + AL["Mail Box"] = true; + AL["Kernobee"] = true; + AL["Alarm-a-bomb 2600"] = true; + AL["Matrix Punchograph 3005-B"] = true; + AL["Viscous Fallout"] = true; + AL["Electrocutioner 6000"] = true; + AL["Matrix Punchograph 3005-C"] = true; + AL["Crowd Pummeler 9-60"] = true; + AL["Matrix Punchograph 3005-D"] = true; + AL["Dark Iron Ambassador"] = true; + AL["Mekgineer Thermaplugg"] = true; + + --Molten Core + AL["Hydraxian Waterlords"] = true; + AL["Lucifron"] = true; + AL["Magmadar"] = true; + AL["Gehennas"] = true; + AL["Garr"] = true; + AL["Shazzrah"] = true; + AL["Baron Geddon"] = true; + AL["Golemagg the Incinerator"] = true; + AL["Sulfuron Harbinger"] = true; + AL["Majordomo Executus"] = true; + AL["Ragnaros"] = true; + + --Scholomance + AL["Skeleton Key"] = true; + AL["Viewing Room Key"] = true; + AL["Viewing Room"] = true; + AL["Blood of Innocents"] = true; + AL["Divination Scryer"] = true; + AL["Blood Steward of Kirtonos"] = true; + AL["The Deed to Southshore"] = true; + AL["Kirtonos the Herald"] = true; + AL["Jandice Barov"] = true; + AL["The Deed to Tarren Mill"] = true; + AL["Rattlegore"] = true; + AL["Death Knight Darkreaver"] = true; + AL["Marduk Blackpool"] = true; + AL["Vectus"] = true; + AL["Ras Frostwhisper"] = true; + AL["The Deed to Brill"] = true; + AL["Kormok"] = true; + AL["Instructor Malicia"] = true; + AL["Doctor Theolen Krastinov "] = true; + AL["Lorekeeper Polkelt"] = true; + AL["The Ravenian"] = true; + AL["Lord Alexei Barov"] = true; + AL["The Deed to Caer Darrow"] = true; + AL["Lady Illucia Barov"] = true; + AL["Darkmaster Gandling"] = true; + AL["Torch Lever"] = true; + AL["Secret Chest"] = true; + AL["Alchemy Lab"] = true; + + --Shadowfang Keep + AL["Deathsworn Captain"] = true; + AL["Rethilgore "] = true; + AL["Sorcerer Ashcrombe"] = true; + AL["Deathstalker Adamant"] = true; + AL["Landen Stilwell"] = true; + AL["Investigator Fezzen Brasstacks"] = true; + AL["Deathstalker Vincent"] = true; + AL["Apothecary Trio"] = true; + AL["Apothecary Hummel "] = true; + AL["Apothecary Baxter "] = true; + AL["Apothecary Frye "] = true; + AL["Fel Steed"] = true; + AL["Jordan's Hammer"] = true; + AL["Crate of Ingots"] = true; + AL["Razorclaw the Butcher"] = true; + AL["Baron Silverlaine"] = true; + AL["Commander Springvale"] = true; + AL["Odo the Blindwatcher"] = true; + AL["Fenrus the Devourer"] = true; + AL["Arugal's Voidwalker"] = true; + AL["The Book of Ur"] = true; + AL["Wolf Master Nandos"] = true; + AL["Archmage Arugal"] = true; + + --SM: Armory + AL["The Scarlet Key"] = true; + AL["Herod "] = true; + + --SM: Cathedral + AL["High Inquisitor Fairbanks"] = true; + AL["Scarlet Commander Mograine"] = true; + AL["High Inquisitor Whitemane"] = true; + + --SM: Graveyard + AL["Interrogator Vishas"] = true; + AL["Vorrel Sengutz"] = true; + AL["Pumpkin Shrine"] = true; + AL["Headless Horseman"] = true; + AL["Bloodmage Thalnos"] = true; + AL["Ironspine"] = true; + AL["Azshir the Sleepless"] = true; + AL["Fallen Champion"] = true; + + --SM: Library + AL["Houndmaster Loksey"] = true; + AL["Arcanist Doan"] = true; + + --Stratholme + AL["The Scarlet Key"] = true; + AL["Key to the City"] = true; + AL["Various Postbox Keys"] = true; + AL["Living Side"] = true; + AL["Undead Side"] = true; + AL["Skul"] = true; + AL["Stratholme Courier"] = true; + AL["Fras Siabi"] = true; + AL["Atiesh "] = true; + AL["Hearthsinger Forresten"] = true; + AL["The Unforgiven"] = true; + AL["Elder Farwhisper"] = true; + AL["Timmy the Cruel"] = true; + AL["Malor the Zealous"] = true; + AL["Malor's Strongbox"] = true; + AL["Crimson Hammersmith"] = true; + AL["Cannon Master Willey"] = true; + AL["Archivist Galford"] = true; + AL["Grand Crusader Dathrohan"] = true; + AL["Balnazzar"] = true; + AL["Sothos"] = true; + AL["Jarien"] = true; + AL["Magistrate Barthilas"] = true; + AL["Aurius"] = true; + AL["Stonespine"] = true; + AL["Baroness Anastari"] = true; + AL["Black Guard Swordsmith"] = true; + AL["Nerub'enkan"] = true; + AL["Maleki the Pallid"] = true; + AL["Ramstein the Gorger"] = true; + AL["Baron Rivendare"] = true; + AL["Ysida Harmon"] = true; + AL["Crusaders' Square Postbox"] = true; + AL["Market Row Postbox"] = true; + AL["Festival Lane Postbox"] = true; + AL["Elders' Square Postbox"] = true; + AL["King's Square Postbox"] = true; + AL["Fras Siabi's Postbox"] = true; + AL["3rd Box Opened"] = true; + AL["Postmaster Malown"] = true; + + --The Deadmines + AL["Rhahk'Zor "] = true; + AL["Miner Johnson"] = true; + AL["Sneed "] = true; + AL["Sneed's Shredder "] = true; + AL["Gilnid "] = true; + AL["Defias Gunpowder"] = true; + AL["Captain Greenskin"] = true; + AL["Edwin VanCleef "] = true; + AL["Mr. Smite "] = true; + AL["Cookie "] = true; + --The Stockade + AL["Targorr the Dread"] = true; + AL["Kam Deepfury"] = true; + AL["Hamhock"] = true; + AL["Bazil Thredd"] = true; + AL["Dextren Ward"] = true; + AL["Bruegal Ironknuckle"] = true; + + --The Sunken Temple + AL["The Temple of Atal'Hakkar"] = true; + AL["Yeh'kinya's Scroll"] = true; + AL["Atal'ai Defenders"] = true; + AL["Gasher"] = true; + AL["Loro"] = true; + AL["Hukku"] = true; + AL["Zolo"] = true; + AL["Mijan"] = true; + AL["Zul'Lor"] = true; + AL["Altar of Hakkar"] = true; + AL["Atal'alarion "] = true; + AL["Dreamscythe"] = true; + AL["Weaver"] = true; + AL["Avatar of Hakkar"] = true; + AL["Jammal'an the Prophet"] = true; + AL["Ogom the Wretched"] = true; + AL["Morphaz"] = true; + AL["Hazzas"] = true; + AL["Shade of Eranikus"] = true; + AL["Essence Font"] = true; + AL["Spawn of Hakkar"] = true; + AL["Elder Starsong"] = true; + AL["Statue Activation Order"] = true; + + --Uldaman + AL["Staff of Prehistoria"] = true; + AL["Baelog"] = true; + AL["Eric \"The Swift\""] = true; + AL["Olaf"] = true; + AL["Baelog's Chest"] = true; + AL["Conspicuous Urn"] = true; + AL["Remains of a Paladin"] = true; + AL["Revelosh"] = true; + AL["Ironaya"] = true; + AL["Obsidian Sentinel"] = true; + AL["Annora "] = true; + AL["Ancient Stone Keeper"] = true; + AL["Galgann Firehammer"] = true; + AL["Tablet of Will"] = true; + AL["Shadowforge Cache"] = true; + AL["Grimlok "] = true; + AL["Archaedas "] = true; + AL["The Discs of Norgannon"] = true; + AL["Ancient Treasure"] = true; + + --Zul'Gurub + AL["Zandalar Tribe"] = true; + AL["Mudskunk Lure"] = true; + AL["Gurubashi Mojo Madness"] = true; + AL["High Priestess Jeklik"] = true; + AL["High Priest Venoxis"] = true; + AL["Zanza the Restless"] = true; + AL["High Priestess Mar'li"] = true; + AL["Bloodlord Mandokir"] = true; + AL["Ohgan"] = true; + AL["Edge of Madness"] = true; + AL["Gri'lek"] = true; + AL["Hazza'rah"] = true; + AL["Renataki"] = true; + AL["Wushoolay"] = true; + AL["Gahz'ranka"] = true; + AL["High Priest Thekal"] = true; + AL["Zealot Zath"] = true; + AL["Zealot Lor'Khan"] = true; + AL["High Priestess Arlokk"] = true; + AL["Jin'do the Hexxer"] = true; + AL["Hakkar"] = true; + AL["Muddy Churning Waters"] = true; + +--**AL***************** +-- BALurning Crusade Instances +--**AL***************** + + --Auch: Auchenai Crypts + AL["Lower City"] = true; + AL["Shirrak the Dead Watcher"] = true; + AL["Exarch Maladaar"] = true; + AL["Avatar of the Martyred"] = true; + AL["D'ore"] = true; + + --Auch: Mana-Tombs + AL["The Consortium"] = true; + AL["Auchenai Key"] = true; + AL["The Eye of Haramad"] = true; + AL["Pandemonius"] = true; + AL["Shadow Lord Xiraxis"] = true; + AL["Ambassador Pax'ivi"] = true; + AL["Tavarok"] = true; + AL["Cryo-Engineer Sha'heen"] = true; + AL["Ethereal Transporter Control Panel"] = true; + AL["Nexus-Prince Shaffar"] = true; + AL["Yor "] = true; + + --Auch: Sethekk Halls + AL["Essence-Infused Moonstone"] = true; + AL["Darkweaver Syth"] = true; + AL["Lakka"] = true; + AL["The Saga of Terokk"] = true; + AL["Anzu"] = true; + AL["Talon King Ikiss"] = true; + + --Auch: Shadow Labyrinth + AL["Shadow Labyrinth Key"] = true; + AL["Spy To'gun"] = true; + AL["Ambassador Hellmaw"] = true; + AL["Blackheart the Inciter"] = true; + AL["Grandmaster Vorpil"] = true; + AL["The Codex of Blood"] = true; + AL["Murmur"] = true; + AL["First Fragment Guardian"] = true; + + --Black Temple (Start) + AL["Ashtongue Deathsworn"] = true; + AL["Towards Reliquary of Souls"] = true; + AL["Towards Teron Gorefiend"] = true; + AL["Towards Illidan Stormrage"] = true; + AL["Spirit of Olum"] = true; + AL["High Warlord Naj'entus"] = true; + AL["Supremus"] = true; + AL["Shade of Akama"] = true; + AL["Spirit of Udalo"] = true; + AL["Aluyen "] = true; + AL["Okuno "] = true; + AL["Seer Kanai"] = true; + + --Black Temple (Basement) + AL["Gurtogg Bloodboil"] = true; + AL["Reliquary of Souls"] = true; + AL["Essence of Suffering"] = true; + AL["Essence of Desire"] = true; + AL["Essence of Anger"] = true; + AL["Teron Gorefiend"] = true; + + --Black Temple (Top) + AL["Mother Shahraz"] = true; + AL["The Illidari Council"] = true; + AL["Lady Malande"] = true; + AL["Gathios the Shatterer"] = true; + AL["High Nethermancer Zerevor"] = true; + AL["Veras Darkshadow"] = true; + AL["Illidan Stormrage "] = true; + + --CFR: Serpentshrine Cavern + AL["Hydross the Unstable "] = true; + AL["The Lurker Below"] = true; + AL["Leotheras the Blind"] = true; + AL["Fathom-Lord Karathress"] = true; + AL["Seer Olum"] = true; + AL["Morogrim Tidewalker"] = true; + AL["Lady Vashj "] = true; + + --CFR: The Slave Pens + AL["Cenarion Expedition"] = true; + AL["Reservoir Key"] = true; + AL["Mennu the Betrayer"] = true; + AL["Weeder Greenthumb"] = true; + AL["Skar'this the Heretic"] = true; + AL["Rokmar the Crackler"] = true; + AL["Naturalist Bite"] = true; + AL["Quagmirran"] = true; + AL["Ahune "] = true; + + --CFR: The Steamvault + AL["Hydromancer Thespia"] = true; + AL["Main Chambers Access Panel"] = true; + AL["Second Fragment Guardian"] = true; + AL["Mekgineer Steamrigger"] = true; + AL["Warlord Kalithresh"] = true; + + --CFR: The Underbog + AL["Hungarfen"] = true; + AL["The Underspore"] = true; + AL["Ghaz'an"] = true; + AL["Earthbinder Rayge"] = true; + AL["Swamplord Musel'ek"] = true; + AL["Claw "] = true; + AL["The Black Stalker"] = true; + + --CoT: The Black Morass + AL["Opening of the Dark Portal"] = true; + AL["Keepers of Time"] = true; + AL["Key of Time"] = true; + AL["Sa'at "] = true; + AL["Chrono Lord Deja"] = true; + AL["Temporus"] = true; + AL["Aeonus"] = true; + AL["The Dark Portal"] = true; + AL["Medivh"] = true; + + --CoT: Hyjal Summit + AL["Battle for Mount Hyjal"] = true; + AL["The Scale of the Sands"] = true; + AL["Alliance Base"] = true; + AL["Lady Jaina Proudmoore"] = true; + AL["Horde Encampment"] = true; + AL["Thrall "] = true; + AL["Night Elf Village"] = true; + AL["Tyrande Whisperwind "] = true; + AL["Rage Winterchill"] = true; + AL["Anetheron"] = true; + AL["Kaz'rogal"] = true; + AL["Azgalor"] = true; + AL["Archimonde"] = true; + AL["Indormi "] = true; + AL["Tydormu "] = true; + + --CoT: Old Hillsbrad Foothills + AL["Escape from Durnholde Keep"] = true; + AL["Erozion"] = true; + AL["Brazen"] = true; + AL["Landing Spot"] = true; + AL["Lieutenant Drake"] = true; + AL["Thrall"] = true; + AL["Captain Skarloc"] = true; + AL["Epoch Hunter"] = true; + AL["Taretha"] = true; + AL["Jonathan Revah"] = true; + AL["Jerry Carter"] = true; + AL["Traveling"] = true; + AL["Thomas Yance "] = true; + AL["Aged Dalaran Wizard"] = true; + AL["Kel'Thuzad "] = true; + AL["Helcular"] = true; + AL["Farmer Kent"] = true; + AL["Sally Whitemane"] = true; + AL["Renault Mograine"] = true; + AL["Little Jimmy Vishas"] = true; + AL["Herod the Bully"] = true; + AL["Nat Pagle"] = true; + AL["Hal McAllister"] = true; + AL["Zixil "] = true; + AL["Overwatch Mark 0 "] = true; + AL["Southshore Inn"] = true; + AL["Captain Edward Hanes"] = true; + AL["Captain Sanders"] = true; + AL["Commander Mograine"] = true; + AL["Isillien"] = true; + AL["Abbendis"] = true; + AL["Fairbanks"] = true; + AL["Tirion Fordring"] = true; + AL["Arcanist Doan"] = true; + AL["Taelan"] = true; + AL["Barkeep Kelly "] = true; + AL["Frances Lin "] = true; + AL["Chef Jessen "] = true; + AL["Stalvan Mistmantle"] = true; + AL["Phin Odelic "] = true; + AL["Magistrate Henry Maleb"] = true; + AL["Raleigh the True"] = true; + AL["Nathanos Marris"] = true; + AL["Bilger the Straight-laced"] = true; + AL["Innkeeper Monica"] = true; + AL["Julie Honeywell"] = true; + AL["Jay Lemieux"] = true; + AL["Young Blanchy"] = true; + AL["Don Carlos"] = true; + AL["Guerrero"] = true; + + --Gruul's Lair + AL["High King Maulgar "] = true; + AL["Kiggler the Crazed"] = true; + AL["Blindeye the Seer"] = true; + AL["Olm the Summoner"] = true; + AL["Krosh Firehand"] = true; + AL["Gruul the Dragonkiller"] = true; + + --HFC: The Blood Furnace + AL["Thrallmar"] = true; + AL["Honor Hold"] = true; + AL["Flamewrought Key"] = true; + AL["The Maker"] = true; + AL["Broggok"] = true; + AL["Keli'dan the Breaker"] = true; + + --HFC: Hellfire Ramparts + AL["Watchkeeper Gargolmar"] = true; + AL["Omor the Unscarred"] = true; + AL["Vazruden"] = true; + AL["Nazan "] = true; + AL["Reinforced Fel Iron Chest"] = true; + + --HFC: Magtheridon's Lair + AL["Magtheridon"] = true; + + --HFC: The Shattered Halls + AL["Shattered Halls Key"] = true; + AL["Randy Whizzlesprocket"] = true; + AL["Drisella"] = true; + AL["Grand Warlock Nethekurse"] = true; + AL["Blood Guard Porung"] = true; + AL["Warbringer O'mrogg"] = true; + AL["Warchief Kargath Bladefist"] = true; + AL["Shattered Hand Executioner"] = true; + AL["Private Jacint"] = true; + AL["Rifleman Brownbeard"] = true; + AL["Captain Alina"] = true; + AL["Scout Orgarr"] = true; + AL["Korag Proudmane"] = true; + AL["Captain Boneshatter"] = true; + + --Karazhan Start + AL["The Violet Eye"] = true; + AL["The Master's Key"] = true; + AL["Staircase to the Ballroom"] = true; + AL["Stairs to Upper Stable"] = true; + AL["Ramp to the Guest Chambers"] = true; + AL["Stairs to Opera House Orchestra Level"] = true; + AL["Ramp from Mezzanine to Balcony"] = true; + AL["Connection to Master's Terrace"] = true; + AL["Path to the Broken Stairs"] = true; + AL["Hastings "] = true; + AL["Servant Quarters"] = true; + AL["Hyakiss the Lurker"] = true; + AL["Rokad the Ravager"] = true; + AL["Shadikith the Glider"] = true; + AL["Berthold "] = true; + AL["Calliard "] = true; + AL["Attumen the Huntsman"] = true; + AL["Midnight"] = true; + AL["Koren "] = true; + AL["Moroes "] = true; + AL["Baroness Dorothea Millstipe"] = true; + AL["Lady Catriona Von'Indi"] = true; + AL["Lady Keira Berrybuck"] = true; + AL["Baron Rafe Dreuger"] = true; + AL["Lord Robin Daris"] = true; + AL["Lord Crispin Ference"] = true; + AL["Bennett "] = true; + AL["Ebonlocke "] = true; + AL["Keanna's Log"] = true; + AL["Maiden of Virtue"] = true; + AL["Sebastian "] = true; + AL["Barnes "] = true; + AL["The Opera Event"] = true; + AL["Red Riding Hood"] = true; + AL["The Big Bad Wolf"] = true; + AL["Wizard of Oz"] = true; + AL["Dorothee"] = true; + AL["Tito"] = true; + AL["Strawman"] = true; + AL["Tinhead"] = true; + AL["Roar"] = true; + AL["The Crone"] = true; + AL["Romulo and Julianne"] = true; + AL["Romulo"] = true; + AL["Julianne"] = true; + AL["The Master's Terrace"] = true; + AL["Nightbane"] = true; + + --Karazhan End + AL["Broken Stairs"] = true; + AL["Ramp to Guardian's Library"] = true; + AL["Suspicious Bookshelf"] = true; + AL["Ramp up to the Celestial Watch"] = true; + AL["Ramp down to the Gamesman's Hall"] = true; + AL["Chess Event"] = true; + AL["Ramp to Medivh's Chamber"] = true; + AL["Spiral Stairs to Netherspace"] = true; + AL["The Curator"] = true; + AL["Wravien "] = true; + AL["Gradav "] = true; + AL["Kamsis "] = true; + AL["Terestian Illhoof"] = true; + AL["Kil'rek"] = true; + AL["Shade of Aran"] = true; + AL["Netherspite"] = true; + AL["Ythyar"] = true; + AL["Echo of Medivh"] = true; + AL["Dust Covered Chest"] = true; + AL["Prince Malchezaar"] = true; + + --Magisters Terrace + AL["Shattered Sun Offensive"] = true; + AL["Selin Fireheart"] = true; + AL["Fel Crystals"] = true; + AL["Tyrith"] = true; + AL["Vexallus"] = true; + AL["Scrying Orb"] = true; + AL["Kalecgos"] = true; + AL["Priestess Delrissa"] = true; + AL["Apoko"] = true; + AL["Eramas Brightblaze"] = true; + AL["Ellrys Duskhallow"] = true; + AL["Fizzle"] = true; + AL["Garaxxas"] = true; + AL["Sliver "] = true; + AL["Kagani Nightstrike"] = true; + AL["Warlord Salaris"] = true; + AL["Yazzai"] = true; + AL["Zelfan"] = true; + AL["Kael'thas Sunstrider "] = true; + + --Sunwell Plateau + AL["Sathrovarr the Corruptor"] = true; + AL["Madrigosa"] = true; + AL["Brutallus"] = true; + AL["Felmyst"] = true; + AL["Eredar Twins"] = true; + AL["Grand Warlock Alythess"] = true; + AL["Lady Sacrolash"] = true; + AL["M'uru"] = true; + AL["Entropius"] = true; + AL["Kil'jaeden "] = true; + + --TK: The Arcatraz + AL["Key to the Arcatraz"] = true; + AL["Zereketh the Unbound"] = true; + AL["Third Fragment Guardian"] = true; + AL["Dalliah the Doomsayer"] = true; + AL["Wrath-Scryer Soccothrates"] = true; + AL["Udalo"] = true; + AL["Harbinger Skyriss"] = true; + AL["Warden Mellichar"] = true; + AL["Millhouse Manastorm"] = true; + + --TK: The Botanica + AL["The Sha'tar"] = true; + AL["Warpforged Key"] = true; + AL["Commander Sarannis"] = true; + AL["High Botanist Freywinn"] = true; + AL["Thorngrin the Tender"] = true; + AL["Laj"] = true; + AL["Warp Splinter"] = true; + + --TK: The Mechanar + AL["Gatewatcher Gyro-Kill"] = true; + AL["Gatewatcher Iron-Hand"] = true; + AL["Cache of the Legion"] = true; + AL["Mechano-Lord Capacitus"] = true; + AL["Overcharged Manacell"] = true; + AL["Nethermancer Sepethrea"] = true; + AL["Pathaleon the Calculator"] = true; + + --TK: The Eye + AL["Al'ar "] = true; + AL["Void Reaver"] = true; + AL["High Astromancer Solarian"] = true; + AL["Thaladred the Darkener "] = true; + AL["Master Engineer Telonicus "] = true; + AL["Grand Astromancer Capernian "] = true; + AL["Lord Sanguinar "] = true; + + --Zul'Aman + AL["Harrison Jones"] = true; + AL["Nalorakk "] = true; + AL["Tanzar"] = true; + AL["The Map of Zul'Aman"] = true; + AL["Akil'Zon "] = true; + AL["Harkor"] = true; + AL["Jan'Alai "] = true; + AL["Kraz"] = true; + AL["Halazzi "] = true; + AL["Ashli"] = true; + AL["Zungam"] = true; + AL["Hex Lord Malacrass"] = true; + AL["Thurg"] = true; + AL["Gazakroth"] = true; + AL["Lord Raadan"] = true; + AL["Darkheart"] = true; + AL["Alyson Antille"] = true; + AL["Slither"] = true; + AL["Fenstalker"] = true; + AL["Koragg"] = true; + AL["Zul'jin"] = true; + AL["Forest Frogs"] = true; + AL["Kyren "] = true; + AL["Gunter "] = true; + AL["Adarrah"] = true; + AL["Brennan"] = true; + AL["Darwen"] = true; + AL["Deez"] = true; + AL["Galathryn"] = true; + AL["Mitzi"] = true; + AL["Mannuth"] = true; + +--***************** +-- WotLK Instances +--***************** + + --Azjol-Nerub: Ahn'kahet: The Old Kingdom + AL["Elder Nadox"] = true; + AL["Prince Taldaram"] = true; + AL["Jedoga Shadowseeker"] = true; + AL["Herald Volazj"] = true; + AL["Amanitar"] = true; + AL["Ahn'kahet Brazier"] = true; + + --Azjol-Nerub: Azjol-Nerub + AL["Krik'thir the Gatewatcher"] = true; + AL["Watcher Gashra"] = true; + AL["Watcher Narjil"] = true; + AL["Watcher Silthik"] = true; + AL["Hadronox"] = true; + AL["Elder Nurgen"] = true; + AL["Anub'arak"] = true; + + --Caverns of Time: The Culling of Stratholme + AL["The Culling of Stratholme"] = true; + AL["Meathook"] = true; + AL["Salramm the Fleshcrafter"] = true; + AL["Chrono-Lord Epoch"] = true; + AL["Mal'Ganis"] = true; + AL["Chromie"] = true; + AL["Infinite Corruptor"] = true; + AL["Guardian of Time"] = true; + AL["Scourge Invasion Points"] = true; + + --Drak'Tharon Keep + AL["Trollgore"] = true; + AL["Novos the Summoner"] = true; + AL["Elder Kilias"] = true; + AL["King Dred"] = true; + AL["The Prophet Tharon'ja"] = true; + AL["Kurzel"] = true; + AL["Drakuru's Brazier"] = true; + + --The Frozen Halls: Halls of Reflection + --3 beginning NPCs omitted, see The Forge of Souls + AL["Falric"] = true; + AL["Marwyn"] = true; + AL["Wrath of the Lich King"] = true; + AL["The Captain's Chest"] = true; + + --The Frozen Halls: Pit of Saron + --6 beginning NPCs omitted, see The Forge of Souls + AL["Forgemaster Garfrost"] = true; + AL["Martin Victus"] = true; + AL["Gorkun Ironskull"] = true; + AL["Krick and Ick"] = true; + AL["Scourgelord Tyrannus"] = true; + AL["Rimefang"] = true; + + --The Frozen Halls: The Forge of Souls + --Lady Jaina Proudmoore omitted, in Hyjal Summit + AL["Archmage Koreln "] = true; + AL["Archmage Elandra "] = true; + AL["Lady Sylvanas Windrunner "] = true; + AL["Dark Ranger Loralen"] = true; + AL["Dark Ranger Kalira"] = true; + AL["Bronjahm "] = true; + AL["Devourer of Souls"] = true; + + --Gundrak + AL["Slad'ran "] = true; + AL["Drakkari Colossus"] = true; + AL["Elder Ohanzee"] = true; + AL["Moorabi "] = true; + AL["Gal'darah "] = true; + AL["Eck the Ferocious"] = true; + + --Icecrown Citadel + AL["The Ashen Verdict"] = true; + AL["Lord Marrowgar"] = true; + AL["Lady Deathwhisper"] = true; + AL["Gunship Battle"] = true; + AL["Deathbringer Saurfang"] = true; + AL["Festergut"] = true; + AL["Rotface"] = true; + AL["Professor Putricide"] = true; + AL["Blood Prince Council"] = true; + AL["Prince Keleseth"] = true; + AL["Prince Taldaram"] = true; + AL["Prince Valanar"] = true; + AL["Blood-Queen Lana'thel"] = true; + AL["Valithria Dreamwalker"] = true; + AL["Sindragosa "] = true; + AL["The Lich King"] = true; + AL["To next map"] = true; + AL["From previous map"] = true; + AL["Upper Spire"] = true; + AL["Sindragosa's Lair"] = true; + + --Naxxramas + AL["Mr. Bigglesworth"] = true; + AL["Patchwerk"] = true; + AL["Grobbulus"] = true; + AL["Gluth"] = true; + AL["Thaddius"] = true; + AL["Anub'Rekhan"] = true; + AL["Grand Widow Faerlina"] = true; + AL["Maexxna"] = true; + AL["Instructor Razuvious"] = true; + AL["Gothik the Harvester"] = true; + AL["The Four Horsemen"] = true; + AL["Thane Korth'azz"] = true; + AL["Lady Blaumeux"] = true; + --Baron Rivendare omitted, listed under Stratholme + AL["Sir Zeliek"] = true; + AL["Four Horsemen Chest"] = true; + AL["Noth the Plaguebringer"] = true; + AL["Heigan the Unclean"] = true; + AL["Loatheb"] = true; + AL["Frostwyrm Lair"] = true; + AL["Sapphiron"] = true; + AL["Kel'Thuzad"] = true; + + --The Obsidian Sanctum + AL["Black Dragonflight Chamber"] = true; + AL["Sartharion "] = true; + AL["Tenebron"] = true; + AL["Shadron"] = true; + AL["Vesperon"] = true; + + --Onyxia's Lair + AL["Onyxian Warders"] = true; + AL["Whelp Eggs"] = true; + AL["Onyxia"] = true; + + --The Ruby Sanctum + AL["Red Dragonflight Chamber"] = true; + AL["Baltharus the Warborn"] = true; + AL["Saviana Ragefire"] = true; + AL["General Zarithrian"] = true; + AL["Halion "] = true; + + --The Nexus: The Eye of Eternity + AL["Malygos"] = true; + AL["Key to the Focusing Iris"] = true; + + --The Nexus: The Nexus + AL["Berinand's Research"] = true; + AL["Commander Stoutbeard"] = true; + AL["Commander Kolurg"] = true; + AL["Grand Magus Telestra"] = true; + AL["Anomalus"] = true; + AL["Elder Igasho"] = true; + AL["Ormorok the Tree-Shaper"] = true; + AL["Keristrasza"] = true; + + --The Nexus: The Oculus + AL["Drakos the Interrogator"] = true; + AL["Mage-Lord Urom"] = true; + AL["Ley-Guardian Eregos"] = true; + AL["Varos Cloudstrider "] = true; + AL["Centrifuge Construct"] = true; + AL["Cache of Eregos"] = true; + + --Trial of the Champion + AL["Grand Champions"] = true; + AL["Champions of the Alliance"] = true; + AL["Marshal Jacob Alerius"] = true; + AL["Ambrose Boltspark"] = true; + AL["Colosos"] = true; + AL["Jaelyne Evensong"] = true; + AL["Lana Stouthammer"] = true; + AL["Champions of the Horde"] = true; + AL["Mokra the Skullcrusher"] = true; + AL["Eressea Dawnsinger"] = true; + AL["Runok Wildmane"] = true; + AL["Zul'tore"] = true; + AL["Deathstalker Visceri"] = "Deathstalker Visceri"; + AL["Eadric the Pure "] = true; + AL["Argent Confessor Paletress"] = true; + AL["The Black Knight"] = true; + + --Trial of the Crusader + AL["Cavern Entrance"] = true; + AL["Northrend Beasts"] = true; + AL["Gormok the Impaler"] = true; + AL["Acidmaw"] = true; + AL["Dreadscale"] = true; + AL["Icehowl"] = true; + AL["Lord Jaraxxus"] = true; + AL["Faction Champions"] = true; + AL["Twin Val'kyr"] = true; + AL["Fjola Lightbane"] = true; + AL["Eydis Darkbane"] = true; + AL["Anub'arak"] = true; + AL["Heroic: Trial of the Grand Crusader"] = true; + -- Ulduar General + AL["Celestial Planetarium Key"] = true; + AL["The Siege"] = true; + AL["The Keepers"] = true; + + -- Ulduar A + AL["Flame Leviathan"] = true; + AL["Ignis the Furnace Master"] = true; + AL["Razorscale"] = true; + AL["XT-002 Deconstructor"] = true; + AL["Tower of Life"] = true; + AL["Tower of Flame"] = true; + AL["Tower of Frost"] = true; + AL["Tower of Storms"] = true; + + -- Ulduar B + AL["Assembly of Iron"] = true; + AL["Steelbreaker"] = true; + AL["Runemaster Molgeim"] = true; + AL["Stormcaller Brundir"] = true; + AL["Kologarn"] = true; + AL["Algalon the Observer"] = true; + AL["Prospector Doren"] = true; + AL["Archivum Console"] = true; + + -- Ulduar C + AL["Auriaya"] = true; + AL["Freya"] = true; + AL["Thorim"] = true; + AL["Hodir"] = true; + + -- Ulduar D + AL["Mimiron"] = true; + + -- Ulduar E + AL["General Vezax"] = true; + AL["Yogg-Saron"] = true; + + --Ulduar: Halls of Lightning + AL["General Bjarngrim"] = true; + AL["Volkhan"] = true; + AL["Ionar"] = true; + AL["Loken"] = true; + + --Ulduar: Halls of Stone + AL["Elder Yurauk"] = true; + AL["Krystallus"] = true; + AL["Maiden of Grief"] = true; + AL["Brann Bronzebeard"] = true; + AL["Tribunal Chest"] = true; + AL["Sjonnir the Ironshaper"] = true; + + --Utgarde Keep: Utgarde Keep + AL["Dark Ranger Marrah"] = true; + AL["Prince Keleseth "] = true; + AL["Elder Jarten"] = true; + AL["Dalronn the Controller"] = true; + AL["Skarvald the Constructor"] = true; + AL["Ingvar the Plunderer"] = true; + + --Utgarde Keep: Utgarde Pinnacle + AL["Brigg Smallshanks"] = true; + AL["Svala Sorrowgrave"] = true; + AL["Gortok Palehoof"] = true; + AL["Skadi the Ruthless"] = true; + AL["Elder Chogan'gada"] = true; + AL["King Ymiron"] = true; + + --Vault of Archavon + AL["Archavon the Stone Watcher"] = true; + AL["Emalon the Storm Watcher"] = true; + AL["Koralon the Flame Watcher"] = true; + AL["Toravon the Ice Watcher"] = true; + + --The Violet Hold + AL["Erekem"] = true; + AL["Zuramat the Obliterator"] = true; + AL["Xevozz"] = true; + AL["Ichoron"] = true; + AL["Moragg"] = true; + AL["Lavanthor"] = true; + AL["Cyanigosa"] = true; + AL["The Violet Hold Key"] = true; end \ No newline at end of file diff --git a/AtlasLoot/Menus/DungeonRaidMenus.lua b/AtlasLoot/Menus/DungeonRaidMenus.lua index de91ea4..be4588f 100644 --- a/AtlasLoot/Menus/DungeonRaidMenus.lua +++ b/AtlasLoot/Menus/DungeonRaidMenus.lua @@ -9,73 +9,76 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); AtlasLoot_SubMenus["Dungeons and RaidsCLASSIC"] = { Module = "AtlasLootOriginalWoW"; + SubMenu = "Dungeons and RaidsCLASSIC"; {"Raids:", "OldKeys", "Header"}; - {"", "MoltenCore"}; - {"", "ZulGurub"}; - {"", "Onyxia60"}; - {"", "BlackwingLair"}; - {"", "RuinsofAQ"}; - {"", "TempleofAQ"}; - {"", "Naxxramas60"}; + {"", "MoltenCore", "", "Molten Core"}; + {"", "ZulGurub", "", "Zul'Gurub"}; + {"", "Onyxia60", "", "Onyxias Hort"}; + {"", "BlackwingLair", "", "Blackwing Lair"}; + {"", "RuinsofAQ", "", "Ruinen von Ahn'Qiraj"}; + {"", "TempleofAQ", "", "Tempel von Ahn'Qiraj"}; + {"", "Naxxramas60", "", "Naxxramas"}; {"Dungeons:", "OldKeys", "Header"}; - {"", "BlackfathomDeeps"}; - {"", "BlackrockDepths"}; - {"", "LowerBlackrock"}; - {"", "UpperBlackrock"}; - {"", "TheDeadmines"}; - {"", "DireMaulNorth"}; - {"", "DireMaulEast"}; - {"", "DireMaulWest"}; - {"", "Gnomeregan"}; - {"", "Maraudon"}; - {"", "RagefireChasm"}; - {"", "RazorfenDowns"}; - {"", "RazorfenKraul"}; - {"", "Scarlet Monastery"}; - {"", "Scholomance"}; - {"", "ShadowfangKeep"}; - {"", "TheStockade"}; - {"", "Stratholme"}; - {"", "SunkenTemple"}; - {"", "Uldaman"}; - {"", "WailingCaverns"}; - {"", "ZulFarrak"}; + {"", "BlackfathomDeeps", "", "Blackfathom Deeps"}; + {"", "BlackrockDepths", "", "Blackrock Depths"}; + {"", "LowerBlackrock", "", "Lower Blackrock Spire"}; + {"", "UpperBlackrock", "", "Upper Blackrock Spire"}; + {"", "TheDeadmines", "", "The Deadmines"}; + {"", "DireMaulNorth", "", "Dire Maul (North)"}; + {"", "DireMaulEast", "", "Dire Maul (East)"}; + {"", "DireMaulWest", "", "Dire Maul (West)"}; + {"", "Gnomeregan", "", "Gnomeregan"}; + {"", "Maraudon", "", "Maraudon"}; + {"", "RagefireChasm", "", "Ragefire Chasm"}; + {"", "RazorfenDowns", "", "Razorfen Downs"}; + {"", "RazorfenKraul", "", "Razorfen Kraul"}; + {"", "Scarlet Monastery", "", "Scarlet Monastery"}; + {"", "Scholomance", "", "Scholomance"}; + {"", "ShadowfangKeep", "", "Shadowfang Keep"}; + {"", "TheStockade", "", "The Stockade"}; + {"", "Stratholme", "", "Stratholme"}; + {"", "SunkenTemple", "", "Sunken Temple"}; + {"", "Uldaman", "", "Uldaman"}; + {"", "WailingCaverns", "", "Wailing Caverns"}; + {"", "ZulFarrak", "", "Zul'Farrak"}; }; AtlasLoot_SubMenus["Dungeons and RaidsTBC"] = { Module = "AtlasLootBurningCrusade"; + SubMenu = "Dungeons and RaidsTBC"; {"Raids:", "BCKeys", "Header"}; - {"", "Karazhan"}; - {"", "GruulsLair"}; - {"", "HCMagtheridon"}; - {"", "CFRSerpentshrine"}; - {"", "TKEye"}; - {"", "ZulAman"}; - {"", "CoTHyjal"}; - {"", "BlackTemple"}; - {"", "SunwellPlateau"}; + {"", "Karazhan", "", "Karazhan"}; + {"", "GruulsLair", "", "Gruul's Lair"}; + {"", "HCMagtheridon", "", "Magtheridon's Lair"}; + {"", "CFRSerpentshrine", "", "Serpentshrine Cavern"}; + {"", "TKEye", "", "The Eye"}; + {"", "ZulAman", "", "Zul'Aman"}; + {"", "CoTHyjal", "", "Mount Hyjal"}; + {"", "BlackTemple", "", "Black Temple"}; + {"", "SunwellPlateau", "", "Sunwell Plateau"}; ---- Dungeons ----- {"Dungeons:", "BCKeys", "Header"}; - {"", "HCRamparts"}; - {"", "HCShatteredHalls"}; - {"", "HCFurnace"}; - {"", "TKBot"}; - {"", "TKArc"}; - {"", "TKMech"}; - {"", "AuchCrypts"}; - {"", "AuchManaTombs"}; - {"", "AuchSethekk"}; - {"", "AuchShadowLab"}; - {"", "CoTOldHillsbrad"}; - {"", "CoTBlackMorass"}; - {"", "CFRSlavePens"}; - {"", "CFRSteamvault"}; - {"", "CFRUnderbog"}; - {"", "MagistersTerrace"}; + {"", "HCRamparts", "", "Hellfire Ramparts"}; + {"", "HCShatteredHalls", "", "The Shattered Halls"}; + {"", "HCFurnace", "", "The Blood Furnace"}; + {"", "TKBot", "", "The Botanica"}; + {"", "TKArc", "", "The Arcatraz"}; + {"", "TKMech", "", "The Mechanar"}; + {"", "AuchCrypts", "", "Auchenai Crypts"}; + {"", "AuchManaTombs", "", "Mana-Tombs"}; + {"", "AuchSethekk", "", "Sethekk Halls"}; + {"", "AuchShadowLab", "", "Shadow Labyrinth"}; + {"", "CoTOldHillsbrad", "", "Old Hillsbrad Foothills"}; + {"", "CoTBlackMorass", "", "The Black Morass"}; + {"", "CFRSlavePens", "", "The Slave Pens"}; + {"", "CFRSteamvault", "", "The Steamvault"}; + {"", "CFRUnderbog", "", "The Underbog"}; + {"", "MagistersTerrace", "", "Magisters' Terrace"}; }; AtlasLoot_SubMenus["Dungeons and RaidsWRATH"] = { Module = "AtlasLootWotLK"; + SubMenu = "Dungeons and RaidsWRATH"; {"Raids:", "WrathKeys", "Header"}; {"", "Naxxramas80"}; {"", "Sartharion"}; From 4e1419e16682b94a1478db904a53cc9c5ce769c3 Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 14 Oct 2022 15:48:04 +1300 Subject: [PATCH 10/33] fixed wishlist sorting to always sort in the same order --- AtlasLoot/Core/WishList.lua | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index 4776348..d1cc218 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -151,21 +151,26 @@ end --Sort wishlist function AtlasLoot:SortWishList(refresh) - local sorted = {}; + Sorted = {}; local name = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name; local icon = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon; for i,v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do - if sorted[v[5]] and v[2] ~= 0 then - table.insert(sorted[v[5]],v); - elseif v[2] ~= 0 then - sorted[v[5]] = {}; - table.insert(sorted[v[5]],{0, 0, "INV_Box_01", WHITE..v[5], ""}); - table.insert(sorted[v[5]],v); + local function tableCheck() + for n,t in ipairs(Sorted) do + if t[2][5] == v[5] then + return t + end + end end + if tableCheck() and v[2] ~= 0 then + table.insert(tableCheck(),v); + elseif v[2] ~= 0 then + table.insert(Sorted,{{0, 0, "INV_Box_01", WHITE..v[5], ""},v}); + end end AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum] = {}; local num = 1 - for i,v in pairs(sorted) do + for i,v in ipairs(Sorted) do for n,t in ipairs(v) do if num ~= 1 and t[3] == "INV_Box_01" then table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num, 0, "Blank", WHITE.." ", ""}); From a956fa1a7f39b65453139fb5587efa0b0dd512a4 Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 14 Oct 2022 15:53:33 +1300 Subject: [PATCH 11/33] swaped a if check around --- AtlasLoot/Core/WishList.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index d1cc218..adc3c45 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -162,7 +162,7 @@ function AtlasLoot:SortWishList(refresh) end end end - if tableCheck() and v[2] ~= 0 then + if v[2] ~= 0 and tableCheck() then table.insert(tableCheck(),v); elseif v[2] ~= 0 then table.insert(Sorted,{{0, 0, "INV_Box_01", WHITE..v[5], ""},v}); From 5a0d869d87484fe01aae8021e93e70750d5ec8a8 Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 14 Oct 2022 20:46:25 +1300 Subject: [PATCH 12/33] wishlist bug fixs -wishlist bug fixs -added button to take you to the current instance --- AtlasLoot/Core/AtlasLoot.lua | 36 +++++++++++++--- AtlasLoot/Core/WishList.lua | 43 +++++++++++-------- .../DefaultFrame/AtlaslootDefaultFrame.lua | 40 +++++++++-------- .../AtlaslootDefaultFrameCreate.lua | 11 +++-- 4 files changed, 82 insertions(+), 48 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index b5b00d0..6c39a3c 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -143,8 +143,8 @@ function AtlasLoot:OnEnable() if IsAddOnLoaded("Atlas") then AtlasLoot:LoadMapData(); ATLASLOOT_ATLASLOADED = true; - AtlasLootDefaultFrame_MapButton:Show(); - AtlasLootDefaultFrame_MapSelectButton:Show(); + AtlasLootDefaultFrame_MapButton:Enable(); + AtlasLootDefaultFrame_MapSelectButton:Enable(); end --Add the loot browser to the special frames tables to enable closing wih the ESC key @@ -230,6 +230,12 @@ function AtlasLoot:OnEnable() LibStub("LibAboutPanel").new(AL["AtlasLoot"], "AtlasLoot"); end AtlasLoot_UpdateLootBrowserScale(); + local playerName = UnitName("player"); + if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then + AtlasLootItemsFrame_Wishlist_UnLock:Disable(); + else + AtlasLootItemsFrame_Wishlist_UnLock:Enable(); + end end function AtlasLoot_Reset(data) @@ -477,19 +483,27 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) AtlasLoot:ScrollFrameUpdate(); end - -- Sets the main page lable - AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name); + -- Finds the tablenumber to set where the difficulty slider should be. + local typeNumber = 1; + local function findTypeNumber() + for i,v in ipairs(AtlasLoot_Difficulty[dataSource[dataID].Type]) do + if v[2] == ItemindexID then + typeNumber = i; + return i; + end + end + end -- Moves the difficulty scrollslider if the difficulty has changed - if dataSource[dataID].Type and difType and #AtlasLoot_Difficulty[dataSource[dataID].Type] > 5 then + if dataSource[dataID].Type and difType and #AtlasLoot_Difficulty[dataSource[dataID].Type] > 5 and findTypeNumber() > 5 then local min, max = AtlasLootDefaultFrameScrollScrollBar:GetMinMaxValues(); - AtlasLootDefaultFrameScrollScrollBar:SetValue(ItemindexID * (max / #AtlasLoot_Difficulty[dataSource[dataID].Type])); + AtlasLootDefaultFrameScrollScrollBar:SetValue(typeNumber * (max / #AtlasLoot_Difficulty[dataSource[dataID].Type])); end -- Moves the difficulty scrollslider if wishlist if dataSource_backup == "AtlasLoot_CurrentWishList" and dataSource[dataID].ListNum > 5 then local min, max = AtlasLootDefaultFrameScrollScrollBar:GetMinMaxValues(); - AtlasLootDefaultFrameScrollScrollBar:SetValue(tablenum * (max / #AtlasLootWishList[dataSource[dataID].ListType][dataSource[dataID].ListNum])); + AtlasLootDefaultFrameScrollScrollBar:SetValue(dataSource[dataID].ListNum * (max / #AtlasLootWishList[dataSource[dataID].ListType][dataSource[dataID].ListNum])); end --For stopping the subtable from changing if its a token table @@ -510,6 +524,14 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) _G["AtlasLootItem_"..i].spellitemID = 0; end + -- Sets the main page lable + if dataSource[dataID][tablenum] and dataSource[dataID][tablenum].Name then + AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name); + else + AtlasLoot_BossName:SetText("This Is Empty"); + return + end + local function getProperItemConditionals(item) isValid = false; toShow = true; diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua index adc3c45..bc328c1 100644 --- a/AtlasLoot/Core/WishList.lua +++ b/AtlasLoot/Core/WishList.lua @@ -41,9 +41,6 @@ local ORANGE = "|cffFF8400"; function AtlasLoot:ShowWishList(listType,arg2,arg3) AtlasLoot_CurrentWishList = {["Show"] = {ListType = listType, ListNum = arg2 ,Name = "WishLists", Icon = AtlasLootWishList[listType][arg2].Icon}}; - if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then - AtlasLoot:SortWishList(true); - end local numPages = math.ceil(#AtlasLootWishList[listType][arg2]/30); for n = 1 ,numPages, 1 do table.insert(AtlasLoot_CurrentWishList["Show"], {Name = "Page "..n}) @@ -81,6 +78,9 @@ function AtlasLoot_WishListAddDropClick(typ, arg2, arg3, arg4) return; end table.insert(AtlasLootWishList["Own"][arg2], { #AtlasLootWishList["Own"][arg2] + 1, itemID, itemTexture, itemName, AtlasLoot_Data[AtlasLootItemsFrame.refresh[1]].Name, "", "", sourcePage}); + if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then + AtlasLoot:SortWishList(nil,"Own", arg2); + end DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..GREY..AL[" added to the WishList."]..WHITE.." ("..AtlasLootWishList["Own"][arg2].Name..")"); AtlasLoot_WishListDrop:Close(1) elseif typ == "addShared" then @@ -89,6 +89,9 @@ function AtlasLoot_WishListAddDropClick(typ, arg2, arg3, arg4) return; end table.insert(AtlasLootWishList["Shared"][arg2], { #AtlasLootWishList["Shared"][arg2] + 1, itemID, itemTexture, itemName, lootPage, "", "", sourcePage}); + if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then + AtlasLoot:SortWishList(nil,"Shared", arg2); + end DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..GREY..AL[" added to the WishList."]..WHITE.." ("..AtlasLootWishList["Shared"][arg2].Name..")"); AtlasLoot_WishListDrop:Close(1) end @@ -150,13 +153,13 @@ function AtlasLoot:MoveWishlistItem(pos,itemNum,replaceNum,replaceNum2) end --Sort wishlist -function AtlasLoot:SortWishList(refresh) - Sorted = {}; - local name = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name; - local icon = AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon; - for i,v in ipairs(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum]) do +function AtlasLoot:SortWishList(refresh,type,tNumb) + local sorted = {}; + local name = AtlasLootWishList[type][tNumb].Name; + local icon = AtlasLootWishList[type][tNumb].Icon; + for i,v in ipairs(AtlasLootWishList[type][tNumb]) do local function tableCheck() - for n,t in ipairs(Sorted) do + for n,t in ipairs(sorted) do if t[2][5] == v[5] then return t end @@ -165,25 +168,25 @@ function AtlasLoot:SortWishList(refresh) if v[2] ~= 0 and tableCheck() then table.insert(tableCheck(),v); elseif v[2] ~= 0 then - table.insert(Sorted,{{0, 0, "INV_Box_01", WHITE..v[5], ""},v}); + table.insert(sorted,{{0, 0, "INV_Box_01", WHITE..v[5], ""},v}); end end - AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum] = {}; + AtlasLootWishList[type][tNumb] = {}; local num = 1 - for i,v in ipairs(Sorted) do + for i,v in ipairs(sorted) do for n,t in ipairs(v) do if num ~= 1 and t[3] == "INV_Box_01" then - table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num, 0, "Blank", WHITE.." ", ""}); + table.insert(AtlasLootWishList[type][tNumb],{num, 0, "Blank", WHITE.." ", ""}); num = num + 1; end - table.insert(AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum],{num,t[2],t[3],t[4],t[5],t[6],t[7],t[8]}); + table.insert(AtlasLootWishList[type][tNumb],{num,t[2],t[3],t[4],t[5],t[6],t[7],t[8]}); num = num + 1; end end - AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Name = name; - AtlasLootWishList[AtlasLoot_CurrentWishList["Show"].ListType][AtlasLoot_CurrentWishList["Show"].ListNum].Icon = icon; - if refresh == nil then - AtlasLoot:ShowWishList(AtlasLoot_CurrentWishList["Show"].ListType, AtlasLoot_CurrentWishList["Show"].ListNum); + AtlasLootWishList[type][tNumb].Name = name; + AtlasLootWishList[type][tNumb].Icon = icon; + if refresh then + AtlasLoot:ShowWishList(type, tNumb); end end @@ -466,7 +469,7 @@ function AtlasLoot:WishListOptionsRegister() ); AtlasLoot_WishListOptions:AddLine( "text", AL["Sort Wishlist"], - "func", function() AtlasLoot:SortWishList() end, + "func", function() AtlasLoot:SortWishList(true,AtlasLoot_CurrentWishList["Show"].ListType,AtlasLoot_CurrentWishList["Show"].ListNum) end, "notCheckable", true ); if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" and AtlasLoot_CurrentWishList["Show"].ListType == "Shared" then @@ -903,8 +906,10 @@ function AtlasLoot_CreateWishlistOptions() WishListAutoSort:SetScript("OnClick", function() if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] = false; + AtlasLootItemsFrame_Wishlist_UnLock:Enable(); else AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] = true; + AtlasLootItemsFrame_Wishlist_UnLock:Disable(); end end) diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua index 7aec4b5..63a5a02 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua @@ -35,28 +35,11 @@ Called whenever the loot browser is shown and sets up buttons and loot tables function AtlasLootDefaultFrame_OnShow() --Definition of where I want the loot table to be shown --Remove the selection of a loot table in Atlas - AtlasLootItemsFrame.activeBoss = nil; - -- checks to see if there is an instance to auto load its loottable - local function findInstance() - for i,v in pairs(AtlasLoot_SubMenus) do - for n,t in ipairs(v) do - if t[4] == BabbleZone[GetRealZoneText()] then - ATLASLOOT_CURRENTTABLE = v.SubMenu; - ATLASLOOT_LASTMODULE = v.Module; - AtlasLoot:IsLootTableAvailable(ATLASLOOT_LASTMODULE); - AtlasLoot:ShowItemsFrame(t[2], "AtlasLoot_Data", 1); - AtlasLoot_DewdropSubMenu:Unregister(AtlasLootDefaultFrame_SubMenu); - AtlasLoot:DewdropSubMenuRegister(AtlasLoot_SubMenus[ATLASLOOT_CURRENTTABLE]); - AtlasLoot:WishListOptionsRegister(); - return true; - end - end - end - end + AtlasLootItemsFrame.activeBoss = nil; --Set the item table to the loot table --Show the last displayed loot table local lastboss = AtlasLoot.db.profile.LastBoss; - if AtlasLoot.db.profile.AutoCurrentInstance and findInstance() then elseif lastboss and lastboss[4] then + if AtlasLoot.db.profile.AutoCurrentInstance and AtlasLoot:ShowInstance() then elseif lastboss and lastboss[4] then ATLASLOOT_CURRENTTABLE = lastboss[5]; ATLASLOOT_LASTMODULE = lastboss[4]; AtlasLoot:IsLootTableAvailable(lastboss[4]); @@ -69,6 +52,24 @@ function AtlasLootDefaultFrame_OnShow() end end +-- Show the Instance you are in +function AtlasLoot:ShowInstance() + for i,v in pairs(AtlasLoot_SubMenus) do + for n,t in ipairs(v) do + if t[4] == BabbleZone[GetRealZoneText()] then + ATLASLOOT_CURRENTTABLE = v.SubMenu; + ATLASLOOT_LASTMODULE = v.Module; + AtlasLoot:IsLootTableAvailable(ATLASLOOT_LASTMODULE); + AtlasLoot:ShowItemsFrame(t[2], "AtlasLoot_Data", 1); + AtlasLoot_DewdropSubMenu:Unregister(AtlasLootDefaultFrame_SubMenu); + AtlasLoot:DewdropSubMenuRegister(AtlasLoot_SubMenus[ATLASLOOT_CURRENTTABLE]); + AtlasLoot:WishListOptionsRegister(); + return true; + end + end + end +end + --[[ AtlasLootDefaultFrame_OnHide: When we close the loot browser, re-bind the item table to Atlas @@ -306,6 +307,7 @@ function AtlasLoot:SetNewStyle(style) "AtlasLootDefaultFrame_AdvancedSearchPanel_ClearButton", "AtlasLootDefaultFrame_MapButton", "AtlasLootDefaultFrame_MapSelectButton", + "AtlasLootDefaultFrame_LoadInstanceButton", } if style == "new" then diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index 37e3da5..02afffe 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -554,7 +554,7 @@ scrollSlider:SetScript("OnShow", function() if scrollFrame.wishList then AtlasLoot:ScrollFrameUpdate(nil,scrollFrame.wishList); else - AtlasLoot:ScrollFrameUpdate() + AtlasLoot:ScrollFrameUpdate(); end end) @@ -704,7 +704,6 @@ local mapbtn = CreateFrame("Button","AtlasLootDefaultFrame_MapButton", AtlasLoot mapbtn:SetPoint("BOTTOMLEFT",Atlasloot_SubTableFrame,0,-27.5); mapbtn:SetText("Map"); mapbtn:SetScript("OnClick", function() AtlasLoot:MapOnShow(); end) - mapbtn:Hide(); -- Map Select Button local mapSelbtn = CreateFrame("Button","AtlasLootDefaultFrame_MapSelectButton", AtlasLootDefaultFrame,"OptionsButtonTemplate"); @@ -718,4 +717,10 @@ local mapSelbtn = CreateFrame("Button","AtlasLootDefaultFrame_MapSelectButton", end end); mapSelbtn:SetText("No Map"); - mapSelbtn:Hide(); \ No newline at end of file + + -- Load Current Instance Button +local currentInstance = CreateFrame("Button","AtlasLootDefaultFrame_LoadInstanceButton", AtlasLootDefaultFrame,"OptionsButtonTemplate"); + currentInstance:SetSize(283,24); + currentInstance:SetPoint("BOTTOMRIGHT",Atlasloot_SubTableFrame,10,-58); + currentInstance:SetScript("OnClick", function() AtlasLoot:ShowInstance(); end) + currentInstance:SetText("Load Current Instance"); \ No newline at end of file From 20b809fc2fff1aa12ebdf7d3835457f0a3819efb Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 14 Oct 2022 21:29:08 +1300 Subject: [PATCH 13/33] token table loading -fix token tables not loading all there items --- AtlasLoot/Core/AtlasLoot.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index cf844dc..e93fd61 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -22,7 +22,7 @@ AtlasLoot:AddTooltip(frameb, tooltiptext) AtlasLoot:FindId(name, difficulty) ]] -AtlasLoot = LibStub("AceAddon-3.0"):NewAddon("AtlasLoot", "AceEvent-3.0"); +AtlasLoot = LibStub("AceAddon-3.0"):NewAddon("AtlasLoot", "AceEvent-3.0", "AceTimer-3.0") --Instance required libraries local BabbleBoss = AtlasLoot_GetLocaleLibBabble("LibBabble-Boss-3.0") @@ -374,8 +374,9 @@ function AtlasLoot:CreateToken(dataID) if itemType == select(9, GetItemInfo(itemID)) or itemType2 == select(9, GetItemInfo(itemID)) then table.insert(AtlasLoot_TokenData[orgID][1], {#AtlasLoot_TokenData[orgID][1] + 1, v[2], v[3], v[4], t.Name}); end - if #AtlasLoot_Data[dataID] == n and #t == c then - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); + if #t == n then + AtlasLoot:CancelTimer(AtlasLoot.refreshTimer); + AtlasLoot.refreshTimer = AtlasLoot:ScheduleTimer("Refresh", 2); end end) end @@ -383,6 +384,11 @@ function AtlasLoot:CreateToken(dataID) end end +-- Refresh loottable after token table creation. +function AtlasLoot:Refresh() + AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); +end + --[[ AtlasLoot:ShowItemsFrame(dataID, dataSource, tablenum): dataID - Name of the loot table From 02d6729459b30b40c839ba0da3abe73fd427d5a6 Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 14 Oct 2022 21:32:10 +1300 Subject: [PATCH 14/33] Update AtlasLoot.toc update version --- AtlasLoot/AtlasLoot.toc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasLoot/AtlasLoot.toc b/AtlasLoot/AtlasLoot.toc index 0ae1e0a..795411f 100644 --- a/AtlasLoot/AtlasLoot.toc +++ b/AtlasLoot/AtlasLoot.toc @@ -2,7 +2,7 @@ ## Title: AtlasLoot Ascension Edition ## Notes: Shows the possible loot from the bosses ## Author: v7 Rebuid Done by: Anch/Rvng (Original: Hegarol, Ascension: Skray/Szyler/Anch/Rvng) -## Version: v7.0.2 +## Version: v7.1.0 ## X-eMail: ## X-Credits: Daviesh, Lag, Cellelach, Asurn, Pernicus and many others. ## X-Category: Map From 6cc6b4ff0721ddf26f6f319e9f6c49779184bd20 Mon Sep 17 00:00:00 2001 From: Anch Date: Sat, 15 Oct 2022 18:25:49 +1300 Subject: [PATCH 15/33] added new crafting dif select for cats that dont need bloodforged items to be shown --- AtlasLoot/Core/AtlasDifficulty.lua | 4 + AtlasLoot_Crafting/craftingCLASSIC.lua | 627 +------------------ AtlasLoot_Crafting/craftingTBC.lua | 818 +------------------------ 3 files changed, 47 insertions(+), 1402 deletions(-) diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua index 498b0de..7268a24 100644 --- a/AtlasLoot/Core/AtlasDifficulty.lua +++ b/AtlasLoot/Core/AtlasDifficulty.lua @@ -80,6 +80,10 @@ AtlasLoot_Difficulty = { {"Item Normal", 2 }, {"Bloodforged", 1 }, }; + ["CraftingNoBF"] = { + {"Crafting Patterns", "Pattern" }, + {"Item Normal", 2 }, + }; ["Search"] = { {"Bloodforged", 1}, diff --git a/AtlasLoot_Crafting/craftingCLASSIC.lua b/AtlasLoot_Crafting/craftingCLASSIC.lua index 135764d..da2a971 100644 --- a/AtlasLoot_Crafting/craftingCLASSIC.lua +++ b/AtlasLoot_Crafting/craftingCLASSIC.lua @@ -97,7 +97,7 @@ local MASTER = select(2, GetSpellInfo(28596)); --------------- AtlasLoot_Data["AlchemyCLASSIC"] = { Name = ALCHEMY; - Type = "Crafting"; + Type = "CraftingNoBF"; { Name = AL["Battle Elixirs"]; { 1, "s17573", "13454", "=q1=Greater Arcane Elixir", "=ds="..AL["Trainer"]}; @@ -549,6 +549,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["CookingCLASSIC"] = { Name = COOKING; + Type = "CraftingNoBF"; { Name = COOKING; { 1, "s25659", "21023", "=q1=Dirge's Kickin' Chimaerok Chops", "=ds="..AL["Quest"]..""}; @@ -683,6 +684,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["EnchantingCLASSIC"] = { Name = ENCHANTING; + Type = "CraftingNoBF"; { Name = AL["Enchant Boots"]; { 1, "s20023", "Spell_Holy_GreaterHeal", "=ds=Enchant Boots - Greater Agility", "=ds=#sr# 295"}; @@ -1084,6 +1086,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["FirstAidCLASSIC"] = { Name = FIRSTAID; + Type = "CraftingNoBF"; { Name = FIRSTAID; { 1, "s23787", "19440", "=q1=Powerful Anti-Venom", "=ds=#sr# 300"}; @@ -1107,6 +1110,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["Inscription"] = { Name = INSCRIPTION; + Type = "CraftingNoBF"; { Name = AL["Off-Hand Items"]; { 1, "s59498", "44210", "=q4=Faces of Doom", "=ds=" }; @@ -1963,6 +1967,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["MiningCLASSIC"] = { Name = MINING; + Type = "CraftingNoBF"; { Name = MINING; { 1, "s22967", "17771", "=q5=Smelt Elementium", "=ds=#sr# 300"}; @@ -2263,583 +2268,6 @@ local MASTER = select(2, GetSpellInfo(28596)); }; }; - ----------------------- - --- Profession Sets --- - ----------------------- - - ------------------------------- - --- Blacksmithing Mail Sets --- - ------------------------------- - - AtlasLoot_Data["BlacksmithingMailBloodsoulEmbrace"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbm1#", ""}; - { 2, 19691, "", "=q3=Bloodsoul Shoulders", "=ds=#s3#, #a3#"}; - { 3, 19690, "", "=q3=Bloodsoul Breastplate", "=ds=#s5#, #a3#"}; - { 4, 19692, "", "=q3=Bloodsoul Gauntlets", "=ds=#s9#, #a3#"}; - }; - - AtlasLoot_Data["BlacksmithingMailFelIronChain"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbm2#", ""}; - { 2, 23493, "", "=q2=Fel Iron Chain Coif", "=ds=#s1#, #a3#"}; - { 3, 23490, "", "=q2=Fel Iron Chain Tunic", "=ds=#s5#, #a3#"}; - { 4, 23494, "", "=q2=Fel Iron Chain Bracers", "=ds=#s8#, #a3#"}; - { 5, 23491, "", "=q2=Fel Iron Chain Gloves", "=ds=#s9#, #a3#"}; - }; - - -------------------------------- - --- Blacksmithing Plate Sets --- - -------------------------------- - - AtlasLoot_Data["BlacksmithingPlateImperialPlate"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp1#", ""}; - { 2, 12427, "", "=q2=Imperial Plate Helm", "=ds=#s1#, #a4#"}; - { 3, 12428, "", "=q2=Imperial Plate Shoulders", "=ds=#s3#, #a4#"}; - { 4, 12422, "", "=q2=Imperial Plate Chest", "=ds=#s5#, #a4#"}; - { 5, 12425, "", "=q2=Imperial Plate Bracers", "=ds=#s8#, #a4#"}; - { 6, 12424, "", "=q2=Imperial Plate Belt", "=ds=#s10#, #a4#"}; - { 7, 12429, "", "=q2=Imperial Plate Leggings", "=ds=#s11#, #a4#"}; - { 8, 12426, "", "=q2=Imperial Plate Boots", "=ds=#s12#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateTheDarksoul"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp2#", ""}; - { 2, 19695, "", "=q3=Darksoul Shoulders", "=ds=#s3#, #a4#"}; - { 3, 19693, "", "=q3=Darksoul Breastplate", "=ds=#s5#, #a4#"}; - { 4, 19694, "", "=q3=Darksoul Leggings", "=ds=#s11#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateFelIronPlate"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp3#", ""}; - { 2, 23489, "", "=q2=Fel Iron Breastplate", "=ds=#s5#, #a4#"}; - { 3, 23482, "", "=q2=Fel Iron Plate Gloves", "=ds=#s9#, #a4#"}; - { 4, 23484, "", "=q2=Fel Iron Plate Belt", "=ds=#s10#, #a4#"}; - { 5, 23488, "", "=q2=Fel Iron Plate Pants", "=ds=#s11#, #a4#"}; - { 6, 23487, "", "=q2=Fel Iron Plate Boots", "=ds=#s12#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateAdamantiteB"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp4#", ""}; - { 2, 23507, "", "=q3=Adamantite Breastplate", "=ds=#s5#, #a4#"}; - { 3, 23506, "", "=q3=Adamantite Plate Bracers", "=ds=#s8#, #a4#"}; - { 4, 23508, "", "=q3=Adamantite Plate Gloves", "=ds=#s9#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateFlameG"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp5#", "=q1=#j11#"}; - { 2, 23516, "", "=q3=Flamebane Helm", "=ds=#s1#, #a4#"}; - { 3, 23513, "", "=q3=Flamebane Breastplate", "=ds=#s5#, #a4#"}; - { 4, 23515, "", "=q3=Flamebane Bracers", "=ds=#s8#, #a4#"}; - { 5, 23514, "", "=q3=Flamebane Gloves", "=ds=#s9#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateEnchantedAdaman"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp6#", "=q1=#j12#"}; - { 2, 23509, "", "=q3=Enchanted Adamantite Breastplate", "=ds=#s5#, #a4#"}; - { 3, 23510, "", "=q3=Enchanted Adamantite Belt", "=ds=#s10#, #a4#"}; - { 4, 23512, "", "=q3=Enchanted Adamantite Leggings", "=ds=#s11#, #a4#"}; - { 5, 23511, "", "=q3=Enchanted Adamantite Boots", "=ds=#s12#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateKhoriumWard"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp7#", ""}; - { 2, 23524, "", "=q3=Khorium Belt", "=ds=#s10#, #a4#"}; - { 3, 23523, "", "=q3=Khorium Pants", "=ds=#s11#, #a4#"}; - { 4, 23525, "", "=q3=Khorium Boots", "=ds=#s12#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateFaithFelsteel"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp8#", ""}; - { 2, 23519, "", "=q3=Felsteel Helm", "=ds=#s1#, #a4#"}; - { 3, 23517, "", "=q3=Felsteel Gloves", "=ds=#s9#, #a4#"}; - { 4, 23518, "", "=q3=Felsteel Leggings", "=ds=#s11#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateBurningRage"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp9#", ""}; - { 2, 23521, "", "=q3=Ragesteel Helm", "=ds=#s1#, #a4#"}; - { 3, 33173, "", "=q3=Ragesteel Shoulders", "=ds=#s3#, #a4#"}; - { 4, 23522, "", "=q3=Ragesteel Breastplate", "=ds=#s5#, #a4#"}; - { 5, 23520, "", "=q3=Ragesteel Gloves", "=ds=#s9#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateOrnateSaroniteBattlegear"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp10#", ""}; - { 2, 42728, "", "=q3=Ornate Saronite Skullshield", "=ds=#s1#, #a4#"}; - { 3, 42727, "", "=q3=Ornate Saronite Pauldrons", "=ds=#s3#, #a4#"}; - { 4, 42725, "", "=q3=Ornate Saronite Hauberk", "=ds=#s5#, #a4#"}; - { 5, 42723, "", "=q3=Ornate Saronite Bracers", "=ds=#s8#, #a4#"}; - { 6, 42724, "", "=q3=Ornate Saronite Gauntlets", "=ds=#s9#, #a4#"}; - { 7, 42729, "", "=q3=Ornate Saronite Waistguard", "=ds=#s10#, #a4#"}; - { 8, 42726, "", "=q3=Ornate Saronite Legplates", "=ds=#s11#, #a4#"}; - { 9, 42730, "", "=q3=Ornate Saronite Walkers", "=ds=#s12#, #a4#"}; - }; - - AtlasLoot_Data["BlacksmithingPlateSavageSaroniteBattlegear"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp11#", ""}; - { 2, 41350, "", "=q3=Savage Saronite Skullshield", "=ds=#s1#, #a4#"}; - { 3, 41351, "", "=q3=Savage Saronite Pauldrons", "=ds=#s3#, #a4#"}; - { 4, 41353, "", "=q3=Savage Saronite Hauberk", "=ds=#s5#, #a4#"}; - { 5, 41354, "", "=q3=Savage Saronite Bracers", "=ds=#s8#, #a4#"}; - { 6, 41349, "", "=q3=Savage Saronite Gauntlets", "=ds=#s9#, #a4#"}; - { 7, 41352, "", "=q3=Savage Saronite Waistguard", "=ds=#s10#, #a4#"}; - { 8, 41347, "", "=q3=Savage Saronite Legplates", "=ds=#s11#, #a4#"}; - { 9, 41348, "", "=q3=Savage Saronite Walkers", "=ds=#s12#, #a4#"}; - }; - - ----------------------------------- - --- Leatherworking Leather Sets --- - ----------------------------------- - - AtlasLoot_Data["LeatherworkingLeatherVolcanicArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl1#", "=q1=#j11#"}; - { 2, 15055, "", "=q2=Volcanic Shoulders", "=ds=#s3#, #a2#"}; - { 3, 15053, "", "=q2=Volcanic Breastplate", "=ds=#s5#, #a2#"}; - { 4, 15054, "", "=q2=Volcanic Leggings", "=ds=#s11#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherIronfeatherArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl2#", ""}; - { 2, 15067, "", "=q3=Ironfeather Shoulders", "=ds=#s3#, #a2#"}; - { 3, 15066, "", "=q3=Ironfeather Breastplate", "=ds=#s5#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherStormshroudArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl3#", ""}; - { 2, 15058, "", "=q3=Stormshroud Shoulders", "=ds=#s3#, #a2#"}; - { 3, 15056, "", "=q3=Stormshroud Armor", "=ds=#s5#, #a2#"}; - { 4, 21278, "", "=q3=Stormshroud Gloves", "=ds=#s9#, #a2#"}; - { 5, 15057, "", "=q3=Stormshroud Pants", "=ds=#s11#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherDevilsaurArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl4#", ""}; - { 2, 15063, "", "=q3=Devilsaur Gauntlets", "=ds=#s9#, #a2#"}; - { 3, 15062, "", "=q3=Devilsaur Leggings", "=ds=#s11#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherBloodTigerH"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl5#", ""}; - { 2, 19689, "", "=q3=Blood Tiger Shoulders", "=ds=#s3#, #a2#"}; - { 3, 19688, "", "=q3=Blood Tiger Breastplate", "=ds=#s5#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherPrimalBatskin"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl6#", ""}; - { 2, 19685, "", "=q3=Primal Batskin Jerkin", "=ds=#s5#, #a2#"}; - { 3, 19687, "", "=q3=Primal Batskin Bracers", "=ds=#s8#, #a2#"}; - { 4, 19686, "", "=q3=Primal Batskin Gloves", "=ds=#s9#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherWildDraenishA"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl7#", ""}; - { 2, 25676, "", "=q2=Wild Draenish Vest", "=ds=#s5#, #a2#"}; - { 3, 25674, "", "=q2=Wild Draenish Gloves", "=ds=#s9#, #a2#"}; - { 4, 25675, "", "=q2=Wild Draenish Leggings", "=ds=#s11#, #a2#"}; - { 5, 25673, "", "=q2=Wild Draenish Boots", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherThickDraenicA"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl8#", ""}; - { 2, 25671, "", "=q2=Thick Draenic Vest", "=ds=#s5#, #a2#"}; - { 3, 25669, "", "=q2=Thick Draenic Gloves", "=ds=#s9#, #a2#"}; - { 4, 25670, "", "=q2=Thick Draenic Pants", "=ds=#s11#, #a2#"}; - { 5, 25668, "", "=q2=Thick Draenic Boots", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherFelSkin"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl9#", ""}; - { 2, 25685, "", "=q3=Fel Leather Gloves", "=ds=#s9#, #a2#"}; - { 3, 25687, "", "=q3=Fel Leather Leggings", "=ds=#s11#, #a2#"}; - { 4, 25686, "", "=q3=Fel Leather Boots", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherSClefthoof"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl10#", ""}; - { 2, 25689, "", "=q3=Heavy Clefthoof Vest", "=ds=#s5#, #a2#"}; - { 3, 25690, "", "=q3=Heavy Clefthoof Leggings", "=ds=#s11#, #a2#"}; - { 4, 25691, "", "=q3=Heavy Clefthoof Boots", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherPrimalIntent"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwe1#", "=q1=#p11#"}; - { 2, 29525, "", "=q4=Primalstrike Vest", "=ds=#s5#, #a2#"}; - { 3, 29527, "", "=q4=Primalstrike Bracers", "=ds=#s8#, #a2#"}; - { 4, 29526, "", "=q4=Primalstrike Belt", "=ds=#s10#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherWindhawkArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwt1#", "=q1=#p10#"}; - { 2, 29522, "", "=q4=Windhawk Hauberk", "=ds=#s5#, #a2#"}; - { 3, 29523, "", "=q4=Windhawk Bracers", "=ds=#s8#, #a2#"}; - { 4, 29524, "", "=q4=Windhawk Belt", "=ds=#s10#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherBoreanEmbrace"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl11#", ""}; - { 2, 38437, "", "=q2=Arctic Helm", "=ds=#s1#, #a2#"}; - { 3, 38402, "", "=q2=Arctic Shoulderpads", "=ds=#s3#, #a2#"}; - { 4, 38400, "", "=q2=Arctic Chestpiece", "=ds=#s5#, #a2#"}; - { 5, 38433, "", "=q2=Arctic Wristguards", "=ds=#s8#, #a2#"}; - { 6, 38403, "", "=q2=Arctic Gloves", "=ds=#s9#, #a2#"}; - { 7, 38405, "", "=q2=Arctic Belt", "=ds=#s10#, #a2#"}; - { 8, 38401, "", "=q2=Arctic Leggings", "=ds=#s11#, #a2#"}; - { 9, 38404, "", "=q2=Arctic Boots", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherIceborneEmbrace"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl12#", ""}; - { 2, 38438, "", "=q2=Iceborne Helm", "=ds=#s1#, #a2#"}; - { 3, 38411, "", "=q2=Iceborne Shoulderpads", "=ds=#s3#, #a2#"}; - { 4, 38408, "", "=q2=Iceborne Chestguard", "=ds=#s5#, #a2#"}; - { 5, 38434, "", "=q2=Iceborne Wristguards", "=ds=#s8#, #a2#"}; - { 6, 38409, "", "=q2=Iceborne Gloves", "=ds=#s9#, #a2#"}; - { 7, 38406, "", "=q2=Iceborne Belt", "=ds=#s10#, #a2#"}; - { 8, 38410, "", "=q2=Iceborne Leggings", "=ds=#s11#, #a2#"}; - { 9, 38407, "", "=q2=Iceborne Boots", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherEvisceratorBattlegear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl13#", ""}; - { 2, 43260, "", "=q3=Eviscerator's Facemask", "=ds=#s1#, #a2#"}; - { 3, 43433, "", "=q3=Eviscerator's Shoulderpads", "=ds=#s3#, #a2#"}; - { 4, 43434, "", "=q3=Eviscerator's Chestguard", "=ds=#s5#, #a2#"}; - { 5, 43435, "", "=q3=Eviscerator's Bindings", "=ds=#s8#, #a2#"}; - { 6, 43436, "", "=q3=Eviscerator's Gauntlets", "=ds=#s9#, #a2#"}; - { 7, 43437, "", "=q3=Eviscerator's Waistguard", "=ds=#s10#, #a2#"}; - { 8, 43438, "", "=q3=Eviscerator's Legguards", "=ds=#s11#, #a2#"}; - { 9, 43439, "", "=q3=Eviscerator's Treads", "=ds=#s12#, #a2#"}; - }; - - AtlasLoot_Data["LeatherworkingLeatherOvercasterBattlegear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl14#", ""}; - { 2, 43261, "", "=q3=Overcast Headguard", "=ds=#s1#, #a2#"}; - { 3, 43262, "", "=q3=Overcast Spaulders", "=ds=#s3#, #a2#"}; - { 4, 43263, "", "=q3=Overcast Chestguard", "=ds=#s5#, #a2#"}; - { 5, 43264, "", "=q3=Overcast Bracers", "=ds=#s8#, #a2#"}; - { 6, 43265, "", "=q3=Overcast Handwraps", "=ds=#s9#, #a2#"}; - { 7, 43266, "", "=q3=Overcast Belt", "=ds=#s10#, #a2#"}; - { 8, 43271, "", "=q3=Overcast Leggings", "=ds=#s11#, #a2#"}; - { 9, 43273, "", "=q3=Overcast Boots", "=ds=#s12#, #a2#"}; - }; - - -------------------------------- - --- Leatherworking Mail Sets --- - -------------------------------- - - AtlasLoot_Data["LeatherworkingMailGreenDragonM"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm1#", "=q1=#j13#"}; - { 2, 15045, "", "=q3=Green Dragonscale Breastplate", "=ds=#s5#, #a3#"}; - { 3, 20296, "", "=q3=Green Dragonscale Gauntlets", "=ds=#s9#, #a3#"}; - { 4, 15046, "", "=q3=Green Dragonscale Leggings", "=ds=#s11#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailBlueDragonM"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm2#", "=q1=#j12#"}; - { 2, 15049, "", "=q3=Blue Dragonscale Shoulders", "=ds=#s3#, #a3#"}; - { 3, 15048, "", "=q3=Blue Dragonscale Breastplate", "=ds=#s5#, #a3#"}; - { 4, 20295, "", "=q3=Blue Dragonscale Leggings", "=ds=#s11#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailBlackDragonM"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm3#", "=q1=#j11#"}; - { 2, 15051, "", "=q3=Black Dragonscale Shoulders", "=ds=#s3#, #a3#"}; - { 3, 15050, "", "=q3=Black Dragonscale Breastplate", "=ds=#s5#, #a3#"}; - { 4, 15052, "", "=q3=Black Dragonscale Leggings", "=ds=#s11#, #a3#"}; - { 5, 16984, "", "=q4=Black Dragonscale Boots", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailScaledDraenicA"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm4#", ""}; - { 2, 25660, "", "=q2=Scaled Draenic Vest", "=ds=#s5#, #a3#"}; - { 3, 25661, "", "=q2=Scaled Draenic Gloves", "=ds=#s9#, #a3#"}; - { 4, 25662, "", "=q2=Scaled Draenic Pants", "=ds=#s11#, #a3#"}; - { 5, 25659, "", "=q2=Scaled Draenic Boots", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailFelscaleArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm5#", ""}; - { 2, 25657, "", "=q2=Felscale Breastplate", "=ds=#s5#, #a3#"}; - { 3, 25654, "", "=q2=Felscale Gloves", "=ds=#s9#, #a3#"}; - { 4, 25656, "", "=q2=Felscale Pants", "=ds=#s11#, #a3#"}; - { 5, 25655, "", "=q2=Felscale Boots", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailFelstalkerArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm6#", ""}; - { 2, 25696, "", "=q3=Felstalker Breastplate", "=ds=#s5#, #a3#"}; - { 3, 25697, "", "=q3=Felstalker Bracers", "=ds=#s8#, #a3#"}; - { 4, 25695, "", "=q3=Felstalker Belt", "=ds=#s10#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailNetherFury"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm7#", ""}; - { 2, 25694, "", "=q3=Netherfury Belt", "=ds=#s10#, #a3#"}; - { 3, 25692, "", "=q3=Netherfury Leggings", "=ds=#s11#, #a3#"}; - { 4, 25693, "", "=q3=Netherfury Boots", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailNetherscaleArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwd1#", "=q1=#p9#"}; - { 2, 29515, "", "=q4=Ebon Netherscale Breastplate", "=ds=#s5#, #a3#"}; - { 3, 29517, "", "=q4=Ebon Netherscale Bracers", "=ds=#s8#, #a3#"}; - { 4, 29516, "", "=q4=Ebon Netherscale Belt", "=ds=#s10#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailNetherstrikeArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwd2#", "=q1=#p9#"}; - { 2, 29519, "", "=q4=Netherstrike Breastplate", "=ds=#s5#, #a3#"}; - { 3, 29521, "", "=q4=Netherstrike Bracers", "=ds=#s8#, #a3#"}; - { 4, 29520, "", "=q4=Netherstrike Belt", "=ds=#s10#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailFrostscaleBinding"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm8#", ""}; - { 2, 38440, "", "=q2=Frostscale Helm", "=ds=#s1#, #a3#"}; - { 3, 38424, "", "=q2=Frostscale Shoulders", "=ds=#s3#, #a3#"}; - { 4, 38414, "", "=q2=Frostscale Chestguard", "=ds=#s5#, #a3#"}; - { 5, 38436, "", "=q2=Frostscale Bracers", "=ds=#s8#, #a3#"}; - { 6, 38415, "", "=q2=Frostscale Gloves", "=ds=#s9#, #a3#"}; - { 7, 38412, "", "=q2=Frostscale Belt", "=ds=#s10#, #a3#"}; - { 8, 38416, "", "=q2=Frostscale Leggings", "=ds=#s11#, #a3#"}; - { 9, 38413, "", "=q2=Frostscale Boots", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailNerubianHive"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm9#", ""}; - { 2, 38439, "", "=q2=Nerubian Helm", "=ds=#s1#, #a3#"}; - { 3, 38417, "", "=q2=Nerubian Shoulders", "=ds=#s3#, #a3#"}; - { 4, 38420, "", "=q2=Nerubian Chestguard", "=ds=#s5#, #a3#"}; - { 5, 38435, "", "=q2=Nerubian Bracers", "=ds=#s8#, #a3#"}; - { 6, 38421, "", "=q2=Nerubian Gloves", "=ds=#s9#, #a3#"}; - { 7, 38418, "", "=q2=Nerubian Belt", "=ds=#s10#, #a3#"}; - { 8, 38422, "", "=q2=Nerubian Legguards", "=ds=#s11#, #a3#"}; - { 9, 38419, "", "=q2=Nerubian Boots", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailStormhideBattlegear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm10#", ""}; - { 2, 43455, "", "=q3=Stormhide Crown", "=ds=#s1#, #a3#"}; - { 3, 43457, "", "=q3=Stormhide Shoulders", "=ds=#s3#, #a3#"}; - { 4, 43453, "", "=q3=Stormhide Hauberk", "=ds=#s5#, #a3#"}; - { 5, 43452, "", "=q3=Stormhide Wristguards", "=ds=#s8#, #a3#"}; - { 6, 43454, "", "=q3=Stormhide Grips", "=ds=#s9#, #a3#"}; - { 7, 43450, "", "=q3=Stormhide Belt", "=ds=#s10#, #a3#"}; - { 8, 43456, "", "=q3=Stormhide Legguards", "=ds=#s11#, #a3#"}; - { 9, 43451, "", "=q3=Stormhide Stompers", "=ds=#s12#, #a3#"}; - }; - - AtlasLoot_Data["LeatherworkingMailSwiftarrowBattlefear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm11#", ""}; - { 2, 43447, "", "=q3=Swiftarrow Helm", "=ds=#s1#, #a3#"}; - { 3, 43449, "", "=q3=Swiftarrow Shoulderguards", "=ds=#s3#, #a3#"}; - { 4, 43445, "", "=q3=Swiftarrow Hauberk", "=ds=#s5#, #a3#"}; - { 5, 43444, "", "=q3=Swiftarrow Bracers", "=ds=#s8#, #a3#"}; - { 6, 43446, "", "=q3=Swiftarrow Gauntlets", "=ds=#s9#, #a3#"}; - { 7, 43442, "", "=q3=Swiftarrow Belt", "=ds=#s10#, #a3#"}; - { 8, 43448, "", "=q3=Swiftarrow Leggings", "=ds=#s11#, #a3#"}; - { 9, 43443, "", "=q3=Swiftarrow Boots", "=ds=#s12#, #a3#"}; - }; - - ---------------------- - --- Tailoring Sets --- - ---------------------- - - AtlasLoot_Data["TailoringBloodvineG"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt1#", ""}; - { 2, 19682, "", "=q3=Bloodvine Vest", "=ds=#s5#, #a1#"}; - { 3, 19683, "", "=q3=Bloodvine Leggings", "=ds=#s11#, #a1#"}; - { 4, 19684, "", "=q3=Bloodvine Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringNeatherVest"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt2#", ""}; - { 2, 21855, "", "=q2=Netherweave Tunic", "=ds=#s5#, #a1#"}; - { 3, 21854, "", "=q2=Netherweave Robe", "=ds=#s5#, #a1#"}; - { 4, 21849, "", "=q2=Netherweave Bracers", "=ds=#s8#, #a1#"}; - { 5, 21851, "", "=q2=Netherweave Gloves", "=ds=#s9#, #a1##"}; - { 6, 21850, "", "=q2=Netherweave Belt", "=ds=#s10#, #a1#"}; - { 7, 21852, "", "=q2=Netherweave Pants", "=ds=#s11#, #a1#"}; - { 8, 21853, "", "=q2=Netherweave Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringImbuedNeather"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt3#", ""}; - { 2, 21862, "", "=q3=Imbued Netherweave Tunic", "=ds=#s5#, #a1#"}; - { 3, 21861, "", "=q3=Imbued Netherweave Robe", "=ds=#s5#, #a1#"}; - { 4, 21859, "", "=q3=Imbued Netherweave Pants", "=ds=#s11#, #a1#"}; - { 5, 21860, "", "=q3=Imbued Netherweave Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringArcanoVest"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt4#", "=q1=#j12#"}; - { 2, 21868, "", "=q3=Arcanoweave Robe", "=ds=#s5#, #a1#"}; - { 3, 21866, "", "=q3=Arcanoweave Bracers", "=ds=#s8#, #a1#"}; - { 4, 21867, "", "=q3=Arcanoweave Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringTheUnyielding"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt5#", ""}; - { 2, 24249, "", "=q3=Unyielding Bracers", "=ds=#s8#, #a1#"}; - { 3, 24255, "", "=q4=Unyielding Girdle", "=ds=#s10#, #a1#"}; - }; - - AtlasLoot_Data["TailoringWhitemendWis"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt6#", ""}; - { 2, 24264, "", "=q4=Whitemend Hood", "=ds=#s1#, #a1#"}; - { 3, 24261, "", "=q4=Whitemend Pants", "=ds=#s11#, #a1#"}; - }; - - AtlasLoot_Data["TailoringSpellstrikeInfu"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt7#", ""}; - { 2, 24266, "", "=q4=Spellstrike Hood", "=ds=#s1#, #a1#"}; - { 3, 24262, "", "=q4=Spellstrike Pants", "=ds=#s11#, #a1#"}; - }; - - AtlasLoot_Data["TailoringBattlecastG"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt8#", ""}; - { 2, 24267, "", "=q4=Battlecast Hood", "=ds=#s1#, #a1#"}; - { 3, 24263, "", "=q4=Battlecast Pants", "=ds=#s11#, #a1#"}; - }; - - AtlasLoot_Data["TailoringSoulclothEm"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt9#", "=q1=#j12#"}; - { 2, 21864, "", "=q4=Soulcloth Shoulders", "=ds=#s3#, #a1#"}; - { 3, 21865, "", "=q4=Soulcloth Vest", "=ds=#s5#, #a1#"}; - { 4, 21863, "", "=q4=Soulcloth Gloves", "=ds=#s9#, #a1#"}; - }; - - AtlasLoot_Data["TailoringPrimalMoon"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#crafttm1#", "=q1=#p19#"}; - { 2, 21874, "", "=q4=Primal Mooncloth Shoulders", "=ds=#s3#, #a1#"}; - { 3, 21875, "", "=q4=Primal Mooncloth Robe", "=ds=#s5#, #a1#"}; - { 4, 21873, "", "=q4=Primal Mooncloth Belt", "=ds=#s10#, #a1#"}; - }; - - AtlasLoot_Data["TailoringShadowEmbrace"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#crafttsh1#", "=q1=#p20#"}; - { 2, 21869, "", "=q4=Frozen Shadoweave Shoulders", "=ds=#s3#, #a1#"}; - { 3, 21871, "", "=q4=Frozen Shadoweave Vest", "=ds=#s5#, #a1#"}; - { 4, 21870, "", "=q4=Frozen Shadoweave Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringSpellfireWRATH"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#crafttsf1#", "=q1=#p21#"}; - { 2, 21848, "", "=q4=Spellfire Robe", "=ds=#s5#, #a1#"}; - { 3, 21847, "", "=q4=Spellfire Gloves", "=ds=#s9#, #a1#"}; - { 4, 21846, "", "=q4=Spellfire Belt", "=ds=#s10#, #a1#"}; - }; - - AtlasLoot_Data["TailoringFrostwovenPower"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt10#", ""}; - { 2, 41521, "", "=q2=Frostwoven Cowl", "=ds=#s1#, #a1#"}; - { 3, 41513, "", "=q2=Frostwoven Shoulders", "=ds=#s3#, #a1#"}; - { 4, 41515, "", "=q2=Frostwoven Robe", "=ds=#s5#, #a1#"}; - { 5, 41512, "", "=q2=Frostwoven Wristwraps", "=ds=#s8#, #a1#"}; - { 6, 44211, "", "=q2=Frostwoven Gloves", "=ds=#s9#, #a1#"}; - { 7, 41522, "", "=q2=Frostwoven Belt", "=ds=#s10#, #a1#"}; - { 8, 41519, "", "=q2=Frostwoven Leggings", "=ds=#s11#, #a1#"}; - { 9, 41520, "", "=q2=Frostwoven Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringDuskweaver"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt11#", ""}; - { 2, 41546, "", "=q2=Duskweave Cowl", "=ds=#s1#, #a1#"}; - { 3, 41550, "", "=q2=Duskweave Shoulders", "=ds=#s3#, #a1#"}; - { 4, 41549, "", "=q2=Duskweave Robe", "=ds=#s5#, #a1#"}; - { 5, 41551, "", "=q2=Duskweave Wristwraps", "=ds=#s8#, #a1#"}; - { 6, 41545, "", "=q2=Duskweave Gloves", "=ds=#s9#, #a1#"}; - { 7, 41543, "", "=q2=Duskweave Belt", "=ds=#s10#, #a1#"}; - { 8, 41548, "", "=q2=Duskweave Leggings", "=ds=#s11#, #a1#"}; - { 9, 41544, "", "=q2=Duskweave Boots", "=ds=#s12#, #a1#"}; - }; - - AtlasLoot_Data["TailoringFrostsavageBattlegear"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt12#", ""}; - { 2, 43971, "", "=q3=Frostsavage Cowl", "=ds=#s1#, #a1#"}; - { 3, 43973, "", "=q3=Frostsavage Shoulders", "=ds=#s3#, #a1#"}; - { 4, 43972, "", "=q3=Frostsavage Robe", "=ds=#s5#, #a1#"}; - { 5, 43974, "", "=q3=Frostsavage Bracers", "=ds=#s8#, #a1#"}; - { 6, 41516, "", "=q3=Frostsavage Gloves", "=ds=#s9#, #a1#"}; - { 7, 43969, "", "=q3=Frostsavage Belt", "=ds=#s10#, #a1#"}; - { 8, 43975, "", "=q3=Frostsavage Leggings", "=ds=#s11#, #a1#"}; - { 9, 43970, "", "=q3=Frostsavage Boots", "=ds=#s12#, #a1#"}; - }; - - ------------- - --- Other --- - ------------- - - ---------------------------- - --- Crafted Epic Weapons --- - ---------------------------- - - AtlasLoot_Data["CraftedWeapons1"] = { - { 1, 49888, "", "=q4=Shadow's Edge", "=ds=#h2#, #w1#"}; - { 3, 0, "INV_Box_01", "=q6=#p2#", "=q1=#j54#"}; - { 4, 45085, "", "=q4=Titansteel Spellblade", "=ds=#h3#, #w4#"}; - { 5, 42435, "", "=q4=Titansteel Shanker", "=ds=#h1#, #w4#"}; - { 6, 41383, "", "=q4=Titansteel Bonecrusher", "=ds=#h3#, #w6#"}; - { 7, 41384, "", "=q4=Titansteel Guardian", "=ds=#h3#, #w6#"}; - { 8, 41257, "", "=q4=Titansteel Destroyer", "=ds=#h2#, #w6#"}; - { 9, 42508, "", "=q4=Titansteel Shield Wall", "=ds=#w8#"}; - { 11, 0, "INV_Box_01", "=q6=#p5#", "=q1=#j54#"}; - { 12, 41168, "", "=q4=Armor Plated Combat Shotgun", "=ds=#w5#"}; - { 13, 44504, "", "=q4=Nesingwary 4000", "=ds=#w5#"}; - { 16, 0, "INV_Box_01", "=q6=#p2#", "=q1=#j10#"}; - { 17, 23554, "", "=q4=Eternium Runed Blade", "=ds=#h3#, #w4#"}; - { 18, 23555, "", "=q4=Dirge", "=ds=#h1#, #w4#"}; - { 19, 23540, "", "=q4=Felsteel Longblade", "=ds=#h1#, #w10#"}; - { 20, 23541, "", "=q4=Khorium Champion", "=ds=#h2#, #w10#"}; - { 21, 23542, "", "=q4=Fel Edged Battleaxe", "=ds=#h1#, #w1#"}; - { 22, 23543, "", "=q4=Felsteel Reaper", "=ds=#h2#, #w1#"}; - { 23, 23556, "", "=q4=Hand of Eternity", "=ds=#h3#, #w6#"}; - { 24, 23544, "", "=q4=Runic Hammer", "=ds=#h1#, #w6#"}; - { 25, 23546, "", "=q4=Fel Hardened Maul", "=ds=#h2#, #w6#"}; - { 26, 32854, "", "=q4=Hammer of Righteous Might", "=ds=#h2#, #w6#"}; - { 28, 0, "INV_Box_01", "=q6=#p5#", "=q1=#j10#"}; - { 29, 32756, "", "=q4=Gyro-balanced Khorium Destroyer", "=ds=#w5#"}; - }; - - AtlasLoot_Data["CraftedWeapons2"] = { - { 1, 0, "INV_Box_01", "=q6=#p2#", "=q1=#j9#"}; - { 2, 19166, "", "=q4=Black Amnesty", "=ds=#h1#, #w4#"}; - { 3, 22383, "", "=q4=Sageblade", "=ds=#h3#, #w10#"}; - { 4, 19168, "", "=q4=Blackguard", "=ds=#h1#, #w10#"}; - { 5, 19169, "", "=q4=Nightfall", "=ds=#h2#, #w1#"}; - { 6, 19170, "", "=q4=Ebon Hand", "=ds=#h1#, #w6#"}; - { 7, 22384, "", "=q4=Persuader", "=ds=#h1#, #w6#"}; - { 8, 17193, "", "=q4=Sulfuron Hammer", "=ds=#h2#, #w6#"}; - { 9, 19167, "", "=q4=Blackfury", "=ds=#w7#"}; - { 10, 22198, "", "=q4=Jagged Obsidian Shield", "=ds=#w8#"}; - { 12, 0, "INV_Box_01", "=q6=#p5#", "=q1=#j9#"}; - { 13, 18282, "", "=q4=Core Marksman Rifle", "=ds=#w5#"}; - { 14, 18168, "", "=q4=Force Reactive Disk", "=ds=#w8#"}; - }; - - AtlasLoot_Data["CraftedWeapons3"] = { - { 1, 0, "INV_Box_01", "=q6=#p15#", ""}; - { 2, 28425, "", "=q4=Fireguard", "=ds=#h1#, #w10#"}; - { 3, 28426, "", "=q4=Blazeguard", "=ds=#h1#, #w10#"}; - { 4, 28427, "", "=q4=Blazefury", "=ds=#h1#, #w10#"}; - { 5, 28428, "", "=q4=Lionheart Blade", "=ds=#h2#, #w10#"}; - { 6, 28429, "", "=q4=Lionheart Champion", "=ds=#h2#, #w10#"}; - { 7, 28430, "", "=q4=Lionheart Executioner", "=ds=#h2#, #w10#"}; - { 9, 0, "INV_Box_01", "=q6=#p14#", ""}; - { 10, 28431, "", "=q4=The Planar Edge", "=ds=#h3#, #w1#"}; - { 11, 28432, "", "=q4=Black Planar Edge", "=ds=#h3#, #w1#"}; - { 12, 28433, "", "=q4=Wicked Edge of the Planes", "=ds=#h3#, #w1#"}; - { 13, 28434, "", "=q4=Lunar Crescent", "=ds=#h2#, #w1#"}; - { 14, 28435, "", "=q4=Mooncleaver", "=ds=#h2#, #w1#"}; - { 15, 28436, "", "=q4=Bloodmoon", "=ds=#h2#, #w1#"}; - { 16, 0, "INV_Box_01", "=q6=#p22#", ""}; - { 17, 28437, "", "=q4=Drakefist Hammer", "=ds=#h3#, #w6#"}; - { 18, 28438, "", "=q4=Dragonmaw", "=ds=#h3#, #w6#"}; - { 19, 28439, "", "=q4=Dragonstrike", "=ds=#h3#, #w6#"}; - { 20, 28440, "", "=q4=Thunder", "=ds=#h2#, #w6#"}; - { 21, 28441, "", "=q4=Deep Thunder", "=ds=#h2#, #w6#"}; - { 22, 28442, "", "=q4=Stormherald", "=ds=#h2#, #w6#"}; - }; - -------------------------------- --- Daily Profession Rewards --- -------------------------------- @@ -2943,6 +2371,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["AlchemyHighRiskCLASSIC"] = { Name = ALCHEMY.." High Risk"; + Type = "CraftingNoBF"; { Name = "Common"; { 1, "s968402", "967443", "=q2=Flask of Manifesting Power", "=ds=#sr# 300"}; @@ -2989,6 +2418,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["SmithingHighRiskCLASSIC"] = { Name = BLACKSMITHING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Common"; { 1, "s968018", "967172", "=q2=Living Belt Buckle", "=ds=#sr# 300"}; @@ -3029,6 +2459,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["LeatherworkingHighRiskCLASSIC"] = { Name = LEATHERWORKING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Common"; { 1, "s968000", "967154", "=q2=Yeti Gambeson", "=ds=#sr# 300"}; @@ -3060,6 +2491,7 @@ local MASTER = select(2, GetSpellInfo(28596)); AtlasLoot_Data["EngineeringHighRiskCLASSIC"] = { Name = ENGINEERING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Common"; { 1, "s968042", "967196", "=q2=Gnomish Magnifying Lense I", "=ds=#sr# 300"}; @@ -3090,7 +2522,8 @@ local MASTER = select(2, GetSpellInfo(28596)); }; AtlasLoot_Data["EnchantingHighRiskCLASSIC"] = { - Name = ENCHANTING.." High Risk"; + Name = ENCHANTING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Common"; { 1, "s968676", "Spell_Holy_GreaterHeal", "=q2=Enchant Weapon - Lesser Unstoppable Assault", "=ds=#sr# 300"}; @@ -3132,8 +2565,9 @@ local MASTER = select(2, GetSpellInfo(28596)); }; AtlasLoot_Data["TailoringHighRiskCLASSIC"] = { - Name = TAILORING.." High Risk"; - { + Name = TAILORING.." High Risk"; + Type = "CraftingNoBF"; + { Name = "Common"; { 1, "s968060", "967214", "=q2=Dragonweave Cloak Lining", "=ds=#sr# 300"}; { 2, "s968063", "967217", "=q2=Twilight Cloak Lining", "=ds=#sr# 300"}; @@ -3163,8 +2597,9 @@ local MASTER = select(2, GetSpellInfo(28596)); }; AtlasLoot_Data["CookingHighRiskCLASSIC"] = { - Name = COOKING.." High Risk"; - { + Name = COOKING.." High Risk"; + Type = "CraftingNoBF"; + { Name = "Common"; { 1, "s968279", "967509", "=q2=Animated Soup for the Soul", "=ds=#sr# 300"}; { 2, "s968282", "967512", "=q2=Volcanic Sandwich", "=ds=#sr# 300"}; @@ -3295,17 +2730,17 @@ local MASTER = select(2, GetSpellInfo(28596)); }; { Name = "Epic"; - { 1, "s968371", "967601", "=q4=Subtle Sandwich", "=ds=#sr# 300"}; - { 2, "s968374", "967604", "=q4=Subtle Wontons", "=ds=#sr# 300"}; - { 3, "s968377", "967607", "=q4=Subtle Sulferous Soup", "=ds=#sr# 300"}; - { 4, "s968380", "967610", "=q4=Strongman Stew", "=ds=#sr# 300"}; - { 5, "s968383", "967613", "=q4=Mysterious Void Roast", "=ds=#sr# 300"}; - { 6, "s968386", "967616", "=q4=Fire Charred Roast", "=ds=#sr# 300"}; - { 7, "s968389", "967619", "=q4=Storm Fried Roast", "=ds=#sr# 300"}; - { 8, "s968392", "967622", "=q4=Winter Roast", "=ds=#sr# 300"}; - { 9, "s968395", "967625", "=q4=Blackened Roast", "=ds=#sr# 300"}; - { 10, "s968398", "967628", "=q4=Dino Delight", "=ds=#sr# 300"}; - { 11, "s968401", "967631", "=q4=Slick-fil-A Sandwich", "=ds=#sr# 300"}; - { 13, "s968648", "967705", "=q4=Irresistible Bait", "=ds=#sr# 300"}; + { 1, "s968371", "967601", "=q4=Subtle Sandwich", "=ds=#sr# 300"}; + { 2, "s968374", "967604", "=q4=Subtle Wontons", "=ds=#sr# 300"}; + { 3, "s968377", "967607", "=q4=Subtle Sulferous Soup", "=ds=#sr# 300"}; + { 4, "s968380", "967610", "=q4=Strongman Stew", "=ds=#sr# 300"}; + { 5, "s968383", "967613", "=q4=Mysterious Void Roast", "=ds=#sr# 300"}; + { 6, "s968386", "967616", "=q4=Fire Charred Roast", "=ds=#sr# 300"}; + { 7, "s968389", "967619", "=q4=Storm Fried Roast", "=ds=#sr# 300"}; + { 8, "s968392", "967622", "=q4=Winter Roast", "=ds=#sr# 300"}; + { 9, "s968395", "967625", "=q4=Blackened Roast", "=ds=#sr# 300"}; + { 10, "s968398", "967628", "=q4=Dino Delight", "=ds=#sr# 300"}; + { 11, "s968401", "967631", "=q4=Slick-fil-A Sandwich", "=ds=#sr# 300"}; + { 13, "s968648", "967705", "=q4=Irresistible Bait", "=ds=#sr# 300"}; + }; }; -}; diff --git a/AtlasLoot_Crafting/craftingTBC.lua b/AtlasLoot_Crafting/craftingTBC.lua index 505f79f..40c2c51 100644 --- a/AtlasLoot_Crafting/craftingTBC.lua +++ b/AtlasLoot_Crafting/craftingTBC.lua @@ -98,7 +98,7 @@ local SPELLFIRE = GetSpellInfo(26797); --------------- AtlasLoot_Data["AlchemyTBC"] = { Name = ALCHEMY; - Type = "Crafting"; + Type = "CraftingNoBF"; { Name = AL["Battle Elixirs"]; { 1, "s28558", "22835", "=q1=Elixir of Major Shadow Power", "=ds="..BabbleFaction["Revered"]..": "..BabbleFaction["Lower City"]}; @@ -442,6 +442,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["CookingTBC"] = { Name = COOKING; + Type = "CraftingNoBF"; { Name = COOKING; { 1, "s42302", "33052", "=q1=Fisherman's Feast", "=ds="..AL["Trainer"]}; @@ -513,6 +514,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["EnchantingTBC"] = { Name = ENCHANTING; + Type = "CraftingNoBF"; { Name = AL["Enchant Boots"]; { 1, "s27954", "Spell_Holy_GreaterHeal", "=ds=Enchant Boots - Surefooted", "=ds=#sr# 370"}; @@ -778,7 +780,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["JewelcraftingTBC"] = { Name = JEWELCRAFTING; - Type = "Crafting"; + Type = "CraftingNoBF"; { Name = AL["Red Gems"]; { 1, "s39705", "32193", "=q4=Bold Crimson Spinel", "=ds=#sr# 375"}; @@ -1505,810 +1507,6 @@ local SPELLFIRE = GetSpellInfo(26797); }; }; - ----------------------- - --- Profession Sets --- - ----------------------- - - ------------------------------- - --- Blacksmithing Mail Sets --- - ------------------------------- - - AtlasLoot_Data["BlacksmithingMailBloodsoulEmbrace"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbm1#", ""}; - { 2, 19691, "", "=q3=Bloodsoul Shoulders", "=ds=#s3#, #a3#"}; - { 3, 19690, "", "=q3=Bloodsoul Breastplate", "=ds=#s5#, #a3#"}; - { 4, 19692, "", "=q3=Bloodsoul Gauntlets", "=ds=#s9#, #a3#"}; - Next = "BlacksmithingMailFelIronChain"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingMailFelIronChain"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbm2#", ""}; - { 2, 23493, "", "=q2=Fel Iron Chain Coif", "=ds=#s1#, #a3#"}; - { 3, 23490, "", "=q2=Fel Iron Chain Tunic", "=ds=#s5#, #a3#"}; - { 4, 23494, "", "=q2=Fel Iron Chain Bracers", "=ds=#s8#, #a3#"}; - { 5, 23491, "", "=q2=Fel Iron Chain Gloves", "=ds=#s9#, #a3#"}; - Prev = "BlacksmithingMailBloodsoulEmbrace"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - -------------------------------- - --- Blacksmithing Plate Sets --- - -------------------------------- - - AtlasLoot_Data["BlacksmithingPlateImperialPlate"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp1#", ""}; - { 2, 12427, "", "=q2=Imperial Plate Helm", "=ds=#s1#, #a4#"}; - { 3, 12428, "", "=q2=Imperial Plate Shoulders", "=ds=#s3#, #a4#"}; - { 4, 12422, "", "=q2=Imperial Plate Chest", "=ds=#s5#, #a4#"}; - { 5, 12425, "", "=q2=Imperial Plate Bracers", "=ds=#s8#, #a4#"}; - { 6, 12424, "", "=q2=Imperial Plate Belt", "=ds=#s10#, #a4#"}; - { 7, 12429, "", "=q2=Imperial Plate Leggings", "=ds=#s11#, #a4#"}; - { 8, 12426, "", "=q2=Imperial Plate Boots", "=ds=#s12#, #a4#"}; - Next = "BlacksmithingPlateTheDarksoul"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateTheDarksoul"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp2#", ""}; - { 2, 19695, "", "=q3=Darksoul Shoulders", "=ds=#s3#, #a4#"}; - { 3, 19693, "", "=q3=Darksoul Breastplate", "=ds=#s5#, #a4#"}; - { 4, 19694, "", "=q3=Darksoul Leggings", "=ds=#s11#, #a4#"}; - Prev = "BlacksmithingPlateImperialPlate"; - Next = "BlacksmithingPlateFelIronPlate"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateFelIronPlate"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp3#", ""}; - { 2, 23489, "", "=q2=Fel Iron Breastplate", "=ds=#s5#, #a4#"}; - { 3, 23482, "", "=q2=Fel Iron Plate Gloves", "=ds=#s9#, #a4#"}; - { 4, 23484, "", "=q2=Fel Iron Plate Belt", "=ds=#s10#, #a4#"}; - { 5, 23488, "", "=q2=Fel Iron Plate Pants", "=ds=#s11#, #a4#"}; - { 6, 23487, "", "=q2=Fel Iron Plate Boots", "=ds=#s12#, #a4#"}; - Prev = "BlacksmithingPlateTheDarksoul"; - Next = "BlacksmithingPlateAdamantiteB"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateAdamantiteB"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp4#", ""}; - { 2, 23507, "", "=q3=Adamantite Breastplate", "=ds=#s5#, #a4#"}; - { 3, 23506, "", "=q3=Adamantite Plate Bracers", "=ds=#s8#, #a4#"}; - { 4, 23508, "", "=q3=Adamantite Plate Gloves", "=ds=#s9#, #a4#"}; - Prev = "BlacksmithingPlateFelIronPlate"; - Next = "BlacksmithingPlateFlameG"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateFlameG"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp5#", "=q1=#j11#"}; - { 2, 23516, "", "=q3=Flamebane Helm", "=ds=#s1#, #a4#"}; - { 3, 23513, "", "=q3=Flamebane Breastplate", "=ds=#s5#, #a4#"}; - { 4, 23515, "", "=q3=Flamebane Bracers", "=ds=#s8#, #a4#"}; - { 5, 23514, "", "=q3=Flamebane Gloves", "=ds=#s9#, #a4#"}; - Prev = "BlacksmithingPlateAdamantiteB"; - Next = "BlacksmithingPlateEnchantedAdaman"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateEnchantedAdaman"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp6#", "=q1=#j12#"}; - { 2, 23509, "", "=q3=Enchanted Adamantite Breastplate", "=ds=#s5#, #a4#"}; - { 3, 23510, "", "=q3=Enchanted Adamantite Belt", "=ds=#s10#, #a4#"}; - { 4, 23512, "", "=q3=Enchanted Adamantite Leggings", "=ds=#s11#, #a4#"}; - { 5, 23511, "", "=q3=Enchanted Adamantite Boots", "=ds=#s12#, #a4#"}; - Prev = "BlacksmithingPlateFlameG"; - Next = "BlacksmithingPlateKhoriumWard"; - Back = "CRAFTSET1"; - }; - - AtlasLoot_Data["BlacksmithingPlateKhoriumWard"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp7#", ""}; - { 2, 23524, "", "=q3=Khorium Belt", "=ds=#s10#, #a4#"}; - { 3, 23523, "", "=q3=Khorium Pants", "=ds=#s11#, #a4#"}; - { 4, 23525, "", "=q3=Khorium Boots", "=ds=#s12#, #a4#"}; - Prev = "BlacksmithingPlateEnchantedAdaman"; - Next = "BlacksmithingPlateFaithFelsteel"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateFaithFelsteel"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp8#", ""}; - { 2, 23519, "", "=q3=Felsteel Helm", "=ds=#s1#, #a4#"}; - { 3, 23517, "", "=q3=Felsteel Gloves", "=ds=#s9#, #a4#"}; - { 4, 23518, "", "=q3=Felsteel Leggings", "=ds=#s11#, #a4#"}; - Prev = "BlacksmithingPlateKhoriumWard"; - Next = "BlacksmithingPlateBurningRage"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateBurningRage"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp9#", ""}; - { 2, 23521, "", "=q3=Ragesteel Helm", "=ds=#s1#, #a4#"}; - { 3, 33173, "", "=q3=Ragesteel Shoulders", "=ds=#s3#, #a4#"}; - { 4, 23522, "", "=q3=Ragesteel Breastplate", "=ds=#s5#, #a4#"}; - { 5, 23520, "", "=q3=Ragesteel Gloves", "=ds=#s9#, #a4#"}; - Prev = "BlacksmithingPlateFaithFelsteel"; - Next = "BlacksmithingPlateOrnateSaroniteBattlegear"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateOrnateSaroniteBattlegear"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp10#", ""}; - { 2, 42728, "", "=q3=Ornate Saronite Skullshield", "=ds=#s1#, #a4#"}; - { 3, 42727, "", "=q3=Ornate Saronite Pauldrons", "=ds=#s3#, #a4#"}; - { 4, 42725, "", "=q3=Ornate Saronite Hauberk", "=ds=#s5#, #a4#"}; - { 5, 42723, "", "=q3=Ornate Saronite Bracers", "=ds=#s8#, #a4#"}; - { 6, 42724, "", "=q3=Ornate Saronite Gauntlets", "=ds=#s9#, #a4#"}; - { 7, 42729, "", "=q3=Ornate Saronite Waistguard", "=ds=#s10#, #a4#"}; - { 8, 42726, "", "=q3=Ornate Saronite Legplates", "=ds=#s11#, #a4#"}; - { 9, 42730, "", "=q3=Ornate Saronite Walkers", "=ds=#s12#, #a4#"}; - Prev = "BlacksmithingPlateBurningRage"; - Next = "BlacksmithingPlateSavageSaroniteBattlegear"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - AtlasLoot_Data["BlacksmithingPlateSavageSaroniteBattlegear"] = { - { 1, 0, "INV_Hammer_20", "=q6=#craftbp11#", ""}; - { 2, 41350, "", "=q3=Savage Saronite Skullshield", "=ds=#s1#, #a4#"}; - { 3, 41351, "", "=q3=Savage Saronite Pauldrons", "=ds=#s3#, #a4#"}; - { 4, 41353, "", "=q3=Savage Saronite Hauberk", "=ds=#s5#, #a4#"}; - { 5, 41354, "", "=q3=Savage Saronite Bracers", "=ds=#s8#, #a4#"}; - { 6, 41349, "", "=q3=Savage Saronite Gauntlets", "=ds=#s9#, #a4#"}; - { 7, 41352, "", "=q3=Savage Saronite Waistguard", "=ds=#s10#, #a4#"}; - { 8, 41347, "", "=q3=Savage Saronite Legplates", "=ds=#s11#, #a4#"}; - { 9, 41348, "", "=q3=Savage Saronite Walkers", "=ds=#s12#, #a4#"}; - Prev = "BlacksmithingPlateOrnateSaroniteBattlegear"; - Back = "CRAFTSET1"; - Type = "Crafting"; - }; - - ----------------------------------- - --- Leatherworking Leather Sets --- - ----------------------------------- - - AtlasLoot_Data["LeatherworkingLeatherVolcanicArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl1#", "=q1=#j11#"}; - { 2, 15055, "", "=q2=Volcanic Shoulders", "=ds=#s3#, #a2#"}; - { 3, 15053, "", "=q2=Volcanic Breastplate", "=ds=#s5#, #a2#"}; - { 4, 15054, "", "=q2=Volcanic Leggings", "=ds=#s11#, #a2#"}; - Next = "LeatherworkingLeatherIronfeatherArmor"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherIronfeatherArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl2#", ""}; - { 2, 15067, "", "=q3=Ironfeather Shoulders", "=ds=#s3#, #a2#"}; - { 3, 15066, "", "=q3=Ironfeather Breastplate", "=ds=#s5#, #a2#"}; - Prev = "LeatherworkingLeatherVolcanicArmor"; - Next = "LeatherworkingLeatherStormshroudArmor"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherStormshroudArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl3#", ""}; - { 2, 15058, "", "=q3=Stormshroud Shoulders", "=ds=#s3#, #a2#"}; - { 3, 15056, "", "=q3=Stormshroud Armor", "=ds=#s5#, #a2#"}; - { 4, 21278, "", "=q3=Stormshroud Gloves", "=ds=#s9#, #a2#"}; - { 5, 15057, "", "=q3=Stormshroud Pants", "=ds=#s11#, #a2#"}; - Prev = "LeatherworkingLeatherIronfeatherArmor"; - Next = "LeatherworkingLeatherDevilsaurArmor"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherDevilsaurArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl4#", ""}; - { 2, 15063, "", "=q3=Devilsaur Gauntlets", "=ds=#s9#, #a2#"}; - { 3, 15062, "", "=q3=Devilsaur Leggings", "=ds=#s11#, #a2#"}; - Prev = "LeatherworkingLeatherStormshroudArmor"; - Next = "LeatherworkingLeatherBloodTigerH"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherBloodTigerH"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl5#", ""}; - { 2, 19689, "", "=q3=Blood Tiger Shoulders", "=ds=#s3#, #a2#"}; - { 3, 19688, "", "=q3=Blood Tiger Breastplate", "=ds=#s5#, #a2#"}; - Prev = "LeatherworkingLeatherDevilsaurArmor"; - Next = "LeatherworkingLeatherPrimalBatskin"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherPrimalBatskin"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl6#", ""}; - { 2, 19685, "", "=q3=Primal Batskin Jerkin", "=ds=#s5#, #a2#"}; - { 3, 19687, "", "=q3=Primal Batskin Bracers", "=ds=#s8#, #a2#"}; - { 4, 19686, "", "=q3=Primal Batskin Gloves", "=ds=#s9#, #a2#"}; - Prev = "LeatherworkingLeatherBloodTigerH"; - Next = "LeatherworkingLeatherWildDraenishA"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherWildDraenishA"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl7#", ""}; - { 2, 25676, "", "=q2=Wild Draenish Vest", "=ds=#s5#, #a2#"}; - { 3, 25674, "", "=q2=Wild Draenish Gloves", "=ds=#s9#, #a2#"}; - { 4, 25675, "", "=q2=Wild Draenish Leggings", "=ds=#s11#, #a2#"}; - { 5, 25673, "", "=q2=Wild Draenish Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherPrimalBatskin"; - Next = "LeatherworkingLeatherThickDraenicA"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherThickDraenicA"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl8#", ""}; - { 2, 25671, "", "=q2=Thick Draenic Vest", "=ds=#s5#, #a2#"}; - { 3, 25669, "", "=q2=Thick Draenic Gloves", "=ds=#s9#, #a2#"}; - { 4, 25670, "", "=q2=Thick Draenic Pants", "=ds=#s11#, #a2#"}; - { 5, 25668, "", "=q2=Thick Draenic Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherWildDraenishA"; - Next = "LeatherworkingLeatherFelSkin"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherFelSkin"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl9#", ""}; - { 2, 25685, "", "=q3=Fel Leather Gloves", "=ds=#s9#, #a2#"}; - { 3, 25687, "", "=q3=Fel Leather Leggings", "=ds=#s11#, #a2#"}; - { 4, 25686, "", "=q3=Fel Leather Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherThickDraenicA"; - Next = "LeatherworkingLeatherSClefthoof"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherSClefthoof"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl10#", ""}; - { 2, 25689, "", "=q3=Heavy Clefthoof Vest", "=ds=#s5#, #a2#"}; - { 3, 25690, "", "=q3=Heavy Clefthoof Leggings", "=ds=#s11#, #a2#"}; - { 4, 25691, "", "=q3=Heavy Clefthoof Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherFelSkin"; - Next = "LeatherworkingLeatherPrimalIntent"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherPrimalIntent"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwe1#", "=q1=#p11#"}; - { 2, 29525, "", "=q4=Primalstrike Vest", "=ds=#s5#, #a2#"}; - { 3, 29527, "", "=q4=Primalstrike Bracers", "=ds=#s8#, #a2#"}; - { 4, 29526, "", "=q4=Primalstrike Belt", "=ds=#s10#, #a2#"}; - Prev = "LeatherworkingLeatherSClefthoof"; - Next = "LeatherworkingLeatherWindhawkArmor"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherWindhawkArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwt1#", "=q1=#p10#"}; - { 2, 29522, "", "=q4=Windhawk Hauberk", "=ds=#s5#, #a2#"}; - { 3, 29523, "", "=q4=Windhawk Bracers", "=ds=#s8#, #a2#"}; - { 4, 29524, "", "=q4=Windhawk Belt", "=ds=#s10#, #a2#"}; - Prev = "LeatherworkingLeatherPrimalIntent"; - Next = "LeatherworkingLeatherBoreanEmbrace"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherBoreanEmbrace"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl11#", ""}; - { 2, 38437, "", "=q2=Arctic Helm", "=ds=#s1#, #a2#"}; - { 3, 38402, "", "=q2=Arctic Shoulderpads", "=ds=#s3#, #a2#"}; - { 4, 38400, "", "=q2=Arctic Chestpiece", "=ds=#s5#, #a2#"}; - { 5, 38433, "", "=q2=Arctic Wristguards", "=ds=#s8#, #a2#"}; - { 6, 38403, "", "=q2=Arctic Gloves", "=ds=#s9#, #a2#"}; - { 7, 38405, "", "=q2=Arctic Belt", "=ds=#s10#, #a2#"}; - { 8, 38401, "", "=q2=Arctic Leggings", "=ds=#s11#, #a2#"}; - { 9, 38404, "", "=q2=Arctic Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherWindhawkArmor"; - Next = "LeatherworkingLeatherIceborneEmbrace"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherIceborneEmbrace"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl12#", ""}; - { 2, 38438, "", "=q2=Iceborne Helm", "=ds=#s1#, #a2#"}; - { 3, 38411, "", "=q2=Iceborne Shoulderpads", "=ds=#s3#, #a2#"}; - { 4, 38408, "", "=q2=Iceborne Chestguard", "=ds=#s5#, #a2#"}; - { 5, 38434, "", "=q2=Iceborne Wristguards", "=ds=#s8#, #a2#"}; - { 6, 38409, "", "=q2=Iceborne Gloves", "=ds=#s9#, #a2#"}; - { 7, 38406, "", "=q2=Iceborne Belt", "=ds=#s10#, #a2#"}; - { 8, 38410, "", "=q2=Iceborne Leggings", "=ds=#s11#, #a2#"}; - { 9, 38407, "", "=q2=Iceborne Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherBoreanEmbrace"; - Next = "LeatherworkingLeatherEvisceratorBattlegear"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherEvisceratorBattlegear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl13#", ""}; - { 2, 43260, "", "=q3=Eviscerator's Facemask", "=ds=#s1#, #a2#"}; - { 3, 43433, "", "=q3=Eviscerator's Shoulderpads", "=ds=#s3#, #a2#"}; - { 4, 43434, "", "=q3=Eviscerator's Chestguard", "=ds=#s5#, #a2#"}; - { 5, 43435, "", "=q3=Eviscerator's Bindings", "=ds=#s8#, #a2#"}; - { 6, 43436, "", "=q3=Eviscerator's Gauntlets", "=ds=#s9#, #a2#"}; - { 7, 43437, "", "=q3=Eviscerator's Waistguard", "=ds=#s10#, #a2#"}; - { 8, 43438, "", "=q3=Eviscerator's Legguards", "=ds=#s11#, #a2#"}; - { 9, 43439, "", "=q3=Eviscerator's Treads", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherIceborneEmbrace"; - Next = "LeatherworkingLeatherOvercasterBattlegear"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingLeatherOvercasterBattlegear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwl14#", ""}; - { 2, 43261, "", "=q3=Overcast Headguard", "=ds=#s1#, #a2#"}; - { 3, 43262, "", "=q3=Overcast Spaulders", "=ds=#s3#, #a2#"}; - { 4, 43263, "", "=q3=Overcast Chestguard", "=ds=#s5#, #a2#"}; - { 5, 43264, "", "=q3=Overcast Bracers", "=ds=#s8#, #a2#"}; - { 6, 43265, "", "=q3=Overcast Handwraps", "=ds=#s9#, #a2#"}; - { 7, 43266, "", "=q3=Overcast Belt", "=ds=#s10#, #a2#"}; - { 8, 43271, "", "=q3=Overcast Leggings", "=ds=#s11#, #a2#"}; - { 9, 43273, "", "=q3=Overcast Boots", "=ds=#s12#, #a2#"}; - Prev = "LeatherworkingLeatherEvisceratorBattlegear"; - Back = "CRAFTSET2"; - Type = "Crafting"; - }; - - -------------------------------- - --- Leatherworking Mail Sets --- - -------------------------------- - - AtlasLoot_Data["LeatherworkingMailGreenDragonM"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm1#", "=q1=#j13#"}; - { 2, 15045, "", "=q3=Green Dragonscale Breastplate", "=ds=#s5#, #a3#"}; - { 3, 20296, "", "=q3=Green Dragonscale Gauntlets", "=ds=#s9#, #a3#"}; - { 4, 15046, "", "=q3=Green Dragonscale Leggings", "=ds=#s11#, #a3#"}; - Next = "LeatherworkingMailBlueDragonM"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailBlueDragonM"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm2#", "=q1=#j12#"}; - { 2, 15049, "", "=q3=Blue Dragonscale Shoulders", "=ds=#s3#, #a3#"}; - { 3, 15048, "", "=q3=Blue Dragonscale Breastplate", "=ds=#s5#, #a3#"}; - { 4, 20295, "", "=q3=Blue Dragonscale Leggings", "=ds=#s11#, #a3#"}; - Prev = "LeatherworkingMailGreenDragonM"; - Next = "LeatherworkingMailBlackDragonM"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailBlackDragonM"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm3#", "=q1=#j11#"}; - { 2, 15051, "", "=q3=Black Dragonscale Shoulders", "=ds=#s3#, #a3#"}; - { 3, 15050, "", "=q3=Black Dragonscale Breastplate", "=ds=#s5#, #a3#"}; - { 4, 15052, "", "=q3=Black Dragonscale Leggings", "=ds=#s11#, #a3#"}; - { 5, 16984, "", "=q4=Black Dragonscale Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailBlueDragonM"; - Next = "LeatherworkingMailScaledDraenicA"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailScaledDraenicA"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm4#", ""}; - { 2, 25660, "", "=q2=Scaled Draenic Vest", "=ds=#s5#, #a3#"}; - { 3, 25661, "", "=q2=Scaled Draenic Gloves", "=ds=#s9#, #a3#"}; - { 4, 25662, "", "=q2=Scaled Draenic Pants", "=ds=#s11#, #a3#"}; - { 5, 25659, "", "=q2=Scaled Draenic Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailBlackDragonM"; - Next = "LeatherworkingMailFelscaleArmor"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailFelscaleArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm5#", ""}; - { 2, 25657, "", "=q2=Felscale Breastplate", "=ds=#s5#, #a3#"}; - { 3, 25654, "", "=q2=Felscale Gloves", "=ds=#s9#, #a3#"}; - { 4, 25656, "", "=q2=Felscale Pants", "=ds=#s11#, #a3#"}; - { 5, 25655, "", "=q2=Felscale Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailScaledDraenicA"; - Next = "LeatherworkingMailFelstalkerArmor"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailFelstalkerArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm6#", ""}; - { 2, 25696, "", "=q3=Felstalker Breastplate", "=ds=#s5#, #a3#"}; - { 3, 25697, "", "=q3=Felstalker Bracers", "=ds=#s8#, #a3#"}; - { 4, 25695, "", "=q3=Felstalker Belt", "=ds=#s10#, #a3#"}; - Prev = "LeatherworkingMailFelscaleArmor"; - Next = "LeatherworkingMailNetherFury"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailNetherFury"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm7#", ""}; - { 2, 25694, "", "=q3=Netherfury Belt", "=ds=#s10#, #a3#"}; - { 3, 25692, "", "=q3=Netherfury Leggings", "=ds=#s11#, #a3#"}; - { 4, 25693, "", "=q3=Netherfury Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailFelstalkerArmor"; - Next = "LeatherworkingMailNetherscaleArmor"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailNetherscaleArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwd1#", "=q1=#p9#"}; - { 2, 29515, "", "=q4=Ebon Netherscale Breastplate", "=ds=#s5#, #a3#"}; - { 3, 29517, "", "=q4=Ebon Netherscale Bracers", "=ds=#s8#, #a3#"}; - { 4, 29516, "", "=q4=Ebon Netherscale Belt", "=ds=#s10#, #a3#"}; - Prev = "LeatherworkingMailNetherFury"; - Next = "LeatherworkingMailNetherstrikeArmor"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailNetherstrikeArmor"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwd2#", "=q1=#p9#"}; - { 2, 29519, "", "=q4=Netherstrike Breastplate", "=ds=#s5#, #a3#"}; - { 3, 29521, "", "=q4=Netherstrike Bracers", "=ds=#s8#, #a3#"}; - { 4, 29520, "", "=q4=Netherstrike Belt", "=ds=#s10#, #a3#"}; - Prev = "LeatherworkingMailNetherscaleArmor"; - Next = "LeatherworkingMailFrostscaleBinding"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailFrostscaleBinding"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm8#", ""}; - { 2, 38440, "", "=q2=Frostscale Helm", "=ds=#s1#, #a3#"}; - { 3, 38424, "", "=q2=Frostscale Shoulders", "=ds=#s3#, #a3#"}; - { 4, 38414, "", "=q2=Frostscale Chestguard", "=ds=#s5#, #a3#"}; - { 5, 38436, "", "=q2=Frostscale Bracers", "=ds=#s8#, #a3#"}; - { 6, 38415, "", "=q2=Frostscale Gloves", "=ds=#s9#, #a3#"}; - { 7, 38412, "", "=q2=Frostscale Belt", "=ds=#s10#, #a3#"}; - { 8, 38416, "", "=q2=Frostscale Leggings", "=ds=#s11#, #a3#"}; - { 9, 38413, "", "=q2=Frostscale Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailNetherstrikeArmor"; - Next = "LeatherworkingMailNerubianHive"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailNerubianHive"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm9#", ""}; - { 2, 38439, "", "=q2=Nerubian Helm", "=ds=#s1#, #a3#"}; - { 3, 38417, "", "=q2=Nerubian Shoulders", "=ds=#s3#, #a3#"}; - { 4, 38420, "", "=q2=Nerubian Chestguard", "=ds=#s5#, #a3#"}; - { 5, 38435, "", "=q2=Nerubian Bracers", "=ds=#s8#, #a3#"}; - { 6, 38421, "", "=q2=Nerubian Gloves", "=ds=#s9#, #a3#"}; - { 7, 38418, "", "=q2=Nerubian Belt", "=ds=#s10#, #a3#"}; - { 8, 38422, "", "=q2=Nerubian Legguards", "=ds=#s11#, #a3#"}; - { 9, 38419, "", "=q2=Nerubian Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailFrostscaleBinding"; - Next = "LeatherworkingMailStormhideBattlegear"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailStormhideBattlegear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm10#", ""}; - { 2, 43455, "", "=q3=Stormhide Crown", "=ds=#s1#, #a3#"}; - { 3, 43457, "", "=q3=Stormhide Shoulders", "=ds=#s3#, #a3#"}; - { 4, 43453, "", "=q3=Stormhide Hauberk", "=ds=#s5#, #a3#"}; - { 5, 43452, "", "=q3=Stormhide Wristguards", "=ds=#s8#, #a3#"}; - { 6, 43454, "", "=q3=Stormhide Grips", "=ds=#s9#, #a3#"}; - { 7, 43450, "", "=q3=Stormhide Belt", "=ds=#s10#, #a3#"}; - { 8, 43456, "", "=q3=Stormhide Legguards", "=ds=#s11#, #a3#"}; - { 9, 43451, "", "=q3=Stormhide Stompers", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailNerubianHive"; - Next = "LeatherworkingMailSwiftarrowBattlefear"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - AtlasLoot_Data["LeatherworkingMailSwiftarrowBattlefear"] = { - { 1, 0, "INV_Box_01", "=q6=#craftlwm11#", ""}; - { 2, 43447, "", "=q3=Swiftarrow Helm", "=ds=#s1#, #a3#"}; - { 3, 43449, "", "=q3=Swiftarrow Shoulderguards", "=ds=#s3#, #a3#"}; - { 4, 43445, "", "=q3=Swiftarrow Hauberk", "=ds=#s5#, #a3#"}; - { 5, 43444, "", "=q3=Swiftarrow Bracers", "=ds=#s8#, #a3#"}; - { 6, 43446, "", "=q3=Swiftarrow Gauntlets", "=ds=#s9#, #a3#"}; - { 7, 43442, "", "=q3=Swiftarrow Belt", "=ds=#s10#, #a3#"}; - { 8, 43448, "", "=q3=Swiftarrow Leggings", "=ds=#s11#, #a3#"}; - { 9, 43443, "", "=q3=Swiftarrow Boots", "=ds=#s12#, #a3#"}; - Prev = "LeatherworkingMailStormhideBattlegear"; - Back = "CRAFTSET3"; - Type = "Crafting"; - }; - - ---------------------- - --- Tailoring Sets --- - ---------------------- - - AtlasLoot_Data["TailoringBloodvineG"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt1#", ""}; - { 2, 19682, "", "=q3=Bloodvine Vest", "=ds=#s5#, #a1#"}; - { 3, 19683, "", "=q3=Bloodvine Leggings", "=ds=#s11#, #a1#"}; - { 4, 19684, "", "=q3=Bloodvine Boots", "=ds=#s12#, #a1#"}; - Next = "TailoringNeatherVest"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringNeatherVest"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt2#", ""}; - { 2, 21855, "", "=q2=Netherweave Tunic", "=ds=#s5#, #a1#"}; - { 3, 21854, "", "=q2=Netherweave Robe", "=ds=#s5#, #a1#"}; - { 4, 21849, "", "=q2=Netherweave Bracers", "=ds=#s8#, #a1#"}; - { 5, 21851, "", "=q2=Netherweave Gloves", "=ds=#s9#, #a1##"}; - { 6, 21850, "", "=q2=Netherweave Belt", "=ds=#s10#, #a1#"}; - { 7, 21852, "", "=q2=Netherweave Pants", "=ds=#s11#, #a1#"}; - { 8, 21853, "", "=q2=Netherweave Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringBloodvineG"; - Next = "TailoringImbuedNeather"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringImbuedNeather"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt3#", ""}; - { 2, 21862, "", "=q3=Imbued Netherweave Tunic", "=ds=#s5#, #a1#"}; - { 3, 21861, "", "=q3=Imbued Netherweave Robe", "=ds=#s5#, #a1#"}; - { 4, 21859, "", "=q3=Imbued Netherweave Pants", "=ds=#s11#, #a1#"}; - { 5, 21860, "", "=q3=Imbued Netherweave Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringNeatherVest"; - Next = "TailoringArcanoVest"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringArcanoVest"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt4#", "=q1=#j12#"}; - { 2, 21868, "", "=q3=Arcanoweave Robe", "=ds=#s5#, #a1#"}; - { 3, 21866, "", "=q3=Arcanoweave Bracers", "=ds=#s8#, #a1#"}; - { 4, 21867, "", "=q3=Arcanoweave Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringImbuedNeather"; - Next = "TailoringTheUnyielding"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringTheUnyielding"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt5#", ""}; - { 2, 24249, "", "=q3=Unyielding Bracers", "=ds=#s8#, #a1#"}; - { 3, 24255, "", "=q4=Unyielding Girdle", "=ds=#s10#, #a1#"}; - Prev = "TailoringArcanoVest"; - Next = "TailoringWhitemendWis"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringWhitemendWis"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt6#", ""}; - { 2, 24264, "", "=q4=Whitemend Hood", "=ds=#s1#, #a1#"}; - { 3, 24261, "", "=q4=Whitemend Pants", "=ds=#s11#, #a1#"}; - Prev = "TailoringTheUnyielding"; - Next = "TailoringSpellstrikeInfu"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringSpellstrikeInfu"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt7#", ""}; - { 2, 24266, "", "=q4=Spellstrike Hood", "=ds=#s1#, #a1#"}; - { 3, 24262, "", "=q4=Spellstrike Pants", "=ds=#s11#, #a1#"}; - Prev = "TailoringWhitemendWis"; - Next = "TailoringBattlecastG"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringBattlecastG"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt8#", ""}; - { 2, 24267, "", "=q4=Battlecast Hood", "=ds=#s1#, #a1#"}; - { 3, 24263, "", "=q4=Battlecast Pants", "=ds=#s11#, #a1#"}; - Prev = "TailoringSpellstrikeInfu"; - Next = "TailoringSoulclothEm"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringSoulclothEm"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt9#", "=q1=#j12#"}; - { 2, 21864, "", "=q4=Soulcloth Shoulders", "=ds=#s3#, #a1#"}; - { 3, 21865, "", "=q4=Soulcloth Vest", "=ds=#s5#, #a1#"}; - { 4, 21863, "", "=q4=Soulcloth Gloves", "=ds=#s9#, #a1#"}; - Prev = "TailoringBattlecastG"; - Next = "TailoringPrimalMoon"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringPrimalMoon"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#crafttm1#", "=q1=#p19#"}; - { 2, 21874, "", "=q4=Primal Mooncloth Shoulders", "=ds=#s3#, #a1#"}; - { 3, 21875, "", "=q4=Primal Mooncloth Robe", "=ds=#s5#, #a1#"}; - { 4, 21873, "", "=q4=Primal Mooncloth Belt", "=ds=#s10#, #a1#"}; - Prev = "TailoringSoulclothEm"; - Next = "TailoringShadowEmbrace"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringShadowEmbrace"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#crafttsh1#", "=q1=#p20#"}; - { 2, 21869, "", "=q4=Frozen Shadoweave Shoulders", "=ds=#s3#, #a1#"}; - { 3, 21871, "", "=q4=Frozen Shadoweave Vest", "=ds=#s5#, #a1#"}; - { 4, 21870, "", "=q4=Frozen Shadoweave Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringPrimalMoon"; - Next = "TailoringSpellfireWRATH"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringSpellfireWRATH"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#crafttsf1#", "=q1=#p21#"}; - { 2, 21848, "", "=q4=Spellfire Robe", "=ds=#s5#, #a1#"}; - { 3, 21847, "", "=q4=Spellfire Gloves", "=ds=#s9#, #a1#"}; - { 4, 21846, "", "=q4=Spellfire Belt", "=ds=#s10#, #a1#"}; - Prev = "TailoringShadowEmbrace"; - Next = "TailoringFrostwovenPower"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringFrostwovenPower"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt10#", ""}; - { 2, 41521, "", "=q2=Frostwoven Cowl", "=ds=#s1#, #a1#"}; - { 3, 41513, "", "=q2=Frostwoven Shoulders", "=ds=#s3#, #a1#"}; - { 4, 41515, "", "=q2=Frostwoven Robe", "=ds=#s5#, #a1#"}; - { 5, 41512, "", "=q2=Frostwoven Wristwraps", "=ds=#s8#, #a1#"}; - { 6, 44211, "", "=q2=Frostwoven Gloves", "=ds=#s9#, #a1#"}; - { 7, 41522, "", "=q2=Frostwoven Belt", "=ds=#s10#, #a1#"}; - { 8, 41519, "", "=q2=Frostwoven Leggings", "=ds=#s11#, #a1#"}; - { 9, 41520, "", "=q2=Frostwoven Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringSpellfireWRATH"; - Next = "TailoringDuskweaver"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringDuskweaver"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt11#", ""}; - { 2, 41546, "", "=q2=Duskweave Cowl", "=ds=#s1#, #a1#"}; - { 3, 41550, "", "=q2=Duskweave Shoulders", "=ds=#s3#, #a1#"}; - { 4, 41549, "", "=q2=Duskweave Robe", "=ds=#s5#, #a1#"}; - { 5, 41551, "", "=q2=Duskweave Wristwraps", "=ds=#s8#, #a1#"}; - { 6, 41545, "", "=q2=Duskweave Gloves", "=ds=#s9#, #a1#"}; - { 7, 41543, "", "=q2=Duskweave Belt", "=ds=#s10#, #a1#"}; - { 8, 41548, "", "=q2=Duskweave Leggings", "=ds=#s11#, #a1#"}; - { 9, 41544, "", "=q2=Duskweave Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringFrostwovenPower"; - Next = "TailoringFrostsavageBattlegear"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - AtlasLoot_Data["TailoringFrostsavageBattlegear"] = { - { 1, 0, "INV_Fabric_Linen_02", "=q6=#craftt12#", ""}; - { 2, 43971, "", "=q3=Frostsavage Cowl", "=ds=#s1#, #a1#"}; - { 3, 43973, "", "=q3=Frostsavage Shoulders", "=ds=#s3#, #a1#"}; - { 4, 43972, "", "=q3=Frostsavage Robe", "=ds=#s5#, #a1#"}; - { 5, 43974, "", "=q3=Frostsavage Bracers", "=ds=#s8#, #a1#"}; - { 6, 41516, "", "=q3=Frostsavage Gloves", "=ds=#s9#, #a1#"}; - { 7, 43969, "", "=q3=Frostsavage Belt", "=ds=#s10#, #a1#"}; - { 8, 43975, "", "=q3=Frostsavage Leggings", "=ds=#s11#, #a1#"}; - { 9, 43970, "", "=q3=Frostsavage Boots", "=ds=#s12#, #a1#"}; - Prev = "TailoringDuskweaver"; - Back = "CRAFTSET4"; - Type = "Crafting"; - }; - - ------------- - --- Other --- - ------------- - - ---------------------------- - --- Crafted Epic Weapons --- - ---------------------------- - - AtlasLoot_Data["CraftedWeapons1"] = { - { 1, 49888, "", "=q4=Shadow's Edge", "=ds=#h2#, #w1#"}; - { 3, 0, "INV_Box_01", "=q6=#p2#", "=q1=#j54#"}; - { 4, 45085, "", "=q4=Titansteel Spellblade", "=ds=#h3#, #w4#"}; - { 5, 42435, "", "=q4=Titansteel Shanker", "=ds=#h1#, #w4#"}; - { 6, 41383, "", "=q4=Titansteel Bonecrusher", "=ds=#h3#, #w6#"}; - { 7, 41384, "", "=q4=Titansteel Guardian", "=ds=#h3#, #w6#"}; - { 8, 41257, "", "=q4=Titansteel Destroyer", "=ds=#h2#, #w6#"}; - { 9, 42508, "", "=q4=Titansteel Shield Wall", "=ds=#w8#"}; - { 11, 0, "INV_Box_01", "=q6=#p5#", "=q1=#j54#"}; - { 12, 41168, "", "=q4=Armor Plated Combat Shotgun", "=ds=#w5#"}; - { 13, 44504, "", "=q4=Nesingwary 4000", "=ds=#w5#"}; - { 16, 0, "INV_Box_01", "=q6=#p2#", "=q1=#j10#"}; - { 17, 23554, "", "=q4=Eternium Runed Blade", "=ds=#h3#, #w4#"}; - { 18, 23555, "", "=q4=Dirge", "=ds=#h1#, #w4#"}; - { 19, 23540, "", "=q4=Felsteel Longblade", "=ds=#h1#, #w10#"}; - { 20, 23541, "", "=q4=Khorium Champion", "=ds=#h2#, #w10#"}; - { 21, 23542, "", "=q4=Fel Edged Battleaxe", "=ds=#h1#, #w1#"}; - { 22, 23543, "", "=q4=Felsteel Reaper", "=ds=#h2#, #w1#"}; - { 23, 23556, "", "=q4=Hand of Eternity", "=ds=#h3#, #w6#"}; - { 24, 23544, "", "=q4=Runic Hammer", "=ds=#h1#, #w6#"}; - { 25, 23546, "", "=q4=Fel Hardened Maul", "=ds=#h2#, #w6#"}; - { 26, 32854, "", "=q4=Hammer of Righteous Might", "=ds=#h2#, #w6#"}; - { 28, 0, "INV_Box_01", "=q6=#p5#", "=q1=#j10#"}; - { 29, 32756, "", "=q4=Gyro-balanced Khorium Destroyer", "=ds=#w5#"}; - Next = "CraftedWeapons2"; - Back = "CRAFTINGMENU"; - Type = "Crafting"; - }; - - AtlasLoot_Data["CraftedWeapons2"] = { - { 1, 0, "INV_Box_01", "=q6=#p2#", "=q1=#j9#"}; - { 2, 19166, "", "=q4=Black Amnesty", "=ds=#h1#, #w4#"}; - { 3, 22383, "", "=q4=Sageblade", "=ds=#h3#, #w10#"}; - { 4, 19168, "", "=q4=Blackguard", "=ds=#h1#, #w10#"}; - { 5, 19169, "", "=q4=Nightfall", "=ds=#h2#, #w1#"}; - { 6, 19170, "", "=q4=Ebon Hand", "=ds=#h1#, #w6#"}; - { 7, 22384, "", "=q4=Persuader", "=ds=#h1#, #w6#"}; - { 8, 17193, "", "=q4=Sulfuron Hammer", "=ds=#h2#, #w6#"}; - { 9, 19167, "", "=q4=Blackfury", "=ds=#w7#"}; - { 10, 22198, "", "=q4=Jagged Obsidian Shield", "=ds=#w8#"}; - { 12, 0, "INV_Box_01", "=q6=#p5#", "=q1=#j9#"}; - { 13, 18282, "", "=q4=Core Marksman Rifle", "=ds=#w5#"}; - { 14, 18168, "", "=q4=Force Reactive Disk", "=ds=#w8#"}; - Prev = "CraftedWeapons1"; - Next = "CraftedWeapons3"; - Back = "CRAFTINGMENU"; - Type = "Crafting"; - }; - - AtlasLoot_Data["CraftedWeapons3"] = { - { 1, 0, "INV_Box_01", "=q6=#p15#", ""}; - { 2, 28425, "", "=q4=Fireguard", "=ds=#h1#, #w10#"}; - { 3, 28426, "", "=q4=Blazeguard", "=ds=#h1#, #w10#"}; - { 4, 28427, "", "=q4=Blazefury", "=ds=#h1#, #w10#"}; - { 5, 28428, "", "=q4=Lionheart Blade", "=ds=#h2#, #w10#"}; - { 6, 28429, "", "=q4=Lionheart Champion", "=ds=#h2#, #w10#"}; - { 7, 28430, "", "=q4=Lionheart Executioner", "=ds=#h2#, #w10#"}; - { 9, 0, "INV_Box_01", "=q6=#p14#", ""}; - { 10, 28431, "", "=q4=The Planar Edge", "=ds=#h3#, #w1#"}; - { 11, 28432, "", "=q4=Black Planar Edge", "=ds=#h3#, #w1#"}; - { 12, 28433, "", "=q4=Wicked Edge of the Planes", "=ds=#h3#, #w1#"}; - { 13, 28434, "", "=q4=Lunar Crescent", "=ds=#h2#, #w1#"}; - { 14, 28435, "", "=q4=Mooncleaver", "=ds=#h2#, #w1#"}; - { 15, 28436, "", "=q4=Bloodmoon", "=ds=#h2#, #w1#"}; - { 16, 0, "INV_Box_01", "=q6=#p22#", ""}; - { 17, 28437, "", "=q4=Drakefist Hammer", "=ds=#h3#, #w6#"}; - { 18, 28438, "", "=q4=Dragonmaw", "=ds=#h3#, #w6#"}; - { 19, 28439, "", "=q4=Dragonstrike", "=ds=#h3#, #w6#"}; - { 20, 28440, "", "=q4=Thunder", "=ds=#h2#, #w6#"}; - { 21, 28441, "", "=q4=Deep Thunder", "=ds=#h2#, #w6#"}; - { 22, 28442, "", "=q4=Stormherald", "=ds=#h2#, #w6#"}; - Prev = "CraftedWeapons2"; - Back = "CRAFTINGMENU"; - Type = "Crafting"; - }; - -------------------------------- --- Daily Profession Rewards --- -------------------------------- @@ -2585,6 +1783,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["AlchemyHighRiskTBC"] = { Name = ALCHEMY.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979362", "1203258", "=q3=Impure Flask of Manifesting Power", "=ds=#sr# 300"}; @@ -2617,6 +1816,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["SmithingHighRiskTBC"] = { Name = BLACKSMITHING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979534", "1204033", "=q3=Hulking Belt Buckle", "=ds=#sr# 300"}; @@ -2643,6 +1843,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["LeatherworkingHighRiskTBC"] = { Name = LEATHERWORKING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979522", "1204021", "=q3=Cobra Strike Gambeson", "=ds=#sr# 300"}; @@ -2665,6 +1866,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["EngineeringHighRiskTBC"] = { Name = ENGINEERING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979550", "1204049", "=q3=Gnomish Magnification Polish", "=ds=#sr# 300"}; @@ -2687,6 +1889,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["EnchantingHighRiskTBC"] = { Name = ENCHANTING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s1968677", "Spell_Holy_GreaterHeal", "=q3=Enchant Weapon - Void Assault", "=ds=#sr# 300"}; @@ -2717,6 +1920,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["TailoringHighRiskTBC"] = { Name = TAILORING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979562", "1204061", "=q3=Armored Cloak Lining", "=ds=#sr# 300"}; @@ -2739,6 +1943,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["JewelcraftingHighRiskTBC"] = { Name = JEWELCRAFTING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979639", "1204165", "=q3=Deep Gold Twisted Pendant", "=ds=#sr# 300"}; @@ -2767,6 +1972,7 @@ local SPELLFIRE = GetSpellInfo(26797); AtlasLoot_Data["CookingHighRiskTBC"] = { Name = COOKING.." High Risk"; + Type = "CraftingNoBF"; { Name = "Rare"; { 1, "s979384", "1203280", "=q3=Infused Living Soup", "=ds=#sr# 300"}; From 79840303b55e0adb6dd3dfddd1c5cb20947d16ff Mon Sep 17 00:00:00 2001 From: Anch Date: Sun, 16 Oct 2022 00:05:37 +1300 Subject: [PATCH 16/33] nav button bug fix fixed nav buttons not showing on rare occasion --- AtlasLoot/Core/AtlasLoot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index d6f5456..b380df2 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -805,7 +805,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) tablenum = AtlasLootItemsFrame.refreshOri[3]; end - if AtlasLootItemsFrame.refreshOri and tablenum ~= #_G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]] and dataSource_backup ~= "AtlasLoot_TokenData" then + if AtlasLootItemsFrame.refresh and tablenum ~= #_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]] and dataSource_backup ~= "AtlasLoot_TokenData" then _G["AtlasLootItemsFrame_NEXT"]:Show(); _G["AtlasLootItemsFrame_NEXT"].tablenum = tablenum + 1; _G["AtlasLootItemsFrame_NEXT"].tablebase = tablebase; From d2089e78e8e4648b8bd9dcc770b6be39dac08d87 Mon Sep 17 00:00:00 2001 From: Szyler Date: Sun, 16 Oct 2022 18:31:41 +0200 Subject: [PATCH 17/33] Added Enchant Weapon - Witchdoctor --- AtlasLoot_Crafting/craftingTBC.lua | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/AtlasLoot_Crafting/craftingTBC.lua b/AtlasLoot_Crafting/craftingTBC.lua index 40c2c51..75d825d 100644 --- a/AtlasLoot_Crafting/craftingTBC.lua +++ b/AtlasLoot_Crafting/craftingTBC.lua @@ -595,21 +595,22 @@ local SPELLFIRE = GetSpellInfo(26797); }; { Name = AL["Enchant Weapon"]; - { 1, "s42974", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Executioner", "=ds=#sr# 375"}; - { 2, "s820034", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Undaunted Might", "=ds=#sr# 375"}; - { 3, "s359012", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Faith", "=ds=#sr# 375"}; - { 4, "s27984", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Mongoose", "=ds=#sr# 375"}; - { 5, "s27982", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Soulfrost", "=ds=#sr# 375"}; - { 6, "s27981", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Sunfire", "=ds=#sr# 375"}; - { 7, "s28004", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Battlemaster", "=ds=#sr# 360"}; - { 8, "s28003", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Spellsurge", "=ds=#sr# 360"}; - { 9, "s46578", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Deathfrost", "=ds=#sr# 350"}; - { 10, "s34010", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Healing", "=ds=#sr# 350"}; - { 11, "s27975", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Spellpower", "=ds=#sr# 350"}; - { 12, "s27972", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Potency", "=ds=#sr# 350"}; - { 13, "s42620", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Greater Agility", "=ds=#sr# 350"}; - { 14, "s27968", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Intellect", "=ds=#sr# 340"}; - { 15, "s27967", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Striking", "=ds=#sr# 340"}; + { 1, "s351535", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Witchdoctor", "=ds=#sr# 375"}; + { 2, "s42974", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Executioner", "=ds=#sr# 375"}; + { 3, "s820034", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Undaunted Might", "=ds=#sr# 375"}; + { 4, "s359012", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Faith", "=ds=#sr# 375"}; + { 5, "s27984", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Mongoose", "=ds=#sr# 375"}; + { 6, "s27982", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Soulfrost", "=ds=#sr# 375"}; + { 7, "s27981", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Sunfire", "=ds=#sr# 375"}; + { 8, "s28004", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Battlemaster", "=ds=#sr# 360"}; + { 9, "s28003", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Spellsurge", "=ds=#sr# 360"}; + { 10, "s46578", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Deathfrost", "=ds=#sr# 350"}; + { 11, "s34010", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Healing", "=ds=#sr# 350"}; + { 12, "s27975", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Spellpower", "=ds=#sr# 350"}; + { 13, "s27972", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Potency", "=ds=#sr# 350"}; + { 14, "s42620", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Greater Agility", "=ds=#sr# 350"}; + { 15, "s27968", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Intellect", "=ds=#sr# 340"}; + { 16, "s27967", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Major Striking", "=ds=#sr# 340"}; }; { Name = "Enchant Staff"; From 877902fc226786b14d44867850ecc973081a3420 Mon Sep 17 00:00:00 2001 From: Anch Date: Fri, 21 Oct 2022 15:04:36 +1300 Subject: [PATCH 18/33] new page filter --- AtlasLoot/AtlasLoot.toc | 4 +- AtlasLoot/Core/AtlasLoot.lua | 55 +- AtlasLoot/Core/Filter.lua | 636 +++++++++--------- AtlasLoot/Core/LootButtons.lua | 6 +- AtlasLoot/Core/Options.lua | 30 +- .../AtlaslootDefaultFrameCreate.lua | 19 +- AtlasLoot/Locales/constants.en.lua | 15 + 7 files changed, 356 insertions(+), 409 deletions(-) diff --git a/AtlasLoot/AtlasLoot.toc b/AtlasLoot/AtlasLoot.toc index 795411f..22ed5c2 100644 --- a/AtlasLoot/AtlasLoot.toc +++ b/AtlasLoot/AtlasLoot.toc @@ -24,8 +24,8 @@ ## RealTitle-zhCN: [地图]副本掉落物品查询 ## RealTitle-zhTW: [地圖]AL 物品掉落[主程式] ## Notes-ruRU: Отображает весю возможную добычу с боссов -## SavedVariables: AtlasLootOptions, AtlasLootDB, AtlasLootWishList -## SavedVariablesPerCharacter: AtlasLootCharDB, AtlasLootFilterDB +## SavedVariables: AtlasLootOptions, AtlasLootDB, AtlasLootWishList, AtlasLootFilterDB +## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: LootLink, ItemSync, DewdropLib, FuBarPlugin-3.0, FuBar, Ace3, LibBabble-Boss-3.0, LibBabble-Faction-3.0, LibBabble-Inventory-3.0, LibBabble-Zone-3.0 embeds.xml diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index b380df2..e24100d 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -133,6 +133,8 @@ function AtlasLoot:OnEnable() if not AtlasLootCharDB then AtlasLootCharDB = {} end if not AtlasLootCharDB["QuickLooks"] then AtlasLootCharDB["QuickLooks"] = {} end if not AtlasLootCharDB["SearchResult"] then AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "Search", Back = true}; end + if not AtlasLootFilterDB then AtlasLootFilterDB = {["FilterLists"] = {}} end; + if AtlasLootFilterDB and not AtlasLootFilterDB["FilterLists"] then AtlasLootFilterDB = {["FilterLists"] = {}} end; if AtlasLoot_Data then AtlasLoot_Data["EmptyTable"] = { Name = AL["Select a Loot Table..."]; @@ -220,7 +222,6 @@ function AtlasLoot:OnEnable() panel.name=AL["AtlasLoot"]; InterfaceOptions_AddCategory(panel); --Filter and wishlist options menus creates as part of the next 2 commands - AtlasLoot_CreateFilterOptions(); AtlasLoot_CreateWishlistOptions(); panel = _G["AtlasLootHelpFrame"]; panel.name=AL["Help"]; @@ -231,11 +232,13 @@ function AtlasLoot:OnEnable() end AtlasLoot_UpdateLootBrowserScale(); local playerName = UnitName("player"); + -- Is wishlist item disabled on load or not if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then AtlasLootItemsFrame_Wishlist_UnLock:Disable(); else AtlasLootItemsFrame_Wishlist_UnLock:Enable(); end + AtlasLoot:LoadItemIDsDatabase(); end function AtlasLoot_Reset(data) @@ -372,6 +375,7 @@ function AtlasLoot:CreateToken(dataID) }; end --Fills table with items + local count = #AtlasLoot_Data[dataID][1] * #AtlasLoot_Data[dataID]; for n, t in ipairs(AtlasLoot_Data[dataID]) do for c, v in ipairs(t) do if type(v) == "table" then @@ -380,21 +384,16 @@ function AtlasLoot:CreateToken(dataID) if itemType == select(9, GetItemInfo(itemID)) or itemType2 == select(9, GetItemInfo(itemID)) then table.insert(AtlasLoot_TokenData[orgID][1], {#AtlasLoot_TokenData[orgID][1] + 1, v[2], v[3], v[4], t.Name}); end - if #t == n then - AtlasLoot:CancelTimer(AtlasLoot.refreshTimer); - AtlasLoot.refreshTimer = AtlasLoot:ScheduleTimer("Refresh", 2); + if count == 1 then + AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); end + count = count - 1; end) end end end end --- Refresh loottable after token table creation. -function AtlasLoot:Refresh() - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); -end - --[[ AtlasLoot:ShowItemsFrame(dataID, dataSource, tablenum): dataID - Name of the loot table @@ -424,6 +423,8 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) --Ditch the Quicklook selector AtlasLootQuickLooksButton:Hide(); + AtlasLoot:HideFilterCreateButtons(); + --Hide Map and reshow lootbackground AtlasLootDefaultFrame_Map:Hide(); AtlasLootDefaultFrame_LootBackground:Show(); @@ -773,7 +774,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) end -- Show the Filter Check-Box - if dataID ~= "SearchResult" and filterCheck(dataID) ~= true and dataSource_backup ~= "AtlasLoot_TokenData" and dataSource_backup ~= "AtlasLoot_CurrentWishList" then + if filterCheck(dataID) ~= true then AtlasLootFilterCheck:Show(); end @@ -805,7 +806,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) tablenum = AtlasLootItemsFrame.refreshOri[3]; end - if AtlasLootItemsFrame.refresh and tablenum ~= #_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]] and dataSource_backup ~= "AtlasLoot_TokenData" then + if AtlasLootItemsFrame.refresh and tablenum ~= #_G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]] and dataSource_backup ~= "AtlasLoot_TokenData" and dataID ~= "SearchResult" or tablenum ~= #_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]] and dataID == "SearchResult" then _G["AtlasLootItemsFrame_NEXT"]:Show(); _G["AtlasLootItemsFrame_NEXT"].tablenum = tablenum + 1; _G["AtlasLootItemsFrame_NEXT"].tablebase = tablebase; @@ -816,6 +817,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) _G["AtlasLootItemsFrame_PREV"].tablenum = tablenum - 1; _G["AtlasLootItemsFrame_PREV"].tablebase = tablebase; end + if dataSource[dataID].Back then _G["AtlasLootItemsFrame_BACK"]:Show(); end @@ -824,7 +826,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum) --Anchor the item frame where it is supposed to be if ATLASLOOT_FILTER_ENABLE and dataID ~= "FilterList" then - AtlasLoot:HideNoUsableItems(); + AtlasLoot:HideFilteredItems(); end if dataID ~= "SearchResult" then @@ -1055,35 +1057,6 @@ function AtlasLoot:QueryLootPage() queryNextItem(START); end ---[[ -AtlasLoot:QueryLootPage() -Querys all valid items on the current loot page. -]] -function AtlasLoot:QueryLootPageOLD() -local lastitem - for t = 1, 30, 1 do - local xbutton = _G["AtlasLootItem_"..t]; - local xqueryitem = xbutton.itemID; - if (xqueryitem) and (xqueryitem ~= nil) and (xqueryitem ~= "") and (xqueryitem ~= 0) and (string.sub(xqueryitem, 1, 1) ~= "s") then - lastitem = t; - end - end - for i = 1, 30, 1 do - local button = _G["AtlasLootItem_"..i]; - local queryitem = button.itemID; - if (queryitem) and (queryitem ~= nil) and (queryitem ~= "") and (queryitem ~= 0) and (string.sub(queryitem, 1, 1) ~= "s") then - local item = Item:CreateFromID(queryitem); - if not (item:GetInfo()) then - item:ContinueOnLoad(function(itemId) - if i == lastitem then - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]); - end - end) - end - end - end -end - --[[ AtlasLoot:AddTooltip(frameb, tooltiptext) Adds explanatory tooltips to UI objects. diff --git a/AtlasLoot/Core/Filter.lua b/AtlasLoot/Core/Filter.lua index d82777c..efac80b 100644 --- a/AtlasLoot/Core/Filter.lua +++ b/AtlasLoot/Core/Filter.lua @@ -5,7 +5,7 @@ Loot browser associating loot with instance bosses Can be integrated with Atlas (http://www.atlasmod.com) Functions: -AtlasLoot:HideNoUsableItems() +AtlasLoot:HideFilteredItems() AtlasLoot_FilterEnableButton() CreateCheckButton(parrent, text, num) AtlasLoote_CreateFilterOptions() @@ -16,359 +16,349 @@ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot"); local OptionsLoadet = false -AtlasLootFilterDB = {}; +AtlasLoot_FilterMenu = AceLibrary("Dewdrop-2.0"); +AtlasLoot_SetFiltersMenu = AceLibrary("Dewdrop-2.0"); -local FilterTableNames = { - ["Armor"] = AL["Armor:"], - ["WeaponsMeele"] = AL["Melee weapons:"], - ["WeaponsMeeleTwoHand"] = BabbleInventory["Two-Hand"]..":",--.." "..AL["Melee weapons:"], - ["WeaponsRanged"] = AL["Ranged weapons:"], - ["Relics"] = AL["Relics:"], - ["Other"] = AL["Other:"], -} - -local FilterSort = {"Armor","WeaponsMeele","WeaponsMeeleTwoHand","WeaponsRanged","Relics","Other"} local FilterTable = { - ["Armor"] = { - "Cloth", --1 - "Leather", --2 - "Mail", --3 - "Plate", --4 - }, - - ["WeaponsMeele"] = { - "Held in Off-Hand", --1 - "Dagger", --2 - "Mace", --3 - "Staff", --4 - "Axe", --5 - "Polearm", --6 - "Shield", --7 - "Sword", --8 - "Fist Weapon", --9 - }, - - ["WeaponsMeeleTwoHand"] = { - "Mace", --1 - "Axe", --2 - "Sword", --3 - }, - - ["WeaponsRanged"] = { - "Wand", --1 - "Bow", --2 - "Crossbow", --3 - "Gun", --4 - "Thrown", --5 - }, - - ["Relics"] = { - "Idol", --1 - "Totem", --2 - "Libram", --3 - "Sigils", --4 - }, - - ["Other"] = { - "Ring", --1 - "Trinket", --2 - "Neck", --3 - "Back", --4 - } -} - -local ClassHides = { - ["DRUID"] = {["Armor"] = {true,true,false,false},["WeaponsMeele"] = {true,true,true,true,false,true,false,false,false},["WeaponsMeeleTwoHand"] = {true,false,false},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {true,false,false,false},["Other"] = {true,true,true,true}}, - ["MAGE"] = {["Armor"] = {true,false,false,false},["WeaponsMeele"] = {true,true,false,true,false,false,false,true,false},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {true,false,false,false,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, - ["PALADIN"] = {["Armor"] = {true,true,true,true},["WeaponsMeele"] = {true,false,true,false,true,true,true,true,false},["WeaponsMeeleTwoHand"] = {true,false,true},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {false,false,true,false},["Other"] = {true,true,true,true}}, - ["PRIEST"] = {["Armor"] = {true,false,false,false},["WeaponsMeele"] = {true,true,true,true,false,false,false,false,false},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {true,false,false,false,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, - ["ROGUE"] = {["Armor"] = {true,true,false,false},["WeaponsMeele"] = {true,true,true,false,true,false,false,true,true},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {false,true,true,true,true},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, - ["HUNTER"] = {["Armor"] = {false,true,true,false},["WeaponsMeele"] = {false,true,false,true,true,true,false,true,true},["WeaponsMeeleTwoHand"] = {false,true,true},["WeaponsRanged"] = {false,true,true,true,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, - ["SHAMAN"] = {["Armor"] = {true,true,true,false},["WeaponsMeele"] = {true,true,true,true,true,false,true,false,true},["WeaponsMeeleTwoHand"] = {true,true,false},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {false,true,false,false},["Other"] = {true,true,true,true}}, - ["WARLOCK"] = {["Armor"] = {true,false,false,false},["WeaponsMeele"] = {true,true,false,true,false,false,false,true,false},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {true,false,false,false,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, - ["WARRIOR"] = {["Armor"] = {true,true,true,true},["WeaponsMeele"] = {true,true,true,true,true,true,true,true,true},["WeaponsMeeleTwoHand"] = {true,true,true},["WeaponsRanged"] = {false,true,true,true,true},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, - ["DEATHKNIGHT"] = {["Armor"] = {true,true,true,true},["WeaponsMeele"] = {true,false,true,false,true,true,false,true,false},["WeaponsMeeleTwoHand"] = {true,false,true},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {false,false,false,true},["Other"] = {true,true,true,true}} + { + Name = AL["Primary Stats"], + Type = "Stat", + {"Strength", "ITEM_MOD_STRENGTH_SHORT"}, + {"Agility", "ITEM_MOD_AGILITY_SHORT"}, + {"Intellect", "ITEM_MOD_INTELLECT_SHORT"}, + {"Spirit", "ITEM_MOD_SPIRIT_SHORT"} + }, + { + Name = AL["Secondary Stats"], + Type = "Stat", + {"Attack Power", "ITEM_MOD_ATTACK_POWER_SHORT"}, + {"Spell Power", "ITEM_MOD_SPELL_POWER_SHORT"}, + {"Crit", "ITEM_MOD_CRIT_RATING_SHORT"}, + {"Hit", "ITEM_MOD_HIT_RATING_SHORT"}, + {"Haste", "ITEM_MOD_HASTE_RATING_SHORT"}, + {"Expertise", "ITEM_MOD_EXPERTISE_RATING_SHORT"}, + {"Armor Pen", "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT"}, + {"Spell Pen", "ITEM_MOD_SPELL_PENETRATION_SHORT"} + }, + { + Name = AL["Armor Type"], + Type = "ArmorType", + {"Cloth", "Cloth"}, + {"Leather", "Leather"}, + {"Mail", "Mail"}, + {"Plate", "Plate"}, + }, + { + Name = AL["Weapons"], + Type = "InvType", + {"One-Hand", "INVTYPE_WEAPON"}, + {"Two-Hand", "INVTYPE_2HWEAPON"}, + {"Main Hand", "INVTYPE_WEAPONMAINHAND"}, + {"Off Hand", "INVTYPE_WEAPONOFFHAND"}, + {"Caster Off Hand", "INVTYPE_HOLDABLE"}, + {"Ranged", "INVTYPE_RANGED"}, + {"Thrown", "INVTYPE_THROWN"}, + {"Relic", "INVTYPE_RELIC"}, + {"Shield", "INVTYPE_SHIELD"} + }, + { + Name = AL["Accessories"], + Type = "InvType", + {"Necklace", "INVTYPE_NECK"}, + {"Back", "INVTYPE_CLOAK"}, + {"Ring", "INVTYPE_FINGER"}, + {"Trinket", "INVTYPE_TRINKET"} + }, + { + Name = AL["Defensive Stats"], + Type = "Stat", + {"Defense", "ITEM_MOD_DEFENSE_SKILL_RATING_SHORT"}, + {"Dodge", "ITEM_MOD_DODGE_RATING_SHORT"}, + {"Parry", "ITEM_MOD_PARRY_RATING_SHORT"}, + {"Block", "ITEM_MOD_BLOCK_RATING_SHORT"}, + {"Block Value", "ITEM_MOD_BLOCK_VALUE_SHORT"}, + {"Resilience", "ITEM_MOD_RESILIENCE_RATING"} + }, } -- ********************************************************************** -- ItemFilter: --- AtlasLoot:HideNoUsableItems() +-- AtlasLoot:HideFilteredItems() -- AtlasLoot_FilterEnableButton() -- ********************************************************************** +AtlasLootFilter = {}; +AtlasLootFilter["FilterList"] = {}; -AtlasLoot_Data["FilterList"] = { [1] = {}; }; - -function AtlasLoot_Testabc() - print(BabbleInventory["Two-Hand"]) -end - -function AtlasLoot:HideNoUsableItems() +function AtlasLoot:HideFilteredItems() local dataID, dataSource, tablenum = AtlasLootItemsFrame.refreshFilter[1], _G[AtlasLootItemsFrame.refreshFilter[2]], AtlasLootItemsFrame.refreshFilter[3]; - local tablebase = dataSource[dataID][tablenum] if not tablebase or dataID == "WishList" or dataID == "SearchResult" then return end - local itemCount = 0 - local countAll = 1 - local count = 0 - local leatherworking = GetSpellInfo(2108) - AtlasLoot_Data["FilterList"] = { Type = dataSource[dataID].Type; Name = dataSource[dataID].Name; Back = dataSource[dataID].Back; Map = dataSource[dataID].Map; [tablenum] = {Name = dataSource[dataID][tablenum].Name}; }; + AtlasLootFilter["FilterList"].Type = dataSource[dataID].Type; + AtlasLootFilter["FilterList"].Name = dataSource[dataID].Name; + AtlasLootFilter["FilterList"].Back = dataSource[dataID].Back; + AtlasLootFilter["FilterList"].Map = dataSource[dataID].Map; + AtlasLootFilter["FilterList"][tablenum] = {Name = dataSource[dataID][tablenum].Name}; - for i=1,30 do - local info = _G["AtlasLootItem_"..i.."_Extra"]:GetText() - if _G["AtlasLootItem_"..i]:IsShown() then - local xgo = true - local countOld = count - itemCount = itemCount + 1 - countAll = countAll + count - count = 0 - local xitemID = _G["AtlasLootItem_"..i].itemID - local xspellitemID = _G["AtlasLootItem_"..i].spellitemID - local xitemTexture = tablebase[itemCount][3] - local xitemExtraText = AtlasLoot_FixText(tablebase[itemCount][5]) - local xitemExtraTextSave = xitemExtraText - -- remove the "-" - xitemExtraText = gsub(xitemExtraText, "-", "") - local xitemNameText = _G["AtlasLootItem_"..i.."_Name"]:GetText() - - if xitemExtraText and xitemExtraText ~= "" then - for k = 1,#FilterSort do - k = FilterSort[k] - if type(FilterTable[k]) == "table" then - for i,j in pairs(FilterTable[k]) do - local Slotname = "" - -- Bugfix with Sigils - if j == "Sigils" then - Slotname = AL["Sigil"] - else - Slotname = BabbleInventory[j] - end - - if (k ~= "WeaponsMeeleTwoHand" and not strfind(xitemExtraText, BabbleInventory["Two-Hand"]) and strfind(xitemExtraText, Slotname) and AtlasLootFilterDB[k][j] == false) then - xgo = false - -- German fix - if j == "Shield" and not strfind(xitemExtraText, BabbleInventory["Held in Off-Hand"]) and not strfind(xitemExtraText, BabbleInventory["Off Hand"]) then - xgo = false - elseif j == "Shield" and strfind(xitemExtraText, BabbleInventory["Held in Off-Hand"]) and AtlasLootFilterDB["WeaponsMeele"]["Held in Off-Hand"] == true then - xgo = true - end - elseif k == "WeaponsMeeleTwoHand" and strfind(xitemExtraText, BabbleInventory["Two-Hand"]) and strfind(xitemExtraText, Slotname) and AtlasLootFilterDB[k][j] == false then - xgo = false - -- Fix bug with Leatherworking Patterns - elseif strfind(xitemExtraText, leatherworking) then - xgo = true - end - end + local function getStats(itemID,sType) + for i,v in pairs(AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter]) do + if type(v) == "table" then + if v[1] and v[3] == sType then + local ItemStats = {}; + GetItemStats(select(2,GetItemInfo(itemID)), ItemStats); + if ItemStats[v[2]] then + return true; end end end - - -- Sort the items - if xgo == true then - if i==16 and countOld > 0 then - AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave} - countAll = 16 - elseif i==16 and xitemExtraText and strfind(xitemExtraText, AL["Token"]) then - AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave} - countAll = 16 - elseif countAll < 16 and xitemNameText and strfind(xitemNameText, AL["Hard Mode"]) then - AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave} - countAll = 16 - elseif i==16 and xitemTexture == "INV_Box_01" then - AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave} - countAll = 16 - else - AtlasLoot_Data["FilterList"][tablenum][countAll] = { countAll, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave} - end - - if tablebase[itemCount][6] and countAll==16 then - AtlasLoot_Data["FilterList"][tablenum][16][6] = tablebase[itemCount][6] - elseif tablebase[itemCount][6] and countAll~=16 then - AtlasLoot_Data["FilterList"][tablenum][countAll][6] = tablebase[itemCount][6] - end - if tablebase[itemCount][7] and countAll==16 then - AtlasLoot_Data["FilterList"][tablenum][16][7] = tablebase[itemCount][7] - elseif tablebase[itemCount][7] and countAll~=16 then - AtlasLoot_Data["FilterList"][tablenum][countAll][7] = tablebase[itemCount][7] - end - if tablebase[itemCount][8] and countAll==16 then - AtlasLoot_Data["FilterList"][tablenum][16][8] = tablebase[itemCount][8] - elseif tablebase[itemCount][8] and countAll~=16 then - AtlasLoot_Data["FilterList"][tablenum][countAll][8] = tablebase[itemCount][8] - end - - countAll = countAll + 1 - count = 0 - end - else - count = count + 1 end end - AtlasLoot:ShowItemsFrame("FilterList", "AtlasLoot_Data", AtlasLootItemsFrame.refresh[3]) + local count = 0 + local function getFilterType(itemID) + local filterSelect3, filterSelect2,_ , filterSelect1 = select(6,GetItemInfo(itemID)); + local filter1 = AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][filterSelect1]; + local filter2 = AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][filterSelect2]; + if filter1 and filter1[1] and filter1[3] == "InvType" and getStats(itemID,"Stat") or + filter2 and filter2[1] and filter2[3] == "ArmorType" and getStats(itemID,"Stat") + then + return true; + else + for _,v in pairs(FilterTable) do + for _,t in ipairs(v) do + if t[2] == filterSelect1 or t[2] == filterSelect2 or t[2] == filterSelect3 then + return false; + end + end + end + return true; + end + end + for i,v in ipairs(tablebase) do + if getFilterType(v[2]) or v[2] == 0 then + if v[1] == 16 then + count = 0; + end + table.insert(AtlasLootFilter["FilterList"][tablenum],{v[1] - count,v[2],v[3],v[4],v[5],v[6],v[7],v[8]}); + elseif v[1] == 16 then + count = 1 + else + count = count + 1; + end + end + + AtlasLoot:ShowItemsFrame("FilterList", "AtlasLootFilter", AtlasLootItemsFrame.refresh[3]) end -function AtlasLoot_FilterEnableButton() - if ATLASLOOT_FILTER_ENABLE == true then - ATLASLOOT_FILTER_ENABLE = false; - AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refreshFilter[1], AtlasLootItemsFrame.refreshFilter[2], AtlasLootItemsFrame.refreshFilter[3]); +function AtlasLoot_FilterEnableButton(self, btnclick) + if btnclick == "RightButton" then + if AtlasLoot_FilterMenu:IsOpen() then + AtlasLoot_FilterMenu:Close(); + else + AtlasLoot_FilterMenu:Unregister(AtlasLootFilterCheck); + AtlasLoot:FilterMenuRegister(); + AtlasLoot_FilterMenu:Open(self); + end + if AtlasLootFilterCheck:GetChecked() then + AtlasLootFilterCheck:SetChecked(false); + else + AtlasLootFilterCheck:SetChecked(true); + end else - ATLASLOOT_FILTER_ENABLE = true - AtlasLoot:HideNoUsableItems(); + if ATLASLOOT_FILTER_ENABLE then + ATLASLOOT_FILTER_ENABLE = false; + AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refreshFilter[1], AtlasLootItemsFrame.refreshFilter[2], AtlasLootItemsFrame.refreshFilter[3]); + else + ATLASLOOT_FILTER_ENABLE = true + AtlasLoot:HideFilteredItems(); + end end end +--[[ +AtlasLoot:FilterMenuRegister: +Constructs the Filter menu. +]] +function AtlasLoot:FilterMenuRegister() + AtlasLoot_FilterMenu:Register(AtlasLootFilterCheck, + 'point', function(parent) + return "TOP", "BOTTOM" + end, + 'children', function(level, value) + for i,v in ipairs(AtlasLootFilterDB["FilterLists"]) do + local setFilter = false; + if AtlasLootFilterDB.SelectedFilter == i then setFilter = true end + AtlasLoot_FilterMenu:AddLine( + "text", v.Name, + "func", function() AtlasLootFilterDB.SelectedFilter = i end, + "checked", setFilter + ); + end + AtlasLoot_FilterMenu:AddLine( + "text", AL["Add Filter Set"], + "func", function() AtlasLoot:OpenFilterCreate() end, + "notCheckable", true + ); + --Close button + AtlasLoot_FilterMenu:AddLine( + 'text', AL["Close Menu"], + 'textR', 0, + 'textG', 1, + 'textB', 1, + 'func', function() AtlasLoot_FilterMenu:Close() end, + 'notCheckable', true + ); + end, + 'dontHook', true + ) +end + +--Sets all the filter check boxs for current filter +local function setFilterChecks() + local filterList = AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter]; + local count = 1; + for i,v in ipairs(FilterTable) do + count = count + 1; + for n,t in ipairs(v) do + if filterList[t[2]] and filterList[t[2]][1] then + _G["AtlasLootFilterButton_"..count]:SetChecked(true); + else + _G["AtlasLootFilterButton_"..count]:SetChecked(false); + end + count = count + 1; + end + end +end + +local function setFilter(arg1,type) + if AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1] and AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1][1] then + AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1] = {false,arg1,type}; + else + AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1] = {true,arg1,type}; + end +end + +function AtlasLoot:HideFilterCreateButtons() + if not ATLASLOOT_BUILD_FILTER_LIST then return end + for i=1, 41 do + _G["AtlasLootFilterButton_"..i]:Hide(); + end + AtlasLootFilterSelect:Hide(); + AtlasLootFilterCreate:Hide(); +end + -- ********************************************************************** -- Options: --- AtlasLoot:HideNoUsableItems() --- CreateCheckButton(parrent, text, num) --- AtlasLoote_CreateFilterOptions() +-- AtlasLoot:HideFilteredItems() -- ********************************************************************** -local ypos = -40 -local xpos = 0 -local linecount = 1 -local lastframewidht,lastframeheight = 0,0 - -local function CreateCheckButton(parrent, text, num) - local framewidht = InterfaceOptionsFramePanelContainer:GetWidth() - local Check = CreateFrame("CheckButton", "AtlasLootOptionsCheck"..text..num, parrent, "OptionsCheckButtonTemplate") - Check:SetPoint("LEFT", parrent, "TOPLEFT", xpos, ypos) - Check:SetWidth(25) - Check:SetHeight(25) - Check:SetScript("OnShow", function() - _G[this:GetName().."Text"]:SetText(BabbleInventory[text]); - if AtlasLootFilterDB[num][text] then - this:SetChecked(1); +ATLASLOOT_BUILD_FILTER_LIST = false; +-- Place to add new or edit existing filter lists +function AtlasLoot:OpenFilterCreate() + if not ATLASLOOT_BUILD_FILTER_LIST then + ATLASLOOT_BUILD_FILTER_LIST = true; + local count = 1; + for i,v in ipairs(FilterTable) do + local filterCatLable = AtlasLootItemsFrame:CreateFontString("AtlasLootFilterButton_"..count,"OVERLAY","GameFontNormal"); + filterCatLable:SetText(v.Name); + filterCatLable:Show(); + if count == 1 then + filterCatLable:SetPoint("TOP", "AtlasLootItemsFrame", "TOP",-150,-90); + elseif count == 15 then + filterCatLable:SetPoint("TOP", "AtlasLootItemsFrame", "TOP",0,-90); + elseif count == 30 then + filterCatLable:SetPoint("TOP", "AtlasLootItemsFrame", "TOP",150,-90); else - this:SetChecked(nil); + filterCatLable:SetPoint("LEFT", "AtlasLootFilterButton_"..(count - 1), "LEFT",0,-25); end - end) - Check:SetScript("OnClick", function() - if AtlasLootFilterDB[num][text] then - AtlasLootFilterDB[num][text] = false; - else - AtlasLootFilterDB[num][text] = true; - end - end) - - if xpos == framewidht/2 then - xpos = 0 - ypos = ypos - 20 - linecount = 1 - elseif xpos == 0 then - xpos = framewidht/2 - linecount = 2 + count = count + 1; + for n,t in ipairs(v) do + local button = CreateFrame("CheckButton", "AtlasLootFilterButton_"..count, AtlasLootItemsFrame, "OptionsCheckButtonTemplate"); + _G["AtlasLootFilterButton_"..count.."Text"]:SetText(t[1]); + button:SetScript("OnClick", function() setFilter(t[2],v.Type) end) + if n == 1 then + button:SetPoint("LEFT", "AtlasLootFilterButton_"..(count - 1), "LEFT",0,-25); + else + button:SetPoint("LEFT", "AtlasLootFilterButton_"..(count - 1), "LEFT",0,-20); + end + count = count + 1; + end + end + + local filterSelectButton = CreateFrame("Button", "AtlasLootFilterSelect", AtlasLootItemsFrame, "UIDropDownMenuTemplate"); + filterSelectButton:SetSize(130,24); + filterSelectButton:SetPoint("Top", "AtlasLootItemsFrame", "TOP",-110,-35); + + local createFilterButton = CreateFrame("Button", "AtlasLootFilterCreate", AtlasLootItemsFrame, "OptionsButtonTemplate"); + createFilterButton:SetSize(130,20); + createFilterButton:SetPoint("LEFT", "AtlasLootItemsFrame_BACK", "LEFT",-150,0); + createFilterButton:SetText(AL["Add New Filter"]); + createFilterButton:SetScript("OnClick", function(self) StaticPopup_Show("ATLASLOOT_ADD_FILTER_LIST") end); + end + UIDropDownMenu_Initialize(AtlasLootFilterSelect, AtlasLoot.FilterSelectorMenuInitialize); + UIDropDownMenu_SetSelectedID(AtlasLootFilterSelect, AtlasLootFilterDB.SelectedFilter); + + setFilterChecks(); + + for i=1,41 do + _G["AtlasLootFilterButton_"..i]:Show(); + end + AtlasLootFilterSelect:Show(); + AtlasLootFilterCreate:Show(); + + --Ditch the Quicklook selector + AtlasLootQuickLooksButton:Hide(); + -- Hide the Filter Check-Box + AtlasLootFilterCheck:Hide(); + --Hide navigation buttons by default, only show what we need + _G["AtlasLootItemsFrame_BACK"]:Show(); + _G["AtlasLootItemsFrame_NEXT"]:Hide(); + _G["AtlasLootItemsFrame_PREV"]:Hide(); + --Hide UI objects so that only needed ones are shown + for i = 1, 30, 1 do + _G["AtlasLootItem_"..i.."_Unsafe"]:Hide(); + _G["AtlasLootItem_"..i]:Hide(); + _G["AtlasLootItem_"..i].itemID = 0; + _G["AtlasLootItem_"..i].spellitemID = 0; + end + --Set Page Title + AtlasLoot_BossName:SetText("Create Filter Set"); + AtlasLoot_FilterMenu:Close(); +end + +local function FilterSelectOnClick() + AtlasLootFilterDB.SelectedFilter = this:GetID(); + UIDropDownMenu_SetSelectedID(AtlasLootFilterSelect, AtlasLootFilterDB.SelectedFilter); + setFilterChecks(); +end + +function AtlasLoot:FilterSelectorMenuInitialize() + for i,v in ipairs(AtlasLootFilterDB["FilterLists"]) do + local info = { + text = v.Name; + func = FilterSelectOnClick; + }; + UIDropDownMenu_AddButton(info); end end -local function CreateCat(parrent, text) - if not AtlasLootFilterDB[text] then AtlasLootFilterDB[text] = {} end - if linecount == 2 then - ypos = ypos - 10 - else - ypos = ypos + 10 - end - local Text = parrent:CreateFontString("AtlasLoot"..text,"OVERLAY","GameFontNormal") - Text:SetPoint("TOPLEFT", parrent, "TOPLEFT", xpos, ypos) - Text:SetText(FilterTableNames[text]); - Text:SetHeight(20) - Text:SetTextColor(1.0, 1.0, 1.0, 1.0); - - ypos = ypos - 30 - - for i,j in pairs(FilterTable[text]) do - if AtlasLootFilterDB[text][j] ~= true and AtlasLootFilterDB[text][j] ~= false then AtlasLootFilterDB[text][j] = true end - CreateCheckButton(parrent, j, text) - end - - xpos = 0 - ypos = ypos - 10 -end - -function AtlasLoot_CreateFilterOptions() - if OptionsLoadet then return end - local FilterOptionsFrame = CreateFrame("FRAME", nil) - FilterOptionsFrame.name = AL["Filter"]; - FilterOptionsFrame.parent = AL["AtlasLoot"]; - - local framewidht = InterfaceOptionsFramePanelContainer:GetWidth() - local panel3 = CreateFrame("ScrollFrame", "AtlasLootFilterOptionsScrollFrame", FilterOptionsFrame, "UIPanelScrollFrameTemplate") - local scc = CreateFrame("Frame", "AtlasLootFilterOptionsScrollInhalt", panel3) - panel3:SetScrollChild(scc) - panel3:SetPoint("TOPLEFT", FilterOptionsFrame, "TOPLEFT", 10, -10) - scc:SetPoint("TOPLEFT", panel3, "TOPLEFT", 0, 0) - panel3:SetWidth(framewidht-45) - panel3:SetHeight(410) - scc:SetWidth(framewidht-45) - scc:SetHeight(410) - panel3:SetHorizontalScroll(-50) - panel3:SetVerticalScroll(50) - panel3:SetBackdrop({bgFile="Interface\\DialogFrame\\UI-DialogBox-Background", edgeFile="", tile = false, tileSize = 0, edgeSize = 0, insets = { left = 0, right = 0, top = 0, bottom = 0 }}) - panel3:SetScript("OnVerticalScroll", function() end) - panel3:EnableMouse(true) - panel3:SetVerticalScroll(0) - panel3:SetHorizontalScroll(0) - panel3:SetScript("OnUpdate", function() - local xframewidht = InterfaceOptionsFramePanelContainer:GetWidth() - local xframeheight = InterfaceOptionsFramePanelContainer:GetHeight() - if xframewidht ~= lastframewidht or xframeheight ~= lastframeheight then - panel3:SetWidth(xframewidht-45) - scc:SetWidth(xframewidht-45) - panel3:SetHeight(xframeheight-20) - scc:SetHeight(xframeheight-20) - end - end) - - local FilterDisableButton = CreateFrame("BUTTON", nil, scc, "UIPanelButtonTemplate") - FilterDisableButton:SetHeight(20) - FilterDisableButton:SetWidth(150) - FilterDisableButton:SetPoint("TOPLEFT", scc, "TOPLEFT",0,-5) - FilterDisableButton:SetText(AL["Select All Loot"]) - FilterDisableButton:SetWidth(FilterDisableButton:GetTextWidth()+20) - FilterDisableButton:SetScript("OnClick", function() - for k,v in pairs(FilterTable) do - if type(v) == "table" then - for i,j in pairs(FilterTable[k]) do - AtlasLootFilterDB[k][j] = true - end - end - end - scc:Hide() - scc:Show() - end) - - local locClass,playerClass = UnitClass("player"); - local ClassFilterLoadButton = CreateFrame("BUTTON", nil, scc, "UIPanelButtonTemplate") - ClassFilterLoadButton:SetHeight(20) - ClassFilterLoadButton:SetWidth(150) - ClassFilterLoadButton:SetPoint("TOPRIGHT", scc, "TOPRIGHT",0,-5) - ClassFilterLoadButton:SetText(AL["Apply Filter:"].." "..locClass) - ClassFilterLoadButton:SetWidth(ClassFilterLoadButton:GetTextWidth()+20) - ClassFilterLoadButton:SetScript("OnClick", function() - for k,v in pairs(FilterTable) do - if type(v) == "table" then - for i,j in pairs(FilterTable[k]) do - if ClassHides[playerClass][k][i] == false then - AtlasLootFilterDB[k][j] = false - else - AtlasLootFilterDB[k][j] = true - end - end - end - end - scc:Hide() - scc:Show() - end) - - - - CreateCat(scc, "Armor") - CreateCat(scc, "WeaponsMeele") - CreateCat(scc, "WeaponsMeeleTwoHand") - CreateCat(scc, "WeaponsRanged") - CreateCat(scc, "Relics") - CreateCat(scc, "Other") - - InterfaceOptions_AddCategory(FilterOptionsFrame) - OptionsLoadet = true -end +--[[ +StaticPopupDialogs["ATLASLOOT_ADD_FILTER_LIST"] +This is shown, if you want too add a CustomHeader to a wishlist +]] +StaticPopupDialogs["ATLASLOOT_ADD_FILTER_LIST"] = { + text = "Filter Name", + button1 = "Add Filter", + button2 = AL["Cancel"], + OnShow = function(self) + self:SetFrameStrata("TOOLTIP"); + end, + OnAccept = function() + local text = _G[this:GetParent():GetName().."EditBox"]:GetText(); + currentFilter.Name = text; + table.insert(AtlasLootFilterDB["FilterLists"],currentFilter); + end, + hasEditBox = 1, + timeout = 0, + whileDead = 1, + hideOnEscape = 1 +}; \ No newline at end of file diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua index c0f7489..c0354b0 100644 --- a/AtlasLoot/Core/LootButtons.lua +++ b/AtlasLoot/Core/LootButtons.lua @@ -154,7 +154,7 @@ function AtlasLootItem_OnEnter(self) if((AtlasLoot.db.profile.EquipCompare and ((not EquipCompare_RegisterTooltip) or (not EquipCompare_Enabled)))) or IsShiftKeyDown() then AtlasLootItem_ShowCompareItem(self); --- CALL MISSING METHOD TO SHOW 2 TOOLTIPS (Item Compare) end - else +--[[ else AtlasLootTooltip:SetOwner(self, "ANCHOR_RIGHT", -(self:GetWidth() / 2), 24); AtlasLootTooltip:ClearLines(); AtlasLootTooltip:AddLine(RED..AL["Item Unavailable"], nil, nil, nil, 1); @@ -162,7 +162,7 @@ function AtlasLootItem_OnEnter(self) AtlasLootTooltip:AddLine(AL["self item is unsafe. To view self item without the risk of disconnection, you need to have first seen it in the game world. This is a restriction enforced by Blizzard since Patch 1.10."], nil, nil, nil, 1); AtlasLootTooltip:AddLine(" "); AtlasLootTooltip:AddLine(AL["You can right-click to attempt to query the server. You may be disconnected."], nil, nil, nil, 1); - AtlasLootTooltip:Show(); + AtlasLootTooltip:Show(); ]] end end end @@ -224,7 +224,7 @@ function AtlasLootItem_OnClick(self ,arg1) if arg1=="RightButton" and ATLASLOOT_ITEM_UNLOCK then AtlasLoot:MoveWishlistItem("Down",self.number); elseif IsAltKeyDown() and arg1=="LeftButton" and ATLASLOOT_ITEM_UNLOCK then - StaticPopup_Show ("ATLASLOOT_ADD_CUSTOMHEADER"); + StaticPopup_Show("ATLASLOOT_ADD_CUSTOMHEADER"); StaticPopupDialogs.ATLASLOOT_ADD_CUSTOMHEADER.num = self.number; elseif (arg1=="LeftButton") and ATLASLOOT_ITEM_UNLOCK then AtlasLoot:MoveWishlistItem("Up",self.number); diff --git a/AtlasLoot/Core/Options.lua b/AtlasLoot/Core/Options.lua index c132751..8f4a39b 100644 --- a/AtlasLoot/Core/Options.lua +++ b/AtlasLoot/Core/Options.lua @@ -235,8 +235,6 @@ function AtlasLoot_OptionsOnShow() UIDropDownMenu_SetWidth(AtlasLoot_SelectLootBrowserStyle, 150); end - - function AtlasLoot_SelectLootBrowserStyle_OnClick() local thisID = this:GetID(); UIDropDownMenu_SetSelectedID(AtlasLoot_SelectLootBrowserStyle, thisID); @@ -249,32 +247,6 @@ function AtlasLoot_SelectLootBrowserStyle_OnClick() AtlasLoot_OptionsOnShow(); end -local Authors = { - ["Calî"] = "Arthas", - ["Lâg"] = "Arthas", - --["Daviesh"] = "Thaurissan", - ["Hegarol"] = "Dun Morogh", - -} - -function AtlasLoot_UnitTarget() - local name = GameTooltip:GetUnit() - if UnitName("mouseover") == name then - local _, realm = UnitName("mouseover") - if not realm then - realm = GetRealmName() - end; - if name and Authors[name] then - if Authors[name] == realm then - GameTooltip:AddLine("AtlasLoot Author |TInterface\\AddOns\\AtlasLoot\\Images\\gold:0|t", 0, 1, 0 ) - end - end - end -end -GameTooltip:HookScript("OnTooltipSetUnit", AtlasLoot_UnitTarget) - - - local helpframe = CreateFrame("Frame", "AtlasLootHelpFrame") helpframe:SetSize(425,450); helpframe:Hide(); @@ -403,7 +375,7 @@ local fooshow = CreateFrame("Button", "AtlasLootOptionsFrame_FuBarShow", AtlasLo end end); - local foohide = CreateFrame("Button", "AtlasLootOptionsFrame_FuBarShow", AtlasLootOptionsFrame, "OptionsButtonTemplate"); +local foohide = CreateFrame("Button", "AtlasLootOptionsFrame_FuBarHide", AtlasLootOptionsFrame, "OptionsButtonTemplate"); foohide:SetSize(150,25); foohide:SetText(AL["Hide FuBar Plugin"]); foohide:SetPoint("TOP", "AtlasLootOptionsFrame", "TOP", 85, -390); diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index 02afffe..bddfe55 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -52,7 +52,7 @@ local lootbground = CreateFrame("Frame", "AtlasLootDefaultFrame_LootBackground", lootbground:SetBackdropColor(0,0,0.5,0.5); lootbground:EnableMouse(); lootbground:SetScript("OnMouseDown",function(self, button) - if _G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]].Back and button == "RightButton" then + if _G["AtlasLootItemsFrame_BACK"]:IsVisible() and button == "RightButton" then AtlasLoot:BackButton_OnClick(); elseif AtlasLootDefaultFrame_AdvancedSearchPanel:IsVisible() and button == "RightButton" then AtlasLoot_AdvancedSearchClose(); @@ -88,7 +88,7 @@ local itemframe = CreateFrame("Frame", "AtlasLootItemsFrame", AtlasLootDefaultFr end end); -local function createLootItemButtons(num) +for num = 1, 30 do local button = CreateFrame("Button","AtlasLootItem_"..num, AtlasLootItemsFrame); button:SetID(num); button:SetSize(236,28); @@ -123,10 +123,6 @@ local function createLootItemButtons(num) end end - for i = 1, 30 do - createLootItemButtons(i); - end - -- LootInfo local lootinfo = CreateFrame("Frame", "AtlasLootInfo") lootinfo:SetSize(128,75); @@ -238,7 +234,8 @@ local filterbtn = CreateFrame("CheckButton","AtlasLootFilterCheck",AtlasLootItem filterbtn.Label = filterbtn:CreateFontString("AtlasLootFilterCheckText","OVERLAY","GameFontNormal"); filterbtn.Label:SetText(AL["Filter"]); filterbtn.Label:SetPoint("RIGHT", AtlasLootFilterCheck, 30, 2); - filterbtn:SetScript("OnClick", function() AtlasLoot_FilterEnableButton() end); + filterbtn:RegisterForClicks("LeftButtonDown","RightButtonDown"); + filterbtn:SetScript("OnClick", function(self, btnclick) AtlasLoot_FilterEnableButton(self, btnclick) end); -- Quick Looks Button local looksbtn = CreateFrame("Button", "AtlasLootQuickLooksButton", AtlasLootItemsFrame); @@ -561,9 +558,9 @@ end) scrollFrame.scrollBar = scrollSlider local rows = setmetatable({}, { __index = function(t, i) - local row = CreateFrame("CheckButton", "$parentRow"..i, scrollFrame) + local row = CreateFrame("CheckButton", "$parentRow"..i, Atlasloot_Difficulty_ScrollFrame) row:SetSize(230, ROW_HEIGHT); - row:SetFrameStrata("Dialog"); + --row:SetFrameStrata("Dialog"); row:SetNormalFontObject(GameFontHighlightLeft); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row:SetScript("OnClick", function() @@ -655,9 +652,9 @@ local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableSc subtableFrame.scrollBar = scrollSlider2 local rows2 = setmetatable({}, { __index = function(t, i) - local row = CreateFrame("CheckButton", "$parentRow"..i, subtableFrame) + local row = CreateFrame("CheckButton", "$parentRow"..i, Atlasloot_SubTableFrame) row:SetSize(230, ROW_HEIGHT); - row:SetFrameStrata("Dialog"); + --row:SetFrameStrata("Dialog"); row:SetNormalFontObject(GameFontHighlightLeft); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row.Text = row:CreateFontString("$parentRow"..i.."Text","OVERLAY","GameFontNormal"); diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 6da31e1..ecb8bf3 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -300,6 +300,7 @@ if AL then AL["Add Wishlist"] = true; AL["Edit Wishlist"] = true; AL["Sort Wishlist"] = true; + AL["Add Filter Set"] = true; AL["Auto Sort WishLists"] = true; AL["Copy Wishlist To Own"] = true; AL["Make Wishlist Default"] = true; @@ -326,6 +327,7 @@ if AL then AL["Please set a default Wishlist."] = true; AL["Set as default Wishlist"] = true; AL["Please Create a Wishlist First."] = true; + AL["Add New Filter"] = true; -- Misc Inventory related words AL["Enchant"] = true; @@ -385,6 +387,19 @@ if AL then AL["Quivers and Ammo Pouches"] = true; AL["Drums, Bags and Misc."] = true; + --Stats etc + AL["Accessories"] = true; + AL["Weapons"] = true; + AL["Armor Type"] = true; + AL["Relics"] = true; + AL["Weapons One-Handers"] = true; + AL["Weapons Two-Handers"] = true; + AL["Ranged Weapons"] = true; + AL["Primary Stats"] = true; + AL["Secondary Stats"] = true; + AL["Defensive Stats"] = true; + AL["Resistances"] = true; + -- Tailoring AL["Cloth Armor"] = true; AL["Shirts"] = true; From 81ec39fe56d99f8cdb11e7852618a2f33fb158f2 Mon Sep 17 00:00:00 2001 From: Anch Date: Wed, 26 Oct 2022 00:40:59 +1300 Subject: [PATCH 19/33] finished filter list -Finshed filter list -Added new item ids database system --- AtlasLoot/Core/AtlasDifficulty.lua | 9 +- AtlasLoot/Core/AtlasLoot.lua | 28 +- AtlasLoot/Core/AtlasLoot.xml | 7 +- AtlasLoot/Core/Filter.lua | 75 +- AtlasLoot/Core/ItemIDsDatabase.lua | 5712 ---------------------- AtlasLoot/Core/ItemIDsDatabase2.lua | 5800 ----------------------- AtlasLoot/Core/ItemIDsDatabase3.lua | 583 --- AtlasLoot/Core/ItemIDsDatabaseFixes.lua | 12 +- AtlasLoot/Core/WishList.lua | 6 +- AtlasLoot/Locales/constants.en.lua | 3 +- AtlasLoot_Crafting/craftingTBC.lua | 392 +- 11 files changed, 296 insertions(+), 12331 deletions(-) delete mode 100644 AtlasLoot/Core/ItemIDsDatabase.lua delete mode 100644 AtlasLoot/Core/ItemIDsDatabase2.lua delete mode 100644 AtlasLoot/Core/ItemIDsDatabase3.lua diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua index 7268a24..9e700e3 100644 --- a/AtlasLoot/Core/AtlasDifficulty.lua +++ b/AtlasLoot/Core/AtlasDifficulty.lua @@ -33,7 +33,8 @@ AtlasLoot_Difficulty = { ["ClassicRaid"] = { {"Normal Flex", 2}, {"Heroic Flex", 3}, - {"Ascended", 4}, + {"Mythic", 4}, + {"Ascended", 5}, {"Bloodforged", 1}, }; @@ -54,7 +55,8 @@ AtlasLoot_Difficulty = { ["BCRaid"] = { {"Normal Flex", 2}, {"Heroic Flex", 3}, - {"Ascended", 4}, + {"Mythic", 4}, + {"Ascended", 5}, {"Bloodforged", 1}, }; @@ -71,7 +73,8 @@ AtlasLoot_Difficulty = { ["WrathRaid"] = { {"Normal Flex", 2}, {"Heroic Flex", 3}, - {"Ascended", 4}, + {"Mythic", 4}, + {"Ascended", 5}, {"Bloodforged", 1}, }; diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index e24100d..ff71021 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -132,9 +132,10 @@ function AtlasLoot:OnEnable() AtlasLoot.db:RegisterDefaults(AtlasLootDBDefaults); if not AtlasLootCharDB then AtlasLootCharDB = {} end if not AtlasLootCharDB["QuickLooks"] then AtlasLootCharDB["QuickLooks"] = {} end + if not AtlasLootCharDB.SelectedFilter then AtlasLootCharDB.SelectedFilter = 1 end if not AtlasLootCharDB["SearchResult"] then AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "Search", Back = true}; end if not AtlasLootFilterDB then AtlasLootFilterDB = {["FilterLists"] = {}} end; - if AtlasLootFilterDB and not AtlasLootFilterDB["FilterLists"] then AtlasLootFilterDB = {["FilterLists"] = {}} end; + if AtlasLootFilterDB and not AtlasLootFilterDB["FilterLists"] then AtlasLootFilterDB = {["FilterLists"] = {{Name = "Default" }}} end; if AtlasLoot_Data then AtlasLoot_Data["EmptyTable"] = { Name = AL["Select a Loot Table..."]; @@ -1082,4 +1083,27 @@ function AtlasLoot:FindId(id, difficulty) return ItemIDsDatabase[id][difficulty], true end return nil, false; -end \ No newline at end of file +end +-- Loads the Item Variations into a table from the data content folder +function AtlasLoot:LoadItemIDsDatabase() + local content = C_ContentLoader:Load("ItemVariationData") + ItemIDsDatabase = {}; + content:SetParser(function(index, data) + -- run for each item in the data + if index ~= 0 and data.Normal ~= 0 then + ItemIDsDatabase[data.Normal] = {} + if data.Bloodforged ~= 0 then table.insert(ItemIDsDatabase[data.Normal],data.Bloodforged) end + if data.Normal ~= 0 then table.insert(ItemIDsDatabase[data.Normal],data.Normal) end + if data.Heroic ~= 0 then table.insert(ItemIDsDatabase[data.Normal],data.Heroic) end + for i,v in ipairs(data["Mythic"]) do + if v ~= 0 then + table.insert(ItemIDsDatabase[data.Normal],v) + end + end + end + end) + + -- This will run over time (usually about 30s for a file this size), but will maintain playable fps while running. + content:ParseAsync() + AtlasLoot:ItemIdFixs() + end \ No newline at end of file diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml index af63bca..3e67a8e 100644 --- a/AtlasLoot/Core/AtlasLoot.xml +++ b/AtlasLoot/Core/AtlasLoot.xml @@ -2,13 +2,14 @@