Merge branch 'development'

Hoizame · Jul 31, 2020 · cc4ba9d · cc4ba9d
2 parents 9890b15 + 6d336e5
commit cc4ba9d
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 93 deletions.
diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,10 @@
 
 This mod is distributed under Version 2 of the GPL.  A copy of the GPL is included in this zip file with links to non-english translations.
 
+## v1.5.3 (Jul. 30, 2020)
+
+- Update content phase
+
 ## v1.5.2 (Jul. 10, 2020)
 
 - Update .toc version

diff --git a/AtlasLootClassic_Data/source.lua b/AtlasLootClassic_Data/source.lua
@@ -1172,10 +1172,10 @@ local SOURCE_DATA = {
 		[11612] = {18,20,1},
 		[11614] = {18,28,1},
 		[11615] = {18,28,1},
-		[11623] = {18,2,1},
+		[11623] = {18,3,1},
 		[11624] = {18,2,1},
 		[11625] = {18,2,1},
-		[11626] = {18,3,1},
+		[11626] = {18,2,1},
 		[11627] = {18,3,1},
 		[11628] = {18,3,1},
 		[11629] = {18,3,1},
@@ -1199,16 +1199,16 @@ local SOURCE_DATA = {
 		[11703] = {18,5,1},
 		[11722] = {18,5,1},
 		[11726] = {18,4,1},
-		[11728] = {18,4,1},
-		[11729] = {18,4,1},
-		[11730] = {18,4,1},
-		[11731] = {18,4,1},
+		[11728] = {18,7,1},
+		[11729] = {18,9,1},
+		[11730] = {18,6,1},
+		[11731] = {18,8,1},
 		[11735] = {18,20,1},
 		[11742] = {18,20,1},
 		[11743] = {18,21,1},
 		[11744] = {18,21,1},
 		[11745] = {18,21,1},
-		[11746] = {18,21,1},
+		[11746] = {18,25,1},
 		[11747] = {18,10,1},
 		[11748] = {18,10,1},
 		[11749] = {18,10,1},
@@ -1234,12 +1234,12 @@ local SOURCE_DATA = {
 		[11807] = {18,17,1},
 		[11808] = {18,22,1},
 		[11809] = {18,22,1},
-		[11810] = {18,27,1},
+		[11810] = {18,18,1},
 		[11811] = {[3] = 13,[4] = 15596},
 		[11812] = {18,22,1},
 		[11813] = {18,1,1},
 		[11814] = {18,22,1},
-		[11815] = {18,18,1},
+		[11815] = {18,27,1},
 		[11816] = {18,18,1},
 		[11817] = {18,18,1},
 		[11819] = {18,19,1},
@@ -1466,7 +1466,7 @@ local SOURCE_DATA = {
 		[13170] = {19,3,1},
 		[13173] = {19,7,1},
 		[13177] = {19,7,1},
-		[13178] = {19,7,1},
+		[13178] = {19,11,1},
 		[13179] = {19,7,1},
 		[13181] = {19,1,1},
 		[13182] = {19,1,1},
@@ -1849,7 +1849,7 @@ local SOURCE_DATA = {
 		[16667] = {24,15,1},
 		[16668] = {25,18,1},
 		[16669] = {20,5,1},
-		[16670] = {19,11,1},
+		[16670] = {19,3,1},
 		[16671] = {{24,16,1},{25,20,1}},
 		[16672] = {20,1,1},
 		[16673] = {{19,17,1},{20,9,1}},
@@ -1861,7 +1861,7 @@ local SOURCE_DATA = {
 		[16679] = {19,16,1},
 		[16680] = {{19,17,1},{20,9,1}},
 		[16681] = {{20,9,1},{25,20,1}},
-		[16682] = {25,19,1},
+		[16682] = {25,3,1},
 		[16683] = {{19,17,1},{20,9,1}},
 		[16684] = {24,10,1},
 		[16685] = {{19,17,1},{24,16,1},{25,20,1}},
@@ -1903,7 +1903,7 @@ local SOURCE_DATA = {
 		[16721] = {20,8,1},
 		[16722] = {{24,13,1},{24,16,1}},
 		[16723] = {25,20,1},
-		[16724] = {18,27,1},
+		[16724] = {25,5,1},
 		[16725] = {25,10,1},
 		[16726] = {20,8,1},
 		[16727] = {24,15,1},

diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua
@@ -2570,7 +2570,7 @@ data["BlackrockDepths"] = {
 			DisplayIDs = {{8761}},
 			AtlasMapBossID = 5,
 			[NORMAL_DIFF] = {
-				{ 1,  11623 }, -- Spritecaster Cape
+				{ 1,  11626 }, -- Blackveil Cape
 				{ 2,  11624 }, -- Kentic Amice
 				{ 3,  22240 }, -- Greaves of Withering Despair
 				{ 4,  11625 }, -- Enthralled Sphere
@@ -2585,7 +2585,7 @@ data["BlackrockDepths"] = {
 			DisplayIDs = {{9212}},
 			AtlasMapBossID = 6,
 			[NORMAL_DIFF] = {
-				{ 1,  11626 }, -- Blackveil Cape
+				{ 1,  11623 }, -- Spritecaster Cape
 				{ 2,  11627 }, -- Fleetfoot Greaves
 				{ 3,  11628 }, -- Houndmaster's Bow
 				{ 4,  11629 }, -- Houndmaster's Rifle
@@ -2600,13 +2600,9 @@ data["BlackrockDepths"] = {
 			AtlasMapBossID = 6,
 			[NORMAL_DIFF] = {
 				{ 1,  11726 }, -- Savage Gladiator Chain
-				{ 2,  11729 }, -- Savage Gladiator Helm
-				{ 3,  11730 }, -- Savage Gladiator Grips
-				{ 4,  11728 }, -- Savage Gladiator Leggings
-				{ 5,  11731 }, -- Savage Gladiator Greaves
-				{ 7,  22271 }, -- Leggings of Frenzied Magic
-				{ 8,  22257 }, -- Bloodclot Band
-				{ 9,  22266 }, -- Flarethorn
+				{ 2,  22271 }, -- Leggings of Frenzied Magic
+				{ 3,  22257 }, -- Bloodclot Band
+				{ 4,  22266 }, -- Flarethorn
 			},
 		},
 		{ -- BRDGrizzle
@@ -2634,6 +2630,7 @@ data["BlackrockDepths"] = {
 				{ 1,  11685 }, -- Splinthide Shoulders
 				{ 2,  11679 }, -- Rubicund Armguards
 				{ 4,  11686 }, -- Girdle of Beastial Fury
+				{ 5,  11730 }, -- Savage Gladiator Grips
 			},
 		},
 		{ -- BRDOkthor
@@ -2645,7 +2642,8 @@ data["BlackrockDepths"] = {
 			[NORMAL_DIFF] = {
 				{ 1,  11665 }, -- Ogreseer Fists
 				{ 2,  11662 }, -- Ban'thok Sash
-				{ 3,  11824 }, -- Cyclopean Band
+				{ 3,  11728 }, -- Savage Gladiator Leggings
+				{ 4,  11824 }, -- Cyclopean Band
 			},
 		},
 		{ -- BRDAnubshiah
@@ -2658,6 +2656,7 @@ data["BlackrockDepths"] = {
 				{ 1,  11678 }, -- Carapace of Anub'shiah
 				{ 2,  11677 }, -- Graverot Cape
 				{ 3,  11675 }, -- Shadefiend Boots
+				{ 4,  11731 }, -- Savage Gladiator Greaves
 			},
 		},
 		{ -- BRDHedrum
@@ -2670,6 +2669,7 @@ data["BlackrockDepths"] = {
 				{ 1,  11633 }, -- Spiderfang Carapace
 				{ 2,  11634 }, -- Silkweb Gloves
 				{ 3,  11635 }, -- Hookfang Shanker
+				{ 4,  11729 }, -- Savage Gladiator Helm
 			},
 		},
 		-- RING END
@@ -2808,7 +2808,7 @@ data["BlackrockDepths"] = {
 			[NORMAL_DIFF] = {
 				{ 1,  11820 }, -- Royal Decorated Armor
 				{ 2,  11821 }, -- Warstrife Leggings
-				{ 3,  11815 }, -- Hand of Justice
+				{ 3, 11810 }, -- Force of Will
 				{ 4,  11817 }, -- Lord General's Sword
 				{ 5,  11816 }, -- Angerforge's Battle Axe
 				{ 6,  11841 }, -- Senior Designer's Pantaloons
@@ -2866,11 +2866,10 @@ data["BlackrockDepths"] = {
 			DisplayIDs = {{8177}},
 			AtlasMapBossID = 15,
 			[NORMAL_DIFF] = {
-				{ 1,  11746 }, -- Golem Skull Helm
-				{ 2,  22212 }, -- Golem Fitted Pauldrons
-				{ 3,  11745 }, -- Fists of Phalanx
-				{ 4, 11744 }, -- Bloodfist
-				{ 5, 11743 }, -- Rockfist
+				{ 1,  22212 }, -- Golem Fitted Pauldrons
+				{ 2,  11745 }, -- Fists of Phalanx
+				{ 3, 11744 }, -- Bloodfist
+				{ 4, 11743 }, -- Rockfist
 			},
 		},
 		{ -- BRDFlamelash
@@ -2931,10 +2930,11 @@ data["BlackrockDepths"] = {
 			DisplayIDs = {{12162}},
 			AtlasMapBossID = 20,
 			[NORMAL_DIFF] = {
-				{ 1,  11935 }, -- Magmus Stone
-				{ 2,  22395 }, -- Totem of Rage
-				{ 3,  22400 }, -- Libram of Truth
-				{ 4,  22208 }, -- Lavastone Hammer
+				{ 1,  11746 }, -- Golem Skull Helm
+				{ 2,  11935 }, -- Magmus Stone
+				{ 3,  22395 }, -- Totem of Rage
+				{ 4,  22400 }, -- Libram of Truth
+				{ 5,  22208 }, -- Lavastone Hammer
 			},
 		},
 		{ -- BRDPrincess
@@ -2960,17 +2960,16 @@ data["BlackrockDepths"] = {
 			AtlasMapBossID = 21,
 			[NORMAL_DIFF] = {
 				{ 1,  11684 }, -- Ironfoe
-				{ 3,  16724 }, -- Lightforge Gauntlets
-				{ 4,  11933 }, -- Imperial Jewel
-				{ 5,  11930 }, -- The Emperor's New Cape
-				{ 6,  11924 }, -- Robes of the Royal Crown
-				{ 7,  22204 }, -- Wristguards of Renown
-				{ 8,  22207 }, -- Sash of the Grand Hunt
-				{ 9,  11934 }, -- Emperor's Seal
-				{ 10, 11810 }, -- Force of Will
-				{ 11, 11928 }, -- Thaurissan's Royal Scepter
-				{ 12, 11931 }, -- Dreadforge Retaliator
-				{ 13, 11932 }, -- Guiding Stave of Wisdom
+				{ 3,  11933 }, -- Imperial Jewel
+				{ 4,  11930 }, -- The Emperor's New Cape
+				{ 5,  11924 }, -- Robes of the Royal Crown
+				{ 6,  22204 }, -- Wristguards of Renown
+				{ 7,  22207 }, -- Sash of the Grand Hunt
+				{ 8,  11934 }, -- Emperor's Seal
+				{ 9,  11815 }, -- Hand of Justice
+				{ 10, 11928 }, -- Thaurissan's Royal Scepter
+				{ 11, 11931 }, -- Dreadforge Retaliator
+				{ 12, 11932 }, -- Guiding Stave of Wisdom
 				{ 16, 12033 }, -- Thaurissan Family Jewels
 			},
 		},
@@ -3071,13 +3070,14 @@ data["LowerBlackrockSpire"] = {
 			DisplayIDs = {{11565}},
 			AtlasMapBossID = 5,
 			[NORMAL_DIFF] = {
-				{ 1,  13166 }, -- Slamshot Shoulders
-				{ 2,  13168 }, -- Plate of the Shaman King
-				{ 3,  13170 }, -- Skyshroud Leggings
-				{ 4,  13169 }, -- Tressermane Leggings
-				{ 5,  13167 }, -- Fist of Omokk
-				{ 7,  12336 }, -- Gemstone of Spirestone
-				{ 9, 12534 }, -- Omokk's Head
+				{ 1,  16670 }, -- Boots of Elements
+				{ 3,  13166 }, -- Slamshot Shoulders
+				{ 4,  13168 }, -- Plate of the Shaman King
+				{ 5,  13170 }, -- Skyshroud Leggings
+				{ 6,  13169 }, -- Tressermane Leggings
+				{ 7,  13167 }, -- Fist of Omokk
+				{ 8,  12336 }, -- Gemstone of Spirestone
+				{ 16, 12534 }, -- Omokk's Head
 			},
 		},
 		{ -- LBRSSpirestoneBattleLord
@@ -3132,12 +3132,11 @@ data["LowerBlackrockSpire"] = {
 			[NORMAL_DIFF] = {
 				{ 1,  16676 }, -- Beaststalker's Gloves
 				{ 3,  13177 }, -- Talisman of Evasion
-				{ 4,  13178 }, -- Rosewine Circle
-				{ 5,  13179 }, -- Brazecore Armguards
-				{ 6,  22231 }, -- Kayser's Boots of Precision
-				{ 7,  13173 }, -- Flightblade Throwing Axe
-				{ 8,  12582 }, -- Keris of Zul'Serak
-				{ 10,  12335 }, -- Gemstone of Smolderthorn
+				{ 4,  13179 }, -- Brazecore Armguards
+				{ 5,  22231 }, -- Kayser's Boots of Precision
+				{ 6,  13173 }, -- Flightblade Throwing Axe
+				{ 7,  12582 }, -- Keris of Zul'Serak
+				{ 9,  12335 }, -- Gemstone of Smolderthorn
 			},
 		},
 		{ -- LBRSGrimaxe
@@ -3190,11 +3189,11 @@ data["LowerBlackrockSpire"] = {
 			DisplayIDs = {{11583}},
 			AtlasMapBossID = 15,
 			[NORMAL_DIFF] = {
-				{ 1,  16670 }, -- Boots of Elements
-				{ 3,  13258 }, -- Slaghide Gauntlets
-				{ 4,  22232 }, -- Marksman's Girdle
-				{ 5,  13259 }, -- Ribsteel Footguards
-				{ 7,  18784 }, -- Top Half of Advanced Armorsmithing: Volume III
+				{ 1,  13258 }, -- Slaghide Gauntlets
+				{ 2,  22232 }, -- Marksman's Girdle
+				{ 3,  13259 }, -- Ribsteel Footguards
+				{ 4,  13178 }, -- Rosewine Circle
+				{ 16,  18784 }, -- Top Half of Advanced Armorsmithing: Volume III
 			},
 		},
 		{ -- LBRSZigris
@@ -4512,10 +4511,11 @@ data["Stratholme"] = {
 			AtlasMapBossID = 3,
 			specialType = "rare",
 			[NORMAL_DIFF] = {
-				{ 1,  13378 }, -- Songbird Blouse
-				{ 2,  13384 }, -- Rainbow Girdle
-				{ 3,  13383 }, -- Woollies of the Prancing Minstrel
-				{ 4,  13379 }, -- Piccolo of the Flaming Fire
+				{ 1,  16682 }, -- Magister's Boots
+				{ 3,  13378 }, -- Songbird Blouse
+				{ 4,  13384 }, -- Rainbow Girdle
+				{ 5,  13383 }, -- Woollies of the Prancing Minstrel
+				{ 6,  13379 }, -- Piccolo of the Flaming Fire
 			},
 		},
 		{ -- STRATTheUnforgiven
@@ -4541,10 +4541,11 @@ data["Stratholme"] = {
 			DisplayIDs = {{571}},
 			AtlasMapBossID = 6,
 			[NORMAL_DIFF] = {
-				{ 1,  13400 }, -- Vambraces of the Sadist
-				{ 2,  13403 }, -- Grimgore Noose
-				{ 3,  13402 }, -- Timmy's Galoshes
-				{ 4,  13401 }, -- The Cruel Hand of Timmy
+				{ 1,  16724 }, -- Lightforge Gauntlets
+				{ 3,  13400 }, -- Vambraces of the Sadist
+				{ 4,  13403 }, -- Grimgore Noose
+				{ 5,  13402 }, -- Timmy's Galoshes
+				{ 6,  13401 }, -- The Cruel Hand of Timmy
 			},
 		},
 		{ -- STRATMalorsStrongbox
@@ -4800,13 +4801,12 @@ data["Stratholme"] = {
 			DisplayIDs = {{10669}},
 			AtlasMapBossID = "6'",
 			[NORMAL_DIFF] = {
-				{ 1,  16682 }, -- Magister's Boots
-				{ 3,  13390 }, -- The Postmaster's Band
-				{ 4,  13388 }, -- The Postmaster's Tunic
-				{ 5,  13389 }, -- The Postmaster's Trousers
-				{ 6,  13391 }, -- The Postmaster's Treads
-				{ 7,  13392 }, -- The Postmaster's Seal
-				{ 8,  13393 }, -- Malown's Slam
+				{ 1,  13390 }, -- The Postmaster's Band
+				{ 2,  13388 }, -- The Postmaster's Tunic
+				{ 3,  13389 }, -- The Postmaster's Trousers
+				{ 4,  13391 }, -- The Postmaster's Treads
+				{ 5,  13392 }, -- The Postmaster's Seal
+				{ 6,  13393 }, -- Malown's Slam
 			},
 		},
 		{ -- STRATTrash