Merge remote-tracking branch 'fork/master'

This commit is contained in:
andrew6180
2024-06-10 08:55:07 -07:00
46 changed files with 1283 additions and 63 deletions
@@ -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)
@@ -2052,4 +2052,4 @@ do
end
end
end
end
end
@@ -11,6 +11,7 @@ local detailsFramework = DetailsFramework
local CreateFrame = CreateFrame
local GameCooltip = GameCooltip
local _
local GetSpellLink = GetSpellLink or C_Spell.GetSpellLink --api local
local encounterDetails = _G.EncounterDetailsGlobal
local edFrame = encounterDetails.Frame
@@ -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
@@ -1,4 +1,13 @@
local GetSpellInfo = GetSpellInfo
--do not load if this is a classic version of the game
if (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow() or DetailsFramework.IsClassicWow() or DetailsFramework.IsCataWow()) then
return
end
local Details = _G.Details
local GetSpellInfo = Details.GetSpellInfo
local UnitAura = UnitAura
local UnitBuff = UnitBuff
local UnitClass = UnitClass
local UnitName = UnitName
@@ -867,4 +876,4 @@ function DetailsRaidCheck:OnEvent(_, event, ...)
end
end
end
end
end
@@ -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"],
@@ -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