Update oUF, numerous further changes

.vscode/settings.json

@@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}

config/config.defaults.lua

@@ -49,10 +49,10 @@ C["frames"] = {
 	focusYoffset		= 75,
 	focusTargetXoffset	= 10, 	-- Relative to right of focus target
 	focusTargetYoffset	= 0,
-	petXoffset			= 62, 	-- Relative to left of player
-	petYoffset			= -100,
-	petTargetXoffset	= 10,  	-- Relative to right of pet
-	petTargetYoffset	= 0,
+	petXoffset			= -6, --62, 	-- Relative to left of player
+	petYoffset			= 30, ---100,
+	petTargetXoffset	= 6,  	-- Relative to right of pet
+	petTargetYoffset	= -10,
 	bossXoffset			= 0,	-- Relative to left of target
 	bossYoffset			= -100,
 	arenaXoffset		= 0, 	-- Relative to left of player
@@ -147,7 +147,7 @@ C["frames"] = {
 
 C["raidframes"] = {
 	-- General frame parameters
-	width = 60,
+	width = 65,
 	height = 40,
 	gridLayout = "HORIZONTAL", -- groups are arranged horizontally - one above (or below) the other,
 							   -- VERTICAL would have groups appear to the right (or left) of each other
@@ -159,42 +159,46 @@ C["raidframes"] = {
 	colorPet = false,
 	colorCharmed = true,
 
+	indicatorLrg = 8,
+	indicatorSml = 5,
+
 	-- X, Y position of frames - the 1, 2, 3, etc. tables
 	-- Equates to the total number of groups in the raid (not each group!). If you do not
 	-- specify a position for a total number of groups the position of the last highest
 	-- will be used
 	position = {
-		[1] = { "BOTTOMLEFT", UIParent, "CENTER", -166, -320 },
-		[2] = { "BOTTOMLEFT", UIParent, "CENTER", -166, -390 },
-		[3] = { "BOTTOMLEFT", UIParent, "CENTER", -166, -430 },
-		[5] = { "BOTTOMLEFT", UIParent, "CENTER", -940, -150 },
+		[1] = { "BOTTOMLEFT", UIParent, "CENTER", -176, -320 },
+		[2] = { "BOTTOMLEFT", UIParent, "CENTER", -176, -390 },
+		[3] = { "BOTTOMLEFT", UIParent, "CENTER", -176, -420 },
+		[6] = { "BOTTOMLEFT", UIParent, "CENTER", -940, -150 },
 	},
 
 	-- Button parameters
 	raidnamelength = 7,
-	showRaidHealthPct = true, -- Show health as a "remaining percentage" rather than an "absolute deficit"
-
+	showRaidHealthPct = false, -- Show health as a "remaining percentage" rather than an "absolute deficit"
 	showOnlyDispellable = false, -- true to only show dispellable unknown debuffs
+
+
 }
 
 -- Player, target and focus castbar
 C["castbar"] = {
 	player = {
 		width	 = 150,
 		height	 = 6,
-		xOffset  = 12,
-		yOffset  = 0,
+		xOffset  = -6,
+		yOffset  = 40,
 		anchor 	 = "DraePlayer",
-		anchorat = "LEFT",
+		anchorat = "RIGHT",
 		anchorto = "RIGHT",
 	},
 	target = {
 		width	 = 150,
 		height	 = 6,
-		xOffset  = -12,
-		yOffset  = 0,
+		xOffset  = 7,
+		yOffset  = 40,
 		anchor 	 = "DraeTarget",
-		anchorat = "RIGHT",
+		anchorat = "LEFT",
 		anchorto = "LEFT",
 	},
 	focus = {

config/indicators/hunter.lua

@@ -14,11 +14,6 @@ P["HUNTER"] = {
 		["dispel_curse"] 		= { debuff = "Curse",	pr = 50, mine = false, color = { r = 0.6, g = 0,   b = 1.0} },
 		["buff_feigndeath"]		= { buff = "Feign Death", pr = 50, mine = false, text = "FEIGN" },
 
-		-- Attack Power
-		["buff_trueshotaura"] 	= { buff = "Trueshot Aura",  pr = 5, mine = false, color = { r = 0.8, g = 0.8, b = 0.8} },
-		["buff_hornofwinter"] 	= { buff = "Horn of Winter", pr = 5, mine = false, color = { r = 0.8, g = 0.8, b = 0.8} }, -- Deathknight
-		["buff_battleshout"] 	= { buff = "Battle Shout",   pr = 5, mine = false, color = { r = 0.8, g = 0.8, b = 0.8} }, -- Warrior
-
 		-- Specific
 		["buff_misdirection"] 	= { buff = "Misdirection",   pr = 5, mine = false, color = { r = 0, g = 0.4, b = 0.9 } },
 	},
@@ -56,14 +51,15 @@ P["HUNTER"] = {
 			["buff_feigndeath"] = true,
 		},
 
+        ["LEFT"] = {
+            ["status_dmgred"] = true,
+        },
+
 		["TOP"] = {
 			["buff_misdirection"] = true
 		},
 
 		["BOTTOMRIGHT"] = {
-			["buff_trueshotaura"] = true,
-			["buff_hornofwinter"] = true,
-			["buff_battleshout"] = true,
 		},
 	}
 }

config/indicators/paladin.lua

@@ -19,7 +19,6 @@ P["PALADIN"] = {
         ["buff_auraofsacrifice"]     		= { buff = "Aura of Sacrifice",     		pr = 50, mine = true, color = { r = 1.0, g = 0, b = 0.7 } },
         ["buff_devotionaura"]     			= { buff = "Devotion Aura",     			pr = 50, mine = true, color = { r = 1.0, g = 0, b = 0.7 } },
 
-        ["buff_greaterblessingofmight"]     = { buff = "Greater Blessing of Might",     pr = 50, mine = true, color = { r = 0, g = 0.4, b = 1.0 } },
         ["buff_greaterblessingofkings"]     = { buff = "Greater Blessing of Kings",     pr = 50, mine = true, color = { r = 0.8, g = 0.8, b = 0.8} },
         ["buff_greaterblessingofwisdom"]    = { buff = "Greater Blessing of Wisdom",    pr = 50, mine = true, color = { r = 0.8, g = 0.0, b = 0.4} },
 
@@ -30,7 +29,7 @@ P["PALADIN"] = {
         ["buff_blessingofspellwarding"]     = { buff = "Blessing of Spellwarding",      pr = 85, mine = false, color = { r = 0, g = 0.8, b = 0.5 } },
 
         ["buff_bestowfaith"]                = { buff = "Bestow Faith", 				    pr = 60, mine = true, color = { r = 1.0, g = 0.8, b = 0 } },
-        ["buff_tyrsdeliverance"]           	= { buff = "Tyr's Deliverance",			    pr = 80, mine = false, color = { r = 1.0, g = 0.7, b = 0 } },
+        ["buff_tyrsdeliverance"]           	= { buff = "Tyr's Deliverance",			    pr = 80, mine = false, color = { r = 1.0, g = 0.7, b = 0 }, flash = true },
         ["buff_beaconoflight"]           	= { buff = "Beacon of Light",   			pr = 40, mine = true, color = { r = 1.0, g = 0.8, b = 0 } },
         ["buff_beaconoffaith"]           	= { buff = "Beacon of Faith",   			pr = 40, mine = true, color = { r = 1.0, g = 0.6, b = 0 } },
         ["buff_beaconofvirtue"]          	= { buff = "Beacon of Virtue",   			pr = 40, mine = true, color = { r = 1.0, g = 0.8, b = 0.2 } },
@@ -94,11 +93,10 @@ P["PALADIN"] = {
         },
 
         ["BOTTOMRIGHTL"] = {
-            ["buff_greaterblessingofmight"] = true,
+            ["buff_greaterblessingofwisdom"] = true,
         },
 
         ["BOTTOMRIGHTT"] = {
-            ["buff_greaterblessingofwisdom"] = true,
         },
 
         ["BOTTOMLEFT"] = {

config/instancedebuffs/embed.xml

@@ -3,4 +3,5 @@
 
 	<!-- Expacs -->
 	<Include file="warlordsofdraenor\embed.xml" />
+	<Include file="legion\embed.xml" />
 </Ui>

config/instancedebuffs/legion/black_rook_hold.lua

@@ -0,0 +1,6 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+UF["raiddebuffs"]["instances"]["Black Rook Hold"] = function()
+
+end

config/instancedebuffs/legion/court_of_stars.lua

@@ -0,0 +1,6 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+UF["raiddebuffs"]["instances"]["Court of Stars"] = function()
+	local zoneid = 1081
+end

config/instancedebuffs/legion/darkheart_thicket.lua

@@ -0,0 +1,32 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+-- Auchindoun
+
+UF["raiddebuffs"]["instances"]["Auchindoun"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true, 157168, 6, true) -- Fixate (Abyssal)
+
+	-- Vigilant Kaathar
+	UF:AddRaidDebuff(true, 152954, 6) -- Sanctified Strike
+
+	-- Nyami
+	UF:AddRaidDebuff(true, 155327, 6, true) -- Soul Vessel
+	UF:AddRaidDebuff(true, 154477, 6) -- Shadow Word: Pain
+	UF:AddRaidDebuff(true, 154218, 6) -- Arbiter's Hammer
+	UF:AddRaidDebuff(true, 176931, 6) -- Crusader Strike
+
+	-- Azzakel
+	UF:AddRaidDebuff(true, 153727, 6) -- Fel Lash
+	UF:AddRaidDebuff(true, 153392, 6) -- Curtain of Flame
+	UF:AddRaidDebuff(true, 154018, 6) -- Conflagration
+	UF:AddRaidDebuff(true, 153500, 6) -- Fel Pool
+
+	-- Terongor
+	UF:AddRaidDebuff(true, 156921, 6, true) -- Seed of Malevonence
+	UF:AddRaidDebuff(true, 156921, 6) -- Drain Life
+	UF:AddRaidDebuff(true, 156842, 6) -- Corruption
+	UF:AddRaidDebuff(true, 156964, 6) -- Immolate
+	UF:AddRaidDebuff(true, 156857, 6) -- Rain of Fire
+	UF:AddRaidDebuff(true, 164841, 6) -- Curse of Exhaustion
+end

config/instancedebuffs/legion/embed.xml

@@ -0,0 +1,13 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="black_rook_hold.lua" />
+	<Script file="court_of_stars.lua" />
+	<Script file="darkheart_thicket.lua" />
+	<Script file="eye_of_azhara.lua" />
+	<Script file="halls_of_valor.lua" />
+	<Script file="karazhan.lua" />
+	<Script file="maw_of_souls.lua" />
+	<Script file="neltharions_lair.lua" />
+	<Script file="the_arcway.lua" />
+	<Script file="vault_of_the_wardens.lua" />
+	<Script file="violet_hold.lua" />
+</Ui>

config/instancedebuffs/legion/eye_of_azhara.lua

@@ -0,0 +1,32 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+-- Auchindoun
+
+UF["raiddebuffs"]["instances"]["Auchindoun"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true, 157168, 6, true) -- Fixate (Abyssal)
+
+	-- Vigilant Kaathar
+	UF:AddRaidDebuff(true, 152954, 6) -- Sanctified Strike
+
+	-- Nyami
+	UF:AddRaidDebuff(true, 155327, 6, true) -- Soul Vessel
+	UF:AddRaidDebuff(true, 154477, 6) -- Shadow Word: Pain
+	UF:AddRaidDebuff(true, 154218, 6) -- Arbiter's Hammer
+	UF:AddRaidDebuff(true, 176931, 6) -- Crusader Strike
+
+	-- Azzakel
+	UF:AddRaidDebuff(true, 153727, 6) -- Fel Lash
+	UF:AddRaidDebuff(true, 153392, 6) -- Curtain of Flame
+	UF:AddRaidDebuff(true, 154018, 6) -- Conflagration
+	UF:AddRaidDebuff(true, 153500, 6) -- Fel Pool
+
+	-- Terongor
+	UF:AddRaidDebuff(true, 156921, 6, true) -- Seed of Malevonence
+	UF:AddRaidDebuff(true, 156921, 6) -- Drain Life
+	UF:AddRaidDebuff(true, 156842, 6) -- Corruption
+	UF:AddRaidDebuff(true, 156964, 6) -- Immolate
+	UF:AddRaidDebuff(true, 156857, 6) -- Rain of Fire
+	UF:AddRaidDebuff(true, 164841, 6) -- Curse of Exhaustion
+end

config/instancedebuffs/legion/halls_of_valor.lua

@@ -0,0 +1,32 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+-- Auchindoun
+
+UF["raiddebuffs"]["instances"]["Auchindoun"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true, 157168, 6, true) -- Fixate (Abyssal)
+
+	-- Vigilant Kaathar
+	UF:AddRaidDebuff(true, 152954, 6) -- Sanctified Strike
+
+	-- Nyami
+	UF:AddRaidDebuff(true, 155327, 6, true) -- Soul Vessel
+	UF:AddRaidDebuff(true, 154477, 6) -- Shadow Word: Pain
+	UF:AddRaidDebuff(true, 154218, 6) -- Arbiter's Hammer
+	UF:AddRaidDebuff(true, 176931, 6) -- Crusader Strike
+
+	-- Azzakel
+	UF:AddRaidDebuff(true, 153727, 6) -- Fel Lash
+	UF:AddRaidDebuff(true, 153392, 6) -- Curtain of Flame
+	UF:AddRaidDebuff(true, 154018, 6) -- Conflagration
+	UF:AddRaidDebuff(true, 153500, 6) -- Fel Pool
+
+	-- Terongor
+	UF:AddRaidDebuff(true, 156921, 6, true) -- Seed of Malevonence
+	UF:AddRaidDebuff(true, 156921, 6) -- Drain Life
+	UF:AddRaidDebuff(true, 156842, 6) -- Corruption
+	UF:AddRaidDebuff(true, 156964, 6) -- Immolate
+	UF:AddRaidDebuff(true, 156857, 6) -- Rain of Fire
+	UF:AddRaidDebuff(true, 164841, 6) -- Curse of Exhaustion
+end

config/instancedebuffs/legion/karazhan.lua

@@ -0,0 +1,14 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+UF["raiddebuffs"]["instances"]["Karazhan"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true) -- Fixate (Abyssal)
+
+	-- Nightbane
+	UF:AddRaidDebuff(true, 228808, 5)  -- Charred Earth
+	UF:AddRaidDebuff(true, 228796, 9, false, true)  -- Ignite Soul
+	UF:AddRaidDebuff(true, 228829, 7)  -- Burning Bones
+	UF:AddRaidDebuff(true, 228835, 6)  -- Absorb Vitality
+	UF:AddRaidDebuff(true, 228833, 8)  -- Bone Shrapnel
+end

config/instancedebuffs/legion/maw_of_souls.lua

@@ -0,0 +1,32 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+-- Auchindoun
+
+UF["raiddebuffs"]["instances"]["Auchindoun"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true, 157168, 6, true) -- Fixate (Abyssal)
+
+	-- Vigilant Kaathar
+	UF:AddRaidDebuff(true, 152954, 6) -- Sanctified Strike
+
+	-- Nyami
+	UF:AddRaidDebuff(true, 155327, 6, true) -- Soul Vessel
+	UF:AddRaidDebuff(true, 154477, 6) -- Shadow Word: Pain
+	UF:AddRaidDebuff(true, 154218, 6) -- Arbiter's Hammer
+	UF:AddRaidDebuff(true, 176931, 6) -- Crusader Strike
+
+	-- Azzakel
+	UF:AddRaidDebuff(true, 153727, 6) -- Fel Lash
+	UF:AddRaidDebuff(true, 153392, 6) -- Curtain of Flame
+	UF:AddRaidDebuff(true, 154018, 6) -- Conflagration
+	UF:AddRaidDebuff(true, 153500, 6) -- Fel Pool
+
+	-- Terongor
+	UF:AddRaidDebuff(true, 156921, 6, true) -- Seed of Malevonence
+	UF:AddRaidDebuff(true, 156921, 6) -- Drain Life
+	UF:AddRaidDebuff(true, 156842, 6) -- Corruption
+	UF:AddRaidDebuff(true, 156964, 6) -- Immolate
+	UF:AddRaidDebuff(true, 156857, 6) -- Rain of Fire
+	UF:AddRaidDebuff(true, 164841, 6) -- Curse of Exhaustion
+end

config/instancedebuffs/legion/neltharions_lair.lua

@@ -0,0 +1,32 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+-- Auchindoun
+
+UF["raiddebuffs"]["instances"]["Auchindoun"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true, 157168, 6, true) -- Fixate (Abyssal)
+
+	-- Vigilant Kaathar
+	UF:AddRaidDebuff(true, 152954, 6) -- Sanctified Strike
+
+	-- Nyami
+	UF:AddRaidDebuff(true, 155327, 6, true) -- Soul Vessel
+	UF:AddRaidDebuff(true, 154477, 6) -- Shadow Word: Pain
+	UF:AddRaidDebuff(true, 154218, 6) -- Arbiter's Hammer
+	UF:AddRaidDebuff(true, 176931, 6) -- Crusader Strike
+
+	-- Azzakel
+	UF:AddRaidDebuff(true, 153727, 6) -- Fel Lash
+	UF:AddRaidDebuff(true, 153392, 6) -- Curtain of Flame
+	UF:AddRaidDebuff(true, 154018, 6) -- Conflagration
+	UF:AddRaidDebuff(true, 153500, 6) -- Fel Pool
+
+	-- Terongor
+	UF:AddRaidDebuff(true, 156921, 6, true) -- Seed of Malevonence
+	UF:AddRaidDebuff(true, 156921, 6) -- Drain Life
+	UF:AddRaidDebuff(true, 156842, 6) -- Corruption
+	UF:AddRaidDebuff(true, 156964, 6) -- Immolate
+	UF:AddRaidDebuff(true, 156857, 6) -- Rain of Fire
+	UF:AddRaidDebuff(true, 164841, 6) -- Curse of Exhaustion
+end

config/instancedebuffs/legion/the_arcway.lua

@@ -0,0 +1,32 @@
+local T, C, G, P, U, _ = unpack(select(2, ...))
+local UF = T:GetModule("UnitFrames")
+
+-- Auchindoun
+
+UF["raiddebuffs"]["instances"]["Auchindoun"] = function()
+	-- Trash
+	UF:AddRaidDebuff(true, 157168, 6, true) -- Fixate (Abyssal)
+
+	-- Vigilant Kaathar
+	UF:AddRaidDebuff(true, 152954, 6) -- Sanctified Strike
+
+	-- Nyami
+	UF:AddRaidDebuff(true, 155327, 6, true) -- Soul Vessel
+	UF:AddRaidDebuff(true, 154477, 6) -- Shadow Word: Pain
+	UF:AddRaidDebuff(true, 154218, 6) -- Arbiter's Hammer
+	UF:AddRaidDebuff(true, 176931, 6) -- Crusader Strike
+
+	-- Azzakel
+	UF:AddRaidDebuff(true, 153727, 6) -- Fel Lash
+	UF:AddRaidDebuff(true, 153392, 6) -- Curtain of Flame
+	UF:AddRaidDebuff(true, 154018, 6) -- Conflagration
+	UF:AddRaidDebuff(true, 153500, 6) -- Fel Pool
+
+	-- Terongor
+	UF:AddRaidDebuff(true, 156921, 6, true) -- Seed of Malevonence
+	UF:AddRaidDebuff(true, 156921, 6) -- Drain Life
+	UF:AddRaidDebuff(true, 156842, 6) -- Corruption
+	UF:AddRaidDebuff(true, 156964, 6) -- Immolate
+	UF:AddRaidDebuff(true, 156857, 6) -- Rain of Fire
+	UF:AddRaidDebuff(true, 164841, 6) -- Curse of Exhaustion
+end