From c3931382e31c53ec442af505f67ac42c5b3b7855 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 5 Feb 2023 18:13:27 -0700 Subject: [PATCH] resolve merge... again --- DBs/AchievementData.lua | 414 ++++++++++++-------- Globals.lua | 834 ---------------------------------------- 2 files changed, 264 insertions(+), 984 deletions(-) diff --git a/DBs/AchievementData.lua b/DBs/AchievementData.lua index 404633c..1a9079b 100644 --- a/DBs/AchievementData.lua +++ b/DBs/AchievementData.lua @@ -5,13 +5,6 @@ local L = LibStub('AceLocale-3.0'):GetLocale('Groupie') --Do not put any other data here addon.groupieAchievementPriorities = { - ["Azjol-Nerub"] = { - [1] = 2136, - [2] = 1289, - [3] = 491, - [4] = 1288, - [5] = 480, - }, ["Arcatraz"] = { [1] = 1287, [2] = 681, @@ -24,6 +17,16 @@ addon.groupieAchievementPriorities = { [3] = 1284, [4] = 666, }, + ["Azjol-Nerub"] = { + [1] = 17304, + [2] = 17285, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 491, + [7] = 1288, + [8] = 480, + }, ["Black Morass"] = { [1] = 1287, [2] = 676, @@ -59,34 +62,40 @@ addon.groupieAchievementPriorities = { [4] = 659, }, ["Culling of Stratholme"] = { - [1] = 2136, - [2] = 1289, - [3] = 500, - [4] = 1288, - [5] = 479, + [1] = 17304, + [2] = 17302, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 500, + [7] = 1288, + [8] = 479, }, ["Deadmines"] = { [1] = 1283, [2] = 628, }, - ["Dire Maul North"] = { + ["Dire Maul East"] = { [1] = 1283, [2] = 644, }, - ["Dire Maul West"] = { + ["Dire Maul North"] = { [1] = 1283, [2] = 644, }, - ["Dire Maul East"] = { + ["Dire Maul West"] = { [1] = 1283, [2] = 644, }, ["Drak'Tharon Keep"] = { - [1] = 2136, - [2] = 1289, - [3] = 493, - [4] = 1288, - [5] = 482, + [1] = 17304, + [2] = 17292, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 493, + [7] = 1288, + [8] = 482, }, ["Eye of Eternity - 10"] = { [1] = 1400, @@ -126,18 +135,24 @@ addon.groupieAchievementPriorities = { [2] = 692, }, ["Gundrak"] = { - [1] = 2136, - [2] = 1289, - [3] = 495, - [4] = 1288, - [5] = 484, + [1] = 17304, + [2] = 17295, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 495, + [7] = 1288, + [8] = 484, }, ["Halls of Lightning"] = { - [1] = 2136, - [2] = 1289, - [3] = 497, - [4] = 1288, - [5] = 486, + [1] = 17304, + [2] = 17299, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 497, + [7] = 1288, + [8] = 486, }, ["Halls of Reflection"] = { [1] = 2136, @@ -147,11 +162,14 @@ addon.groupieAchievementPriorities = { [5] = 4518, }, ["Halls of Stone"] = { - [1] = 2136, - [2] = 1289, - [3] = 496, - [4] = 1288, - [5] = 485, + [1] = 17304, + [2] = 17297, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 496, + [7] = 1288, + [8] = 485, }, ["Hellfire Ramparts"] = { [1] = 1287, @@ -159,13 +177,6 @@ addon.groupieAchievementPriorities = { [3] = 1284, [4] = 647, }, - ["Heroic Azjol-Nerub"] = { - [1] = 2136, - [2] = 1289, - [3] = 491, - [4] = 1288, - [5] = 480, - }, ["Heroic Arcatraz"] = { [1] = 1287, [2] = 681, @@ -178,6 +189,16 @@ addon.groupieAchievementPriorities = { [3] = 1284, [4] = 666, }, + ["Heroic Azjol-Nerub"] = { + [1] = 17304, + [2] = 17285, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 491, + [7] = 1288, + [8] = 480, + }, ["Heroic Black Morass"] = { [1] = 1287, [2] = 676, @@ -197,18 +218,24 @@ addon.groupieAchievementPriorities = { [4] = 659, }, ["Heroic Culling of Stratholme"] = { - [1] = 2136, - [2] = 1289, - [3] = 500, - [4] = 1288, - [5] = 500, + [1] = 17304, + [2] = 17302, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 500, + [7] = 1288, + [8] = 479, }, ["Heroic Drak'Tharon Keep"] = { - [1] = 2136, - [2] = 1289, - [3] = 493, - [4] = 1288, - [5] = 482, + [1] = 17304, + [2] = 17292, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 493, + [7] = 1288, + [8] = 482, }, ["Heroic Forge of Souls"] = { [1] = 2136, @@ -218,18 +245,24 @@ addon.groupieAchievementPriorities = { [5] = 4516, }, ["Heroic Gundrak"] = { - [1] = 2136, - [2] = 1289, - [3] = 495, - [4] = 1288, - [5] = 484, + [1] = 17304, + [2] = 17295, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 495, + [7] = 1288, + [8] = 484, }, ["Heroic Halls of Lightning"] = { - [1] = 2136, - [2] = 1289, - [3] = 497, - [4] = 1288, - [5] = 486, + [1] = 17304, + [2] = 17299, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 497, + [7] = 1288, + [8] = 486, }, ["Heroic Halls of Reflection"] = { [1] = 2136, @@ -239,11 +272,14 @@ addon.groupieAchievementPriorities = { [5] = 4518, }, ["Heroic Halls of Stone"] = { - [1] = 2136, - [2] = 1289, - [3] = 496, - [4] = 1288, - [5] = 485, + [1] = 17304, + [2] = 17297, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 496, + [7] = 1288, + [8] = 485, }, ["Heroic Hellfire Ramparts"] = { [1] = 1287, @@ -270,18 +306,24 @@ addon.groupieAchievementPriorities = { [4] = 658, }, ["Heroic Nexus"] = { - [1] = 2136, - [2] = 1289, - [3] = 490, - [4] = 1288, - [5] = 478, + [1] = 17304, + [2] = 17283, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 490, + [7] = 1288, + [8] = 478, }, ["Heroic Oculus"] = { - [1] = 2136, - [2] = 1289, - [3] = 498, - [4] = 1288, - [5] = 487, + [1] = 17304, + [2] = 17300, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 498, + [7] = 1288, + [8] = 487, }, ["Heroic Old Hillsbrad Foothills"] = { [1] = 1287, @@ -290,11 +332,14 @@ addon.groupieAchievementPriorities = { [4] = 652, }, ["Heroic Old Kingdom"] = { - [1] = 2136, - [2] = 1289, - [3] = 492, - [4] = 1288, - [5] = 481, + [1] = 17304, + [2] = 17291, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 492, + [7] = 1288, + [8] = 481, }, ["Heroic Pit of Saron"] = { [1] = 2136, @@ -349,25 +394,34 @@ addon.groupieAchievementPriorities = { [4] = 650, }, ["Heroic Utgarde Keep"] = { - [1] = 2136, - [2] = 1289, - [3] = 489, - [4] = 1288, - [5] = 477, + [1] = 17304, + [2] = 17213, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 489, + [7] = 1288, + [8] = 477, }, ["Heroic Utgarde Pinnacle"] = { - [1] = 2136, - [2] = 1289, - [3] = 499, - [4] = 1288, - [5] = 488, + [1] = 17304, + [2] = 17301, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 499, + [7] = 1288, + [8] = 488, }, ["Heroic Violet Hold"] = { - [1] = 2136, - [2] = 1289, - [3] = 494, - [4] = 1288, - [5] = 483, + [1] = 17304, + [2] = 17293, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 494, + [7] = 1288, + [8] = 483, }, ["Karazhan"] = { [1] = 1286, @@ -417,20 +471,10 @@ addon.groupieAchievementPriorities = { [3] = 2137, [4] = 2186, [5] = 2187, - [6] = 2177, - [7] = 2176, - [8] = 2139, - [9] = 1996, - [10] = 2147, - [11] = 2146, [12] = 579, [13] = 578, [14] = 577, - [15] = 575, - [16] = 573, [17] = 576, - [18] = 574, - [19] = 572, }, ["Naxxramas - 25"] = { [1] = 1402, @@ -438,27 +482,20 @@ addon.groupieAchievementPriorities = { [3] = 2137, [4] = 2186, [5] = 2187, - [6] = 2177, - [7] = 2176, - [8] = 2139, - [9] = 1996, - [10] = 2147, - [11] = 2146, [12] = 579, [13] = 578, [14] = 577, - [15] = 575, - [16] = 573, [17] = 576, - [18] = 574, - [19] = 572, }, ["Nexus"] = { - [1] = 2136, - [2] = 1289, - [3] = 490, - [4] = 1288, - [5] = 478, + [1] = 17304, + [2] = 17283, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 490, + [7] = 1288, + [8] = 478, }, ["Obsidian Sanctum - 10"] = { [1] = 456, @@ -495,11 +532,14 @@ addon.groupieAchievementPriorities = { [15] = 1876, }, ["Oculus"] = { - [1] = 2136, - [2] = 1289, - [3] = 498, - [4] = 1288, - [5] = 487, + [1] = 17304, + [2] = 17300, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 498, + [7] = 1288, + [8] = 487, }, ["Old Hillsbrad Foothills"] = { [1] = 1287, @@ -508,11 +548,14 @@ addon.groupieAchievementPriorities = { [4] = 652, }, ["Old Kingdom"] = { - [1] = 2136, - [2] = 1289, - [3] = 492, - [4] = 1288, - [5] = 481, + [1] = 17304, + [2] = 17291, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 492, + [7] = 1288, + [8] = 481, }, ["Onyxia's Lair - 10"] = { [1] = 4407, @@ -557,7 +600,7 @@ addon.groupieAchievementPriorities = { [1] = 1285, [2] = 689, }, - ["Scarlet Graveyard"] = { + ["Scarlet Armory"] = { [1] = 1283, [2] = 637, }, @@ -565,11 +608,11 @@ addon.groupieAchievementPriorities = { [1] = 1283, [2] = 637, }, - ["Scarlet Library"] = { + ["Scarlet Graveyard"] = { [1] = 1283, [2] = 637, }, - ["Scarlet Armory"] = { + ["Scarlet Library"] = { [1] = 1283, [2] = 637, }, @@ -652,6 +695,68 @@ addon.groupieAchievementPriorities = { [1] = 1283, [2] = 638, }, + ["Ulduar - 10"] = { + [1] = 3117, + [2] = 3259, + [3] = 3164, + [4] = 3159, + [5] = 2958, + [6] = 2957, + [7] = 3163, + [8] = 3158, + [9] = 3162, + [10] = 3141, + [11] = 3161, + [12] = 3157, + [13] = 2903, + [14] = 2904, + [15] = 3316, + [16] = 3005, + [17] = 3004, + [18] = 3016, + [19] = 3015, + [20] = 3037, + [21] = 3036, + [22] = 2893, + [23] = 2892, + [24] = 2891, + [25] = 2890, + [26] = 2889, + [27] = 2888, + [28] = 2887, + [29] = 2886, + }, + ["Ulduar - 25"] = { + [1] = 3117, + [2] = 3259, + [3] = 3164, + [4] = 3159, + [5] = 2958, + [6] = 2957, + [7] = 3163, + [8] = 3158, + [9] = 3162, + [10] = 3141, + [11] = 3161, + [12] = 3157, + [13] = 2903, + [14] = 2904, + [15] = 3316, + [16] = 3005, + [17] = 3004, + [18] = 3016, + [19] = 3015, + [20] = 3037, + [21] = 3036, + [22] = 2893, + [23] = 2892, + [24] = 2891, + [25] = 2890, + [26] = 2889, + [27] = 2888, + [28] = 2887, + [29] = 2886, + }, ["Underbog"] = { [1] = 1287, [2] = 670, @@ -659,18 +764,24 @@ addon.groupieAchievementPriorities = { [4] = 650, }, ["Utgarde Keep"] = { - [1] = 2136, - [2] = 1289, - [3] = 489, - [4] = 1288, - [5] = 477, + [1] = 17304, + [2] = 17213, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 489, + [7] = 1288, + [8] = 477, }, ["Utgarde Pinnacle"] = { - [1] = 2136, - [2] = 1289, - [3] = 499, - [4] = 1288, - [5] = 488, + [1] = 17304, + [2] = 17301, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 499, + [7] = 1288, + [8] = 488, }, ["Vault of Archavon - 10"] = { [1] = 4017, @@ -697,11 +808,14 @@ addon.groupieAchievementPriorities = { [10] = 1722, }, ["Violet Hold"] = { - [1] = 2136, - [2] = 1289, - [3] = 494, - [4] = 1288, - [5] = 483, + [1] = 17304, + [2] = 17293, + [3] = 2136, + [4] = 1658, + [5] = 1289, + [6] = 494, + [7] = 1288, + [8] = 483, }, ["Wailing Caverns"] = { [1] = 1283, diff --git a/Globals.lua b/Globals.lua index 50d6d25..9ce6cef 100644 --- a/Globals.lua +++ b/Globals.lua @@ -534,837 +534,3 @@ addon.GroupieDevs = { -- Test Accounts ["Player-4395-034E469C"] = L["TeamMember"], -- Cooltestguy-Benediction } -<<<<<<< HEAD -======= - -addon.groupieAchievementPriorities = { - ["Arcatraz"] = { - [1] = 1287, - [2] = 681, - [3] = 1284, - [4] = 660, - }, - ["Auchenai Crypts"] = { - [1] = 1287, - [2] = 672, - [3] = 1284, - [4] = 666, - }, - ["Azjol-Nerub"] = { - [1] = 17304, - [2] = 17285, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 491, - [7] = 1288, - [8] = 480, - }, - ["Black Morass"] = { - [1] = 1287, - [2] = 676, - [3] = 1284, - [4] = 655, - }, - ["Black Temple"] = { - [1] = 1286, - [2] = 697, - }, - ["Blackfathom Deeps"] = { - [1] = 1283, - [2] = 632, - }, - ["Blackrock Depths"] = { - [1] = 1283, - [2] = 642, - }, - ["Blackwing Lair"] = { - [1] = 1285, - [2] = 685, - }, - ["Blood Furnace"] = { - [1] = 1287, - [2] = 668, - [3] = 1284, - [4] = 648, - }, - ["Botanica"] = { - [1] = 1287, - [2] = 680, - [3] = 1284, - [4] = 659, - }, - ["Culling of Stratholme"] = { - [1] = 17304, - [2] = 17302, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 500, - [7] = 1288, - [8] = 479, - }, - ["Deadmines"] = { - [1] = 1283, - [2] = 628, - }, - ["Dire Maul East"] = { - [1] = 1283, - [2] = 644, - }, - ["Dire Maul North"] = { - [1] = 1283, - [2] = 644, - }, - ["Dire Maul West"] = { - [1] = 1283, - [2] = 644, - }, - ["Drak'Tharon Keep"] = { - [1] = 17304, - [2] = 17292, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 493, - [7] = 1288, - [8] = 482, - }, - ["Eye of Eternity - 10"] = { - [1] = 1400, - [2] = 2138, - [3] = 2137, - [4] = 1870, - [5] = 1869, - [6] = 1875, - [7] = 1874, - [8] = 623, - [9] = 622, - }, - ["Eye of Eternity - 25"] = { - [1] = 1400, - [2] = 2138, - [3] = 2137, - [4] = 1870, - [5] = 1869, - [6] = 1875, - [7] = 1874, - [8] = 623, - [9] = 622, - }, - ["Forge of Souls"] = { - [1] = 2136, - [2] = 1289, - [3] = 4519, - [4] = 1288, - [5] = 4516, - }, - ["Gnomeregan"] = { - [1] = 1283, - [2] = 634, - }, - ["Gruul's Lair"] = { - [1] = 1286, - [2] = 692, - }, - ["Gundrak"] = { - [1] = 17304, - [2] = 17295, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 495, - [7] = 1288, - [8] = 484, - }, - ["Halls of Lightning"] = { - [1] = 17304, - [2] = 17299, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 497, - [7] = 1288, - [8] = 486, - }, - ["Halls of Reflection"] = { - [1] = 2136, - [2] = 1289, - [3] = 4521, - [4] = 1288, - [5] = 4518, - }, - ["Halls of Stone"] = { - [1] = 17304, - [2] = 17297, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 496, - [7] = 1288, - [8] = 485, - }, - ["Hellfire Ramparts"] = { - [1] = 1287, - [2] = 667, - [3] = 1284, - [4] = 647, - }, - ["Heroic Arcatraz"] = { - [1] = 1287, - [2] = 681, - [3] = 1284, - [4] = 660, - }, - ["Heroic Auchenai Crypts"] = { - [1] = 1287, - [2] = 672, - [3] = 1284, - [4] = 666, - }, - ["Heroic Azjol-Nerub"] = { - [1] = 17304, - [2] = 17285, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 491, - [7] = 1288, - [8] = 480, - }, - ["Heroic Black Morass"] = { - [1] = 1287, - [2] = 676, - [3] = 1284, - [4] = 655, - }, - ["Heroic Blood Furnace"] = { - [1] = 1287, - [2] = 668, - [3] = 1284, - [4] = 648, - }, - ["Heroic Botanica"] = { - [1] = 1287, - [2] = 680, - [3] = 1284, - [4] = 659, - }, - ["Heroic Culling of Stratholme"] = { - [1] = 17304, - [2] = 17302, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 500, - [7] = 1288, - [8] = 479, - }, - ["Heroic Drak'Tharon Keep"] = { - [1] = 17304, - [2] = 17292, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 493, - [7] = 1288, - [8] = 482, - }, - ["Heroic Forge of Souls"] = { - [1] = 2136, - [2] = 1289, - [3] = 4519, - [4] = 1288, - [5] = 4516, - }, - ["Heroic Gundrak"] = { - [1] = 17304, - [2] = 17295, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 495, - [7] = 1288, - [8] = 484, - }, - ["Heroic Halls of Lightning"] = { - [1] = 17304, - [2] = 17299, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 497, - [7] = 1288, - [8] = 486, - }, - ["Heroic Halls of Reflection"] = { - [1] = 2136, - [2] = 1289, - [3] = 4521, - [4] = 1288, - [5] = 4518, - }, - ["Heroic Halls of Stone"] = { - [1] = 17304, - [2] = 17297, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 496, - [7] = 1288, - [8] = 485, - }, - ["Heroic Hellfire Ramparts"] = { - [1] = 1287, - [2] = 667, - [3] = 1284, - [4] = 647, - }, - ["Heroic Magisters' Terrace"] = { - [1] = 1287, - [2] = 682, - [3] = 1284, - [4] = 661, - }, - ["Heroic Mana-Tombs"] = { - [1] = 1287, - [2] = 671, - [3] = 1284, - [4] = 651, - }, - ["Heroic Mechanar"] = { - [1] = 1287, - [2] = 679, - [3] = 1284, - [4] = 658, - }, - ["Heroic Nexus"] = { - [1] = 17304, - [2] = 17283, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 490, - [7] = 1288, - [8] = 478, - }, - ["Heroic Oculus"] = { - [1] = 17304, - [2] = 17300, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 498, - [7] = 1288, - [8] = 487, - }, - ["Heroic Old Hillsbrad Foothills"] = { - [1] = 1287, - [2] = 673, - [3] = 1284, - [4] = 652, - }, - ["Heroic Old Kingdom"] = { - [1] = 17304, - [2] = 17291, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 492, - [7] = 1288, - [8] = 481, - }, - ["Heroic Pit of Saron"] = { - [1] = 2136, - [2] = 1289, - [3] = 4520, - [4] = 1288, - [5] = 4517, - }, - ["Heroic Sethekk Halls"] = { - [1] = 1287, - [2] = 674, - [3] = 1284, - [4] = 653, - }, - ["Heroic Shadow Labyrinth"] = { - [1] = 1287, - [2] = 675, - [3] = 1284, - [4] = 654, - }, - ["Heroic Shattered Halls"] = { - [1] = 1287, - [2] = 678, - [3] = 1284, - [4] = 657, - }, - ["Heroic Slave Pens"] = { - [1] = 1287, - [2] = 669, - [3] = 1284, - [4] = 649, - }, - ["Heroic Steamvault"] = { - [1] = 1287, - [2] = 677, - [3] = 1284, - [4] = 656, - }, - ["Heroic Trial of the Champion"] = { - [1] = 2136, - [2] = 1289, - [3] = 4297, - [4] = 4298, - [5] = 1288, - [6] = 4296, - [7] = 3778, - }, - ["Heroic Underbog"] = { - [1] = 1287, - [2] = 670, - [3] = 1284, - [4] = 650, - }, - ["Heroic Utgarde Keep"] = { - [1] = 17304, - [2] = 17213, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 489, - [7] = 1288, - [8] = 477, - }, - ["Heroic Utgarde Pinnacle"] = { - [1] = 17304, - [2] = 17301, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 499, - [7] = 1288, - [8] = 488, - }, - ["Heroic Violet Hold"] = { - [1] = 17304, - [2] = 17293, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 494, - [7] = 1288, - [8] = 483, - }, - ["Karazhan"] = { - [1] = 1286, - [2] = 690, - }, - ["Lower Blackrock Spire"] = { - [1] = 1283, - [2] = 643, - }, - ["Magisters' Terrace"] = { - [1] = 1287, - [2] = 682, - [3] = 1284, - [4] = 661, - }, - ["Magtheridon's Lair"] = { - [1] = 1286, - [2] = 693, - }, - ["Mana-Tombs"] = { - [1] = 1287, - [2] = 671, - [3] = 1284, - [4] = 651, - }, - ["Maraudon"] = { - [1] = 1283, - [2] = 640, - }, - ["Mechanar"] = { - [1] = 1287, - [2] = 679, - [3] = 1284, - [4] = 658, - }, - ["Molten Core"] = { - [1] = 1285, - [2] = 686, - }, - ["Mount Hyjal"] = { - [1] = 1286, - [2] = 695, - }, - ["Naxxramas - 10"] = { - [1] = 1402, - [2] = 2138, - [3] = 2137, - [4] = 2186, - [5] = 2187, - [12] = 579, - [13] = 578, - [14] = 577, - [17] = 576, - }, - ["Naxxramas - 25"] = { - [1] = 1402, - [2] = 2138, - [3] = 2137, - [4] = 2186, - [5] = 2187, - [12] = 579, - [13] = 578, - [14] = 577, - [17] = 576, - }, - ["Nexus"] = { - [1] = 17304, - [2] = 17283, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 490, - [7] = 1288, - [8] = 478, - }, - ["Obsidian Sanctum - 10"] = { - [1] = 456, - [2] = 2138, - [3] = 2137, - [4] = 2054, - [5] = 2051, - [6] = 2053, - [7] = 2050, - [8] = 2052, - [9] = 2049, - [10] = 2048, - [11] = 2047, - [12] = 1877, - [13] = 624, - [14] = 625, - [15] = 1876, - }, - ["Obsidian Sanctum - 25"] = { - [1] = 456, - [2] = 2138, - [3] = 2137, - [4] = 2054, - [5] = 2051, - [6] = 2053, - [7] = 2050, - [8] = 2052, - [9] = 2049, - [10] = 2048, - [11] = 2047, - [12] = 1877, - [13] = 624, - [14] = 625, - [15] = 1876, - }, - ["Oculus"] = { - [1] = 17304, - [2] = 17300, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 498, - [7] = 1288, - [8] = 487, - }, - ["Old Hillsbrad Foothills"] = { - [1] = 1287, - [2] = 673, - [3] = 1284, - [4] = 652, - }, - ["Old Kingdom"] = { - [1] = 17304, - [2] = 17291, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 492, - [7] = 1288, - [8] = 481, - }, - ["Onyxia's Lair - 10"] = { - [1] = 4407, - [2] = 4404, - [3] = 4406, - [4] = 4403, - [5] = 4405, - [6] = 4402, - [7] = 4397, - [8] = 4396, - }, - ["Onyxia's Lair - 25"] = { - [1] = 4407, - [2] = 4404, - [3] = 4406, - [4] = 4403, - [5] = 4405, - [6] = 4402, - [7] = 4397, - [8] = 4396, - }, - ["Pit of Saron"] = { - [1] = 2136, - [2] = 1289, - [3] = 4520, - [4] = 1288, - [5] = 4517, - }, - ["Ragefire Chasm"] = { - [1] = 1283, - [2] = 629, - }, - ["Razorfen Downs"] = { - [1] = 1283, - [2] = 636, - }, - ["Razorfen Kraul"] = { - [1] = 1283, - [2] = 635, - }, - ["Ruins of Ahn'Qiraj"] = { - [1] = 1285, - [2] = 689, - }, - ["Scarlet Armory"] = { - [1] = 1283, - [2] = 637, - }, - ["Scarlet Cathedral"] = { - [1] = 1283, - [2] = 637, - }, - ["Scarlet Graveyard"] = { - [1] = 1283, - [2] = 637, - }, - ["Scarlet Library"] = { - [1] = 1283, - [2] = 637, - }, - ["Scholomance"] = { - [1] = 1283, - [2] = 645, - }, - ["Serpentshrine Cavern"] = { - [1] = 1286, - [2] = 694, - }, - ["Sethekk Halls"] = { - [1] = 1287, - [2] = 674, - [3] = 1284, - [4] = 653, - }, - ["Shadow Labyrinth"] = { - [1] = 1287, - [2] = 675, - [3] = 1284, - [4] = 654, - }, - ["Shadowfang Keep"] = { - [1] = 1283, - [2] = 631, - }, - ["Shattered Halls"] = { - [1] = 1287, - [2] = 678, - [3] = 1284, - [4] = 657, - }, - ["Slave Pens"] = { - [1] = 1287, - [2] = 669, - [3] = 1284, - [4] = 649, - }, - ["Steamvault"] = { - [1] = 1287, - [2] = 677, - [3] = 1284, - [4] = 656, - }, - ["Stormwind Stockades"] = { - [1] = 1283, - [2] = 633, - }, - ["Stratholme"] = { - [1] = 1283, - [2] = 646, - }, - ["Sunken Temple"] = { - [1] = 1283, - [2] = 641, - }, - ["Sunwell Plateau"] = { - [1] = 1286, - [2] = 698, - }, - ["Tempest Keep"] = { - [1] = 1286, - [2] = 696, - }, - ["Temple of Ahn'Qiraj"] = { - [1] = 1285, - [2] = 687, - }, - ["Trial of the Champion"] = { - [1] = 2136, - [2] = 1289, - [3] = 4297, - [4] = 4298, - [5] = 1288, - [6] = 4296, - [7] = 3778, - }, - ["Uldaman"] = { - [1] = 1283, - [2] = 638, - }, - ["Ulduar - 10"] = { - [1] = 3117, - [2] = 3259, - [3] = 3164, - [4] = 3159, - [5] = 2958, - [6] = 2957, - [7] = 3163, - [8] = 3158, - [9] = 3162, - [10] = 3141, - [11] = 3161, - [12] = 3157, - [13] = 2903, - [14] = 2904, - [15] = 3316, - [16] = 3005, - [17] = 3004, - [18] = 3016, - [19] = 3015, - [20] = 3037, - [21] = 3036, - [22] = 2893, - [23] = 2892, - [24] = 2891, - [25] = 2890, - [26] = 2889, - [27] = 2888, - [28] = 2887, - [29] = 2886, - }, - ["Ulduar - 25"] = { - [1] = 3117, - [2] = 3259, - [3] = 3164, - [4] = 3159, - [5] = 2958, - [6] = 2957, - [7] = 3163, - [8] = 3158, - [9] = 3162, - [10] = 3141, - [11] = 3161, - [12] = 3157, - [13] = 2903, - [14] = 2904, - [15] = 3316, - [16] = 3005, - [17] = 3004, - [18] = 3016, - [19] = 3015, - [20] = 3037, - [21] = 3036, - [22] = 2893, - [23] = 2892, - [24] = 2891, - [25] = 2890, - [26] = 2889, - [27] = 2888, - [28] = 2887, - [29] = 2886, - }, - ["Underbog"] = { - [1] = 1287, - [2] = 670, - [3] = 1284, - [4] = 650, - }, - ["Utgarde Keep"] = { - [1] = 17304, - [2] = 17213, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 489, - [7] = 1288, - [8] = 477, - }, - ["Utgarde Pinnacle"] = { - [1] = 17304, - [2] = 17301, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 499, - [7] = 1288, - [8] = 488, - }, - ["Vault of Archavon - 10"] = { - [1] = 4017, - [2] = 4016, - [3] = 4586, - [4] = 4585, - [5] = 3837, - [6] = 3836, - [7] = 3137, - [8] = 3136, - [9] = 1721, - [10] = 1722, - }, - ["Vault of Archavon - 25"] = { - [1] = 4017, - [2] = 4016, - [3] = 4586, - [4] = 4585, - [5] = 3837, - [6] = 3836, - [7] = 3137, - [8] = 3136, - [9] = 1721, - [10] = 1722, - }, - ["Violet Hold"] = { - [1] = 17304, - [2] = 17293, - [3] = 2136, - [4] = 1658, - [5] = 1289, - [6] = 494, - [7] = 1288, - [8] = 483, - }, - ["Wailing Caverns"] = { - [1] = 1283, - [2] = 630, - }, - ["Zul'Aman"] = { - [1] = 1286, - [2] = 691, - }, - ["Zul'Farrak"] = { - [1] = 1283, - [2] = 639, - }, - ["Zul'Gurub"] = { - [1] = 1285, - [2] = 688, - }, -} ->>>>>>> 7678c6531c958ec5b86d1f57315ccfb9c221d33c