diff --git a/boot.lua b/boot.lua index 8f8535ac..e96a4ea3 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 = 340 --it's 340 for release - _detalhes.userversion = "v3.6.14b" + _detalhes.build_counter = 342 --it's 342 for release + _detalhes.userversion = "v3.6.15" _detalhes.realversion = 55 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -18,6 +18,14 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ +|cFFFFFF00v3.6.15 (|cFFFFCC00Jan 03, 2015|r|cFFFFFF00)|r:\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 combat on garrison training dummies which was being marked as Trash Segment.\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 @@ -51,7 +59,7 @@ do |cFFFFFF00-|r Fixed bugs on sending messages to chat for Raid Tools.\n\n --]] - Loc ["STRING_VERSION_LOG"] = "|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'.\n\n|cFFFFFF00-|r Added Observer mode for Raid Tools: report cooldown/interrupt/death of entire raid only to you in your chat window.\n\n|cFFFFFF00-|r Added new plugin 'Raid Check': tracks raid members checking food, flask and pre-potions usage.\n\n|cFFFFFF00-|r Changed DPS display, now it shows onyl the player's Dps and the Dps difference between him and the top ranked.\n\n|cFFFFFF00-|r Changed Overheal display, now its percentage shows the player's overheal percent.\n\n|cFFFFFF00-|r Player Detail Window now shows the amount of multistrike on normal and critical hits.\n\n|cFFFFFF00-|r Removed skin: 'ElvUI Frame Style BW'.\n\n|cFFFFFF00-|r The tooltip for Scale option under options panel, now shows the real value for the scale.\n\n|cFFFFFF00-|r Fixed Imperator Mar'gok's adds damage taken.\n\n|cFFFFFF00-|r Fixed a problem where multistrike was counting towards critical strike amount.\n\n|cFFFFFF00-|r Fixed death display's report where it was't showing any death.\n\n|cFFFFFF00-|r Fixed a small issue with Encounter Details plugin where sometimes gets a error right after a boss encounter.\n\n|cFFFFFF00-|r Fixed bugs on sending messages to chat for Raid Tools.\n\n\n\n|cFFFFFF00v3.5.1 (|cFFFFCC00Dec 16, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed few accuracy on miss spells.\n\n|cFFFFFF00v3.5.0 (|cFFFFCC00Dec 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed tooltip for Auras and Voidzones, now shows sorted by damage and time.\n\n|cFFFFFF00-|r More fixes for Korgath encounter on Highmaul.\n\n|cFFFFFF00-|r Added slash commands: 'reset' 'config'.\n\n|cFFFFFF00-|r Spell bars on Player Details Window now is painted with the spell spellschool color.\n\n|cFFFFFF00-|r Multistrike doesn't count any more for spell's Minimal Damage.\n\n|cFFFFFF00-|r Resource display got an tooltip which shows what resource is and resource gained per minute.\n\n|cFFFFFF00-|r Clicking on report button when the report window is already open, make it close.\n\n|cFFFFFF00v3.4.7 (|cFFFFCC00Dec 11, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs plugin got updates on Endurance Player Value and few bug fixes.\n\n|cFFFFFF00-|r Max Window Amount options can new be set to 1, before the minimum was 3.\n\n|cFFFFFF00-|r Fixed a problem with friendly fire tooltip where sometimes it wasn't showing up.\n\n|cFFFFFF00-|r Fixed cooldowns tooltip which wasn't showing rounded numbers (49.99 instead of 50).\n\n|cFFFFFF00-|r Fixed Warrior's Shield Block which wasn't being count as a cooldown.\n\n|cFFFFFF00-|r Fixed a problem where sometimes when a hunter pull and reset the boss right after, was causing segments to merge.\n\n|cFFFFFF00v3.4.4 (|cFFFFCC00Dec 05, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a issue with Ko'Ragh boss on Highmaul raid.\n\n|cFFFFFF00-|r Few changes on Bookmark panel.\n\n|cFFFFFF00v3.4.3 (|cFFFFCC00Dec 02, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed 'Simple Gray' skin.\n\n|cFFFFFF00-|r Addde new skin: 'Forced Square'.\n\n|cFFFFFF00-|r 'Default Skin' got renamed to 'WoW Interface'.\n\n|cFFFFFF00v3.4.2 (|cFFFFCC00Dec 01, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a bug with menu desaturation where erase and close buttons stay colored after clicking on it.\n\n|cFFFFFF00-|r Fixed stretch where sometimes after release the window, all exceeded bars shows up and fade in again.\n\n|cFFFFFF00-|r Fixed a bug with the +- buttons on the window's scale option.\n\n|cFFFFFF00-|r Fixed the border for sub menus on mode menu.\n\n|cFFFFFF00v3.4.0 (|cFFFFCC00Nov 29, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed custom displays ignoring 'target' setted.\n\n|cFFFFFF00-|r Fixed plugins showing its icon even when auto hide menus is enabled.\n\n|cFFFFFF00-|r .Updates slash command 'worldboss' now it shows Draenor bosses.\n\n|cFFFFFF00v3.3.0 (|cFFFFCC00Nov 25, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 3D models for the bars in the window. The options are at Appearance -> Rows: Advanced.\n\n|cFFFFFF00-|r Now when showing custom displays, clicking on a bar report what is shown on bar's tooltip.\n\n|cFFFFFF00-|r More fixes for dungeon bosses identification.\n\n|cFFFFFF00-|r Fixed a tooltip bug with Debuff Uptime and Aura & Voidzone displays.\n\n|cFFFFFF00-|r Fixed Player Details Window for friendly fire and damage taken.\n\n|cFFFFFF00-|r Fixed Molten Core Raid Finder version where all bosses was considered trash segments.\n\n|cFFFFFF00v3.2.4 (|cFFFFCC00Nov 19, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r More fixes for dungeon bosses recognition.\n\n|cFFFFFF00-|r Fixes for few errors during combat parser.\n\n|cFFFFFF00v3.2.3 (|cFFFFCC00Nov 18, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Monk's Stagger ability which was counting as damage done.\n\n|cFFFFFF00-|r Added WoD dungeon information, this fixes dungeon bosses being assigned as 'trash cleanup'.\n\n|cFFFFFF00-|r Added more information on API.txt document (is in Details! root folder).\n\n|cFFFFFF00v3.2.1 (|cFFFFCC00Nov 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Custom Displays updated to track WoD potions.\n\n|cFFFFFF00-|r Added Feedback panel at options panel." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.6.15 (|cFFFFCC00Jan 03, 2015|r|cFFFFFF00)|r:\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 combat on garrison training dummies which was being marked as Trash Segment.\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'.\n\n|cFFFFFF00-|r Added Observer mode for Raid Tools: report cooldown/interrupt/death of entire raid only to you in your chat window.\n\n|cFFFFFF00-|r Added new plugin 'Raid Check': tracks raid members checking food, flask and pre-potions usage.\n\n|cFFFFFF00-|r Changed DPS display, now it shows onyl the player's Dps and the Dps difference between him and the top ranked.\n\n|cFFFFFF00-|r Changed Overheal display, now its percentage shows the player's overheal percent.\n\n|cFFFFFF00-|r Player Detail Window now shows the amount of multistrike on normal and critical hits.\n\n|cFFFFFF00-|r Removed skin: 'ElvUI Frame Style BW'.\n\n|cFFFFFF00-|r The tooltip for Scale option under options panel, now shows the real value for the scale.\n\n|cFFFFFF00-|r Fixed Imperator Mar'gok's adds damage taken.\n\n|cFFFFFF00-|r Fixed a problem where multistrike was counting towards critical strike amount.\n\n|cFFFFFF00-|r Fixed death display's report where it was't showing any death.\n\n|cFFFFFF00-|r Fixed a small issue with Encounter Details plugin where sometimes gets a error right after a boss encounter.\n\n|cFFFFFF00-|r Fixed bugs on sending messages to chat for Raid Tools.\n\n\n\n|cFFFFFF00v3.5.1 (|cFFFFCC00Dec 16, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed few accuracy on miss spells.\n\n|cFFFFFF00v3.5.0 (|cFFFFCC00Dec 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed tooltip for Auras and Voidzones, now shows sorted by damage and time.\n\n|cFFFFFF00-|r More fixes for Korgath encounter on Highmaul.\n\n|cFFFFFF00-|r Added slash commands: 'reset' 'config'.\n\n|cFFFFFF00-|r Spell bars on Player Details Window now is painted with the spell spellschool color.\n\n|cFFFFFF00-|r Multistrike doesn't count any more for spell's Minimal Damage.\n\n|cFFFFFF00-|r Resource display got an tooltip which shows what resource is and resource gained per minute.\n\n|cFFFFFF00-|r Clicking on report button when the report window is already open, make it close.\n\n|cFFFFFF00v3.4.7 (|cFFFFCC00Dec 11, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs plugin got updates on Endurance Player Value and few bug fixes.\n\n|cFFFFFF00-|r Max Window Amount options can new be set to 1, before the minimum was 3.\n\n|cFFFFFF00-|r Fixed a problem with friendly fire tooltip where sometimes it wasn't showing up.\n\n|cFFFFFF00-|r Fixed cooldowns tooltip which wasn't showing rounded numbers (49.99 instead of 50).\n\n|cFFFFFF00-|r Fixed Warrior's Shield Block which wasn't being count as a cooldown.\n\n|cFFFFFF00-|r Fixed a problem where sometimes when a hunter pull and reset the boss right after, was causing segments to merge.\n\n|cFFFFFF00v3.4.4 (|cFFFFCC00Dec 05, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a issue with Ko'Ragh boss on Highmaul raid.\n\n|cFFFFFF00-|r Few changes on Bookmark panel.\n\n|cFFFFFF00v3.4.3 (|cFFFFCC00Dec 02, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed 'Simple Gray' skin.\n\n|cFFFFFF00-|r Addde new skin: 'Forced Square'.\n\n|cFFFFFF00-|r 'Default Skin' got renamed to 'WoW Interface'.\n\n|cFFFFFF00v3.4.2 (|cFFFFCC00Dec 01, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a bug with menu desaturation where erase and close buttons stay colored after clicking on it.\n\n|cFFFFFF00-|r Fixed stretch where sometimes after release the window, all exceeded bars shows up and fade in again.\n\n|cFFFFFF00-|r Fixed a bug with the +- buttons on the window's scale option.\n\n|cFFFFFF00-|r Fixed the border for sub menus on mode menu.\n\n|cFFFFFF00v3.4.0 (|cFFFFCC00Nov 29, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed custom displays ignoring 'target' setted.\n\n|cFFFFFF00-|r Fixed plugins showing its icon even when auto hide menus is enabled.\n\n|cFFFFFF00-|r .Updates slash command 'worldboss' now it shows Draenor bosses.\n\n|cFFFFFF00v3.3.0 (|cFFFFCC00Nov 25, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 3D models for the bars in the window. The options are at Appearance -> Rows: Advanced.\n\n|cFFFFFF00-|r Now when showing custom displays, clicking on a bar report what is shown on bar's tooltip.\n\n|cFFFFFF00-|r More fixes for dungeon bosses identification.\n\n|cFFFFFF00-|r Fixed a tooltip bug with Debuff Uptime and Aura & Voidzone displays.\n\n|cFFFFFF00-|r Fixed Player Details Window for friendly fire and damage taken.\n\n|cFFFFFF00-|r Fixed Molten Core Raid Finder version where all bosses was considered trash segments.\n\n|cFFFFFF00v3.2.4 (|cFFFFCC00Nov 19, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r More fixes for dungeon bosses recognition." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index 9c0bf3c9..954abe16 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -532,18 +532,11 @@ gump:Fade (esta_barra, "out") end - --> ele nao come o texto quando a instância esta muito pequena - esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [tabela [3]])) - - if (tabela [3] == "UNKNOW" or tabela [3] == "UNGROUPPLAYER" or tabela [3] == "ENEMY") then - --esta_barra.icone_classe:SetTexture ("Interface\\LFGFRAME\\LFGROLE_BW") - --esta_barra.icone_classe:SetTexCoord (.25, .5, 0, 1) - --esta_barra.icone_classe:SetVertexColor (1, 1, 1) + if (instancia.row_info.texture_class_colors) then + esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [tabela [3]])) + end - --esta_barra.icone_classe:SetTexture ([[Interface\MINIMAP\Minimap_skull_normal]]) - --esta_barra.icone_classe:SetTexCoord (0, 1, 0, 1) - --esta_barra.icone_classe:SetVertexColor (1, 1, 1) - + if (tabela [3] == "UNKNOW" or tabela [3] == "UNGROUPPLAYER" or tabela [3] == "ENEMY") then esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_plus]]) esta_barra.icone_classe:SetTexCoord (0.50390625, 0.62890625, 0, 0.125) esta_barra.icone_classe:SetVertexColor (1, 1, 1) @@ -751,7 +744,9 @@ school_color = _detalhes.school_colors ["unknown"] end - esta_barra.textura:SetVertexColor (_unpack (school_color)) + if (instancia.row_info.texture_class_colors) then + esta_barra.textura:SetVertexColor (_unpack (school_color)) + end esta_barra.icone_classe:SetTexture (icon) esta_barra.icone_classe:SetTexCoord (0, 1, 0, 1) esta_barra.icone_classe:SetVertexColor (1, 1, 1) @@ -1284,7 +1279,7 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex conteudo[myPos]:AtualizaBarra (instancia, barras_container, qual_barra, myPos, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations) --> instância, index, total, valor da 1º barra qual_barra = qual_barra+1 else - + -- /run print (_detalhes:GetInstance(1).barraS[2]) -- vai do 5 ao 1 -- qual barra começa no 1 -- i = 5 até 1 -- player 5 atualiza na barra 1 / player 1 atualiza na barra 5 for i = instancia.barraS[2], instancia.barraS[1], -1 do --> vai atualizar só o range que esta sendo mostrado conteudo[i]:AtualizaBarra (instancia, barras_container, qual_barra, i, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations) --> instância, index, total, valor da 1º barra qual_barra = qual_barra+1 @@ -1497,6 +1492,8 @@ end --> primeiro colocado if (esta_barra.colocacao == 1) then + --aqui + esta_barra.animacao_ignorar = true if (not tabela_anterior or tabela_anterior ~= esta_barra.minha_tabela or forcar) then esta_barra:SetValue (100) diff --git a/classes/classe_energy.lua b/classes/classe_energy.lua index 26d993b6..42510dc2 100644 --- a/classes/classe_energy.lua +++ b/classes/classe_energy.lua @@ -224,7 +224,9 @@ function atributo_energy:AtualizarResources (qual_barra, colocacao, instancia) end actor_class_color_r, actor_class_color_g, actor_class_color_b = self:GetBarColor() - esta_barra.textura:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b) + if (instancia.row_info.texture_class_colors) then + esta_barra.textura:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b) + end if (self.classe == "UNKNOW") then esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_plus]]) diff --git a/classes/classe_others.lua b/classes/classe_others.lua index 563964df..7cdb1b5e 100644 --- a/classes/classe_others.lua +++ b/classes/classe_others.lua @@ -472,7 +472,14 @@ function atributo_misc:DeadAtualizarBarra (morte, qual_barra, colocacao, instanc if (esta_barra.hidden or esta_barra.fading_in or esta_barra.faded) then gump:Fade (esta_barra, "out") end - esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [morte[4]])) + + if (instancia.row_info.texture_class_colors) then + esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [morte[4]])) + end + if (instancia.row_info.texture_background_class_color) then + esta_barra.background:SetVertexColor (_unpack (_detalhes.class_colors [morte[4]])) + end + esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file) esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [morte[4]])) diff --git a/core/control.lua b/core/control.lua index 56f98d8a..535e2649 100644 --- a/core/control.lua +++ b/core/control.lua @@ -428,7 +428,8 @@ if (not _detalhes.tabela_vigente.is_boss) then - if (InstanceType == "party" or InstanceType == "raid") then + local in_instance = IsInInstance() --> garrison returns party as instance type. + if ((InstanceType == "party" or InstanceType == "raid") and in_instance) then _detalhes.tabela_vigente.is_trash = true end diff --git a/core/network.lua b/core/network.lua index 1a252336..b9fdfaba 100644 --- a/core/network.lua +++ b/core/network.lua @@ -409,6 +409,7 @@ end function _detalhes:SendGuildData (type, ...) + if not IsInGuild() then return end --> fix from Tim@WoWInterface _detalhes:SendCommMessage (CONST_DETAILS_PREFIX, _detalhes:Serialize (type, _UnitName ("player"), _GetRealmName(), _detalhes.realversion, ...), "GUILD") end diff --git a/core/parser.lua b/core/parser.lua index 7d19630b..c32a4742 100644 --- a/core/parser.lua +++ b/core/parser.lua @@ -2422,6 +2422,7 @@ --SPELL_PERIODIC_DRAIN --> need research --SPELL_PERIODIC_LEECH --> need research --SPELL_DISPEL_FAILED --> need research + --SPELL_BUILDING_HEAL --> need research function _detalhes:CaptureEnable (capture_type) diff --git a/core/windows.lua b/core/windows.lua index ed877fba..637c445b 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -61,42 +61,81 @@ self.proximo_update = 0 end +-- /run print( _detalhes:GetInstance(1).rowframe:GetParent():GetName()) +-- /run print (DetailsBarra_1_1:GetParent():GetName()) + function _detalhes:fazer_animacoes() + --aqui + + if (self.bars_sort_direction == 2) then - --[ - for i = 2, self.rows_fit_in_window do - --local row_anterior = self.barras [i-1] - local row = self.barras [i] - local row_proxima = self.barras [i+1] - - if (row_proxima and not row.animacao_ignorar) then - local v = row.statusbar:GetValue() - local v_proxima = row_proxima.statusbar:GetValue() + for i = self.rows_fit_in_window - 1, 1, -1 do + local row = self.barras [i] + local row_proxima = self.barras [i-1] - if (v_proxima > v) then - if (row.animacao_fim >= v_proxima) then - row:SetValue (v_proxima) - else - row:SetValue (row.animacao_fim) - row_proxima.statusbar:SetValue (row.animacao_fim) + if (row_proxima and not row.animacao_ignorar) then + local v = row.statusbar:GetValue() + local v_proxima = row_proxima.statusbar:GetValue() + + if (v_proxima > v) then + if (row.animacao_fim >= v_proxima) then + row:SetValue (v_proxima) + else + row:SetValue (row.animacao_fim) + row_proxima.statusbar:SetValue (row.animacao_fim) + end end end end - end - --]] - - for i = 2, self.rows_fit_in_window do - local row = self.barras [i] - if (row.animacao_ignorar) then - row.animacao_ignorar = nil - if (row.tem_animacao) then - row.tem_animacao = false - row:SetScript ("OnUpdate", nil) + + for i = 1, self.rows_fit_in_window -1 do + local row = self.barras [i] + if (row.animacao_ignorar) then + row.animacao_ignorar = nil + if (row.tem_animacao) then + row.tem_animacao = false + row:SetScript ("OnUpdate", nil) + end + else + if (row.animacao_fim ~= row.animacao_fim2) then + _detalhes:AnimarBarra (row, row.animacao_fim) + row.animacao_fim2 = row.animacao_fim + end end - else - if (row.animacao_fim ~= row.animacao_fim2) then - _detalhes:AnimarBarra (row, row.animacao_fim) - row.animacao_fim2 = row.animacao_fim + end + else + for i = 2, self.rows_fit_in_window do + local row = self.barras [i] + local row_proxima = self.barras [i+1] + + if (row_proxima and not row.animacao_ignorar) then + local v = row.statusbar:GetValue() + local v_proxima = row_proxima.statusbar:GetValue() + + if (v_proxima > v) then + if (row.animacao_fim >= v_proxima) then + row:SetValue (v_proxima) + else + row:SetValue (row.animacao_fim) + row_proxima.statusbar:SetValue (row.animacao_fim) + end + end + end + end + + for i = 2, self.rows_fit_in_window do + local row = self.barras [i] + if (row.animacao_ignorar) then + row.animacao_ignorar = nil + if (row.tem_animacao) then + row.tem_animacao = false + row:SetScript ("OnUpdate", nil) + end + else + if (row.animacao_fim ~= row.animacao_fim2) then + _detalhes:AnimarBarra (row, row.animacao_fim) + row.animacao_fim2 = row.animacao_fim + end end end end diff --git a/gumps/janela_options.lua b/gumps/janela_options.lua index ccef7e45..b08919b7 100644 --- a/gumps/janela_options.lua +++ b/gumps/janela_options.lua @@ -2297,10 +2297,10 @@ function window:CreateFrame17() _detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance) end local typeCombatAlpha = { - {value = 1, label = "No Changes", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_03", texcoord = {1, 0, 0, 1}}, - {value = 2, label = "While In Combat", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}, - {value = 3, label = "While Out of Combat", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}, - {value = 4, label = "While Out of a Group", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}} + {value = 1, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_1"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_03", texcoord = {1, 0, 0, 1}, color = "gray"}, + {value = 2, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_2"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}, + {value = 3, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_3"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}, + {value = 4, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_4"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}} } local buildTypeCombatAlpha = function() return typeCombatAlpha @@ -2411,12 +2411,12 @@ function window:CreateFrame17() {"hideInCombatAnchor", 1, true}, {"combatAlphaLabel", 2}, {"hideOnCombatAlphaLabel", 3}, + {"menuAlphaAnchorLabel", 4, true}, {"alphaSwitchLabel", 5}, - {"menuOnEnterLabel", 6}, - {"menuOnLeaveLabel", 7}, - {"alphaIconsTooLabel", 8}, - + {"alphaIconsTooLabel", 6}, + {"menuOnEnterLabel", 7}, + {"menuOnLeaveLabel", 8}, } window:arrange_menu (frame17, left_side, x, -90) @@ -6340,8 +6340,6 @@ function window:CreateFrame7() --auto hide menus - --text anchor on options menu - --g:NewLabel (frame7, _, "$parentAutoHideLabelAnchor", "autoHideLabel", Loc ["STRING_OPTIONS_MENU_AUTOHIDE_ANCHOR"], "GameFontNormal") --left g:NewLabel (frame7, _, "$parentAutoHideLeftMenuLabel", "autoHideLeftMenuLabel", Loc ["STRING_OPTIONS_MENU_AUTOHIDE_LEFT"], "GameFontHighlightLeft") diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index ee0499b4..1e9cd237 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -922,7 +922,6 @@ local function move_janela (baseframe, iniciando, instancia) for _, esta_instancia in _ipairs (_detalhes.tabela_instancias) do if (not esta_instancia:IsAtiva() and esta_instancia.iniciada) then esta_instancia:ResetaGump() - --aqui gump:Fade (esta_instancia.baseframe, "in", 0.2) gump:Fade (esta_instancia.baseframe.cabecalho.ball, "in", 0.2) @@ -3972,12 +3971,10 @@ function _detalhes:SetWindowAlphaForInteract (alpha) else --> saiu if (self.combat_changes_alpha) then --> combat alpha - --self.baseframe:SetAlpha (self.combat_changes_alpha) self:InstanceAlpha (self.combat_changes_alpha) self:SetIconAlpha (self.combat_changes_alpha, nil, true) self.rowframe:SetAlpha (self.combat_changes_alpha) --alpha do combate é absoluta else - --self.baseframe:SetAlpha (alpha) self:InstanceAlpha (alpha) self:SetIconAlpha (alpha, nil, true) @@ -5392,13 +5389,9 @@ function _detalhes:ChangeSkin (skin_name) _detalhes:OpenOptionsWindow (self) end - --> check if is interacting + --> auto interact if (self.menu_alpha.enabled) then - if (_detalhes.in_combat) then - self:SetWindowAlphaForCombat (true) - else - self:SetWindowAlphaForCombat() - end + self:SetMenuAlpha (nil, nil, nil, nil, self.is_interacting) end --> set the scale @@ -5780,7 +5773,6 @@ function _detalhes:SetMenuAlpha (enabled, onenter, onleave, ignorebars, interact self.menu_alpha.ignorebars = ignorebars if (not enabled) then - --> aqui esta mandando setar a alpha do baseframe self.baseframe:SetAlpha (1) self.rowframe:SetAlpha (1) self:InstanceAlpha (self.color[4])