update

AsphyxiaUI/AsphyxiaUI.toc

@@ -1,11 +1,12 @@
 ## Interface: 50001
 ## Title: AsphyxiaUI - Core
 ## Notes:
-## Version: 6.0
-## Author: Sinaris, Merith
-## SavedVariablesPerCharacter: AsphyxiaUISaved
+## Version: 6.0.0
+## Author: Sinaris
+## SavedVariablesPerCharacter: AsphyxiaUISaved, ClickCast
 ## RequiredDeps: AsphyxiaUI_Config, Tukui
 ## OptionalDeps: Blizzard_CombatText, !ClassColors, Clique, DBM-Core, Omen, Recount, Skada, TinyDPS
 ## X-oUF: oUFTukui
+## Website: www.natias.de
 
 AsphyxiaUI_Loader.xml

AsphyxiaUI/Core/API.lua

@@ -24,20 +24,6 @@ local function Animate( self, x, y, duration )
 	self.anim.out1:SetScript( "OnFinished", function() self:Hide() end )
 end
 
-local function CreateBorder( self, shadow )
-	if( self:GetFrameStrata() == "BACKGROUND" ) then self:SetFrameStrata( "LOW" ) end
-
-	local border = CreateFrame( "Frame", nil, self )
-	border:SetPoint( "TOPLEFT", self, "TOPLEFT", S.Scale( -2 ), S.Scale( 2 ) )
-	border:SetPoint( "BOTTOMRIGHT", self, "BOTTOMRIGHT", S.Scale( 2 ), S.Scale( -2 ) )
-	border:SetTemplate( "Default" )
-
-	if( shadow == true ) then
-		border:CreateShadow( "Default" )
-	end
-	border:SetFrameLevel( self:GetFrameLevel() )
-end
-
 local function CreateOverlay( frame )
 	if( frame.overlay ) then return end
 

AsphyxiaUI/Core/Filter/Announce.lua

@@ -0,0 +1,36 @@
+---------------------------------------------------------------------------------------------
+-- Project: AsphyxiaUI Version 6.0
+---------------------------------------------------------------------------------------------
+
+local S, C, L, G = unpack( Tukui )
+
+S.AnnounceSpells = {
+	[20707] = true,
+	[20484] = true,
+	[61999] = true,
+
+	[2565] = true,
+	[871] = true,
+	[12975] = true,
+	[114207] = true,
+
+	[47788] = true,
+	[33206] = true,
+
+	[34477] = "player",
+
+	[115176] = true,
+	[115203] = true,
+	[115213] = true,
+
+	[48707] = true,
+	[55233] = true,
+	[48792] = true,
+
+	[31850] = true,
+	[498] = true,
+	[642] = true,
+
+	[106922] = true,
+	[61336] = true,
+}

AsphyxiaUI/Core/Filter/CombatText.lua

@@ -24,46 +24,44 @@ if( S.myclass == "WARLOCK" ) then
 		S.aoespam[30108] = true
 		S.aoespam[348] = true
 		S.aoespam[980] = true
-		S.aoespam[85455] = true
-		S.aoespam[85421] = true
+		S.aoespam[80240] = true
 		S.aoespam[42223] = true
+		S.aoespam[689] = true
+		S.aoespam[89420] = true
 		S.aoespam[5857] = true
-		S.aoespam[47897] = true
+		S.aoespam[129476] = true
+		S.aoespam[103103] = true
+		S.aoespam[86040] = true
+		S.aoespam[124915] = true
 		S.aoespam[47960] = true
 		S.aoespam[50590] = true
 		S.aoespam[30213] = true
 		S.aoespam[89753] = true
 		S.aoespam[20153] = true
-		S.aoespam[129476] = true
-		S.aoespam[124915] = true
-		S.aoespam[115422] = true
-		S.aoespam[86040] = true
-		S.aoespam[115832] = true
-		S.aoespam[115625] = true
-		S.aoespam[104318] = true
+		S.aoespam[103988] = true
+		S.aoespam[108371] = true
+		S.aoespam[115707] = true
 	end
 	if( C["combattext"]["healing"] == true ) then
-		S.healfilter[28176] = true
-		S.healfilter[96379] = true
 		S.healfilter[63106] = true
-		S.healfilter[54181] = true
 		S.healfilter[89653] = true
