Quantcast

1.2 release

Steven Jackson [05-04-15 - 01:14]
1.2 release

-Dock buttons can be moved by [shift+click+drag] now
-Docks now save the last docklet you had open to reload when logging in
-Docks for other addons have bug fixes and have been improved in general
-Quest item bar has been tweaked to fix some errors and improve its layout
-Addons list is now styled
-The gold reading on the inventory frame now has a tooltip that will show totals for all server characters
-The frame moving tool now has an individual reset button that can be accessed when right-clicking a frame (aka the precision frame)
-Greatly improved nameplates and the use of threat coloring within them
-Revised some missing styles from various skins including PVP and LFD/LFG frames
-WorldStateCaptureBars updated
-More code cleanup.
Filename
SVUI_!Core/assets/textures/WorldState-CaptureBar.blp
SVUI_!Core/system/overrides.lua
SVUI_FightOMatic/SVUI_FightOMatic.lua
SVUI_NamePlates/SVUI_NamePlates.lua
SVUI_Skins/artwork/UI-LFG-ICON-ROLES.blp
SVUI_Skins/components/blizzard/alert.lua
SVUI_Skins/components/blizzard/lfd.lua
SVUI_Skins/components/blizzard/pvp.lua
diff --git a/SVUI_!Core/assets/textures/WorldState-CaptureBar.blp b/SVUI_!Core/assets/textures/WorldState-CaptureBar.blp
new file mode 100644
index 0000000..08c5650
Binary files /dev/null and b/SVUI_!Core/assets/textures/WorldState-CaptureBar.blp differ
diff --git a/SVUI_!Core/system/overrides.lua b/SVUI_!Core/system/overrides.lua
index 3e33a8b..291e0f9 100644
--- a/SVUI_!Core/system/overrides.lua
+++ b/SVUI_!Core/system/overrides.lua
@@ -856,15 +856,37 @@ local PVPRaidNoticeHandler = function(self, event, msg)
 end

 local CaptureBarHandler = function()
+	local lastFrame = SVUI_WorldStateHolder
+	local offset = 0;
+	if(NUM_ALWAYS_UP_UI_FRAMES) then
+		for i=1, NUM_ALWAYS_UP_UI_FRAMES do
+			local frame = _G["AlwaysUpFrame"..i]
+			if(frame and frame:IsVisible()) then
+				frame:ClearAllPoints()
+				frame:SetPoint("TOP", lastFrame, "TOP", 0, offset)
+				lastFrame = frame
+				offset = (-45 * i);
+			end
+		end
+	end
+
 	if(NUM_EXTENDED_UI_FRAMES) then
-		local lastFrame = SVUI_WorldStateHolder
-		local offset = 0;
 		for i=1, NUM_EXTENDED_UI_FRAMES do
