Merge branch 'main' into ptr

Author: Luckyone961

ElvUI/Cata/Modules/Skins/NonRaid.lua

@@ -16,10 +16,8 @@ function S:RaidInfoFrame()
 	end
 
 	for _, texture in next, {
-		_G.RaidInfoScrollFrameScrollBarBG,
-		_G.RaidInfoScrollFrameScrollBarTop,
-		_G.RaidInfoScrollFrameScrollBarBottom,
-		_G.RaidInfoScrollFrameScrollBarMiddle,
+		_G.RaidInfoScrollFrameBottom,
+		_G.RaidInfoScrollFrameTop,
 	} do
 		texture:Kill()
 	end
@@ -37,7 +35,7 @@ function S:RaidInfoFrame()
 	RaidInfoFrame:SetTemplate('Transparent')
 
 	S:HandleCloseButton(_G.RaidInfoCloseButton,RaidInfoFrame)
-	S:HandleTrimScrollBar(RaidInfoFrame.ScrollBar)
+	S:HandleScrollBar(_G.RaidInfoScrollFrame.ScrollBar)
 	S:HandleCheckBox(_G.RaidFrameAllAssistCheckButton)
 end
 

ElvUI/Core/Modules/Chat/Chat.lua

@@ -405,6 +405,7 @@ do --this can save some main file locals
 			z['Player-6112-028A3A6D']	= ElvGreen -- [Horde] Hunter
 			z['Player-6112-02A2F754']	= ElvGreen -- [Horde] Priest
 			z['Player-6112-02A39E0E']	= ElvGreen -- [Horde] Warlock
+			z['Player-6112-02BBE8AB']	= ElvGreen -- [Horde] Hunter 2
 			-- Luckyone Seasonal (5827: Living Flame EU)
 			z['Player-5827-0273D732']	= ElvGreen -- [Alliance] Hunter
 			z['Player-5827-0273D63E']	= ElvGreen -- [Alliance] Paladin

ElvUI_Libraries/Core/oUF/elements/castbar.lua

@@ -140,17 +140,17 @@ local function SpecialActive(unit, filter)
 	local index, speed = 1
 	local name, _, _, _, _, _, _, _, _, spellID = oUF:GetAuraData(unit, index, filter)
 	while name do
+		speed = specialAuras[spellID];
+
 		if speed == 0.6 then
 			return speed -- fastest speed
-		else -- we have to check the entire table otherwise just to see if a faster one is available
-			speed = specialAuras[spellID]
 		end
 
 		index = index + 1
 		name, _, _, _, _, _, _, _, _, spellID = oUF:GetAuraData(unit, index, filter)
 	end
 
-	return speed
+	return speed -- we have to check the entire table otherwise just to see if a faster one is available
 end
 -- end block
 
@@ -345,7 +345,12 @@ local function CastStart(self, real, unit, castGUID, spellID, castTime)
 	-- end block
 
 	element:SetMinMaxValues(0, element.max)
-	element:SetValue(element.duration)
+
+	if element.SetValue_ then
+		element:SetValue_(element.duration)
+	else
+		element:SetValue(element.duration)
+	end
 
 	if(element.Icon) then element.Icon:SetTexture(texture or FALLBACK_ICON) end
 	if(element.Shield) then element.Shield:SetShown(notInterruptible) end

ElvUI_Libraries/Core/oUF_Plugins/oUF_AuraBars.lua

@@ -4,9 +4,9 @@ local oUF = ns.oUF
 local VISIBLE = 1
 local HIDDEN = 0
 
+local mod = mod
 local wipe = wipe
 local pcall = pcall
-local floor = floor
 local unpack = unpack
 local tinsert = tinsert
 local infinity = math.huge
@@ -20,18 +20,26 @@ local GameTooltip = GameTooltip
 local LibDispel = LibStub('LibDispel-1.0')
 local DebuffColors = LibDispel:GetDebuffTypeColor()
 
