From 60fbd99e82d5a8db93adec5198156f6813827259 Mon Sep 17 00:00:00 2001 From: Tercio Date: Tue, 17 Mar 2015 21:55:49 -0300 Subject: [PATCH] - Fixed a problem while reporting enemy damage taken. - Fixed an issue with damage taken by spell where some spells wasn't shown. - Few improvements on tooltips. --- boot.lua | 11 +++++---- classes/classe_damage.lua | 46 +++++++++++++++++++++----------------- classes/classe_energy.lua | 11 +++++---- classes/classe_heal.lua | 28 +++++++++++------------ core/control.lua | 2 +- core/parser.lua | 10 ++++----- functions/loaddata.lua | 4 ---- functions/profiles.lua | 4 ++++ functions/slash.lua | 23 +++++++++++++++++++ images/key_alt.tga | Bin 9368 -> 9106 bytes images/key_ctrl.tga | Bin 9756 -> 9696 bytes startup.lua | 2 ++ 12 files changed, 84 insertions(+), 57 deletions(-) diff --git a/boot.lua b/boot.lua index 76d5979b..a93f991c 100644 --- a/boot.lua +++ b/boot.lua @@ -4,7 +4,7 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") _detalhes.build_counter = 656 --it's 656 for release - _detalhes.userversion = "v3.11.3" + _detalhes.userversion = "v3.11.4" _detalhes.realversion = 64 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -20,7 +20,10 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v3.11.3 (|cFFFFCC00Mar 17, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00v3.11.4 (|cFFFFCC00Mar 18, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Fixed a problem while reporting enemy damage taken.\n\n +|cFFFFFF00-|r Fixed an issue with damage taken by spell where some spells wasn't shown.\n\n +|cFFFFFF00-|r Few improvements on tooltips.\n\n |cFFFFFF00-|r Fixed a accuracy problem with shaman's spirit link toten where its life exchange was considered healing done.\n\n |cFFFFFF00-|r Boss segments now need to have at least 30 seconds to be added on the overall data.\n\n |cFFFFFF00-|r When the segment limit is reach, segments with less combat time will be erased instead of the olders.\n\n @@ -30,9 +33,9 @@ do |cFFFFFF00-|r Added custom display for CC done.\n\n --]] --- +-- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.11.3 (|cFFFFCC00Mar 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a accuracy problem with shaman's spirit link toten where its life exchange was considered healing done.\n\n|cFFFFFF00-|r Boss segments now need to have at least 30 seconds to be added on the overall data.\n\n|cFFFFFF00-|r When the segment limit is reach, segments with less combat time will be erased instead of the olders.\n\n|cFFFFFF00-|r Added item level tracker.\n\n|cFFFFFF00-|r Fixed window positioning when changing from Solo mode to Group mode.\n\n|cFFFFFF00-|r Added an option for change the amount of lines on death log.\n\n|cFFFFFF00-|r Added custom display for CC done.\n\n|cFFFFFF00v3.10.10 (|cFFFFCC00Mar 10, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs (plugin): done a calibration on endurance calculation.\n\n|cFFFFFF00-|r Raid Check (plugin): now also show information for 50+ stats runes.\n\n|cFFFFFF00-|r Fixed cooldowns spell targets on overall data.\n\n|cFFFFFF00-|r Fixed report custom displays where sometimes it didn't report spell links.\n\n|cFFFFFF00-|r Replaced old report line saying 'for the last X segments' with 'overall data'.\n\n|cFFFFFF00-|r Mini-displays on statusbar are now more responsible to right button click.\n\n|cFFFFFF00-|r Added Mage's Greater Invisibility as cooldown.\n\n|cFFFFFF00v3.10.8 (|cFFFFCC00Mar 02, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improved aura creation.\n\n|cFFFFFF00-|r Custom display 'My Spells' now also show your pets.\n\n|cFFFFFF00-|r Fixed 'Raid Check' plugin food detection.\n\n|cFFFFFF00v3.10.6 (|cFFFFCC00Feb 24, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Encounter Details (plugin): several bug fixes and improvements.\n\n|cFFFFFF00-|r Encounter Details (plugin): added new tab showing enemy spells from the encounter with an aura creation panel.\n\n|cFFFFFF00-|r Encounter Details (plugin): added phase indicators on graphic tab, hovering over shows the damage and heal for that specific phase.\n\n|cFFFFFF00-|r Segments menu now also show the encounter try number plus the elapsed combat time.\n\n|cFFFFFF00-|r Several improvements on Overall Data, also, now it has an option to not save it when the character logoff.\n\n|cFFFFFF00-|r Player Details window now closes with right click on any bar.\n\n|cFFFFFF00-|r Fixed Nature's Vigil cooldown.\n\n|cFFFFFF00v3.9.12a (|cFFFFCC00Feb 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Roll back on combat detection after reset data, might be causing problems.\n\n|cFFFFFF00v3.9.12 (|cFFFFCC00Feb 13, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs (plugin): got report buttons for Endurance and Deaths Overall Damage.\n\n|cFFFFFF00-|r Advanced Death Logs (plugin): the Deaths and Endurance limits can now be changed under the plugin options.\n\n|cFFFFFF00-|r Chart Viewer (plugin): has been revamped and now it's less complicated to use.\n\n|cFFFFFF00-|r Time Line (plugin): added options to change the background color and scale.\n\n|cFFFFFF00-|r Raid Check (plugin): its window is now 'always on top'.\n\n|cFFFFFF00-|r Accuracy adjustments on overheal of Divine Aegis and Illuminated Healing.\n\n|cFFFFFF00-|r Removed healthstone from cooldown list, added Nature's Vigil.\n\n|cFFFFFF00-|r Enemies display now shows damage taken instead of damage done.\n\n|cFFFFFF00-|r Tooltip for enemies display now also show damage and healing done by the enemy.\n\n|cFFFFFF00-|r Added an option under miscellaneous to show neutral and hostile creatures on damage taken display.\n\n|cFFFFFF00-|r Added an option to ignore nicknames and always use character names.\n\n|cFFFFFF00-|r Enabling the display icon on title bar now makes the title text automatically move slightly to right.\n\n|cFFFFFF00-|r Fixed issue with skin changing when the window has the statusbar enabled.\n\n|cFFFFFF00v3.9.4 (|cFFFFCC00Feb 03, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added option 'Ignore Mass Toggle', when enabled the window won't be affected when hiding, showing or toggling all windows.\n\n|cFFFFFF00-|r Added window number for slash commands 'hide', 'show' and 'toggle'. Usage: '/details hide 1' to hide window 1.\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r Added display icons for all skins which still didn't have they.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Created custom spell for Living Bomb explosion.\n\n|cFFFFFF00-|r Fixed statusbar textures and mini displays.\n\n|cFFFFFF00-|r Fixed an issue with title bar buttons when toggling the titlebar anchor from bottom to top position.\n\n|cFFFFFF00-|r Fixed an issue with title bar text when toggling the statusbar position from bottom to top.\n\n|cFFFFFF00-|r Fixed yet another bug with avoidance tab on player detail window.\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.11.4 (|cFFFFCC00Mar 18, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a problem while reporting enemy damage taken.\n\n|cFFFFFF00-|r Fixed an issue with damage taken by spell where some spells wasn't shown.\n\n|cFFFFFF00-|r Few improvements on tooltips.\n\n|cFFFFFF00-|r Fixed a accuracy problem with shaman's spirit link toten where its life exchange was considered healing done.\n\n|cFFFFFF00-|r Boss segments now need to have at least 30 seconds to be added on the overall data.\n\n|cFFFFFF00-|r When the segment limit is reach, segments with less combat time will be erased instead of the olders.\n\n|cFFFFFF00-|r Added item level tracker.\n\n|cFFFFFF00-|r Fixed window positioning when changing from Solo mode to Group mode.\n\n|cFFFFFF00-|r Added an option for change the amount of lines on death log.\n\n|cFFFFFF00-|r Added custom display for CC done.\n\n|cFFFFFF00v3.10.10 (|cFFFFCC00Mar 10, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs (plugin): done a calibration on endurance calculation.\n\n|cFFFFFF00-|r Raid Check (plugin): now also show information for 50+ stats runes.\n\n|cFFFFFF00-|r Fixed cooldowns spell targets on overall data.\n\n|cFFFFFF00-|r Fixed report custom displays where sometimes it didn't report spell links.\n\n|cFFFFFF00-|r Replaced old report line saying 'for the last X segments' with 'overall data'.\n\n|cFFFFFF00-|r Mini-displays on statusbar are now more responsible to right button click.\n\n|cFFFFFF00-|r Added Mage's Greater Invisibility as cooldown.\n\n|cFFFFFF00v3.10.8 (|cFFFFCC00Mar 02, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improved aura creation.\n\n|cFFFFFF00-|r Custom display 'My Spells' now also show your pets.\n\n|cFFFFFF00-|r Fixed 'Raid Check' plugin food detection.\n\n|cFFFFFF00v3.10.6 (|cFFFFCC00Feb 24, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Encounter Details (plugin): several bug fixes and improvements.\n\n|cFFFFFF00-|r Encounter Details (plugin): added new tab showing enemy spells from the encounter with an aura creation panel.\n\n|cFFFFFF00-|r Encounter Details (plugin): added phase indicators on graphic tab, hovering over shows the damage and heal for that specific phase.\n\n|cFFFFFF00-|r Segments menu now also show the encounter try number plus the elapsed combat time.\n\n|cFFFFFF00-|r Several improvements on Overall Data, also, now it has an option to not save it when the character logoff.\n\n|cFFFFFF00-|r Player Details window now closes with right click on any bar.\n\n|cFFFFFF00-|r Fixed Nature's Vigil cooldown.\n\n|cFFFFFF00v3.9.12a (|cFFFFCC00Feb 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Roll back on combat detection after reset data, might be causing problems.\n\n|cFFFFFF00v3.9.12 (|cFFFFCC00Feb 13, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs (plugin): got report buttons for Endurance and Deaths Overall Damage.\n\n|cFFFFFF00-|r Advanced Death Logs (plugin): the Deaths and Endurance limits can now be changed under the plugin options.\n\n|cFFFFFF00-|r Chart Viewer (plugin): has been revamped and now it's less complicated to use.\n\n|cFFFFFF00-|r Time Line (plugin): added options to change the background color and scale.\n\n|cFFFFFF00-|r Raid Check (plugin): its window is now 'always on top'.\n\n|cFFFFFF00-|r Accuracy adjustments on overheal of Divine Aegis and Illuminated Healing.\n\n|cFFFFFF00-|r Removed healthstone from cooldown list, added Nature's Vigil.\n\n|cFFFFFF00-|r Enemies display now shows damage taken instead of damage done.\n\n|cFFFFFF00-|r Tooltip for enemies display now also show damage and healing done by the enemy.\n\n|cFFFFFF00-|r Added an option under miscellaneous to show neutral and hostile creatures on damage taken display.\n\n|cFFFFFF00-|r Added an option to ignore nicknames and always use character names.\n\n|cFFFFFF00-|r Enabling the display icon on title bar now makes the title text automatically move slightly to right.\n\n|cFFFFFF00-|r Fixed issue with skin changing when the window has the statusbar enabled.\n\n|cFFFFFF00v3.9.4 (|cFFFFCC00Feb 03, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added option 'Ignore Mass Toggle', when enabled the window won't be affected when hiding, showing or toggling all windows.\n\n|cFFFFFF00-|r Added window number for slash commands 'hide', 'show' and 'toggle'. Usage: '/details hide 1' to hide window 1.\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r Added display icons for all skins which still didn't have they.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Created custom spell for Living Bomb explosion.\n\n|cFFFFFF00-|r Fixed statusbar textures and mini displays.\n\n|cFFFFFF00-|r Fixed an issue with title bar buttons when toggling the titlebar anchor from bottom to top position.\n\n|cFFFFFF00-|r Fixed an issue with title bar text when toggling the statusbar position from bottom to top.\n\n|cFFFFFF00-|r Fixed yet another bug with avoidance tab on player detail window.\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index a6e80bdd..640f5fc3 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -61,8 +61,12 @@ local CLASS_ICON_TCOORDS = _G.CLASS_ICON_TCOORDS local is_player_class = _detalhes.player_class - local key_overlay = {1, 1, 1, .1} - local key_overlay_press = {1, 1, 1, .2} + _detalhes.tooltip_key_overlay1 = {1, 1, 1, .2} + _detalhes.tooltip_key_overlay2 = {1, 1, 1, .5} + + _detalhes.tooltip_key_size_width = 24 + _detalhes.tooltip_key_size_height = 10 + local headerColor = {1, 0.9, 0.0, 1} local info = _detalhes.janela_info @@ -423,10 +427,10 @@ if (ismaximized) then --highlight shift key - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, .1, .1, .1, 1) else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3) end @@ -1903,7 +1907,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) _table_sort (ActorTargetsSortTable, _detalhes.Sort2) --tooltip stuff - local tooltip_max_abilities = _detalhes.tooltip_max_abilities + local tooltip_max_abilities = _detalhes.tooltip.tooltip_max_abilities if (instancia.sub_atributo == 2) then tooltip_max_abilities = 6 end @@ -1922,10 +1926,10 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) if (is_maximized) then --highlight shift key - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end @@ -1951,7 +1955,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, r, g, b, #ActorTargetsSortTable) - local max_targets = _detalhes.tooltip_max_targets + local max_targets = _detalhes.tooltip.tooltip_max_targets local is_maximized = false if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then max_targets = 99 @@ -1962,10 +1966,10 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) if (is_maximized) then --highlight - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end @@ -2045,7 +2049,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) for index, _table in _ipairs (totais) do - if (_table [2] > 0 and (index < 3 or ismaximized)) then + if (_table [2] > 0 and (index <= _detalhes.tooltip.tooltip_max_pets or ismaximized)) then if (not added_logo) then added_logo = true @@ -2055,10 +2059,10 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) GameCooltip:AddIcon ([[Interface\COMMON\friendship-heart]], 1, 1, 14, 14, 0.21875, 0.78125, 0.09375, 0.6875) if (ismaximized) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end @@ -2144,14 +2148,14 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown) if (ismaximized) then --highlight - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) if (instancia.sub_atributo == 6) then GameCooltip:AddStatusBar (100, 1, 0.7, g, b, 1) else GameCooltip:AddStatusBar (100, 1, r, g, b, 1) end else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) if (instancia.sub_atributo == 6) then GameCooltip:AddStatusBar (100, 1, 0.7, 0, 0, barAlha) else @@ -2271,15 +2275,15 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown local ismaximized = false if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end - local max_abilities = _detalhes.tooltip_max_abilities + local max_abilities = _detalhes.tooltip.tooltip_max_abilities if (ismaximized) then max_abilities = 99 end @@ -2308,15 +2312,15 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown local ismaximized = false if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end - local max_abilities2 = _detalhes.tooltip_max_abilities + local max_abilities2 = _detalhes.tooltip.tooltip_max_abilities if (ismaximized) then max_abilities2 = 99 end diff --git a/classes/classe_energy.lua b/classes/classe_energy.lua index 3f6d039e..0967aea6 100644 --- a/classes/classe_energy.lua +++ b/classes/classe_energy.lua @@ -55,8 +55,7 @@ local FormatTooltipNumber = ToKFunctions [8] local TooltipMaximizedMethod = 1 local headerColor = "yellow" -local key_overlay = {1, 1, 1, .1} -local key_overlay_press = {1, 1, 1, .2} + local actor_class_color_r, actor_class_color_g, actor_class_color_b local info = _detalhes.janela_info @@ -973,11 +972,11 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown local ismaximized = false if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end @@ -1035,11 +1034,11 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown local ismaximized = false if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end diff --git a/classes/classe_heal.lua b/classes/classe_heal.lua index 055cf035..5d145c8e 100644 --- a/classes/classe_heal.lua +++ b/classes/classe_heal.lua @@ -63,8 +63,6 @@ local FormatTooltipNumber = ToKFunctions [8] local TooltipMaximizedMethod = 1 local headerColor = "yellow" -local key_overlay = {1, 1, 1, .1} -local key_overlay_press = {1, 1, 1, .2} local info = _detalhes.janela_info local keyName @@ -1062,18 +1060,18 @@ function atributo_heal:ToolTip_HealingTaken (instancia, numero, barra, keydown) local ismaximized = false if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end _table_sort (meus_curadores, function (a, b) return a[2] > b[2] end) local max = #meus_curadores - if (max > 6) then - max = 6 + if (max > 9) then + max = 9 end if (ismaximized) then @@ -1152,17 +1150,17 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) local ismaximized = false if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end - local tooltip_max_abilities = _detalhes.tooltip_max_abilities + local tooltip_max_abilities = _detalhes.tooltip.tooltip_max_abilities if (instancia.sub_atributo == 3 or instancia.sub_atributo == 2) then - tooltip_max_abilities = 6 + tooltip_max_abilities = 9 end if (ismaximized) then @@ -1203,15 +1201,15 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) local ismaximized = false if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) ismaximized = true else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end - local tooltip_max_abilities2 = _detalhes.tooltip_max_abilities + local tooltip_max_abilities2 = _detalhes.tooltip.tooltip_max_targets if (ismaximized) then tooltip_max_abilities2 = 99 end @@ -1316,10 +1314,10 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) GameCooltip:AddIcon ([[Interface\COMMON\friendship-heart]], 1, 1, 14, 14, 0.21875, 0.78125, 0.09375, 0.6875) if (ismaximized) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay2) GameCooltip:AddStatusBar (100, 1, r, g, b, 1) else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, _detalhes.tooltip_key_size_width, _detalhes.tooltip_key_size_height, 0, 1, 0, 0.640625, _detalhes.tooltip_key_overlay1) GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha) end diff --git a/core/control.lua b/core/control.lua index d764ef0d..bb0ccf17 100644 --- a/core/control.lua +++ b/core/control.lua @@ -995,7 +995,7 @@ function _detalhes:AddTooltipSpellHeaderText (headerText, headerColor, r, g, b, amount) if (_detalhes.tooltip.show_amount) then - GameCooltip:AddLine (headerText, "x" .. amount .. "", nil, headerColor, r, g, b, .2, 12) + GameCooltip:AddLine (headerText, "x" .. amount .. "", nil, headerColor, r, g, b, .5, 10) else GameCooltip:AddLine (headerText, nil, nil, headerColor, nil, 12) end diff --git a/core/parser.lua b/core/parser.lua index 9832186f..4515ed69 100644 --- a/core/parser.lua +++ b/core/parser.lua @@ -147,10 +147,6 @@ ------------------------------------------------------------------------------------------------ --> early checks and fixes ---SPELL_DAMAGE,0000000000000000,nil,0x512,0x0,Player-1174-080D253A,"Neltuvak-Undermine",0x512,0x0,157247,"Reverberations",0x1,0000000000000000,0000000000000000,0,0,0,0,0,0,0,0,0.00,0.00,0,47061,-1,1,0,0,0,nil,nil,nil,nil ---SPELL_DAMAGE,Creature-0-3020-1205-15169-79806-000003513D,"Stone Wall",0x2248,0x0,Player-3209-085116F5,"Xirodots-Azralon",0x514,0x0,161923,"Rune of Crushing Earth",0x8,0000000000000000,0000000000000000,0,0,0,0,0,0,0,0,0.00,0.00,0,72729,-1,8,0,0,0,nil,nil,nil,nil ---SPELL_DAMAGE,0000000000000000,nil,0x514,0x0,Player-3677-070E7EAE,"Alithan-Garrosh",0x514,0x0,157659,"Rippling Smash",0x8,0000000000000000,0000000000000000,0,0,0,0,0,0,0,0,0.00,0.00,0,50610,-1,8,0,0,12765,nil,nil,nil,nil - if (who_serial == "") then if (who_flags and _bit_band (who_flags, OBJECT_TYPE_PETS) ~= 0) then --> é um pet --> pets must have a serial @@ -162,9 +158,11 @@ if (not alvo_name) then --> no target name, just quit return + elseif (not who_name) then --> no actor name, use spell name instead - who_name = "[*] "..spellname + who_name = "[*] " .. spellname + who_flags = 0xa48 who_serial = "" end @@ -374,7 +372,7 @@ local this_event = t [i] if (not this_event) then - print ("event error", i, _death_event_amt) + print ("Parser Event Error -> Set to 16 DeathLogs and /reload", i, _death_event_amt) end this_event [1] = true --> true if this is a damage || false for healing diff --git a/functions/loaddata.lua b/functions/loaddata.lua index 335865e2..2241df2b 100644 --- a/functions/loaddata.lua +++ b/functions/loaddata.lua @@ -45,10 +45,6 @@ function _detalhes:ApplyBasicKeys() self.default_texture = [[Interface\AddOns\Details\images\bar4]] self.default_texture_name = "Details D'ictum" - self.tooltip_max_targets = 3 - self.tooltip_max_abilities = 3 - self.tooltip_max_pets = 1 - self.class_coords_version = 1 self.class_colors_version = 1 diff --git a/functions/profiles.lua b/functions/profiles.lua index e6eedead..4f72f872 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -947,6 +947,10 @@ local default_profile = { --border_color = {0.76, 0.76, 0.76, 1}, border_color = {1, 1, 1, 1}, border_size = 14, + + tooltip_max_abilities = 5, + tooltip_max_targets = 2, + tooltip_max_pets = 2, }, } diff --git a/functions/slash.lua b/functions/slash.lua index 830e8d6d..89878e09 100644 --- a/functions/slash.lua +++ b/functions/slash.lua @@ -956,6 +956,29 @@ function SlashCmdList.DETAILS (msg, editbox) local average = item_level / item_amount print ("your item lvl:", average) + elseif (msg == "parser") then + + _detalhes:OnParserEvent ( + "COMBAT_LOG_EVENT_UNFILTERED", --evento = + 1548754114, --time = + "SPELL_DAMAGE", --token = + nil, --hidding = + "0000000000000000", --who_serial = + nil, --who_name = + 0x514, --who_flags = + 0x0, --who_flags2 = + "Player-3676-06F3C3FA", --alvo_serial = + "Icybluefur-Area52", --alvo_name = + 0x514, --alvo_flags = + 0x0, --alvo_flags2 = + 157247, --spellid = + "Reverberations", --spellname = + 0x1, --spelltype = + 4846, --amount = + -1, --overkill = + 1 --school = + ) + else --if (_detalhes.opened_windows < 1) then diff --git a/images/key_alt.tga b/images/key_alt.tga index d8b042a58b5fe7e14c891f225f75e01d1e542cc1..7a0a8d1b67f51ca2517b1bff470220fdd5c843ff 100644 GIT binary patch literal 9106 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 literal 9368 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 VxO~v%*Ia$#O#?6g&wzfu{{mb-Of~=j diff --git a/startup.lua b/startup.lua index 5a60ea7b..d7ac0606 100644 --- a/startup.lua +++ b/startup.lua @@ -368,6 +368,8 @@ function _G._detalhes:Start() _detalhes:SetTooltipBackdrop (_detalhes.default_profile.tooltip.border_texture, _detalhes.default_profile.tooltip.border_size, table_deepcopy (_detalhes.default_profile.tooltip.border_color)) + _detalhes.tooltip.show_amount = true + end if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 47 and enable_reset_warning) then