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

- Improvements for overkill amount.

Browse Source 
- Added custom display 'My Spells' which shows your spells in the window.
This commit is contained in:
tercio
2014-12-28 16:26:09 -02:00
parent a5144c12c4
commit 371392c58e
6 changed files with 185 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+7 -2
View File
File diff suppressed because one or more lines are too long
classes/classe_custom.lua
+151 -2
View File
@@ -835,8 +835,14 @@
r, g, b = actor:GetClassColor()
end
_detalhes:AddTooltipSpellHeaderText (custom_object:GetName(), "yellow", 1, 0, 0, 0)
GameCooltip:AddIcon (custom_object:GetIcon(), 1, 1, 14, 14, 0.90625, 0.109375, 0.15625, 0.875)
if (actor.id) then
_detalhes:AddTooltipSpellHeaderText (select (1, _GetSpellInfo (actor.id)), "yellow", 1, 0, 0, 0)
GameCooltip:AddIcon (select (3, _GetSpellInfo (actor.id)), 1, 1, 14, 14, 0.90625, 0.109375, 0.15625, 0.875)
else
_detalhes:AddTooltipSpellHeaderText (custom_object:GetName(), "yellow", 1, 0, 0, 0)
GameCooltip:AddIcon (custom_object:GetIcon(), 1, 1, 14, 14, 0.90625, 0.109375, 0.15625, 0.875)
end
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
if (custom_object:IsScripted()) then
@@ -1554,6 +1560,149 @@
self.custom [#self.custom+1] = DamageTakenBySpell
end
----------------------------------------------------------------------------------------------------------------------------------------------------
local MySpells = {
name = Loc ["STRING_CUSTOM_MYSPELLS"],
icon = [[Interface\ICONS\ABILITY_MAGE_ARCANEBARRAGE]],
attribute = false,
spellid = false,
author = "Details!",
desc = Loc ["STRING_CUSTOM_MYSPELLS_DESC"],
source = false,
target = false,
script_version = 1,
script = [[
--get the parameters passed
local combat, instance_container, instance = ...
--declade the values to return
local total, top, amount = 0, 0, 0
--do the loop
local player = combat (DETAILS_ATTRIBUTE_DAMAGE, _detalhes.playername)
if (player) then
local spells = player:GetSpellList()
for spellid, spell in pairs (spells) do
instance_container:AddValue (spell, spell.total)
total = total + spell.total
if (top < spell.total) then
top = spell.total
end
amount = amount + 1
end
end
--loop end
--return the values
return total, top, amount
]],
tooltip = [[
--config:
--Background RBG and Alpha:
local R, G, B, A = 0, 0, 0, 0.75
--get the parameters passed
local spell, combat, instance = ...
--get the cooltip object (we dont use the convencional GameTooltip here)
local GC = GameCooltip
GC:SetOption ("YSpacingMod", 1)
local spellschool, schooltext = spell.spellschool, ""
if (spellschool) then
local t = _detalhes.spells_school [spellschool]
if (t and t.name) then
schooltext = t.formated
end
end
local total_hits = spell.counter
local combat_time = instance.showing:GetCombatTime()
--Cooltip code
GC:AddLine ("Hits:", spell.counter)
GC:AddStatusBar (100, 1, R, G, B, A)
local average = spell.total / total_hits
GC:AddLine ("Average:", _detalhes:ToK (average))
GC:AddStatusBar (100, 1, R, G, B, A)
GC:AddLine ("E-Dps:", _detalhes:ToK (spell.total / combat_time))
GC:AddStatusBar (100, 1, R, G, B, A)
GC:AddLine ("School:", schooltext)
GC:AddStatusBar (100, 1, R, G, B, A)
--GC:AddLine (" ")
GC:AddLine ("Normal Hits: ", spell.n_amt .. " (" ..floor ( spell.n_amt/total_hits*100) .. "%)")
GC:AddStatusBar (100, 1, R, G, B, A)
local n_average = spell.n_dmg / spell.n_amt
local T = (combat_time*spell.n_dmg)/spell.total
local P = average/n_average*100
T = P*T/100
GC:AddLine ("Average / E-Dps: ", _detalhes:ToK (n_average) .. " / " .. format ("%.1f",spell.n_dmg / T ))
GC:AddStatusBar (100, 1, R, G, B, A)
--GC:AddLine (" ")
GC:AddLine ("Critical Hits: ", spell.c_amt .. " (" ..floor ( spell.c_amt/total_hits*100) .. "%)")
GC:AddStatusBar (100, 1, R, G, B, A)
if (spell.c_amt > 0) then
local c_average = spell.c_dmg/spell.c_amt
local T = (combat_time*spell.c_dmg)/spell.total
local P = average/c_average*100
T = P*T/100
local crit_dps = spell.c_dmg / T
GC:AddLine ("Average / E-Dps: ", _detalhes:ToK (c_average) .. " / " .. _detalhes:comma_value (crit_dps))
else
GC:AddLine ("Average / E-Dps: ", "0 / 0")
end
GC:AddStatusBar (100, 1, R, G, B, A)
--GC:AddLine (" ")
GC:AddLine ("Multistrike: ", spell.m_amt .. " (" ..floor ( spell.m_amt/total_hits*100) .. "%)")
GC:AddStatusBar (100, 1, R, G, B, A)
GC:AddLine ("On Normal / On Critical:", spell.m_amt - spell.m_crit .. " / " .. spell.m_crit)
GC:AddStatusBar (100, 1, R, G, B, A)
]],
percent_script = [[
local value, top, total, combat, instance = ...
local dps = _detalhes:ToK (floor (value) / combat:GetCombatTime())
local percent = string.format ("%.1f", value/total*100)
return dps .. ", " .. percent
]],
}
local have = false
for _, custom in ipairs (self.custom) do
if (custom.name == Loc ["STRING_CUSTOM_MYSPELLS"] and (custom.script_version and custom.script_version >= MySpells.script_version) ) then
have = true
break
end
end
if (not have) then
for i, custom in ipairs (self.custom) do
if (custom.name == Loc ["STRING_CUSTOM_MYSPELLS"]) then
table.remove (self.custom, i)
end
end
setmetatable (MySpells, _detalhes.atributo_custom)
MySpells.__index = _detalhes.atributo_custom
self.custom [#self.custom+1] = MySpells
end
end
classes/classe_others.lua
+2 -1
View File
@@ -203,8 +203,9 @@ function _detalhes:ToolTipDead (instancia, morte, esta_barra, keydown)
if (evtype) then
--> damage
local overkill = event [10]
local overkill = event [10] or 0
if (overkill > 0) then
amount = amount - overkill
overkill = " (" .. _detalhes:ToK (overkill) .. " |cFFFF8800overkill|r)"
else
overkill = ""
core/parser.lua
+2 -2
View File
@@ -304,7 +304,7 @@
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 - overkill --> amount of damage or healing
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
@@ -435,7 +435,7 @@
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 - overkill --> amount of damage or healing
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
plugins/Details_EncounterDetails/Details_EncounterDetails.lua
+2 -1
View File
@@ -369,14 +369,15 @@ end
local amount = event [3]
local time = event [4]
local source = event [6]
local overkill = event [10]
if (type (evtype) == "boolean") then
--> is damage or heal
if (evtype) then
--> damage
local overkill = event [10] or 0
if (overkill > 0) then
amount = amount - overkill
overkill = " (" .. _detalhes:ToK (overkill) .. " |cFFFF8800overkill|r)"
else
overkill = ""
plugins/Details_RaidInfo-Highmaul/Details_RaidInfo-Highmaul.lua
+21
View File
@@ -1,6 +1,10 @@
local _detalhes = _G._detalhes
local trash_mobs_ids = {
}
local highmaul = {
id = 1228, --994 = map id extracted from encounter journal
@@ -87,6 +91,23 @@ local highmaul = {
--> spell list
continuo = {},
funcType = 0x2,
func = function (combat)
local removed = false
local list = combat:GetActorList (DETAILS_ATTRIBUTE_DAMAGE)
for i = #list, 1, -1 do
local id = _detalhes:GetNpcIdFromGuid (list[i].serial)
if (trash_mobs_ids [id]) then
tremove (list, i)
combat.totals [DETAILS_ATTRIBUTE_DAMAGE] = combat.totals [DETAILS_ATTRIBUTE_DAMAGE] - list[i].total
removed = true
end
end
if (removed) then
combat[DETAILS_ATTRIBUTE_DAMAGE]:Remap()
end
end,
},
[4] = {