- Segment menu improvements.

This commit is contained in:
Tercio
2015-02-21 15:18:04 -02:00
parent 3376f9b1b5
commit a1582287b0
5 changed files with 54 additions and 9 deletions
+6 -4
View File
File diff suppressed because one or more lines are too long
+20
View File
@@ -90,6 +90,26 @@ function historico:adicionar (tabela)
--> adiciona no index #1
_table_insert (self.tabelas, 1, tabela)
--_detalhes.encounter_counter
local boss = tabela.is_boss and tabela.is_boss.name
if (boss) then
local try_number = _detalhes.encounter_counter [boss]
if (not try_number) then
local previous_combat = self.tabelas [2]
if (previous_combat and previous_combat.is_boss and previous_combat.is_boss.name and previous_combat.is_boss.name == boss) then
try_number = previous_combat.is_boss.try_number + 1
else
try_number = 1
end
else
try_number = _detalhes.encounter_counter [boss] + 1
end
_detalhes.encounter_counter [boss] = try_number
tabela.is_boss.try_number = try_number
end
local overall_added = false
if (not overall_added and bit.band (_detalhes.overall_flag, 0x1) ~= 0) then --> raid boss - flag 0x1
+2
View File
@@ -683,6 +683,8 @@
local ignored_overheal = {
[47753] = true, -- Divine Aegis
[86273] = true, -- Illuminated Healing
[114908] = true, --Spirit Shell
[152118] = true, --Clarity of Will
}
function parser:heal_absorb (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount)
+2 -2
View File
@@ -774,8 +774,8 @@ function DetailsCreateCoolTip()
menuButton.leftIcon:SetDesaturated (leftIconTable [9])
else
menuButton.leftIcon:SetTexture (nil)
menuButton.leftIcon:SetWidth (3)
menuButton.leftIcon:SetHeight (3)
menuButton.leftIcon:SetWidth (1)
menuButton.leftIcon:SetHeight (1)
end
--> right icon
+24 -3
View File
@@ -5149,12 +5149,31 @@ local build_segment_list = function (self, elapsed)
if (thisCombat.is_boss and thisCombat.is_boss.name) then
local try_number = thisCombat.is_boss.try_number
local combat_time = thisCombat:GetCombatTime()
if (thisCombat.instance_type == "party") then
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..i..")", _, 1, party_line_color)
elseif (thisCombat.is_boss.killed) then
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..i..")", _, 1, "lime")
if (try_number) then
local m, s = _math_floor (combat_time/60), _math_floor (combat_time%60)
if (s < 10) then
s = "0" .. s
end
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..try_number.." " .. m .. ":" .. s .. ")", _, 1, "lime")
else
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..i..")", _, 1, "lime")
end
else
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..i..")", _, 1, "red")
if (try_number) then
local m, s = _math_floor (combat_time/60), _math_floor (combat_time%60)
if (s < 10) then
s = "0" .. s
end
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..try_number.." " .. m .. ":" .. s .. ")", _, 1, "red")
else
CoolTip:AddLine (thisCombat.is_boss.name .." (#"..i..")", _, 1, "red")
end
end
local portrait = _detalhes:GetBossPortrait (thisCombat.is_boss.mapid, thisCombat.is_boss.index)
@@ -5323,7 +5342,9 @@ local build_segment_list = function (self, elapsed)
CoolTip:AddLine (Loc ["STRING_SEGMENT_TIME"] .. ":", minutos.."m "..segundos.."s", 2, "white", "white")
CoolTip:SetWallpaper (2, [[Interface\ACHIEVEMENTFRAME\UI-Achievement-StatsBackground]], segments_common_tex, segments_common_color)
--CoolTip:SetWallpaper (2, [[Interface\ACHIEVEMENTFRAME\UI-Achievement-StatsBackground]], segments_common_tex, segments_common_color)
--CoolTip:SetWallpaper (2, [[Interface\PetBattles\MountJournal-NoMounts]], {0, 403/512, 0, 294/512}, {.5, .5, .5, 0.9})
CoolTip:SetWallpaper (2, [[Interface\PetPaperDollFrame\PetStatsBG-Hunter]], {321/512, 0, 0, 190/512}, {1, 1, 1, 0.9})
CoolTip:AddLine (Loc ["STRING_SEGMENT_START"] .. ":", _detalhes.tabela_overall.data_inicio, 2, "white", "white")
CoolTip:AddLine (Loc ["STRING_SEGMENT_END"] .. ":", _detalhes.tabela_overall.data_fim, 2, "white", "white")