Merge branch 'development'

Hoizame · Dec 2, 2019 · d106b40 · d106b40
2 parents 1dc29af + 463d942
commit d106b40
Show file tree

Hide file tree

Showing 13 changed files with 179 additions and 32 deletions.
diff --git a/AtlasLootClassic/Button/Button.lua b/AtlasLootClassic/Button/Button.lua
@@ -339,6 +339,13 @@ function Button:Create()
 	button.secButton.count:SetText(15)
 	button.secButton.count:Hide()
 
+	button.secButton.pvp = button.secButton:CreateTexture(buttonName.."_secButtonPvp")
+	button.secButton.pvp:SetPoint("BOTTOMRIGHT", button.secButton.icon, "BOTTOMRIGHT", -3, 3)
+	button.secButton.pvp:SetHeight(13)
+	button.secButton.pvp:SetWidth(13)
+	button.secButton.pvp:SetDrawLayer(button.secButton.icon:GetDrawLayer(), 1)
+	button.secButton.pvp:Hide()
+
 	button.secButton.phaseIndicator = button.secButton:CreateTexture(buttonName.."_phaseIndicator", "OVERLAY")
 	button.secButton.phaseIndicator:SetPoint("TOPLEFT", button.secButton.icon)
 	button.secButton.phaseIndicator:SetPoint("BOTTOMRIGHT", button.secButton.icon)
@@ -425,6 +432,13 @@ function Button:CreateSecOnly(frame)
 	button.secButton.count:SetText(15)
 	button.secButton.count:Hide()
 
+	button.secButton.pvp = button.secButton:CreateTexture(buttonName.."_secButtonPvp")
+	button.secButton.pvp:SetPoint("BOTTOMRIGHT", button.secButton.icon, "BOTTOMRIGHT", -3, 3)
+	button.secButton.pvp:SetHeight(13)
+	button.secButton.pvp:SetWidth(13)
+	button.secButton.pvp:SetDrawLayer(button.secButton.icon:GetDrawLayer(), 1)
+	button.secButton.pvp:Hide()
+
 	button.secButton.phaseIndicator = button.secButton:CreateTexture(buttonName.."_phaseIndicator", "OVERLAY")
 	button.secButton.phaseIndicator:SetPoint("TOPLEFT", button.secButton.icon)
 	button.secButton.phaseIndicator:SetPoint("BOTTOMRIGHT", button.secButton.icon)

diff --git a/AtlasLootClassic/Button/Item_type.lua b/AtlasLootClassic/Button/Item_type.lua
@@ -254,6 +254,7 @@ function Item.OnClear(button)
 	button.secButton.ItemString = nil
 	button.secButton.SetData = nil
 	button.secButton.RawName = nil
+	button.secButton.pvp:Hide()
 
 	itemIsOnEnter = nil
 	buttonOnEnter = nil
@@ -280,6 +281,11 @@ function Item.Refresh(button)
 
 	if button.type == "secButton" then
 		button:SetNormalTexture(itemTexture or DUMMY_ITEM_ICON)
+
+		if Requirements.HasPvPRequirements(itemID) then
+			button.pvp:SetTexture(Requirements.GetPvPRankIconForItem(itemID))
+			button.pvp:Show()
+		end
 	else
 		-- ##################
 		-- icon

