Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

- Another improvement on overall data and minor bug fixes.

Browse Source
This commit is contained in:
Tercio
2015-02-23 15:01:10 -03:00
parent a1582287b0
commit 8ba65a4699
6 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+2 -2
View File
File diff suppressed because one or more lines are too long
classes/classe_damage.lua
+8 -4
View File
@@ -1129,8 +1129,6 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
if (player[keyName] < 1) then --> dano menor que 1, interromper o loop
amount = index - 1
break
elseif (index == 1) then --> esse IF aqui, precisa mesmo ser aqui? não daria pra pega-lo com uma chave [1] nad grupo == true?
instancia.top = conteudo[1][keyName]
end
total = total + player[keyName]
@@ -1139,6 +1137,8 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
break
end
end
instancia.top = conteudo[1] and conteudo[1][keyName]
end
end
@@ -1272,8 +1272,12 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
qual_barra = qual_barra+1
else
for i = instancia.barraS[1], instancia.barraS[2], 1 do --> vai atualizar só o range que esta sendo mostrado
--[[ index nil value]] conteudo[i]:AtualizaBarra (instancia, barras_container, qual_barra, i, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator)
qual_barra = qual_barra+1
if (not conteudo[i]) then
print ("error on update", amount, conteudo[i], #conteudo, instancia.barraS[1], instancia.barraS[2])
else
--[[ index nil value]] conteudo[i]:AtualizaBarra (instancia, barras_container, qual_barra, i, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator)
qual_barra = qual_barra+1
end
end
end
end
classes/classe_others.lua
+1 -1
View File
@@ -1214,7 +1214,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra)
quantidade [nome] = 1
local my_self = instancia.showing[class_type]:PegarCombatente (nil, nome)
if (my_self) then
if (my_self and my_self.dispell) then
totais [#totais+1] = {nome, my_self.dispell}
end
else
classes/container_historico.lua
+10 -4
View File
@@ -96,10 +96,16 @@ function historico:adicionar (tabela)
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
local previous_combat
for i = 2, #self.tabelas do
previous_combat = self.tabelas [i]
if (previous_combat and previous_combat.is_boss and previous_combat.is_boss.name and previous_combat.is_boss.try_number and previous_combat.is_boss.name == boss and not previous_combat.is_boss.killed) then
try_number = previous_combat.is_boss.try_number + 1
break
end
end
if (not try_number) then
try_number = 1
end
else
core/parser.lua
+48 -39
View File
@@ -162,10 +162,6 @@
who_serial = ""
end
if (absorbed) then
amount = absorbed + (amount or 0)
end
--> Fix for mage prismatic crystal
--local npcId = _detalhes:GetNpcIdFromGuid (alvo_serial)
--if (npcId == 76933) then
@@ -291,44 +287,24 @@
------------------------------------------------------------------------------------------------
--> group checks and avoidance
if (absorbed) then
amount = absorbed + (amount or 0)
end
if (este_jogador.grupo) then
_current_gtotal [1] = _current_gtotal [1]+amount
elseif (jogador_alvo.grupo) then
--> record death log
local t = last_events_cache [alvo_name]
if (not t) then
t = _current_combat:CreateLastEventsTable (alvo_name)
end
local i = t.n
local this_event = t [i]
this_event [1] = true --> true if this is a damage || false for healing
this_event [2] = spellid --> spellid || false if this is a battle ress line
this_event [3] = amount --> amount of damage or healing
this_event [4] = time --> parser time
this_event [5] = _UnitHealth (alvo_name) --> current unit heal
this_event [6] = who_name --> source name
this_event [7] = absorbed
this_event [8] = school
this_event [9] = false
this_event [10] = overkill
i = i + 1
if (i == 17) then
t.n = 1
else
t.n = i
end
--> record avoidance only for player actors
--> record avoidance only for tank actors
if (tanks_members_cache [alvo_serial]) then --> autoshot or melee hit
--> monk's stagger
if (jogador_alvo.classe == "MONK") then
if (absorbed) then
amount = (amount or 0) - absorbed
end
end
--> avoidance
local avoidance = jogador_alvo.avoidance
if (not avoidance) then
@@ -372,6 +348,37 @@
mob ["FULL_HIT_AMT"] = mob ["FULL_HIT_AMT"] + amount
end
end
--> record death log
local t = last_events_cache [alvo_name]
if (not t) then
t = _current_combat:CreateLastEventsTable (alvo_name)
end
local i = t.n
local this_event = t [i]
this_event [1] = true --> true if this is a damage || false for healing
this_event [2] = spellid --> spellid || false if this is a battle ress line
this_event [3] = amount --> amount of damage or healing
this_event [4] = time --> parser time
this_event [5] = _UnitHealth (alvo_name) --> current unit heal
this_event [6] = who_name --> source name
this_event [7] = absorbed
this_event [8] = school
this_event [9] = false
this_event [10] = overkill
i = i + 1
if (i == 17) then
t.n = 1
else
t.n = i
end
end
------------------------------------------------------------------------------------------------
@@ -414,10 +421,12 @@
--> firendly fire
if (
--(
(
(_bit_band (alvo_flags, REACTION_FRIENDLY) ~= 0 and _bit_band (who_flags, REACTION_FRIENDLY) ~= 0) or --ajdt d' brx
(raid_members_cache [who_serial] and raid_members_cache [alvo_serial]) --amrl
--) and who_name ~= alvo_name
)
and
spellid ~= 124255 --stagger
) then
--> record death log
functions/slash.lua
+12
View File
@@ -907,6 +907,18 @@ function SlashCmdList.DETAILS (msg, editbox)
end
end
elseif (msg == "pos") then
local x, y = GetPlayerMapPosition ("player")
if (not DetailsPosBox) then
_detalhes.gump:CreateTextEntry (UIParent, function()end, 200, 20, nil, "DetailsPosBox")
DetailsPosBox:SetPoint ("center", UIParent, "center")
end
DetailsPosBox.MyObject.text = "{x = " .. x .. ", y = " .. y .. "}"
DetailsPosBox.MyObject:SetFocus()
DetailsPosBox.MyObject:HighlightText()
elseif (msg == "outline") then
local instancia = _detalhes.tabela_instancias [1]