-			local captureBar = _G["WorldStateCaptureBar"..i]
-			if(captureBar and captureBar:IsVisible()) then
-				captureBar:ClearAllPoints()
-				captureBar:SetPoint("TOP", lastFrame, "TOP", 0, offset)
-				lastFrame = captureBar
+			local name = "WorldStateCaptureBar"..i;
+			local frame = _G[name]
+			if(frame and frame:IsVisible()) then
+				if(_G[name .. "LeftBar"]) then _G[name .. "LeftBar"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "RightBar"]) then _G[name .. "RightBar"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "MiddleBar"]) then _G[name .. "MiddleBar"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "LeftLine"]) then _G[name .. "LeftLine"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "RightLine"]) then _G[name .. "RightLine"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "LeftIconHighlight"]) then _G[name .. "LeftIconHighlight"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "RightIconHighlight"]) then _G[name .. "RightIconHighlight"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "IndicatorLeft"]) then _G[name .. "IndicatorLeft"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				if(_G[name .. "IndicatorRight"]) then _G[name .. "IndicatorRight"]:SetTexture("Interface\\AddOns\\SVUI_!Core\\assets\\textures\\WorldState-CaptureBar") end
+				frame:ClearAllPoints()
+				frame:SetPoint("TOP", lastFrame, "TOP", 0, offset)
+				lastFrame = frame
 				offset = (-45 * i);
 			end
 		end
diff --git a/SVUI_FightOMatic/SVUI_FightOMatic.lua b/SVUI_FightOMatic/SVUI_FightOMatic.lua
index d773835..379c8da 100644
--- a/SVUI_FightOMatic/SVUI_FightOMatic.lua
+++ b/SVUI_FightOMatic/SVUI_FightOMatic.lua
@@ -455,7 +455,6 @@ function PLUGIN:PopulateKOS()
 end

 function PLUGIN:PopulateScans()
-	self.COMM.Unavailable:Hide()
 	self.Title:Clear();
 	self.Summary:Clear();
 	self.LOG.Output:Clear();
@@ -478,9 +477,6 @@ function PLUGIN:PopulateScans()
 			hasScans = true;
 		end
 	end
-	if(not hasScans) then
-		self.COMM.Unavailable:Show()
-	end
 end

 function PLUGIN:PauseScanner()
@@ -509,6 +505,7 @@ function PLUGIN:ScannerLog(enemy)
 end

 function PLUGIN:UpdateCommunicator()
+	self.COMM.Unavailable:Hide()
 	if(self.InPVP) then
 		self.COMM.Unavailable:Show()
 		for i = 1, 5 do
@@ -530,7 +527,6 @@ function PLUGIN:UpdateCommunicator()
 		if(mapID) then
 			local points = PVP_NODES[mapID]
 			if(points) then
-				self.COMM.Unavailable:Hide()
 				for i = 1, 5 do
 					local nodeName = ("SVUI_PVPNode%d"):format(i)
 					local node = _G[nodeName]
diff --git a/SVUI_NamePlates/SVUI_NamePlates.lua b/SVUI_NamePlates/SVUI_NamePlates.lua
index dfbb86d..11e2800 100644
--- a/SVUI_NamePlates/SVUI_NamePlates.lua
+++ b/SVUI_NamePlates/SVUI_NamePlates.lua
@@ -731,9 +731,7 @@ do
 		end

 		plate.setting.classToken = nil
-		if((r > 0.4) and (g > 0.4) and (b > 0.4)) then
-			return REACTION_COLORING[2]()
-		elseif(r + b < 0.25) then
+		if(r + b < 0.25) then
 			return REACTION_COLORING[3]()
 		else
 			local threatReaction = GetPlateThreatReaction(plate)
@@ -741,6 +739,8 @@ do
 				return REACTION_COLORING[4](threatReaction)
 			elseif(g + b < 0.25) then
 				return REACTION_COLORING[5](threatReaction)
+			elseif((r > 0.45 and r < 0.55) and (g > 0.45 and g < 0.55) and (b > 0.45 and b < 0.55)) then
+				REACTION_COLORING[2]()
 			else
 				REACTION_COLORING[1]()
 			end
diff --git a/SVUI_Skins/artwork/UI-LFG-ICON-ROLES.blp b/SVUI_Skins/artwork/UI-LFG-ICON-ROLES.blp
index 4ba2a09..82a7726 100644
Binary files a/SVUI_Skins/artwork/UI-LFG-ICON-ROLES.blp and b/SVUI_Skins/artwork/UI-LFG-ICON-ROLES.blp differ
diff --git a/SVUI_Skins/components/blizzard/alert.lua b/SVUI_Skins/components/blizzard/alert.lua
index ad49ba7..daf8e1b 100644
--- a/SVUI_Skins/components/blizzard/alert.lua
+++ b/SVUI_Skins/components/blizzard/alert.lua
@@ -12,8 +12,8 @@ local SV = _G['SVUI'];
 local L = SV.L;
 local MOD = SV.Skins;
 local Schema = MOD.Schema;
---[[
-##########################################################
+--[[
+##########################################################
 OVERRIDES AND HOOKS
 ##########################################################
 ]]--
@@ -39,13 +39,13 @@ local _hook_DisableOverlay = function(self)
     self:DisableDrawLayer("OVERLAY")
 end;

-local _hook_BackdropColor = function(self,...)
+local _hook_BackdropColor = function(self,...)
     if(self.AlertPanel) then
         self.AlertPanel:AlertColor(...)
     end
 end
---[[
-##########################################################
+--[[
+##########################################################
 HELPERS
 ##########################################################
 ]]--
@@ -54,8 +54,8 @@ local function StyleAlertIcon(frame, icon)

 	icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS))
 	icon:SetDrawLayer("BORDER")
-
-	if(not frame.IconSlot) then
+
+	if(not frame.IconSlot) then
 		frame.IconSlot = CreateFrame("Frame", nil, frame)
 		frame.IconSlot:WrapPoints(icon)
 		frame.IconSlot:SetStyle("Icon")
@@ -68,7 +68,7 @@ local function StyleLootFrame(frame)

 	if(not frame.Panel) then
 		SV.API:Set("!_Alert", frame)
-
+    if(frame.PvPBackground) then frame.PvPBackground:Die() end
 		if(frame.Background) then frame.Background:Die() end
 		if(frame.BGAtlas) then frame.BGAtlas:Die() end
 		if(frame.IconBorder) then frame.IconBorder:Die() end
@@ -123,7 +123,7 @@ local function AchievementStyle()
 		local frameName = "AchievementAlertFrame"..i
 		local frame = _G[frameName]
 		if(frame and (not frame.Panel)) then
-
+
 			SV.API:Set("!_Alert", frame)

 			local icon = _G[frameName.."IconTexture"];
@@ -138,18 +138,18 @@ local function AchievementStyle()
 			if(_G[frameName .. 'Glow']) then _G[frameName .. 'Glow']:Die() end
 			if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end
 			if(_G[frameName .. 'Background']) then _G[frameName .. 'Background']:SetTexture("") end
-			if(_G[frameName .. 'IconOverlay']) then _G[frameName .. 'IconOverlay']:Die() end
+			if(_G[frameName .. 'IconOverlay']) then _G[frameName .. 'IconOverlay']:Die() end
 			if(_G[frameName .. 'GuildBanner']) then _G[frameName .. 'GuildBanner']:Die() end
 			if(_G[frameName .. 'GuildBorder']) then _G[frameName .. 'GuildBorder']:Die() end
 			if(_G[frameName .. 'OldAchievement']) then _G[frameName .. 'OldAchievement']:Die() end
-		end
-	end
+		end
+	end
 end

 local function DungeonCompletionStyle()
 	local frameName = "DungeonCompletionAlertFrame1"
 	local frame = _G[frameName]
-	if(frame and (not frame.Panel)) then
+	if(frame and (not frame.Panel)) then

 		SV.API:Set("!_Alert", frame)

@@ -161,22 +161,22 @@ local function DungeonCompletionStyle()
 			StyleAlertIcon(frame, icon)
 		end

-		if(_G[frameName .. 'GlowFrame']) then
+		if(_G[frameName .. 'GlowFrame']) then
 			if(_G[frameName .. 'GlowFrame'].glow) then _G[frameName .. 'GlowFrame'].glow:Die() end
-			_G[frameName .. 'GlowFrame']:Die()
+			_G[frameName .. 'GlowFrame']:Die()
 		end
 		if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end

 		frame:DisableDrawLayer("BORDER")
 		frame:HookScript("OnShow", _hook_DisableBorder)
-	end
+	end
 end

 local function GuildChallengeStyle()
     local frameName = "GuildChallengeAlertFrame"
 	local frame = _G[frameName];
-	if(frame and (not frame.Panel)) then
-
+	if(frame and (not frame.Panel)) then
+
 		SV.API:Set("!_Alert", frame)

 		local icon = _G[frameName .. 'EmblemIcon'];
@@ -184,8 +184,8 @@ local function GuildChallengeStyle()
 			icon:ClearAllPoints()
 			icon:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0)
 			StyleAlertIcon(frame, icon)
-			SetLargeGuildTabardTextures("player", icon, nil, nil)
-		end
+			SetLargeGuildTabardTextures("player", icon, nil, nil)
+		end

 		if(_G[frameName .. 'Glow']) then _G[frameName .. 'Glow']:Die() end
 		if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end
@@ -193,82 +193,82 @@ local function GuildChallengeStyle()
 		frame:DisableDrawLayer("BACKGROUND")
 		frame:DisableDrawLayer("BORDER")
 		frame:HookScript("OnShow", _hook_DisableBoth)
-	end
+	end
 end

 local function ChallengeModeStyle()
 	local frameName = "ChallengeModeAlertFrame1"
 	local frame = _G[frameName];
-	if(frame and (not frame.Panel)) then
-
+	if(frame and (not frame.Panel)) then
+
 		SV.API:Set("!_Alert", frame)

 		local icon = _G[frameName .. 'DungeonTexture'];
 		if(icon) then
 			icon:ClearAllPoints()
 			icon:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0)
-			StyleAlertIcon(frame, icon)
+			StyleAlertIcon(frame, icon)
 		end

-		if(_G[frameName .. 'GlowFrame']) then
+		if(_G[frameName .. 'GlowFrame']) then
 			if(_G[frameName .. 'GlowFrame'].glow) then _G[frameName .. 'GlowFrame'].glow:Die() end
-			_G[frameName .. 'GlowFrame']:Die()
+			_G[frameName .. 'GlowFrame']:Die()
 		end
 		if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end
 		if(_G[frameName .. 'Border']) then _G[frameName .. 'Border']:Die() end

 		frame:DisableDrawLayer("BACKGROUND")
 		frame:HookScript("OnShow", _hook_DisableBackground)
-	end
+	end
 end

 local function ScenarioStyle()
 	local frameName = "ScenarioAlertFrame1"
 	local frame = _G[frameName];
-	if(frame and (not frame.Panel)) then
-
+	if(frame and (not frame.Panel)) then
+
 		SV.API:Set("!_Alert", frame)

 		local icon = _G[frameName .. 'DungeonTexture'];
 		if(icon) then
 			icon:ClearAllPoints()
 			icon:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0)
