Work on Ascension Backport

This commit is contained in:
andrew6180
2024-05-17 15:08:08 -07:00
parent 5de2a04b8c
commit bb7e0d2c27
325 changed files with 26995 additions and 41741 deletions
@@ -331,14 +331,14 @@ local createGenericBar = function(self, index) --~create ~generic ~creategeneric
---@type texture shown when the mouse hoverover this bar
local hightlightTexture = statusBar:CreateTexture("$parentTextureHighlight", "highlight")
hightlightTexture:SetColorTexture(1, 1, 1, 0.2)
hightlightTexture:SetTexture(1, 1, 1, 0.2)
hightlightTexture:SetAllPoints()
statusBar.highlightTexture = hightlightTexture
---@type texture background texture
local backgroundTexture = statusBar:CreateTexture("$parentTextureBackground", "border")
backgroundTexture:SetAllPoints()
backgroundTexture:SetColorTexture(.05, .05, .05)
backgroundTexture:SetTexture(.05, .05, .05)
backgroundTexture:SetAlpha(1)
statusBar.backgroundTexture = backgroundTexture
@@ -68,14 +68,14 @@ function spellsTab.CreatePhaseBar(self, index) --~create ~createphase ~phasebar
---@type texture shown when the mouse hoverover this bar
local hightlightTexture = statusBar:CreateTexture("$parentTextureHighlight", "highlight")
hightlightTexture:SetColorTexture(1, 1, 1, 0.2)
hightlightTexture:SetTexture(1, 1, 1, 0.2)
hightlightTexture:SetAllPoints()
statusBar.highlightTexture = hightlightTexture
---@type texture background texture
local backgroundTexture = statusBar:CreateTexture("$parentTextureBackground", "border")
backgroundTexture:SetAllPoints()
backgroundTexture:SetColorTexture(.05, .05, .05)
backgroundTexture:SetTexture(.05, .05, .05)
backgroundTexture:SetAlpha(1)
statusBar.backgroundTexture = backgroundTexture
@@ -502,7 +502,7 @@ local spellBlockMixin = {
---@param self breakdownspellblock
SetColor = function(self, ...)
local r, g, b, a = DF:ParseColors(...)
self.statusBarTexture:SetColorTexture(r, g, b, a)
self.statusBarTexture:SetTexture(r, g, b, a)
end,
}
@@ -516,7 +516,7 @@ function spellsTab.CreateSpellBlock(spellBlockContainer, index) --~breakdownspel
detailsFramework:Mixin(spellBlock, spellBlockMixin)
local statusBarTexture = spellBlock:CreateTexture("$parentTexture", "artwork")
statusBarTexture:SetColorTexture(unpack(CONST_SPELLBLOCK_DEFAULT_COLOR))
statusBarTexture:SetTexture(unpack(CONST_SPELLBLOCK_DEFAULT_COLOR))
statusBarTexture:SetPoint("topleft", spellBlock, "topleft", 1, -1)
statusBarTexture:SetPoint("bottomleft", spellBlock, "bottomleft", 1, 1)
spellBlock.statusBarTexture = statusBarTexture
@@ -1508,7 +1508,7 @@ function spellsTab.CreateSpellBar(self, index) --~spellbar ~spellline ~spell ~cr
---@type texture shown when the mouse hoverover this spellbar
local hightlightTexture = statusBar:CreateTexture("$parentTextureHighlight", "highlight")
hightlightTexture:SetColorTexture(1, 1, 1, 0.2)
hightlightTexture:SetTexture(1, 1, 1, 0.2)
hightlightTexture:SetAllPoints()
statusBar.highlightTexture = hightlightTexture
@@ -1538,7 +1538,6 @@ function spellsTab.CreateSpellBar(self, index) --~spellbar ~spellline ~spell ~cr
local spellIcon = spellIconFrame:CreateTexture("$parentTexture", "overlay")
spellIcon:SetAllPoints()
spellIcon:SetTexCoord(.1, .9, .1, .9)
detailsFramework:SetMask(spellIcon, Details:GetTextureAtlas("iconmask"))
spellBar.spellIcon = spellIcon
--create a square frame which is placed at the right side of the line to show which targets for damaged by the spell
@@ -566,14 +566,14 @@ function spellsTab.CreateTargetBar(self, index) --~create ~target ~createtarget
---@type texture shown when the mouse hoverover this bar
local hightlightTexture = statusBar:CreateTexture("$parentTextureHighlight", "highlight")
hightlightTexture:SetColorTexture(1, 1, 1, 0.2)
hightlightTexture:SetTexture(1, 1, 1, 0.2)
hightlightTexture:SetAllPoints()
statusBar.highlightTexture = hightlightTexture
---@type texture background texture
local backgroundTexture = statusBar:CreateTexture("$parentTextureBackground", "border")
backgroundTexture:SetAllPoints()
backgroundTexture:SetColorTexture(.05, .05, .05)
backgroundTexture:SetTexture(.05, .05, .05)
backgroundTexture:SetAlpha(1)
statusBar.backgroundTexture = backgroundTexture
@@ -799,7 +799,7 @@ function Details:CreateBreakdownWindow()
breakdownWindowFrame.SummaryWindowWidgets:Hide()
local scaleBar = detailsFramework:CreateScaleBar(breakdownWindowFrame, Details.player_details_window)
scaleBar.label:AdjustPointsOffset(-6, 3)
scaleBar.label:SetPointOffset(-6, 3)
breakdownWindowFrame:SetScale(Details.player_details_window.scale)
--class icon
@@ -75,7 +75,6 @@ local createAuraTabOnBreakdownWindow = function(tab, frame)
local iconTexture = line:CreateTexture("$parentIcon", "overlay")
iconTexture:SetSize(scroll_line_height -2 , scroll_line_height - 2)
iconTexture:SetAlpha(0.924)
detailsFramework:SetMask(iconTexture, Details:GetTextureAtlas("iconmask"))
local nameLabel = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
local uptimeLabel = line:CreateFontString("$parentUptime", "overlay", "GameFontNormal")
@@ -252,22 +251,6 @@ local aurasTabFillCallback = function(tab, player, combat)
end
end
--check if this player has a augmentation buff container
local augmentedBuffContainer = utilityActor.received_buffs_spells
if (augmentedBuffContainer) then
for sourceNameSpellId, spellTable in augmentedBuffContainer:ListSpells() do
local sourceName, spellId = strsplit("@", sourceNameSpellId)
spellId = tonumber(spellId)
local spellName, _, spellIcon = Details.GetSpellInfo(spellId)
if (spellName) then
sourceName = detailsFramework:RemoveRealmName(sourceName)
local uptime = spellTable.uptime or 0
table.insert(newAuraTable, {spellIcon, spellName .. " [" .. sourceName .. "]", uptime, spellTable.appliedamt, spellTable.refreshamt, uptime / combatTime * 100, spellID = spellId, bReceived = true})
end
end
end
table.sort(newAuraTable, Details.Sort3)
tab.BuffScroll:SetData(newAuraTable)
tab.BuffScroll:Refresh()
@@ -1950,7 +1950,7 @@ function Details:InitializeCompareTab()
local flashAnimation = tabOBject:CreateTexture(nil, "overlay")
flashAnimation:SetPoint("topleft", tabOBject.widget, "topleft", 1, -1)
flashAnimation:SetPoint("bottomright", tabOBject.widget, "bottomright", -1, 1)
flashAnimation:SetColorTexture(1, 1, 1)
flashAnimation:SetTexture(1, 1, 1)
local flashHub = DetailsFramework:CreateAnimationHub (flashAnimation, function() flashAnimation:Show() end, function() flashAnimation:Hide() end)
DetailsFramework:CreateAnimation(flashHub, "alpha", 1, 1, 0, 0.3)
@@ -204,15 +204,7 @@ local createPlayerScrollBox = function(breakdownWindowFrame, breakdownSideMenu,
self.specIcon:SetTexture(specIcon)
self.specIcon:SetTexCoord(L, R, T, B)
if (DetailsFramework.IsTimewalkWoW()) then
specRole = "NONE"
else
---@type number
local spec = self.playerObject.spec
if (spec) then
specRole = select(5, GetSpecializationInfoByID(self.playerObject.spec))
end
end
specRole = "NONE"
else
self.specIcon:SetTexture("")
end
@@ -340,7 +332,6 @@ local createPlayerScrollBox = function(breakdownWindowFrame, breakdownSideMenu,
local specIcon = OTTFrame:CreateTexture("$parentSpecIcon", "artwork")
specIcon:SetSize(headerTable[1].width - 1, headerTable[1].width - 1)
specIcon:SetAlpha(0.834)
detailsFramework:SetMask(specIcon, Details:GetTextureAtlas("iconmask"))
local roleIcon = OTTFrame:CreateTexture("$parentRoleIcon", "overlay")
roleIcon:SetSize((player_line_height-2) / 2, (player_line_height-2) / 2)
@@ -420,7 +411,7 @@ local createPlayerScrollBox = function(breakdownWindowFrame, breakdownSideMenu,
breakdownWindowFrame.PlayerSelectionHeader:SetPoint("topright", playerSelectionHeaderFrame, "bottomright", 0, -2)
detailsFramework:ApplyStandardBackdrop(breakdownWindowFrame.PlayerSelectionHeader)
breakdownWindowFrame.PlayerSelectionHeader.__background:SetColorTexture(.60, .60, .60)
breakdownWindowFrame.PlayerSelectionHeader.__background:SetTexture(.60, .60, .60)
--create the scrollbox lines
for i = 1, scrollbox_lines do
@@ -620,7 +620,7 @@ function spellsTab.OnCreateTabCallback(tabButton, tabFrame) --~init
backgroundTexture:SetPoint("bottomright", ROB, "bottomright", 0, 0)
ROB.backgroundTexture = backgroundTexture
backgroundTexture:SetColorTexture(.1, .1, .1, 0.834)
backgroundTexture:SetTexture(.1, .1, .1, 0.834)
local text = ROB:CreateFontString(nil, "overlay", "GameFontNormal")
text:SetText("REPORT")
@@ -666,7 +666,7 @@ function spellsTab.UpdateBarSettings(bar)
--bar.statusBar:GetStatusBarTexture():SetTexture(Details.breakdown_spell_tab.statusbar_texture)
Details222.BreakdownWindow.ApplyTextureSettings(bar.statusBar)
--bar.statusBar.backgroundTexture:SetColorTexture(unpack(Details.breakdown_spell_tab.statusbar_background_color))
--bar.statusBar.backgroundTexture:SetTexture(unpack(Details.breakdown_spell_tab.statusbar_background_color))
--bar.statusBar.backgroundTexture:SetAlpha(Details.breakdown_spell_tab.statusbar_background_alpha)
detailsFramework:SetTemplate(bar.statusBar.backgroundTexture, "STANDARD_GRAY")