- Deprecated rules for friendly fire has been removed, this might fix some random issues with mind controlled players in the Lord Stormsong encounter in the Shrine of the Storm dungeon.
- Fixed DBM/BigWigs aura creation from the Spell List panel. - Chart scripts now receives the envTable, use local envTable = ... . - Polymorth (Black Cat) and Between the Eyes got added to Crowd Control list. - Fixed Timeline plugin not showing the cooldown panel. - Overall data setting won't reset on every logout. - Slash command '/details merge' won't flag the merged combat as a trash segment anymore. - Added function to use on macros to open the Player Details Window: /script Details:OpenPlayerDetails(1). - Done more improvements on the Death Recap window.
This commit is contained in:
Tercio
+82
-19
@@ -3679,7 +3679,7 @@
|
||||
-----------------------------------------------
|
||||
|
||||
local dbm_open_aura_creator = function (row)
|
||||
local data = all_modules [3].data [row]
|
||||
local data = all_modules [4].data [row]
|
||||
|
||||
local spellname, spellicon, _
|
||||
if (type (data [7]) == "number") then
|
||||
@@ -3809,7 +3809,7 @@
|
||||
|
||||
local bw_open_aura_creator = function (row)
|
||||
|
||||
local data = all_modules [4].data [row]
|
||||
local data = all_modules [5].data [row]
|
||||
|
||||
local spellname, spellicon, _
|
||||
local spellid = tonumber (data [2])
|
||||
@@ -4155,7 +4155,7 @@ local create_deathrecap_line = function (parent, n)
|
||||
--text setup
|
||||
amount:SetWidth (85)
|
||||
amount:SetJustifyH ("right")
|
||||
lifePercent:SetWidth (36)
|
||||
lifePercent:SetWidth (42)
|
||||
lifePercent:SetJustifyH ("right")
|
||||
|
||||
--background
|
||||
@@ -4189,8 +4189,8 @@ local create_deathrecap_line = function (parent, n)
|
||||
backgroundTexture2:SetHeight (32)
|
||||
|
||||
--_detalhes.gump:SetFontColor (amount, "red")
|
||||
_detalhes.gump:SetFontSize (amount, 16)
|
||||
_detalhes.gump:SetFontSize (lifePercent, 16)
|
||||
_detalhes.gump:SetFontSize (amount, 14)
|
||||
_detalhes.gump:SetFontSize (lifePercent, 14)
|
||||
backgroundTexture:SetVertexColor (.2, .1, .1, .3)
|
||||
|
||||
end
|
||||
@@ -4266,7 +4266,8 @@ function _detalhes.BuildDeathTableFromRecap (recapID)
|
||||
evtData.absorbed or 0,
|
||||
evtData.school or 0,
|
||||
false,
|
||||
evtData.overkill
|
||||
evtData.overkill,
|
||||
not spellId and {spellId, spellName, texture},
|
||||
}
|
||||
|
||||
tinsert (ArtificialDeathLog[1], ev)
|
||||
@@ -4276,8 +4277,35 @@ function _detalhes.BuildDeathTableFromRecap (recapID)
|
||||
return ArtificialDeathLog
|
||||
end
|
||||
|
||||
function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
function _detalhes.GetDeathRecapFromChat()
|
||||
-- /dump ChatFrame1:GetMessageInfo (i)
|
||||
-- /dump ChatFrame1:GetNumMessages()
|
||||
local chat1 = ChatFrame1
|
||||
local recapIDFromChat
|
||||
if (chat1) then
|
||||
local numLines = chat1:GetNumMessages()
|
||||
for i = numLines, 1, -1 do
|
||||
local text = chat1:GetMessageInfo (i)
|
||||
if (text) then
|
||||
if (text:find ("Hdeath:%d")) then
|
||||
local recapID = text:match ("|Hdeath:(%d+)|h")
|
||||
if (recapID) then
|
||||
recapIDFromChat = tonumber (recapID)
|
||||
end
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if (recapIDFromChat) then
|
||||
_detalhes.OpenDetailsDeathRecap (nil, recapIDFromChat, true)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
function _detalhes.OpenDetailsDeathRecap (segment, RecapID, fromChat)
|
||||
|
||||
if (not _detalhes.death_recap.enabled) then
|
||||
if (Details.DeathRecap and Details.DeathRecap.Lines) then
|
||||
for i = 1, 10 do
|
||||
@@ -4287,6 +4315,7 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
button:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
@@ -4405,8 +4434,7 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
DeathRecapFrame.Unavailable:Show()
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
|
||||
--get the death events from the blizzard's recap
|
||||
ArtificialDeathLog = _detalhes.BuildDeathTableFromRecap (RecapID)
|
||||
end
|
||||
@@ -4499,7 +4527,14 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
tremove (BiggestDamageHits, 11)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if (#BiggestDamageHits == 0) then
|
||||
if (not fromChat) then
|
||||
_detalhes.GetDeathRecapFromChat()
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
table.sort (BiggestDamageHits, function (t1, t2)
|
||||
return t1[4] > t2[4]
|
||||
end)
|
||||
@@ -4521,6 +4556,8 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
local source = event [6]
|
||||
local overkill = event [10] or 0
|
||||
|
||||
local customSpellInfo = event [11]
|
||||
|
||||
--print ("3 loop", i, type (evType), evType)
|
||||
|
||||
if (type (evType) == "boolean" and evType) then
|
||||
@@ -4529,7 +4566,7 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
--print ("4 loop", i, line)
|
||||
if (line) then
|
||||
line.timeAt:SetText (format ("%.1f", eventTime - timeOfDeath) .. "s")
|
||||
line.spellIcon:SetTexture (spellIcon)
|
||||
line.spellIcon:SetTexture (spellIcon or customSpellInfo and customSpellInfo [3] or "")
|
||||
line.TopFader:Hide()
|
||||
--line.spellIcon:SetTexCoord (.1, .9, .1, .9)
|
||||
--line.sourceName:SetText ("|cFFC6B0D9" .. source .. "|r")
|
||||
@@ -4574,9 +4611,20 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
|
||||
--> remove the dot signal from the spell name
|
||||
if (not spellName) then
|
||||
spellName = "*?*"
|
||||
spellName = customSpellInfo and customSpellInfo [2] or "*?*"
|
||||
if (spellName:find (STRING_ENVIRONMENTAL_DAMAGE_FALLING)) then
|
||||
if (UnitName ("player") == "Elphaba") then
|
||||
spellName = "Gravity Won!, Elphaba..."
|
||||
source = ""
|
||||
else
|
||||
source = "Gravity"
|
||||
end
|
||||
--/run for a,b in pairs (_G) do if (type (b)=="string" and b:find ("Falling")) then print (a,b) end end
|
||||
end
|
||||
end
|
||||
|
||||
spellName = spellName:gsub (L["STRING_DOT"], "")
|
||||
source = source or ""
|
||||
|
||||
line.sourceName:SetText (spellName .. " (" .. "|cFFC6B0D9" .. source .. "|r" .. ")")
|
||||
|
||||
@@ -4613,6 +4661,10 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
end
|
||||
|
||||
DeathRecapFrame.Unavailable:Hide()
|
||||
else
|
||||
if (not fromChat) then
|
||||
_detalhes.GetDeathRecapFromChat()
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@@ -4785,13 +4837,24 @@ function Details:RefreshPlaterIntegration()
|
||||
end
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--> general macros
|
||||
|
||||
function _detalhes:OpenPlayerDetails (window)
|
||||
|
||||
window = window or 1
|
||||
|
||||
local instance = _detalhes:GetInstance (window)
|
||||
if (instance) then
|
||||
local display, subDisplay = instance:GetDisplay()
|
||||
if (display == 1) then
|
||||
instance:AbreJanelaInfo (Details:GetPlayer (false, 1))
|
||||
elseif (display == 2) then
|
||||
instance:AbreJanelaInfo (Details:GetPlayer (false, 2))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
--endd
|
||||
Reference in New Issue
Block a user