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

Merge remote-tracking branch 'fork/master'

Browse Source
This commit is contained in:
andrew6180
2024-05-19 14:48:19 -07:00
parent 5799e5c473 4a3def3556
commit 852c69865f
6 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+13 -2
View File
@@ -18,8 +18,8 @@
local addonName, Details222 = ...
local version, build, date, tocversion = GetBuildInfo()
Details.build_counter = 12717
Details.alpha_build_counter = 12717 --if this is higher than the regular counter, use it instead
Details.build_counter = 12755
Details.alpha_build_counter = 12755 --if this is higher than the regular counter, use it instead
Details.dont_open_news = true
Details.game_version = version
Details.userversion = version .. " " .. Details.build_counter
@@ -180,6 +180,17 @@ do
local Loc = _G.LibStub("AceLocale-3.0"):GetLocale("Details")
local news = {
{"v10.2.7.12755.156", "May 19th, 2024"},
"Pet names on tooltips are now transliterate from Cyrillic.",
"Default segments amount are now 25 and save 15, users with different amount set won't have their settings changed.",
"Fixed an error when the user opens the death recap.",
"Merging the effects of All-Totem of the Mastr (Flamanis).",
"Added a season setting to stop right click for bookmark: '/run Details.no_bookmark = true' stop the right click for bookmark in combat or not.\n/run Details.no_bookmark_on_combat = true stop the right click for bookmark only in combat.\nYou need to run this command every time you log in or add it into the Auto Run Code.",
"A few changes has been done in an attempt to fix the loot squares not showing properly in the mythic+ end screen.",
"The options panel now cannot be dragged outside the screen, this will stop users with two monitors to acciently moving the window out of screen.",
"Tooltip bar colors are now fixed and won't lost its setting on reload.",
"The buff Rallied to Victory should now be shown in the player breakdown window Auras tab.",
{"v10.2.6.12699.156", "May 03th, 2024"},
"Framework and Backend upgrades.",
"Added Toc data for Cata classic.",
classes/class_damage.lua
+7
View File
@@ -3520,6 +3520,13 @@ function damageClass:ToolTip_DamageDone (instancia, numero, barra, keydown)
meu_tempo = instancia.showing:GetCombatTime()
end
if (not meu_tempo) then
meu_tempo = instancia.showing:GetCombatTime()
if (Details.time_type == 3) then --time type 3 is deprecated
Details.time_type = 2
end
end
--add actor spells
for _spellid, _skill in pairs(ActorSkillsContainer) do
ActorSkillsSortTable [#ActorSkillsSortTable+1] = {_spellid, _skill.total, _skill.total/meu_tempo}
core/parser.lua
+1
View File
@@ -178,6 +178,7 @@
local buffs_on_target = {
[10060] = true, --power infusion
[194384] = true, --atonement uptime
[378134] = true, --rallied to victory
}
Details.CreditBuffToTarget = buffs_on_target
core/plugins.lua
+1
View File
@@ -509,6 +509,7 @@
pluginContainerFrame:EnableMouse(true)
pluginContainerFrame:SetMovable(true)
pluginContainerFrame:SetPoint("center", UIParent, "center", 0, 0)
pluginContainerFrame:SetClampedToScreen(true)
table.insert(UISpecialFrames, "DetailsPluginContainerWindow")
pluginContainerFrame:Hide()
frames/window_mythicplus/window_end_of_run.lua
+40 -29
View File
@@ -4,6 +4,8 @@ local debugmode = false --print debug lines
local verbosemode = false --auto open the chart panel
local addonName, Details222 = ...
local mPlus = Details222.MythicPlusBreakdown
---@type detailsframework
local detailsFramework = DetailsFramework
local _
@@ -72,7 +74,6 @@ local createLootSquare = function(playerBanner, name, parent, lootIndex)
local lootSquare = CreateFrame("frame", playerBanner:GetName() .. "LootSquare" .. lootIndex, parent)
lootSquare:SetSize(46, 46)
lootSquare:SetFrameLevel(parent:GetFrameLevel()+1)
playerBanner.LootSquare = lootSquare
lootSquare:Hide()
lootSquare:SetScript("OnEnter", function(self)
@@ -103,7 +104,7 @@ local createLootSquare = function(playerBanner, name, parent, lootIndex)
local lootItemLevel = lootSquare:CreateFontString("$parentLootItemLevel", "overlay", "GameFontNormal")
lootItemLevel:SetPoint("top", lootSquare, "bottom", 0, -2)
lootItemLevel:SetTextColor(1, 1, 1)
DetailsFramework:SetFontSize(lootItemLevel, 12)
detailsFramework:SetFontSize(lootItemLevel, 12)
lootSquare.LootItemLevel = lootItemLevel
return lootSquare
@@ -128,7 +129,7 @@ local createPlayerBanner = function(parent, name)
local playerNameFontString = playerBanner:CreateFontString("$parentPlayerNameText", "overlay", "GameFontNormal")
playerNameFontString:SetTextColor(1, 1, 1)
playerNameFontString:SetPoint("top", playerBanner, "bottom", -1, -7)
DetailsFramework:SetFontSize(playerNameFontString, 12)
detailsFramework:SetFontSize(playerNameFontString, 12)
playerBanner.PlayerNameFontString = playerNameFontString
local playerNameBackgroundTexture = playerBanner:CreateTexture("$parentPlayerNameBackgroundTexture", "overlay", nil, 6)
@@ -238,7 +239,7 @@ local createPlayerBanner = function(parent, name)
local levelFontString = levelUpTextFrame:CreateFontString("$parentLVLText", "artwork", "GameFontNormal")
levelFontString:SetTextColor(1, 1, 1)
levelFontString:SetPoint("center", levelUpTextFrame, "center", 0, 0)
DetailsFramework:SetFontSize(levelFontString, 20)
detailsFramework:SetFontSize(levelFontString, 20)
levelFontString:SetText("")
playerBanner.LevelFontString = levelFontString
@@ -313,13 +314,18 @@ local createPlayerBanner = function(parent, name)
playerBanner.LootSquares = {}
local lootSquare1 = createLootSquare(playerBanner, name, parent, 1)
lootSquare1:SetPoint("top", playerBanner, "bottom", 0, -90)
playerBanner.LootSquares[1] = lootSquare1
local lootSquareAmount = 2
local lootSquare2 = createLootSquare(playerBanner, name, parent, 2)
lootSquare2:SetPoint("top", lootSquare1, "bottom", 0, -2)
playerBanner.LootSquares[2] = lootSquare2
for i = 1, lootSquareAmount do
local lootSquare = createLootSquare(playerBanner, name, parent, i)
if (i == 1) then
lootSquare:SetPoint("top", playerBanner, "bottom", 0, -90)
else
lootSquare:SetPoint("top", playerBanner.LootSquares[i-1], "bottom", 0, -2)
end
playerBanner.LootSquares[i] = lootSquare
playerBanner["lootSquare" .. i] = lootSquare
end
function playerBanner:ClearLootSquares()
playerBanner.NextLootSquare = 1
@@ -333,9 +339,11 @@ local createPlayerBanner = function(parent, name)
end
function playerBanner:GetLootSquare()
local lootSquare = playerBanner.NextLootSquare
playerBanner.NextLootSquare = playerBanner.NextLootSquare + 1
return playerBanner.LootSquares[lootSquare]
local lootSquareIdx = playerBanner.NextLootSquare
playerBanner.NextLootSquare = lootSquareIdx + 1
local lootSquare = playerBanner.LootSquares[lootSquareIdx]
lootSquare:Show()
return lootSquare
end
return playerBanner
@@ -608,12 +616,12 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
readyFrame.bottomFiligree:SetSize(66, 28)
readyFrame.bottomFiligree:SetPoint("bottom", readyFrame, "bottom", 0, -19)
local titleLabel = DetailsFramework:CreateLabel(contentFrame, "Details! Mythic Run Completed!", 12, "yellow")
local titleLabel = detailsFramework:CreateLabel(contentFrame, "Details! Mythic Run Completed!", 12, "yellow")
titleLabel:SetPoint("top", readyFrame, "top", 0, -7)
titleLabel.textcolor = textColor
---@type df_closebutton
local closeButton = DetailsFramework:CreateCloseButton(contentFrame, "$parentCloseButton")
local closeButton = detailsFramework:CreateCloseButton(contentFrame, "$parentCloseButton")
closeButton:SetPoint("topright", readyFrame, "topright", -2, -2)
closeButton:SetScale(1.4)
closeButton:SetAlpha(0.823)
@@ -622,8 +630,9 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
end)
--warning footer
local warningFooter = DetailsFramework:CreateLabel(contentFrame, "Under development.", 9, "yellow")
warningFooter:SetPoint("bottom", readyFrame, "bottom", 0, 20)
local warningFooter = detailsFramework:CreateLabel(contentFrame, "Under development", 9, "orange")
warningFooter:SetPoint("bottomright", readyFrame, "bottomright", -5, 5)
warningFooter:SetAlpha(0.5)
---@type texture
local topRedLineTexture = backgroundFrame:CreateTexture("$parentBannerTop", "border")
@@ -672,7 +681,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
mPlus.ShowSummary()
end
---@type df_button
readyFrame.ShowBreakdownButton = DetailsFramework:CreateButton(contentFrame, showBreakdownFunc, 145, 30, "Show Breakdown")
readyFrame.ShowBreakdownButton = detailsFramework:CreateButton(contentFrame, showBreakdownFunc, 145, 30, "Show Breakdown")
PixelUtil.SetPoint(readyFrame.ShowBreakdownButton, "topleft", readyFrame, "topleft", 31, -30)
PixelUtil.SetSize(readyFrame.ShowBreakdownButton, 145, 32)
readyFrame.ShowBreakdownButton:SetBackdrop(nil)
@@ -688,7 +697,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
readyFrame:Hide()
end
---@type df_button
readyFrame.ShowChartButton = DetailsFramework:CreateButton(contentFrame, showChartFunc, 145, 30, "Show Damage Graphic")
readyFrame.ShowChartButton = detailsFramework:CreateButton(contentFrame, showChartFunc, 145, 30, "Show Damage Graphic")
PixelUtil.SetPoint(readyFrame.ShowChartButton, "left", readyFrame.ShowBreakdownButton, "right", 6, 0)
PixelUtil.SetSize(readyFrame.ShowChartButton, 145, 32)
readyFrame.ShowChartButton:SetBackdrop(nil)
@@ -701,24 +710,24 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
Details.mythic_plus.show_damage_graphic = not value
end
local elapsedTimeLabel = DetailsFramework:CreateLabel(contentFrame, "Run Time:", textSize, textColor)
local elapsedTimeLabel = detailsFramework:CreateLabel(contentFrame, "Run Time:", textSize, textColor)
--elapsedTimeLabel:SetPoint("topleft", leftAnchor, "bottomleft", 0, -8)
elapsedTimeLabel:SetPoint("topleft", readyFrame, "topleft", 5, -70)
local elapsedTimeAmount = DetailsFramework:CreateLabel(contentFrame, "00:00", textSize, textColor)
local elapsedTimeAmount = detailsFramework:CreateLabel(contentFrame, "00:00", textSize, textColor)
elapsedTimeAmount:SetPoint("left", elapsedTimeLabel, "left", 130, 0)
local timeNotInCombatLabel = DetailsFramework:CreateLabel(contentFrame, "Time not in combat:", textSize, "orangered")
local timeNotInCombatLabel = detailsFramework:CreateLabel(contentFrame, "Time not in combat:", textSize, "orangered")
timeNotInCombatLabel:SetPoint("topleft", elapsedTimeLabel, "bottomleft", 0, -5)
local timeNotInCombatAmount = DetailsFramework:CreateLabel(contentFrame, "00:00", textSize, "orangered")
local timeNotInCombatAmount = detailsFramework:CreateLabel(contentFrame, "00:00", textSize, "orangered")
timeNotInCombatAmount:SetPoint("left", timeNotInCombatLabel, "left", 130, 0)
local youBeatTheTimerLabel = DetailsFramework:CreateLabel(contentFrame, "", textSize, "white")
local youBeatTheTimerLabel = detailsFramework:CreateLabel(contentFrame, "", textSize, "white")
youBeatTheTimerLabel:SetPoint("topleft", timeNotInCombatLabel, "bottomleft", 0, -5)
--local keystoneUpgradeLabel = DetailsFramework:CreateLabel(readyFrame, "Keystone Upgrade:", textSize, "white")
--local keystoneUpgradeLabel = detailsFramework:CreateLabel(readyFrame, "Keystone Upgrade:", textSize, "white")
--keystoneUpgradeLabel:SetPoint("topleft", youBeatTheTimerLabel, "bottomleft", 0, -5)
local rantingLabel = DetailsFramework:CreateLabel(contentFrame, "", textSize, textColor)
local rantingLabel = detailsFramework:CreateLabel(contentFrame, "", textSize, textColor)
--rantingLabel:SetPoint("topleft", keystoneUpgradeLabel, "bottomleft", 0, -5)
rantingLabel:SetPoint("topleft", youBeatTheTimerLabel, "bottomleft", 0, -5)
@@ -767,12 +776,14 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
Details222.MythicPlus.BackgroundTexture = backgroundTexture
--]=]
local notAgainSwitch, notAgainLabel = DetailsFramework:CreateSwitch(contentFrame, on_switch_enable, not Details.mythic_plus.show_damage_graphic, _, _, _, _, _, _, _, _, _, Loc ["STRING_MINITUTORIAL_BOOKMARK4"], DetailsFramework:GetTemplate("switch", "OPTIONS_CHECKBOX_BRIGHT_TEMPLATE"), "GameFontHighlightLeft")
local notAgainSwitch, notAgainLabel = detailsFramework:CreateSwitch(contentFrame, on_switch_enable, not Details.mythic_plus.show_damage_graphic, _, _, _, _, _, _, _, _, _, Loc ["STRING_MINITUTORIAL_BOOKMARK4"], detailsFramework:GetTemplate("switch", "OPTIONS_CHECKBOX_BRIGHT_TEMPLATE"), "GameFontHighlightLeft")
notAgainLabel.textcolor = "orange"
notAgainSwitch:ClearAllPoints()
notAgainLabel:SetPoint("left", notAgainSwitch, "right", 2, 0)
notAgainSwitch:SetPoint("bottomleft", readyFrame, "bottomleft", 5, 5)
notAgainSwitch:SetAsCheckBox()
notAgainSwitch:SetSize(12, 12)
notAgainSwitch:SetAlpha(0.5)
notAgainLabel.textsize = 9
readyFrame.TimeNotInCombatAmountLabel = timeNotInCombatAmount
@@ -837,12 +848,12 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
--update the run time and time not in combat
local elapsedTime = Details222.MythicPlus.time or 1507
readyFrame.ElapsedTimeAmountLabel.text = DetailsFramework:IntegerToTimer(elapsedTime)
readyFrame.ElapsedTimeAmountLabel.text = detailsFramework:IntegerToTimer(elapsedTime)
if (overallMythicDungeonCombat:GetCombatType() == DETAILS_SEGMENTTYPE_MYTHICDUNGEON_OVERALL) then
local combatTime = overallMythicDungeonCombat:GetCombatTime()
local notInCombat = elapsedTime - combatTime
readyFrame.TimeNotInCombatAmountLabel.text = DetailsFramework:IntegerToTimer(notInCombat) .. " (" .. math.floor(notInCombat / elapsedTime * 100) .. "%)"
readyFrame.TimeNotInCombatAmountLabel.text = detailsFramework:IntegerToTimer(notInCombat) .. " (" .. math.floor(notInCombat / elapsedTime * 100) .. "%)"
else
readyFrame.TimeNotInCombatAmountLabel.text = "Unknown for this run"
end
startup.lua
-5
View File
@@ -543,11 +543,6 @@ function Details:StartMeUp()
--no no, enforece 8, 8 is much better, 8 is more lines, we like 8
Details.tooltip.tooltip_max_abilities = 8
local tooltipBarColor = Details.tooltip.bar_color
tooltipBarColor[1] = 0.149
tooltipBarColor[2] = 0.149
tooltipBarColor[3] = 0.149
Details.InstallRaidInfo()
--Plater integration