diff --git a/AtlasLootClassic_Data/source.lua b/AtlasLootClassic_Data/source.lua index fe6ccd3..1862213 100755 --- a/AtlasLootClassic_Data/source.lua +++ b/AtlasLootClassic_Data/source.lua @@ -33,7 +33,7 @@ local SOURCE_DATA = { "Uldaman", "Zul'Farrak", "Maraudon", - "TheTempleOfAtal'Hakkar", + "SunkenTemple", "BlackrockDepths", "LowerBlackrockSpire", "UpperBlackrockSpire", @@ -990,7 +990,7 @@ local SOURCE_DATA = { [10421] = {[3] = 5,[4] = 12260}, [10423] = {[3] = 5,[4] = 12259}, [10441] = {2,8,1}, - [10454] = {17,11,1}, + [10454] = {17,3,1}, [10455] = 10454, [10498] = {[3] = 12,[4] = 12590}, [10499] = {[3] = 12,[4] = 12587}, @@ -1038,18 +1038,18 @@ local SOURCE_DATA = { [10587] = {[3] = 12,[4] = 12755}, [10588] = {[3] = 12,[4] = 12758}, [10592] = {[3] = 7,[4] = 12609}, - [10623] = {17,12,1}, - [10624] = {17,12,1}, - [10625] = {17,12,1}, - [10626] = {17,12,1}, - [10627] = {17,12,1}, - [10628] = {17,12,1}, - [10629] = {17,12,1}, - [10630] = {17,12,1}, - [10631] = {17,12,1}, - [10632] = {17,12,1}, - [10633] = {17,12,1}, - [10634] = {17,12,1}, + [10623] = {17,5,1}, + [10624] = {17,5,1}, + [10625] = {17,5,1}, + [10626] = {17,5,1}, + [10627] = {17,5,1}, + [10628] = {17,5,1}, + [10629] = {17,5,1}, + [10630] = {17,5,1}, + [10631] = {17,5,1}, + [10632] = {17,5,1}, + [10633] = {17,5,1}, + [10634] = {17,5,1}, [10644] = {[3] = 12,[4] = 12715}, [10645] = {[3] = 12,[4] = 12759}, [10646] = {[3] = 12,[4] = 12760}, @@ -1085,43 +1085,43 @@ local SOURCE_DATA = { [10775] = {13,1,1}, [10776] = {13,1,1}, [10777] = {13,1,1}, - [10780] = {17,12,1}, - [10781] = {17,12,1}, - [10782] = {17,12,1}, + [10780] = {17,5,1}, + [10781] = {17,5,1}, + [10782] = {17,5,1}, [10783] = {17,1,1}, [10784] = {17,1,1}, [10785] = {17,1,1}, [10786] = {17,1,1}, [10787] = {17,1,1}, [10788] = {17,1,1}, - [10795] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, - [10796] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, - [10797] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, + [10795] = {17,3,1}, + [10796] = {17,3,1}, + [10797] = {17,3,1}, [10798] = {17,2,1}, [10799] = {17,2,1}, [10800] = {17,2,1}, [10801] = {17,3,1}, [10802] = {17,3,1}, - [10803] = {17,6,1}, - [10804] = {17,6,1}, - [10805] = {17,6,1}, - [10806] = {17,5,1}, - [10807] = {17,5,1}, - [10808] = {17,5,1}, - [10828] = {17,11,1}, - [10829] = {17,11,1}, - [10833] = {17,11,1}, - [10835] = {17,11,1}, - [10836] = {17,11,1}, - [10837] = {17,11,1}, - [10838] = {17,4,1}, + [10803] = {17,1,1}, + [10804] = {17,1,1}, + [10805] = {17,1,1}, + [10806] = {17,1,1}, + [10807] = {17,1,1}, + [10808] = {17,1,1}, + [10828] = {17,4,1}, + [10829] = {17,4,1}, + [10833] = {17,4,1}, + [10835] = {17,4,1}, + [10836] = {17,4,1}, + [10837] = {17,4,1}, + [10838] = {17,2,1}, [10841] = {[3] = 9,[4] = 13028}, - [10842] = {17,4,1}, - [10843] = {17,4,1}, - [10844] = {17,4,1}, - [10845] = {17,4,1}, - [10846] = {17,4,1}, - [10847] = {17,11,1}, + [10842] = {17,2,1}, + [10843] = {17,2,1}, + [10844] = {17,2,1}, + [10845] = {17,2,1}, + [10846] = {17,2,1}, + [10847] = {17,4,1}, [10918] = {[3] = 16,[4] = 13220}, [10920] = {[3] = 16,[4] = 13228}, [10921] = {[3] = 16,[4] = 13229}, @@ -1274,7 +1274,7 @@ local SOURCE_DATA = { [12218] = {[3] = 9,[4] = 15933}, [12219] = {19,17,1}, [12224] = {[3] = 9,[4] = 15935}, - [12243] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, + [12243] = {17,3,1}, [12259] = {[3] = 5,[4] = 15972}, [12260] = {[3] = 5,[4] = 15973}, [12335] = {19,7,1}, @@ -1304,11 +1304,11 @@ local SOURCE_DATA = { [12427] = {[3] = 5,[4] = 16658}, [12428] = {[3] = 5,[4] = 16646}, [12429] = {[3] = 5,[4] = 16730}, - [12462] = {17,4,1}, - [12463] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, - [12464] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, - [12465] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, - [12466] = {{17,7,1},{17,8,1},{17,9,1},{17,10,1}}, + [12462] = {17,2,1}, + [12463] = {17,3,1}, + [12464] = {17,3,1}, + [12465] = {17,3,1}, + [12466] = {17,3,1}, [12470] = {15,13,1}, [12471] = {15,7,1}, [12527] = {18,28,1}, @@ -1787,7 +1787,7 @@ local SOURCE_DATA = { [15410] = {28,1,1}, [15564] = {[3] = 6,[4] = 19058}, [15730] = {20,8,1}, - [15733] = {17,12,1}, + [15733] = {17,5,1}, [15749] = {19,17,1}, [15759] = {18,20,1}, [15768] = {25,20,1}, @@ -1826,7 +1826,7 @@ local SOURCE_DATA = { [16053] = {18,28,1}, [16206] = {[3] = 5,[4] = 20201}, [16207] = {[3] = 13,[4] = 20051}, - [16216] = {17,12,1}, + [16216] = {17,5,1}, [16244] = {19,17,1}, [16247] = {20,9,1}, [16248] = {25,20,1}, @@ -2844,9 +2844,6 @@ local SOURCE_DATA = { [20582] = {{26,3,1},{26,4,1},{26,5,1},{26,6,1}}, [20599] = {26,4,1}, [20600] = {{26,3,1},{26,4,1},{26,5,1},{26,6,1}}, - [20606] = {17,1,1}, - [20607] = {17,1,1}, - [20608] = {17,1,1}, [20615] = {{26,3,1},{26,4,1},{26,5,1},{26,6,1}}, [20616] = {{26,3,1},{26,4,1},{26,5,1},{26,6,1}}, [20617] = {{26,3,1},{26,4,1},{26,5,1},{26,6,1}}, diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua index 1cd2862..b1303c6 100755 --- a/AtlasLootClassic_DungeonsAndRaids/data.lua +++ b/AtlasLootClassic_DungeonsAndRaids/data.lua @@ -1879,102 +1879,47 @@ data["Maraudon"] = { }, } -data["TheTempleOfAtal'Hakkar"] = { +data["SunkenTemple"] = { MapID = 1417, InstanceID = 109, ContentType = DUNGEON_CONTENT, LoadDifficulty = NORMAL_DIFF, - LevelRange = GetForVersion({45, 50, 60},{35, 47, 50}), + LevelRange = {47, 50, 60}, items = { - { -- STJammalan + { -- Jammal'an name = AL["Jammal'an the Prophet"], - npcID = 5710, + npcID = 5710, -- 5711 Level = GetForVersion(54,50), - DisplayIDs = {{6708}}, + DisplayIDs = {{6708}, {6709}}, [NORMAL_DIFF] = { { 1, 10806 }, -- Vestments of the Atal'ai Prophet { 2, 10808 }, -- Gloves of the Atal'ai Prophet { 3, 10807 }, -- Kilt of the Atal'ai Prophet + { 16, 10805 }, -- Eater of the Dead + { 17, 10803 }, -- Blade of the Wretched + { 18, 10804 }, -- Fist of the Damned }, }, - { -- STOgom - name = AL["Ogom the Wretched"], - npcID = 5711, - Level = GetForVersion(53,49), - DisplayIDs = {{6709}}, - [NORMAL_DIFF] = { - { 1, 10805 }, -- Eater of the Dead - { 2, 10803 }, -- Blade of the Wretched - { 3, 10804 }, -- Fist of the Damned - }, - }, - { -- STAvatar + { -- Avatar name = AL["Avatar of Hakkar"], npcID = 8443, Level = GetForVersion(53,50), DisplayIDs = {{8053}}, [NORMAL_DIFF] = { - { 1, 10843 }, -- Featherskin Cape - { 2, 10842 }, -- Windscale Sarong - { 3, 10846 }, -- BloodShot Greaves - { 4, 10845 }, -- Warrior's Embrace - { 5, 10838 }, -- Might of Hakkar - { 6, 10844 }, -- Spire of Hakkar + { 1, 12462 }, -- Embrace of the Wind Serpent + { 3, 10843 }, -- Featherskin Cape + { 4, 10842 }, -- Windscale Sarong + { 5, 10846 }, -- BloodShot Greaves + { 6, 10845 }, -- Warrior's Embrace + { 7, 10838 }, -- Might of Hakkar + { 8, 10844 }, -- Spire of Hakkar }, }, - { -- STDreamscythe - name = AL["Dreamscythe"], + { -- Wardens of the Dream + name = AL["Wardens of the Dream"], npcID = 5721, Level = GetForVersion(53,50), - DisplayIDs = {{7553}}, - [NORMAL_DIFF] = { - { 1, 12465 }, -- Nightfall Drape - { 2, 12466 }, -- Dawnspire Cord - { 3, 12464 }, -- Bloodfire Talons - { 4, 10797 }, -- Firebreather - { 5, 12463 }, -- Drakefang Butcher - { 6, 12243 }, -- Smoldering Claw - { 7, 10795 }, -- Drakeclaw Band - { 8, 10796 }, -- Drakestone - }, - }, - { -- STWeaver - name = AL["Weaver"], - npcID = 5720, - Level = GetForVersion(51,50), - DisplayIDs = {{6375}}, - [NORMAL_DIFF] = { - { 1, 12465 }, -- Nightfall Drape - { 2, 12466 }, -- Dawnspire Cord - { 3, 12464 }, -- Bloodfire Talons - { 4, 10797 }, -- Firebreather - { 5, 12463 }, -- Drakefang Butcher - { 6, 12243 }, -- Smoldering Claw - { 7, 10795 }, -- Drakeclaw Band - { 8, 10796 }, -- Drakestone - }, - }, - { -- STHazzas - name = AL["Hazzas"], - npcID = 5722, - Level = GetForVersion(53,50), - DisplayIDs = {{9584}}, - [NORMAL_DIFF] = { - { 1, 12465 }, -- Nightfall Drape - { 2, 12466 }, -- Dawnspire Cord - { 3, 12464 }, -- Bloodfire Talons - { 4, 10797 }, -- Firebreather - { 5, 12463 }, -- Drakefang Butcher - { 6, 12243 }, -- Smoldering Claw - { 7, 10795 }, -- Drakeclaw Band - { 8, 10796 }, -- Drakestone - }, - }, - { -- STMorphaz - name = AL["Morphaz"], - npcID = 5719, - Level = GetForVersion(52,50), - DisplayIDs = {{7975}}, + DisplayIDs = {{7553},{6375},{9584},{7975}}, [NORMAL_DIFF] = { { 1, 12465 }, -- Nightfall Drape { 2, 12466 }, -- Dawnspire Cord @@ -1986,7 +1931,7 @@ data["TheTempleOfAtal'Hakkar"] = { { 8, 10796 }, -- Drakestone }, }, - { -- STEranikus + { -- ST Eranikus name = AL["Shade of Eranikus"], npcID = 5709, Level = GetForVersion(55,50), diff --git a/AtlasLootClassic_DungeonsAndRaids/droprate.lua b/AtlasLootClassic_DungeonsAndRaids/droprate.lua index 0a5331c..8814070 100755 --- a/AtlasLootClassic_DungeonsAndRaids/droprate.lua +++ b/AtlasLootClassic_DungeonsAndRaids/droprate.lua @@ -254,81 +254,6 @@ local DropRateData = { [6907] = 37.27, [6908] = 56.43 }, - [5708] = { - [10801] = 46.74, - [10802] = 23.66 - }, - [5709] = { - [10454] = 63.68, - [10828] = 16.41, - [10829] = 31.8, - [10833] = 30.95, - [10835] = 28.92, - [10836] = 26.29, - [10837] = 14.17, - [10847] = 0.19 - }, - [5710] = { - [10806] = 27.02, - [10807] = 27.24, - [10808] = 29.64 - }, - [5711] = { - [10803] = 30.41, - [10804] = 30.81, - [10805] = 29.89 - }, - [5716] = { - [10783] = 5.02, - [10784] = 2.6, - [10785] = 5.74, - [10786] = 8.26, - [10787] = 6.98, - [10788] = 10.14, - [20606] = 19.99, - [20607] = 23.95, - [20608] = 22.43 - }, - [5719] = { - [10795] = 7.32, - [10796] = 8.32, - [10797] = 7.27, - [12243] = 7.73, - [12463] = 8.2, - [12464] = 6.89, - [12465] = 7.89, - [12466] = 8.23 - }, - [5720] = { - [10795] = 10.03, - [10796] = 9.3, - [10797] = 8.58, - [12243] = 10.13, - [12463] = 10.56, - [12464] = 7.51, - [12465] = 8.58, - [12466] = 9.21 - }, - [5721] = { - [10795] = 9.44, - [10796] = 9.18, - [10797] = 10.15, - [12243] = 8.56, - [12463] = 8.1, - [12464] = 8.46, - [12465] = 9.54, - [12466] = 9.74 - }, - [5722] = { - [10795] = 9.6, - [10796] = 8.75, - [10797] = 9.53, - [12243] = 8.36, - [12463] = 8.56, - [12464] = 8.2, - [12465] = 8.12, - [12466] = 8.54 - }, [5775] = { [6629] = 19.62, [6630] = 39.22, @@ -524,14 +449,6 @@ local DropRateData = { [9640] = 31.98, [9641] = 34.98 }, - [8443] = { - [10838] = 14.3, - [10842] = 30.3, - [10843] = 28.5, - [10844] = 14.1, - [10845] = 26.5, - [10846] = 30.2 - }, [8567] = { [10772] = 50.33, [10774] = 47.71 diff --git a/CF_Locales/DungeonsAndRaids.lua b/CF_Locales/DungeonsAndRaids.lua index 1f49fcb..64073fe 100644 --- a/CF_Locales/DungeonsAndRaids.lua +++ b/CF_Locales/DungeonsAndRaids.lua @@ -327,6 +327,7 @@ AL["Viscidus"] = "Viscidus" AL["Viscous Fallout"] = "Viscous Fallout" AL["War Master Voone"] = "War Master Voone" AL["Warchief Rend Blackhand"] = "Warchief Rend Blackhand" +AL["Wardens of the Dream"] = "Wardens of the Dream" AL["Warder Stilgiss"] = "Warder Stilgiss" AL["Watchman Doomgrip"] = "Watchman Doomgrip" AL["Weaver"] = "Weaver"