diff --git a/boot.lua b/boot.lua index 73ec3d58..a3509cef 100644 --- a/boot.lua +++ b/boot.lua @@ -3,8 +3,8 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 489 --it's 489 for release - _detalhes.userversion = "v3.9.3" + _detalhes.build_counter = 509 --it's 509 for release + _detalhes.userversion = "v3.9.4" _detalhes.realversion = 58 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -20,22 +20,25 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v3.9.3 (|cFFFFCC00Jan 31, 2015|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Fixed title bar icon for all skins (almost all skins has it disabled by default).\n\n -|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n +|cFFFFFF00v3.9.4 (|cFFFFCC00Feb 03, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Added option 'Ignore Mass Toggle', when enabled the window won't be affected when hiding, showing or toggling all windows.\n\n +|cFFFFFF00-|r Added window number for slash commands 'hide', 'show' and 'toggle'. Usage: '/details hide 1' to hide window 1.\n\n |cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n |cFFFFFF00-|r Added slash command 'toggle'.\n\n -|cFFFFFF00-|r More tweaks and fixes on skins.\n\n +|cFFFFFF00-|r Added display icons for all skins which still didn't have they.\n\n |cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n |cFFFFFF00-|r Improvements on Bookmark panel.\n\n |cFFFFFF00-|r Improvements on spec icons with transparency.\n\n -|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n +|cFFFFFF00-|r Created custom spell for Living Bomb explosion.\n\n +|cFFFFFF00-|r Fixed statusbar textures and mini displays.\n\n +|cFFFFFF00-|r Fixed an issue with title bar buttons when toggling the titlebar anchor from bottom to top position.\n\n +|cFFFFFF00-|r Fixed an issue with title bar text when toggling the statusbar position from bottom to top.\n\n +|cFFFFFF00-|r Fixed yet another bug with avoidance tab on player detail window.\n\n +|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n --]] ---|cFFFFFF00v3.9.3 (|cFFFFCC00Jan 31, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed title bar icon for all skins (almost all skins has it disabled by default).\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n - -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.9.3 (|cFFFFCC00Jan 31, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed title bar icon for all skins (almost all skins has it disabled by default).\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use.\n\n|cFFFFFF00-|r Plugin TimeAttack: fixed problem where sometimes required a reload to start a new time.\n\n|cFFFFFF00-|r Plugin Damage the Game!: fixed a problem where sometimes the time didn't started after level 2.\n\n|cFFFFFF00-|r Added specialization icons.\n\n|cFFFFFF00-|r Fixed Auto-Hide where it wasn't hiding the wallpaper of the window.\n\n|cFFFFFF00-|r Added 'Editing Group' check box on option panel, when enabled, settings changed also are modified on all windows in the group.\n\n|cFFFFFF00-|r Changing window's skin, doesn't change any more settings not related with appearance, for example, Auto-Hide, Switches.\n\n|cFFFFFF00-|r Custom display 'Health Potion & Stone' now also track Healing Tonic.\n\n|cFFFFFF00-|r Custom display 'Damage Taken by Spell' now tracks more spells and also melee hits.\n\n|cFFFFFF00-|r Menus now uses 'Friz Quadrata TT' font as default, also added an option to change it on options panel -> miscellaneous.\n\n|cFFFFFF00-|r 'Switch to Current' feature now switches all windows which have this option enabled.\n\n|cFFFFFF00-|r The message telling to use '/details reinstall' now only shows if a problem happen during the addon load process.\n\n|cFFFFFF00-|r Segments Saved option now can be set to 25, up from 5.\n\n|cFFFFFF00-|r Attempt to fix the bug with the monk spell 'Storm, Earth, and Fire'.\n\n|cFFFFFF00-|r Fixed 'Icon Pick' panel.\n\n|cFFFFFF00-|r Fixed bug when reporting friendly fire through player detail window.\n\n|cFFFFFF00-|r Fixed bug with report window where sometimes it was reporting on a wrong channel.\n\n|cFFFFFF00v3.7.1 (|cFFFFCC00Jan 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its levels adjusted for WoD.\n\n|cFFFFFF00-|r Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': incoming heals now count shield amount on the player too.\n\n|cFFFFFF00-|r Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.\n\n|cFFFFFF00-|r Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).\n\n|cFFFFFF00-|r Added option panel for Raid Check plugin.\n\n|cFFFFFF00-|r Added key bindings for open a window, close a window and select a bookmark.\n\n|cFFFFFF00-|r Added 'CTRL + RightClick' closes a window.\n\n|cFFFFFF00-|r Fixed wallpaper transparency after releasing the window from a stretch.|cFFFFFF00-|r Fixed few issues when using class text colors.\n\n|cFFFFFF00-|r Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.\n\n|cFFFFFF00-|r Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.\n\n|cFFFFFF00-|r Fixed auto erase poping up when the player enters on its garrison.\n\n|cFFFFFF00-|r Fixed combat on garrison training dummies which was being marked as Trash Segment.\n\n|cFFFFFF00-|r Fixed command /details disable, wasn't disabling the capture of cooldowns.\n\n|cFFFFFF00-|r Fixed a problem with fast dps/hps when the window is in a empty segment.\n\n|cFFFFFF00-|r Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.\n\n|cFFFFFF00-|r Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.\n\n|cFFFFFF00-|r Fixed bar animations when 'Sort Direction' is set to bottom.\n\n|cFFFFFF00-|r Fixed the spam 'you are not in a guild' when checking for new versions.\n\n|cFFFFFF00-|r Fixed translations for Auto Hide Settings bracket under options panel.\n\n|cFFFFFF00-|r Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.\n\n|cFFFFFF00v3.6.14b (|cFFFFCC00Jan 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n|cFFFFFF00-|r Added overkill on death's tooltip.\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n|cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n|cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n|cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n|cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n|cFFFFFF00v3.6.8 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Fast (i mean, really fast) Dps/Hps update rate, its option is under Rows: Advanced -> Fast Updates.\n\n|cFFFFFF00-|r Created a custom spell for Mirror Image's Fireball and Frostbolt, with that Player Detail window distinguishes spells from the player and images.\n\n|cFFFFFF00-|r Added new skin: 'ElvUI Style II'." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.9.4 (|cFFFFCC00Feb 03, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added option 'Ignore Mass Toggle', when enabled the window won't be affected when hiding, showing or toggling all windows.\n\n|cFFFFFF00-|r Added window number for slash commands 'hide', 'show' and 'toggle'. Usage: '/details hide 1' to hide window 1.\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r Added display icons for all skins which still didn't have they.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Created custom spell for Living Bomb explosion.\n\n|cFFFFFF00-|r Fixed statusbar textures and mini displays.\n\n|cFFFFFF00-|r Fixed an issue with title bar buttons when toggling the titlebar anchor from bottom to top position.\n\n|cFFFFFF00-|r Fixed an issue with title bar text when toggling the statusbar position from bottom to top.\n\n|cFFFFFF00-|r Fixed yet another bug with avoidance tab on player detail window.\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use.\n\n|cFFFFFF00-|r Plugin TimeAttack: fixed problem where sometimes required a reload to start a new time.\n\n|cFFFFFF00-|r Plugin Damage the Game!: fixed a problem where sometimes the time didn't started after level 2.\n\n|cFFFFFF00-|r Added specialization icons.\n\n|cFFFFFF00-|r Fixed Auto-Hide where it wasn't hiding the wallpaper of the window.\n\n|cFFFFFF00-|r Added 'Editing Group' check box on option panel, when enabled, settings changed also are modified on all windows in the group.\n\n|cFFFFFF00-|r Changing window's skin, doesn't change any more settings not related with appearance, for example, Auto-Hide, Switches.\n\n|cFFFFFF00-|r Custom display 'Health Potion & Stone' now also track Healing Tonic.\n\n|cFFFFFF00-|r Custom display 'Damage Taken by Spell' now tracks more spells and also melee hits.\n\n|cFFFFFF00-|r Menus now uses 'Friz Quadrata TT' font as default, also added an option to change it on options panel -> miscellaneous.\n\n|cFFFFFF00-|r 'Switch to Current' feature now switches all windows which have this option enabled.\n\n|cFFFFFF00-|r The message telling to use '/details reinstall' now only shows if a problem happen during the addon load process.\n\n|cFFFFFF00-|r Segments Saved option now can be set to 25, up from 5.\n\n|cFFFFFF00-|r Attempt to fix the bug with the monk spell 'Storm, Earth, and Fire'.\n\n|cFFFFFF00-|r Fixed 'Icon Pick' panel.\n\n|cFFFFFF00-|r Fixed bug when reporting friendly fire through player detail window.\n\n|cFFFFFF00-|r Fixed bug with report window where sometimes it was reporting on a wrong channel.\n\n|cFFFFFF00v3.7.1 (|cFFFFCC00Jan 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its levels adjusted for WoD.\n\n|cFFFFFF00-|r Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': incoming heals now count shield amount on the player too.\n\n|cFFFFFF00-|r Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.\n\n|cFFFFFF00-|r Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).\n\n|cFFFFFF00-|r Added option panel for Raid Check plugin.\n\n|cFFFFFF00-|r Added key bindings for open a window, close a window and select a bookmark.\n\n|cFFFFFF00-|r Added 'CTRL + RightClick' closes a window.\n\n|cFFFFFF00-|r Fixed wallpaper transparency after releasing the window from a stretch.|cFFFFFF00-|r Fixed few issues when using class text colors.\n\n|cFFFFFF00-|r Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.\n\n|cFFFFFF00-|r Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.\n\n|cFFFFFF00-|r Fixed auto erase poping up when the player enters on its garrison.\n\n|cFFFFFF00-|r Fixed combat on garrison training dummies which was being marked as Trash Segment.\n\n|cFFFFFF00-|r Fixed command /details disable, wasn't disabling the capture of cooldowns.\n\n|cFFFFFF00-|r Fixed a problem with fast dps/hps when the window is in a empty segment.\n\n|cFFFFFF00-|r Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.\n\n|cFFFFFF00-|r Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.\n\n|cFFFFFF00-|r Fixed bar animations when 'Sort Direction' is set to bottom.\n\n|cFFFFFF00-|r Fixed the spam 'you are not in a guild' when checking for new versions.\n\n|cFFFFFF00-|r Fixed translations for Auto Hide Settings bracket under options panel.\n\n|cFFFFFF00-|r Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.\n\n|cFFFFFF00v3.6.14b (|cFFFFCC00Jan 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n|cFFFFFF00-|r Added overkill on death's tooltip.\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n|cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n|cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n|cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n|cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n|cFFFFFF00v3.6.8 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Fast (i mean, really fast) Dps/Hps update rate, its option is under Rows: Advanced -> Fast Updates.\n\n|cFFFFFF00-|r Created a custom spell for Mirror Image's Fireball and Frostbolt, with that Player Detail window distinguishes spells from the player and images.\n\n|cFFFFFF00-|r Added new skin: 'ElvUI Style II'." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index e3490118..baf70375 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -1352,7 +1352,7 @@ end local actor_class_color_r, actor_class_color_g, actor_class_color_b ---self = esta classe de dano +-- ~atualizar ~barra function atributo_damage:AtualizaBarra (instancia, barras_container, qual_barra, lugar, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator) -- instância, container das barras, qual barra, colocação, total?, sub atributo, forçar refresh, key diff --git a/classes/classe_instancia.lua b/classes/classe_instancia.lua index 53229231..3f3a70f4 100644 --- a/classes/classe_instancia.lua +++ b/classes/classe_instancia.lua @@ -311,7 +311,7 @@ end function _detalhes:ShutDownAllInstances() for index, instance in _ipairs (_detalhes.tabela_instancias) do - if (instance:IsEnabled()) then + if (instance:IsEnabled() and instance.baseframe and not instance.ignore_mass_showhide) then instance:ShutDown() end end @@ -410,7 +410,17 @@ end end function _detalhes:ToggleWindows() - local instance = _detalhes:GetInstance (1) + + local instance + + for i = 1, #_detalhes.tabela_instancias do + local this_instance = _detalhes:GetInstance (i) + if (this_instance and not this_instance.ignore_mass_showhide) then + instance = this_instance + break + end + end + if (instance) then if (instance:IsEnabled()) then _detalhes:ShutDownAllInstances() @@ -430,7 +440,9 @@ end function _detalhes:ReabrirTodasInstancias (temp) for index = math.min (#_detalhes.tabela_instancias, _detalhes.instances_amount), 1, -1 do local instancia = _detalhes:GetInstance (index) - instancia:AtivarInstancia (temp) + if (instancia and not instancia.ignore_mass_showhide) then + instancia:AtivarInstancia (temp) + end end end @@ -477,8 +489,6 @@ end end end ---> oposto do desativar, ela apenas volta a mostrar a janela - --> alias function _detalhes:EnableInstance (temp) return self:AtivarInstancia (temp) @@ -740,13 +750,14 @@ end function _detalhes:BaseFrameSnap() - for meu_id, instancia in _ipairs (_detalhes.tabela_instancias) do + local group = self:GetInstanceGroup() + + for meu_id, instancia in _ipairs (group) do if (instancia:IsAtiva()) then instancia.baseframe:ClearAllPoints() end end - local group = self:GetInstanceGroup() local scale = self.window_scale for _, instance in _ipairs (group) do instance:SetWindowScale (scale) @@ -3115,7 +3126,7 @@ function _detalhes:envia_relatorio (linhas, custom) local alvo = _detalhes.report_to_who if (not alvo or alvo == "") then - print (Loc ["STRING_REPORT_INVALIDTARGET"]) + _detalhes:Msg (Loc ["STRING_REPORT_INVALIDTARGET"]) return end @@ -3132,11 +3143,11 @@ function _detalhes:envia_relatorio (linhas, custom) if (_UnitIsPlayer ("target")) then alvo = _UnitName ("target") else - print (Loc ["STRING_REPORT_INVALIDTARGET"]) + _detalhes:Msg (Loc ["STRING_REPORT_INVALIDTARGET"]) return end else - print (Loc ["STRING_REPORT_INVALIDTARGET"]) + _detalhes:Msg (Loc ["STRING_REPORT_INVALIDTARGET"]) return end diff --git a/classes/classe_instancia_include.lua b/classes/classe_instancia_include.lua index 7271482f..5a7c670f 100644 --- a/classes/classe_instancia_include.lua +++ b/classes/classe_instancia_include.lua @@ -44,6 +44,7 @@ _detalhes.instance_skin_ignored_values = { ["strata"] = true, ["grab_on_top"] = true, ["libwindow"] = true, + ["ignore_mass_showhide"] = true, } function _detalhes:ResetInstanceConfigKeepingValues (maintainsnap) @@ -89,6 +90,8 @@ end _detalhes.instance_defaults = { + --> window settings + ignore_mass_showhide = false, --skin skin = _detalhes.default_skin_to_use, --scale diff --git a/core/parser.lua b/core/parser.lua index 8050f10c..2d92ec2c 100644 --- a/core/parser.lua +++ b/core/parser.lua @@ -627,11 +627,11 @@ function parser:summon (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellName) --[[statistics]]-- _detalhes.statistics.pets_summons = _detalhes.statistics.pets_summons + 1 - - --if (who_name:find ("Kastfall")) then - -- print ("SUMMON", who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags) - --end - + + if (not _detalhes.capture_real ["damage"] and not _detalhes.capture_real ["heal"]) then + return + end + if (not who_name) then who_name = "[*] " .. spellName end diff --git a/functions/skins.lua b/functions/skins.lua index fed2eafa..4e64e435 100644 --- a/functions/skins.lua +++ b/functions/skins.lua @@ -280,7 +280,13 @@ local _ site = "unknown", desc = "Simple skin with soft gray color and half transparent frames.", --\n - micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10}, + --micro frames + micro_frames = { + color = {1, 1, 1, 1}, + font = "Accidental Presidency", + size = 10, + textymod = 1, + }, can_change_alpha_head = true, icon_anchor_main = {-1, -5}, @@ -358,11 +364,12 @@ local _ ["desaturated_menu"] = false, ["micro_displays_side"] = 2, ["statusbar_info"] = { - ["alpha"] = 0.622480094432831, + ["alpha"] = 0.3777777777777, -- [4] ["overlay"] = { - 0.333333333333333, -- [1] - 0.298039215686275, -- [2] - 0.337254901960784, -- [3] + 0.333333333333333, -- [1] + 0.333333333333333, -- [2] + 0.333333333333333, -- [3] + }, }, ["hide_icon"] = true, @@ -494,7 +501,13 @@ local _ site = "unknown", desc = "Same as the first Minimalistic, but this one is more darker and less transparent.", - micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10}, + --micro frames + micro_frames = { + color = {1, 1, 1, 0.7}, + font = "Friz Quadrata TT", + size = 9, + textymod = 0, + }, can_change_alpha_head = true, icon_anchor_main = {-1, -5}, @@ -632,11 +645,11 @@ local _ -2, -- [2] }, ["statusbar_info"] = { - ["alpha"] = 1, + ["alpha"] = 0.77, ["overlay"] = { - 1, -- [1] - 1, -- [2] - 1, -- [3] + 0.28627, -- [1] + 0.28627, -- [2] + 0.28627, -- [3] }, }, ["hide_icon"] = true, @@ -707,7 +720,14 @@ local _ site = "unknown", desc = "Light blue, this skin fits on almost all interfaces.\n\nFor ElvUI interfaces, change the window color to black to get an compatible visual.", - micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"}, + --micro frames + micro_frames = { + left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE", + color = {1, 1, 1, 0.7}, + font = "Accidental Presidency", + size = 10, + textymod = 0, + }, can_change_alpha_head = true, @@ -763,7 +783,7 @@ local _ ["text_face"] = "Accidental Presidency", ["anchor"] = { -17, -- [1] - 2, -- [2] + 3, -- [2] }, ["text_size"] = 12, ["enable_custom_text"] = false, @@ -1002,7 +1022,12 @@ local _ icon_plugins_size = {19, 18}, --micro frames - micro_frames = {color = {.7, .7, .7, 1}, font = "Arial Narrow", size = 11, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"}, + micro_frames = { + color = {.7, .7, .7, 0.7}, + font = "FORCED SQUARE", + size = 10, + textymod = 1, + }, -- the four anchors (for when the toolbar is on the top side) icon_point_anchor = {-37, 0}, @@ -1039,6 +1064,10 @@ local _ 2, ["side"] = 2, }, + ["menu_anchor_down"] = { + 14, + -2, + }, ["bg_r"] = 0, ["following"] = { ["enabled"] = false, @@ -1197,10 +1226,6 @@ local _ ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", ["percent_type"] = 1, }, - ["menu_anchor_down"] = { - -20, - -3, - }, ["toolbar_side"] = 1, ["bg_g"] = 0, ["bars_grow_direction"] = 1, @@ -1378,9 +1403,14 @@ local _ icon_anchor_main = {-4, -5}, icon_anchor_plugins = {-7, -13}, icon_plugins_size = {19, 18}, - + --micro frames - micro_frames = {color = {0.525490, 0.525490, 0.525490, 1}, font = "Arial Narrow", size = 11}, + micro_frames = { + color = {1, 1, 1, 0.7}, + font = "FORCED SQUARE", + size = 10, + textymod = 1, + }, -- the four anchors (for when the toolbar is on the top side) icon_point_anchor = {-35, -0.5}, @@ -1621,7 +1651,12 @@ local _ icon_plugins_size = {19, 18}, --micro frames - micro_frames = {color = {0.525490, 0.525490, 0.525490, 1}, font = "Arial Narrow", size = 11}, + micro_frames = { + color = {0.525490, 0.525490, 0.525490, 1}, + font = "FORCED SQUARE", + size = 11, + textymod = 1, + }, -- the four anchors (for when the toolbar is on the top side) icon_point_anchor = {-35, -0.5}, diff --git a/functions/slash.lua b/functions/slash.lua index 9aba64f6..a502f0c5 100644 --- a/functions/slash.lua +++ b/functions/slash.lua @@ -20,11 +20,47 @@ function SlashCmdList.DETAILS (msg, editbox) if (command == Loc ["STRING_SLASH_NEW"] or command == "new") then _detalhes:CriarInstancia (nil, true) + elseif (command == Loc ["STRING_SLASH_TOGGLE"] or command == "toggle") then + + local instance = rest:match ("^(%S*)%s*(.-)$") + instance = tonumber (instance) + if (instance) then + _detalhes:ToggleWindow (instance) + else + _detalhes:ToggleWindows() + end + elseif (command == Loc ["STRING_SLASH_HIDE"] or command == Loc ["STRING_SLASH_HIDE_ALIAS1"] or command == "hide") then - _detalhes:ShutDownAllInstances() + + local instance = rest:match ("^(%S*)%s*(.-)$") + instance = tonumber (instance) + if (instance) then + local this_instance = _detalhes:GetInstance (instance) + if (not this_instance) then + return _detalhes:Msg (Loc ["STRING_WINDOW_NOTFOUND"]) + end + if (this_instance:IsEnabled() and this_instance.baseframe) then + this_instance:ShutDown() + end + else + _detalhes:ShutDownAllInstances() + end elseif (command == Loc ["STRING_SLASH_SHOW"] or command == Loc ["STRING_SLASH_SHOW_ALIAS1"] or command == "show") then - _detalhes:ReabrirTodasInstancias() + + local instance = rest:match ("^(%S*)%s*(.-)$") + instance = tonumber (instance) + if (instance) then + local this_instance = _detalhes:GetInstance (instance) + if (not this_instance) then + return _detalhes:Msg (Loc ["STRING_WINDOW_NOTFOUND"]) + end + if (not this_instance:IsEnabled() and this_instance.baseframe) then + this_instance:EnableInstance() + end + else + _detalhes:ReabrirTodasInstancias() + end elseif (command == Loc ["STRING_SLASH_WIPECONFIG"] or command == "reinstall") then _detalhes:WipeConfig() @@ -73,12 +109,7 @@ function SlashCmdList.DETAILS (msg, editbox) end end - - elseif (command == Loc ["STRING_SLASH_TOGGLE"] or command == "toggle") then - - _detalhes:ToggleWindows() - elseif (command == Loc ["STRING_SLASH_WORLDBOSS"] or command == "worldboss") then local questIds = {{"Tarlna the Ageless", 81535}, {"Drov the Ruiner ", 87437}, {"Rukhmar", 87493}} @@ -869,18 +900,15 @@ function SlashCmdList.DETAILS (msg, editbox) print (" ") print (Loc ["STRING_DETAILS1"] .. "(" .. _detalhes.userversion .. ") " .. Loc ["STRING_COMMAND_LIST"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_NEW"] .. "|r: " .. Loc ["STRING_SLASH_NEW_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_SHOW"] .. "|r: " .. Loc ["STRING_SLASH_SHOW_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_HIDE"] .. "|r: " .. Loc ["STRING_SLASH_HIDE_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_TOGGLE"] .. "|r: " .. Loc ["STRING_SLASH_TOGGLE_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_NEW"] .. "|r: " .. Loc ["STRING_SLASH_NEW_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_SHOW"] .. " " .. Loc ["STRING_SLASH_HIDE"] .. " " .. Loc ["STRING_SLASH_TOGGLE"] .. "|r|cfffcffb0 <" .. Loc ["STRING_WINDOW_NUMBER"] .. ">|r: " .. Loc ["STRING_SLASH_SHOWHIDETOGGLE_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_ENABLE"] .. " " .. Loc ["STRING_SLASH_DISABLE"] .. "|r: " .. Loc ["STRING_SLASH_CAPTURE_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_RESET"] .. "|r: " .. Loc ["STRING_SLASH_RESET_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_OPTIONS"] .. "|r|cfffcffb0 <" .. Loc ["STRING_WINDOW_NUMBER"] .. ">|r: " .. Loc ["STRING_SLASH_OPTIONS_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_CHANGES"] .. "|r: " .. Loc ["STRING_SLASH_CHANGES_DESC"]) + print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_WIPECONFIG"] .. "|r: " .. Loc ["STRING_SLASH_WIPECONFIG_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_ENABLE"] .. "|r: " .. Loc ["STRING_SLASH_ENABLE_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_DISABLE"] .. "|r: " .. Loc ["STRING_SLASH_DISABLE_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_RESET"] .. "|r: " .. Loc ["STRING_SLASH_RESET_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_OPTIONS"] .. "|r|cfffcffb0 |r: " .. Loc ["STRING_SLASH_OPTIONS_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_CHANGES"] .. "|r: " .. Loc ["STRING_SLASH_CHANGES_DESC"]) - print ("|cffffaeae/details " .. Loc ["STRING_SLASH_WIPECONFIG"] .. "|r: " .. Loc ["STRING_SLASH_WIPECONFIG_DESC"]) --print ("|cffffaeae/details " .. Loc ["STRING_SLASH_WORLDBOSS"] .. "|r: " .. Loc ["STRING_SLASH_WORLDBOSS_DESC"]) print (" ") diff --git a/gumps/janela_info.lua b/gumps/janela_info.lua index 027fd16e..0de2fc6f 100644 --- a/gumps/janela_info.lua +++ b/gumps/janela_info.lua @@ -1266,14 +1266,14 @@ function gump:CriaJanelaInfo() n = n:gsub (("-.*"), "") end tab.tankname:SetText ("Avoidance of\n" .. n) --> localize-me - - if (not playerdamage.avoidance) then - playerdamage.avoidance = _detalhes:CreateActorAvoidanceTable() - end - + --> damage taken local playerdamage = combat (1, player.nome) - + + if (not playerdamage.avoidance) then + playerdamage.avoidance = _detalhes:CreateActorAvoidanceTable() + end + local damagetaken = playerdamage.damage_taken local last_damage_received = 0 if (last_actor) then diff --git a/gumps/janela_options.lua b/gumps/janela_options.lua index 4fff8296..6dbc27ea 100644 --- a/gumps/janela_options.lua +++ b/gumps/janela_options.lua @@ -6519,7 +6519,11 @@ function window:CreateFrame6() frame6.instanceToolbarSideSlider:SetPoint ("left", frame6.instanceToolbarSideLabel, "right", 2) frame6.instanceToolbarSideSlider.OnSwitch = function (self, instance, value) instance:ToolbarSide (value) - _G.DetailsOptionsWindow7:update_menuanchor_xy (instance) + + local group_editing = _detalhes.options_group_edit + _detalhes.options_group_edit = nil + _G.DetailsOptionsWindow7:update_menuanchor_xy (instance) + _detalhes.options_group_edit = group_editing if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do @@ -6778,7 +6782,6 @@ function window:CreateFrame6() else instance:HideStatusBar() end - instance:BaseFrameSnap() if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do @@ -6788,11 +6791,11 @@ function window:CreateFrame6() else this_instance:HideStatusBar() end - this_instance:BaseFrameSnap() end end end + instance:BaseFrameSnap() window:update_microframes() _detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance) end @@ -6920,7 +6923,29 @@ function window:CreateFrame6() GameCooltip:ShowCooltip (frame6.WindowScaleSlider.widget, "tooltip") return true end) + + --> ignore mass show hide + g:NewSwitch (frame6, _, "$parentIgnoreMassShowHideSlider", "IgnoreMassShowHideSlider", 60, 20, _, _, instance.ignore_mass_showhide) + g:NewLabel (frame6, _, "$parentIgnoreMassShowHideLabel", "IgnoreMassShowHideLabel", Loc ["STRING_OPTIONS_WINDOW_IGNOREMASSTOGGLE"], "GameFontHighlightLeft") + + frame6.IgnoreMassShowHideSlider:SetPoint ("left", frame6.IgnoreMassShowHideLabel, "right", 2) + frame6.IgnoreMassShowHideSlider.OnSwitch = function (self, instance, value) + + instance.ignore_mass_showhide = value + if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then + for _, this_instance in ipairs (instance:GetInstanceGroup()) do + if (this_instance ~= instance) then + this_instance.ignore_mass_showhide = value + end + end + end + + _detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance) + end + + window:CreateLineBackground2 (frame6, "IgnoreMassShowHideSlider", "IgnoreMassShowHideLabel", Loc ["STRING_OPTIONS_WINDOW_IGNOREMASSTOGGLE_DESC"]) + --> general anchor g:NewLabel (frame6, _, "$parentAdjustmentsAnchor", "AdjustmentsAnchorLabel", Loc ["STRING_OPTIONS_WINDOW_ANCHOR"], "GameFontNormal") g:NewLabel (frame6, _, "$parentAdjustments2Anchor", "AdjustmentsAnchor2Label", Loc ["STRING_OPTIONS_WINDOW_ANCHOR_ANCHORS"], "GameFontNormal") @@ -6936,13 +6961,14 @@ function window:CreateFrame6() {"windowBackgroundPickColorLabel", 3}, {"WindowScaleLabel", 4, true}, {"sideBarsLabel", 5, true}, - {"strataLabel", 6}, - {"backdropLabel", 7}, + {"IgnoreMassShowHideLabel", 6}, + {"strataLabel", 7}, + {"backdropLabel", 8}, - {"AdjustmentsAnchor2Label", 8, true}, - {"instanceToolbarSideLabel", 9}, - {"stretchAnchorLabel", 10, true}, - {"stretchAlwaysOnTopLabel", 11}, + {"AdjustmentsAnchor2Label", 9, true}, + {"instanceToolbarSideLabel", 10}, + {"stretchAnchorLabel", 11, true}, + {"stretchAlwaysOnTopLabel", 12}, } window:arrange_menu (frame6, left_side, x, window.top_start_at) @@ -9972,6 +9998,9 @@ end --> if not window _G.DetailsOptionsWindow6StretchAlwaysOnTopSlider.MyObject:SetFixedParameter (editing_instance) _G.DetailsOptionsWindow6StretchAlwaysOnTopSlider.MyObject:SetValue (editing_instance.grab_on_top) + _G.DetailsOptionsWindow6IgnoreMassShowHideSlider.MyObject:SetFixedParameter (editing_instance) + _G.DetailsOptionsWindow6IgnoreMassShowHideSlider.MyObject:SetValue (editing_instance.ignore_mass_showhide) + _G.DetailsOptionsWindow6InstanceMicroDisplaysSideSlider.MyObject:SetFixedParameter (editing_instance) _G.DetailsOptionsWindow6InstanceMicroDisplaysSideSlider.MyObject:SetValue (editing_instance.micro_displays_side) diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index 60bb8be6..f3dbefc0 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -5434,6 +5434,22 @@ function _detalhes:ChangeSkin (skin_name) if (this_skin.micro_frames.left) then _detalhes.StatusBar:SetPlugin (self, this_skin.micro_frames.left, "left") end + + if (this_skin.micro_frames.textxmod) then + _detalhes.StatusBar:ApplyOptions (self.StatusBar.left, "textxmod", this_skin.micro_frames.textxmod) + _detalhes.StatusBar:ApplyOptions (self.StatusBar.center, "textxmod", this_skin.micro_frames.textxmod) + _detalhes.StatusBar:ApplyOptions (self.StatusBar.right, "textxmod", this_skin.micro_frames.textxmod) + end + if (this_skin.micro_frames.textymod) then + _detalhes.StatusBar:ApplyOptions (self.StatusBar.left, "textymod", this_skin.micro_frames.textymod) + _detalhes.StatusBar:ApplyOptions (self.StatusBar.center, "textymod", this_skin.micro_frames.textymod) + _detalhes.StatusBar:ApplyOptions (self.StatusBar.right, "textymod", this_skin.micro_frames.textymod) + end + if (this_skin.micro_frames.hidden) then + _detalhes.StatusBar:ApplyOptions (self.StatusBar.left, "hidden", this_skin.micro_frames.hidden) + _detalhes.StatusBar:ApplyOptions (self.StatusBar.center, "hidden", this_skin.micro_frames.hidden) + _detalhes.StatusBar:ApplyOptions (self.StatusBar.right, "hidden", this_skin.micro_frames.hidden) + end if (this_skin.micro_frames.color) then _detalhes.StatusBar:ApplyOptions (self.StatusBar.left, "textcolor", this_skin.micro_frames.color) _detalhes.StatusBar:ApplyOptions (self.StatusBar.center, "textcolor", this_skin.micro_frames.color) @@ -5789,7 +5805,7 @@ function _detalhes:AttributeMenu (enabled, pos_x, pos_y, font, size, color, side self.attribute_text.text_color = color self.attribute_text.side = side self.attribute_text.shadow = shadow - + --> enabled if (not enabled and self.menu_attribute_string) then return self.menu_attribute_string:Hide() @@ -5861,7 +5877,7 @@ function _detalhes:AttributeMenu (enabled, pos_x, pos_y, font, size, color, side --shadow _detalhes:SetFontOutline (self.menu_attribute_string, shadow) - + end -- ~backdrop @@ -6236,7 +6252,7 @@ function _detalhes:ToolbarSide (side) end --> update top menus - self:LeftMenuAnchorSide() + self:LeftMenuAnchorSide() self:StretchButtonAnchor() @@ -6601,6 +6617,7 @@ function _detalhes:ShowStatusBar (instancia) self.baseframe.DOWNFrame:Show() self:ToolbarSide() + self:StretchButtonAnchor() if (self.micro_displays_side == 2) then --> bottom side diff --git a/images/skins/classic_skin.tga b/images/skins/classic_skin.tga index a2d59809..9aad223f 100644 Binary files a/images/skins/classic_skin.tga and b/images/skins/classic_skin.tga differ diff --git a/images/skins/classic_skin_v1.tga b/images/skins/classic_skin_v1.tga index 5e21d674..285caf86 100644 Binary files a/images/skins/classic_skin_v1.tga and b/images/skins/classic_skin_v1.tga differ diff --git a/images/skins/elvui.tga b/images/skins/elvui.tga index 6f1cddd3..10b41537 100644 Binary files a/images/skins/elvui.tga and b/images/skins/elvui.tga differ diff --git a/images/skins/elvui_opaque.tga b/images/skins/elvui_opaque.tga index a0a13507..76028a14 100644 Binary files a/images/skins/elvui_opaque.tga and b/images/skins/elvui_opaque.tga differ diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index c79bcec0..6a21566a 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -148,15 +148,13 @@ local food_list = { DetailsRaidCheck.ToolbarButton:SetHighlightTexture ([[Interface\AddOns\Details_RaidCheck\icon_red]], "ADD") end end - - + local show_panel = CreateFrame ("frame", nil, UIParent) show_panel:SetSize (400, 300) - --show_panel:SetBackdrop ({bgFile = [[Interface\AddOns\Details\images\background]], tile = true, tileSize = 16}) show_panel:SetPoint ("bottom", DetailsRaidCheck.ToolbarButton, "top", 0, 10) - --show_panel:SetBackdrop ({bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16, insets = {left = 4, right = 4, top = 2, bottom = 1}}) show_panel:SetBackdrop ({bgFile = [[Interface\Garrison\GarrisonMissionUIInfoBoxBackgroundTile]], tileSize = 256, edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16, insets = {left = 4, right = 4, top = 2, bottom = 1}}) show_panel:SetBackdropColor (1, 1, 1, 0.9) + show_panel:SetClampedToScreen (true) -- diff --git a/plugins/Details_RaidInfo-BlackrockFoundry/Details_RaidInfo-BlackrockFoundry.lua b/plugins/Details_RaidInfo-BlackrockFoundry/Details_RaidInfo-BlackrockFoundry.lua index c1c5655e..9f0fbb91 100644 --- a/plugins/Details_RaidInfo-BlackrockFoundry/Details_RaidInfo-BlackrockFoundry.lua +++ b/plugins/Details_RaidInfo-BlackrockFoundry/Details_RaidInfo-BlackrockFoundry.lua @@ -48,25 +48,33 @@ local blackrock_foundry = { encounter_ids2 = { --combatlog encounter id + [1691] = 1, --Gruul + [1696] = 2, --Oregorger [1694] = 3, --Beastlord Darmac [1689] = 4, --Flamebender Ka'graz [1693] = 5, --Hans'gar & Franzok [1692] = 6, --Operator Thogar + [1690] = 7, --The Blast Furnace [1713] = 8, --Kromog, Legend of the Mountain [1695] = 9, --The Iron Maidens + [1704] = 10, --Blackhand }, boss_ids = { --npc ids + [76877] = 1, --Gruul + [77182] = 2, --Oregorger [76865] = 3, --Beastlord Darmac [76814] = 4, --Flamebender Ka'graz [76974] = 5, --Franzok [76973] = 5, --Hans'gar [76906] = 6, --Operator Thogar + [76806] = 7, --Heart of the Mountain [77692] = 8, --Kromog, Legend of the Mountain [77557] = 9, -- Admiral Gar'an [77231] = 9, --Enforcer Sorka [77477] = 9, --Marak the Blooded + [77325] = 10, --Blackhand }, encounters = {