-			StyleAlertIcon(frame, icon)
+			StyleAlertIcon(frame, icon)
 		end

-		if(_G[frameName .. 'GlowFrame']) then
+		if(_G[frameName .. 'GlowFrame']) then
 			if(_G[frameName .. 'GlowFrame'].glow) then _G[frameName .. 'GlowFrame'].glow:Die() end
-			_G[frameName .. 'GlowFrame']:Die()
+			_G[frameName .. 'GlowFrame']:Die()
 		end
 		if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end

 		frame:DisableDrawLayer("BORDER")
 		frame:HookScript("OnShow", _hook_DisableBorder)
-	end
+	end
 end

 local function CriteriaStyle()
-	for i = 1, MAX_ACHIEVEMENT_ALERTS do
+	for i = 1, MAX_ACHIEVEMENT_ALERTS do
 		local frameName = "CriteriaAlertFrame"..i
 		local frame = _G[frameName]
 		if(frame and (not frame.Panel)) then
-
+
 			SV.API:Set("!_Alert", frame)

 			local icon = _G[frameName .. 'IconTexture'];
 			if(icon) then
 				icon:ClearAllPoints()
 				icon:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0)
-				StyleAlertIcon(frame, icon)
+				StyleAlertIcon(frame, icon)
 			end

 			if(_G[frameName .. 'Glow']) then _G[frameName .. 'Glow']:Die() end
 			if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end
 			if(_G[frameName .. 'Background']) then _G[frameName .. 'Background']:SetTexture("") end
