Skip to content

Commit

Permalink
13.56
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Feb 6, 2024
2 parents 15976bf + 95deddb commit 977fc33
Show file tree
Hide file tree
Showing 32 changed files with 166 additions and 141 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
### Version 13.56 [ February 6th 2024 ]
* Style Filter error resolved
* Group Loot frame backdrop fixed
* Wrath: Warrior Charge to CCDebuffs
* Classic SoD: Auras added to Aurawatch and Penance to Castbar Ticks
* Chat Loot tab not being created during Install
* Color Picker Alpha input box behaves better
* Tooltip not showing player names sometimes
* Updated plugin for Show Healers & Tanks on Nameplates
* Timewalking instance type added to Unitframe Fader
* Difficulty IDs updated to include Follower Dungeons

### Version 13.55 [ January 16th 2024 ]
* Darth finally got enough XP for lvl 36 (happy birthday)
* Datatext tooltip for Crest Fragments displays correctly
* Fists of Fury added to Castbar Ticks
* Minimap Menu updated with Icons
* Tank Icon setting works again

### Version 13.54 [ December 19th 2023 ]
* Raid Utility Countdown button works with other addons
* Dropdown for WIM skinned
Expand Down
47 changes: 47 additions & 0 deletions ElvUI/Classic/Filters/Filters.lua
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,26 @@ G.unitframe.aurafilters.RaidDebuffs = {
},
}

if E.ClassicSOD then
----------------------------------------------------------
-------------------- Blackfathom Deeps -------------------
----------------------------------------------------------
-- Baron Aquanis
G.unitframe.aurafilters.RaidDebuffs.spells[404806] = List(2) -- Depth Charge
-- Ghamoo-ra
G.unitframe.aurafilters.RaidDebuffs.spells[407095] = List(2) -- Crunch Armor
-- Lady Saravess
G.unitframe.aurafilters.RaidDebuffs.spells[407644] = List(2) -- Forked Lightning
G.unitframe.aurafilters.RaidDebuffs.spells[407546] = List(2) -- Freezing Arrow
-- Gelihast
G.unitframe.aurafilters.RaidDebuffs.spells[411959] = List(2) -- Fear
-- Twilight Lord Kelris
G.unitframe.aurafilters.RaidDebuffs.spells[426495] = List(2) -- Shadowy Chains
-- Aku'mai
G.unitframe.aurafilters.RaidDebuffs.spells[427625] = List(2) -- Corrosion
G.unitframe.aurafilters.RaidDebuffs.spells[428482] = List(2) -- Shadow Seep
end

