Merge branch 'main' into ptr

Author: kodewdle

ElvUI/Core/General/Core.lua

@@ -72,7 +72,7 @@ E.physicalWidth, E.physicalHeight = GetPhysicalScreenSize()
 E.screenWidth, E.screenHeight = GetScreenWidth(), GetScreenHeight()
 E.resolution = format('%dx%d', E.physicalWidth, E.physicalHeight)
 E.perfect = 768 / E.physicalHeight
-E.allowRoles = E.Retail or E.Cata or E.ClassicAnniv or E.ClassicAnnivHC
+E.allowRoles = E.Retail or E.Cata or E.ClassicAnniv or E.ClassicAnnivHC or E.ClassicSOD
 E.NewSign = [[|TInterface\OptionsFrame\UI-OptionsFrame-NewFeatureIcon:14:14|t]]
 E.NewSignNoWhatsNew = [[|TInterface\OptionsFrame\UI-OptionsFrame-NewFeatureIcon:14:14:0:0|t]]
 E.TexturePath = [[Interface\AddOns\ElvUI\Media\Textures\]] -- for plugins?

ElvUI/Core/Modules/Blizzard/AlertFrame.lua

@@ -165,6 +165,7 @@ function BL:AlertMovers()
 		/run MoneyWonAlertSystem:AddAlert(81500)
 		/run NewRecipeLearnedAlertSystem:AddAlert(204)
 		/run NewCosmeticAlertFrameSystem:AddAlert(204)
+		/run NewWarbandSceneAlertSystem:AddAlert(1)
 
 		--Simple Alerts
 		/run GuildChallengeAlertSystem:AddAlert(3, 2, 5)

ElvUI/Core/Modules/UnitFrames/Groups/Party.lua

@@ -41,9 +41,12 @@ function UF:Construct_PartyFrames()
 		self.ReadyCheckIndicator = UF:Construct_ReadyCheckIcon(self)
 		self.HealthPrediction = UF:Construct_HealComm(self)
 
+		if E.allowRoles then
+			self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
+		end
+
 		if not E.Classic then
 			self.PvPClassificationIndicator = UF:Construct_PvPClassificationIndicator(self) -- Cart / Flag / Orb / Assassin Bounty
-			self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
 			self.AlternativePower = UF:Construct_AltPowerBar(self)
 			self.ClassBar = 'AlternativePower'
 		end

ElvUI/Core/Modules/UnitFrames/Groups/Raid.lua

@@ -36,9 +36,12 @@ function UF:Construct_RaidFrames()
 	self.Cutaway = UF:Construct_Cutaway(self)
 	self.PrivateAuras = UF:Construct_PrivateAuras(self)
 
+	if E.allowRoles then
+		self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
+	end
+
 	if not E.Classic then
 		self.PvPClassificationIndicator = UF:Construct_PvPClassificationIndicator(self) -- Cart / Flag / Orb / Assassin Bounty
-		self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
 		self.AlternativePower = UF:Construct_AltPowerBar(self)
 		self.ClassBar = 'AlternativePower'
 	end

ElvUI/Core/Modules/UnitFrames/UnitFrames.lua

@@ -1357,8 +1357,11 @@ do
 		if iconRoles[which] then
 			UF:Configure_ReadyCheckIcon(frame)
 
-			if not E.Classic then
+			if E.allowRoles then
 				UF:Configure_RoleIcon(frame)
+			end
+
+			if not E.Classic then
 				UF:Configure_SummonIcon(frame)
 				UF:Configure_AltPowerBar(frame)
 			end

ElvUI/Mainline/Filters/Filters.lua

