From 9e9f897db6b086cc597f5ebb0c97964db43e8372 Mon Sep 17 00:00:00 2001 From: Tercio Date: Sun, 30 Sep 2018 20:05:18 -0300 Subject: [PATCH] - Updated to BFA 'Potion Used' and 'Health Potion and Stone' custom displays. - Fixed small visual glitches and tooltip updates. --- boot.lua | 31 ++-- classes/classe_custom.lua | 101 ++++++------- classes/classe_damage.lua | 141 +++++++++++------- classes/classe_energy.lua | 12 +- classes/classe_heal.lua | 117 ++++++++------- classes/classe_others.lua | 97 +++++++----- core/control.lua | 4 +- functions/profiles.lua | 5 +- gumps/janela_info.lua | 16 +- .../Details_RaidCheck/Details_RaidCheck.lua | 28 +++- startup.lua | 7 +- 11 files changed, 320 insertions(+), 239 deletions(-) diff --git a/boot.lua b/boot.lua index ecc33e42..2762fadf 100644 --- a/boot.lua +++ b/boot.lua @@ -3,9 +3,9 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 6514 + _detalhes.build_counter = 6538 _detalhes.userversion = "v8.0.1." .. _detalhes.build_counter - _detalhes.realversion = 134 --core version + _detalhes.realversion = 135 --core version _detalhes.APIVersion = _detalhes.realversion --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" _detalhes.BFACORE = 131 @@ -23,14 +23,14 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v8.0.1.6514.134 (|cFFFFCC00September 25th, 2018|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Backfire damage from Light of the Martyr now shows on death logs as friendly fire.\n\n +|cFFFFFF00v8.0.1.6538.135 (|cFFFFCC00September 30th, 2018|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Updated to BFA 'Potion Used' and 'Health Potion and Stone' custom displays.\n\n |cFFFFFF00-|r .\n\n |cFFFFFF00-|r .\n\n --]] - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v8.0.1.6514.134 (|cFFFFCC00September 28th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Backfire damage from Light of the Martyr now shows on death logs as friendly fire.\n\n|cFFFFFF00-|r Deprecated rules for friendly fire has been removed, this might fix some random issues with mind controlled players in the Lord Stormsong encounter in the Shrine of the Storm dungeon.\n\n|cFFFFFF00-|r Fixed DBM/BigWigs aura creation from the Spell List panel.\n\n|cFFFFFF00-|r Chart scripts now receives the envTable, use local envTable = ... .\n\n|cFFFFFF00-|r Polymorth (Black Cat) and Between the Eyes got added to Crowd Control list.\n\n|cFFFFFF00-|r Fixed Timeline plugin not showing the cooldown panel.\n\n|cFFFFFF00-|r Overall data setting won't reset on every logout.\n\n|cFFFFFF00-|r Slash command '/details merge' won't flag the merged combat as a trash segment anymore.\n\n|cFFFFFF00-|r Added function to use on macros to open the Player Details Window: /script Details:OpenPlayerDetails(1).\n\n|cFFFFFF00-|r Done more improvements on the Death Recap window.\n\n|cFFFFFF00v8.0.1.6449.134 (|cFFFFCC00September 11th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! is ready for Uldir mythic raiding!.\n\n|cFFFFFF00-|r Several improvements on Encounter Details plugin.\n\n|cFFFFFF00-|r Details! Scroll Damage for training in dummies is now ready for more tests, access it |cFFFFFF00/details scrolldamage|r.\n\n|cFFFFFF00-|r Damage and Healing tooltips now show a statusbar indicating the percent done by the ability.\n\n|cFFFFFF00-|r Added a scale slider to the options panel.\n\n|cFFFFFF00-|r Added monk's Quaking Palm to crowd control spells.\n\n|cFFFFFF00-|r Fixed an issue with Plater integration.\n\n|cFFFFFF00-|r Fixed tooltips not hiding when the cursor leaves the spell icon in the Damage Taken by Spell.\n\n|cFFFFFF00-|r Framework: fixed an issue with tooltips and menus where the division line wasn't hiding properly.\n\n|cFFFFFF00-|r Framework: fixed some buttons not showing its text in the options panel.\n\n|cFFFFFF00v8.0.1.6272.134 (|cFFFFCC00August 28th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Dynamic Overall Data custom display.\n\n|cFFFFFF00-|r Fixed friendly fire on some dungeon fights with mind control.\n\n|cFFFFFF00-|r Raid Check plugin fully revamped, now shows talents, spec and role.\n\n|cFFFFFF00-|r Updated flask and food list for BFA.\n\n|cFFFFFF00-|r Added NpcID listing at the Spell List window.\n\n|cFFFFFF00-|r Fixed an issue with Alliance or Horde icons showing at random in player bars.\n\n|cFFFFFF00-|r Small revamp in the Death Recap window.\n\n|cFFFFFF00-|r Fixed new segment creation when the option to use only one segment while in a battleground is disabled.\n\n|cFFFFFF00-|r Fixed east asian number format on several strings.\n\n|cFFFFFF00-|r 'Smart Score' option renamed to 'Unique Segment' under the PvP options for battlegrounds.\n\n|cFFFFFF00v8.0.1.6120.132 (|cFFFFCC00August 07th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Death Knight: Epidemic, Scourge Strike and Howling Blast now has a better description on the spell name.\n\n|cFFFFFF00-|r Fixed snap button showing when 'Hide Resize Buttons' are enabled.\n\n|cFFFFFF00-|r Fixed title bar icons not hiding when 'Auto Hide Buttons' is enabled.\n\n|cFFFFFF00-|r Several improvements to overall data, it should be more consistent now.\n\n|cFFFFFF00-|r Details! now passes to identify the tank role of the player even when out of a party or raid.\n\n|cFFFFFF00-|r Debug helper /run Details:DumpTable(table) now correctly shows the key name when it isn't a string.\n\n|cFFFFFF00-|r Improvements done on the Bookmark config frame accessed by the options panel > display section.\n\n|cFFFFFF00-|r New slash command: '/details spells'.\n\n|cFFFFFF00-|r Statistics for Legion has been closed! You can access statistics from the orange gear > statistics.\n\n|cFFFFFF00v8.0.1.6027.132 (|cFFFFCC00July 28th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added size offset options for the chat tab embed feature.\n\n|cFFFFFF00-|r Revamp on the editor for the custom line text.\n\n|cFFFFFF00v8.0.1.5985.131 (|cFFFFCC00July 17th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 'Auto Run Code' module.\n\n|cFFFFFF00-|r Added 'Plater Nameplates' integration.\n\n|cFFFFFF00-|r Weakauras integration with the Create Aura panel got great improvements.\n\n|cFFFFFF00-|r Many options has been renamed or moved from groups for better organization .\n\n|cFFFFFF00-|r Several skins got some revamp for 2018.\n\n|cFFFFFF00-|r Default settings for Arenas and Battlegrounds got changes and the experience should be more smooth now.\n\n|cFFFFFF00v7.3.5.5559.130 (|cFFFFCC00April 13th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added slash commands: /details 'softtoggle' 'softshow' 'softhide'. Use them to manipulate the window visibility while using auto hide.\n\n|cFFFFFF00-|r Mythic dungeon graphic window won't show up if the user leaves the dungeon before completing it.\n\n|cFFFFFF00v7.3.5.5529.130 (|cFFFFCC00April 06th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added minimize button on the mythic dungeon run chart.\n\n|cFFFFFF00-|r Added API calls: Details:ResetSegmentOverallData() and Details:ResetSegmentData().\n\n|cFFFFFF00v7.3.5.5499.130 (|cFFFFCC00Mar 30th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added outline option for the right text.\n\n|cFFFFFF00v7.3.5.5469.130 (|cFFFFCC00Mar 23th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a few things on the mythic dungeon chart.\n\n|cFFFFFF00v7.3.5.5424.129 (|cFFFFCC00Mar 10th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added macro support to open plugins. Example:\n /run Details:OpenPlugin ('Time Line')\n\n|cFFFFFF00v7.3.5.5351.129 (|cFFFFCC00Feb 26rd, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a damage chart for mythic dungeon runs, it shows at the of the run. You may disable it at the Streamer Settings.\n\n|cFFFFFF00v7.3.5.5231.128 (|cFFFFCC00Feb 02nd, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with wasted shield absorbs where the wasted amount was subtracting the total healing done.\n\n|cFFFFFF00v7.3.5.5221.128 (|cFFFFCC00Jan 26th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Warlock mana from Life Tap won't show up any more under mana regen, this makes easy to see Soul Shard gain.\n\n|cFFFFFF00v7.3.2.5183.128 (|cFFFFCC00Jan 12th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r The new bar animation is now applied to all users by default.\n\n|cFFFFFF00-|r Fixed an issue with the threat plugin where sometimes it was triggering errors.\n\n|cFFFFFF00v7.3.2.5175.128 (|cFFFFCC00Jan 03rd, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r ElvUI skins should have now a more good looking scrollbar.\n\n|cFFFFFF00-|r When starting to edit a custom display, the code window now clear the code from the previous display.\n\n|cFFFFFF00v7.3.2.5154.128 (|cFFFFCC00Dec 22th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r API and Create Aura windows are now attached to the new plugin window.\n\n|cFFFFFF00v7.3.2.5101.128 (|cFFFFCC00Dec 15th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Moving the custom display window to the new plugins window.\n\n|cFFFFFF00-|r Major layout changes on the Encounter Details plugin window.\n\n|cFFFFFF00v7.3.2.4919.128 (|cFFFFCC00Dec 08th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with the statistics sharing among guild members.\n\n|cFFFFFF00-|r Fixed an issue with Argus encounter where two segments were created.\n\n|cFFFFFF00-|r Fixed aura type images on the Create Aura Panel.\n\n|cFFFFFF00-|r Create Aura Panel can now be closed with Right Click.\n\n|cFFFFFF00-|r Framework updated to r60, plugins should be more stable now.\n\n|cFFFFFF00v7.3.0.4830.126 (|cFFFFFF00v7.3.2.4836.126 (|cFFFFCC00Nov 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed some tutorial windows popups.\n\n|cFFFFCC00Oct 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed opening windows when streamer settings > no alerts is enabled.\n\n|cFFFFFF00v7.3.0.4823.126 (|cFFFFCC00Oct 09th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added new options section: Streamer Settings, focused on adjustments for streamers and youtubers.\n\n|cFFFFFF00-|r Animations now always run at the same speed regardless the framerate.\n\n|cFFFFFF00-|r Click-To-Open menus now close the menu if the menu is already open.\n\n|cFFFFFF00v7.3.0.4723.126 (|cFFFFCC00Set 22th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed overall dungeon segments being added to overall data.\n\n|cFFFFFF00v7.3.0.4705.126 (|cFFFFCC00Set 19th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed damage taken tooltip for Brewmaster Monk where sometimes the tooltip didn't open.\n\n|cFFFFFF00-|r Fixed overall data on mythic dungeon not adding trash segments even with the option enabled on the options panel.\n\n|cFFFFFF00-|r Fixed the guild selection dropdown reseting everytime the Guild Rank window is opened.\n\n|cFFFFFF00v7.3.0.4677.126 (|cFFFFCC00Set 10th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r During mythic dungeons, the trash segments will be merged into a new segment at the end of the boss encounter (instead of merging on the fly while cleaning up).\n\n|cFFFFFF00v7.3.0.4615.125 (|cFFFFCC00Set 09th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Setting up the dungeon stuff as opt-in for early adopters while we continue to make improvements on the system.\n\n|cFFFFFF00v7.3.0.4586.125 (|cFFFFCC00Set 08th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Formating mythic+ dungeon segments, each segment should count the boss trash + boss fight.\n\n|cFFFFFF00-|r At the end of the mythic+ dungeon, it should create a new segment adding up all segments described above.\n\n|cFFFFFF00v7.3.0.4499.124 (|cFFFFCC00Set 05th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option to always show all players when using the standard mode. Option under PvP/PvE bracket on the options panel.\n\n|cFFFFFF00-|r Added a setting to exclude healing done lines from the death log below a certain healing amount. This options is also under PvP/PvE bracket.\n\n|cFFFFFF00-|r Fixed the guild selection on the ranking panel.\n\n|cFFFFFF00v7.3.0.4467.124 (|cFFFFCC00August 29th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Damage or Healing record for the encounter should be printed on chat on the boss pull.\nUse /run Details.announce_damagerecord.enabled = false; to disable.\n\n|cFFFFFF00v7.2.5.4437.124 (|cFFFFCC00August 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added healing done cap for death log. Use /run Details.deathlog_healingdone_min = 10000\n\n|cFFFFFF00-|r Fixed an issue where the alpha from the fixed bar color was used even when this option was disabled.\n\n|cFFFFFF00v7.2.5.4436.124 (|cFFFFCC00August 17th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Attempt to fix the issue where the window doesn't update after entering a raid or reseting data.\n\n|cFFFFFF00v7.2.5.4434.124 (|cFFFFCC00August 10th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added buttons to create an aura at Aura tab on the Player Details window.\n\n|cFFFFFF00-|r Fixes and improvements on the damage rank panel.\n\n|cFFFFFF00-|r Best damage or healing for the player on the current boss encounter is now shown on the spec icon tooltip.\n\n|cFFFFFF00-|r Major revamp on the aura creation panel.\n\n|cFFFFFF00v7.2.5.4369.124 (|cFFFFCC00August 1st, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! can now track debuff applications (stack) and refreshes.\n\n|cFFFFFF00-|r Added new tab on Player Detail Window called 'Auras', you can see your buffs and debuffs from there.\n\n|cFFFFFF00-|r Death log now show debuff applications.\n\n|cFFFFFF00v7.2.5.4275.123 (|cFFFFCC00July 18th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed some issues with tooltiops popup when the user press SHIFT.\n\n|cFFFFFF00-|r Now is possible to change the bar durating when selecting Cast Start trigger on Details! Forge.\n\n|cFFFFFF00-|r Kil'Jaeden adds should be consolidated into only one actor instead of having one for each player targeted.\n\n|cFFFFFF00v7.2.5.4236.122 (|cFFFFCC00July 05th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r The alert to open the raid ranking after a boss kill, is now shown for 10 seconds (down from 40).\n\n|cFFFFFF00-|r Added a report button on the raid ranking panel and boss are sort alphabetically.\n\n|cFFFFFF00-|r Fixed some issues on the combatlog introduced on the wow patch 7.2.5 where sometimes the source of an event has no name.\n\n|cFFFFFF00-|r Ticket #209, fixed more issues with the comparison panel where are pets involved.\n\n|cFFFFFF00v7.2.5.4201.121 (|cFFFFCC00June 26th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Monk Stagger where it was only shown on the friendly fire and not under the Damage Taken display.\n\n|cFFFFFF00-|r Added Forge and Ranking options on the main menu (orange cogwheel).\n\n|cFFFFFF00v7.2.5.4102.121 (|cFFFFCC00June 22th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! Forge has updated and now is more usder friendly.\n\n|cFFFFFF00-|r Fixed an issue with player buff uptime where sometimes some buffs wans't showing in the tooltip.\n\n|cFFFFFF00v7.2.5.3968.120 (|cFFFFCC00June 20th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r New Death Recap implemented! replaces the default from Blizzard and can be configured at Options > Raid Tools.\n\n|cFFFFFF00-|r New Guild Damage and Heal rank on '/details ranking' panel.\n\n|cFFFFFF00-|r Added a Guild Sync button on the Details! Ranking Panel.\n\n|cFFFFFF00-|r Added Custom display 'Damage on Shields', useful for encounter like Maiden of Vigilance where there's big shields to be removed and you want to know who is doing more damage to it.\n\n|cFFFFFF00-|r Added Heal Absorbed display under Heal bracket.\n\nHeal Absorb are the heal denied by abilities such like DK's Necrotic Strike or raid boss Sisters of the Moon 'Embrace of the Eclipse' ability.\nThe tooltip of this display shows which players got heal denied, which abilities absorbed the heal, which abilities tried to heal but got the heal denied.\n\n|cFFFFFF00-|r Added Alternate Power display under Energy bracket, it shows the total of alternate power gain from each player, useful for encounters such as Demonic Inquisition.\n\n|cFFFFFF00-|r 'First Hit' message after pulling a boss, now also shows who the boss is targeting (almost always is who pulled).\n\n|cFFFFFF00-|r Raid Dps {rdps} and Hps {rhps} can now be used on the Broker Data Feed..\n\n|cFFFFFF00-|r Fixed an issue with Chromie from the scenario 'The Deaths of Chromie' where she wasn't being shown on the meter.\n\n|cFFFFFF00-|r Fixed Paladin 'Light of the Martyr' damage to self.\n\n|cFFFFFF00-|r Ticket #198 'Script Error' Fixed.\n\n|cFFFFFF00v7.2.0.3703.119 (|cFFFFCC00May 29th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an error while killing low level mobs with warrior class.\n\n|cFFFFFF00v7.2.0.3693.118 (|cFFFFCC00May 25th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fury Warrior shouldn't be assigned as Protection any more.\n\n|cFFFFFF00-|r Some parser fixes.\n\n|cFFFFFF00v7.2.0.3673.118 (|cFFFFCC00May 09th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Ticket #187: Fixed an issue when comparing hunter pets on the player detail window.\n\n|cFFFFFF00-|r Ticket #189 #186: Fixed a taint issue for some classes when using friendly nameplates on.\n\n|cFFFFFF00v7.2.0.3512.116 (|cFFFFCC00April 27th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Havoc Demon Hunter: your fury energy is being shown under Mana Restored (don't ask me why, the combat log is telling us it's mana).\n\n|cFFFFFF00-|r Pets now are shown on damage tooltips.\n\n|cFFFFFF00-|r Pets are now also shown on the comparison panel.\n\n|cFFFFFF00v7.2.0.3474.116 (|cFFFFCC00April 20th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin: Raid Check > added some food buffs which wasn't being tracked.\n\n|cFFFFFF00v7.2.0.3467.116 (|cFFFFCC00April 07th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for the custom display window where apply and cancel buttons where over the edit window.\n\n|cFFFFFF00-|r Fix for an issue on editing a bookmark.\n\n|cFFFFFF00v7.1.5.3459.116 (|cFFFFCC00Mar 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue on dynamic overall data where it wasn't showing DPS.\n\n|cFFFFFF00-|r Fixed an issue with Apply, Save and Cancel buttons when editing a custom display.\n\n|cFFFFFF00-|r Removed the Damage and Healing presets for custom displays, now is only possible create custom displays by scripting them.\n\n|cFFFFFF00v7.1.5.3431.116 (|cFFFFCC00Mar 15th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with bar orientation right to left where fixed bar color isn't working.\n\n|cFFFFFF00-|r The nickname field now use FrizQuadrataTT font and shall be compatible with Cyrillic.\n\n|cFFFFFF00v7.1.5.3418.116 (|cFFFFCC00Mar 1st, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Ticket #167 fix: Light of the Martyr self-damage now does reduce the healing done (following WCL method).\n\n|cFFFFFF00-|r Ticket #169 fix: Damage Prevented is now working for new segments.\n\n|cFFFFFF00-|r Fixed an issue where sometimes BeastMaster's Hati pet wasn't detected correctly.\n\n|cFFFFFF00v7.1.5.3369.116 (|cFFFFCC00Feb 07th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'Dynamic Overall Damage' for mythic dungeons.\n\n|cFFFFFF00-|r Fix for Ticket #168: 'Auto Hide While [Not] Inside Instance is broken'.\n\n|cFFFFFF00-|r The bar truncate frame 'DetailsLeftTextAntiTruncate' is now created on Details! load instead on demand.\n\n|cFFFFFF00v7.1.5.3315.116 (|cFFFFCC00Jan 23th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Ticket #162: 'no Monochrome font' available, added an experimental slash command: /run _detalhes:UseOutline ('MONOCHROME').\n\n|cFFFFFF00-|r Ticket #158: 'no elapsed time shown on report to chat', added the elapsed time when reporting a segment.\n\n|cFFFFFF00-|r Ticket #164: 'error when browsing segments', an attempt to fix the problem has been made." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v8.0.1.6538.135 (|cFFFFCC00September 30th, 2018|r|cFFFFFF00)|r:|cFFFFFF00-|r Updated to BFA 'Potion Used' and 'Health Potion and Stone' custom displays.\n\n|cFFFFFF00-|r Backfire damage from Light of the Martyr now shows on death logs as friendly fire.\n\n|cFFFFFF00-|r Deprecated rules for friendly fire has been removed, this might fix some random issues with mind controlled players in the Lord Stormsong encounter in the Shrine of the Storm dungeon.\n\n|cFFFFFF00-|r Fixed DBM/BigWigs aura creation from the Spell List panel.\n\n|cFFFFFF00-|r Chart scripts now receives the envTable, use local envTable = ... .\n\n|cFFFFFF00-|r Polymorth (Black Cat) and Between the Eyes got added to Crowd Control list.\n\n|cFFFFFF00-|r Fixed Timeline plugin not showing the cooldown panel.\n\n|cFFFFFF00-|r Overall data setting won't reset on every logout.\n\n|cFFFFFF00-|r Slash command '/details merge' won't flag the merged combat as a trash segment anymore.\n\n|cFFFFFF00-|r Added function to use on macros to open the Player Details Window: /script Details:OpenPlayerDetails(1).\n\n|cFFFFFF00-|r Done more improvements on the Death Recap window.\n\n|cFFFFFF00v8.0.1.6449.134 (|cFFFFCC00September 11th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! is ready for Uldir mythic raiding!.\n\n|cFFFFFF00-|r Several improvements on Encounter Details plugin.\n\n|cFFFFFF00-|r Details! Scroll Damage for training in dummies is now ready for more tests, access it |cFFFFFF00/details scrolldamage|r.\n\n|cFFFFFF00-|r Damage and Healing tooltips now show a statusbar indicating the percent done by the ability.\n\n|cFFFFFF00-|r Added a scale slider to the options panel.\n\n|cFFFFFF00-|r Added monk's Quaking Palm to crowd control spells.\n\n|cFFFFFF00-|r Fixed an issue with Plater integration.\n\n|cFFFFFF00-|r Fixed tooltips not hiding when the cursor leaves the spell icon in the Damage Taken by Spell.\n\n|cFFFFFF00-|r Framework: fixed an issue with tooltips and menus where the division line wasn't hiding properly.\n\n|cFFFFFF00-|r Framework: fixed some buttons not showing its text in the options panel.\n\n|cFFFFFF00v8.0.1.6272.134 (|cFFFFCC00August 28th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Dynamic Overall Data custom display.\n\n|cFFFFFF00-|r Fixed friendly fire on some dungeon fights with mind control.\n\n|cFFFFFF00-|r Raid Check plugin fully revamped, now shows talents, spec and role.\n\n|cFFFFFF00-|r Updated flask and food list for BFA.\n\n|cFFFFFF00-|r Added NpcID listing at the Spell List window.\n\n|cFFFFFF00-|r Fixed an issue with Alliance or Horde icons showing at random in player bars.\n\n|cFFFFFF00-|r Small revamp in the Death Recap window.\n\n|cFFFFFF00-|r Fixed new segment creation when the option to use only one segment while in a battleground is disabled.\n\n|cFFFFFF00-|r Fixed east asian number format on several strings.\n\n|cFFFFFF00-|r 'Smart Score' option renamed to 'Unique Segment' under the PvP options for battlegrounds.\n\n|cFFFFFF00v8.0.1.6120.132 (|cFFFFCC00August 07th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Death Knight: Epidemic, Scourge Strike and Howling Blast now has a better description on the spell name.\n\n|cFFFFFF00-|r Fixed snap button showing when 'Hide Resize Buttons' are enabled.\n\n|cFFFFFF00-|r Fixed title bar icons not hiding when 'Auto Hide Buttons' is enabled.\n\n|cFFFFFF00-|r Several improvements to overall data, it should be more consistent now.\n\n|cFFFFFF00-|r Details! now passes to identify the tank role of the player even when out of a party or raid.\n\n|cFFFFFF00-|r Debug helper /run Details:DumpTable(table) now correctly shows the key name when it isn't a string.\n\n|cFFFFFF00-|r Improvements done on the Bookmark config frame accessed by the options panel > display section.\n\n|cFFFFFF00-|r New slash command: '/details spells'.\n\n|cFFFFFF00-|r Statistics for Legion has been closed! You can access statistics from the orange gear > statistics.\n\n|cFFFFFF00v8.0.1.6027.132 (|cFFFFCC00July 28th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added size offset options for the chat tab embed feature.\n\n|cFFFFFF00-|r Revamp on the editor for the custom line text.\n\n|cFFFFFF00v8.0.1.5985.131 (|cFFFFCC00July 17th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 'Auto Run Code' module.\n\n|cFFFFFF00-|r Added 'Plater Nameplates' integration.\n\n|cFFFFFF00-|r Weakauras integration with the Create Aura panel got great improvements.\n\n|cFFFFFF00-|r Many options has been renamed or moved from groups for better organization .\n\n|cFFFFFF00-|r Several skins got some revamp for 2018.\n\n|cFFFFFF00-|r Default settings for Arenas and Battlegrounds got changes and the experience should be more smooth now.\n\n|cFFFFFF00v7.3.5.5559.130 (|cFFFFCC00April 13th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added slash commands: /details 'softtoggle' 'softshow' 'softhide'. Use them to manipulate the window visibility while using auto hide.\n\n|cFFFFFF00-|r Mythic dungeon graphic window won't show up if the user leaves the dungeon before completing it.\n\n|cFFFFFF00v7.3.5.5529.130 (|cFFFFCC00April 06th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added minimize button on the mythic dungeon run chart.\n\n|cFFFFFF00-|r Added API calls: Details:ResetSegmentOverallData() and Details:ResetSegmentData().\n\n|cFFFFFF00v7.3.5.5499.130 (|cFFFFCC00Mar 30th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added outline option for the right text.\n\n|cFFFFFF00v7.3.5.5469.130 (|cFFFFCC00Mar 23th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a few things on the mythic dungeon chart.\n\n|cFFFFFF00v7.3.5.5424.129 (|cFFFFCC00Mar 10th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added macro support to open plugins. Example:\n /run Details:OpenPlugin ('Time Line')\n\n|cFFFFFF00v7.3.5.5351.129 (|cFFFFCC00Feb 26rd, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a damage chart for mythic dungeon runs, it shows at the of the run. You may disable it at the Streamer Settings.\n\n|cFFFFFF00v7.3.5.5231.128 (|cFFFFCC00Feb 02nd, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with wasted shield absorbs where the wasted amount was subtracting the total healing done.\n\n|cFFFFFF00v7.3.5.5221.128 (|cFFFFCC00Jan 26th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Warlock mana from Life Tap won't show up any more under mana regen, this makes easy to see Soul Shard gain.\n\n|cFFFFFF00v7.3.2.5183.128 (|cFFFFCC00Jan 12th, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r The new bar animation is now applied to all users by default.\n\n|cFFFFFF00-|r Fixed an issue with the threat plugin where sometimes it was triggering errors.\n\n|cFFFFFF00v7.3.2.5175.128 (|cFFFFCC00Jan 03rd, 2018|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r ElvUI skins should have now a more good looking scrollbar.\n\n|cFFFFFF00-|r When starting to edit a custom display, the code window now clear the code from the previous display.\n\n|cFFFFFF00v7.3.2.5154.128 (|cFFFFCC00Dec 22th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r API and Create Aura windows are now attached to the new plugin window.\n\n|cFFFFFF00v7.3.2.5101.128 (|cFFFFCC00Dec 15th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Moving the custom display window to the new plugins window.\n\n|cFFFFFF00-|r Major layout changes on the Encounter Details plugin window.\n\n|cFFFFFF00v7.3.2.4919.128 (|cFFFFCC00Dec 08th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with the statistics sharing among guild members.\n\n|cFFFFFF00-|r Fixed an issue with Argus encounter where two segments were created.\n\n|cFFFFFF00-|r Fixed aura type images on the Create Aura Panel.\n\n|cFFFFFF00-|r Create Aura Panel can now be closed with Right Click.\n\n|cFFFFFF00-|r Framework updated to r60, plugins should be more stable now.\n\n|cFFFFFF00v7.3.0.4830.126 (|cFFFFFF00v7.3.2.4836.126 (|cFFFFCC00Nov 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed some tutorial windows popups.\n\n|cFFFFCC00Oct 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed opening windows when streamer settings > no alerts is enabled.\n\n|cFFFFFF00v7.3.0.4823.126 (|cFFFFCC00Oct 09th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added new options section: Streamer Settings, focused on adjustments for streamers and youtubers.\n\n|cFFFFFF00-|r Animations now always run at the same speed regardless the framerate.\n\n|cFFFFFF00-|r Click-To-Open menus now close the menu if the menu is already open.\n\n|cFFFFFF00v7.3.0.4723.126 (|cFFFFCC00Set 22th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed overall dungeon segments being added to overall data.\n\n|cFFFFFF00v7.3.0.4705.126 (|cFFFFCC00Set 19th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed damage taken tooltip for Brewmaster Monk where sometimes the tooltip didn't open.\n\n|cFFFFFF00-|r Fixed overall data on mythic dungeon not adding trash segments even with the option enabled on the options panel.\n\n|cFFFFFF00-|r Fixed the guild selection dropdown reseting everytime the Guild Rank window is opened.\n\n|cFFFFFF00v7.3.0.4677.126 (|cFFFFCC00Set 10th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r During mythic dungeons, the trash segments will be merged into a new segment at the end of the boss encounter (instead of merging on the fly while cleaning up).\n\n|cFFFFFF00v7.3.0.4615.125 (|cFFFFCC00Set 09th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Setting up the dungeon stuff as opt-in for early adopters while we continue to make improvements on the system.\n\n|cFFFFFF00v7.3.0.4586.125 (|cFFFFCC00Set 08th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Formating mythic+ dungeon segments, each segment should count the boss trash + boss fight.\n\n|cFFFFFF00-|r At the end of the mythic+ dungeon, it should create a new segment adding up all segments described above.\n\n|cFFFFFF00v7.3.0.4499.124 (|cFFFFCC00Set 05th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option to always show all players when using the standard mode. Option under PvP/PvE bracket on the options panel.\n\n|cFFFFFF00-|r Added a setting to exclude healing done lines from the death log below a certain healing amount. This options is also under PvP/PvE bracket.\n\n|cFFFFFF00-|r Fixed the guild selection on the ranking panel.\n\n|cFFFFFF00v7.3.0.4467.124 (|cFFFFCC00August 29th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Damage or Healing record for the encounter should be printed on chat on the boss pull.\nUse /run Details.announce_damagerecord.enabled = false; to disable.\n\n|cFFFFFF00v7.2.5.4437.124 (|cFFFFCC00August 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added healing done cap for death log. Use /run Details.deathlog_healingdone_min = 10000\n\n|cFFFFFF00-|r Fixed an issue where the alpha from the fixed bar color was used even when this option was disabled.\n\n|cFFFFFF00v7.2.5.4436.124 (|cFFFFCC00August 17th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Attempt to fix the issue where the window doesn't update after entering a raid or reseting data.\n\n|cFFFFFF00v7.2.5.4434.124 (|cFFFFCC00August 10th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added buttons to create an aura at Aura tab on the Player Details window.\n\n|cFFFFFF00-|r Fixes and improvements on the damage rank panel.\n\n|cFFFFFF00-|r Best damage or healing for the player on the current boss encounter is now shown on the spec icon tooltip.\n\n|cFFFFFF00-|r Major revamp on the aura creation panel.\n\n|cFFFFFF00v7.2.5.4369.124 (|cFFFFCC00August 1st, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! can now track debuff applications (stack) and refreshes.\n\n|cFFFFFF00-|r Added new tab on Player Detail Window called 'Auras', you can see your buffs and debuffs from there.\n\n|cFFFFFF00-|r Death log now show debuff applications.\n\n|cFFFFFF00v7.2.5.4275.123 (|cFFFFCC00July 18th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed some issues with tooltiops popup when the user press SHIFT.\n\n|cFFFFFF00-|r Now is possible to change the bar durating when selecting Cast Start trigger on Details! Forge.\n\n|cFFFFFF00-|r Kil'Jaeden adds should be consolidated into only one actor instead of having one for each player targeted.\n\n|cFFFFFF00v7.2.5.4236.122 (|cFFFFCC00July 05th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r The alert to open the raid ranking after a boss kill, is now shown for 10 seconds (down from 40).\n\n|cFFFFFF00-|r Added a report button on the raid ranking panel and boss are sort alphabetically.\n\n|cFFFFFF00-|r Fixed some issues on the combatlog introduced on the wow patch 7.2.5 where sometimes the source of an event has no name.\n\n|cFFFFFF00-|r Ticket #209, fixed more issues with the comparison panel where are pets involved.\n\n|cFFFFFF00v7.2.5.4201.121 (|cFFFFCC00June 26th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Monk Stagger where it was only shown on the friendly fire and not under the Damage Taken display.\n\n|cFFFFFF00-|r Added Forge and Ranking options on the main menu (orange cogwheel).\n\n|cFFFFFF00v7.2.5.4102.121 (|cFFFFCC00June 22th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! Forge has updated and now is more usder friendly.\n\n|cFFFFFF00-|r Fixed an issue with player buff uptime where sometimes some buffs wans't showing in the tooltip.\n\n|cFFFFFF00v7.2.5.3968.120 (|cFFFFCC00June 20th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r New Death Recap implemented! replaces the default from Blizzard and can be configured at Options > Raid Tools.\n\n|cFFFFFF00-|r New Guild Damage and Heal rank on '/details ranking' panel.\n\n|cFFFFFF00-|r Added a Guild Sync button on the Details! Ranking Panel.\n\n|cFFFFFF00-|r Added Custom display 'Damage on Shields', useful for encounter like Maiden of Vigilance where there's big shields to be removed and you want to know who is doing more damage to it.\n\n|cFFFFFF00-|r Added Heal Absorbed display under Heal bracket.\n\nHeal Absorb are the heal denied by abilities such like DK's Necrotic Strike or raid boss Sisters of the Moon 'Embrace of the Eclipse' ability.\nThe tooltip of this display shows which players got heal denied, which abilities absorbed the heal, which abilities tried to heal but got the heal denied.\n\n|cFFFFFF00-|r Added Alternate Power display under Energy bracket, it shows the total of alternate power gain from each player, useful for encounters such as Demonic Inquisition.\n\n|cFFFFFF00-|r 'First Hit' message after pulling a boss, now also shows who the boss is targeting (almost always is who pulled).\n\n|cFFFFFF00-|r Raid Dps {rdps} and Hps {rhps} can now be used on the Broker Data Feed..\n\n|cFFFFFF00-|r Fixed an issue with Chromie from the scenario 'The Deaths of Chromie' where she wasn't being shown on the meter.\n\n|cFFFFFF00-|r Fixed Paladin 'Light of the Martyr' damage to self.\n\n|cFFFFFF00-|r Ticket #198 'Script Error' Fixed.\n\n|cFFFFFF00v7.2.0.3703.119 (|cFFFFCC00May 29th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an error while killing low level mobs with warrior class.\n\n|cFFFFFF00v7.2.0.3693.118 (|cFFFFCC00May 25th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fury Warrior shouldn't be assigned as Protection any more.\n\n|cFFFFFF00-|r Some parser fixes.\n\n|cFFFFFF00v7.2.0.3673.118 (|cFFFFCC00May 09th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Ticket #187: Fixed an issue when comparing hunter pets on the player detail window.\n\n|cFFFFFF00-|r Ticket #189 #186: Fixed a taint issue for some classes when using friendly nameplates on.\n\n|cFFFFFF00v7.2.0.3512.116 (|cFFFFCC00April 27th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Havoc Demon Hunter: your fury energy is being shown under Mana Restored (don't ask me why, the combat log is telling us it's mana).\n\n|cFFFFFF00-|r Pets now are shown on damage tooltips.\n\n|cFFFFFF00-|r Pets are now also shown on the comparison panel.\n\n|cFFFFFF00v7.2.0.3474.116 (|cFFFFCC00April 20th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin: Raid Check > added some food buffs which wasn't being tracked.\n\n|cFFFFFF00v7.2.0.3467.116 (|cFFFFCC00April 07th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for the custom display window where apply and cancel buttons where over the edit window.\n\n|cFFFFFF00-|r Fix for an issue on editing a bookmark.\n\n|cFFFFFF00v7.1.5.3459.116 (|cFFFFCC00Mar 21th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue on dynamic overall data where it wasn't showing DPS.\n\n|cFFFFFF00-|r Fixed an issue with Apply, Save and Cancel buttons when editing a custom display.\n\n|cFFFFFF00-|r Removed the Damage and Healing presets for custom displays, now is only possible create custom displays by scripting them.\n\n|cFFFFFF00v7.1.5.3431.116 (|cFFFFCC00Mar 15th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with bar orientation right to left where fixed bar color isn't working.\n\n|cFFFFFF00-|r The nickname field now use FrizQuadrataTT font and shall be compatible with Cyrillic.\n\n|cFFFFFF00v7.1.5.3418.116 (|cFFFFCC00Mar 1st, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Ticket #167 fix: Light of the Martyr self-damage now does reduce the healing done (following WCL method).\n\n|cFFFFFF00-|r Ticket #169 fix: Damage Prevented is now working for new segments.\n\n|cFFFFFF00-|r Fixed an issue where sometimes BeastMaster's Hati pet wasn't detected correctly.\n\n|cFFFFFF00v7.1.5.3369.116 (|cFFFFCC00Feb 07th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'Dynamic Overall Damage' for mythic dungeons.\n\n|cFFFFFF00-|r Fix for Ticket #168: 'Auto Hide While [Not] Inside Instance is broken'.\n\n|cFFFFFF00-|r The bar truncate frame 'DetailsLeftTextAntiTruncate' is now created on Details! load instead on demand.\n\n|cFFFFFF00v7.1.5.3315.116 (|cFFFFCC00Jan 23th, 2017|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Ticket #162: 'no Monochrome font' available, added an experimental slash command: /run _detalhes:UseOutline ('MONOCHROME').\n\n|cFFFFFF00-|r Ticket #158: 'no elapsed time shown on report to chat', added the elapsed time when reporting a segment.\n\n|cFFFFFF00-|r Ticket #164: 'error when browsing segments', an attempt to fix the problem has been made." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " @@ -215,8 +215,8 @@ do } _detalhes.tooltip_border_color = {1, 1, 1, 1} _detalhes.tooltip_spell_icon = {file = [[Interface\CHARACTERFRAME\UI-StateIcon]], coords = {36/64, 58/64, 7/64, 26/64}} - --_detalhes.tooltip_target_icon = {file = [[Interface\CHARACTERFRAME\UI-StateIcon]], coords = {36/64, 58/64, 7/64, 26/64}} - + _detalhes.tooltip_target_icon = {file = [[Interface\Addons\Details\images\icons]], coords = {0, 0.03125, 0.126953125, 0.15625}} + --> icons _detalhes.attribute_icons = [[Interface\AddOns\Details\images\atributos_icones]] function _detalhes:GetAttributeIcon (attribute) @@ -325,12 +325,19 @@ do --> constants --[[global]] DETAILS_HEALTH_POTION_LIST = { - [188016] = true, --Ancient Healing Potion - [188018] = true, --Ancient Rejuvenation Potion - [6262] = true, --warlock's healthstone + [250870] = true, --Coastal Healing Potion + [250872] = true, --Coastal Rejuvenation Potion + [6262] = true, --Warlock's Healthstone } - --[[global]] DETAILS_HEALTH_POTION_ID = 188016 - --[[global]] DETAILS_REJU_POTION_ID = 188018 + --[[global]] DETAILS_HEALTH_POTION_ID = 250870 + --[[global]] DETAILS_REJU_POTION_ID = 250872 + --[[global]] DETAILS_MANA_POTION_ID = 250871 + --[[global]] DETAILS_FOCUS_POTION_ID = 252753 + + --[[global]] DETAILS_INT_POTION_ID = 279151 + --[[global]] DETAILS_AGI_POTION_ID = 279152 + --[[global]] DETAILS_STR_POTION_ID = 279153 + --[[global]] DETAILS_STAMINA_POTION_ID = 279154 _detalhes._detalhes_props = { DATA_TYPE_START = 1, --> Something on start diff --git a/classes/classe_custom.lua b/classes/classe_custom.lua index 9cff2e65..d35740c2 100644 --- a/classes/classe_custom.lua +++ b/classes/classe_custom.lua @@ -1171,7 +1171,7 @@ desc = Loc ["STRING_CUSTOM_POT_DEFAULT_DESC"], source = false, target = false, - script_version = 3, + script_version = 4, script = [[ --init: local combat, instance_container, instance = ... @@ -1192,7 +1192,8 @@ local debuff_uptime_container = player.debuff_uptime and player.debuff_uptime_spells and player.debuff_uptime_spells._ActorTable if (debuff_uptime_container) then --potion of focus (can't use as pre-potion, so, its amount is always 1 - local focus_potion = debuff_uptime_container [188030] --Legion + local focus_potion = debuff_uptime_container [DETAILS_FOCUS_POTION_ID] + if (focus_potion) then total = total + 1 found_potion = true @@ -1209,7 +1210,7 @@ if (buff_uptime_container) then --potion of the jade serpent - local jade_serpent_potion = buff_uptime_container [188027] --Legion + local jade_serpent_potion = buff_uptime_container [DETAILS_INT_POTION_ID] if (jade_serpent_potion) then local used = jade_serpent_potion.activedamt if (used > 0) then @@ -1224,7 +1225,7 @@ end --potion of mogu power - local mogu_power_potion = buff_uptime_container [188028] --Legion + local mogu_power_potion = buff_uptime_container [DETAILS_STR_POTION_ID] if (mogu_power_potion) then local used = mogu_power_potion.activedamt if (used > 0) then @@ -1239,7 +1240,7 @@ end --mana potion - local mana_potion = buff_uptime_container [188017] --Legion + local mana_potion = buff_uptime_container [DETAILS_MANA_POTION_ID] if (mana_potion) then local used = mana_potion.activedamt if (used > 0) then @@ -1254,7 +1255,7 @@ end --potion of prolongued power - local prolongued_power = buff_uptime_container [229206] --Legion + local prolongued_power = buff_uptime_container [DETAILS_AGI_POTION_ID] if (prolongued_power) then local used = prolongued_power.activedamt if (used > 0) then @@ -1269,7 +1270,7 @@ end --potion of the mountains - local mountains_potion = buff_uptime_container [188029] --Legion + local mountains_potion = buff_uptime_container [DETAILS_STAMINA_POTION_ID] if (mountains_potion) then local used = mountains_potion.activedamt if (used > 0) then @@ -1300,12 +1301,12 @@ --get the debuff container for potion of focus local debuff_uptime_container = player.debuff_uptime and player.debuff_uptime_spells and player.debuff_uptime_spells._ActorTable if (debuff_uptime_container) then - local focus_potion = debuff_uptime_container [188030] --Legion + local focus_potion = debuff_uptime_container [DETAILS_FOCUS_POTION_ID] if (focus_potion) then - local name, _, icon = GetSpellInfo (188030) --Legion + local name, _, icon = GetSpellInfo (DETAILS_FOCUS_POTION_ID) GameCooltip:AddLine (name, 1) --> can use only 1 focus potion (can't be pre-potion) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end end @@ -1313,48 +1314,48 @@ local buff_uptime_container = player.buff_uptime and player.buff_uptime_spells and player.buff_uptime_spells._ActorTable if (buff_uptime_container) then --potion of the jade serpent - local jade_serpent_potion = buff_uptime_container [188027] --Legion + local jade_serpent_potion = buff_uptime_container [DETAILS_INT_POTION_ID] if (jade_serpent_potion) then - local name, _, icon = GetSpellInfo (188027) --Legion + local name, _, icon = GetSpellInfo (DETAILS_INT_POTION_ID) GameCooltip:AddLine (name, jade_serpent_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end --potion of mogu power - local mogu_power_potion = buff_uptime_container [188028] --Legion + local mogu_power_potion = buff_uptime_container [DETAILS_STR_POTION_ID] if (mogu_power_potion) then - local name, _, icon = GetSpellInfo (188028) --Legion + local name, _, icon = GetSpellInfo (DETAILS_STR_POTION_ID) GameCooltip:AddLine (name, mogu_power_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end --mana potion - local mana_potion = buff_uptime_container [188017] --Legion + local mana_potion = buff_uptime_container [DETAILS_MANA_POTION_ID] if (mana_potion) then - local name, _, icon = GetSpellInfo (188017) --Legion + local name, _, icon = GetSpellInfo (DETAILS_MANA_POTION_ID) GameCooltip:AddLine (name, mana_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end --prolongued power - local prolongued_power = buff_uptime_container [229206] --Legion + local prolongued_power = buff_uptime_container [DETAILS_AGI_POTION_ID] if (prolongued_power) then - local name, _, icon = GetSpellInfo (229206) --Legion + local name, _, icon = GetSpellInfo (DETAILS_AGI_POTION_ID) GameCooltip:AddLine (name, prolongued_power.activedamt) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end --potion of the mountains - local mountains_potion = buff_uptime_container [188029] --Legion + local mountains_potion = buff_uptime_container [DETAILS_STAMINA_POTION_ID] if (mountains_potion) then - local name, _, icon = GetSpellInfo (188029) --Legion + local name, _, icon = GetSpellInfo (DETAILS_STAMINA_POTION_ID) GameCooltip:AddLine (name, mountains_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end end ]] @@ -1381,7 +1382,7 @@ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -- /run _detalhes:AddDefaultCustomDisplays() - local Healthstone = { + local Healthstone = { name = Loc ["STRING_CUSTOM_HEALTHSTONE_DEFAULT"], icon = [[Interface\ICONS\warlock_ healthstone]], attribute = false, @@ -1431,21 +1432,21 @@ local hs = actor:GetSpell (6262) if (hs) then GameCooltip:AddLine (select (1, GetSpellInfo(6262)), _detalhes:ToK(hs.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (6262)), 1, 1, 16, 16) + GameCooltip:AddIcon (select (3, GetSpellInfo (6262)), 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) GameCooltip:AddStatusBar (100, 1, R, G, B, A) end local pot = actor:GetSpell (DETAILS_HEALTH_POTION_ID) if (pot) then GameCooltip:AddLine (select (1, GetSpellInfo(DETAILS_HEALTH_POTION_ID)), _detalhes:ToK(pot.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (DETAILS_HEALTH_POTION_ID)), 1, 1, 16, 16) + GameCooltip:AddIcon (select (3, GetSpellInfo (DETAILS_HEALTH_POTION_ID)), 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) GameCooltip:AddStatusBar (100, 1, R, G, B, A) end local pot = actor:GetSpell (DETAILS_REJU_POTION_ID) if (pot) then GameCooltip:AddLine (select (1, GetSpellInfo(DETAILS_REJU_POTION_ID)), _detalhes:ToK(pot.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (DETAILS_REJU_POTION_ID)), 1, 1, 16, 16) + GameCooltip:AddIcon (select (3, GetSpellInfo (DETAILS_REJU_POTION_ID)), 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) GameCooltip:AddStatusBar (100, 1, R, G, B, A) end @@ -1453,7 +1454,7 @@ ]], percent_script = false, total_script = false, - script_version = 13, + script_version = 14, } -- /run _detalhes:AddDefaultCustomDisplays() local have = false @@ -1617,7 +1618,7 @@ desc = "Show the crowd control amount for each player.", source = false, target = false, - script_version = 9, + script_version = 11, script = [[ local combat, instance_container, instance = ... local total, top, amount = 0, 0, 0 @@ -1651,7 +1652,7 @@ local name, _, icon = GetSpellInfo (spell [1]) GameCooltip:AddLine (name, spell [2]) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end local targets = {} @@ -1672,9 +1673,9 @@ local class, _, _, _, _, r, g, b = _detalhes:GetClass (target [1]) if (class and class ~= "UNKNOW") then local texture, l, r, t, b = _detalhes:GetClassIcon (class) - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, 14, 14, l, r, t, b) + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height, l, r, t, b) else - GameCooltip:AddIcon ("Interface\\GossipFrame\\IncompleteQuestIcon", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\GossipFrame\\IncompleteQuestIcon", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end -- end @@ -1721,7 +1722,7 @@ desc = "Show the amount of crowd control received for each player.", source = false, target = false, - script_version = 1, + script_version = 2, script = [[ local combat, instance_container, instance = ... local total, top, amt = 0, 0, 0 @@ -1793,7 +1794,7 @@ local name, _, icon = GetSpellInfo (spell [1]) GameCooltip:AddLine (name, spell [2]) _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) + GameCooltip:AddIcon (icon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end _detalhes:AddTooltipSpellHeaderText ("From", "yellow", #from) @@ -1806,9 +1807,9 @@ local class, _, _, _, _, r, g, b = _detalhes:GetClass (t [1]) if (class and class ~= "UNKNOW") then local texture, l, r, t, b = _detalhes:GetClassIcon (class) - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, 14, 14, l, r, t, b) + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height, l, r, t, b) else - GameCooltip:AddIcon ("Interface\\GossipFrame\\IncompleteQuestIcon", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\GossipFrame\\IncompleteQuestIcon", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end end @@ -2135,7 +2136,7 @@ desc = Loc ["STRING_CUSTOM_DAMAGEONSKULL_DESC"], source = false, target = false, - script_version = 2, + script_version = 3, script = [[ --get the parameters passed local Combat, CustomContainer, Instance = ... @@ -2185,7 +2186,7 @@ if (DamageOnStar) then --RAID_TARGET_8 is the built-in localized word for 'Skull'. GameCooltip:AddLine (RAID_TARGET_8 .. ":", format_func (_, DamageOnStar)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_8", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_8", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end ]], @@ -2227,7 +2228,7 @@ desc = Loc ["STRING_CUSTOM_DAMAGEONANYMARKEDTARGET_DESC"], source = false, target = false, - script_version = 2, + script_version = 3, script = [[ --get the parameters passed local Combat, CustomContainer, Instance = ... @@ -2273,49 +2274,49 @@ local DamageOnStar = RaidTargets [1] if (DamageOnStar) then GameCooltip:AddLine (RAID_TARGET_1 .. ":", format_func (_, DamageOnStar)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_1", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_1", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end local DamageOnCircle = RaidTargets [2] if (DamageOnCircle) then GameCooltip:AddLine (RAID_TARGET_2 .. ":", format_func (_, DamageOnCircle)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_2", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_2", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end local DamageOnDiamond = RaidTargets [4] if (DamageOnDiamond) then GameCooltip:AddLine (RAID_TARGET_3 .. ":", format_func (_, DamageOnDiamond)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_3", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_3", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end local DamageOnTriangle = RaidTargets [8] if (DamageOnTriangle) then GameCooltip:AddLine (RAID_TARGET_4 .. ":", format_func (_, DamageOnTriangle)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_4", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_4", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end local DamageOnMoon = RaidTargets [16] if (DamageOnMoon) then GameCooltip:AddLine (RAID_TARGET_5 .. ":", format_func (_, DamageOnMoon)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_5", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_5", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end local DamageOnSquare = RaidTargets [32] if (DamageOnSquare) then GameCooltip:AddLine (RAID_TARGET_6 .. ":", format_func (_, DamageOnSquare)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_6", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_6", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end local DamageOnCross = RaidTargets [64] if (DamageOnCross) then GameCooltip:AddLine (RAID_TARGET_7 .. ":", format_func (_, DamageOnCross)) - GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_7", 1, 1, 14, 14) + GameCooltip:AddIcon ("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcon_7", 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) Details:AddTooltipBackgroundStatusbar() end ]], @@ -2360,7 +2361,7 @@ desc = "Show overall damage done on the fly.", source = false, target = false, - script_version = 3, + script_version = 4, script = [[ --init: local combat, instance_container, instance = ... @@ -2448,7 +2449,7 @@ GameCooltip:AddLine (spellName, format_func (_, total)) Details:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (spellIcon, 1, 1, 14, 14) + GameCooltip:AddIcon (spellIcon, 1, 1, _detalhes.tooltip.line_height, _detalhes.tooltip.line_height) end end ]], diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index b31b0ad8..1180fad9 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -531,10 +531,10 @@ end end end - + --> search actors which used the spell shown in the bar local spell = character.spells._ActorTable [from_spell] - + if (spell) then for targetname, amount in pairs (spell.targets) do @@ -619,6 +619,8 @@ local top = Targets[1] and Targets[1][2] + local lineHeight = _detalhes.tooltip.line_height + for index, t in ipairs (Targets) do GameCooltip:AddLine (_detalhes:GetOnlyName(t[1]), _detalhes:ToK (t[2]) .. " (" .. _cstr ("%.1f", t[2]/total*100) .. "%)") local class, _, _, _, _, r, g, b = _detalhes:GetClass (t[1]) @@ -626,10 +628,17 @@ GameCooltip:AddStatusBar (t[2]/top*100, 1, r, g, b, 0.8, false, byspell_tooltip_background) if (class) then - local texture, l, r, t, b = _detalhes:GetClassIcon (class) - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, 14, 14, l, r, t, b) + local specID = _detalhes:GetSpec (t[1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + local texture, l, r, t, b = _detalhes:GetClassIcon (class) + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, lineHeight, lineHeight, l, r, t, b) + end + elseif (t[1] == Loc ["STRING_TARGETS_OTHER1"]) then - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, 14, 14, 0.25, 0.49609375, 0.75, 1) + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small_alpha", 1, 1, lineHeight, lineHeight, 0.25, 0.49609375, 0.75, 1) end end @@ -1027,6 +1036,8 @@ frags_tooltip_table = damage_taken_table frags_tooltip_table.damage_total = total + local lineHeight = _detalhes.tooltip.line_height + if (#damage_taken_table > 0) then for i = 1, math.min (min, #damage_taken_table) do local t = damage_taken_table [i] @@ -1038,9 +1049,16 @@ end if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, lineHeight, lineHeight, .25, .5, 0, 1) else - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small_alpha]], nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + + local specID = _detalhes:GetSpec (t[1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small_alpha]], nil, nil, lineHeight, lineHeight, _unpack (_detalhes.class_coords [classe])) + end end local _, _, _, _, _, r, g, b = _detalhes:GetClass (t[1]) @@ -1310,8 +1328,6 @@ for index, void_table in ipairs (tooltip_void_zone_temp) do --ir� reportar dano zero tamb�m if (void_table[1] and type (void_table[1]) == "string" and void_table[2] and void_table[3] and type (void_table[3]) == "table") then - print (void_table[1], void_table[2], void_table[3]) - local actor_table = {_detalhes:GetOnlyName (void_table[1])} local m, s = _math_floor (void_table[3].uptime / 60), _math_floor (void_table[3].uptime % 60) if (m > 0) then @@ -1417,6 +1433,8 @@ tooltip_void_zone_temp.spellid = actor.damage_spellid tooltip_void_zone_temp.current_actor = actor + local lineHeight = _detalhes.tooltip.line_height + for index, t in _ipairs (tooltip_void_zone_temp) do if (t[3] == 0) then @@ -1433,10 +1451,16 @@ end local classe = _detalhes:GetClass (t[1]) - if (classe) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small_alpha]], nil, nil, 14, 14, unpack (_detalhes.class_coords [classe])) + if (classe) then + local specID = _detalhes:GetSpec (t[1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small_alpha]], nil, nil, lineHeight, lineHeight, unpack (_detalhes.class_coords [classe])) + end else - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, lineHeight, lineHeight, .25, .5, 0, 1) end local _, _, _, _, _, r, g, b = _detalhes:GetClass (t[1]) @@ -2967,9 +2991,9 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) end if (instancia.sub_atributo == 1 or instancia.sub_atributo == 6) then - GameCooltip:AddLine (nome_magia..": ", FormatTooltipNumber (_, totalDamage) .." (".._cstr("%.1f", totalDamage/ActorDamage*100).."%)") + GameCooltip:AddLine (nome_magia, FormatTooltipNumber (_, totalDamage) .." (".._cstr("%.1f", totalDamage/ActorDamage*100).."%)") else - GameCooltip:AddLine (nome_magia..": ", FormatTooltipNumber (_, _math_floor (totalDPS)) .." (".._cstr("%.1f", totalDamage/ActorDamage*100).."%)") + GameCooltip:AddLine (nome_magia, FormatTooltipNumber (_, _math_floor (totalDPS)) .." (".._cstr("%.1f", totalDamage/ActorDamage*100).."%)") end GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) @@ -3003,7 +3027,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) for i = 1, _math_min (max_targets, #ActorTargetsSortTable) do local este_inimigo = ActorTargetsSortTable [i] - GameCooltip:AddLine (este_inimigo[1]..": ", FormatTooltipNumber (_, este_inimigo[2]) .." (".._cstr("%.1f", este_inimigo[2]/ActorDamageWithPet*100).."%)") + GameCooltip:AddLine (este_inimigo[1], FormatTooltipNumber (_, este_inimigo[2]) .." (".._cstr("%.1f", este_inimigo[2]/ActorDamageWithPet*100).."%)") GameCooltip:AddIcon ([[Interface\PetBattles\PetBattle-StatIcons]], nil, nil, icon_size.W, icon_size.H, 0, 0.5, 0, 0.5, {.7, .7, .7, 1}, nil, true) _detalhes:AddTooltipBackgroundStatusbar (false, este_inimigo[2] / topEnemy * 100) end @@ -3117,7 +3141,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) --_detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\MobileAppIcons]], 2*130/1024, 3*130/1024, 5*130/1024, 6*130/1024) --_detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic10]], 0, 1, 0, 1) - _detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic8]], 11/64, 53/64, 11/64, 53/64) --localize-me + _detalhes:AddTooltipSpellHeaderText ("Damage by Encounter Phase", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic8]], 11/64, 53/64, 11/64, 53/64) --localize-me --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) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) @@ -3273,40 +3297,41 @@ function atributo_damage:ToolTip_Enemies (instancia, numero, barra, keydown) -- enemy damage taken _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_DAMAGE_TAKEN_FROM"], headerColor, i-1, [[Interface\Buttons\UI-MicroStream-Red]], 0.1875, 0.8125, 0.15625, 0.78125) 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, 0.7, g, b, 1) + _detalhes:AddTooltipHeaderStatusbar (1, 1, 1, 0.5) --> build the tooltip - local top = (tooltip_temp_table [1] and tooltip_temp_table [1][2]) or 0 tooltip_temp_table.damage_total = damage_taken + local lineHeight = _detalhes.tooltip.line_height + for o = 1, i-1 do local player = tooltip_temp_table [o][1] local total = tooltip_temp_table [o][2] local player_name = _detalhes:GetOnlyName (player:name()) - if (player_name:find (_detalhes.playername)) then - GameCooltip:AddLine (player_name .. " ", FormatTooltipNumber (_, total) .. " (" .. _cstr ("%.1f", (total / damage_taken) * 100) .. "%)", nil, "yellow") - else - GameCooltip:AddLine (player_name .. " ", FormatTooltipNumber (_, total) .." (" .. _cstr ("%.1f", (total / damage_taken) * 100) .. "%)") - end + GameCooltip:AddLine (player_name .. " ", FormatTooltipNumber (_, total) .." (" .. _cstr ("%.1f", (total / damage_taken) * 100) .. "%)") local classe = player:class() if (not classe) then classe = "UNKNOW" end if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, lineHeight, lineHeight, .25, .5, 0, 1) else - GameCooltip:AddIcon (instancia.row_info.icon_file, nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + local specID = player.spec + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon (instancia.row_info.icon_file, nil, nil, lineHeight, lineHeight, _unpack (_detalhes.class_coords [classe])) + end end local r, g, b = unpack (_detalhes.class_colors [classe]) GameCooltip:AddStatusBar (total/top*100, 1, r, g, b, 1, false, enemies_background) - --_detalhes:AddTooltipBackgroundStatusbar() end @@ -3317,7 +3342,6 @@ function atributo_damage:ToolTip_Enemies (instancia, numero, barra, keydown) GameCooltip:AddLine (Loc ["STRING_ATTRIBUTE_DAMAGE_ENEMIES_DONE"], FormatTooltipNumber (_, _math_floor (self.total))) local half = 0.00048828125 GameCooltip:AddIcon (instancia:GetSkinTexture(), 1, 1, 14, 14, 0.005859375 + half, 0.025390625 - half, 0.3623046875, 0.3818359375) - --_detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddStatusBar (0, 1, r, g, b, 1, false, enemies_background) local heal_actor = instancia.showing (2, self.nome) @@ -3327,23 +3351,14 @@ function atributo_damage:ToolTip_Enemies (instancia, numero, barra, keydown) GameCooltip:AddLine (Loc ["STRING_ATTRIBUTE_HEAL_ENEMY"], 0) end GameCooltip:AddIcon (instancia:GetSkinTexture(), 1, 1, 14, 14, 0.037109375 + half, 0.056640625 - half, 0.3623046875, 0.3818359375) - --_detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddStatusBar (0, 1, r, g, b, 1, false, enemies_background) GameCooltip:AddLine (" ") _detalhes:AddTooltipReportLineText() - --> clean up - --for o = 1, #tooltip_temp_table do - -- local t = tooltip_temp_table [o] - -- t[2] = 0 - -- t[1] = 0 - --end - GameCooltip:SetOption ("YSpacingMod", 0) return true - end ---------> DAMAGE TAKEN @@ -3475,16 +3490,17 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown) for _, spell in _ipairs (all_spells) do local spellname, _, spellicon = _GetSpellInfo (spell [1]) - GameCooltip:AddLine (spellname .. " (|cFFFFFF00" .. spell [3] .. "|r): ", FormatTooltipNumber (_, spell [2]).." (" .. _cstr ("%.1f", (spell [2] / damage_taken) * 100).."%)") + GameCooltip:AddLine (spellname .. " (|cFFFFFF00" .. spell [3] .. "|r)", FormatTooltipNumber (_, spell [2]).." (" .. _cstr ("%.1f", (spell [2] / damage_taken) * 100).."%)") GameCooltip:AddIcon (spellicon, 1, 1, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end else + local aggressorName = _detalhes:GetOnlyName (meus_agressores[i][1]) if (ismaximized and meus_agressores[i][1]:find (_detalhes.playername)) then - GameCooltip:AddLine (meus_agressores[i][1]..": ", FormatTooltipNumber (_, meus_agressores[i][2]).." (".._cstr("%.1f", (meus_agressores[i][2]/damage_taken) * 100).."%)", nil, "yellow") + GameCooltip:AddLine (aggressorName, FormatTooltipNumber (_, meus_agressores[i][2]).." (".._cstr("%.1f", (meus_agressores[i][2]/damage_taken) * 100).."%)", nil, "yellow") else - GameCooltip:AddLine (meus_agressores[i][1]..": ", FormatTooltipNumber (_, meus_agressores[i][2]).." (".._cstr("%.1f", (meus_agressores[i][2]/damage_taken) * 100).."%)") + GameCooltip:AddLine (aggressorName, FormatTooltipNumber (_, meus_agressores[i][2]).." (".._cstr("%.1f", (meus_agressores[i][2]/damage_taken) * 100).."%)") end local classe = meus_agressores[i][3] @@ -3493,9 +3509,9 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown) end if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, icon_size.W, icon_size.H, .25, .5, 0, 1) else - GameCooltip:AddIcon (instancia.row_info.icon_file, nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + GameCooltip:AddIcon (instancia.row_info.icon_file, nil, nil, icon_size.W, icon_size.H, _unpack (_detalhes.class_coords [classe])) end _detalhes:AddTooltipBackgroundStatusbar() end @@ -3506,7 +3522,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown) GameCooltip:AddLine (" ") GameCooltip:AddLine (Loc ["STRING_ATTRIBUTE_DAMAGE_DONE"], FormatTooltipNumber (_, _math_floor (self.total))) local half = 0.00048828125 - GameCooltip:AddIcon (instancia:GetSkinTexture(), 1, 1, 14, 14, 0.005859375 + half, 0.025390625 - half, 0.3623046875, 0.3818359375) + GameCooltip:AddIcon (instancia:GetSkinTexture(), 1, 1, icon_size.W, icon_size.H, 0.005859375 + half, 0.025390625 - half, 0.3623046875, 0.3818359375) _detalhes:AddTooltipBackgroundStatusbar() local heal_actor = instancia.showing (2, self.nome) @@ -3515,7 +3531,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown) else GameCooltip:AddLine (Loc ["STRING_ATTRIBUTE_HEAL_DONE"], 0) end - GameCooltip:AddIcon (instancia:GetSkinTexture(), 1, 1, 14, 14, 0.037109375 + half, 0.056640625 - half, 0.3623046875, 0.3818359375) + GameCooltip:AddIcon (instancia:GetSkinTexture(), 1, 1, icon_size.W, icon_size.H, 0.037109375 + half, 0.056640625 - half, 0.3623046875, 0.3818359375) _detalhes:AddTooltipBackgroundStatusbar() end @@ -3539,6 +3555,10 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown local tabela_do_combate = instancia.showing local showing = tabela_do_combate [class_type] + + local icon_size = _detalhes.tooltip.icon_size + local icon_border = _detalhes.tooltip.icon_border_texcoord + local lineHeight = _detalhes.tooltip.line_height local DamagedPlayers = {} local Skills = {} @@ -3549,14 +3569,13 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown DamagedPlayers [#DamagedPlayers+1] = {target_name, ff_table.total, actor.classe} for spellid, amount in _pairs (ff_table.spells) do Skills [spellid] = (Skills [spellid] or 0) + amount - --Skills [#Skills+1] = {spellid, amount} end end end _table_sort (DamagedPlayers, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, #DamagedPlayers, [[Interface\Addons\Details\images\icons]], 0.126953125, 0.224609375, 0.056640625, 0.140625) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, #DamagedPlayers, _detalhes.tooltip_target_icon.file, unpack (_detalhes.tooltip_target_icon.coords)) local ismaximized = false if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then @@ -3579,21 +3598,25 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown classe = "UNKNOW" end - GameCooltip:AddLine (DamagedPlayers[i][1]..": ", FormatTooltipNumber (_, DamagedPlayers[i][2]).." (".._cstr("%.1f", DamagedPlayers[i][2]/FriendlyFireTotal*100).."%)") - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\espadas", nil, nil, 14, 14) + GameCooltip:AddLine (_detalhes:GetOnlyName (DamagedPlayers[i][1]), FormatTooltipNumber (_, DamagedPlayers[i][2]).." (".._cstr("%.1f", DamagedPlayers[i][2]/FriendlyFireTotal*100).."%)") + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\espadas", nil, nil, lineHeight, lineHeight) _detalhes:AddTooltipBackgroundStatusbar() if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords ["UNKNOW"])) + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, lineHeight, lineHeight, _unpack (_detalhes.class_coords ["UNKNOW"])) else - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + local specID = _detalhes:GetSpec (DamagedPlayers[i][1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, lineHeight, lineHeight, _unpack (_detalhes.class_coords [classe])) + end end end - GameCooltip:AddLine (Loc ["STRING_SPELLS"].."", nil, nil, headerColor, nil, 12) - - GameCooltip:AddIcon ([[Interface\PVPFrame\bg-down-on]], 1, 1, 14, 14, 0, 1, 0, 1) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, 1, _detalhes.tooltip_spell_icon.file, unpack (_detalhes.tooltip_spell_icon.coords)) local ismaximized = false if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then @@ -3610,9 +3633,6 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown max_abilities2 = 99 end - local icon_size = _detalhes.tooltip.icon_size - local icon_border = _detalhes.tooltip.icon_border_texcoord - --spells usadas no friendly fire local SpellsInOrder = {} for spellID, amount in _pairs (Skills) do @@ -3622,7 +3642,7 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown for i = 1, _math_min (max_abilities2, #SpellsInOrder) do local nome, _, icone = _GetSpellInfo (SpellsInOrder[i][1]) - GameCooltip:AddLine (nome .. ": ", FormatTooltipNumber (_, SpellsInOrder[i][2]).." (".._cstr("%.1f", SpellsInOrder[i][2]/FriendlyFireTotal*100).."%)") + GameCooltip:AddLine (nome, FormatTooltipNumber (_, SpellsInOrder[i][2]).." (".._cstr("%.1f", SpellsInOrder[i][2]/FriendlyFireTotal*100).."%)") GameCooltip:AddIcon (icone, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end @@ -3897,6 +3917,13 @@ end row.icone:SetTexture ("") end + if (not row.IconUpBorder) then + row.IconUpBorder = CreateFrame ("frame", nil, row) + row.IconUpBorder:SetAllPoints (row.icone) + row.IconUpBorder:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1}) + row.IconUpBorder:SetBackdropBorderColor (0, 0, 0, 0.75) + end + if (texCoords) then row.icone:SetTexCoord (unpack (texCoords)) else diff --git a/classes/classe_energy.lua b/classes/classe_energy.lua index 8aa07e14..ecb96e5a 100644 --- a/classes/classe_energy.lua +++ b/classes/classe_energy.lua @@ -783,7 +783,7 @@ function atributo_energy:KeyNames (sub_atributo) return "total" end ----------> TOOLTIPS BIFURCA��O +---------> TOOLTIPS BIFURCA��O ~tooltip local resource_bg_color = {.1, .1, .1, 0.6} local resource_bg_coords = {.6, 0.1, 0, 0.64453125} @@ -909,9 +909,9 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown end local nome_magia, _, icone_magia = _GetSpellInfo (spell [1]) - GameCooltip:AddLine (nome_magia..": ", FormatTooltipNumber (_, spell [2]).." (".._cstr("%.1f", (spell [2]/total_regenerado) * 100).."%)") + GameCooltip:AddLine (nome_magia, FormatTooltipNumber (_, spell [2]).." (".._cstr("%.1f", (spell [2]/total_regenerado) * 100).."%)") GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) - _detalhes:AddTooltipBackgroundStatusbar() + _detalhes:AddTooltipBackgroundStatusbar (false, spell [2] / energy_tooltips_table [1][2] * 100) end --> players @@ -968,7 +968,7 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown break end - GameCooltip:AddLine (source [1]..": ", FormatTooltipNumber (_, source [2]).." (".._cstr("%.1f", (source [2] / total_regenerado) * 100).."%)") + GameCooltip:AddLine (source [1], FormatTooltipNumber (_, source [2]).." (".._cstr("%.1f", (source [2] / total_regenerado) * 100).."%)") _detalhes:AddTooltipBackgroundStatusbar() local classe = source [3] @@ -976,9 +976,9 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown classe = "UNKNOW" end if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, icon_size.W, icon_size.H, .25, .5, 0, 1) else - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, icon_size.W, icon_size.H, _unpack (_detalhes.class_coords [classe])) end end diff --git a/classes/classe_heal.lua b/classes/classe_heal.lua index 354ec13a..c2d6e6f4 100644 --- a/classes/classe_heal.lua +++ b/classes/classe_heal.lua @@ -934,7 +934,7 @@ end --------------------------------------------- // TOOLTIPS // --------------------------------------------- ----------> TOOLTIPS BIFURCA��O +---------> TOOLTIPS BIFURCA��O ~tooltip function atributo_heal:ToolTip (instancia, numero, barra, keydown) --> seria possivel aqui colocar o icone da classe dele? @@ -948,7 +948,7 @@ function atributo_heal:ToolTip (instancia, numero, barra, keydown) elseif (instancia.sub_atributo == 6) then --> healing done, HPS or Overheal return self:ToolTip_HealingDone (instancia, numero, barra, keydown) elseif (instancia.sub_atributo == 4) then --> healing taken - return self:ToolTip_HealingDenied (instancia, numero, barra, keydown) + return self:ToolTip_HealingTaken (instancia, numero, barra, keydown) elseif (instancia.sub_atributo == 7) then --> heal denied return self:ToolTip_HealingDenied (instancia, numero, barra, keydown) end @@ -1203,19 +1203,29 @@ function atributo_heal:ToolTip_HealingTaken (instancia, numero, barra, keydown) if (ismaximized) then max = 99 end + + local lineHeight = _detalhes.tooltip.line_height for i = 1, _math_min (max, #meus_curadores) do - GameCooltip:AddLine (meus_curadores[i][1]..": ", FormatTooltipNumber (_, meus_curadores[i][2]).." (".._cstr ("%.1f", (meus_curadores[i][2]/total_curado) * 100).."%)") + GameCooltip:AddLine (_detalhes:GetOnlyName (meus_curadores[i][1]), FormatTooltipNumber (_, meus_curadores[i][2]).." (".._cstr ("%.1f", (meus_curadores[i][2]/total_curado) * 100).."%)") local classe = meus_curadores[i][3] if (not classe) then classe = "UNKNOW" end if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, lineHeight, lineHeight, .25, .5, 0, 1) else - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + local specID = _detalhes:GetSpec (meus_curadores[i][1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, lineHeight, lineHeight, _unpack (_detalhes.class_coords [classe])) + end end - _detalhes:AddTooltipBackgroundStatusbar() + + _detalhes:AddTooltipBackgroundStatusbar (false, meus_curadores[i][2] / meus_curadores[1][2] * 100) + end return true @@ -1277,6 +1287,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) for _spellid, _skill in _pairs (petActor:GetActorSpells()) do if (_skill [skill_key] > 0) then local SkillName, _, SkillIcon = _GetSpellInfo (_spellid) + local petName = petName:gsub ((" <.*"), "") ActorHealingTable [#ActorHealingTable+1] = { _spellid, _skill [skill_key], @@ -1284,7 +1295,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) {SkillName, nil, SkillIcon}, _skill [skill_key]/meu_tempo, _skill.total, - petName:gsub ((" <.*"), "") + petName } end end @@ -1352,7 +1363,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) formatedTotal = formatedTotal .. " [|cFFFF5500" .. FormatTooltipNumber (_, _math_floor (antiHeal)) .." " .. Loc ["STRING_DAMAGE"] .."|r] " end - GameCooltip:AddLine (spellName ..": ", formatedTotal .. " (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)") + GameCooltip:AddLine (spellName , formatedTotal .. " (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)") elseif (instancia.sub_atributo == 3) then --> overheal local overheal = ActorHealingTable[i][2] @@ -1364,7 +1375,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) formatedTotal = formatedTotal .. " [|cFFFF5500" .. FormatTooltipNumber (_, _math_floor (antiHeal)) .." " .. Loc ["STRING_DAMAGE"] .."|r] " end - GameCooltip:AddLine (spellName .." (|cFFFF3333" .. _math_floor ( (overheal / (overheal+total)) *100) .. "%|r):", formatedTotal .. " (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)") + GameCooltip:AddLine (spellName .." (|cFFFF3333" .. _math_floor ( (overheal / (overheal+total)) *100) .. "%|r)", formatedTotal .. " (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)") else local formatedTotal = FormatTooltipNumber (_, ActorHealingTable[i][2]) @@ -1372,7 +1383,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) if (antiHeal) then formatedTotal = formatedTotal .. " [|cFFFF5500" .. FormatTooltipNumber (_, _math_floor (antiHeal)) .." " .. Loc ["STRING_DAMAGE"] .."|r] " end - GameCooltip:AddLine (spellName ..": ", formatedTotal .. " (" .. _cstr ("%.1f", ActorHealingTable[i][3]) .. "%)") + GameCooltip:AddLine (spellName , formatedTotal .. " (" .. _cstr ("%.1f", ActorHealingTable[i][3]) .. "%)") end @@ -1417,10 +1428,10 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) end if (ismaximized and ActorHealingTargets[i][1]:find (_detalhes.playername)) then - GameCooltip:AddLine (ActorHealingTargets[i][1]..": ", FormatTooltipNumber (_, ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)", nil, "yellow") + GameCooltip:AddLine (ActorHealingTargets[i][1], FormatTooltipNumber (_, ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)", nil, "yellow") GameCooltip:AddStatusBar (100, 1, .5, .5, .5, .7) else - GameCooltip:AddLine (ActorHealingTargets[i][1]..": ", FormatTooltipNumber (_, ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)") + GameCooltip:AddLine (ActorHealingTargets[i][1], FormatTooltipNumber (_, ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)") _detalhes:AddTooltipBackgroundStatusbar (false, ActorHealingTargets[i][2] / topTarget * 100) end @@ -1518,57 +1529,57 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) end - --> ~Phases - local segment = instancia:GetShowingCombat() - if (segment and self.grupo) then - local bossInfo = segment:GetBossInfo() - local phasesInfo = segment:GetPhases() - if (bossInfo and phasesInfo) then - if (#phasesInfo > 1) then - - --_detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\MobileAppIcons]], 2*130/1024, 3*130/1024, 5*130/1024, 6*130/1024) - --_detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic10]], 0, 1, 0, 1) - _detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic8]], 11/64, 53/64, 11/64, 53/64) - --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) - _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) - - local playerPhases = {} - local totalDamage = 0 - - for phase, playersTable in pairs (phasesInfo.heal) do --each phase - - local allPlayers = {} --all players for this phase - for playerName, amount in pairs (playersTable) do - tinsert (allPlayers, {playerName, amount}) - totalDamage = totalDamage + amount - end - table.sort (allPlayers, function(a, b) return a[2] > b[2] end) + if (instancia.sub_atributo == 1 or instancia.sub_atributo == 2) then + local segment = instancia:GetShowingCombat() + if (segment and self.grupo) then + local bossInfo = segment:GetBossInfo() + local phasesInfo = segment:GetPhases() + if (bossInfo and phasesInfo) then + if (#phasesInfo > 1) then - local myRank = 0 - for i = 1, #allPlayers do - if (allPlayers [i] [1] == self.nome) then - myRank = i - break + --_detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\MobileAppIcons]], 2*130/1024, 3*130/1024, 5*130/1024, 6*130/1024) + --_detalhes:AddTooltipSpellHeaderText ("Phases", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic10]], 0, 1, 0, 1) + _detalhes:AddTooltipSpellHeaderText ("Healing by Encounter Phase", headerColor, 1, [[Interface\Garrison\orderhall-missions-mechanic8]], 11/64, 53/64, 11/64, 53/64) + --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) + _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) + + local playerPhases = {} + local totalDamage = 0 + + for phase, playersTable in pairs (phasesInfo.heal) do --each phase + + local allPlayers = {} --all players for this phase + for playerName, amount in pairs (playersTable) do + tinsert (allPlayers, {playerName, amount}) + totalDamage = totalDamage + amount end + table.sort (allPlayers, function(a, b) return a[2] > b[2] end) + + local myRank = 0 + for i = 1, #allPlayers do + if (allPlayers [i] [1] == self.nome) then + myRank = i + break + end + end + + tinsert (playerPhases, {phase, playersTable [self.nome] or 0, myRank, (playersTable [self.nome] or 0) / totalDamage * 100}) end - tinsert (playerPhases, {phase, playersTable [self.nome] or 0, myRank, (playersTable [self.nome] or 0) / totalDamage * 100}) - end - - table.sort (playerPhases, function(a, b) return a[1] < b[1] end) - - for i = 1, #playerPhases do - --[1] Phase Number [2] Amount Done [3] Rank [4] Percent - GameCooltip:AddLine ("|cFFF0F0F0Phase|r " .. playerPhases [i][1], FormatTooltipNumber (_, playerPhases [i][2]) .. " (|cFFFFFF00#" .. playerPhases [i][3] .. "|r, " .. _cstr ("%.1f", playerPhases [i][4]) .. "%)") - GameCooltip:AddIcon ([[Interface\Garrison\orderhall-missions-mechanic9]], 1, 1, 14, 14, 11/64, 53/64, 11/64, 53/64) - _detalhes:AddTooltipBackgroundStatusbar() + table.sort (playerPhases, function(a, b) return a[1] < b[1] end) + + for i = 1, #playerPhases do + --[1] Phase Number [2] Amount Done [3] Rank [4] Percent + GameCooltip:AddLine ("|cFFF0F0F0Phase|r " .. playerPhases [i][1], FormatTooltipNumber (_, playerPhases [i][2]) .. " (|cFFFFFF00#" .. playerPhases [i][3] .. "|r, " .. _cstr ("%.1f", playerPhases [i][4]) .. "%)") + GameCooltip:AddIcon ([[Interface\Garrison\orderhall-missions-mechanic9]], 1, 1, 14, 14, 11/64, 53/64, 11/64, 53/64) + _detalhes:AddTooltipBackgroundStatusbar() + end end end end end - --> absorbs vs heal --[=[ if (instancia.sub_atributo == 1 or instancia.sub_atributo == 2) then diff --git a/classes/classe_others.lua b/classes/classe_others.lua index 8e78a47f..7911f2d8 100644 --- a/classes/classe_others.lua +++ b/classes/classe_others.lua @@ -1038,41 +1038,40 @@ function atributo_misc:ToolTipCC (instancia, numero, barra) --> habilidade usada para tirar o CC local icon_size = _detalhes.tooltip.icon_size local icon_border = _detalhes.tooltip.icon_border_texcoord + local lineHeight = _detalhes.tooltip.line_height + local icon_border = _detalhes.tooltip.icon_border_texcoord for _spellid, _tabela in _pairs (habilidades) do --> quantidade local nome_magia, _, icone_magia = _GetSpellInfo (_spellid) GameCooltip:AddLine (nome_magia, _tabela.cc_break .. " (" .. _cstr ("%.1f", _tabela.cc_break / meu_total * 100) .. "%)") - GameCooltip:AddIcon (icone_magia, nil, nil, 14, 14) + GameCooltip:AddIcon (icone_magia, nil, nil, lineHeight, lineHeight, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) --> o que quebrou local quebrou_oque = _tabela.cc_break_oque for spellid_quebrada, amt_quebrada in _pairs (_tabela.cc_break_oque) do local nome_magia, _, icone_magia = _GetSpellInfo (spellid_quebrada) - GameCooltip:AddLine (nome_magia..": ", amt_quebrada) + GameCooltip:AddLine (nome_magia, amt_quebrada .. " ") GameCooltip:AddIcon ([[Interface\Buttons\UI-GroupLoot-Pass-Down]], nil, 1, 14, 14) GameCooltip:AddIcon (icone_magia, nil, 2, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) GameCooltip:AddStatusBar (100, 1, 1, 0, 0, .2) end --> em quem quebrou - --GameCooltip:AddLine (Loc ["STRING_TARGETS"] .. ":") for target_name, amount in _pairs (_tabela.targets) do - - GameCooltip:AddLine (target_name .. ": ", amount) + GameCooltip:AddLine (target_name .. ": ", amount .. " ") local classe = _detalhes:GetClass (target_name) - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\espadas]], nil, 1, 14, 14) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\espadas]], nil, 1, lineHeight, lineHeight) if (classe) then - GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small]], nil, 2, 14, 14, unpack (_detalhes.class_coords [classe])) + GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small]], nil, 2, lineHeight, lineHeight, unpack (_detalhes.class_coords [classe])) else - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, 2, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, 2, lineHeight, lineHeight, .25, .5, 0, 1) end _detalhes:AddTooltipBackgroundStatusbar() - end end @@ -1109,7 +1108,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra) for i = 1, _math_min (25, #meus_dispells) do local esta_habilidade = meus_dispells[i] local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1]) - GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") + GameCooltip:AddLine (nome_magia, esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end @@ -1131,7 +1130,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra) for i = 1, _math_min (25, #buffs_dispelados) do local esta_habilidade = buffs_dispelados[i] local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1]) - GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") + GameCooltip:AddLine (nome_magia, esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end @@ -1153,7 +1152,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra) break end - GameCooltip:AddLine (alvos_dispelados[i][1]..": ", _detalhes:comma_value (alvos_dispelados[i][2]) .." (".._cstr ("%.1f", alvos_dispelados[i][3]).."%)") + GameCooltip:AddLine (alvos_dispelados[i][1], _detalhes:comma_value (alvos_dispelados[i][2]) .." (".._cstr ("%.1f", alvos_dispelados[i][3]).."%)") _detalhes:AddTooltipBackgroundStatusbar() local targetActor = instancia.showing[4]:PegarCombatente (_, alvos_dispelados[i][1]) @@ -1629,7 +1628,7 @@ function atributo_misc:ToolTipDebuffUptime (instancia, numero, barra) --_table_sort (debuffs_usados, Sort2Reverse) _table_sort (debuffs_usados, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #debuffs_usados, [[Interface\ICONS\Ability_Warrior_Safeguard]], 0.9375, 0.078125, 0.078125, 0.953125) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #debuffs_usados, _detalhes.tooltip_spell_icon.file, unpack (_detalhes.tooltip_spell_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) local icon_size = _detalhes.tooltip.icon_size @@ -1644,14 +1643,14 @@ function atributo_misc:ToolTipDebuffUptime (instancia, numero, barra) local minutos, segundos = _math_floor (esta_habilidade[2]/60), _math_floor (esta_habilidade[2]%60) if (esta_habilidade[2] >= _combat_time) then - --GameCooltip:AddLine (nome_magia..": ", minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)", nil, "gray", "gray") + --GameCooltip:AddLine (nome_magia, minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)", nil, "gray", "gray") --GameCooltip:AddStatusBar (100, nil, 1, 0, 1, .3, false) elseif (minutos > 0) then - GameCooltip:AddLine (nome_magia..": ", minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)") - _detalhes:AddTooltipBackgroundStatusbar() + GameCooltip:AddLine (nome_magia, minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)") + _detalhes:AddTooltipBackgroundStatusbar (false, esta_habilidade[2] / _combat_time * 100) else - GameCooltip:AddLine (nome_magia..": ", segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)") - _detalhes:AddTooltipBackgroundStatusbar() + GameCooltip:AddLine (nome_magia, segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)") + _detalhes:AddTooltipBackgroundStatusbar (false, esta_habilidade[2] / _combat_time * 100) end GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) @@ -1688,7 +1687,7 @@ function atributo_misc:ToolTipBuffUptime (instancia, numero, barra) --_table_sort (buffs_usados, Sort2Reverse) _table_sort (buffs_usados, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #buffs_usados, [[Interface\ICONS\Ability_Warrior_Safeguard]], 0.9375, 0.078125, 0.078125, 0.953125) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #buffs_usados, _detalhes.tooltip_spell_icon.file, unpack (_detalhes.tooltip_spell_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) local icon_size = _detalhes.tooltip.icon_size @@ -1705,14 +1704,14 @@ function atributo_misc:ToolTipBuffUptime (instancia, numero, barra) local minutos, segundos = _math_floor (esta_habilidade[2]/60), _math_floor (esta_habilidade[2]%60) if (esta_habilidade[2] >= _combat_time) then - --GameCooltip:AddLine (nome_magia..": ", minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)", nil, "gray", "gray") + --GameCooltip:AddLine (nome_magia, minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", esta_habilidade[2] / _combat_time * 100) .. "%)", nil, "gray", "gray") --GameCooltip:AddStatusBar (100, nil, 1, 0, 1, .3, false) elseif (minutos > 0) then - GameCooltip:AddLine (nome_magia..": ", minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", percent) .. "%)") - _detalhes:AddTooltipBackgroundStatusbar() + GameCooltip:AddLine (nome_magia, minutos .. "m " .. segundos .. "s" .. " (" .. _cstr ("%.1f", percent) .. "%)") + _detalhes:AddTooltipBackgroundStatusbar (false, percent) else - GameCooltip:AddLine (nome_magia..": ", segundos .. "s" .. " (" .. _cstr ("%.1f", percent) .. "%)") - _detalhes:AddTooltipBackgroundStatusbar() + GameCooltip:AddLine (nome_magia, segundos .. "s" .. " (" .. _cstr ("%.1f", percent) .. "%)") + _detalhes:AddTooltipBackgroundStatusbar (false, percent) end GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) @@ -1746,17 +1745,18 @@ function atributo_misc:ToolTipDefensiveCooldowns (instancia, numero, barra) end _table_sort (cooldowns_usados, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #cooldowns_usados, [[Interface\ICONS\Ability_Warrior_Safeguard]], 0.9375, 0.078125, 0.078125, 0.953125) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #cooldowns_usados, _detalhes.tooltip_spell_icon.file, unpack (_detalhes.tooltip_spell_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) local icon_size = _detalhes.tooltip.icon_size local icon_border = _detalhes.tooltip.icon_border_texcoord + local lineHeight = _detalhes.tooltip.line_height if (#cooldowns_usados > 0) then for i = 1, _math_min (25, #cooldowns_usados) do local esta_habilidade = cooldowns_usados[i] local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1]) - GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") + GameCooltip:AddLine (nome_magia, esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end @@ -1773,15 +1773,15 @@ function atributo_misc:ToolTipDefensiveCooldowns (instancia, numero, barra) end _table_sort (alvos, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, #alvos, [[Interface\ICONS\Ability_Warrior_DefensiveStance]], 0.9375, 0.125, 0.0625, 0.9375) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, #alvos, _detalhes.tooltip_target_icon.file, unpack (_detalhes.tooltip_target_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) if (#alvos > 0) then for i = 1, _math_min (25, #alvos) do - GameCooltip:AddLine (alvos[i][1]..": ", alvos[i][2], 1, "white", "white") + GameCooltip:AddLine (_detalhes:GetOnlyName (alvos[i][1]) .. ": ", alvos[i][2], 1, "white", "white") _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon ("Interface\\Icons\\PALADIN_HOLY", nil, nil, 14, 14) + GameCooltip:AddIcon ("Interface\\Icons\\PALADIN_HOLY", nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) local targetActor = instancia.showing[4]:PegarCombatente (_, alvos[i][1]) if (targetActor) then @@ -1792,7 +1792,13 @@ function atributo_misc:ToolTipDefensiveCooldowns (instancia, numero, barra) if (classe == "UNKNOW") then GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) else - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + local specID = _detalhes:GetSpec (alvos[i][1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + end end end @@ -1814,6 +1820,8 @@ function atributo_misc:ToolTipRess (instancia, numero, barra) local meu_total = self ["ress"] local minha_tabela = self.ress_spells._ActorTable + local lineHeight = _detalhes.tooltip.line_height + local icon_border = _detalhes.tooltip.icon_border_texcoord --> habilidade usada para interromper local meus_ress = {} @@ -1823,15 +1831,15 @@ function atributo_misc:ToolTipRess (instancia, numero, barra) end _table_sort (meus_ress, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #meus_ress, [[Interface\ICONS\Ability_Paladin_BlessedMending]], 0.098125, 0.828125, 0.953125, 0.168125) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #meus_ress, _detalhes.tooltip_spell_icon.file, unpack (_detalhes.tooltip_spell_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) if (#meus_ress > 0) then for i = 1, _math_min (3, #meus_ress) do local esta_habilidade = meus_ress[i] local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1]) - GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") - GameCooltip:AddIcon (icone_magia, nil, nil, 14, 14) + GameCooltip:AddLine (nome_magia, esta_habilidade[2] .. " (" .. _cstr ("%.1f", floor (esta_habilidade[2]) / floor (meu_total) * 100).."%)") + GameCooltip:AddIcon (icone_magia, nil, nil, lineHeight, lineHeight, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end else @@ -1847,12 +1855,12 @@ function atributo_misc:ToolTipRess (instancia, numero, barra) end _table_sort (alvos, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, #alvos, [[Interface\ICONS\Ability_Priest_Cascade]], 0.9375, 0.0625, 0.0625, 0.9375) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_TARGETS"], headerColor, #alvos, _detalhes.tooltip_target_icon.file, unpack (_detalhes.tooltip_target_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) if (#alvos > 0) then for i = 1, _math_min (3, #alvos) do - GameCooltip:AddLine (alvos[i][1]..": ", alvos[i][2]) + GameCooltip:AddLine (alvos[i][1], alvos[i][2]) _detalhes:AddTooltipBackgroundStatusbar() local targetActor = instancia.showing[4]:PegarCombatente (_, alvos[i][1]) @@ -1862,9 +1870,15 @@ function atributo_misc:ToolTipRess (instancia, numero, barra) classe = "UNKNOW" end if (classe == "UNKNOW") then - GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1) + GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, lineHeight, lineHeight, .25, .5, 0, 1) else - GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe])) + local specID = _detalhes:GetSpec (alvos[i][1]) + if (specID) then + local texture, l, r, t, b = _detalhes:GetSpecIcon (specID, false) + GameCooltip:AddIcon (texture, 1, 1, lineHeight, lineHeight, l, r, t, b) + else + GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, lineHeight, lineHeight, _unpack (_detalhes.class_coords [classe])) + end end end @@ -1889,6 +1903,7 @@ function atributo_misc:ToolTipInterrupt (instancia, numero, barra) local icon_size = _detalhes.tooltip.icon_size local icon_border = _detalhes.tooltip.icon_border_texcoord + local lineHeight = _detalhes.tooltip.line_height --> habilidade usada para interromper local meus_interrupts = {} @@ -1898,14 +1913,14 @@ function atributo_misc:ToolTipInterrupt (instancia, numero, barra) end _table_sort (meus_interrupts, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #meus_interrupts, [[Interface\ICONS\Ability_Warrior_PunishingBlow]], 0.9375, 0.078125, 0.078125, 0.953125) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELLS"], headerColor, #meus_interrupts, _detalhes.tooltip_spell_icon.file, unpack (_detalhes.tooltip_spell_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) if (#meus_interrupts > 0) then for i = 1, _math_min (25, #meus_interrupts) do local esta_habilidade = meus_interrupts[i] local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1]) - GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") + GameCooltip:AddLine (nome_magia, esta_habilidade[2].." (".._cstr("%.1f", floor (esta_habilidade[2])/floor (meu_total)*100).."%)") GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end @@ -1921,14 +1936,14 @@ function atributo_misc:ToolTipInterrupt (instancia, numero, barra) end _table_sort (habilidades_interrompidas, _detalhes.Sort2) - _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELL_INTERRUPTED"] .. ":", headerColor, #habilidades_interrompidas, [[Interface\ICONS\Ability_Warrior_Sunder]], 0.078125, 0.9375, 0.128125, 0.913125) + _detalhes:AddTooltipSpellHeaderText (Loc ["STRING_SPELL_INTERRUPTED"] .. ":", headerColor, #habilidades_interrompidas, _detalhes.tooltip_target_icon.file, unpack (_detalhes.tooltip_target_icon.coords)) _detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha) if (#habilidades_interrompidas > 0) then for i = 1, _math_min (25, #habilidades_interrompidas) do local esta_habilidade = habilidades_interrompidas[i] local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1]) - GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)") + GameCooltip:AddLine (nome_magia, esta_habilidade[2].." (".._cstr("%.1f", floor (esta_habilidade[2])/floor (meu_total)*100).."%)") GameCooltip:AddIcon (icone_magia, nil, nil, icon_size.W, icon_size.H, icon_border.L, icon_border.R, icon_border.T, icon_border.B) _detalhes:AddTooltipBackgroundStatusbar() end diff --git a/core/control.lua b/core/control.lua index 4cf5328a..bc31c479 100644 --- a/core/control.lua +++ b/core/control.lua @@ -1502,8 +1502,8 @@ function _detalhes:AddTooltipBackgroundStatusbar (side, value, useSpark) _detalhes.tooltip.background [4] = 0.8 - _detalhes.tooltip.icon_size.W = 16 - _detalhes.tooltip.icon_size.H = 16 + _detalhes.tooltip.icon_size.W = _detalhes.tooltip.line_height + _detalhes.tooltip.icon_size.H = _detalhes.tooltip.line_height value = value or 100 diff --git a/functions/profiles.lua b/functions/profiles.lua index 93eee3ba..737c36c7 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -1146,7 +1146,10 @@ local default_profile = { menus_bg_texture = [[Interface\SPELLBOOK\Spellbook-Page-1]], icon_border_texcoord = {L = 5/64, R = 59/64, T = 5/64, B = 59/64}, - icon_size = {W = 13, H = 13} + icon_size = {W = 13, H = 13}, + + --height used on tooltips at displays such as damage taken by spell + line_height = 17, }, } diff --git a/gumps/janela_info.lua b/gumps/janela_info.lua index 08570f95..223c398a 100644 --- a/gumps/janela_info.lua +++ b/gumps/janela_info.lua @@ -5187,8 +5187,8 @@ local row_on_enter = function (self) end --> da zoom no icone - self.icone:SetWidth (17) - self.icone:SetHeight (17) + self.icone:SetWidth (18) + self.icone:SetHeight (18) --> poe a alfa do icone em 1.0 self.icone:SetAlpha (1) @@ -5227,8 +5227,8 @@ local row_on_leave = function (self) if (self.isMain) then --> retira o zoom no icone - self.icone:SetWidth (14) - self.icone:SetHeight (14) + self.icone:SetWidth (16) + self.icone:SetHeight (16) --> volta com a alfa antiga da barra self.icone:SetAlpha (1) @@ -5545,8 +5545,8 @@ function gump:CriaNovaBarraInfo1 (instancia, index) esta_barra.miniframe:SetScript ("OnLeave", miniframe_func_on_leave) esta_barra.icone = esta_barra:CreateTexture (nil, "OVERLAY") - esta_barra.icone:SetWidth (14) - esta_barra.icone:SetHeight (14) + esta_barra.icone:SetWidth (16) + esta_barra.icone:SetHeight (16) esta_barra.icone:SetPoint ("RIGHT", esta_barra.textura, "LEFT", 18, 0) esta_barra:SetAlpha(0.9) @@ -5591,8 +5591,8 @@ function gump:CriaNovaBarraInfo2 (instancia, index) --> icone esta_barra.icone = esta_barra:CreateTexture (nil, "OVERLAY") - esta_barra.icone:SetWidth (14) - esta_barra.icone:SetHeight (14) + esta_barra.icone:SetWidth (16) + esta_barra.icone:SetHeight (16) esta_barra.icone:SetPoint ("RIGHT", esta_barra.textura, "LEFT", 18, 0) esta_barra:SetAlpha (ALPHA_BLEND_AMOUNT) diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index e77996cb..905c7b3d 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -214,24 +214,33 @@ end -- local report_string1 = show_panel:CreateFontString (nil, "overlay", "GameFontNormal") - report_string1:SetPoint ("bottomleft", show_panel, "bottomleft", 10, 10) + report_string1:SetPoint ("bottomleft", show_panel, "bottomleft", 10, 8) report_string1:SetText ("|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:225:307|t Report No Food/Flask |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:328:409|t Report No Pre-Pot |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:126:204|t Report No Rune | |cFFFFFFFFShift+Click: Options|r") + local using_details_string1 = show_panel:CreateFontString (nil, "overlay", "GameFontNormal") + using_details_string1:SetPoint ("bottomleft", show_panel, "bottomleft", 10, 22) + using_details_string1:SetText ("Receives dynamic updates from other Details! users when they change talents and gear") + DetailsRaidCheck:SetFontSize (report_string1, 10) DetailsRaidCheck:SetFontColor (report_string1, "white") report_string1:SetAlpha (0.6) + DetailsRaidCheck:SetFontSize (using_details_string1, 10) + DetailsRaidCheck:SetFontColor (using_details_string1, "white") + using_details_string1:SetAlpha (0.6) + -- --header and scroll local headerTable = { {text = "Player Name", width = 160}, {text = "Talents", width = 150}, - {text = "Item Level", width = 80}, - {text = "Food", width = 80}, - {text = "Flask", width = 80}, - {text = "Rune", width = 80}, - {text = "Pre-Pot", width = 80}, + {text = "Item Level", width = 70}, + {text = "Food", width = 50}, + {text = "Flask", width = 50}, + {text = "Rune", width = 50}, + {text = "Pre-Pot Last Try", width = 100}, + {text = "Using Details!", width = 100}, } local headerOptions = { padding = 2, @@ -299,6 +308,8 @@ end local RuneIndicator = DF:CreateImage (line, "", scroll_line_height, scroll_line_height) --no pre pot local PrePotIndicator = DF:CreateImage (line, "", scroll_line_height, scroll_line_height) + --using details! + local DetailsIndicator = DF:CreateImage (line, "", scroll_line_height, scroll_line_height) line:AddFrameToHeaderAlignment (roleIcon) line:AddFrameToHeaderAlignment (talentsRow) @@ -307,6 +318,7 @@ end line:AddFrameToHeaderAlignment (FlaskIndicator) line:AddFrameToHeaderAlignment (RuneIndicator) line:AddFrameToHeaderAlignment (PrePotIndicator) + line:AddFrameToHeaderAlignment (DetailsIndicator) line:AlignWithHeader (DetailsRaidCheck.Header, "left") @@ -319,6 +331,7 @@ end line.FlaskIndicator = FlaskIndicator line.RuneIndicator = RuneIndicator line.PrePotIndicator = PrePotIndicator + line.DetailsIndicator = DetailsIndicator return line end @@ -397,6 +410,7 @@ end line.FlaskIndicator.texture = playerTable.Flask and [[Interface\Scenarios\ScenarioIcon-Check]] or "" line.RuneIndicator.texture = playerTable.Rune and [[Interface\Scenarios\ScenarioIcon-Check]] or "" line.PrePotIndicator.texture = playerTable.PrePot and [[Interface\Scenarios\ScenarioIcon-Check]] or "" + line.DetailsIndicator.texture = playerTable.UseDetails and [[Interface\Scenarios\ScenarioIcon-Check]] or "" end end end @@ -591,6 +605,7 @@ end PrePot = DetailsRaidCheck.usedprepot_table [cleuName], Rune = DetailsRaidCheck.havefocusaug_table [unitSerial], Eating = DetailsRaidCheck.iseating_table [unitSerial], + UseDetails = Details.trusted_characters [unitSerial], }) end @@ -622,6 +637,7 @@ end PrePot = DetailsRaidCheck.usedprepot_table [cleuName], Rune = DetailsRaidCheck.havefocusaug_table [unitSerial], Eating = DetailsRaidCheck.iseating_table [unitSerial], + UseDetails = Details.trusted_characters [unitSerial], }) end diff --git a/startup.lua b/startup.lua index 4a153af2..c5cfd6b0 100644 --- a/startup.lua +++ b/startup.lua @@ -1318,9 +1318,10 @@ function _G._detalhes:Start() local lineHeight = instance.row_info.height local textSize = instance.row_info.font_size if (lineHeight-1 <= textSize) then - instance.row_info.height = 21 - instance.row_info.font_size = 16 - instance:ChangeSkin() + -- no need this, scheduled to code cleanup + -- instance.row_info.height = 21 + -- instance.row_info.font_size = 16 + -- instance:ChangeSkin() end end end