Merge branch 'development'

Hoizame · Sep 5, 2020 · c8249aa · c8249aa
2 parents a7b7891 + 2cf2778
commit c8249aa
Show file tree

Hide file tree

Showing 7 changed files with 1,945 additions and 2,132 deletions.
diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,13 @@
 
 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.5 (Aug. 21, 2020)
+
+- Add Gyromatic Icemaker in Gnomeregan
+- Replace "The Darksoul" in "Misc Sets" with "Shard of the Gods"
+- Add General Rajaxx encounter loot
+- Add Warblade of the Hakkari (Off hand) for Hakkar
+
 ## v1.5.4 (Jul. 31, 2020)
 
 - update loot sources for Phase 5

diff --git a/AtlasLootClassic_Collections/data.lua b/AtlasLootClassic_Collections/data.lua
@@ -308,200 +308,6 @@ data["MiscSets"] = {
 	},
 }
 
---[[
-data["Azuregos"] = {
-	name = AL["Azuregos"],
-	AtlasMapFile = "Azuregos",
-	ContentType = WORLD_BOSS_CONTENT,
-	LoadDifficulty = LOAD_DIFF,
-	ContentPhase = 2,
-	items = {
-		{ -- AAzuregos
-			name = AL["Azuregos"],
-			npcId = 6109,
-			Level = 999,
-			DisplayIDs = {{11460}},
-			AtlasMapBossID = 1,
-			[NORMAL_DIFF] = {
-				{ 1,  19132 }, -- Crystal Adorned Crown
-				{ 2,  18208 }, -- Drape of Benediction
-				{ 3,  18541 }, -- Puissant Cape
-				{ 4,  18547 }, -- Unmelting Ice Girdle
-				{ 5,  18545 }, -- Leggings of Arcane Supremacy
-				{ 6,  19131 }, -- Snowblind Shoes
-				{ 7,  19130 }, -- Cold Snap
-				{ 8,  17070 }, -- Fang of the Mystics
-				{ 9,  18202 }, -- Eskhandar's Left Claw
-				{ 10, 18542 }, -- Typhoon
-				{ 16, 18704 }, -- Mature Blue Dragon Sinew
-			},
-		},
-		{ -- ASpiritA
-			name = AL["Spirit of Azuregos"],
-			npcId = 15481,
-			DisplayIDs = {{15473}},
-			AtlasMapBossID = 1,
-			ExtraList = true,
-			[NORMAL_DIFF] = {
-				{ 1,  20949 }, -- Magical Ledger
-			},
-		},
-	},
-}
-
-data["LordKazzak"] = {
-	name = AL["Lord Kazzak"],
-	AtlasMapFile = "LordKazzak",
-	ContentType = WORLD_BOSS_CONTENT,
-	LoadDifficulty = LOAD_DIFF,
-	ContentPhase = 2,
-	items = {
-		{ -- KKazzak
-			name = AL["Lord Kazzak"],
-			npcId = 12397,
-			Level = 999,
-			DisplayIDs = {{12449}},
-			AtlasMapBossID = 1,
-			[NORMAL_DIFF] = {
-				{ 1,  18546 }, -- Infernal Headcage
-				{ 2,  17111 }, -- Blazefury Medallion
-				{ 3,  18204 }, -- Eskhandar's Pelt
-				{ 4,  19135 }, -- Blacklight Bracer
-				{ 5,  18544 }, -- Doomhide Gauntlets
-				{ 6,  19134 }, -- Flayed Doomguard Belt
-				{ 7,  19133 }, -- Fel Infused Leggings
-				{ 8,  18543 }, -- Ring of Entropy
-				{ 9,  17112 }, -- Empyrean Demolisher
-				{ 10, 17113 }, -- Amberseal Keeper
-				{ 16, 18665 }, -- The Eye of Shadow
-			},
-		},
-	},
-}
-
-data["DragonsOfNightmare"] = {
-	name = AL["Dragons of Nightmare"],
-	AtlasMapFile = "FourDragons",
-	ContentType = WORLD_BOSS_CONTENT,
-	LoadDifficulty = LOAD_DIFF,
-	ContentPhase = 4,
-	items = {
-		{ -- DLethon
-			name = AL["Lethon"],
-			npcId = 14888,
-			Level = 999,
-			DisplayIDs = {{15365}},
-			[NORMAL_DIFF] = {
-				{ 1,  20628 }, -- Deviate Growth Cap
-				{ 2,  20626 }, -- Black Bark Wristbands
-				{ 3,  20630 }, -- Gauntlets of the Shining Light
-				{ 4,  20625 }, -- Belt of the Dark Bog
-				{ 5,  20627 }, -- Dark Heart Pants
-				{ 6,  20629 }, -- Malignant Footguards
-				{ 9,  20579 }, -- Green Dragonskin Cloak
-				{ 10, 20615 }, -- Dragonspur Wraps
-				{ 11, 20616 }, -- Dragonbone Wristguards
-				{ 12, 20618 }, -- Gloves of Delusional Power
-				{ 13, 20617 }, -- Ancient Corroded Leggings
-				{ 14, 20619 }, -- Acid Inscribed Greaves
-				{ 15, 20582 }, -- Trance Stone
-				{ 16, 20644 }, -- Nightmare Engulfed Object
-				{ 17, 20600 }, -- Malfurion's Signet Ring
-				{ 24, 20580 }, -- Hammer of Bestial Fury
-				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
-			},
-		},
-		{ -- DEmeriss
-			name = AL["Emeriss"],
-			npcId = 14889,
-			Level = 999,
-			DisplayIDs = {{15366}},
-			[NORMAL_DIFF] = {
-				{ 1,  20623 }, -- Circlet of Restless Dreams
-				{ 2,  20622 }, -- Dragonheart Necklace
-				{ 3,  20624 }, -- Ring of the Unliving
-				{ 4,  20621 }, -- Boots of the Endless Moor
-				{ 5,  20599 }, -- Polished Ironwood Crossbow
-				{ 9,  20579 }, -- Green Dragonskin Cloak
-				{ 10, 20615 }, -- Dragonspur Wraps
-				{ 11, 20616 }, -- Dragonbone Wristguards
-				{ 12, 20618 }, -- Gloves of Delusional Power
-				{ 13, 20617 }, -- Ancient Corroded Leggings
-				{ 14, 20619 }, -- Acid Inscribed Greaves
-				{ 15, 20582 }, -- Trance Stone
-				{ 16, 20644 }, -- Nightmare Engulfed Object
-				{ 17, 20600 }, -- Malfurion's Signet Ring
-				{ 24, 20580 }, -- Hammer of Bestial Fury
-				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
-			},
-		},
-		{ -- DTaerar
-			name = AL["Taerar"],
-			npcId = 14890,
-			Level = 999,
-			DisplayIDs = {{15363}, {15367}},
-			[NORMAL_DIFF] = {
-				{ 1,  20633 }, -- Unnatural Leather Spaulders
-				{ 2,  20631 }, -- Mendicant's Slippers
-				{ 3,  20634 }, -- Boots of Fright
-				{ 4,  20632 }, -- Mindtear Band
-				{ 5,  20577 }, -- Nightmare Blade
-				{ 9,  20579 }, -- Green Dragonskin Cloak
-				{ 10, 20615 }, -- Dragonspur Wraps
-				{ 11, 20616 }, -- Dragonbone Wristguards
-				{ 12, 20618 }, -- Gloves of Delusional Power
-				{ 13, 20617 }, -- Ancient Corroded Leggings
-				{ 14, 20619 }, -- Acid Inscribed Greaves
-				{ 15, 20582 }, -- Trance Stone
-				{ 16, 20644 }, -- Nightmare Engulfed Object
-				{ 17, 20600 }, -- Malfurion's Signet Ring
-				{ 24, 20580 }, -- Hammer of Bestial Fury
-				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
-			},
-		},
-		{ -- DYsondre
-			name = AL["Ysondre"],
-			npcId = 14887,
-			Level = 999,
-			DisplayIDs = {{15364}},
-			[NORMAL_DIFF] = {
-				{ 1,  20637 }, -- Acid Inscribed Pauldrons
-				{ 2,  20635 }, -- Jade Inlaid Vestments
-				{ 3,  20638 }, -- Leggings of the Demented Mind
-				{ 4,  20639 }, -- Strangely Glyphed Legplates
-				{ 5,  20636 }, -- Hibernation Crystal
-				{ 6,  20578 }, -- Emerald Dragonfang
-				{ 9,  20579 }, -- Green Dragonskin Cloak
-				{ 10, 20615 }, -- Dragonspur Wraps
-				{ 11, 20616 }, -- Dragonbone Wristguards
-				{ 12, 20618 }, -- Gloves of Delusional Power
-				{ 13, 20617 }, -- Ancient Corroded Leggings
-				{ 14, 20619 }, -- Acid Inscribed Greaves
-				{ 15, 20582 }, -- Trance Stone
-				{ 16, 20644 }, -- Nightmare Engulfed Object
-				{ 17, 20600 }, -- Malfurion's Signet Ring
-				{ 24, 20580 }, -- Hammer of Bestial Fury
-				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
-			},
-		},
-		{ -- DTrash
-			name = AL["Trash"],
-			ExtraList = true,
-			[NORMAL_DIFF] = {
-				{ 1,  21146 }, -- Fragment of the Nightmare's Corruption
-				{ 2,  21147 }, -- Fragment of the Nightmare's Corruption
-				{ 3,  21148 }, -- Fragment of the Nightmare's Corruption
-				{ 4,  21149 }, -- Fragment of the Nightmare's Corruption
-			},
-		},
-	},
-}
-]]--
-
 data["WorldEpics"] = {
 	name = AL["World Epics"],
 	ContentType = COLLECTIONS_CONTENT,
@@ -1174,8 +980,6 @@ data["Darkmoon"] = {
 	},
 }
 
--- { 17,  22523, 22524, [ATLASLOOT_IT_AMOUNT1] = 12, [ATLASLOOT_IT_AMOUNT2] = 11 }, -- Insignia of the Dawn / Crusade
-
 data["SilithusAbyssal"] = {
 	name = AL["Silithus Abyssal"],
 	ContentType = WORLD_EVENT_CONTENT,