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

Merge pull request #746 from linaori/div-0-get-spell-info

Browse Source 
TWW fixes
This commit is contained in:
Tercio Jose
2024-06-08 11:13:40 -03:00
committed by GitHub
parent 74f5ea791a 0940294067
commit 43bbcaae5d
20 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/class_resources.lua
+1 -1
View File
@@ -1025,7 +1025,7 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown
for i = 1, #allGeneratorSpells do
local thisGenerator = allGeneratorSpells [i]
local spellName, _, spellIcon = GetSpellInfo(thisGenerator[1].id)
local spellName, _, spellIcon = _GetSpellInfo(thisGenerator[1].id)
GameCooltip:AddLine(spellName, FormatTooltipNumber (_, thisGenerator[2]) .. " (|cFFFF5555overflow: " .. FormatTooltipNumber (_, thisGenerator[3]) .. "|r | " .. _cstr ("%.1f", (thisGenerator[2] / allGenerated) * 100).."%)")
GameCooltip:AddIcon (spellIcon, nil, nil, icon_size.W, icon_size.H, .1, .9, .1, .9)
_detalhes:AddTooltipBackgroundStatusbar()
frames/window_breakdown/breakdown_spells_spellframes.lua
+9 -5
View File
@@ -7,7 +7,7 @@ local unpack = unpack
local GetTime = GetTime
local CreateFrame = CreateFrame
local GetSpellLink = GetSpellLink
local GetSpellInfo = GetSpellInfo
local GetSpellInfo = Details222.GetSpellInfo
local _GetSpellInfo = Details.GetSpellInfo
local GameTooltip = GameTooltip
local IsShiftKeyDown = IsShiftKeyDown
@@ -336,10 +336,14 @@ local onEnterSpellBar = function(spellBar, motion) --parei aqui: precisa por nom
local normalAverage = spellTable.n_total / math.max(normalHitsAmt, 0.0001)
blockLine3.leftText:SetText(Loc ["STRING_AVERAGE"] .. ": " .. Details:CommaValue(normalAverage))
local tempo = (elapsedTime * spellTable.n_total) / math.max(spellTable.total, 0.001)
local normalAveragePercent = spellBar.average / normalAverage * 100
local normalTempoPercent = normalAveragePercent * tempo / 100
blockLine3.rightText:SetText(Loc ["STRING_HPS"] .. ": " .. Details:CommaValue(spellTable.n_total / normalTempoPercent))
if (spellTable.n_total > 0) then
local tempo = (elapsedTime * spellTable.n_total) / math.max(spellTable.total, 0.001)
local normalAveragePercent = spellBar.average / normalAverage * 100
local normalTempoPercent = normalAveragePercent * tempo / 100
blockLine3.rightText:SetText(Loc ["STRING_HPS"] .. ": " .. Details:CommaValue(spellTable.n_total / normalTempoPercent))
else
blockLine3.rightText:SetText(Loc ["STRING_HPS"] .. ": " .. Details:CommaValue(0))
end
end
---@type number
frames/window_breakdown/breakdown_spells_targetframes.lua
+2 -2
View File
@@ -7,7 +7,7 @@ local unpack = unpack
local GetTime = GetTime
local CreateFrame = CreateFrame
local GetSpellLink = GetSpellLink
local GetSpellInfo = GetSpellInfo
local GetSpellInfo = Details222.GetSpellInfo
local _GetSpellInfo = Details.GetSpellInfo
local GameTooltip = GameTooltip
local IsShiftKeyDown = IsShiftKeyDown
@@ -605,4 +605,4 @@ function spellsTab.CreateTargetBar(self, index) --~create ~target ~createtarget
targetBar:AlignWithHeader(self.Header, "left")
return targetBar
end
end
frames/window_breakdown/window_playerbreakdown_spells.lua
+1 -1
View File
@@ -9,7 +9,7 @@ local unpack = unpack
local GetTime = GetTime
local CreateFrame = CreateFrame
local GetSpellLink = GetSpellLink
local GetSpellInfo = GetSpellInfo
local GetSpellInfo = Details222.GetSpellInfo
local _GetSpellInfo = Details.GetSpellInfo
local GameTooltip = GameTooltip
local IsShiftKeyDown = IsShiftKeyDown
frames/window_currentdps.lua
+5 -2
View File
@@ -759,7 +759,10 @@ function Details:CreateCurrentDpsFrame(parent, name)
local dpsBarFrame = DetailsArenaDpsBars.splitBar
--a percenntagem na barra esta sendo setada corretamente, porem a animação não esta funcrtionando ainda
local percentValue = teamGreenDps / totalDamage
local percentValue = 0
if (totalDamage > 0) then
percentValue = teamGreenDps / totalDamage
end
percentValue = Saturate(percentValue)
--print(percentValue)
@@ -963,4 +966,4 @@ function DetailsTestSplitBar()
loopTime = 0.1
end
end)
end
end
frames/window_eventtracker.lua
+2 -1
View File
@@ -1,6 +1,7 @@
local Details = _G.Details
local C_Timer = _G.C_Timer
local GetSpellInfo = Details.GetSpellInfo
local libwindow = LibStub("LibWindow-1.1")
function Details:OpenEventTrackerOptions(bFromOptionsPanel)
@@ -262,7 +263,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
if (not DetailsFramework.IsDragonflightAndBeyond() and not DetailsFramework.IsNonRetailWowWithRetailAPI()) then
screenFrame:SetMinResize (150, 40)
screenFrame:SetMaxResize (800, 1024)
else
frames/window_options2_sections.lua
+2 -2
View File
@@ -6383,7 +6383,7 @@ do
spellname_entry:SetPoint("left", spellname, "right", 2, 0)
local spellid_entry_func = function(arg1, arg2, spellid)
local spellname, _, icon = GetSpellInfo(spellid)
local spellname, _, icon = _GetSpellInfo(spellid)
if (spellname) then
spellname_entry:SetText(spellname)
addframe.spellIconButton.icon.texture = icon
@@ -7226,4 +7226,4 @@ do
tinsert(Details.optionsSection, buildSection)
end
--]=]
--]=]
frames/window_spellcategory.lua
+2 -2
View File
@@ -221,7 +221,7 @@ function Details.Survey.OpenSpellCategoryScreen()
local spellId = spellTable[1]
--get a line
local line = self:GetLine(i)
local spellName, _, spellIcon = GetSpellInfo(spellId)
local spellName, _, spellIcon = Details.GetSpellInfo(spellId)
line.Icon:SetTexture(spellIcon)
line.Icon:SetTexCoord(.1, .9, .1, .9)
line.SpellNameText.text = spellName
@@ -361,4 +361,4 @@ function Details.Survey.OpenSpellCategoryScreen()
DetailsSpellCategoryFrame.SpellScroll:RefreshScroll()
DetailsSpellCategoryFrame:Show()
end
end
frames/window_wa.lua
+2 -2
View File
@@ -1958,7 +1958,7 @@ local empty_other_values = {}
function _detalhes:OpenAuraPanel (spellid, spellname, spellicon, encounterid, triggertype, auratype, other_values)
if (not spellname) then
spellname = select(1, GetSpellInfo(spellid))
spellname = select(1, _detalhes.GetSpellInfo(spellid))
end
Details:Destroy(empty_other_values)
@@ -2783,4 +2783,4 @@ function _detalhes:OpenAuraPanel (spellid, spellname, spellicon, encounterid, tr
DetailsAuraPanel:Show()
DetailsPluginContainerWindow.OpenPlugin (DetailsAuraPanel)
end
end
functions/api2.lua
+2
View File
@@ -9,6 +9,8 @@ This is a high level API for Details! Damage Meter
local addonName, Details222 = ...
local GetSpellInfo = Details222.GetSpellInfo
--local helpers
local getCombatObject = function(segmentNumber)
---@type combat
functions/buff.lua
+1
View File
@@ -9,6 +9,7 @@
local Loc = LibStub("AceLocale-3.0"):GetLocale ( "Details" )
local _
local addonName, Details222 = ...
local GetSpellInfo = Details222.GetSpellInfo
--initialize buffs name container
_detalhes.Buffs.BuffsTable = {} -- armazenara o [nome do buff] = { tabela do buff }
_detalhes.Buffs.__index = _detalhes.Buffs
functions/journal.lua
+1
View File
@@ -3,6 +3,7 @@ local Details = _G.Details
local DF = _G.DetailsFramework
local C_Timer = _G.C_Timer
local addonName, Details222 = ...
local GetSpellInfo = Details222.GetSpellInfo
--get the sectionInfo and try to extract the spellID from it
--sectionInfo is always a valid table
functions/playerclass.lua
+2 -2
View File
@@ -6,7 +6,7 @@ do
local pairs = pairs
local ipairs = ipairs
local unpack = table.unpack or _G.unpack
local GetSpellInfo = GetSpellInfo
local GetSpellInfo = Details222.GetSpellInfo
local UnitClass = UnitClass
local UnitGUID = UnitGUID
@@ -632,4 +632,4 @@ do
end
end
end
end
end
functions/slash.lua
+1
View File
@@ -11,6 +11,7 @@ local UIParent = UIParent
local UnitGUID = UnitGUID
local tonumber= tonumber
local LoggingCombat = LoggingCombat
local GetSpellInfo = Details222.GetSpellInfo
SLASH_PLAYEDCLASS1 = "/playedclass"
function SlashCmdList.PLAYEDCLASS(msg, editbox)
functions/spells.lua
+2
View File
@@ -3,6 +3,8 @@ do
local _detalhes = _G.Details
local addonName, Details222 = ...
local GetSpellInfo = Details222.GetSpellInfo
--import potion list from the framework
_detalhes.PotionList = {}
for spellID, _ in pairs(DetailsFramework.PotionIDs) do
plugins/Details_Compare2/Details_Compare2.lua
+3 -3
View File
@@ -458,7 +458,7 @@ do
--amount of casts
local combatObject = Details:GetCombatFromBreakdownWindow()
local castAmount = combatObject:GetSpellCastAmount(playerName, GetSpellInfo(spellId))
local castAmount = combatObject:GetSpellCastAmount(playerName, Details.GetSpellInfo(spellId))
local playerMiscObject = combatObject:GetActor(DETAILS_ATTRIBUTE_MISC, playerName)
if (castAmount > 0) then
@@ -579,7 +579,7 @@ do
local combatObject = Details:GetCombatFromBreakdownWindow()
local playerMiscObject = combatObject:GetActor(DETAILS_ATTRIBUTE_MISC, playerName)
local castAmount = combatObject:GetSpellCastAmount(playerName, GetSpellInfo(spellId))
local castAmount = combatObject:GetSpellCastAmount(playerName, Details.GetSpellInfo(spellId))
if (castAmount > 0) then
tooltip.casts_label2:SetText(getPercentComparison(mainCastAmount, castAmount))
tooltip.casts_label3:SetText(castAmount)
@@ -2057,4 +2057,4 @@ do
end
end
end
end
end
plugins/Details_EncounterDetails/frames_summary.lua
+2 -2
View File
@@ -14,7 +14,7 @@ local DETAILS_ATTRIBUTE_DAMAGE = DETAILS_ATTRIBUTE_DAMAGE
local CONST_DETAILS_MODE_GROUP = DETAILS_MODE_GROUP
local DETAILS_SEGMENTTYPE_MYTHICDUNGEON = DETAILS_SEGMENTTYPE_MYTHICDUNGEON
local DETAILS_ATTRIBUTE_MISC = DETAILS_ATTRIBUTE_MISC
local GetSpellInfo = GetSpellInfo
local GetSpellInfo = Details.GetSpellInfo
local GameTooltip = GameTooltip
local encounterDetails = _G.EncounterDetailsGlobal
@@ -1264,4 +1264,4 @@ function encounterDetails.RefreshSummaryPage(combatObject)
encounterDetails.RefreshInterruptsScoll(combatObject)
encounterDetails.RefreshDispelsScoll(combatObject)
encounterDetails.RefreshDeathsScoll(combatObject)
end
end
plugins/Details_RaidCheck/Details_RaidCheck.lua
+3 -2
View File
@@ -4,9 +4,10 @@ if (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow() or DetailsFrame
return
end
local Details = _G.Details
local GetSpellInfo = Details.GetSpellInfo
local UnitAura = UnitAura
local UnitBuff = UnitBuff
local GetSpellInfo = GetSpellInfo
local UnitClass = UnitClass
local UnitName = UnitName
local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS
@@ -1078,4 +1079,4 @@ function DetailsRaidCheck:OnEvent(_, event, ...)
end
end
end
end
end
plugins/Details_Streamer/Details_Streamer.lua
+2
View File
@@ -3,6 +3,8 @@ local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0")
local LDB = LibStub ("LibDataBroker-1.1", true)
local LDBIcon = LDB and LibStub ("LibDBIcon-1.0", true)
local LibWindow = LibStub ("LibWindow-1.1")
local Details = _G.Details
local GetSpellInfo = Details.GetSpellInfo
local _
---need cleanup Loc ["STRING_MEMORY_ALERT_BUTTON"],
plugins/Details_TinyThreat/Details_TinyThreat.lua
+2
View File
@@ -10,6 +10,8 @@ local _IsInRaid = IsInRaid --> wow api
local _IsInGroup = IsInGroup --> wow api
local _UnitGroupRolesAssigned = DetailsFramework.UnitGroupRolesAssigned --> wow api
local GetUnitName = GetUnitName
local Details = _G.Details
local GetSpellInfo = Details.GetSpellInfo
local _ipairs = ipairs --> lua api
local _table_sort = table.sort --> lua api