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

- Advanced Death Logs plugin got updates on Endurance Player Value and few bug fixes.

Browse Source 
- Max Window Amount options can new be set to 1, before the minimum was 3.
- Fixed a problem with friendly fire tooltip where sometimes it doesn't show up.
- Fixed cooldowns tooltip which wasn't showing rounded numbers (49.99 instead of 50).
- Fixed Warrior's Shield Block which wasn't being count as a cooldown.
- Fixed a problem where sometimes when a hunter pull and reset the boss right after, was causing segments to merge.
This commit is contained in:
tercio
2014-12-11 12:36:12 -02:00
parent 6b9ecf4a4a
commit 47bc71010c
11 changed files with 93 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+11 -3
View File
File diff suppressed because one or more lines are too long
classes/classe_damage.lua
+6 -3
View File
@@ -1965,9 +1965,12 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown
local Skills = {}
for target_name, ff_table in _pairs (FriendlyFire) do
DamagedPlayers [#DamagedPlayers+1] = {target_name, ff_table.total, combat (1, target_name).classe}
for spellid, amount in _pairs (ff_table.spells) do
Skills [#Skills+1] = {spellid, amount}
local actor = combat (1, target_name)
if (actor) then
DamagedPlayers [#DamagedPlayers+1] = {target_name, ff_table.total, actor.classe}
for spellid, amount in _pairs (ff_table.spells) do
Skills [#Skills+1] = {spellid, amount}
end
end
end
classes/classe_others.lua
+2 -2
View File
@@ -1608,9 +1608,9 @@ function atributo_misc:ToolTipDefensiveCooldowns (instancia, numero, barra)
r, g, b = unpack (_detalhes.class_colors [owner.classe])
else
r, g, b = unpack (_detalhes.class_colors [self.classe])
end
end
local meu_total = self ["cooldowns_defensive"]
local meu_total = _math_floor (self ["cooldowns_defensive"])
local minha_tabela = self.cooldowns_defensive_spells._ActorTable
--> habilidade usada para interromper
core/parser.lua
+29 -9
View File
@@ -142,7 +142,7 @@
end
function parser:spell_dmg (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)
------------------------------------------------------------------------------------------------
--> early checks and fixes
@@ -563,13 +563,29 @@
------------------------------------------------------------------------------------------------
--> amount add
--> actor spells table
local spell = este_jogador.spells._ActorTable [spellid]
if (not spell) then
spell = este_jogador.spells:PegaHabilidade (spellid, true, token)
if (missType == "ABSORB") then
if (token == "SWING_MISSED") then
return parser:swing ("SWING_DAMAGE", time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, amountMissed, -1, 1, nil, nil, nil, false, false, false, false, multistrike)
elseif (token == "RANGE_MISSED") then
return parser:range ("RANGE_DAMAGE", time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amountMissed, -1, 1, nil, nil, nil, false, false, false, false, multistrike)
else
return parser:spell_dmg (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amountMissed, -1, 1, nil, nil, nil, false, false, false, false, multistrike)
end
else
--> actor spells table
local spell = este_jogador.spells._ActorTable [spellid]
if (not spell) then
spell = este_jogador.spells:PegaHabilidade (spellid, true, token)
end
return spell_damageMiss_func (spell, alvo_serial, alvo_name, alvo_flags, who_name, missType)
end
return spell_damageMiss_func (spell, alvo_serial, alvo_name, alvo_flags, who_name, missType)
--return spell:AddMiss (alvo_serial, alvo_name, alvo_flags, who_name, missType)
end
-----------------------------------------------------------------------------------------------------------------------------------------
@@ -1776,7 +1792,11 @@
--> search key: ~spellcast ~castspell ~cast
function parser:spellcast (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype)
--if (spellname == "Shield Block") then
-- print (who_name, spellid, spellname)
--end
------------------------------------------------------------------------------------------------
--> record cooldowns cast which can't track with buff applyed.
@@ -2594,7 +2614,7 @@
_detalhes:SairDoCombate (false, true) --wipe
end
else
if (_detalhes.tabela_vigente.end_time + 2 >= _detalhes.encounter_table ["end"]) then
if ((_detalhes.tabela_vigente.end_time or 0) + 2 >= _detalhes.encounter_table ["end"]) then
--_detalhes.tabela_vigente.start_time = _detalhes.encounter_table ["start"]
_detalhes.tabela_vigente.end_time = _detalhes.encounter_table ["end"]
_detalhes:AtualizaGumpPrincipal (-1, true)
core/plugins_toolbar.lua
+1
View File
@@ -26,6 +26,7 @@
--> create button from template
local button = CreateFrame ("button", framename, _detalhes.listener, "DetailsToolbarButton")
--button:SetScript ("OnHide", function (self) print (debugstack()) end)
--> sizes
if (w) then
core/util.lua
+17
View File
@@ -232,6 +232,23 @@
end
return s
end
function _detalhes:percent_color (value)
local r, g
if (value < 50) then
r = 255
else
r = _math_floor ( 255 - (value * 2 - 100) * 255 / 100)
end
if (value > 50) then
g = 255
else
g = _math_floor ( (value * 2) * 255 / 100)
end
return r/255, g/255, 0
end
--> unpack more than 1 table
-- http://www.dzone.com/snippets/lua-unpack-multiple-tables
functions/spells.lua
+2 -2
View File
@@ -1223,6 +1223,7 @@ do
--[114203] = {180, 15}, -- Demoralizing Banner
[114028] = {60, 5}, -- Mass Spell Reflection
[97462] = {180, 10}, -- Rallying Cry
[2565] = {12, 6}, -- Shield Block
}
_detalhes.DefensiveCooldownSpells = {
@@ -1299,9 +1300,8 @@ do
[23920] = {25, 5}, -- Spell Reflection
[114030] = {120, 12}, -- Vigilance
[118038] = {120, 8}, -- Die by the Sword
[2565] = {90, 6}, -- Shield Block
[112048] = {90, 6}, -- Shield Barrier
["WARRIOR"] = {871, 12975, 23920, 114030, 118038, 114028, 97462} --114203
["WARRIOR"] = {871, 12975, 23920, 114030, 118038, 114028, 97462, 2565} --114203
}
gumps/janela_options.lua
+1 -1
View File
@@ -3403,7 +3403,7 @@ function window:CreateFrame1()
--> Max Instances
g:NewLabel (frame1, _, "$parentLabelMaxInstances", "maxInstancesLabel", Loc ["STRING_OPTIONS_MAXINSTANCES"], "GameFontHighlightLeft")
--
local s = g:NewSlider (frame1, _, "$parentSliderMaxInstances", "maxInstancesSlider", SLIDER_WIDTH, 20, 3, 30, 1, _detalhes.instances_amount) -- min, max, step, defaultv
local s = g:NewSlider (frame1, _, "$parentSliderMaxInstances", "maxInstancesSlider", SLIDER_WIDTH, 20, 1, 30, 1, _detalhes.instances_amount) -- min, max, step, defaultv
s:SetBackdrop (slider_backdrop)
s:SetBackdropColor (unpack (slider_backdrop_color))
s:SetThumbSize (50)
gumps/janela_principal.lua
+8 -12
View File
@@ -784,6 +784,9 @@ local function move_janela (baseframe, iniciando, instancia)
if (need_start) then --> se a instância não tiver sido aberta ainda
local lower_instance = _detalhes:GetLowerInstanceNumber()
--print (lower_instance, instancia_alvo.meu_id, DEATHGRAPHICS_BUTTON:GetParent():GetName())
instancia_alvo:RestauraJanela (instancia_alvo.meu_id, true)
if (instancia_alvo:IsSoloMode()) then
_detalhes.SoloTables:switch()
@@ -2452,10 +2455,9 @@ function _detalhes:InstanceAlert (msg, icon, time, clickfunc)
self.alert.button.clickfunction = nil
end
if (time) then
self.alert_time = time
_detalhes:ScheduleTimer ("InstanceAlertTime", time, self)
end
time = time or 15
self.alert_time = time
_detalhes:ScheduleTimer ("InstanceAlertTime", time, self)
self.alert:SetPoint ("bottom", self.baseframe, "bottom", 0, -12)
self.alert:SetPoint ("left", self.baseframe, "left", 3, 0)
@@ -2554,14 +2556,14 @@ function CreateAlertFrame (baseframe, instancia)
return alert_bg
end
function _detalhes:InstanceMsg (text, icon, textcolor, icontexture, iconcoords, iconcolor)
function _detalhes:InstanceMsg (text, icon, textcolor, iconcoords, iconcolor)
if (not text) then
self.freeze_icon:Hide()
return self.freeze_texto:Hide()
end
self.freeze_texto:SetText (text)
self.freeze_icon:SetTexture (icon)
self.freeze_icon:SetTexture (icon or [[Interface\CHARACTERFRAME\Disconnect-Icon]])
self.freeze_icon:Show()
self.freeze_texto:Show()
@@ -2572,12 +2574,6 @@ function _detalhes:InstanceMsg (text, icon, textcolor, icontexture, iconcoords,
else
self.freeze_texto:SetTextColor (1, 1, 1, 1)
end
if (icontexture) then
self.freeze_icon:SetTexture (icontexture)
else
self.freeze_icon:SetTexture ([[Interface\CHARACTERFRAME\Disconnect-Icon]])
end
if (iconcoords and type (iconcoords) == "table") then
self.freeze_icon:SetTexCoord (_unpack (iconcoords))
plugins/Details_RaidInfo-Highmaul/Details_RaidInfo-Highmaul.lua
+15 -2
View File
@@ -42,12 +42,25 @@ local highmaul = {
encounter_ids2 = {
--combatlog encounter id
[1721] = 1, --kargath
[1706] = 2, --the butcher
[1722] = 3, --tectus
[1720] = 4, --brakenspore
[1719] = 5, --twin ogron
[1723] = 6, --Koragh
[1705] = 7, --Margok
},
boss_ids = {
--npc ids
[78714] = 1, --Kargath
[77404] = 2, --The Butcher
[78948] = 3, --Tectus
[78491] = 4, --Brakenspore
[78238] = 5, --Pol
[78237] = 5, --Phemos
[79015] = 6, --Koragh
[77428] = 7, --Margok
},
encounters = {
startup.lua
+1
View File
@@ -671,5 +671,6 @@ function _G._detalhes:Start()
_detalhes:InstallEncounter (molten_core)
end