- Fixed an issue with Alliance or Horde icons showing at random in player bars.
- Fixed the Death Recap window not showing data during battlegrounds. - Fixed new segment creation when the option to use only one segment while in a battleground is disabled. - Fixed east asian number format on several strings. - 'Smart Score' option renamed to "Unique Segment" under the PvP options for battlegrounds.
This commit is contained in:
Tercio
+54
-5
@@ -4061,6 +4061,8 @@ local create_deathrecap_line = function (parent, n)
|
||||
_detalhes.gump:SetFontColor (amount, "red")
|
||||
_detalhes.gump:SetFontColor (timeAt, "gray")
|
||||
_detalhes.gump:SetFontColor (sourceName, "yellow")
|
||||
|
||||
_detalhes.gump:SetFontSize (sourceName, 10)
|
||||
|
||||
--text alpha
|
||||
timeAt:SetAlpha (textAlpha)
|
||||
@@ -4299,6 +4301,8 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
DeathRecapFrame.Unavailable:Show()
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
--get the death events from the blizzard's recap
|
||||
ArtificialDeathLog = _detalhes.BuildDeathTableFromRecap (RecapID)
|
||||
end
|
||||
@@ -4360,9 +4364,11 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--tem menos que 10 eventos com grande dano dentro dos ultimos 5 segundos
|
||||
--precisa preencher com danos pequenos
|
||||
|
||||
--print ("1 BiggestDamageHits:", #BiggestDamageHits)
|
||||
|
||||
if (#BiggestDamageHits < 10) then
|
||||
for i = #events, 1, -1 do
|
||||
local event = events [i]
|
||||
@@ -4393,7 +4399,7 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
table.sort (BiggestDamageHits, function (t1, t2)
|
||||
return t1[4] > t2[4]
|
||||
end)
|
||||
|
||||
|
||||
local events = BiggestDamageHits
|
||||
|
||||
local maxHP = t [5]
|
||||
@@ -4411,18 +4417,61 @@ function _detalhes.OpenDetailsDeathRecap (segment, RecapID)
|
||||
local source = event [6]
|
||||
local overkill = event [10] or 0
|
||||
|
||||
--print ("3 loop", i, type (evType), evType)
|
||||
|
||||
if (type (evType) == "boolean" and evType) then
|
||||
|
||||
local line = Details.DeathRecap.Lines [lineIndex]
|
||||
|
||||
--print ("4 loop", i, line)
|
||||
if (line) then
|
||||
line.timeAt:SetText (format ("%.1f", eventTime - timeOfDeath) .. "s")
|
||||
line.spellIcon:SetTexture (spellIcon)
|
||||
line.TopFader:Hide()
|
||||
--line.spellIcon:SetTexCoord (.1, .9, .1, .9)
|
||||
|
||||
--line.sourceName:SetText ("|cFFC6B0D9" .. source .. "|r")
|
||||
line.sourceName:SetText (spellName)
|
||||
|
||||
--parse source and cut the length of the string after setting the spellname and source
|
||||
local sourceClass = _detalhes:GetClass (source)
|
||||
local sourceSpec = _detalhes:GetSpec (source)
|
||||
|
||||
if (not sourceClass) then
|
||||
local combat = Details:GetCurrentCombat()
|
||||
if (combat) then
|
||||
local sourceActor = combat:GetActor (1, source)
|
||||
if (sourceActor) then
|
||||
sourceClass = sourceActor.classe
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if (not sourceSpec) then
|
||||
local combat = Details:GetCurrentCombat()
|
||||
if (combat) then
|
||||
local sourceActor = combat:GetActor (1, source)
|
||||
if (sourceActor) then
|
||||
sourceSpec = sourceActor.spec
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--> remove real name or owner name
|
||||
source = _detalhes:GetOnlyName (source)
|
||||
--> remove owner name
|
||||
source = source:gsub ((" <.*"), "")
|
||||
|
||||
--> if a player?
|
||||
if (_detalhes.player_class [sourceClass]) then
|
||||
source = _detalhes:AddClassOrSpecIcon (source, sourceClass, sourceSpec, 16, true)
|
||||
|
||||
elseif (sourceClass == "PET") then
|
||||
source = _detalhes:AddClassOrSpecIcon (source, sourceClass)
|
||||
|
||||
end
|
||||
|
||||
--> remove the dot signal from the spell name
|
||||
spellName = spellName:gsub (L["STRING_DOT"], "")
|
||||
|
||||
line.sourceName:SetText (spellName .. " (" .. "|cFFC6B0D9" .. source .. "|r" .. ")")
|
||||
|
||||
if (amount > 1000) then
|
||||
--line.amount:SetText ("-" .. _detalhes:ToK (amount))
|
||||
|
||||
@@ -506,3 +506,37 @@ function _detalhes:AddRoleIcon (player_name, role, size)
|
||||
|
||||
return player_name
|
||||
end
|
||||
|
||||
function _detalhes:AddClassOrSpecIcon (playerName, class, spec, iconSize, useAlphaIcons)
|
||||
|
||||
local size = iconSize or 16
|
||||
|
||||
if (spec) then
|
||||
local specString = ""
|
||||
local L, R, T, B = unpack (_detalhes.class_specs_coords [spec])
|
||||
if (L) then
|
||||
if (useAlphaIcons) then
|
||||
specString = "|TInterface\\AddOns\\Details\\images\\spec_icons_normal_alpha:" .. size .. ":" .. size .. ":0:0:512:512:" .. (L * 512) .. ":" .. (R * 512) .. ":" .. (T * 512) .. ":" .. (B * 512) .. "|t"
|
||||
else
|
||||
specString = "|TInterface\\AddOns\\Details\\images\\spec_icons_normal:" .. size .. ":" .. size .. ":0:0:512:512:" .. (L * 512) .. ":" .. (R * 512) .. ":" .. (T * 512) .. ":" .. (B * 512) .. "|t"
|
||||
end
|
||||
return specString .. " " .. playerName
|
||||
end
|
||||
end
|
||||
|
||||
if (class) then
|
||||
local classString = ""
|
||||
local L, R, T, B = unpack (_detalhes.class_coords [class])
|
||||
if (L) then
|
||||
local imageSize = 128
|
||||
if (useAlphaIcons) then
|
||||
classString = "|TInterface\\AddOns\\Details\\images\\classes_small_alpha:" .. size .. ":" .. size .. ":0:0:" .. imageSize .. ":" .. imageSize .. ":" .. (L * imageSize) .. ":" .. (R * imageSize) .. ":" .. (T * imageSize) .. ":" .. (B * imageSize) .. "|t"
|
||||
else
|
||||
classString = "|TInterface\\AddOns\\Details\\images\\classes_small:" .. size .. ":" .. size .. ":0:0:" .. imageSize .. ":" .. imageSize .. ":" .. (L * imageSize) .. ":" .. (R * imageSize) .. ":" .. (T * imageSize) .. ":" .. (B * imageSize) .. "|t"
|
||||
end
|
||||
return classString .. " " .. playerName
|
||||
end
|
||||
end
|
||||
|
||||
return playerName
|
||||
end
|
||||
|
||||
@@ -1428,6 +1428,38 @@ Damage Update Status: @INSTANCEDAMAGESTATUS
|
||||
|
||||
instance:InstanceAlert ("Boss Defeated! Show Ranking", icon, 10, func, true)
|
||||
|
||||
elseif (msg == "spec") then
|
||||
|
||||
local spec = GetSpecialization()
|
||||
if (spec) then
|
||||
local specID = GetSpecializationInfo (spec)
|
||||
if (specID and specID ~= 0) then
|
||||
print ("Current SpecID: ", specID)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
elseif (msg == "senditemlevel") then
|
||||
_detalhes:SentMyItemLevel()
|
||||
print ("Item level dispatched.")
|
||||
|
||||
elseif (msg == "talents") then
|
||||
local talents = {}
|
||||
for i = 1, 7 do
|
||||
for o = 1, 3 do
|
||||
local talentID, name, texture, selected, available = GetTalentInfo (i, o, 1)
|
||||
if (selected) then
|
||||
tinsert (talents, talentID)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
print ("talentID", "name", "texture", "selected", "available", "spellID", "unknown", "row", "column", "unknown", "unknown")
|
||||
for i = 1, #talents do
|
||||
print (GetTalentInfoByID (talents [i]))
|
||||
end
|
||||
|
||||
elseif (msg == "merge") then
|
||||
|
||||
--> at this point, details! should not be in combat
|
||||
|
||||
@@ -87,7 +87,29 @@ do
|
||||
|
||||
[49184] = {name = GetSpellInfo (49184) .. " (Main Target)"}, --DK Howling Blast
|
||||
[237680] = {name = GetSpellInfo (237680) .. " (AoE)"}, --DK Howling Blast
|
||||
|
||||
|
||||
--> bfa trinkets
|
||||
[278155] = {name = GetSpellInfo (278155) .. " (Trinket)"}, --[Twitching Tentacle of Xalzaix]
|
||||
[279664] = {name = GetSpellInfo (279664) .. " (Trinket)"}, --[Vanquished Tendril of G'huun]
|
||||
[278227] = {name = GetSpellInfo (278227) .. " (Trinket)"}, --[T'zane's Barkspines]
|
||||
[278383] = {name = GetSpellInfo (278383) .. " (Trinket)"}, --[Azurethos' Singed Plumage]
|
||||
[278862] = {name = GetSpellInfo (278862) .. " (Trinket)"}, --[Drust-Runed Icicle]
|
||||
[278359] = {name = GetSpellInfo (278359) .. " (Trinket)"}, --[Doom's Hatred]
|
||||
[278812] = {name = GetSpellInfo (278812) .. " (Trinket)"}, --[Lion's Grace]
|
||||
[270827] = {name = GetSpellInfo (270827) .. " (Trinket)"}, --[Vessel of Skittering Shadows]
|
||||
[271071] = {name = GetSpellInfo (271071) .. " (Trinket)"}, --[Conch of Dark Whispers]
|
||||
[270925] = {name = GetSpellInfo (270925) .. " (Trinket)"}, --[Hadal's Nautilus]
|
||||
[271115] = {name = GetSpellInfo (271115) .. " (Trinket)"}, --[Ignition Mage's Fuse]
|
||||
[271462] = {name = GetSpellInfo (271462) .. " (Trinket)"}, --[Rotcrusted Voodoo Doll]
|
||||
[271465] = {name = GetSpellInfo (271465) .. " (Trinket)"}, --[Rotcrusted Voodoo Doll]
|
||||
[268998] = {name = GetSpellInfo (268998) .. " (Trinket)"}, --[Balefire Branch]
|
||||
[271671] = {name = GetSpellInfo (271671) .. " (Trinket)"}, --[Lady Waycrest's Music Box]
|
||||
[277179] = {name = GetSpellInfo (277179) .. " (Trinket)"}, --[Dread Gladiator's Medallion]
|
||||
[277187] = {name = GetSpellInfo (277187) .. " (Trinket)"}, --[Dread Gladiator's Emblem]
|
||||
[277181] = {name = GetSpellInfo (277181) .. " (Trinket)"}, --[Dread Gladiator's Insignia]
|
||||
[277185] = {name = GetSpellInfo (277185) .. " (Trinket)"}, --[Dread Gladiator's Badge]
|
||||
[278057] = {name = GetSpellInfo (278057) .. " (Trinket)"}, --[Vigilant's Bloodshaper]
|
||||
|
||||
}
|
||||
|
||||
function _detalhes:UserCustomSpellUpdate (index, name, icon)
|
||||
|
||||
+9
-21
@@ -103,25 +103,22 @@ do
|
||||
[56222] = 250, -- Dark Command
|
||||
|
||||
-- Balance Druid:
|
||||
[152221] = 102, -- Stellar Flare
|
||||
[88747] = 102, -- Wild Mushroom
|
||||
[33605] = 102, -- Astral Showers
|
||||
[48505] = 102, -- Starfall
|
||||
[112071] = 102, -- Celestial Alignment
|
||||
[78675] = 102, -- Solar Beam
|
||||
[93399] = 102, -- Shooting Stars
|
||||
[78674] = 102, -- Starsurge
|
||||
[2912] = 102, -- Starfire
|
||||
--[78674] = 102, -- Starsurge
|
||||
|
||||
-- Feral Druid:
|
||||
[171746] = 103, -- Claws of Shirvallah
|
||||
[22570] = 103, -- Maim
|
||||
[16974] = 103, -- Predatory Swiftness
|
||||
--[106785] = 103, -- Swipe
|
||||
--[1079] = 103, -- Rip
|
||||
[52610] = 103, -- Savage Roar
|
||||
[5217] = 103, -- Tiger's Fury
|
||||
--[1822] = 103, -- Rake
|
||||
--[106785] = 103, -- Swipe
|
||||
--[1079] = 103, -- Rip
|
||||
|
||||
-- Guardian Druid:
|
||||
[155835] = 104, -- Bristling Fur
|
||||
@@ -134,15 +131,15 @@ do
|
||||
[62606] = 104, -- Savage Defense
|
||||
|
||||
-- Restoration Druid:
|
||||
|
||||
[145518] = 105, -- Genesis --no exists
|
||||
[145205] = 105, -- Wild Mushroom
|
||||
[48438] = 105, -- Wild Growth
|
||||
[740] = 105, -- Tranquility
|
||||
[102342] = 105, -- Ironbark
|
||||
[33763] = 105, -- Lifebloom
|
||||
[88423] = 105, -- Nature's Cure
|
||||
[18562] = 105, -- Swiftmend
|
||||
[145205] = 105, --Efflorescence
|
||||
--[145518] = 105, -- Genesis --removed
|
||||
--[48438] = 105, -- Wild Growth --talent for other specs
|
||||
--[18562] = 105, -- Swiftmend --talent for other specs
|
||||
|
||||
-- Beast Mastery Hunter:
|
||||
[19574] = 253, -- Bestial Wrath
|
||||
@@ -269,9 +266,6 @@ do
|
||||
[184575] = 70, --Blade of Justice
|
||||
|
||||
-- Discipline Priest:
|
||||
--[109964] = 256, -- Spirit Shell
|
||||
--[47753] = 256, -- Divine Aegis
|
||||
--[132157] = 256, -- Holy Nova
|
||||
[152118] = 256, -- Clarity of Will
|
||||
[62618] = 256, -- Power Word: Barrier
|
||||
[194509] = 256, -- Power Word: Radiance
|
||||
@@ -284,7 +278,6 @@ do
|
||||
[200829] = 256, -- Plea
|
||||
[47536] = 256, -- Rapture
|
||||
[204197] = 256, -- Purge the Wicked
|
||||
|
||||
|
||||
-- Holy Priest:
|
||||
[155245] = 257, -- Clarity of Purpose
|
||||
@@ -296,21 +289,16 @@ do
|
||||
[2050] = 257, -- Holy Word: Serenity
|
||||
[34861] = 257, -- Holy Word: Sanctify
|
||||
[47788] = 257, -- Guardian Spirit
|
||||
[132157] = 257, -- Holy Nova
|
||||
--[126135] = 257, -- Lightwell
|
||||
[139] = 257, -- Renew
|
||||
[2061] = 257, --Flash Heal
|
||||
[2060] = 257, --Heal
|
||||
|
||||
|
||||
-- Shadow Priest:
|
||||
--[127632] = 258, -- Cascade
|
||||
--[122121] = 258, -- Divine Star
|
||||
--[120644] = 258, -- Halo
|
||||
[15286] = 258, -- Vampiric Embrace
|
||||
[32379] = 258, -- Shadow Word: Death
|
||||
[73510] = 258, -- Mind Spike
|
||||
[78203] = 258, -- Shadowy Apparitions
|
||||
[34914] = 258, -- Vampiric Touch
|
||||
--[2944] = 258, -- Devouring Plague
|
||||
[8092] = 258, -- Mind Blast
|
||||
[15407] = 258, -- Mind Flay
|
||||
[228266] = 258, -- Void Bolt
|
||||
|
||||
Reference in New Issue
Block a user