Merge branch 'development'

Hoizame · Oct 2, 2019 · 4c52e02 · 4c52e02
2 parents 1f1de95 + 062ec5a
commit 4c52e02
Show file tree

Hide file tree

Showing 10 changed files with 1,132 additions and 121 deletions.
diff --git a/AtlasLootClassic/Button/Item_type.lua b/AtlasLootClassic/Button/Item_type.lua
@@ -33,6 +33,7 @@ local GetItemString = AtlasLoot.ItemString.Create
 local ITEM_COLORS = {}
 local DUMMY_ITEM_ICON = "Interface\\Icons\\INV_Misc_QuestionMark"
 local SET_ITEM = "|cff00ff00"..AL["Set item"]..":|r "
+local WHITE_TEXT = "|cffffffff%s|r"
 
 local itemIsOnEnter, buttonOnEnter = nil, nil
 
@@ -209,13 +210,13 @@ function Item.OnEnter(button, owner)
 		tooltip:SetHyperlink("item:"..button.ItemID)
 	end
 	if button.Droprate then
-		tooltip:AddDoubleLine(AL["Droprate:"], button.Droprate.."%")
+		tooltip:AddDoubleLine(AL["Droprate:"], format(WHITE_TEXT, button.Droprate.."%"))
 	end
 	if AtlasLoot.db.showIDsInTT then
-		tooltip:AddDoubleLine("ItemID:", button.ItemID or 0)
+		tooltip:AddDoubleLine("ItemID:", format(WHITE_TEXT, button.ItemID or 0))
 	end
 	if AtlasLoot.db.ContentPhase.enableTT and ContentPhase:GetForItemID(button.ItemID) then
-		tooltip:AddDoubleLine(AL["Content phase:"], ContentPhase:GetForItemID(button.ItemID))
+		tooltip:AddDoubleLine(AL["Content phase:"], format(WHITE_TEXT, ContentPhase:GetForItemID(button.ItemID)))
 	end
 	if button.ItemID == 12784 then tooltip:AddLine("Arcanite Reaper Hoooooo!") end
 	tooltip:Show()

diff --git a/AtlasLootClassic/Button/Profession_type.lua b/AtlasLootClassic/Button/Profession_type.lua
@@ -14,6 +14,7 @@ local GetTradeskillLink = AtlasLoot.TooltipScan.GetTradeskillLink
 local ProfClickHandler = nil
 
 local PROF_COLOR = "|cffffff00"
