Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

Work on Ascension Backport

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
frames/anime.lua
+190 -153
View File
@@ -91,8 +91,15 @@ function _detalhes.PlayBestDamageOnGuild (damage)
DetailsNewDamageRecord:SetSize(300, 300)
--single animation group
local MainAnimationGroup = DetailsNewDamageRecord:CreateAnimationGroup ("DetailsNewDamageRecordAnimationGroup")
MainAnimationGroup:SetLooping ("NONE")
local MainAnimationGroup = {
Play = function()
for _, animGroup in ipairs(self) do
if animGroup.Play then
animGroup.Play()
end
end
end
}
--widgets:
@@ -107,23 +114,30 @@ function _detalhes.PlayBestDamageOnGuild (damage)
--animations for BaseTexture
BaseTexture.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
BaseTexture.alpha:SetTarget (BaseTexture)
BaseTexture.alpha:SetOrder (1)
BaseTexture.alpha:SetDuration(0.14869952201843)
BaseTexture.alpha:SetStartDelay (0)
BaseTexture.alpha:SetEndDelay (0)
BaseTexture.alpha:SetFromAlpha (0)
BaseTexture.alpha:SetToAlpha (1)
BaseTexture.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
BaseTexture.alpha:SetTarget (BaseTexture)
BaseTexture.alpha:SetOrder (2)
BaseTexture.alpha:SetDuration(1)
BaseTexture.alpha:SetStartDelay (5)
BaseTexture.alpha:SetEndDelay (0)
BaseTexture.alpha:SetFromAlpha (1)
BaseTexture.alpha:SetToAlpha (0)
do
local animGroup = BaseTexture:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (1)
alpha:SetDuration(0)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.14869952201843)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(1)
alpha:SetStartDelay (5)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
end
----------------------------------------------
local BigFlash = DetailsNewDamageRecord:CreateTexture("BigFlashTexture", "OVERLAY")
@@ -141,23 +155,30 @@ function _detalhes.PlayBestDamageOnGuild (damage)
BigFlash:SetBlendMode("ADD")
--animations for BigFlash
do
local animGroup = BigFlash:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (1)
alpha:SetDuration(0)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
BigFlash.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
BigFlash.alpha:SetTarget (BigFlash)
BigFlash.alpha:SetOrder (1)
BigFlash.alpha:SetDuration(0.11600000411272)
BigFlash.alpha:SetStartDelay (0)
BigFlash.alpha:SetEndDelay (0)
BigFlash.alpha:SetFromAlpha (0)
BigFlash.alpha:SetToAlpha (1)
BigFlash.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
BigFlash.alpha:SetTarget (BigFlash)
BigFlash.alpha:SetOrder (2)
BigFlash.alpha:SetDuration(0.31600001454353)
BigFlash.alpha:SetStartDelay (0)
BigFlash.alpha:SetEndDelay (0)
BigFlash.alpha:SetFromAlpha (1)
BigFlash.alpha:SetToAlpha (0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.11600000411272)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(0.31600001454353)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
end
----------------------------------------------
@@ -176,30 +197,38 @@ function _detalhes.PlayBestDamageOnGuild (damage)
FlashSwipe:SetBlendMode("ADD")
--animations for FlashSwipe
do
local animGroup = FlashSwipe:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetTarget (FlashSwipe)
alpha:SetOrder (1)
alpha:SetDuration()
alpha:SetStartDelay ()
alpha:SetEndDelay (0)
alpha:SetChange(-1)
FlashSwipe.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
FlashSwipe.alpha:SetTarget (FlashSwipe)
FlashSwipe.alpha:SetOrder (1)
FlashSwipe.alpha:SetDuration(0.31600001454353)
FlashSwipe.alpha:SetStartDelay (0.20000000298023)
FlashSwipe.alpha:SetEndDelay (0)
FlashSwipe.alpha:SetFromAlpha (0)
FlashSwipe.alpha:SetToAlpha (0.501051902771)
FlashSwipe.translation = MainAnimationGroup:CreateAnimation("TRANSLATION")
FlashSwipe.translation:SetTarget (FlashSwipe)
FlashSwipe.translation:SetOrder (1)
FlashSwipe.translation:SetDuration(0.81599998474121)
FlashSwipe.translation:SetStartDelay (0.20000000298023)
FlashSwipe.translation:SetEndDelay (0)
FlashSwipe.translation:SetOffset (200, 0)
FlashSwipe.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
FlashSwipe.alpha:SetTarget (FlashSwipe)
FlashSwipe.alpha:SetOrder (1)
FlashSwipe.alpha:SetDuration(0.31600001454353)
FlashSwipe.alpha:SetStartDelay (0.69999998807907)
FlashSwipe.alpha:SetEndDelay (0)
FlashSwipe.alpha:SetFromAlpha (0.501051902771)
FlashSwipe.alpha:SetToAlpha (0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.31600001454353)
alpha:SetStartDelay (0.20000000298023)
alpha:SetEndDelay (0)
alpha:SetChange(0.501051902771)
local translation = animGroup:CreateAnimation("TRANSLATION")
translation:SetOrder (2)
translation:SetDuration(0.81599998474121)
translation:SetStartDelay (0.20000000298023)
translation:SetEndDelay (0)
translation:SetOffset (200, 0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(0.31600001454353)
alpha:SetStartDelay (0.69999998807907)
alpha:SetEndDelay (0)
alpha:SetChange(-0.501051902771)
end
----------------------------------------------
@@ -218,39 +247,47 @@ function _detalhes.PlayBestDamageOnGuild (damage)
Portrait:SetBlendMode("BLEND")
--animations for Portrait
do
local animGroup = Portrait:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
Portrait.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
Portrait.alpha:SetTarget (Portrait)
Portrait.alpha:SetOrder (1)
Portrait.alpha:SetDuration(0.41600000858307)
Portrait.alpha:SetStartDelay (0)
Portrait.alpha:SetEndDelay (0)
Portrait.alpha:SetFromAlpha (0)
Portrait.alpha:SetToAlpha (1)
Portrait.scale = MainAnimationGroup:CreateAnimation("SCALE")
Portrait.scale:SetTarget (Portrait)
Portrait.scale:SetOrder (1)
Portrait.scale:SetDuration(0.21600000560284)
Portrait.scale:SetStartDelay (0)
Portrait.scale:SetEndDelay (0)
alpha:SetOrder (1)
alpha:SetDuration(0)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
if (DetailsFramework.IsDragonflight() or DetailsFramework.IsNonRetailWowWithRetailAPI()) then
Portrait.scale:SetScaleFrom (0, 0)
Portrait.scale:SetScaleTo (1, 1)
else
Portrait.scale:SetFromScale (0, 0)
Portrait.scale:SetToScale (1, 1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.41600000858307)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(1)
local scale = animGroup:CreateAnimation("SCALE")
scale:SetOrder (1)
scale:SetDuration(0)
scale:SetStartDelay (0)
scale:SetEndDelay (0)
scale:SetScale (0.01, 0.01)
scale:SetOrigin ("center", 0, 0)
scale = animGroup:CreateAnimation("SCALE")
scale:SetOrder (2)
scale:SetDuration(0.21600000560284)
scale:SetStartDelay (0)
scale:SetEndDelay (0)
scale:SetScale(100, 100)
scale:SetOrigin ("center", 0, 0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(1)
alpha:SetStartDelay (4.7000002861023)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
end
Portrait.scale:SetOrigin ("center", 0, 0)
Portrait.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
Portrait.alpha:SetTarget (Portrait)
Portrait.alpha:SetOrder (2)
Portrait.alpha:SetDuration(1)
Portrait.alpha:SetStartDelay (4.7000002861023)
Portrait.alpha:SetEndDelay (0)
Portrait.alpha:SetFromAlpha (1)
Portrait.alpha:SetToAlpha (0)
----------------------------------------------
@@ -269,23 +306,30 @@ function _detalhes.PlayBestDamageOnGuild (damage)
DamageIcon:SetBlendMode("BLEND")
--animations for DamageIcon
do
local animGroup = DamageIcon:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (1)
alpha:SetDuration(0)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
DamageIcon.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
DamageIcon.alpha:SetTarget (DamageIcon)
DamageIcon.alpha:SetOrder (1)
DamageIcon.alpha:SetDuration(0.51599997282028)
DamageIcon.alpha:SetStartDelay (0)
DamageIcon.alpha:SetEndDelay (0)
DamageIcon.alpha:SetFromAlpha (0)
DamageIcon.alpha:SetToAlpha (1)
DamageIcon.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
DamageIcon.alpha:SetTarget (DamageIcon)
DamageIcon.alpha:SetOrder (2)
DamageIcon.alpha:SetDuration(1)
DamageIcon.alpha:SetStartDelay (4.5999999046326)
DamageIcon.alpha:SetEndDelay (0)
DamageIcon.alpha:SetFromAlpha (1)
DamageIcon.alpha:SetToAlpha (0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.51599997282028)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0)
alpha:SetChange(1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(1)
alpha:SetStartDelay (4.5999999046326)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
end
----------------------------------------------
@@ -300,32 +344,29 @@ function _detalhes.PlayBestDamageOnGuild (damage)
NewDamageRecord:SetJustifyH("CENTER")
--animations for NewDamageRecord
do
local animGroup = NewDamageRecord:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (1)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0.016000000759959)
alpha:SetChange(-1)
NewDamageRecord.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
NewDamageRecord.alpha:SetTarget (NewDamageRecord)
NewDamageRecord.alpha:SetOrder (1)
NewDamageRecord.alpha:SetDuration(0.016000000759959)
NewDamageRecord.alpha:SetStartDelay (0)
NewDamageRecord.alpha:SetEndDelay (0)
NewDamageRecord.alpha:SetFromAlpha (0)
NewDamageRecord.alpha:SetToAlpha (0)
NewDamageRecord.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
NewDamageRecord.alpha:SetTarget (NewDamageRecord)
NewDamageRecord.alpha:SetOrder (2)
NewDamageRecord.alpha:SetDuration(0.51599997282028)
NewDamageRecord.alpha:SetStartDelay (0.40000000596046)
NewDamageRecord.alpha:SetEndDelay (4.0999999046326)
NewDamageRecord.alpha:SetFromAlpha (0)
NewDamageRecord.alpha:SetToAlpha (1)
NewDamageRecord.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
NewDamageRecord.alpha:SetTarget (NewDamageRecord)
NewDamageRecord.alpha:SetOrder (3)
NewDamageRecord.alpha:SetDuration(1)
NewDamageRecord.alpha:SetStartDelay (0.10000000149012)
NewDamageRecord.alpha:SetEndDelay (0)
NewDamageRecord.alpha:SetFromAlpha (1)
NewDamageRecord.alpha:SetToAlpha (0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.51599997282028)
alpha:SetStartDelay (0.40000000596046)
alpha:SetEndDelay (4.0999999046326)
alpha:SetChange(1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(1)
alpha:SetStartDelay (0.10000000149012)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
end
----------------------------------------------
local DamageAmount = DetailsNewDamageRecord:CreateFontString("DamageAmountFontString", "OVERLAY")
@@ -339,34 +380,30 @@ function _detalhes.PlayBestDamageOnGuild (damage)
DamageAmount:SetJustifyH("CENTER")
--animations for DamageAmount
do
local animGroup = DamageAmount:CreateAnimationGroup()
tinsert(MainAnimationGroup, animGroup)
local alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (1)
alpha:SetDuration(0)
alpha:SetStartDelay (0)
alpha:SetEndDelay (0.016000000759959)
alpha:SetChange(-1)
DamageAmount.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
DamageAmount.alpha:SetTarget (DamageAmount)
DamageAmount.alpha:SetOrder (1)
DamageAmount.alpha:SetDuration(0.016000000759959)
DamageAmount.alpha:SetStartDelay (0)
DamageAmount.alpha:SetEndDelay (0)
DamageAmount.alpha:SetFromAlpha (0)
DamageAmount.alpha:SetToAlpha (0)
DamageAmount.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
DamageAmount.alpha:SetTarget (DamageAmount)
DamageAmount.alpha:SetOrder (2)
DamageAmount.alpha:SetDuration(0.51599997282028)
DamageAmount.alpha:SetStartDelay (0.40000000596046)
DamageAmount.alpha:SetEndDelay (0)
DamageAmount.alpha:SetFromAlpha (0)
DamageAmount.alpha:SetToAlpha (1)
DamageAmount.alpha = MainAnimationGroup:CreateAnimation("ALPHA")
DamageAmount.alpha:SetTarget (DamageAmount)
DamageAmount.alpha:SetOrder (3)
DamageAmount.alpha:SetDuration(1.0160000324249)
DamageAmount.alpha:SetStartDelay (4.2000002861023)
DamageAmount.alpha:SetEndDelay (0)
DamageAmount.alpha:SetFromAlpha (1)
DamageAmount.alpha:SetToAlpha (0)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (2)
alpha:SetDuration(0.51599997282028)
alpha:SetStartDelay (0.40000000596046)
alpha:SetEndDelay (0)
alpha:SetChange(1)
alpha = animGroup:CreateAnimation("ALPHA")
alpha:SetOrder (3)
alpha:SetDuration(1.0160000324249)
alpha:SetStartDelay (4.2000002861023)
alpha:SetEndDelay (0)
alpha:SetChange(-1)
end
--test the animation
MainAnimationGroup:Play()
end
frames/window_all_in_one.lua
+1 -7
View File
@@ -336,16 +336,10 @@
end,
SetTexture = function(titleBar, texturePath, textureCoord, vertexColor, maskTexture)
SetTexture = function(titleBar, texturePath, textureCoord, vertexColor)
if (texturePath) then
titleBar.BackgroundTexture:SetTexture(texturePath)
if (maskTexture) then
titleBar.BackgroundTexture:SetMask(maskTexture)
else
titleBar.BackgroundTexture:SetMask("")
end
if (vertexColor) then
local r, g, b, a = detailsFramework:ParseColors(vertexColor)
titleBar.BackgroundTexture:SetVertexColor(r, g, b, a)
frames/window_breakdown/breakdown_spells_genericframes.lua
+2 -2
View File
@@ -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
frames/window_breakdown/breakdown_spells_phaseframes.lua
+2 -2
View File
@@ -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
frames/window_breakdown/breakdown_spells_spellframes.lua
+3 -4
View File
@@ -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
frames/window_breakdown/breakdown_spells_targetframes.lua
+2 -2
View File
@@ -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
frames/window_breakdown/window_playerbreakdown.lua
+1 -1
View File
@@ -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
frames/window_breakdown/window_playerbreakdown_auras.lua
-17
View File
@@ -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()
frames/window_breakdown/window_playerbreakdown_compare.lua
+1 -1
View File
@@ -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)
frames/window_breakdown/window_playerbreakdown_list.lua
+2 -11
View File
@@ -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
frames/window_breakdown/window_playerbreakdown_spells.lua
+2 -2
View File
@@ -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")
frames/window_copy.lua
+1 -1
View File
@@ -45,7 +45,7 @@ do
panel.text:SetHook("OnEditFocusLost", function() panel:Hide() end)
panel.text:SetHook("OnChar", function() panel:Hide() end)
DetailsFrameWork:NewLabel(panel, _, _, "desc", "paste on your web browser address bar", "OptionsFontHighlightSmall", 12)
DetailsFrameWork:NewLabel(panel, _, _, "desc", "paste on your web browser address bar", "GameFontNormalSmall", 12)
panel.desc:SetPoint(340, -78)
panel.desc.width = 150
panel.desc.height = 25
frames/window_currentdps.lua
+3 -26
View File
@@ -1,9 +1,7 @@
local Details = _G.Details
local libwindow = LibStub("LibWindow-1.1")
local DF = DetailsFramework
local isDragonflight = DF.IsDragonflight()
local green_team_color
local yellow_team_color
@@ -47,7 +45,7 @@ function Details:OpenCurrentRealDPSOptions(from_options_panel)
--add an extra background
local backgroundTexture = f:CreateTexture("$parentBackgroundTexture", "background")
backgroundTexture:SetColorTexture(.2, .2, .2, .2)
backgroundTexture:SetTexture(.2, .2, .2, .2)
backgroundTexture:SetAllPoints()
@@ -393,27 +391,6 @@ function Details:CreateCurrentDpsFrame(parent, name)
end
end
C_Timer.After(10, function()
--f:SetPoint("top", UIParent, "top", 0, -110)
--LibWindow.SavePosition(f)
end)
if(isDragonflight) then
GhostFrame:HookScript("OnShow", function(ghostFrame)
if (f:IsShown()) then
local p1, p2, p3, p4, p5 = ghostFrame:GetPoint(1)
f.GhostFrameY = f.GhostFrameY or 0
if (DF:IsNearlyEqual(p5, f.GhostFrameY, 0.1)) then
return
end
local newY = p5-45
ghostFrame:SetPoint(p1, p2, p3, p4, newY)
f.GhostFrameY = newY
end
end)
end
--arena dps bars
--code for the dps bars shown in arenas
@@ -447,7 +424,7 @@ function Details:CreateCurrentDpsFrame(parent, name)
f.movemeLabel:SetPoint("center", barFrame.splitBar.widget, "center", 0, 0)
local backgroundText = barFrame.borderFrame:CreateTexture(nil, "background")
backgroundText:SetColorTexture(0, 0, 0, 0.5)
backgroundText:SetTexture(0, 0, 0, 0.5)
backgroundText:SetAllPoints()
local fff = CreateFrame("frame", "nopnopnopnopnop", barFrame.splitBar.widget, "BackdropTemplate")
@@ -934,7 +911,7 @@ function DetailsTestSplitBar()
f:SetPoint("center")
local backgroundTexture = f:CreateTexture(nil, "overlay")
backgroundTexture:SetAllPoints()
backgroundTexture:SetColorTexture(.1, .1, .1, .7)
backgroundTexture:SetTexture(.1, .1, .1, .7)
local barFrame = CreateFrame("frame", "DetailsArenaDpsBars", f, "BackdropTemplate")
f.dpsBarFrame = barFrame
frames/window_custom.lua
+2 -2
View File
@@ -805,7 +805,7 @@
end)
local flashTexture = editbox:CreateTexture(nil, "overlay")
flashTexture:SetColorTexture(1, 1, 1)
flashTexture:SetTexture(1, 1, 1)
flashTexture:SetAllPoints()
flashTexture:SetAlpha(0)
@@ -1709,7 +1709,7 @@
codeEditor:SetBackdrop({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1})
codeEditor:SetBackdropBorderColor(0, 0, 0, 1)
codeEditor.__background:SetColorTexture(0.2317647, 0.2317647, 0.2317647)
codeEditor.__background:SetTexture(0.2317647, 0.2317647, 0.2317647)
codeEditor.__background:SetVertexColor(0.27, 0.27, 0.27)
codeEditor.__background:SetAlpha(0.8)
codeEditor.__background:SetVertTile(true)
frames/window_dump.lua
+2 -2
View File
@@ -39,7 +39,7 @@ function Details:Dump (...)
text_editor:SetBackdrop({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1})
text_editor:SetBackdropBorderColor(0, 0, 0, 1)
text_editor.__background:SetColorTexture(0.2317647, 0.2317647, 0.2317647)
text_editor.__background:SetTexture(0.2317647, 0.2317647, 0.2317647)
text_editor.__background:SetVertexColor(0.27, 0.27, 0.27)
text_editor.__background:SetAlpha(0.8)
text_editor.__background:SetVertTile(true)
@@ -103,7 +103,7 @@ function Details:ShowImportWindow (defaultText, confirmFunc, titleText)
importTextEditor:SetBackdrop({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1})
importTextEditor:SetBackdropBorderColor(0, 0, 0, 1)
importTextEditor.__background:SetColorTexture(0.2317647, 0.2317647, 0.2317647)
importTextEditor.__background:SetTexture(0.2317647, 0.2317647, 0.2317647)
importTextEditor.__background:SetVertexColor(0.27, 0.27, 0.27)
importTextEditor.__background:SetAlpha(0.8)
importTextEditor.__background:SetVertTile(true)
frames/window_eventtracker.lua
+3 -8
View File
@@ -262,12 +262,7 @@ function Details:CreateEventTrackerFrame(parentObject, name)
local screenFrame = CreateFrame("frame", name, parentObject or UIParent,"BackdropTemplate")
screenFrame:SetPoint("center", UIParent, "center")
if (not DetailsFramework.IsDragonflight() and not DetailsFramework.IsNonRetailWowWithRetailAPI()) then
screenFrame:SetMinResize (150, 40)
screenFrame:SetMaxResize (800, 1024)
else
screenFrame:SetResizeBounds(150, 40, 800, 1024)
end
screenFrame:SetResizeBounds(150, 40, 800, 1024)
screenFrame:SetSize(Details.event_tracker.frame.width, Details.event_tracker.frame.height)
@@ -796,9 +791,9 @@ function Details:CreateEventTrackerFrame(parentObject, name)
[4] = true,
}
combatLog:SetScript("OnEvent", function(self, event)
combatLog:SetScript("OnEvent", function(self, event, ...)
local time, token, hidding, caster_serial, caster_name, caster_flags, caster_flags2, target_serial, target_name, target_flags, target_flags2, spellid, spellname, spelltype, extraSpellID, extraSpellName, extraSchool = CombatLogGetCurrentEventInfo()
local time, token, hidding, caster_serial, caster_name, caster_flags, caster_flags2, target_serial, target_name, target_flags, target_flags2, spellid, spellname, spelltype, extraSpellID, extraSpellName, extraSchool = CombatLogGetCurrentEventInfo(...)
local added = false
--get the spell info from the Open Raid Lib
frames/window_forge.lua
+1 -1
View File
@@ -1069,7 +1069,7 @@ function Details:OpenForge()
local background = fillpanel:CreateTexture(nil, "background")
background:SetAllPoints()
background:SetColorTexture(0, 0, 0, 0.2)
background:SetTexture(0, 0, 0, 0.2)
module.fill_panel = fillpanel
end
frames/window_main.lua
+41 -159
View File
@@ -567,15 +567,6 @@ local movement_onupdate = function(self, elapsed)
if (instance_ids_shown and instance_ids_shown > 0.95) then
show_instance_ids()
instance_ids_shown = nil
if (need_show_group_guide and not DetailsFramework.IsTimewalkWoW()) then
Details.MicroButtonAlert.Text:SetText(Loc["STRING_WINDOW1ATACH_DESC"])
Details.MicroButtonAlert:SetPoint("bottom", need_show_group_guide.baseframe, "top", 0, 30)
Details.MicroButtonAlert:SetHeight(320)
Details.MicroButtonAlert:Show()
need_show_group_guide = nil
end
elseif (instance_ids_shown) then
instance_ids_shown = instance_ids_shown + elapsed
end
@@ -957,10 +948,6 @@ local function move_janela(baseframe, iniciando, instancia, just_updating)
this_instance.isMoving = false
end
if (not DetailsFramework.IsTimewalkWoW()) then
Details.MicroButtonAlert:Hide()
end
if (instancia_alvo and instancia_alvo.ativa and instancia_alvo.baseframe) then
instancia_alvo.h_esquerda:Stop()
instancia_alvo.h_baixo:Stop()
@@ -1851,24 +1838,6 @@ local lineScript_Onenter = function(self)
self.textura:SetBlendMode("ADD")
end
local lefttext = self.lineText1
if (lefttext:IsTruncated()) then
if (not Details.left_anti_truncate) then
end
Details:SetFontSize(Details.left_anti_truncate.text, self._instance.row_info.font_size)
Details:SetFontFace(Details.left_anti_truncate.text, self._instance.row_info.font_face_file)
Details:SetFontColor(Details.left_anti_truncate.text, lefttext:GetTextColor())
Details.left_anti_truncate:SetPoint("left", lefttext, "left", -3, 0)
Details.left_anti_truncate.text:SetText(lefttext:GetText())
Details.left_anti_truncate:SetSize(Details.left_anti_truncate.text:GetStringWidth() + 3, self._instance.row_info.height)
Details.left_anti_truncate:Show()
lefttext.untruncated = true
end
self:SetScript("OnUpdate", shiftMonitor)
local classIcon = self:GetClassIcon()
@@ -2054,7 +2023,20 @@ end
local setBarValue = function(self, value)
value = Clamp(value, 0, 100)
self.statusbar:SetValue(value)
if(self._instance.bars_inverted) then
self.statusbar:SetValue(0)
local width = self._instance.cached_bar_width
local inverse_bar_size = width / 100 * value
local coord_inverse = inverse_bar_size / width
inverse_bar_size = _math_max(inverse_bar_size, 0.00000001)
self.right_to_left_texture:SetWidth(inverse_bar_size)
self.right_to_left_texture:SetTexCoord(coord_inverse, 0, 0, 1)
else
self.statusbar:SetValue(value)
end
self.statusbar.value = value
if (self.using_upper_3dmodels) then
local width = self:GetWidth()
@@ -2093,9 +2075,6 @@ local iconFrame_OnEnter = function(self)
local instance = Details:GetInstance(self.row.instance_id)
instance:BuildInstanceBarTooltip(self)
local bIsClassic = (DetailsFramework.IsClassicWow() or DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow() or DetailsFramework.IsCataWow())
local classIcon, classL, classR, classT, classB = Details:GetClassIcon(class)
local specId, specName, specDescription, specIcon, specRole, specClass = DetailsFramework.GetSpecializationInfoByID(spec or 0) --thanks pas06
@@ -2120,28 +2099,15 @@ local iconFrame_OnEnter = function(self)
end
Details:AddTooltipHeaderStatusbar()
local talentString = ""
if (type(talents) == "table") then
if (talents and not bIsClassic) then
for i = 1, #talents do
local talentID, talentName, texture, selected, available = GetTalentInfoByID(talents[i])
if (texture) then
talentString = talentString .. " |T" .. texture .. ":" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t"
end
end
end
end
local gotInfo
local localizedItemLevelString = _G.STAT_AVERAGE_ITEM_LEVEL
local localizedItemLevelString = _G.AVERAGE_ITEM_LEVEL_S
if (ilvl) then
GameCooltip:AddLine(localizedItemLevelString .. ":" , ilvl and "|T:" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t" .. floor(ilvl.ilvl) or "|T:" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t ??") --Loc from GlobalStrings.lua
GameCooltip:AddLine(format(localizedItemLevelString, ilvl) and "|T:" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t" .. floor(ilvl.ilvl) or "|T:" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t ??") --Loc from GlobalStrings.lua
GameCooltip:AddIcon([[]], 1, 1, 1, 20)
Details:AddTooltipBackgroundStatusbar()
gotInfo = true
else
GameCooltip:AddLine(localizedItemLevelString .. ":" , 0)
GameCooltip:AddLine(format(localizedItemLevelString, 0))
GameCooltip:AddIcon([[]], 1, 1, 1, 20)
Details:AddTooltipBackgroundStatusbar()
gotInfo = true
@@ -2149,14 +2115,8 @@ local iconFrame_OnEnter = function(self)
local localizedTalentsString = _G.TALENTS
if (talentString ~= "") then
GameCooltip:AddLine(localizedTalentsString .. ":", talentString)
GameCooltip:AddIcon([[]], 1, 1, 1, 24)
Details:AddTooltipBackgroundStatusbar()
gotInfo = true
elseif (gotInfo) then
GameCooltip:AddLine(localizedTalentsString .. ":", Loc["STRING_QUERY_INSPECT_REFRESH"])
if (gotInfo) then
GameCooltip:AddLine(format(localizedItemLevelString, Loc["STRING_QUERY_INSPECT_REFRESH"]))
GameCooltip:AddIcon([[]], 1, 1, 1, 24)
Details:AddTooltipBackgroundStatusbar()
end
@@ -2196,76 +2156,8 @@ local iconFrame_OnEnter = function(self)
end
end
local actorName = actor:GetName()
local RaiderIO = _G.RaiderIO
local lineHeight = 21
if (RaiderIO and not bIsClassic) then
local addedInfo = false
local playerName, playerRealm = actorName:match("(%w+)%-(%w+)")
playerName = playerName or actorName
playerRealm = playerRealm or GetRealmName()
local faction = actor.enemy and Details.faction_against or UnitFactionGroup("player")
faction = faction == "Horde" and 2 or 1
local rioProfile = RaiderIO.GetProfile(playerName, playerRealm, faction)
if (rioProfile and rioProfile.mythicKeystoneProfile) then
rioProfile = rioProfile.mythicKeystoneProfile
local previousScore = rioProfile.previousScore or 0
local currentScore = rioProfile.currentScore or 0
if (false and previousScore > currentScore and time() > 1700562401) then --2023.11.21 midday
GameCooltip:AddLine("M+ Score:", previousScore .. " (|cFFFFDD11" .. currentScore .. "|r)", 1, "white")
addedInfo = true
else
GameCooltip:AddLine("M+ Score:", currentScore, 1, "white")
addedInfo = true
end
else
local dungeonPlayerInfo = C_PlayerInfo.GetPlayerMythicPlusRatingSummary(actorName)
if (dungeonPlayerInfo) then
local currentScore = dungeonPlayerInfo.currentSeasonScore or 0
if (currentScore > 0) then
GameCooltip:AddLine("M+ Score:", currentScore, 1, "white")
addedInfo = true
end
end
end
if (addedInfo) then
GameCooltip:AddIcon([[]], 1, 1, 1, 20)
Details:AddTooltipBackgroundStatusbar()
--increase frame height
height = height + lineHeight
end
else
if (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE and C_PlayerInfo) then --is retail?
local dungeonPlayerInfo = C_PlayerInfo.GetPlayerMythicPlusRatingSummary(actorName)
if (dungeonPlayerInfo) then
local currentScore = dungeonPlayerInfo.currentSeasonScore or 0
if (currentScore > 0) then
GameCooltip:AddLine("M+ Score:", currentScore, 1, "white")
GameCooltip:AddIcon([[]], 1, 1, 1, 20)
Details:AddTooltipBackgroundStatusbar()
--increase frame height
height = height + lineHeight
end
end
end
end
if (actor.spec == 1473 and actor.tipo == DETAILS_ATTRIBUTE_DAMAGE) then
local damageDone = math.floor(actor.total + actor.total_extra)
GameCooltip:AddLine("Evoker Predicted Damage:", Details:Format(damageDone) .. " (" .. Details:Format(damageDone / Details:GetCurrentCombat():GetCombatTime()) .. ")", 1, "white")
GameCooltip:AddIcon([[]], 1, 1, 1, 20)
Details:AddTooltipBackgroundStatusbar()
height = height + lineHeight
end
if (actor.classe == "UNKNOW") then
local npcId = tonumber(actor.aID)
if (not npcId) then
@@ -3211,19 +3103,19 @@ local function CreateAlertFrame(baseframe, instancia)
flash_texture:SetAllPoints()
flash_texture:SetBlendMode("ADD")
local animation = flash_texture:CreateAnimationGroup()
local anim0 = animation:CreateAnimation("ALPHA")
local anim1 = animation:CreateAnimation("ALPHA")
local anim2 = animation:CreateAnimation("ALPHA")
anim1:SetOrder (1)
anim1:SetFromAlpha (0)
anim1:SetToAlpha (1)
anim0:SetOrder(0)
anim0:SetDuration(0)
anim0:SetChange(-1)
anim1:SetOrder (2)
anim1:SetChange(1)
anim1:SetDuration(0.1)
anim2:SetOrder (2)
anim1:SetFromAlpha (1)
anim1:SetToAlpha (0)
anim2:SetOrder (3)
anim1:SetChange(-1)
anim2:SetDuration(0.2)
animation:SetScript("OnFinished", function(self)
flash_texture:Hide()
@@ -4107,6 +3999,14 @@ function gump:CreateNewLine(instance, index)
newLine.statusbar:SetMinMaxValues(0, 100)
newLine.statusbar:SetValue(0)
--> right to left texture
newLine.statusbar.right_to_left_texture = newLine.statusbar:CreateTexture(nil, "overlay")
newLine.statusbar.right_to_left_texture:SetPoint("topright", newLine.statusbar, "topright")
newLine.statusbar.right_to_left_texture:SetPoint("bottomright", newLine.statusbar, "bottomright")
newLine.statusbar.right_to_left_texture:SetWidth(0.000000001)
newLine.statusbar.right_to_left_texture:Hide()
newLine.right_to_left_texture = newLine.statusbar.right_to_left_texture
--create textures and icons
newLine.textura = newLine.statusbar:CreateTexture(nil, "artwork")
newLine.textura:SetHorizTile(false)
@@ -4118,12 +4018,10 @@ function gump:CreateNewLine(instance, index)
newLine.extraStatusbar.texture = newLine.extraStatusbar:CreateTexture(nil, "overlay")
newLine.extraStatusbar:SetStatusBarTexture(newLine.extraStatusbar.texture)
--by default painting the extraStatusbar with the evoker color
local evokerColor = Details.class_colors["EVOKER"]
--newLine.extraStatusbar.texture:SetTexture([[Interface\AddOns\Details\images\bar_textures\bar_of_bars.png]]) --setColorTexture is very expensive, so set the color once and use vertex color to change it
newLine.extraStatusbar.texture:SetColorTexture(1, 1, 1, 1) --setColorTexture is very expensive, so set the color once and use vertex color to change it
--newLine.extraStatusbar.texture:SetTexture([[Interface\AddOns\Details\images\bar_textures\bar_of_bars]]) --SetTexture is very expensive, so set the color once and use vertex color to change it
newLine.extraStatusbar.texture:SetTexture(1, 1, 1, 1) --SetTexture is very expensive, so set the color once and use vertex color to change it
newLine.extraStatusbar.texture:SetVertexColor(unpack(evokerColor))
newLine.extraStatusbar.texture:SetVertexColor(0.20, 0.58, 0.50)
newLine.extraStatusbar:SetAlpha(0.7)
newLine.extraStatusbar.defaultAlpha = 0.7
newLine.extraStatusbar:Hide()
@@ -4910,9 +4808,8 @@ function Details:InstanceRefreshRows(instance)
row.lineText1:SetPoint("right", row.statusbar, "right", -self.row_info.textL_offset - 2, self.row_info.text_yoffset)
row.icone_classe:Hide()
row.iconHighlight:Hide()
--[[ Deprecation of right_to_left_texture in favor of StatusBar:SetReverseFill 5/2/2022 - Flamanis
row.right_to_left_texture:SetPoint("topright", row.statusbar, "topright")
row.right_to_left_texture:SetPoint("bottomright", row.statusbar, "bottomright")]]
row.right_to_left_texture:SetPoint("bottomright", row.statusbar, "bottomright")
else
row.icone_classe:ClearAllPoints()
@@ -4931,21 +4828,6 @@ function Details:InstanceRefreshRows(instance)
end
end
if (bHasIconMask) then
if (not row.icone_classe.maskTexture) then
row.icone_classe.maskTexture = row:CreateMaskTexture("$parentClassIconMask", "overlay")
row.icone_classe.maskTexture:SetAllPoints(row.icone_classe)
row.icone_classe:AddMaskTexture(row.icone_classe.maskTexture)
end
row.icone_classe.maskTexture:SetTexture(iconMask)
row.icone_classe.maskTexture:Show()
else
if (row.icone_classe.maskTexture) then
row.icone_classe.maskTexture:Hide()
row.icone_classe.maskTexture:SetTexture("")
end
end
if (not self.row_info.texture_background_class_color) then
local color = self.row_info.fixed_texture_background_color
row.background:SetVertexColor(color[1], color[2], color[3], color[4])
@@ -4998,9 +4880,9 @@ function Details:InstanceRefreshRows(instance)
row.overlayTexture:SetVertexColor(unpack(overlayColor))
if (isInvertedBars) then
row.statusbar:SetReverseFill(true)
row.right_to_left_texture:Show()
else
row.statusbar:SetReverseFill(false)
row.right_to_left_texture:Hide()
end
--texture class color: if true color changes on the fly through class refresh
frames/window_mythicplus/deprecated.lua
+1 -1
View File
@@ -49,7 +49,7 @@ if (false and Details222.MythicPlus.Level and Details222.MythicPlus.Level < 28 a
readyFrame.ShowChartButton = DetailsFramework:CreateButton(readyFrame, function() mythicDungeonCharts.ShowChart(); readyFrame:Hide() end, 80, 20, "Show Damage Graphic")
readyFrame.ShowChartButton:SetTemplate(DetailsFramework:GetTemplate("button", "DETAILS_PLUGIN_BUTTON_TEMPLATE"))
readyFrame.ShowChartButton:SetPoint("topleft", readyFrame, "topleft", 5, -30)
readyFrame.ShowChartButton:SetIcon([[Interface\AddOns\Details\images\icons2.png]], 16, 16, "overlay", {42/512, 75/512, 153/512, 187/512}, {.7, .7, .7, 1}, nil, 0, 0)
readyFrame.ShowChartButton:SetIcon([[Interface\AddOns\Details\images\icons2]], 16, 16, "overlay", {42/512, 75/512, 153/512, 187/512}, {.7, .7, .7, 1}, nil, 0, 0)
readyFrame.ShowChartButton.textcolor = textColor
--disable feature check box (dont show this again)
frames/window_mythicplus/window_chart.lua
+4 -8
View File
@@ -210,12 +210,12 @@ function mythicDungeonCharts.ShowChart()
local leftDivisorLine = dungeonChartFrame.BossWidgetsFrame:CreateTexture(nil, "overlay")
leftDivisorLine:SetSize(2, dungeonChartFrame.ChartFrame.Graphic:GetHeight())
leftDivisorLine:SetColorTexture(1, 1, 1, 1)
leftDivisorLine:SetTexture(1, 1, 1, 1)
leftDivisorLine:SetPoint("bottomleft", dungeonChartFrame.ChartFrame.Graphic.TextFrame, "bottomleft", -2, 0)
local bottomDivisorLine = dungeonChartFrame.BossWidgetsFrame:CreateTexture(nil, "overlay")
bottomDivisorLine:SetSize(dungeonChartFrame.ChartFrame.Graphic:GetWidth(), 2)
bottomDivisorLine:SetColorTexture(1, 1, 1, 1)
bottomDivisorLine:SetTexture(1, 1, 1, 1)
bottomDivisorLine:SetPoint("bottomleft", dungeonChartFrame.ChartFrame.Graphic.TextFrame, "bottomleft", 0, 0)
dungeonChartFrame.ChartFrame.Graphic:SetBackdrop({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
@@ -238,7 +238,7 @@ function mythicDungeonCharts.ShowChart()
newBossWidget.AvatarTexture = bossAvatar
local verticalLine = Details:GetFramework():CreateImage(newBossWidget, "", 1, dungeonChartFrame.ChartFrame.Graphic:GetHeight(), "overlay")
verticalLine:SetColorTexture(1, 1, 1, 0.3)
verticalLine:SetTexture(1, 1, 1, 0.3)
verticalLine:SetPoint("bottomleft", newBossWidget, "bottomright", 0, 0)
local timeText = Details:GetFramework():CreateLabel(newBossWidget)
@@ -246,7 +246,7 @@ function mythicDungeonCharts.ShowChart()
newBossWidget.TimeText = timeText
local timeBackground = Details:GetFramework():CreateImage(newBossWidget, "", 30, 12, "artwork")
timeBackground:SetColorTexture(0, 0, 0, 0.5)
timeBackground:SetTexture(0, 0, 0, 0.5)
timeBackground:SetPoint("topleft", timeText, "topleft", -2, 2)
timeBackground:SetPoint("bottomright", timeText, "bottomright", 2, 0)
@@ -579,10 +579,6 @@ mythicDungeonCharts.ClassColors = {
["DEMONHUNTER1"] = { r = 0.64, g = 0.19, b = 0.79, colorStr = "ffa330c9" },
["DEMONHUNTER2"] = { r = 0.44, g = 0.09, b = 0.59, colorStr = "ffa330c9" },
["DEMONHUNTER3"] = { r = 0.24, g = 0.09, b = 0.39, colorStr = "ffa330c9" },
["EVOKER1"] = { r = 0.0, g = 1.00 , b = 0.59, colorStr = "FF205F45" },
["EVOKER2"] = { r = 0.0, g = 0.8 , b = 0.39, colorStr = "FF126442" },
["EVOKER3"] = { r = 0.0, g = 0.6 , b = 0.19, colorStr = "FF274B3C" },
};
if (debugmode) then
frames/window_mythicplus/window_end_of_run.lua
+12 -143
View File
@@ -110,7 +110,7 @@ local createLootSquare = function(playerBanner, name, parent, lootIndex)
end
local createPlayerBanner = function(parent, name)
local template = "ChallengeModeBannerPartyMemberTemplate"
local template = "MythicPlusBannerPartyMemberTemplate"
---@type playerbanner
local playerBanner = CreateFrame("frame", name, parent, template)
@@ -218,11 +218,6 @@ local createPlayerBanner = function(parent, name)
dungeonBorderTexture:SetAlpha(1)
playerBanner.DungeonBorderTexture = dungeonBorderTexture
--load this addon, required to have access to the garrison templates
if (not C_AddOns.IsAddOnLoaded("Blizzard_GarrisonTemplates")) then
C_AddOns.LoadAddOn("Blizzard_GarrisonTemplates")
end
--animation for the key leveling up
local levelUpFrame = CreateFrame("frame", "$LevelUpFrame", playerBanner, "GarrisonFollowerLevelUpTemplate")
levelUpFrame:SetPoint("top", dungeonTexture, "bottom", 0, 44)
@@ -254,40 +249,33 @@ local createPlayerBanner = function(parent, name)
do
levelFontString.translation = animationGroup:CreateAnimation("TRANSLATION")
levelFontString.translation:SetTarget(levelFontString)
levelFontString.translation:SetOrder(1)
levelFontString.translation:SetDuration(0.096000000834465)
levelFontString.translation:SetOffset(0, -4)
levelFontString.translation = animationGroup:CreateAnimation("TRANSLATION")
levelFontString.translation:SetTarget(levelFontString)
levelFontString.translation:SetOrder(2)
levelFontString.translation:SetDuration(0.11599999666214)
levelFontString.translation:SetOffset(0, 16)
levelFontString.rotation = animationGroup:CreateAnimation("ROTATION")
levelFontString.rotation:SetTarget(levelFontString)
levelFontString.rotation:SetOrder(3)
levelFontString.rotation:SetDuration(0.096000000834465)
levelFontString.rotation:SetDegrees(20)
levelFontString.rotation:SetOrigin("center", 0, 0)
levelFontString.rotation = animationGroup:CreateAnimation("ROTATION")
levelFontString.rotation:SetTarget(levelFontString)
levelFontString.rotation:SetOrder(4)
levelFontString.rotation:SetDuration(0.096000000834465)
levelFontString.rotation:SetDegrees(-20)
levelFontString.rotation:SetOrigin("center", 0, 0)
levelFontString.rotation = animationGroup:CreateAnimation("ROTATION")
levelFontString.rotation:SetTarget(levelFontString)
levelFontString.rotation:SetOrder(5)
levelFontString.rotation:SetDuration(0.195999994874)
levelFontString.rotation:SetDegrees(360)
levelFontString.rotation:SetOrigin("center", 0, 0)
levelFontString.translation = animationGroup:CreateAnimation("TRANSLATION")
levelFontString.translation:SetTarget(levelFontString)
levelFontString.translation:SetOrder(6)
levelFontString.translation:SetDuration(0.21599999070168)
levelFontString.translation:SetOffset(0, 9)
levelFontString.translation = animationGroup:CreateAnimation("TRANSLATION")
levelFontString.translation:SetTarget(levelFontString)
levelFontString.translation:SetOrder(7)
levelFontString.translation:SetDuration(0.046000000089407)
levelFontString.translation:SetOffset(0, -24)
@@ -476,7 +464,7 @@ end
if (CONST_DEBUG_MODE) then
C_Timer.After(3, function()
C_AddOns.LoadAddOn("Blizzard_ChallengesUI");
LoadAddOn("Ascension_MythicPlus");
_G.MythicDungeonFrames.ShowEndOfMythicPlusPanel()
end)
end
@@ -540,30 +528,22 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
readyFrame.OpeningAnimation = openingAnimationHub
do --backdrop textures
local maskTexture = readyFrame:CreateMaskTexture("$parentDungeonBackdropTextureMaskTexture", "artwork")
maskTexture:SetTexture([[Interface\AddOns\Details\images\masks\white_rounded_512x512.png]])
maskTexture:SetPoint("topleft", readyFrame, "topleft", 0, 0)
maskTexture:SetPoint("bottomright", readyFrame, "bottomright", 0, 0)
--backdrop gradient from bottom to top
---@type df_gradienttable
local gradientTable = {gradient = "vertical", fromColor = {0, 0, 0, 0.8}, toColor = "transparent"}
local gradientBelowTheLine = detailsFramework:CreateTexture(readyFrame, gradientTable, 1, readyFrame:GetHeight()/3, "artwork", {0, 1, 0, 1}, "backgroundGradient")
gradientBelowTheLine:SetPoint("bottoms", 0, 0)
gradientBelowTheLine:AddMaskTexture(maskTexture)
local dungeonBackdropTexture = readyFrame:CreateTexture("$parentDungeonBackdropTexture", "artwork", nil, -2)
dungeonBackdropTexture:SetTexCoord(0.05, 0.70, 0.1, 0.82)
dungeonBackdropTexture:SetVertexColor(0.2, 0.2, 0.2, 0.8)
dungeonBackdropTexture:SetDesaturation(0.65)
dungeonBackdropTexture:SetDesaturated(true)
dungeonBackdropTexture:SetAlpha(0.834)
dungeonBackdropTexture:SetAllPoints()
dungeonBackdropTexture:AddMaskTexture(maskTexture)
readyFrame.DungeonBackdropTexture = dungeonBackdropTexture
local anotherBackdropTexture = readyFrame:CreateTexture("$parentAnotherBackdropTexture", "artwork", nil, -3)
anotherBackdropTexture:SetTexture([[Interface\GLUES\Models\UI_HighmountainTauren\7HM_RapidSimpleMask]])
anotherBackdropTexture:AddMaskTexture(maskTexture)
anotherBackdropTexture:SetAllPoints()
anotherBackdropTexture:SetVertexColor(0.467, 0.416, 0.639, 1)
readyFrame.AnotherBackdropTexture = anotherBackdropTexture
@@ -590,7 +570,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
spikes:SetPoint("center", readyFrame, "top", 0, 30)
spikes:SetAtlas("ChallengeMode-SpikeyStar")
spikes:SetAlpha(1)
spikes:SetIgnoreParentAlpha(true)
readyFrame.YellowSpikeCircle = spikes
local yellowFlash = mythicDungeonFrames.ReadyFrameTop:CreateTexture("$parentYellowFlash", "artwork")
@@ -599,10 +578,9 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
yellowFlash:SetAtlas("BossBanner-RedFlash")
yellowFlash:SetAlpha(0)
yellowFlash:SetBlendMode("ADD")
yellowFlash:SetIgnoreParentAlpha(true)
readyFrame.YellowFlash = yellowFlash
readyFrame.Level = mythicDungeonFrames.ReadyFrameTop:CreateFontString("$parentLevelText", "overlay", "GameFontNormalWTF2Outline")
readyFrame.Level = mythicDungeonFrames.ReadyFrameTop:CreateFontString("$parentLevelText", "overlay", "SystemFont_OutlineThick_WTF")
readyFrame.Level:SetPoint("center", readyFrame.YellowSpikeCircle, "center", 0, 0)
readyFrame.Level:SetText("")
@@ -611,12 +589,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
local flashAnim1 = detailsFramework:CreateAnimation(flashAnimHub, "Alpha", 1, 0.5, 0, 1)
local flashAnim2 = detailsFramework:CreateAnimation(flashAnimHub, "Alpha", 2, 0.5, 1, 0)
--create the animation for the yellow spike circle
local spikeCircleAnimHub = detailsFramework:CreateAnimationHub(spikes, function() spikes:SetAlpha(0); spikes:SetScale(1) end, function() flashAnimHub:Play(); spikes:SetSize(100, 100); spikes:SetScale(1); spikes:SetAlpha(1) end)
local alphaAnim1 = detailsFramework:CreateAnimation(spikeCircleAnimHub, "Alpha", 1, 0.2960000038147, 0, 1)
local scaleAnim1 = detailsFramework:CreateAnimation(spikeCircleAnimHub, "Scale", 1, 0.21599999070168, 5, 5, 1, 1, "center", 0, 0)
readyFrame.YellowSpikeCircle.OnShowAnimation = spikeCircleAnimHub
readyFrame.YellowSpikeCircle.OnShowAnimation = flashAnimHub
end
readyFrame.leftFiligree = contentFrame:CreateTexture("$parentLeftFiligree", "artwork")
@@ -652,14 +625,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
local warningFooter = DetailsFramework:CreateLabel(contentFrame, "Under development.", 9, "yellow")
warningFooter:SetPoint("bottom", readyFrame, "bottom", 0, 20)
--waiting for loot label
local waitingForLootLabel = DetailsFramework:CreateLabel(contentFrame, "Waiting for loot", 12, "silver")
waitingForLootLabel:SetPoint("bottom", readyFrame, "bottom", 0, 54)
waitingForLootLabel:Hide()
local waitingForLootDotsAnimationLabel = DetailsFramework:CreateLabel(contentFrame, "...", 12, "silver")
waitingForLootDotsAnimationLabel:SetPoint("left", waitingForLootLabel, "right", 0, 0)
waitingForLootDotsAnimationLabel:Hide()
---@type texture
local topRedLineTexture = backgroundFrame:CreateTexture("$parentBannerTop", "border")
topRedLineTexture:SetAtlas("BossBanner-BgBanner-Top")
@@ -690,46 +655,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
--centerGradient:SetPoint("center", backgroundFrame, "center", 0, 0)
--centerGradient:SetSize(355, 390)
--make a text dot animation, which will show no dots at start and then "." then ".." then "..." and back to "" and so on
function readyFrame.StartTextDotAnimation()
--update the Waiting for Loot labels
waitingForLootLabel:Show()
waitingForLootDotsAnimationLabel:Show()
local dots = waitingForLootDotsAnimationLabel
local dotsCount = 0
local maxDots = 3
local maxLoops = 24
local dotsTimer = C_Timer.NewTicker(0.5, function()
dotsCount = dotsCount + 1
if (dotsCount > maxDots) then
dotsCount = 0
end
local dotsText = ""
for i = 1, dotsCount do
dotsText = dotsText .. "."
end
dots:SetText(dotsText)
end, maxLoops)
waitingForLootDotsAnimationLabel.dotsTimer = dotsTimer
end
function readyFrame.StopTextDotAnimation()
waitingForLootLabel:Hide()
waitingForLootDotsAnimationLabel:Hide()
if (waitingForLootDotsAnimationLabel.dotsTimer) then
waitingForLootDotsAnimationLabel.dotsTimer:Cancel()
end
end
readyFrame:SetScript("OnHide", function(self)
readyFrame.StopTextDotAnimation()
mythicDungeonFrames.ReadyFrameTop:Hide()
end)
@@ -750,7 +676,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
PixelUtil.SetPoint(readyFrame.ShowBreakdownButton, "topleft", readyFrame, "topleft", 31, -30)
PixelUtil.SetSize(readyFrame.ShowBreakdownButton, 145, 32)
readyFrame.ShowBreakdownButton:SetBackdrop(nil)
readyFrame.ShowBreakdownButton:SetIcon([[Interface\AddOns\Details\images\icons2.png]], 16, 16, "overlay", {84/512, 120/512, 153/512, 187/512}, {.7, .7, .7, 1}, nil, 0, 0)
readyFrame.ShowBreakdownButton:SetIcon([[Interface\AddOns\Details\images\icons2]], 16, 16, "overlay", {84/512, 120/512, 153/512, 187/512}, {.7, .7, .7, 1}, nil, 0, 0)
readyFrame.ShowBreakdownButton.textcolor = textColor
detailsFramework:AddRoundedCornersToFrame(readyFrame.ShowBreakdownButton.widget, roundedCornerPreset)
leftAnchor = readyFrame.ShowBreakdownButton
@@ -766,7 +692,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
PixelUtil.SetPoint(readyFrame.ShowChartButton, "left", readyFrame.ShowBreakdownButton, "right", 6, 0)
PixelUtil.SetSize(readyFrame.ShowChartButton, 145, 32)
readyFrame.ShowChartButton:SetBackdrop(nil)
readyFrame.ShowChartButton:SetIcon([[Interface\AddOns\Details\images\icons2.png]], 16, 16, "overlay", {42/512, 75/512, 153/512, 187/512}, {.7, .7, .7, 1}, nil, 0, 0)
readyFrame.ShowChartButton:SetIcon([[Interface\AddOns\Details\images\icons2]], 16, 16, "overlay", {42/512, 75/512, 153/512, 187/512}, {.7, .7, .7, 1}, nil, 0, 0)
readyFrame.ShowChartButton.textcolor = textColor
detailsFramework:AddRoundedCornersToFrame(readyFrame.ShowChartButton.widget, roundedCornerPreset)
@@ -810,7 +736,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
--frame to handle loot events
local lootFrame = CreateFrame("frame", "$parentLootFrame", readyFrame)
lootFrame:RegisterEvent("BOSS_KILL");
lootFrame:RegisterEvent("ENCOUNTER_LOOT_RECEIVED")
local bossKillEncounterId
@@ -819,49 +744,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
local encounterID, name = ...;
bossKillEncounterId = encounterID
--print("BOSS_KILL", GetTime(), bossKillEncounterId)
elseif (event == "ENCOUNTER_LOOT_RECEIVED") then
local lootEncounterId, itemID, itemLink, quantity, playerName, className = ...
--print("ENCOUNTER_LOOT_RECEIVED", GetTime(), lootEncounterId, bossKillEncounterId)
--print("no ambig:", playerName, "with ambig:", Ambiguate(playerName, "none")) --debug
playerName = Ambiguate(playerName, "none")
local unitBanner = readyFrame.playerCacheByName[playerName]
if (not unitBanner) then
--print("no unitBanner for player", playerName, "aborting.")
return
end
local _, instanceType = GetInstanceInfo()
--print("Is encounter the same:", lootEncounterId == bossKillEncounterId)
if (instanceType == "party") then -- or instanceType == "raid" --lootEncounterId == bossKillEncounterId and
--print("all good showing loot for player", playerName)
local effectiveILvl, nop, baseItemLevel = GetDetailedItemLevelInfo(itemLink)
local itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType,
itemStackCount, itemEquipLoc, itemTexture, sellPrice, classID, subclassID, bindType,
expacID, setID, isCraftingReagent = GetItemInfo(itemLink)
--print("equip loc:", itemEquipLoc)
--unitBanner:ClearLootSquares()
if (effectiveILvl > 300 and baseItemLevel > 5) then --avoid showing loot that isn't items
local lootSquare = unitBanner:GetLootSquare()
lootSquare.itemLink = itemLink --will error if this the thrid lootSquare (creates only 2 per banner)
local rarityColor = ITEM_QUALITY_COLORS[itemQuality]
lootSquare.LootIconBorder:SetVertexColor(rarityColor.r, rarityColor.g, rarityColor.b, 1)
lootSquare.LootIcon:SetTexture(GetItemIcon(itemID))
lootSquare.LootItemLevel:SetText(effectiveILvl or "0")
readyFrame.StopTextDotAnimation()
--print("loot info:", itemLink, effectiveILvl, itemQuality)
lootSquare:Show()
end
end
end
end)
@@ -909,7 +791,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
readyFrame.TopRedLineTexture:Hide()
readyFrame.BottomRedLineTexture:Hide()
readyFrame.ContentFrame:SetAlpha(0)
readyFrame.Level:SetText(Details222.MythicPlus.Level or "")
@@ -937,8 +818,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
end)
end)
readyFrame.StartTextDotAnimation()
--/run PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_KEYSTONE_UPGRADE);
--PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_COMPLETE_NO_UPGRADE);
@@ -989,7 +868,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
wipe(readyFrame.playerCacheByName)
if (Details222.MythicPlus.OnTime) then
readyFrame.YouBeatTheTimerLabel:SetFormattedText(CHALLENGE_MODE_COMPLETE_BEAT_TIMER .. " | " .. CHALLENGE_MODE_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels) --"You beat the timer!"
readyFrame.YouBeatTheTimerLabel:SetFormattedText(MYTHIC_PLUS_COMPLETE_BEAT_TIMER .. " | " .. MYTHIC_PLUS_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels) --"You beat the timer!"
readyFrame.YouBeatTheTimerLabel.textcolor = "limegreen"
--readyFrame.KeystoneUpgradeLabel:SetFormattedText(CHALLENGE_MODE_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels)
PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_KEYSTONE_UPGRADE)
@@ -998,22 +877,12 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
end)
else
readyFrame.YouBeatTheTimerLabel.textcolor = "white"
readyFrame.YouBeatTheTimerLabel.text = CHALLENGE_MODE_COMPLETE_TIME_EXPIRED --"Time expired!"
--readyFrame.KeystoneUpgradeLabel.text = CHALLENGE_MODE_COMPLETE_TRY_AGAIN --"Try again! Beat the timer to upgrade your keystone!"
readyFrame.YouBeatTheTimerLabel.text = MYTHIC_PLUS_COMPLETE_TIME_EXPIRED --"Time expired!"
--readyFrame.KeystoneUpgradeLabel.text = MYTHIC_PLUS_COMPLETE_TRY_AGAIN --"Try again! Beat the timer to upgrade your keystone!"
PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_COMPLETE_NO_UPGRADE)
end
if (Details222.MythicPlus.NewDungeonScore and Details222.MythicPlus.OldDungeonScore) then
local gainedScore = Details222.MythicPlus.NewDungeonScore - Details222.MythicPlus.OldDungeonScore
local color = C_ChallengeMode.GetDungeonScoreRarityColor(Details222.MythicPlus.NewDungeonScore)
if (not color) then
color = HIGHLIGHT_FONT_COLOR
end
readyFrame.RantingLabel.text = CHALLENGE_COMPLETE_DUNGEON_SCORE:format(color:WrapTextInColorCode(CHALLENGE_COMPLETE_DUNGEON_SCORE_FORMAT_TEXT:format(Details222.MythicPlus.NewDungeonScore, gainedScore)))
readyFrame.RantingLabel.textcolor = "limegreen"
else
readyFrame.RantingLabel.text = ""
end
readyFrame.RantingLabel.text = ""
C_Timer.After(0.6, function()
local playersFound = 0
@@ -1041,5 +910,5 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
end
Details222.MythicPlus.IsMythicPlus = function()
return C_ChallengeMode and C_ChallengeMode.GetActiveKeystoneInfo() and true or false
return C_MythicPlus.IsKeystoneActive()
end
frames/window_options2.lua
+3 -3
View File
@@ -84,7 +84,7 @@ function Details222.OptionsPanel.InitializeOptionsWindow(instance)
frameBackgroundTextureTopLine:SetPoint("topleft", optionsFrame, "topleft", startX-9, divisorYPosition)
frameBackgroundTextureTopLine:SetPoint("topright", optionsFrame, "topright", -1, divisorYPosition)
frameBackgroundTextureTopLine:SetHeight(1)
frameBackgroundTextureTopLine:SetColorTexture(0.1215, 0.1176, 0.1294)
frameBackgroundTextureTopLine:SetTexture(0.1215, 0.1176, 0.1294)
frameBackgroundTextureTopLine:Hide()
--divisor shown in the left side of the tab options area
@@ -92,13 +92,13 @@ function Details222.OptionsPanel.InitializeOptionsWindow(instance)
frameBackgroundTextureLeftLine:SetPoint("topleft", frameBackgroundTextureTopLine, "topleft", 0, 0)
frameBackgroundTextureLeftLine:SetPoint("bottomleft", optionsFrame, "bottomleft", startX-9, 1)
frameBackgroundTextureLeftLine:SetHeight(1)
frameBackgroundTextureLeftLine:SetColorTexture(0.1215, 0.1176, 0.1294)
frameBackgroundTextureLeftLine:SetTexture(0.1215, 0.1176, 0.1294)
frameBackgroundTextureLeftLine:Hide()
local frameBackgroundTexture = optionsFrame:CreateTexture(nil, "artwork")
frameBackgroundTexture:SetPoint("topleft", optionsFrame, "topleft", startX-9, divisorYPosition-1)
frameBackgroundTexture:SetPoint("bottomright", optionsFrame, "bottomright", -1, 0)
frameBackgroundTexture:SetColorTexture (0.2317647, 0.2317647, 0.2317647)
frameBackgroundTexture:SetTexture (0.2317647, 0.2317647, 0.2317647)
frameBackgroundTexture:SetVertexColor (0.27, 0.27, 0.27)
frameBackgroundTexture:SetAlpha (0.3)
frameBackgroundTexture:Hide()
frames/window_options2_sections.lua
+2 -30
View File
@@ -205,7 +205,6 @@ do
--localize-me
{value = 1, label = "Activity Time", onclick = onSelectTimeType, icon = "Interface\\Icons\\Achievement_Quests_Completed_Daily_08", iconcolor = {1, .9, .9}, texcoord = {0.078125, 0.921875, 0.078125, 0.921875}},
{value = 2, label = "Effective Time", onclick = onSelectTimeType, icon = "Interface\\Icons\\Achievement_Quests_Completed_08"},
--{value = 3, label = "Real Time", onclick = onSelectTimeType, icon = "Interface\\Icons\\Ability_Evoker_TipTheScales"},
}
local buildTimeTypeMenu = function()
return timetypeOptions
@@ -4826,7 +4825,7 @@ do
whiteBackground:SetDrawLayer("background")
whiteBackground:SetSize(255, 128)
whiteBackground:SetPoint("topleft", sectionFrame, "topleft", previewX, previewY)
whiteBackground:SetColorTexture(1, 1, 1, 1)
whiteBackground:SetTexture(1, 1, 1, 1)
--background grid
local icon1 = DF:NewImage(sectionFrame, nil, 128, 64, "artwork", nil, nil, "$parentIcon1")
@@ -6227,7 +6226,7 @@ do
--create a gray texture below each plugin section
local createBackgroupTexture = function()
local texture = sectionFrame:CreateTexture(nil, "background")
texture:SetColorTexture(1, 1, 1, .1)
texture:SetTexture(1, 1, 1, .1)
texture:SetSize(300, 150)
return texture
end
@@ -7132,33 +7131,6 @@ do
boxfirst = true,
},
{--show evoker bar
type = "toggle",
get = function() return Details.combat_log.calc_evoker_damage end,
set = function(self, fixedparam, value)
Details.combat_log.calc_evoker_damage = value
afterUpdate()
Details:ClearParserCache()
currentInstance:InstanceReset()
end,
name = DF:AddClassIconToText("Show Augmentation Extra Bar", false, "EVOKER"),
desc = "Calculate how much the Augmentation Evoker are buffing other players",
boxfirst = true,
},
{--use realtime dps for evoker augmentataion
type = "toggle",
get = function() return Details.combat_log.evoker_show_realtimedps end,
set = function(self, fixedparam, value)
Details.combat_log.evoker_show_realtimedps = value
afterUpdate()
Details:ClearParserCache()
end,
name = DF:AddClassIconToText("Use Real Time Dps for Aug. Evoker", false, "EVOKER"),
desc = "Use Real Time Dps for Augmentation Evoker",
boxfirst = true,
},
{type = "blank"},
{type = "label", get = function() return "Parser Options:" end, text_template = subSectionTitleTextTemplate},
frames/window_report.lua
+3 -20
View File
@@ -313,23 +313,6 @@ local createDropdown = function(thisFrame)
reportChannelsTable[#reportChannelsTable + 1] = {iconsize = iconsize, value = "CHANNEL|" .. channels[i+1], label = channels[i] .. ". " .. channels[i+1], onclick = onClick, icon = [[Interface\FriendsFrame\UI-Toast-ToastIcons]], texcoord = {0.3046875, 0.4453125, 0.109375, 0.390625}, iconcolor = {149/255, 112/255, 112/255}}
end
if (not DetailsFramework.IsTimewalkWoW()) then
local _, numBNetOnline = BNGetNumFriends()
for i = 1, numBNetOnline do
local accountInfo = C_BattleNet.GetFriendAccountInfo(i)
local gameAccountInfo = accountInfo and accountInfo.gameAccountInfo
if (gameAccountInfo) then
local isOnline = gameAccountInfo.isOnline
if (isOnline) then
local bTag = accountInfo.battleTag
local bTagNoNumber = bTag:gsub("#.*", "")
reportChannelsTable[#reportChannelsTable + 1] = {iconsize = iconsize, value = "REALID|" .. accountInfo.bnetAccountID, label = bTagNoNumber, onclick = onClick, icon = [[Interface\FriendsFrame\Battlenet-Battleneticon]], texcoord = {0.125, 0.875, 0.125, 0.875}, iconcolor = {1, 1, 1}}
end
end
end
end
return reportChannelsTable
end
@@ -759,12 +742,12 @@ local createDropdown = function(thisFrame)
window.recently_report_buttons = {}
local historyBlockBackground = window:CreateTexture(nil, "background")
historyBlockBackground:SetColorTexture(0, 0, 0, .3)
historyBlockBackground:SetTexture(0, 0, 0, .3)
historyBlockBackground:SetSize(160, 158)
historyBlockBackground:SetPoint("topleft", window, "topleft", 3, -25)
local separator = window:CreateTexture(nil, "border")
separator:SetColorTexture(0, 0, 0, .6)
separator:SetTexture(0, 0, 0, .6)
separator:SetSize(2, 158)
separator:SetPoint("topleft", historyBlockBackground, "topright", 0, 0)
@@ -834,7 +817,7 @@ local createDropdown = function(thisFrame)
--scritps
local flashTexture = window:CreateTexture(nil, "background")
flashTexture:SetColorTexture(1, 1, 1)
flashTexture:SetTexture(1, 1, 1)
flashTexture:SetPoint("topleft", window, "topleft", -2, 2)
flashTexture:SetPoint("bottomright", window, "bottomright", 2, -2)
frames/window_runcode.lua
+1 -1
View File
@@ -70,7 +70,7 @@ function Details222.AutoRunCode.OpenRunCodeWindow()
codeEditor:SetBackdrop({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1})
codeEditor:SetBackdropBorderColor(0, 0, 0, 1)
codeEditor.__background:SetColorTexture(0.2317647, 0.2317647, 0.2317647)
codeEditor.__background:SetTexture(0.2317647, 0.2317647, 0.2317647)
codeEditor.__background:SetVertexColor(0.27, 0.27, 0.27)
codeEditor.__background:SetAlpha(0.8)
codeEditor.__background:SetVertTile(true)
frames/window_scrolldamage.lua
+2 -2
View File
@@ -231,8 +231,8 @@ function Details:ScrollDamage()
local combatLogReader = CreateFrame("frame")
local playerSerial = UnitGUID("player")
combatLogReader:SetScript("OnEvent", function(self)
local timew, token, hidding, sourceSerial, sourceName, sourceFlag, sourceFlag2, targetSerial, targetName, targetFlag, targetFlag2, spellID, spellName, spellType, amount, overKill, school, resisted, blocked, absorbed, isCritical = CombatLogGetCurrentEventInfo()
combatLogReader:SetScript("OnEvent", function(self, event, ...)
local timew, token, hidding, sourceSerial, sourceName, sourceFlag, sourceFlag2, targetSerial, targetName, targetFlag, targetFlag2, spellID, spellName, spellType, amount, overKill, school, resisted, blocked, absorbed, isCritical = CombatLogGetCurrentEventInfo(...)
if (sourceSerial == playerSerial) then
if (token == "SPELL_DAMAGE" or token == "SPELL_PERIODIC_DAMAGE" or token == "RANGE_DAMAGE" or token == "DAMAGE_SHIELD") then
if (not DetailsScrollDamage.Data.Started) then
frames/window_spellcategory.lua
+1 -1
View File
@@ -307,7 +307,7 @@ function Details.Survey.OpenSpellCategoryScreen()
local background = line:CreateTexture(nil, "background")
background:SetAllPoints()
background:SetColorTexture(1, 1, 1, 0.08)
background:SetTexture(1, 1, 1, 0.08)
line.hasDataBackground = background
background:Hide()
frames/window_statistics.lua
+2 -2
View File
@@ -278,10 +278,10 @@ function Details:OpenRaidHistoryWindow(raidName, bossEncounterId, difficultyId,
background:SetTexture(file)
background:SetTexCoord(L, R, T, B)
else
background:SetColorTexture(0.2, 0.2, 0.2, 0.8)
background:SetTexture(0.2, 0.2, 0.2, 0.8)
end
--]]
background:SetColorTexture(0.2, 0.2, 0.2, 0.8)
background:SetTexture(0.2, 0.2, 0.2, 0.8)
end
end
frames/window_wa.lua
+3 -3
View File
@@ -2129,7 +2129,7 @@ function _detalhes:OpenAuraPanel (spellid, spellname, spellicon, encounterid, tr
f.OnSelectAuraType = OnSelectAuraType
local AuraTypeBackground = f:CreateTexture(nil, "border")
AuraTypeBackground:SetColorTexture(.4, .4, .4, .1)
AuraTypeBackground:SetTexture(.4, .4, .4, .1)
AuraTypeBackground:SetHeight(64)
AuraTypeBackground:SetPoint("topleft", f, "topleft", 10, -79)
AuraTypeBackground:SetPoint("topright", f, "topright", -10, -79)
@@ -2753,8 +2753,8 @@ function _detalhes:OpenAuraPanel (spellid, spellname, spellicon, encounterid, tr
DetailsAuraPanel.AuraSpellId.text = tostring(spellid)
DetailsAuraPanel.icon.texture = spellicon
DetailsAuraPanel.UseGlow.glow_test.animIn:Stop()
DetailsAuraPanel.UseGlow.glow_test.animOut:Play()
---DetailsAuraPanel.UseGlow.glow_test.animIn:Stop()
---DetailsAuraPanel.UseGlow.glow_test.animOut:Play()
DetailsAuraPanel.UseGlow:SetValue(false)
DetailsAuraPanel.StackSlider:SetValue(0)
frames/window_welcome.lua
+4 -7
View File
@@ -30,13 +30,10 @@ function _detalhes:OpenWelcomeWindow()
window:SetScript("OnHide", function()
_detalhes.tabela_historico:ResetAllCombatData()
if (DetailsFramework.IsClassicWow()) then
local new_instance = Details:GetWindow (1)
new_instance.row_info.use_spec_icons = false
new_instance.row_info.icon_file = [[Interface\AddOns\Details\images\classes_small]]
new_instance:SetBarSpecIconSettings (false)
end
local new_instance = Details:GetWindow (1)
new_instance.row_info.use_spec_icons = false
new_instance.row_info.icon_file = [[Interface\AddOns\Details\images\classes_small]]
new_instance:SetBarSpecIconSettings (false)
end)
local rodape_bg = window:CreateTexture(nil, "artwork")