--[[
RAID BUFFS:
Buffs that are provided by NPCs in raid or other PvE content.
Expand Down Expand Up @@ -620,6 +640,19 @@ G.unitframe.aurafilters.RaidBuffsElvUI = {
},
}

if E.ClassicSOD then
----------------------------------------------------------
-------------------- Blackfathom Deeps -------------------
----------------------------------------------------------
-- Baron Aquanis
G.unitframe.aurafilters.RaidBuffsElvUI.spells[404373] = List(2) -- Bubble Beam I
G.unitframe.aurafilters.RaidBuffsElvUI.spells[413664] = List(2) -- Bubble Beam II
-- Ghamoo-ra
G.unitframe.aurafilters.RaidBuffsElvUI.spells[406970] = List(2) -- Aqua Shell
-- Twilight Lord Kelris
G.unitframe.aurafilters.RaidBuffsElvUI.spells[426489] = List(2) -- Manifesting Dreams
end

G.unitframe.aurawatch = {
GLOBAL = {},
DRUID = {
Expand Down Expand Up @@ -661,6 +694,7 @@ G.unitframe.aurawatch = {
[27681] = Aura(27681, nil, 'TOPRIGHT', {0.2, 0.7, 0.2}, true), -- Prayer of Spirit
[976] = Aura(976, {10957,10958}, 'BOTTOMLEFT', {0.7, 0.7, 0.7}, true), -- Shadow Protection
[27683] = Aura(27683, nil, 'BOTTOMLEFT', {0.7, 0.7, 0.7}, true), -- Prayer of Shadow Protection
[6346] = Aura(6346, nil, 'LEFT', {0.89, 0.45, 0}), -- Fear Ward
[17] = Aura(17, {592,600,3747,6065,6066,10898,10899,10900,10901}, 'BOTTOM', {0.00, 0.00, 1.00}), -- Power Word: Shield
[139] = Aura(139, {6074,6075,6076,6077,6078,10927,10928,10929,25315}, 'BOTTOMRIGHT', {0.33, 0.73, 0.75}), -- Renew
},
Expand Down Expand Up @@ -696,6 +730,14 @@ G.unitframe.aurawatch = {
},
}

-- Season of Discovery Runes AuraWatch
if E.ClassicSOD then
G.unitframe.aurawatch.DRUID[408120] = Aura(408120, nil, 'RIGHT', {0.38, 0.19, 0.43}) -- Wild Growth
G.unitframe.aurawatch.MAGE[401417] = Aura(401417, nil, 'RIGHT', {0.38, 0.19, 0.43}) -- Regeneration
G.unitframe.aurawatch.MAGE[412510] = Aura(412510, nil, 'BOTTOMRIGHT', {0.38, 0.19, 0.17}) -- Mass Regeneration
G.unitframe.aurawatch.PRIEST[401877] = Aura(401877, nil, 'RIGHT', {0.00, 0.00, 0.90}) -- Prayer of Mending
end

-- List of spells to display ticks
G.unitframe.ChannelTicks = {
--Druid
Expand Down Expand Up @@ -784,6 +826,11 @@ G.unitframe.ChannelTicks = {
[746] = 6, -- Linen Bandage
}

if E.ClassicSOD then
G.unitframe.ChannelTicks[402261] = 3 -- Penance (DPS)
G.unitframe.ChannelTicks[402277] = 3 -- Penance (Healing)
end

-- Spells that chain, second step
G.unitframe.ChainChannelTicks = {}

Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Classic/Modules/Blizzard/ColorPicker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ local function UpdateColorTexts(r, g, b, box)
end

-- we want those /255 values
r, g, b = r*255, g*255, b*255
r, g, b = E:Round(r*255), E:Round(g*255), E:Round(b*255)

_G.ColorPPBoxH:SetText(format('%.2x%.2x%.2x', r, g, b))
_G.ColorPPBoxR:SetText(r)
Expand Down
14 changes: 2 additions & 12 deletions ElvUI/Classic/Modules/Skins/Misc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local S = E:GetModule('Skins')

local _G = _G
local next, unpack = next, unpack
local pairs, ipairs = pairs, ipairs
local pairs = pairs

local hooksecurefunc = hooksecurefunc
local UnitIsUnit = UnitIsUnit
Expand Down Expand Up @@ -104,24 +104,14 @@ function S:BlizzardMiscFrames()
end
end)

local ChatMenus = {
_G.ChatMenu,
_G.EmoteMenu,
_G.LanguageMenu,
_G.VoiceMacroMenu,
}

for _, frame in ipairs(ChatMenus) do
for _, frame in next, { _G.ChatMenu.NineSlice, _G.EmoteMenu.NineSlice, _G.LanguageMenu.NineSlice, _G.VoiceMacroMenu.NineSlice } do
if frame == _G.ChatMenu then
frame:HookScript('OnShow', function(menu) menu:SetTemplate('Transparent', true) menu:SetBackdropColor(unpack(E.media.backdropfadecolor)) menu:ClearAllPoints() menu:Point('BOTTOMLEFT', _G.ChatFrame1, 'TOPLEFT', 0, 30) end)
else
frame:HookScript('OnShow', function(menu) menu:SetTemplate('Transparent', true) menu:SetBackdropColor(unpack(E.media.backdropfadecolor)) end)
end
end

-- Emotes NineSlice
_G.ChatMenu.NineSlice:SetTemplate()

-- reskin popup buttons
for i = 1, 4 do
local StaticPopup = _G['StaticPopup'..i]
Expand Down
1 change: 1 addition & 0 deletions ElvUI/Core/Defaults/Profile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,7 @@ local UF_Fader = {
dynamicflight = false,
instanceDifficulties = {
none = false,
timewalking = false,
dungeonNormal = false,
dungeonHeroic = false,
dungeonMythic = false,
Expand Down
4 changes: 3 additions & 1 deletion ElvUI/Core/General/API.lua
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,9 @@ function E:LoadAPI()
local localized = (x == 3 and female) or male
copy.className = localized

E.SpecInfoBySpecClass[name..' '..localized] = copy
if localized then
E.SpecInfoBySpecClass[name..' '..localized] = copy
end
end
end
end
Expand Down
25 changes: 16 additions & 9 deletions ElvUI/Core/General/Install.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ local PlaySound = PlaySound
local CreateFrame = CreateFrame
local UIFrameFadeOut = UIFrameFadeOut
local ChangeChatColor = ChangeChatColor
local FCF_DockFrame = FCF_DockFrame
local FCF_SetWindowName = FCF_SetWindowName
local FCF_StopDragging = FCF_StopDragging
local FCF_UnDockFrame = FCF_UnDockFrame
local FCF_OpenNewWindow = FCF_OpenNewWindow
local FCF_ResetChatWindow = FCF_ResetChatWindow
local FCF_ResetChatWindows = FCF_ResetChatWindows
local FCF_SetChatWindowFontSize = FCF_SetChatWindowFontSize
local FCF_SavePositionAndDimensions = FCF_SavePositionAndDimensions
Expand All @@ -33,7 +35,7 @@ local VoiceTranscriptionFrame_UpdateVisibility = VoiceTranscriptionFrame_UpdateV
local VoiceTranscriptionFrame_UpdateVoiceTab = VoiceTranscriptionFrame_UpdateVoiceTab

local CLASS, CONTINUE, PREVIOUS = CLASS, CONTINUE, PREVIOUS
local LOOT, GENERAL, TRADE = LOOT, GENERAL, TRADE
local VOICE, LOOT, GENERAL, TRADE = VOICE, LOOT, GENERAL, TRADE
local GUILD_EVENT_LOG = GUILD_EVENT_LOG

-- GLOBALS: ElvUIInstallFrame
Expand Down Expand Up @@ -67,17 +69,22 @@ local function ToggleChatColorNamesByClassGroup(checked, group)
end

function E:SetupChat(noDisplayMsg)
local chats = _G.CHAT_FRAMES
FCF_ResetChatWindows()

local rightChatFrame = FCF_OpenNewWindow(LOOT)
FCF_UnDockFrame(rightChatFrame)
-- force initialize the tts chat (it doesn't get shown unless you use it)
local voiceChat = _G[chats[3]]
FCF_ResetChatWindow(voiceChat, VOICE)
FCF_DockFrame(voiceChat, 3)

for _, name in next, _G.CHAT_FRAMES do
local rightChat = FCF_OpenNewWindow(LOOT)
FCF_UnDockFrame(rightChat)

for id, name in next, chats do
local frame = _G[name]
local id = frame:GetID()

if E.private.chat.enable then
CH:FCFTab_UpdateColors(CH:GetTab(_G[name]))
CH:FCFTab_UpdateColors(CH:GetTab(frame))
end

if id == 1 then
Expand Down Expand Up @@ -109,14 +116,14 @@ function E:SetupChat(noDisplayMsg)

-- keys taken from `ChatTypeGroup` which weren't added above to ChatFrame1
chatGroup = { E.Retail and 'PING' or nil, 'COMBAT_XP_GAIN', 'COMBAT_HONOR_GAIN', 'COMBAT_FACTION_CHANGE', 'SKILL', 'LOOT', 'CURRENCY', 'MONEY' }
ChatFrame_RemoveAllMessageGroups(rightChatFrame)
ChatFrame_RemoveAllMessageGroups(rightChat)
for _, v in next, chatGroup do
ChatFrame_AddMessageGroup(rightChatFrame, v)
ChatFrame_AddMessageGroup(rightChat, v)
end

ChatFrame_AddChannel(_G.ChatFrame1, GENERAL)
ChatFrame_RemoveChannel(_G.ChatFrame1, TRADE)
ChatFrame_AddChannel(rightChatFrame, TRADE)
ChatFrame_AddChannel(rightChat, TRADE)

-- set the chat groups names in class color to enabled for all chat groups which players names appear
chatGroup = { 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', 'OFFICER', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'COMMUNITIES_CHANNEL' }
Expand Down
66 changes: 1 addition & 65 deletions ElvUI/Core/General/Toolkit.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,60 +50,6 @@ local function DisablePixelSnap(frame)
end
end

local function FixStatusBarMinCurPlease(frame, value)
local MIN = frame:GetMinMaxValues()
if MIN and (value <= MIN) then -- gg blizz, idk how you manage this one lol
local style = frame:GetFillStyle()
if style ~= 'STANDARD' and style ~= 'REVERSE' then return end

local width, height = frame:GetSize()
if not width or not height then return end

local texture = frame:GetStatusBarTexture()
if not texture then return end

texture:ClearAllPoints()

local reverse = frame:GetReverseFill()
local orientation = frame:GetOrientation()
if orientation == 'VERTICAL' then
if reverse then
texture:SetPoint('TOPLEFT', 0, 0)
texture:SetPoint('TOPRIGHT', 0, 0)
texture:SetPoint('BOTTOMLEFT', 0, height)
texture:SetPoint('BOTTOMRIGHT', 0, height)
else
texture:SetPoint('TOPLEFT', 0, -height)
texture:SetPoint('TOPRIGHT', 0, -height)
texture:SetPoint('BOTTOMLEFT', 0, 0)
texture:SetPoint('BOTTOMRIGHT', 0, 0)
end
else -- horizontal
if reverse then
texture:SetPoint('TOPLEFT', width, 0)
texture:SetPoint('TOPRIGHT', 0, 0)
texture:SetPoint('BOTTOMLEFT', width, 0)
texture:SetPoint('BOTTOMRIGHT', 0, 0)
else
texture:SetPoint('TOPLEFT', 0, 0)
texture:SetPoint('TOPRIGHT', -width, 0)
texture:SetPoint('BOTTOMLEFT', 0, 0)
texture:SetPoint('BOTTOMRIGHT', -width, 0)
end
end
end
end

local function FixMinCurDuringValue(frame, value)
FixStatusBarMinCurPlease(frame, value)
end

local function FixMinCurDuringTexture(frame)
DisablePixelSnap(frame)

FixStatusBarMinCurPlease(frame, frame:GetValue())
end

local function BackdropFrameLevel(frame, level)
frame:SetFrameLevel(level)

Expand Down Expand Up @@ -529,25 +475,15 @@ local function addapi(object)

if not object.DisabledPixelSnap and (mk.SetSnapToPixelGrid or mk.SetStatusBarTexture or mk.SetColorTexture or mk.SetVertexColor or mk.CreateTexture or mk.SetTexCoord or mk.SetTexture) then
if mk.SetSnapToPixelGrid then hooksecurefunc(mk, 'SetSnapToPixelGrid', WatchPixelSnap) end
if mk.SetStatusBarTexture then hooksecurefunc(mk, 'SetStatusBarTexture', DisablePixelSnap) end
if mk.SetColorTexture then hooksecurefunc(mk, 'SetColorTexture', DisablePixelSnap) end
if mk.SetVertexColor then hooksecurefunc(mk, 'SetVertexColor', DisablePixelSnap) end
if mk.CreateTexture then hooksecurefunc(mk, 'CreateTexture', DisablePixelSnap) end
if mk.SetTexCoord then hooksecurefunc(mk, 'SetTexCoord', DisablePixelSnap) end
if mk.SetTexture then hooksecurefunc(mk, 'SetTexture', DisablePixelSnap) end

if not E.Classic and mk.SetStatusBarTexture then
hooksecurefunc(mk, 'SetStatusBarTexture', DisablePixelSnap)
end

mk.DisabledPixelSnap = true
end

if E.Classic and not object.fixTheStatusBarsPlease and mk.SetStatusBarTexture then
hooksecurefunc(mk, 'SetValue', FixMinCurDuringValue)
hooksecurefunc(mk, 'SetStatusBarTexture', FixMinCurDuringTexture)

object.fixTheStatusBarsPlease = true
end
end

local handled = {Frame = true}
Expand Down
2 changes: 2 additions & 0 deletions ElvUI/Core/Modules/Auras/Auras.lua
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,8 @@ function A:CreateAuraHeader(filter)
end

function A:Initialize()
if E.Classic then return end -- secure headers broken

if E.private.auras.disableBlizzard then
_G.BuffFrame:Kill()

Expand Down
1 change: 1 addition & 0 deletions ElvUI/Core/Modules/DataTexts/Difficulty.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ local DiffIDLabel = { -- also has IDs maintained in Nameplate StyleFilters
['PvP'] = { 25, 29, 32, 34, 45 },
['WF'] = { 147 },
['WFH'] = { 149 },
['FD'] = { 205 },
}

local IDTexture = {
Expand Down
9 changes: 5 additions & 4 deletions ElvUI/Core/Modules/Nameplates/StyleFilter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ local IsPlayerSpell = IsPlayerSpell
local IsResting = IsResting
local IsSpellKnownOrOverridesKnown = IsSpellKnownOrOverridesKnown
local UnitAffectingCombat = UnitAffectingCombat
local UnitAura = UnitAura
local UnitCanAttack = UnitCanAttack
local UnitExists = UnitExists
local UnitGroupRolesAssigned = UnitGroupRolesAssigned
Expand Down Expand Up @@ -147,7 +146,9 @@ NP.TriggerConditions = {
[175] = 'legacy10normal',
[176] = 'legacy25normal',
[193] = 'legacy10heroic',
[194] = 'legacy25heroic'
[194] = 'legacy25heroic',
-- follower dungeon
[205] = 'follower'
}
}

Expand Down Expand Up @@ -1201,7 +1202,7 @@ function NP:StyleFilterConditionCheck(frame, filter, trigger)
if frame.Buffs_ and trigger.buffs then
-- Has Stealable
if trigger.buffs.hasStealable or trigger.buffs.hasNoStealable then
local isStealable = NP:StyleFilterDispelCheck(frame, filter)
local isStealable = NP:StyleFilterDispelCheck(frame, 'HELPFUL')
if (trigger.buffs.hasStealable and isStealable) or (trigger.buffs.hasNoStealable and not isStealable) then passed = true else return end
end

Expand All @@ -1218,7 +1219,7 @@ function NP:StyleFilterConditionCheck(frame, filter, trigger)
if frame.Debuffs_ and trigger.debuffs and trigger.debuffs.names and next(trigger.debuffs.names) then
-- Has Dispellable
if trigger.debuffs.hasDispellable or trigger.debuffs.hasNoDispellable then
local canDispel = NP:StyleFilterDispelCheck(frame, filter)
local canDispel = NP:StyleFilterDispelCheck(frame, 'HARMFUL')
if (trigger.debuffs.hasDispellable and canDispel) or (trigger.debuffs.hasNoDispellable and not canDispel) then passed = true else return end
end

Expand Down
6 changes: 1 addition & 5 deletions ElvUI/Core/Modules/Tooltip/Tooltip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ function TT:SetUnitText(tt, unit, isPlayerUnit)

local nameColor = E:ClassColor(class) or PRIEST_COLOR

if TT.db.playerTitles and pvpName then
if TT.db.playerTitles and pvpName and pvpName ~= '' then
name = pvpName
end

Expand Down Expand Up @@ -1019,10 +1019,6 @@ function TT:Initialize()
statusBar:Height(TT.db.healthBar.height)
statusBar:SetScript('OnValueChanged', nil) -- Do we need to unset this?

if E.Classic then
statusBar:SetMinMaxValues(-0.00001, 1)
end

GameTooltip.StatusBar = statusBar

local statusText = statusBar:CreateFontString(nil, 'OVERLAY')
Expand Down
Loading

0 comments on commit 977fc33

Please sign in to comment.