-			if(_G[frameName .. 'IconOverlay']) then _G[frameName .. 'IconOverlay']:Die() end
+			if(_G[frameName .. 'IconOverlay']) then _G[frameName .. 'IconOverlay']:Die() end
 			if(_G[frameName .. 'IconBling']) then _G[frameName .. 'IconBling']:Die() end
-		end
-	end
+		end
+	end
 end

 -- [[ GarrisonFollowerAlertFrame ]] --
@@ -282,8 +282,8 @@ local function GarrisonFollowerAlertStyle(followerID, name, displayID, level, qu
 		GarrisonFollowerAlertFrame.PortraitFrame.PortraitRing:SetVertexColor(1, 1, 1);
 	end
 end
---[[
-##########################################################
+--[[
+##########################################################
 ALERTFRAME STYLES
 ##########################################################
 ]]--
@@ -314,28 +314,28 @@ local function AlertStyle()

 	--[[ LOOT WON ]]--
 	do
-		for i = 1, #LOOT_WON_ALERT_FRAMES do
+		for i = 1, #LOOT_WON_ALERT_FRAMES do
 			StyleLootFrame(LOOT_WON_ALERT_FRAMES[i])
 		end
 		StyleLootFrame(BonusRollLootWonFrame)
 		hooksecurefunc("AlertFrame_SetLootWonAnchors", function()
-			for i = 1, #LOOT_WON_ALERT_FRAMES do
+			for i = 1, #LOOT_WON_ALERT_FRAMES do
 				local frame = LOOT_WON_ALERT_FRAMES[i]
 				if(frame) then StyleLootFrame(frame) end
-			end
+			end
 		end)
 		hooksecurefunc("LootWonAlertFrame_SetUp", function(self, itemLink, ...)
 		    local itemName, itemHyperLink, itemRarity, itemTexture, _;
 		    if (self.isCurrency) then
 		        itemName, _, itemTexture, _, _, _, _, itemRarity = GetCurrencyInfo(itemLink);
-		        itemHyperLink = itemLink;
+		        itemHyperLink = itemLink;
 		    else
 		        itemName, itemHyperLink, itemRarity, _, _, _, _, _, _, itemTexture = GetItemInfo(itemLink);
 		    end
 	    	if(itemRarity) then
 		    	local color = ITEM_QUALITY_COLORS[itemRarity];
 		    	if(not self.IconSlot) then return end;
-				self.IconSlot:SetBackdropColor(color.r, color.g, color.b);
+				self.IconSlot:SetBackdropColor(color.r, color.g, color.b);
 				self:AlertColor(color.r, color.g, color.b)
 			end
 		end)
@@ -343,35 +343,35 @@ local function AlertStyle()

 	--[[ MONEY WON ]]--
 	do
-		for i = 1, #MONEY_WON_ALERT_FRAMES do
+		for i = 1, #MONEY_WON_ALERT_FRAMES do
 			StyleLootFrame(MONEY_WON_ALERT_FRAMES[i])
 		end
 		StyleLootFrame(BonusRollMoneyWonFrame)
 		hooksecurefunc("AlertFrame_SetMoneyWonAnchors", function()
-			for i = 1, #MONEY_WON_ALERT_FRAMES do
+			for i = 1, #MONEY_WON_ALERT_FRAMES do
 				local frame = MONEY_WON_ALERT_FRAMES[i]
 				if(frame) then StyleLootFrame(frame) end
-			end
+			end
 		end)
 	end

 	--[[ LOOT UPGRADE ]]--
 	do
-		for i = 1, #LOOT_UPGRADE_ALERT_FRAMES do
+		for i = 1, #LOOT_UPGRADE_ALERT_FRAMES do
 			StyleUpgradeFrame(LOOT_UPGRADE_ALERT_FRAMES[i])
 		end
 		hooksecurefunc("AlertFrame_SetLootUpgradeFrameAnchors", function()
-			for i = 1, #LOOT_UPGRADE_ALERT_FRAMES do
+			for i = 1, #LOOT_UPGRADE_ALERT_FRAMES do
 				local frame = LOOT_UPGRADE_ALERT_FRAMES[i]
-				if(frame) then StyleUpgradeFrame(frame) end
-			end
+				if(frame) then StyleUpgradeFrame(frame) end
+			end
 		end)
 		hooksecurefunc("LootUpgradeFrame_SetUp", function(self, itemLink, ...)
 		    local itemName, itemHyperLink, itemRarity, _, _, _, _, _, _, itemTexture = GetItemInfo(itemLink);
 		    if(itemRarity) then
 		    	local color = ITEM_QUALITY_COLORS[itemRarity];
 		    	if(not self.IconSlot) then return end;
-				self.IconSlot:SetBackdropColor(color.r, color.g, color.b);
+				self.IconSlot:SetBackdropColor(color.r, color.g, color.b);
 				self:AlertColor(color.r, color.g, color.b)
 			end
 		end)
@@ -408,7 +408,7 @@ local function AlertStyle()
 		--Garrison Mission
 	    frameName = "GarrisonMissionAlertFrame"
 	    frame = _G[frameName]
-	    if(frame and (not frame.Panel)) then
+	    if(frame and (not frame.Panel)) then
 			frame:DisableDrawLayer("BACKGROUND")

 			SV.API:Set("!_Alert", frame)
@@ -429,7 +429,7 @@ local function AlertStyle()
 		--Garrison Building
 		frameName = "GarrisonBuildingAlertFrame"
 	    frame = _G[frameName]
-	    if(frame and (not frame.Panel)) then
+	    if(frame and (not frame.Panel)) then
 			frame:DisableDrawLayer("BACKGROUND")

 			SV.API:Set("!_Alert", frame)
@@ -449,7 +449,7 @@ local function AlertStyle()
 		frameName = "GarrisonFollowerAlertFrame"
 	    frame = _G[frameName]
 	    if(frame) then
-	    	if(not frame.Panel) then
+	    	if(not frame.Panel) then
 				frame:DisableDrawLayer("BACKGROUND")

 				SV.API:Set("!_Alert", frame)
@@ -479,13 +479,13 @@ local function AlertStyle()
 		end
 	end
 	hooksecurefunc("GarrisonFollowerAlertFrame_ShowAlert", GarrisonFollowerAlertStyle)
-end
---[[
-##########################################################
+end
+--[[
+##########################################################
 MOD LOADING
 ##########################################################
 ]]--
 MOD:SaveCustomStyle(AlertStyle)
 -- /script GarrisonMissionAlertFrame:Show()
 -- /script GarrisonBuildingAlertFrame:Show()
--- /script GarrisonFollowerAlertFrame:Show()
\ No newline at end of file
+-- /script GarrisonFollowerAlertFrame:Show()
diff --git a/SVUI_Skins/components/blizzard/lfd.lua b/SVUI_Skins/components/blizzard/lfd.lua
index 91dff35..d42679b 100644
--- a/SVUI_Skins/components/blizzard/lfd.lua
+++ b/SVUI_Skins/components/blizzard/lfd.lua
@@ -178,23 +178,6 @@ local function LFDFrameStyle()
   --LFGDungeonReadyPopup:SetScript('OnShow', nil)
   --/script StaticPopupSpecial_Show(LFGDungeonReadyPopup);

-  -- LFGDungeonReadyDialogRoleIconTexture:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICONS-ROLEBACKGROUNDS")
-  -- LFGDungeonReadyDialogRoleIconTexture:SetAlpha(0.5)
-  -- LFGDungeonReadyDialogRoleIconTexture:SetTexCoord(LFDQueueFrameRoleButtonDPS.background:GetTexCoord())
-  --
-  -- hooksecurefunc("LFGDungeonReadyPopup_Update", function()
-  --   local proposalExists, _, _, _, _, _, role = GetLFGProposal();
-  --   if proposalExists and role and LFGDungeonReadyDialogRoleIcon:IsShown() then
-  --     if(role == "DAMAGER") then
-  --       LFGDungeonReadyDialogRoleIconTexture:SetTexCoord(LFDQueueFrameRoleButtonDPS.background:GetTexCoord())
-  --     elseif(role == "TANK") then
-  --       LFGDungeonReadyDialogRoleIconTexture:SetTexCoord(LFDQueueFrameRoleButtonTank.background:GetTexCoord())
-  --     elseif(role == "HEALER") then
-  --       LFGDungeonReadyDialogRoleIconTexture:SetTexCoord(LFDQueueFrameRoleButtonHealer.background:GetTexCoord())
-  --     end
-  --   end
-  -- end)
-
   LFDQueueFrameRoleButtonTankIncentiveIcon:SetAlpha(0)
   LFDQueueFrameRoleButtonHealerIncentiveIcon:SetAlpha(0)
   LFDQueueFrameRoleButtonDPSIncentiveIcon:SetAlpha(0)
@@ -211,6 +194,14 @@ local function LFDFrameStyle()
   LFGDungeonReadyDialog.bottomArt:SetAlpha(0)
   SV.API:Set("CloseButton", LFGDungeonReadyStatusCloseButton)

+  LFDQueueFrameRoleButtonTank:SetNormalTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+  LFDQueueFrameRoleButtonHealer:SetNormalTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+  LFDQueueFrameRoleButtonDPS:SetNormalTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+
+  LFDQueueFrameRoleButtonTank.cover:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+  LFDQueueFrameRoleButtonHealer.cover:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+  LFDQueueFrameRoleButtonDPS.cover:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+
   for _,name in pairs(LFDFrameList) do
     local frame = _G[name];
     if(frame) then
diff --git a/SVUI_Skins/components/blizzard/pvp.lua b/SVUI_Skins/components/blizzard/pvp.lua
index ccdd29d..cc55c9d 100644
--- a/SVUI_Skins/components/blizzard/pvp.lua
+++ b/SVUI_Skins/components/blizzard/pvp.lua
@@ -18,13 +18,7 @@ PVP MODR
 ##########################################################
 ]]--
 local _hook_PVPReadyDialogDisplay = function(self, _, _, _, queueType, _, queueRole)
-	if(queueRole == "DAMAGER") then
-		PVPReadyDialogRoleIcon.texture:SetTexCoord(LFDQueueFrameRoleButtonDPS.background:GetTexCoord())
-	elseif(queueRole == "TANK") then
-		PVPReadyDialogRoleIcon.texture:SetTexCoord(LFDQueueFrameRoleButtonTank.background:GetTexCoord())
-	elseif(queueRole == "HEALER") then
-		PVPReadyDialogRoleIcon.texture:SetTexCoord(LFDQueueFrameRoleButtonHealer.background:GetTexCoord())
-	end
+	PVPReadyDialogRoleIconTexture:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
 	if(queueType == "ARENA") then
 		self:SetHeight(100)
 	end
@@ -86,10 +80,13 @@ local function PVPFrameStyle()
 	HonorFrame.RoleInset.HealerIcon.checkButton:SetStyle("CheckButton")
 	HonorFrame.RoleInset.TankIcon:DisableDrawLayer("OVERLAY")
 	HonorFrame.RoleInset.TankIcon:DisableDrawLayer("BACKGROUND")
+	HonorFrame.RoleInset.TankIcon:SetNormalTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
 	HonorFrame.RoleInset.HealerIcon:DisableDrawLayer("OVERLAY")
 	HonorFrame.RoleInset.HealerIcon:DisableDrawLayer("BACKGROUND")
+	HonorFrame.RoleInset.HealerIcon:SetNormalTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
 	HonorFrame.RoleInset.DPSIcon:DisableDrawLayer("OVERLAY")
 	HonorFrame.RoleInset.DPSIcon:DisableDrawLayer("BACKGROUND")
+	HonorFrame.RoleInset.DPSIcon:SetNormalTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
 	hooksecurefunc("LFG_PermanentlyDisableRoleButton", function(n)
 		if n.bg then
 			n.bg:SetDesaturated(true)
@@ -134,8 +131,8 @@ local function PVPFrameStyle()
 	PVPReadyDialogEnterBattleButton:SetStyle("Button")
 	PVPReadyDialogLeaveQueueButton:SetStyle("Button")
 	SV.API:Set("CloseButton", PVPReadyDialogCloseButton)
-	PVPReadyDialogRoleIcon.texture:SetTexture("Interface\\LFGFrame\\UI-LFG-ICONS-ROLEBACKGROUNDS")
-	PVPReadyDialogRoleIcon.texture:SetAlpha(0.5)
+	PVPReadyDialogRoleIconTexture:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\UI-LFG-ICON-ROLES")
+	PVPReadyDialogRoleIconTexture:SetAlpha(0.5)

 	ConquestFrame.Inset:SetStyle("!_Frame", "Inset")
 	WarGamesFrameScrollFrame:SetStyle("Frame", "Inset",false,2,2,6)