+local WHITE_TEXT = "|cffffffff%s|r"
 local ITEM_COLORS = {}
 
 AtlasLoot.ClickHandler:Add(
@@ -82,7 +83,7 @@ function Prof.OnEnter(button)
 	tooltip:SetOwner(button, "ANCHOR_RIGHT", -(button:GetWidth() * 0.5), 5)
 	tooltip:SetSpellByID(button.SpellID)
 	if AtlasLoot.db.showIDsInTT then
-		tooltip:AddDoubleLine("SpellID:", button.SpellID)
+		tooltip:AddDoubleLine("SpellID:", format(WHITE_TEXT, button.SpellID))
 	end
 	tooltip:Show()
 end

diff --git a/AtlasLootClassic/Core/Tooltip.lua b/AtlasLootClassic/Core/Tooltip.lua
@@ -117,6 +117,7 @@ local PLAYER_GUID_REGISTER = {
 	["Player-4455-00D28DDC"] = format(SILVER, "AtlasLoot Friend"),
 	["Player-4463-00A5D43D"] = format(SILVER, "AtlasLoot Friend"),
 	["Player-4476-0054EED9"] = format(COPPER, "aka god of shadow"),
+	["Player-4476-0166DB51"] = format(COPPER, "god of shadow"),
 }
 
 local function AddText(self)

diff --git a/AtlasLootClassic/Data/Token.lua b/AtlasLootClassic/Data/Token.lua
@@ -178,6 +178,7 @@ local TOKEN = {
 	[7733] = { 7733, 0, 7740, 7741 }, -- Staff of Prehistoria
 	[7740] = 7733, -- Gni'kiv Medallion
 	[7741] = 7733, -- The Shaft of Tsol
+	[12845] = { 17044, 17045, type = 4 }, -- Medallion of Faith
 
 	-- Quests
 	[10441] = { 10657, 10658, type = 3 }, -- Glowing Shard

diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,11 @@
 
 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.2.1 (Oct. 01, 2019)
+
+- Add a option to show level for bosses
+- Small fixes
+
 ## v1.2.0 (Sep. 30, 2019)
 
 - Add droprates for dungeons / raids

diff --git a/AtlasLootClassic/GUI/GUI.lua b/AtlasLootClassic/GUI/GUI.lua
@@ -109,7 +109,17 @@ local function UpdateFrames(noPageUpdate)
 	end
 
 	-- npcID
-	GUI.ItemFrame.npcID = moduleData[dataID].items[bossID].npcID
+	local usedNpcID = moduleData[dataID].items[bossID].npcID
+	if not usedNpcID then
+		usedNpcID = moduleData[dataID].items[bossID].ObjectID
+	end
+	if usedNpcID then
+		if type(moduleData[dataID].items[bossID].npcID) == "table" then
+			GUI.ItemFrame.npcID = usedNpcID[1]
+		else
+			GUI.ItemFrame.npcID = usedNpcID
+		end
+	end
 
 	-- Search
 	if contentFrame.shownFrame and contentFrame.shownFrame.OnSearch then

diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua
@@ -1712,6 +1712,7 @@ data["RazorfenDowns"] = {
 			Level = 40,
 			DisplayIDs = {{11382}},
 			AtlasMapBossID = 5,
+			specialType = "rare",
 			[NORMAL_DIFF] = {
 				{ 1,  10768 }, -- Boar Champion's Belt
 				{ 2,  10767 }, -- Savage Boar's Guard
@@ -2613,7 +2614,6 @@ data["BlackrockDepths"] = {
 			[NORMAL_DIFF] = {
 				{ 1,  11685 }, -- Splinthide Shoulders
 				{ 2,  11679 }, -- Rubicund Armguards
-				{ 3,  11730 }, -- Savage Gladiator Grips
 				{ 4,  11686 }, -- Girdle of Beastial Fury
 			},
 		},
@@ -2648,10 +2648,9 @@ data["BlackrockDepths"] = {
 			DisplayIDs = {{8271}},
 			AtlasMapBossID = 6,
 			[NORMAL_DIFF] = {
-				{ 1,  11729 }, -- Savage Gladiator Helm
-				{ 2,  11633 }, -- Spiderfang Carapace
-				{ 3,  11634 }, -- Silkweb Gloves
-				{ 4,  11635 }, -- Hookfang Shanker
+				{ 1,  11633 }, -- Spiderfang Carapace
+				{ 2,  11634 }, -- Silkweb Gloves
+				{ 3,  11635 }, -- Hookfang Shanker
 			},
 		},
 		-- RING END
@@ -2879,6 +2878,7 @@ data["BlackrockDepths"] = {
 			name = AL["Chest of The Seven"],
 			SubAreaID = 26784,
 			npcID = {9034, 9035, 9036, 9037, 9038, 9039, 9040},
+			ObjectID = 169243,
 			Level = {55, 57},
 			DisplayIDs = {{8690},{8686},{8692},{8689},{8691},{8687},{8688}},
 			AtlasMapBossID = 18,
@@ -3039,14 +3039,13 @@ data["LowerBlackrockSpire"] = {
 			DisplayIDs = {{11565}},
 			AtlasMapBossID = 5,
 			[NORMAL_DIFF] = {
-				{ 1,  16670 }, -- Boots of the 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
-				{ 9,  12336 }, -- Gemstone of Spirestone
-				{ 11, 12534 }, -- Omokk's Head
+				{ 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
 			},
 		},
 		{ -- LBRSSpirestoneBattleLord
@@ -3163,8 +3162,7 @@ data["LowerBlackrockSpire"] = {
 				{ 3,  13258 }, -- Slaghide Gauntlets
 				{ 4,  22232 }, -- Marksman's Girdle
 				{ 5,  13259 }, -- Ribsteel Footguards
-				{ 6,  13178 }, -- Rosewine Circle
-				{ 8,  18784 }, -- Top Half of Advanced Armorsmithing: Volume III
+				{ 7,  18784 }, -- Top Half of Advanced Armorsmithing: Volume III
 			},
 		},
 		{ -- LBRSZigris
@@ -4471,11 +4469,10 @@ data["Stratholme"] = {
 			AtlasMapBossID = 3,
 			specialType = "rare",
 			[NORMAL_DIFF] = {
-				{ 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
+				{ 1,  13378 }, -- Songbird Blouse
+				{ 2,  13384 }, -- Rainbow Girdle
+				{ 3,  13383 }, -- Woollies of the Prancing Minstrel
+				{ 4,  13379 }, -- Piccolo of the Flaming Fire
 			},
 		},
 		{ -- STRATTheUnforgiven
@@ -4510,6 +4507,7 @@ data["Stratholme"] = {
 		{ -- STRATMalorsStrongbox
 			name = AL["Malor the Zealous"],
 			npcID = 11032,
+			ObjectID = 176112,
 			Level = 60,
 			SubAreaID = 32319,
 			DisplayIDs = {{10458}},
@@ -4528,7 +4526,7 @@ data["Stratholme"] = {
 			AtlasMapBossID = 8,
 			[NORMAL_DIFF] = {
 				{ 1,  18781 }, -- Bottom Half of Advanced Armorsmithing: Volume II
-				{ 3,  12824 }, -- Plans: Enchanted Battlehammer
+				--{ 3,  12824 }, -- Plans: Enchanted Battlehammer
 			},
 		},
 		{ -- STRATCannonMasterWilley
@@ -4572,10 +4570,10 @@ data["Stratholme"] = {
 		},
 		{ -- STRATBalnazzar
 			name = AL["Balnazzar"],
-			npcID = 10813,
+			npcID = {10812, 10813},
 			Level = 999,
 			SubAreaID = 32367,
-			DisplayIDs = {{10691}},
+			DisplayIDs = {{10545}, {10691}},
 			AtlasMapBossID = 11,
 			[NORMAL_DIFF] = {
 				{ 1,  13353 }, -- Book of the Dead
@@ -4589,7 +4587,8 @@ data["Stratholme"] = {
 				{ 11, 13369 }, -- Fire Striders
 				{ 12, 13360 }, -- Gift of the Elven Magi
 				{ 13, 18717 }, -- Hammer of the Grand Crusader
-				{ 14, 13348 }, -- Demonshear
+				{ 14,  22334 }, -- Band of Mending
+				{ 15, 13348 }, -- Demonshear
 				{ 16, 13520 }, -- Recipe: Flask of Distilled Wisdom
 				{ 18, 13250 }, -- Head of Balnazzar
 			},
@@ -4655,7 +4654,7 @@ data["Stratholme"] = {
 				{ 1,  18783 }, -- Bottom Half of Advanced Armorsmithing: Volume III
 				--{ 2,  12725 }, -- Plans: Enchanted Thorium Helm
 				--{ 3,  12620 }, -- Enchanted Thorium Helm
-				{ 3,  12825 }, -- Plans: Blazing Rapier
+				--{ 3,  12825 }, -- Plans: Blazing Rapier
 				--{ 6,  12777 }, -- Blazing Rapier
 			},
 		},
@@ -4757,12 +4756,13 @@ data["Stratholme"] = {
 			DisplayIDs = {{10669}},
 			AtlasMapBossID = "6'",
 			[NORMAL_DIFF] = {
-				{ 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
+				{ 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
 			},
 		},
 		{ -- STRATTrash