-		S.healfilter[79268] = true
-		S.healfilter[30294] = true
+		S.healfilter[125314] = true
+		S.healfilter[108366] = true
+		S.healfilter[108359] = true
 	end
 elseif( S.myclass == "DRUID" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[774] = true
-		S.aoespam[64801] = true
 		S.aoespam[48438] = true
 		S.aoespam[8936] = true
 		S.aoespam[33763] = true
 		S.aoespam[44203] = true
 		S.aoespam[81269] = true
+		S.aoespam[102792] = true
 		S.aoespam[8921] = true
 		S.aoespam[93402] = true
-		S.aoespam[5570] = true
 		S.aoespam[42231] = true
+		S.aoespam[106998] = true
 		S.aoespam[50288] = true
 		S.aoespam[78777] = true
 		S.aoespam[61391] = true
@@ -73,21 +71,20 @@ elseif( S.myclass == "DRUID" ) then
 		S.aoespam[62078] = true
 		S.aoespam[779] = true
 		S.aoespam[33745] = true
+		S.aoespam[77758] = true
 		S.aoespam[1079] = true
 	end
 elseif( S.myclass == "PALADIN" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
-		S.aoespam[20167] = true	
-		S.aoespam[94289] = true
+		S.aoespam[20167] = true
 		S.aoespam[53652] = true
 		S.aoespam[85222] = true
 		S.aoespam[82327] = true
-		S.aoespam[86452] = true
+		S.aoespam[121129] = true
 		S.aoespam[81297] = true
-		S.aoespam[2812] = true
+		S.aoespam[119072] = true
 		S.aoespam[53385] = true
 		S.aoespam[31803] = true
-		S.aoespam[20424] = true
 		S.aoespam[42463] = true
 		S.aoespam[101423] = true
 		S.aoespam[88263] = true
@@ -97,31 +94,29 @@ elseif( S.myclass == "PALADIN" ) then
 elseif( S.myclass == "PRIEST" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[47750] = true
+		S.aoespam[23455] = true
 		S.aoespam[139] = true
 		S.aoespam[596] = true
-		S.aoespam[56161] = true
 		S.aoespam[64844] = true
 		S.aoespam[32546] = true
 		S.aoespam[77489] = true
 		S.aoespam[34861] = true
-		S.aoespam[23455] = true
 		S.aoespam[33110] = true
 		S.aoespam[63544] = true
 		S.aoespam[81751] = true
-		S.aoespam[94472] = true
+		S.aoespam[94472] = 81751
 		S.aoespam[47666] = true
-		S.aoespam[15237] = true
+		S.aoespam[132157] = true
 		S.aoespam[589] = true
 		S.aoespam[34914] = true
 		S.aoespam[2944] = true
-		S.aoespam[63675] = true
 		S.aoespam[15407] = true
 		S.aoespam[49821] = true
 		S.aoespam[87532] = true
 		S.aoespam[14914] = true
 	end
 	if( C["combattext"]["healing"] == true ) then
-		S.healfilter[2944] = true
+		S.healfilter[127626] = true
 		S.healfilter[15290] = true
 	end
 elseif( S.myclass == "SHAMAN" ) then
@@ -131,8 +126,10 @@ elseif( S.myclass == "SHAMAN" ) then
 		S.aoespam[1064] = true
 		S.aoespam[51945] = true
 		S.aoespam[61295] = true
-		S.aoespam[61295] = true
 		S.aoespam[98021] = true
+		S.aoespam[114911] = true
+		S.aoespam[118800] = true
+		S.aoespam[114942] = true
 		S.aoespam[421] = true
 		S.aoespam[45297] = true
 		S.aoespam[8349] = true
@@ -141,76 +138,85 @@ elseif( S.myclass == "SHAMAN" ) then
 		S.aoespam[8187] = true
 		S.aoespam[8050] = true
 		S.aoespam[25504] = true
+		S.aoespam[3606] = true
 	end
 elseif( S.myclass == "MAGE" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
-		S.aoespam[44461] = true
 		S.aoespam[44457] = true
+		S.aoespam[44461] = true
 		S.aoespam[2120] = true
 		S.aoespam[12654] = true
 		S.aoespam[11366] = true
 		S.aoespam[31661] = true
 		S.aoespam[42208] = true
 		S.aoespam[122] = true
 		S.aoespam[1449] = true
-		S.aoespam[92315] = true
 		S.aoespam[83853] = true
 		S.aoespam[11113] = true
-		S.aoespam[88148] = true
-		S.aoespam[84721] = true
-		S.aoespam[82739] = true
-		S.aoespam[83619] = true
 		S.aoespam[120] = true
+		S.aoespam[114923] = true
+		S.aoespam[114954] = true
+		S.aoespam[7268] = true
+		S.aoespam[113092] = true
+		S.aoespam[44425] = true
+		S.aoespam[84721] = true
 	end
 elseif( S.myclass == "WARRIOR" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[845] = true
 		S.aoespam[46968] = true
 		S.aoespam[6343] = true
 		S.aoespam[1680] = true
-		S.aoespam[94009] = true
-		S.aoespam[12721] = true
+		S.aoespam[115767] = true
 		S.aoespam[50622] = true
 		S.aoespam[52174] = true
+		S.aoespam[118000] = true
+		S.aoespam[76858] = true
 	end
 	if( C["combattext"]["healing"] == true ) then
-		S.healfilter[23880] = true
+		S.healfilter[117313] = true
 		S.healfilter[55694] = true
 	end
 elseif( S.myclass == "HUNTER" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[2643] = true
 		S.aoespam[83077] = true
-		S.aoespam[88453] = true
-		S.aoespam[88466] = true
-		S.aoespam[1978] = true
+		S.aoespam[118253] = true
 		S.aoespam[13812] = true
 		S.aoespam[53301] = true
+		S.aoespam[63468] = true
+		S.aoespam[118459] = true
+		S.aoespam[120699] = true
+		S.aoespam[131900] = true
+		S.aoespam[34655] = true
 	end
 elseif( S.myclass == "MONK" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[115175] = true
 		S.aoespam[125953] = 115175
 		S.aoespam[126890] = true
 		S.aoespam[117640] = true
+		S.aoespam[132463] = true
+		S.aoespam[124101] = true
 		S.aoespam[117952] = true
-		S.aoespam[107270] = true
-		S.aoespam[101546] = true
-		S.aoespam[128531] = true
 		S.aoespam[117418] = true
+		S.aoespam[120274] = true
+		S.aoespam[128531] = true
+		S.aoespam[123725] = true
+		S.aoespam[107270] = true
+		S.aoespam[132467] = true
+		S.aoespam[125033] = true
+		S.aoespam[123586] = true
 	end
 elseif( S.myclass == "DEATHKNIGHT" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[55095] = true
 		S.aoespam[55078] = true
-		S.aoespam[55536] = true
 		S.aoespam[48721] = true
 		S.aoespam[49184] = true
 		S.aoespam[52212] = true
-		S.aoespam[47541] = true
 		S.aoespam[55050] = true
-		S.aoespam[98957] = true
-		S.aoespam[59754] = true
+		S.aoespam[119980] = true
 		S.aoespam[49020] = true
 		S.aoespam[66198] = 49020
 		S.aoespam[49998] = true
@@ -219,14 +225,12 @@ elseif( S.myclass == "DEATHKNIGHT" ) then
 		S.aoespam[66216] = 45462
 		S.aoespam[49143] = true
 		S.aoespam[66196] = 49143
-		S.aoespam[56815] = true
-		S.aoespam[66217] = 56815
-		S.aoespam[45902] = true
-		S.aoespam[66215] = 45902
 	end
 elseif( S.myclass == "ROGUE" ) then
 	if( C["combattext"]["mergeaoespam"] == true ) then
 		S.aoespam[51723] = true
+		S.aoespam[121411] = true
+		S.aoespam[122233] = true
 		S.aoespam[2818] = true
 		S.aoespam[8680] = true
 		S.aoespam[5374] = true

AsphyxiaUI/Core/Functions.lua

@@ -4,6 +4,8 @@
 
 local S, C, L, G = unpack( Tukui )
 
+S.ClassColor = RAID_CLASS_COLORS[S.myclass]
+
 S.CreateFontString = function( normalfont )
 	if( normalfont ) then
 		return C["media"]["font"], 12, "THINOUTLINE"
@@ -17,15 +19,13 @@ S.CreateFontString = function( normalfont )
 end
 
 function S.SetModifiedBackdrop( self )
-	local color = RAID_CLASS_COLORS[S.myclass]
-	self:SetBackdropColor( color.r * 0.15, color.g * 0.15, color.b * 0.15 )
-	self:SetBackdropBorderColor( color.r, color.g, color.b )
+	self:SetBackdropColor( S.ClassColor.r * 0.15, S.ClassColor.g * 0.15, S.ClassColor.b * 0.15 )
+	self:SetBackdropBorderColor( S.ClassColor.r, S.ClassColor.g, S.ClassColor.b )
 end
 
 function S.SetOriginalBackdrop( self )
-	local color = RAID_CLASS_COLORS[S.myclass]
 	if( C["general"]["classcolortheme"] == true ) then
-		self:SetBackdropBorderColor( color.r, color.g, color.b )
+		self:SetBackdropBorderColor( S.ClassColor.r, S.ClassColor.g, S.ClassColor.b )
 	else
 		self:SetTemplate( "Default" )
 	end
@@ -56,7 +56,7 @@ function S.update_alpha( self )
 end
 
 function S.fadeOut( self )
-	UIFrameFadeOut( self, .4, 1, 0 )
+	UIFrameFadeOut( self, 0.4, 1, 0 )
 	self.frame:Show()
 end
 
@@ -67,7 +67,7 @@ function S.fadeIn( p )
 	p.frame:SetScript( "OnUpdate", S.update_alpha )
 	p:SetScript( "OnShow", function()
 		p.frame:Hide()
-		UIFrameFadeIn( p, .4, 0, 1 )
+		UIFrameFadeIn( p, 0.4, 0, 1 )
 	end )
 	p.fadeOut = S.fadeOut
 end

AsphyxiaUI/Core/load_core.xml

@@ -7,5 +7,6 @@
 	<Script file="Kill.lua" />
 	<Script file="Install.lua" />
 
+	<Script file="Filter\Announce.lua" />
 	<Script file="Filter\CombatText.lua" />
 </Ui>