Merge branch 'main' into ptr

Author: kodewdle

ElvUI/Core/Defaults/Global.lua

@@ -97,7 +97,8 @@ G.datatexts = {
 		Parry = { decimalLength = 1 },
 		Block = { decimalLength = 1 },
 		['Mana Regen'] = { Label = '', NoLabel = false, decimalLength = 1 },
-		HealPower = { Label = '', NoLabel = false }
+		HealPower = { Label = '', NoLabel = false },
+		['Spell Hit'] = { Label = '', NoLabel = false, decimalLength = 0 }
 	},
 	newPanelInfo = {
 		growth = 'HORIZONTAL',

ElvUI/Core/General/Tags.lua

@@ -44,12 +44,8 @@ local UnitGUID = UnitGUID
 local UnitHealthMax = UnitHealthMax
 local UnitIsAFK = UnitIsAFK
 local UnitIsBattlePetCompanion = UnitIsBattlePetCompanion
-local UnitIsConnected = UnitIsConnected
-local UnitIsDead = UnitIsDead
-local UnitIsDeadOrGhost = UnitIsDeadOrGhost
 local UnitIsDND = UnitIsDND
 local UnitIsFeignDeath = UnitIsFeignDeath
-local UnitIsGhost = UnitIsGhost
 local UnitIsPlayer = UnitIsPlayer
 local UnitIsPVP = UnitIsPVP
 local UnitIsPVPFreeForAll = UnitIsPVPFreeForAll
@@ -79,7 +75,7 @@ local SPEC_MONK_BREWMASTER = SPEC_MONK_BREWMASTER
 local PVP = PVP
 
 -- GLOBALS: Hex, _TAGS, _COLORS -- added by oUF
--- GLOBALS: UnitPower, UnitHealth, UnitName, UnitClass -- override during testing groups
+-- GLOBALS: UnitPower, UnitHealth, UnitName, UnitClass, UnitIsDead, UnitIsGhost, UnitIsDeadOrGhost, UnitIsConnected -- override during testing groups
 -- GLOBALS: GetTitleNPC, Abbrev, GetClassPower, GetQuestData, UnitEffectiveLevel, NameHealthColor -- custom ones we made
 
 local RefreshNewTags -- will turn true at EOF

ElvUI/Core/Modules/DataTexts/SpellHit.lua

@@ -8,14 +8,24 @@ local GetCombatRatingBonus = GetCombatRatingBonus
 local STAT_CATEGORY_ENHANCEMENTS = STAT_CATEGORY_ENHANCEMENTS
 local CR_HIT_SPELL = CR_HIT_SPELL
 
-local displayString = ''
+local displayString, db = ''
 
 local function OnEvent(self)
-	self.text:SetFormattedText(displayString, E.Classic and GetSpellHitModifier() or GetCombatRatingBonus(CR_HIT_SPELL) or 0)
+	local spellHit = E.Classic and GetSpellHitModifier() or GetCombatRatingBonus(CR_HIT_SPELL) or 0
+
+	if db.NoLabel then
+		self.text:SetFormattedText(displayString, spellHit)
+	else
+		self.text:SetFormattedText(displayString, db.Label ~= '' and db.Label or L["Spell Hit"]..': ', spellHit)
+	end
 end
 
-local function ApplySettings(_, hex)
-	displayString = strjoin('', L["Spell Hit"], ': ', hex, '%.2f%%|r')
+local function ApplySettings(self, hex)
+	if not db then
+		db = E.global.datatexts.settings[self.name]
+	end
+
+	displayString = strjoin('', db.NoLabel and '' or '%s', hex, '%.'..db.decimalLength..'f%%|r')
 end
 
 DT:RegisterDatatext('Spell Hit', STAT_CATEGORY_ENHANCEMENTS, { 'UNIT_STATS', 'UNIT_AURA' }, OnEvent, nil, nil, nil, nil, L["Spell Hit"], nil, ApplySettings)

ElvUI/Core/Modules/Nameplates/StyleFilter.lua

@@ -998,8 +998,8 @@ function NP:StyleFilterConditionCheck(frame, filter, trigger)
 	end
 
 	-- My Role
-	if trigger.role and (trigger.role.tank or trigger.role.healer or trigger.role.damager) then
-		if trigger.role[NP.TriggerConditions.roles[E.myrole]] then passed = true else return end
+	if trigger.myRole and (trigger.myRole.tank or trigger.myRole.healer or trigger.myRole.damager) then
+		if trigger.myRole[NP.TriggerConditions.roles[E.myrole]] then passed = true else return end
 	end
 
 	-- Unit Type

ElvUI/Core/Modules/UnitFrames/ConfigEnviroment.lua

@@ -2,8 +2,8 @@ local E, L, V, P, G = unpack(ElvUI)
 local UF = E:GetModule('UnitFrames')
 local ElvUF = E.oUF
 
-local _G = _G
-local setmetatable, getfenv, setfenv = setmetatable, getfenv, setfenv
+local _G, getfenv, setfenv = _G, getfenv, setfenv
+local setmetatable, rawget, rawset = setmetatable, rawget, rawset
 local type, pairs, min, random, strfind, next = type, pairs, min, random, strfind, next
 
 local UnitName = UnitName
@@ -35,13 +35,24 @@ local attributeBlacklist = {
 	showSolo = true
 }
 
-local colorTags = {
+local allowTags = {
+	dead = true,
+	ghost = true,
+	status = true,
+	resting = true,
+	offline = true,
 	healthcolor = true,
 	powercolor = true,
 	classcolor = true,
 	namecolor = true
 }
 
+local statusChanceDefault = 10
+local statusChance = {
+	UnitIsConnected = 15, -- less likely
+	UnitIsDeadOrGhost = 5 -- more likely
+}
+
 local PowerType = Enum.PowerType
 local classPowers = {
 	[0] = PowerType.Mana,
@@ -76,10 +87,30 @@ local function envUnit(arg1)
 	end
 end
 
+local function generateStatusFunc(tag)
+	return function(arg1)
+		local unit, real = envUnit(arg1)
+		if real then
+			return _G[tag](unit)
+		end
+
+		local chance = random(1, statusChance[tag] or statusChanceDefault)
+		if tag == 'UnitIsConnected' then
+			return chance ~= 1
+		else
+			return chance == 1
+		end
+	end
+end
+
 local function createConfigEnv()
 	if configEnv then return end
 
-	configEnv = setmetatable({
+	UF.ConfigEnv = {
+		Env = ElvUF.Tags.Env,
+		_VARS = ElvUF.Tags.Vars,
+		_COLORS = ElvUF.colors,
+		ColorGradient = ElvUF.ColorGradient,
 		UnitPower = function(arg1, displayType)
 			local unit, real = envUnit(arg1)
 			if real then
@@ -128,27 +159,29 @@ local function createConfigEnv()
 
 			local classToken = CLASS_SORT_ORDER[random(1, NUM_CLASS_ORDER)]
 			return LOCALIZED_CLASS_NAMES_MALE[classToken], classToken
-		end,
-		Env = ElvUF.Tags.Env,
-		_VARS = ElvUF.Tags.Vars,
-		_COLORS = ElvUF.colors,
-		ColorGradient = ElvUF.ColorGradient,
-	}, {
+		end
+	}
+
+	for _, name in next, { 'IsResting', 'UnitIsDead', 'UnitIsGhost', 'UnitIsDeadOrGhost', 'UnitIsConnected' } do
+		UF.ConfigEnv[name] = generateStatusFunc(name)
+	end
+
+	configEnv = setmetatable(UF.ConfigEnv, {
 		__index = function(obj, key)
 			local envValue = ElvUF.Tags.Env[key]
 			if envValue ~= nil then
 				return envValue
 			end
 
-			return obj[key]
+			return rawget(obj, key)
 		end,
-		__newindex = function(_, key, value)
-			_G[key] = value
+		__newindex = function(obj, key, value)
+			rawset(obj, key, value)
 		end,
 	})
 
 	for tag, func in next, ElvUF.Tags.Methods do
-		if colorTags[tag] or UF.overrideTags[tag] or (strfind(tag, '^name:') or strfind(tag, '^health:') or strfind(tag, '^power:')) then
+		if allowTags[tag] or UF.overrideTags[tag] or (strfind(tag, '^name:') or strfind(tag, '^health:') or strfind(tag, '^power:')) then
 			overrideFuncs[tag] = func
 		end
 	end

ElvUI/Core/Modules/UnitFrames/Elements/Health.lua

@@ -2,19 +2,19 @@ local E, L, V, P, G = unpack(ElvUI)
 local UF = E:GetModule('UnitFrames')
 local ElvUF = E.oUF
 
+local _G = _G
 local random = random
 local strmatch = strmatch
+
 local CreateFrame = CreateFrame
+local UnitInPartyIsAI = UnitInPartyIsAI
+local UnitIsCharmed = UnitIsCharmed
+local UnitIsEnemy = UnitIsEnemy
+local UnitIsFriend = UnitIsFriend
+local UnitIsPlayer = UnitIsPlayer
 local UnitIsTapDenied = UnitIsTapDenied
 local UnitReaction = UnitReaction
-local UnitIsPlayer = UnitIsPlayer
 local UnitClass = UnitClass
-local UnitIsConnected = UnitIsConnected
-local UnitIsDeadOrGhost = UnitIsDeadOrGhost
-local UnitIsCharmed = UnitIsCharmed
-local UnitIsFriend = UnitIsFriend
-local UnitIsEnemy = UnitIsEnemy
-local UnitInPartyIsAI = UnitInPartyIsAI
 
 local BACKDROP_MULT = 0.35
 
@@ -252,19 +252,25 @@ local HOSTILE_REACTION = 2
 function UF:PostUpdateHealthColor(unit, r, g, b)
 	local parent = self:GetParent()
 	local colors = E.db.unitframe.colors
+	local env = (parent.isForced and UF.ConfigEnv) or _G
 
 	local isTapped = UnitIsTapDenied(unit)
-	local isDeadOrGhost = UnitIsDeadOrGhost(unit)
+	local isDeadOrGhost = env.UnitIsDeadOrGhost(unit)
 	local healthBreak = not isTapped and colors.healthBreak
 
 	local color -- main bar
 	if not b then
 		r, g, b = colors.health.r, colors.health.g, colors.health.b
 	end
 
+	-- Recheck offline status when forced
+	if parent.isForced and self.colorDisconnected and not env.UnitIsConnected(unit) then
+		color = parent.colors.disconnected
+	end
+
 	-- Charmed player should have hostile color
 	if unit and (strmatch(unit, 'raid%d+') or strmatch(unit, 'party%d+')) then
-		if not isDeadOrGhost and UnitIsConnected(unit) and UnitIsCharmed(unit) and UnitIsEnemy('player', unit) then
+		if not isDeadOrGhost and env.UnitIsConnected(unit) and UnitIsCharmed(unit) and UnitIsEnemy('player', unit) then
 			color = parent.colors.reaction[HOSTILE_REACTION]
 		end
 	end
@@ -339,14 +345,11 @@ end
 function UF:PostUpdateHealth(_, cur)
 	local parent = self:GetParent()
 	if parent.isForced then
-		cur = random(1, 100)
-		local max = 100
-
-		self.cur = cur
-		self.max = max
+		self.cur = random(1, 100)
+		self.max = 100
 
-		self:SetMinMaxValues(0, max)
-		self:SetValue(cur)
+		self:SetMinMaxValues(0, self.max)
+		self:SetValue(self.cur)
 	elseif parent.ResurrectIndicator then
 		parent.ResurrectIndicator:SetAlpha(cur == 0 and 1 or 0)
 	end