@@ -911,6 +911,7 @@ G.unitframe.aurafilters.RaidDebuffs = {
 		[260829] = List(), -- Homing Missle (travelling)
 		[260838] = List(), -- Homing Missle (exploded)
 		[263637] = List(), -- Clothesline
+		[262347] = List(), -- Static Pulse
 	-- Theater of Pain
 		[333299] = List(), -- Curse of Desolation 1
 		[333301] = List(), -- Curse of Desolation 2
@@ -928,6 +929,7 @@ G.unitframe.aurafilters.RaidDebuffs = {
 		[319626] = List(), -- Phantasmal Parasite
 		[324449] = List(), -- Manifest Death
 		[341949] = List(), -- Withering Blight
+		[1223804] = List(), -- Well of Darkness
 	-- Operation Mechagon: Workshop
 		[291928] = List(), -- Giga-Zap
 		[292267] = List(), -- Giga-Zap
@@ -961,21 +963,31 @@ G.unitframe.aurafilters.RaidDebuffs = {
 		[459669] = List(), -- Spew Oil
 	-- Cauldron of Carnage
 		[1213690] = List(), -- Molten Phlegm
+		[1214009] = List(), -- Voltaic Image
 	-- Rik Reverb
 		[1217122] = List(), -- Lingering Voltage
+		[468119] = List(), -- Resonant Echoes
+		[467044] = List(), -- Faulty Zap
 	-- Stix Bunkjunker
 		[461536] = List(), -- Rolling Rubbish
 		[1217954] = List(), -- Meltdown
 		[465346] = List(), -- Sorted
+		[466748] = List(), -- Infected Bite
 	-- Sprocketmonger Lockenstock
 		[1218342] = List(), -- Unstable Shrapnel
 		[465917] = List(), -- Gravi-Gunk
+		[471308] = List(), -- Blisterizer Mk. II
 	-- The One-Armed Bandit
 		[471927] = List(), -- Withering Flames
 		[460420] = List(), -- Crushed!
 	-- Mug'Zee, Heads of Security
 		[4664769] = List(), -- Frostshatter Boots
+		[466509] = List(), -- Stormfury Finger Gun
+		[1215488] = List(), -- Disintegration Beam (Actually getting beamed)
 	-- Chrome King Gallywix
+		[466154] = List(4), -- Blast Burns
+		[466834] = List(6), -- Shock Barrage
+		[469362] = List(6), -- Charged Giga Bomb (Carrying)
 	---------------------------------------------------------
 	------------------- Nerub'ar Palace ---------------------
 	---------------------------------------------------------

ElvUI/Mainline/Modules/Skins/Alerts.lua

@@ -757,7 +757,7 @@ local function SkinNewRecipeLearnedAlert(frame)
 	end
 end
 
-local function SkinNewPetAlert(frame)
+local function SkinMiscAlerts(frame)
 	frame:SetAlpha(1)
 
 	if not frame.hooked then
@@ -826,13 +826,16 @@ function S:AlertSystem()
 	hooksecurefunc(_G.DigsiteCompleteAlertSystem, 'setUpFunction', SkinDigsiteCompleteAlert)
 	hooksecurefunc(_G.NewRecipeLearnedAlertSystem, 'setUpFunction', SkinNewRecipeLearnedAlert)
 
-	-- Pets/Mounts
-	hooksecurefunc(_G.NewPetAlertSystem, 'setUpFunction', SkinNewPetAlert)
-	hooksecurefunc(_G.NewMountAlertSystem, 'setUpFunction', SkinNewPetAlert)
-	hooksecurefunc(_G.NewToyAlertSystem, 'setUpFunction', SkinNewPetAlert)
+	-- Pets/Mounts/Toys
+	hooksecurefunc(_G.NewPetAlertSystem, 'setUpFunction', SkinMiscAlerts)
+	hooksecurefunc(_G.NewMountAlertSystem, 'setUpFunction', SkinMiscAlerts)
+	hooksecurefunc(_G.NewToyAlertSystem, 'setUpFunction', SkinMiscAlerts)
 
 	-- Cosmetics
-	hooksecurefunc(_G.NewCosmeticAlertFrameSystem, 'setUpFunction', SkinNewPetAlert)
+	hooksecurefunc(_G.NewCosmeticAlertFrameSystem, 'setUpFunction', SkinMiscAlerts)
+
+	-- Warband
+	hooksecurefunc(_G.NewWarbandSceneAlertSystem, 'setUpFunction', SkinMiscAlerts)
 
 	--Bonus Roll Money
 	local frame = _G.BonusRollMoneyWonFrame

ElvUI/Mainline/Modules/Skins/AuctionHouse.lua

@@ -306,6 +306,10 @@ local function LoadSkin()
 	ItemBuyFrame.BidFrame.BidButton:ClearAllPoints()
 	ItemBuyFrame.BidFrame.BidButton:Point('LEFT', ItemBuyFrame.BidFrame.BidAmount, 'RIGHT', 2, -2)
 
+	-- Did blizz do a whoopsi with this names?
+	S:HandleEditBox(_G.BidAmountGold)
+	S:HandleEditBox(_G.BidAmountSilver)
+
 	--[[ Item Sell Frame | TAB 2 ]]--
 	local SellFrame = Frame.ItemSellFrame
 	HandleSellFrame(SellFrame)