- Fixed a problem with solo plugins window when fast PS update is enabled.

- Fixed an issue with Soul Capacitor trinket.
This commit is contained in:
Tercio
2015-07-01 17:24:03 -03:00
parent 671515e4be
commit 232715c238
3 changed files with 43 additions and 21 deletions
+3 -3
View File
File diff suppressed because one or more lines are too long
+26 -6
View File
@@ -85,6 +85,8 @@
local container_pets = {} --> place holder
--> ignore deaths
local ignore_death = {}
--> special items
local soul_capacitor = {} --> trinket from Socrethar the Eternal
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> constants
@@ -190,7 +192,16 @@
if (spellid == 98021) then
return parser:SLT_damage (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand, multistrike)
end
if (soul_capacitor [who_serial]) then
if (soul_capacitor [who_serial]+12 < _tempo) then
--> something went wrong, debuff didn't expired or we didn't saw it going out.
soul_capacitor [who_serial] = nil
else
return
end
end
------------------------------------------------------------------------------------------------
--> check if need start an combat
@@ -300,14 +311,14 @@
--> last event
este_jogador.last_event = _tempo
------------------------------------------------------------------------------------------------
--> group checks and avoidance
if (absorbed) then
amount = absorbed + (amount or 0)
end
end
if (este_jogador.grupo and not este_jogador.arena_enemy) then --> source = friendly player
_current_gtotal [1] = _current_gtotal [1]+amount
@@ -457,7 +468,7 @@
if (spellid == 108446) then
return
end
--> record death log (o erro era o pet, não tinha tabela então dava erro)
if (este_jogador.grupo) then --> se tiver ele não adiciona o evento lá em cima
local t = last_events_cache [alvo_name]
@@ -700,6 +711,8 @@
return --> just return if actor doen't exist yet
end
end
este_jogador.last_event = _tempo
if (tanks_members_cache [alvo_serial]) then --> only track tanks
@@ -842,6 +855,7 @@
[114556] = true, -- Purgatory (DK)
[115069] = true, -- Stance of the Sturdy Ox (Monk)
[20711] = true, -- Spirit of Redemption (Priest)
[184553] = true, --Soul Capacitor
}
local ignored_overheal = {
@@ -1192,6 +1206,8 @@
parser:dead ("UNIT_DIED", time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags)
ignore_death [who_name] = true
return
elseif (spellid == 184293) then --> WOD trinket: Soul Capacitor T18
soul_capacitor [who_serial] = _tempo
end
if (_recording_buffs_and_debuffs) then
@@ -1552,7 +1568,11 @@
parser:add_buff_uptime (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, "BUFF_UPTIME_OUT")
end
end
if (spellid == 184293) then --> WOD trinket: Soul Capacitor T18
soul_capacitor [who_serial] = nil
end
------------------------------------------------------------------------------------------------
--> healing done (shields)
if (absorb_spell_list [spellid] and _recording_healing) then
+14 -12
View File
@@ -4125,18 +4125,20 @@ local fast_ps_func = function (self)
local combat_time = instance.showing:GetCombatTime()
local ps_type = _detalhes.ps_abbreviation
for i = 1, instance.rows_fit_in_window do --instance:GetNumRows()
local row = instance.barras [i] --instance:GetRow (i)
if (row and row:IsShown()) then
local actor = row.minha_tabela
if (actor) then
local dps_text = row.ps_text
if (dps_text) then
local new_dps = _math_floor (actor.total / combat_time)
local formated_dps = tok_functions [ps_type] (_, new_dps)
if (instance.rows_fit_in_window) then
for i = 1, instance.rows_fit_in_window do --instance:GetNumRows()
local row = instance.barras [i] --instance:GetRow (i)
if (row and row:IsShown()) then
local actor = row.minha_tabela
if (actor) then
local dps_text = row.ps_text
if (dps_text) then
local new_dps = _math_floor (actor.total / combat_time)
local formated_dps = tok_functions [ps_type] (_, new_dps)
row.texto_direita:SetText (row.texto_direita:GetText():gsub (dps_text, formated_dps))
row.ps_text = formated_dps
row.texto_direita:SetText (row.texto_direita:GetText():gsub (dps_text, formated_dps))
row.ps_text = formated_dps
end
end
end
end
@@ -5626,7 +5628,7 @@ local build_segment_list = function (self, elapsed)
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..i..")", _, 1, "red")
end
end
local portrait = _detalhes:GetBossPortrait (thisCombat.is_boss.mapid, thisCombat.is_boss.index) or thisCombat.is_boss.bossimage
if (portrait) then
CoolTip:AddIcon (portrait, 2, "top", 128, 64)