diff --git a/AtlasLootClassic/Data/Profession.lua b/AtlasLootClassic/Data/Profession.lua
@@ -563,7 +563,7 @@ local PROFESSION = {
     [10570] =  	{ 8208,  	3,  	250,  	270,  	290,  	{4304,8154,8343}, {10,20,2} }, -- Tough Scorpid Helm
     [9918] =  	{ 7964,  	2,  	200,  	200,  	210,  	{7912}, {1} }, -- Solid Sharpening Stone
     [9921] =  	{ 7965,  	2,  	200,  	200,  	210,  	{7912,4306}, {1,1} }, -- Solid Weightstone
-    [9273] =  	{ 7148,  	9,  	165,  	160,  	200,  	{3575,4375,814,4306,1210,7191}, {6,2,2,2,2,1} }, -- Goblin Jumper Cables
+    [9273] =  	{ 7148,  	9,  	165,  	165,  	200,  	{3575,4375,814,4306,1210,7191}, {6,2,2,2,2,1} }, -- Goblin Jumper Cables
     [9916] =  	{ 7963,  	2,  	200,  	225,  	250,  	{3859,3486}, {16,3} }, -- Steel Breastplate
     [9952] =  	{ 7928,  	2,  	225,  	245,  	265,  	{3860,6037,4304}, {12,1,6} }, -- Ornate Mithril Shoulders
     [9920] =  	{ 7966,  	2,  	200,  	200,  	210,  	{7912}, {4} }, -- Solid Grinding Stone
@@ -1157,14 +1157,14 @@ local PROFESSION = {
     [23799] =  	{ nil,  	10,  	290,  	310,  	350,  	{14344,16203,16204,7076}, {6,6,4,2} }, -- Enchant Weapon - Strength
     [23800] =  	{ nil,  	10,  	290,  	310,  	350,  	{14344,16203,16204,7082}, {6,6,4,2} }, -- Enchant Weapon - Agility
     [24136] =  	{ 19690,  	2,  	300,  	320,  	340,  	{12359,19774,19726,7910}, {20,10,2,2} }, -- Bloodsoul Breastplate
-    [23489] =  	{ 18986,  	9,  	1,  	285,  	305,  	{3860,18631,7075,7079,7909,9060}, {12,2,4,2,4,1} }, -- Ultrasafe Transporter - Gadgetzan
+    [23489] =  	{ 18986,  	9,  	260,  	285,  	305,  	{3860,18631,7075,7079,7909,9060}, {12,2,4,2,4,1} }, -- Ultrasafe Transporter - Gadgetzan
     [23652] =  	{ 19168,  	2,  	300,  	320,  	340,  	{17011,17010,12360,11371,12809}, {6,6,10,6,12} }, -- Blackguard
     [23708] =  	{ 19157,  	3,  	300,  	320,  	340,  	{17010,17011,17012,12607,15407,14227}, {5,2,4,4,4,4} }, -- Chromatic Gauntlets
     [23079] =  	{ 18637,  	9,  	275,  	285,  	295,  	{16000,18631,14047}, {2,1,2} }, -- Major Recombobulator
     [23709] =  	{ 19162,  	3,  	300,  	320,  	340,  	{17010,17012,12810,15407,14227}, {8,12,10,4,4} }, -- Corehound Belt
     [23801] =  	{ nil,  	10,  	290,  	310,  	350,  	{16204,16203,7080}, {16,4,2} }, -- Enchant Bracer - Mana Regeneration
     [23703] =  	{ 19044,  	3,  	290,  	310,  	330,  	{8170,12804,12803,15407,14341}, {30,2,4,2,2} }, -- Might of the Timbermaw
-    [23486] =  	{ 18984,  	9,  	1,  	285,  	305,  	{3860,18631,7077,7910,10586}, {10,1,4,2,1} }, -- Dimensional Ripper - Everlook
+    [23486] =  	{ 18984,  	9,  	260,  	285,  	305,  	{3860,18631,7077,7910,10586}, {10,1,4,2,1} }, -- Dimensional Ripper - Everlook
     [23636] =  	{ 19148,  	2,  	300,  	320,  	340,  	{17011,17010,11371}, {4,2,4} }, -- Dark Iron Helm
     [23637] =  	{ 19164,  	2,  	300,  	320,  	340,  	{17011,17010,17012,11371,11382}, {3,5,4,4,2} }, -- Dark Iron Gauntlets
     [22902] =  	{ 18486,  	8,  	300,  	315,  	345,  	{14048,14342,13926,14341}, {6,4,2,2} }, -- Mooncloth Robe

diff --git a/AtlasLootClassic/Data/Requirements.lua b/AtlasLootClassic/Data/Requirements.lua
@@ -2249,7 +2249,12 @@ local ReqData = {
 	[21560] = {32767},
 	[21561] = {32767},
 	[21562] = {32767},
+	[21563] = {-1136},
 	[21564] = {32767},
+	[21565] = {-48},
+	[21566] = {-48},
+	[21567] = {-1521},
+	[21568] = {-1521},
 	[21569] = {32767},
 	[21570] = {32767},
 	[21571] = {32767},
@@ -3050,13 +3055,26 @@ end
 
 function Requirements.GetPvPRankInfo(rank, faction)
 	faction = faction or PLAYER_FACTION
-	return PVP_RANK[faction == HORDE and 1 or 2], PVP_RANK[3]
+	return PVP_RANK[faction == HORDE and 1 or 2], PVP_RANK[rank][3]
+end
+
+function Requirements.GetPvPRankIcon(rank)
+	return PVP_RANK[rank][3]
+end
+
+function Requirements.GetPvPRankIconForItem(itemID)
+	if not ReqData[itemID] then return end
+	return PVP_RANK[ReqData[itemID][2]][3]
 end
 
 function Requirements.HasRequirements(itemID)
 	return ReqData[itemID] and true or false
 end
 
+function Requirements.HasPvPRequirements(itemID)
+	return ( ReqData[itemID] and ReqData[itemID][2] ) and true or false
+end
+
 function Requirements.GetReqString(itemID, noClass, noPvP)
 	local ret = ""
 	local data = ReqData[itemID]
@@ -3069,4 +3087,4 @@ function Requirements.GetReqString(itemID, noClass, noPvP)
 		end
 		return ret
 	end
-end
+end
diff --git a/AtlasLootClassic/Data/Token.lua b/AtlasLootClassic/Data/Token.lua
@@ -147,11 +147,19 @@ local TOKEN = {
 	[22362] = { 22443, 22495, 22471, 22424 },	-- Desecrated Wristguards
 
 	-- Gem Sacks
-	[17962] = { 12361, 1529, 7909, 7910, 3864, 7971, 13926, type = 2 },			-- Blue Sack of Gems
-	[17963] = { 12364, 1529, 7909, 7910, 3864, 7971, 13926, type = 2 },			-- Green Sack of Gems
-	[17964] = { 12800, 1529, 7909, 7910, 3864, 7971, 13926, type = 2 },			-- Gray Sack of Gems
-	[17965] = { 12363, 1529, 7909, 7910, 3864, 7971, 13926, type = 2 },			-- Yellow Sack of Gems
-	[17969] = { 6332, 12799, 1529, 7909, 7910, 3864, 7971, 13926, type = 2 },	-- Red Sack of Gems
+	[17962] = { 12361, 7971, 13926, {1529, "1-2"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, type = 2 },		-- Blue Sack of Gems
+	[17963] = { 12364, 7971, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, type = 2 },			-- Green Sack of Gems
+	[17964] = { 12800, 7971, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, type = 2 },			-- Gray Sack of Gems
+	[17965] = { 12363, 7971, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, type = 2 },			-- Yellow Sack of Gems
+	[17969] = { 12799, 7971, 13926, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, type = 2 },		-- Red Sack of Gems
+	[11938] = {
+		17962, 12361, 7971, 13926, {1529, "1-2"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, 0,
+		17963, 12364, 7971, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, 0,
+		17964, 12800, 7971, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, 0,
+		17965, 12363, 7971, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"}, 0,
+		17969, 12799, 7971, 13926, {1529, "1-3"}, {7909, "1-3"}, {7910, "1-3"}, {3864, "1-3"},
+		type = 2,
+	},
 
 	-- Misc Bags
 	[21156] = { 20858, 20859, 20860, 20861, 20862, 20863, 20864, 20865, type = 2 },						-- Scarab Bag
@@ -197,6 +205,7 @@ local TOKEN = {
 	[7666] = { 7673, type = 3 }, -- Shattered Necklace
 	[19003] = { 19383, 19384, 19366, type = 3 }, -- Head of Nefarian
 	[18423] = { 18404, 18403, 18406, type = 3 }, -- Head of Onyxia
+	[20644] = { 20600, type = 3 }, -- Shrouded in Nightmare
 
 	-- Quest objective
 	[18705] = { 18713, type = 4 }, -- Mature Black Dragon Sinew

diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,14 @@
 
 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.4.0 (Dec. 01, 2019)
+
+- New: Items now show class / PvP rank icons
+- Add PvP Non set armor
+- Set Panzor in BRD as rare
+- Add level for Avatar of Hakkar
+- Fix bug with empty boss names
+
 ## v1.3.5 (Nov. 30, 2019)
 
 - add Phase 2.5 for PvP

diff --git a/AtlasLootClassic/GUI/GUI.lua b/AtlasLootClassic/GUI/GUI.lua
@@ -225,11 +225,11 @@ local function FrameOnShow(self)
 	if (AtlasLoot.db.enableAutoSelect) then
 		local module, instance, boss = AtlasLoot.Data.AutoSelect:GetCurrrentPlayerData()
 		local pass = false
-		if module ~= db.selected[1] then
+		if module and module ~= db.selected[1] then
 			self.moduleSelect:SetSelected(module)
 			pass = true
 		end
-		if ( pass and instance ) or ( instance ~= db.selected[2] ) then
+		if ( pass and instance ) or ( instance and instance ~= db.selected[2] ) then
 			if instance ~= db.selected[2] then
 				pass = true
 			else

diff --git a/AtlasLootClassic_Data/source.lua b/AtlasLootClassic_Data/source.lua
@@ -2159,10 +2159,14 @@ local SOURCE_DATA = {
 		[17771] = {[3] = 10,[4] = 22967},
 		[17780] = {16,11,1},
 		[17943] = {16,8,1},
-		[17962] = {{28,1,1},{30,8,1}},
+		[17962] = {{[1] = 26,[3] = 1},{28,1,1},{30,8,1}},
+		[17963] = {{[1] = 26,[3] = 1},{28,1,1},{30,8,1}},
+		[17964] = {{[1] = 26,[3] = 1},{28,1,1},{30,8,1}},
+		[17965] = {{[1] = 26,[3] = 1},{28,1,1},{30,8,1}},
 		[17966] = {28,1,1},
 		[17967] = {[3] = 7,[4] = 22430},
 		[17968] = {[3] = 13,[4] = 22434},
+		[17969] = {{[1] = 26,[3] = 1},{28,1,1},{30,8,1}},
 		[18043] = {18,20,1},
 		[18044] = {18,20,1},
 		[18045] = {[3] = 9,[4] = 22480},
@@ -2785,7 +2789,7 @@ local SOURCE_DATA = {
 		[20295] = {[3] = 6,[4] = 24654},
 		[20296] = {[3] = 6,[4] = 24655},
 		[20380] = {[3] = 6,[4] = 24703},
-		[20381] = {{26,3,1},{26,4,1},{26,5,1},{26,6,1}},
+		[20381] = {26,3,1},
 		[20383] = {30,3,1},
 		[20452] = {[3] = 9,[4] = 24801},
 		[20476] = {[3] = 6,[4] = 24849},

diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua
@@ -4925,6 +4925,13 @@ data["WorldBosses"] = {
 				{ 9,  18202 }, -- Eskhandar's Left Claw
 				{ 10, 18542 }, -- Typhoon
 				{ 16, 18704 }, -- Mature Blue Dragon Sinew
+				{ 18, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 		{ -- KKazzak
@@ -4947,6 +4954,13 @@ data["WorldBosses"] = {
 				{ 9,  17112 }, -- Empyrean Demolisher
 				{ 10, 17113 }, -- Amberseal Keeper
 				{ 16, 18665 }, -- The Eye of Shadow
+				{ 18, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 		{ -- DLethon
@@ -4974,7 +4988,14 @@ data["WorldBosses"] = {
 				{ 17, 20600 }, -- Malfurion's Signet Ring
 				{ 24, 20580 }, -- Hammer of Bestial Fury
 				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
+				{ 29, 20381 }, -- Dreamscale
+				{ 30, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 		{ -- DEmeriss
@@ -5001,7 +5022,13 @@ data["WorldBosses"] = {
 				{ 17, 20600 }, -- Malfurion's Signet Ring
 				{ 24, 20580 }, -- Hammer of Bestial Fury
 				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
+				{ 30, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 		{ -- DTaerar
@@ -5028,7 +5055,13 @@ data["WorldBosses"] = {
 				{ 17, 20600 }, -- Malfurion's Signet Ring
 				{ 24, 20580 }, -- Hammer of Bestial Fury
 				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
+				{ 30, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 		{ -- DYsondre
@@ -5056,7 +5089,13 @@ data["WorldBosses"] = {
 				{ 17, 20600 }, -- Malfurion's Signet Ring
 				{ 24, 20580 }, -- Hammer of Bestial Fury
 				{ 25, 20581 }, -- Staff of Rampant Growth
-				{ 30, 20381 }, -- Dreamscale
+				{ 30, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 	}
@@ -5436,7 +5475,13 @@ data["Onyxia"] = {
 				{ 23, 17068 }, -- Deathbringer
 				{ 24, 17075 }, -- Vis'kag the Bloodletter
 				{ 26, 17966 }, -- Onyxia Hide Backpack
-				{ 27, 17962 }, -- Blue Sack of Gems
+				{ 27, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 	},
@@ -6065,7 +6110,13 @@ data["BlackwingLair"] = {
 				{ 26, 19376 }, -- Archimtiros' Ring of Reckoning
 				{ 27, 19382 }, -- Pure Elementium Band
 				{ 28, 19379 }, -- Neltharion's Tear
-				{ 30, 17962 }, -- Blue Sack of Gems
+				{ 30, 11938 }, -- Sack of Gems
+				-- Hidden items
+				{ 0, 17962 }, -- Blue Sack of Gems
+				{ 0, 17963 }, -- Green Sack of Gems
+				{ 0, 17964 }, -- Gray Sack of Gems
+				{ 0, 17965 }, -- Yellow Sack of Gems
+				{ 0, 17969 }, -- Red Sack of Gems
 			},
 		},
 		{ -- BWLTrashMobs