-local DAY, HOUR, MINUTE = 86400, 3600, 60
-local function FormatTime(s)
-	if s == infinity then return end
+local YEAR, DAY, HOUR, MINUTE = 31557600, 86400, 3600, 60
+local function FormatTime(sec)
+	if sec == infinity then
+		return
+	end
 
-	if s < MINUTE then
-		return '%.1fs', s
-	elseif s < HOUR then
-		return '%dm %ds', s/60%60, s%60
-	elseif s < DAY then
-		return '%dh %dm', s/(60*60), s/60%60
+	if sec < MINUTE then
+		return '%.1fs', sec
+	elseif sec < HOUR then
+		local mins = mod(sec, HOUR) / MINUTE
+		local secs = mod(sec, MINUTE)
+		return '%dm %ds', mins, secs
+	elseif sec < DAY then
+		local hrs = mod(sec, DAY) / HOUR
+		local mins = mod(sec, HOUR) / MINUTE
+		return '%dh %dm', hrs, mins
 	else
-		return '%dd %dh', s/DAY, (s / HOUR) - (floor(s/DAY) * 24)
+		local days = mod(sec, YEAR) / DAY
+		local hrs = mod(sec, DAY) / HOUR
+		return '%dd %dh', days, hrs
 	end
 end
 
@@ -48,13 +56,23 @@ local function onLeave()
 	GameTooltip:Hide()
 end
 
+local function updateValue(bar, start)
+	local remain = (bar.expiration - GetTime()) / (bar.modRate or 1)
+
+	if start and bar.SetValue_ then
+		bar:SetValue_(remain / bar.duration)
+	else
+		bar:SetValue(remain / bar.duration)
+	end
+
+	bar.timeText:SetFormattedText(FormatTime(remain))
+end
+
 local function onUpdate(bar, elapsed)
 	bar.elapsed = (bar.elapsed or 0) + elapsed
 
 	if bar.elapsed > 0.01 then
-		local remain = (bar.expiration - GetTime()) / (bar.modRate or 1)
-		bar:SetValue(remain / bar.duration)
-		bar.timeText:SetFormattedText(FormatTime(remain))
+		updateValue(bar)
 
 		bar.elapsed = 0
 	end
@@ -140,7 +158,7 @@ local function updateBar(element, bar)
 	end
 end
 
-local function updateAura(element, unit, index, offset, filter, isDebuff, visible)
+local function auraUpdate(element, unit, index, offset, filter, isDebuff, visible)
 	local name, texture, count, debuffType, duration, expiration, source, isStealable, nameplateShowPersonal, spellID, canApplyAura, isBossDebuff, castByPlayer, nameplateShowAll, modRate, effect1, effect2, effect3 = oUF:GetAuraData(unit, index, filter)
 
 	if not name then return end
@@ -178,7 +196,13 @@ local function updateAura(element, unit, index, offset, filter, isDebuff, visibl
 		canApplyAura, isBossDebuff, castByPlayer, nameplateShowAll, modRate, effect1, effect2, effect3)
 
 	updateBar(element, bar)
-	bar:SetScript('OnUpdate', not bar.noTime and onUpdate or nil)
+
+	if bar.noTime then
+		bar:SetScript('OnUpdate', nil)
+	else
+		updateValue(bar, true)
+		bar:SetScript('OnUpdate', onUpdate)
+	end
 
 	return show and VISIBLE or HIDDEN
 end
@@ -210,7 +234,7 @@ local function filterBars(element, unit, filter, limit, isDebuff, offset, dontHi
 	local visible = 0
 	local hidden = 0
 	while(visible < limit) do
-		local result = updateAura(element, unit, index, offset, filter, isDebuff, visible)
+		local result = auraUpdate(element, unit, index, offset, filter, isDebuff, visible)
 		if(not result) then
 			break
 		elseif(result == VISIBLE) then