diff --git a/boot.lua b/boot.lua index 84184d65..cdd61098 100644 --- a/boot.lua +++ b/boot.lua @@ -8,9 +8,9 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.userversion = "v1.10.0" - _detalhes.version = "Alpha 013" - _detalhes.realversion = 14 + _detalhes.userversion = "v1.11.0" + _detalhes.version = "Alpha 015" + _detalhes.realversion = 15 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --> initialization stuff @@ -200,6 +200,7 @@ do local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0") SharedMedia:Register ("statusbar", "Details D'ictum", [[Interface\AddOns\Details\images\bar4]]) SharedMedia:Register ("statusbar", "Details D'ictum (reverse)", [[Interface\AddOns\Details\images\bar4_reverse]]) + SharedMedia:Register ("statusbar", "Details Serenity", [[Interface\AddOns\Details\images\bar_serenity]]) --> global 'vardump' for dump table contents over chat panel function vardump (t) diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index 36fec74e..676e8a1d 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -1036,11 +1036,24 @@ function atributo_damage:AtualizaBarra (instancia, barras_container, qual_barra, esta_porcentagem = _math_floor ((self.custom/instancia.top) * 100) --> determina qual o tamanho da barra else if (sub_atributo == 1) then --> mostrando damage done - esta_barra.texto_direita:SetText (_detalhes:ToK (damage_total) .." ".. div_abre .. _math_floor (dps) .. ", ".. _cstr ("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + dps = _math_floor (dps) + if (_detalhes.ps_abbreviation == 2) then + dps = _detalhes:ToK (dps) + elseif (_detalhes.ps_abbreviation == 3) then + dps = _detalhes:ToK2 (dps) + end + esta_barra.texto_direita:SetText (_detalhes:ToK (damage_total) .." ".. div_abre .. dps .. ", ".. _cstr ("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita esta_porcentagem = _math_floor ((damage_total/instancia.top) * 100) --> determina qual o tamanho da barra elseif (sub_atributo == 2) then --> mostrando dps - esta_barra.texto_direita:SetText (_cstr("%.1f", dps) .." ".. div_abre .. _detalhes:ToK (damage_total) .. ", ".._cstr("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + dps = _math_floor (dps) + if (_detalhes.ps_abbreviation == 2) then + esta_barra.texto_direita:SetText (_detalhes:ToK (dps) .. " " .. div_abre .. _detalhes:ToK (damage_total) .. ", " .. _cstr ("%.1f", porcentagem) .. "%" .. div_fecha) --seta o texto da direita + elseif (_detalhes.ps_abbreviation == 3) then + esta_barra.texto_direita:SetText (_detalhes:ToK2 (dps) .. " " .. div_abre .. _detalhes:ToK (damage_total) .. ", " .. _cstr ("%.1f", porcentagem) .. "%" .. div_fecha) --seta o texto da direita + else + esta_barra.texto_direita:SetText (_cstr ("%.1f", dps) .. " " .. div_abre .. _detalhes:ToK (damage_total) .. ", " .. _cstr ("%.1f", porcentagem) .. "%" .. div_fecha) --seta o texto da direita + end esta_porcentagem = _math_floor ((dps/instancia.top) * 100) --> determina qual o tamanho da barra elseif (sub_atributo == 3) then --> mostrando damage taken @@ -2011,7 +2024,7 @@ function atributo_damage:MontaInfoDamageDone() end barra.texto_esquerdo:SetText (index..instancia.divisores.colocacao..tabela[1]) --seta o texto da esqueda - barra.texto_direita:SetText (tabela[2] .." ".. instancia.divisores.abre .._cstr("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita + barra.texto_direita:SetText (_detalhes:comma_value (tabela[2]) .." ".. instancia.divisores.abre .. _cstr ("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita --barra.icone:SetTexture (tabela[4]) --CLASSE @@ -2144,7 +2157,7 @@ function atributo_damage:MontaDetalhesFriendlyFire (nome, barra) end barra.texto_esquerdo:SetText (index..instancia.divisores.colocacao..tabela[4]) --seta o texto da esqueda - barra.texto_direita:SetText (tabela[2] .." ".. instancia.divisores.abre .._cstr("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita + barra.texto_direita:SetText (_detalhes:comma_value (tabela[2]) .. " " .. instancia.divisores.abre .. _cstr ("%.1f", tabela[3]) .. "%" .. instancia.divisores.fecha) --seta o texto da direita barra.icone:SetTexture (tabela[5]) @@ -2206,7 +2219,7 @@ function atributo_damage:MontaDetalhesEnemy (spellid, barra) _detalhes:name_space_info (barra) if (spell.total > 0) then - barra.texto_direita:SetText (tabela[2] .." (".. _cstr("%.1f", tabela[2] / spell.total * 100) .."%)") --seta o texto da direita + barra.texto_direita:SetText (_detalhes:comma_value (tabela[2]) .." (".. _cstr("%.1f", tabela[2] / spell.total * 100) .."%)") --seta o texto da direita else barra.texto_direita:SetText (tabela[2] .." (0%)") --seta o texto da direita end @@ -2295,7 +2308,7 @@ function atributo_damage:MontaDetalhesDamageTaken (nome, barra) barra.texto_esquerdo:SetText (index..instancia.divisores.colocacao..tabela[4]) --seta o texto da esqueda _detalhes:name_space_info (barra) - barra.texto_direita:SetText (tabela[2] .." ".. instancia.divisores.abre .._cstr("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita + barra.texto_direita:SetText (_detalhes:comma_value (tabela[2]) .." ".. instancia.divisores.abre .._cstr("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita barra.icone:SetTexture (tabela[5]) diff --git a/classes/classe_heal.lua b/classes/classe_heal.lua index f5196d7d..288d2c48 100644 --- a/classes/classe_heal.lua +++ b/classes/classe_heal.lua @@ -416,8 +416,20 @@ function atributo_heal:AtualizaBarra (instancia, barras_container, qual_barra, l local esta_porcentagem if ((_detalhes.time_type == 2 and self.grupo) or (not _detalhes:CaptureGet ("heal") and not _detalhes:CaptureGet ("aura")) or not self.shadow) then - hps = healing_total / combat_time - self.last_hps = hps + if (not self.shadow and combat_time == 0) then + local p = _detalhes.tabela_vigente (2, self.nome) + if (p) then + local t = p:Tempo() + hps = healing_total / t + self.last_hps = hps + else + hps = healing_total / combat_time + self.last_hps = hps + end + else + hps = healing_total / combat_time + self.last_hps = hps + end else if (not self.on_hold) then hps = healing_total/self:Tempo() --calcula o dps deste objeto @@ -438,11 +450,27 @@ function atributo_heal:AtualizaBarra (instancia, barras_container, qual_barra, l esta_porcentagem = _math_floor ((self.custom/instancia.top) * 100) --> determina qual o tamanho da barra else if (sub_atributo == 1) then --> mostrando healing done - esta_barra.texto_direita:SetText (_detalhes:ToK (healing_total) .." ".. div_abre .. _math_floor (hps) .. ", ".. _cstr ("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + + hps = _math_floor (hps) + if (_detalhes.ps_abbreviation == 2) then + hps = _detalhes:ToK (hps) + elseif (_detalhes.ps_abbreviation == 3) then + hps = _detalhes:ToK2 (hps) + end + + esta_barra.texto_direita:SetText (_detalhes:ToK (healing_total) .." ".. div_abre .. hps .. ", ".. _cstr ("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita esta_porcentagem = _math_floor ((healing_total/instancia.top) * 100) --> determina qual o tamanho da barra elseif (sub_atributo == 2) then --> mostrando hps - esta_barra.texto_direita:SetText (_cstr("%.1f", hps) .." ".. div_abre .. _detalhes:ToK (healing_total) .. ", ".._cstr("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + + hps = _math_floor (hps) + if (_detalhes.ps_abbreviation == 2) then + esta_barra.texto_direita:SetText (_detalhes:ToK (hps) .." ".. div_abre .. _detalhes:ToK (healing_total) .. ", ".._cstr("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + elseif (_detalhes.ps_abbreviation == 2) then + esta_barra.texto_direita:SetText (_detalhes:ToK2 (hps) .." ".. div_abre .. _detalhes:ToK (healing_total) .. ", ".._cstr("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + else + esta_barra.texto_direita:SetText (_cstr("%.1f", hps) .." ".. div_abre .. _detalhes:ToK (healing_total) .. ", ".._cstr("%.1f", porcentagem).."%" .. div_fecha) --seta o texto da direita + end esta_porcentagem = _math_floor ((hps/instancia.top) * 100) --> determina qual o tamanho da barra elseif (sub_atributo == 3) then --> mostrando overall @@ -1220,6 +1248,7 @@ function atributo_heal:MontaInfoHealingDone() barra.minha_tabela = self barra.show = tabela[1] + barra.spellid = self.nome barra:Show() if (self.detalhes and self.detalhes == barra.show) then @@ -1265,7 +1294,7 @@ function atributo_heal:MontaInfoHealingDone() barra.nome_inimigo = tabela [1] -- no lugar do spell id colocar o que? - --barra.spellid = tabela[5] + barra.spellid = tabela[5] barra:Show() --if (self.detalhes and self.detalhes == barra.spellid) then @@ -1398,7 +1427,7 @@ function atributo_heal:MontaDetalhesHealingTaken (nome, barra) end barra.texto_esquerdo:SetText (index..instancia.divisores.colocacao..tabela[4]) --seta o texto da esqueda - barra.texto_direita:SetText (tabela[2] .." ".. instancia.divisores.abre .._cstr("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita + barra.texto_direita:SetText (_detalhes:comma_value (tabela[2]) .." ".. instancia.divisores.abre .._cstr("%.1f", tabela[3]) .."%".. instancia.divisores.fecha) --seta o texto da direita barra.icone:SetTexture (tabela[5]) diff --git a/classes/classe_instancia.lua b/classes/classe_instancia.lua index e8fa1be5..44211ab0 100644 --- a/classes/classe_instancia.lua +++ b/classes/classe_instancia.lua @@ -266,8 +266,13 @@ end --gump:Fade (self.baseframe.cabecalho.atributo_icon, _unpack (_detalhes.windows_fade_out)) --gump:Fade (self.baseframe.cabecalho.ball, _unpack (_detalhes.windows_fade_out)) --gump:Fade (self.baseframe, _unpack (_detalhes.windows_fade_out)) + + if (self.hide_icon) then + gump:Fade (self.baseframe.cabecalho.atributo_icon, 1) + else + gump:Fade (self.baseframe.cabecalho.atributo_icon, 0) + end - --gump:Fade (self.baseframe.cabecalho.atributo_icon, 0) gump:Fade (self.baseframe.cabecalho.ball, 0) gump:Fade (self.baseframe, 0) diff --git a/core/parser.lua b/core/parser.lua index a3680eb6..1c012beb 100644 --- a/core/parser.lua +++ b/core/parser.lua @@ -2740,6 +2740,13 @@ end end + function _detalhes:IsInCache (playerguid) + return raid_members_cache [playerguid] + end + function _detalhes:GetParserPlayerCache() + return raid_members_cache + end + --serach key: ~cache function _detalhes:UpdateParserGears() diff --git a/core/plugins.lua b/core/plugins.lua index 555d7f55..c11789eb 100644 --- a/core/plugins.lua +++ b/core/plugins.lua @@ -52,8 +52,10 @@ PluginObject.__icon = PluginIcon or [[Interface\ICONS\Trade_Engineering]] PluginObject.real_name = PluginAbsoluteName + local saved_table + if (PluginType ~= "STATUSBAR") then - local saved_table = _detalhes.plugin_database [PluginAbsoluteName] + saved_table = _detalhes.plugin_database [PluginAbsoluteName] if (not saved_table) then saved_table = {enabled = true, author = Author or "--------"} _detalhes.plugin_database [PluginAbsoluteName] = saved_table diff --git a/core/plugins_toolbar.lua b/core/plugins_toolbar.lua index 750c4e94..e3207130 100644 --- a/core/plugins_toolbar.lua +++ b/core/plugins_toolbar.lua @@ -7,6 +7,7 @@ local _detalhes = _G._detalhes local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) + local SharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0") ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --> local pointers @@ -16,15 +17,15 @@ --> details api functions --> create a button which will be displayed on tooltip - function _detalhes.ToolBar:NewPluginToolbarButton (func, icon, tooltip, w, h, name) + function _detalhes.ToolBar:NewPluginToolbarButton (func, icon, pluginname, tooltip, w, h, framename) --> random name if nameless - if (not name) then - name = "DetailsToolbarButton" .. math.random (1, 100000) + if (not framename) then + framename = "DetailsToolbarButton" .. math.random (1, 100000) end --> create button from template - local button = CreateFrame ("button", name, _detalhes.listener, "DetailsToolbarButton") + local button = CreateFrame ("button", framename, _detalhes.listener, "DetailsToolbarButton") --> sizes if (w) then @@ -43,9 +44,11 @@ button:SetPushedTexture (icon) button:SetDisabledTexture (icon) button:SetHighlightTexture (icon, "ADD") + button.__icon = icon + button.__name = pluginname --> blizzard built-in animation - local FourCornerAnimeFrame = CreateFrame ("frame", name.."Blink", button, "IconIntroAnimTemplate") + local FourCornerAnimeFrame = CreateFrame ("frame", framename.."Blink", button, "IconIntroAnimTemplate") FourCornerAnimeFrame:SetPoint ("center", button) FourCornerAnimeFrame:SetWidth (w or 14) FourCornerAnimeFrame:SetHeight (w or 14) @@ -104,6 +107,8 @@ end end + _detalhes.ToolBar:ReorganizeIcons (lastIcon) + return true end @@ -136,8 +141,19 @@ end if (button.tooltip) then + GameCooltip:Reset() - GameCooltip:AddLine (button.tooltip) + + --GameCooltip:SetOption ("FixedWidth", 200) + GameCooltip:SetOption ("ButtonsYMod", -5) + GameCooltip:SetOption ("YSpacingMod", -5) + GameCooltip:SetOption ("IgnoreButtonAutoHeight", true) + GameCooltip:SetColor (1, 0.5, 0.5, 0.5, 0.5) + + --[[title]] GameCooltip:AddLine (button.__name, nil, 1, "orange", nil, 12, SharedMedia:Fetch ("font", "Friz Quadrata TT")) + GameCooltip:AddIcon (button.__icon, 1, 1, 16, 16) + ----[[desc]] GameCooltip:AddLine (button.tooltip) + GameCooltip:ShowCooltip (button, "tooltip") end end @@ -206,9 +222,9 @@ ThisButton:Show() LastIcon = ThisButton end - + elseif (instance.plugins_grow_direction == 1) then --> left direction - + if (instance.consolidate) then LastIcon = instance.consolidateButtonTexture else diff --git a/core/util.lua b/core/util.lua index 7337111d..dbb2fc0e 100644 --- a/core/util.lua +++ b/core/util.lua @@ -55,6 +55,16 @@ end return _string_format ("%.1f", numero) end + function _detalhes:ToK2 (numero) + if (numero > 999999) then + return _string_format ("%.2f", numero/1000000) .. "M" + elseif (numero > 99999) then + return _math_floor (numero/1000) .. "K" + elseif (numero > 999) then + return _string_format ("%.1f", (numero/1000)) .. "K" + end + return _string_format ("%.1f", numero) + end --> short numbers no numbers after comma function _detalhes:ToK0 (numero) if (numero > 1000000) then diff --git a/framework/picture.lua b/framework/picture.lua index 48d853a6..c0cddcf6 100644 --- a/framework/picture.lua +++ b/framework/picture.lua @@ -135,6 +135,14 @@ local ImageMetaFunctions = {} _object:SetDesaturated (false) end end + --> texcoords + local smember_texcoord = function (_object, _value) + if (_value) then + _object:SetTexCoord (unpack (_value)) + else + _object:SetTexCoord (0, 1, 0, 1) + end + end local set_members_function_index = { ["show"] = smember_show, @@ -143,6 +151,7 @@ local ImageMetaFunctions = {} ["width"] = smember_width, ["height"] = smember_height, ["texture"] = smember_texture, + ["texcoord"] = smember_texcoord, ["color"] = smember_color, ["blackwhite"] = smember_desaturated, } diff --git a/functions/savedata.lua b/functions/savedata.lua index 4665abe9..bcbd0265 100644 --- a/functions/savedata.lua +++ b/functions/savedata.lua @@ -50,6 +50,7 @@ end _detalhes_database.window_clamp = _detalhes.window_clamp --> text sizes _detalhes_database.font_sizes = _detalhes.font_sizes + _detalhes_database.ps_abbreviation = _detalhes.ps_abbreviation -- max segments _detalhes_database.segments_amount = _detalhes.segments_amount _detalhes_database.segments_amount_to_save = _detalhes.segments_amount_to_save @@ -254,6 +255,7 @@ end --]] _detalhes.clear_graphic = _detalhes_database.clear_graphic --> text sizes _detalhes.font_sizes = _detalhes_database.font_sizes + _detalhes.ps_abbreviation = _detalhes_database.ps_abbreviation -- row animation _detalhes.use_row_animations = _detalhes_database.use_row_animations _detalhes.animate_scroll = _detalhes_database.animate_scroll @@ -414,6 +416,8 @@ function _detalhes:ApplyConfigDataOnLoad() self.font_sizes = self.font_sizes or {menus = 10} self.minimap = self.minimap or {hide = false, radius = 160, minimapPos = 220} + self.ps_abbreviation = self.ps_abbreviation or 1 + self.plugin_database = self.plugin_database or {} --> tutorial diff --git a/functions/spells.lua b/functions/spells.lua index c6a2689b..6d163945 100644 --- a/functions/spells.lua +++ b/functions/spells.lua @@ -1,29 +1,156 @@ do local _detalhes = _G._detalhes - + _detalhes.ClassSpellList = { --death knight + + [108194] = "DEATHKNIGHT", -- Asphyxiate + [50977] = "DEATHKNIGHT", -- Death Gate + [108199] = "DEATHKNIGHT", -- Gorefiend's Grasp + [108201] = "DEATHKNIGHT", -- Desecrated Ground + [48265] = "DEATHKNIGHT", -- Unholy Presence + [77606] = "DEATHKNIGHT", -- Dark Simulacrum + [61999] = "DEATHKNIGHT", -- Raise Ally + [108196] = "DEATHKNIGHT", --Death Siphon + [47541] = "DEATHKNIGHT", -- Death Coil + [48721] = "DEATHKNIGHT", -- Blood Boil + [42650] = "DEATHKNIGHT", -- Army of the Dead + [130736] = "DEATHKNIGHT", -- Soul Reaper + [45524] = "DEATHKNIGHT", -- Chains of Ice + [57330] = "DEATHKNIGHT", -- Horn of Winter + [45462] = "DEATHKNIGHT", -- Plague Strike + [85948] = "DEATHKNIGHT", -- Festering Strike + [56815] = "DEATHKNIGHT", -- Rune Strike + [63560] = "DEATHKNIGHT", -- Dark Transformation + [108200] = "DEATHKNIGHT", -- Remorseless Winter + [49222] = "DEATHKNIGHT", -- Bone Shield + [45477] = "DEATHKNIGHT", -- Icy Touch + [43265] = "DEATHKNIGHT", -- Death and Decay + [77575] = "DEATHKNIGHT", -- Outbreak + [51271] = "DEATHKNIGHT", -- Pillar of Frost + [115989] = "DEATHKNIGHT", -- Unholy Blight + [48792] = "DEATHKNIGHT", -- Icebound Fortitude + [55050] = "DEATHKNIGHT", -- Heart Strike + [55233] = "DEATHKNIGHT", -- Vampiric Blood + [49576] = "DEATHKNIGHT", -- Death Grip + [119975] = "DEATHKNIGHT", -- Conversion + [56222] = "DEATHKNIGHT", -- Dark Command + [114866] = "DEATHKNIGHT", -- Soul Reaper + [73975] = "DEATHKNIGHT", -- Necrotic Strike + [45529] = "DEATHKNIGHT", -- Blood Tap + [130735] = "DEATHKNIGHT", -- Soul Reaper + [50842] = "DEATHKNIGHT", -- Pestilence + [48743] = "DEATHKNIGHT", -- Death Pact + [47528] = "DEATHKNIGHT", -- Mind Freeze + [123693] = "DEATHKNIGHT", -- Plague Leech + [3714] = "DEATHKNIGHT", -- Path of Frost + [48263] = "DEATHKNIGHT", -- Blood Presence + [49039] = "DEATHKNIGHT", -- Lichborne + [49028] = "DEATHKNIGHT", -- Dancing Rune Weapon + [47568] = "DEATHKNIGHT", -- Empower Rune Weapon + [96268] = "DEATHKNIGHT", -- Death's Advance + [49016] = "DEATHKNIGHT", -- Unholy Frenzy + [49206] = "DEATHKNIGHT", -- Summon Gargoyle + [48266] = "DEATHKNIGHT", -- Frost Presence + [45902] = "DEATHKNIGHT", -- Blood Strike [77535] = "DEATHKNIGHT", --Blood Shield (heal) [45470] = "DEATHKNIGHT", --Death Strike (heal) [53365] = "DEATHKNIGHT", --Unholy Strength (heal) [48707] = "DEATHKNIGHT", -- Anti-Magic Shell (heal) [48982] = "DEATHKNIGHT", --rune tap - --> DK Frost [49020] = "DEATHKNIGHT", --obliterate [49143] = "DEATHKNIGHT", --frost strike [55095] = "DEATHKNIGHT", --frost fever [55078] = "DEATHKNIGHT", --blood plague [49184] = "DEATHKNIGHT", --howling blast - --> DK Blood [49998] = "DEATHKNIGHT", --death strike - --> DK Unholy [55090] = "DEATHKNIGHT",--scourge strike [47632] = "DEATHKNIGHT",--death coil --druid - --> Druid Cat + + [80965] = "DRUID", -- Skull Bash + [16689] = "DRUID", -- Nature's Grasp + [102417] = "DRUID", -- Wild Charge + [5229] = "DRUID", -- Enrage + [78675] = "DRUID", -- Solar Beam + [102351] = "DRUID", -- Cenarion Ward + [9005] = "DRUID", -- Pounce + [114282] = "DRUID", -- Treant Form + [5215] = "DRUID", -- Prowl + [52610] = "DRUID", -- Savage Roar + [22570] = "DRUID", -- Maim + [102401] = "DRUID", -- Wild Charge + [33831] = "DRUID", -- Force of Nature + [102355] = "DRUID", -- Faerie Swarm + [102706] = "DRUID", -- Force of Nature + [16914] = "DRUID", -- Hurricane + [2908] = "DRUID", -- Soothe + [62078] = "DRUID", -- Swipe + [102793] = "DRUID", -- Ursol's Vortex + [106996] = "DRUID", -- Astral Storm + [6785] = "DRUID", -- Ravage + [106898] = "DRUID", -- Stampeding Roar + [33891] = "DRUID", -- Incarnation: Tree of Life + [102359] = "DRUID", -- Mass Entanglement + [108293] = "DRUID", -- Heart of the Wild + [5211] = "DRUID", -- Mighty Bash + [102795] = "DRUID", -- Bear Hug + [108291] = "DRUID", -- Heart of the Wild + [18562] = "DRUID", --Swiftmend + [106922] = "DRUID", -- Might of Ursoc + [132158] = "DRUID", -- Nature's Swiftness + [33763] = "DRUID", -- Lifebloom + [1126] = "DRUID", -- Mark of the Wild + [6807] = "DRUID", -- Maul + [33745] = "DRUID", -- Lacerate + [145205] = "DRUID", -- Wild Mushroom + [77761] = "DRUID", -- Stampeding Roar + [102791] = "DRUID", -- Wild Mushroom: Bloom + [16953] = "DRUID", -- Primal Fury + [102693] = "DRUID", -- Force of Nature + [145518] = "DRUID", -- Genesis + [22812] = "DRUID", -- Barkskin + [770] = "DRUID", -- Faerie Fire + [106951] = "DRUID", -- Berserk + [124974] = "DRUID", -- Nature's Vigil + [105697] = "DRUID", -- Virmen's Bite + [5225] = "DRUID", -- Track Humanoids + [102280] = "DRUID", -- Displacer Beast + [102543] = "DRUID", -- Incarnation: King of the Jungle + [1850] = "DRUID", -- Dash + [77764] = "DRUID", -- Stampeding Roar + [22568] = "DRUID", -- Ferocious Bite + [779] = "DRUID", -- Swipe + [147349] = "DRUID", -- Wild Mushroom + [77758] = "DRUID", -- Thrash + [108294] = "DRUID", -- Heart of the Wild + [106830] = "DRUID", -- Thrash + [108292] = "DRUID", -- Heart of the Wild + [768] = "DRUID", -- Cat Form + [127538] = "DRUID", -- Savage Roar + [61336] = "DRUID", -- Survival Instincts + [114236] = "DRUID", -- Shred! + [146323] = "DRUID", -- Inward Contemplation + [22842] = "DRUID", -- Frenzied Regeneration + [108238] = "DRUID", -- Renewal + [16979] = "DRUID", -- Wild Charge + [50334] = "DRUID", -- Berserk + [102558] = "DRUID", -- Incarnation: Son of Ursoc + [6795] = "DRUID", -- Growl + [48505] = "DRUID", -- Starfall + [78674] = "DRUID", -- Starsurge + [102560] = "DRUID", -- Incarnation: Chosen of Elune + [112071] = "DRUID", -- Celestial Alignment + [61391] = "DRUID", -- Typhoon + [24858] = "DRUID", -- Moonkin Form + [136086] = "DRUID", -- Archer's Grace + [127663] = "DRUID", -- Astral Communion + [49376] = "DRUID", -- Wild Charge + [62606] = "DRUID", -- Savage Defense + [80964] = "DRUID", -- Skull Bash [1822] = "DRUID", --rake [1079] = "DRUID", --rip [5221] = "DRUID", --shred @@ -35,13 +162,11 @@ do [16959] = "DRUID", --primal fury (energy gain) [5217] = "DRUID", --tiger's fury (energy gain) [68285] = "DRUID", --leader of the pack (mana) - --> Druid Balance [5176] = "DRUID", --wrath [93402] = "DRUID", --sunfire [2912] = "DRUID", --starfire [8921] = "DRUID", --moonfire [81070] = "DRUID", --eclipse - --> Druid Resto [29166] = "DRUID", --innervate [774] = "DRUID", --rejuvenation [44203] = "DRUID", --tranquility @@ -55,6 +180,58 @@ do [50464] = "DRUID", --nourish --hunter + [19503] = "HUNTER",-- Scatter Shot HUNTER + [83245] = "HUNTER",-- Call Pet 5 HUNTER + [51753] = "HUNTER",-- Camouflage HUNTER + [13165] = "HUNTER",-- Aspect of the Hawk HUNTER + [109259] = "HUNTER",-- Powershot HUNTER + [53271] = "HUNTER",-- Master's Call HUNTER + [20736] = "HUNTER",-- Distracting Shot HUNTER + [1543] = "HUNTER",-- Flare HUNTER + [3674] = "HUNTER",-- Black Arrow + [117050] = "HUNTER",-- Glaive Toss + [1978] = "HUNTER",-- Serpent Sting + [781] = "HUNTER",-- Disengage + [34026] = "HUNTER",-- Kill Command + [82948] = "HUNTER",-- Snake Trap + [2643] = "HUNTER",-- Multi-Shot + [109248] = "HUNTER",-- Binding Shot + [149365] = "HUNTER",-- Dire Beast + [120679] = "HUNTER",-- Dire Beast + [82726] = "HUNTER",-- Fervor + [3045] = "HUNTER",-- Rapid Fire + [883] = "HUNTER",-- Call Pet 1 + [19574] = "HUNTER",-- Bestial Wrath + [148467] = "HUNTER",-- Deterrence + [109304] = "HUNTER",-- Exhilaration + [82939] = "HUNTER",-- Explosive Trap + [19386] = "HUNTER",-- Wyvern Sting + [131894] = "HUNTER",-- A Murder of Crows + [13159] = "HUNTER",-- Aspect of the Pack + [109260] = "HUNTER",-- Aspect of the Iron Hawk + [121818] = "HUNTER",-- Stampede + [19434] = "HUNTER",-- Aimed Shot + [82941] = "HUNTER",-- Ice Trap + [83242] = "HUNTER",-- Call Pet 2 + [120697] = "HUNTER",-- Lynx Rush + [56641] = "HUNTER",-- Steady Shot + [82692] = "HUNTER",-- Focus Fire + [34490] = "HUNTER",-- Silencing Shot + [53209] = "HUNTER",-- Chimera Shot + [82928] = "HUNTER",-- Aimed Shot! + [83243] = "HUNTER",-- Call Pet 3 + [5116] = "HUNTER",-- Concussive Shot + [1130] = "HUNTER",--'s Mark + [34477] = "HUNTER",-- Misdirection + [19263] = "HUNTER",-- Deterrence + [147362] = "HUNTER",-- Counter Shot + [19801] = "HUNTER",-- Tranquilizing Shot + [82654] = "HUNTER",-- Widow Venom + [2641] = "HUNTER",-- Dismiss Pet + [83244] = "HUNTER",-- Call Pet 4 + [5118] = "HUNTER",-- Aspect of the Cheetah + [120360] = "HUNTER",-- Barrage + [19577] = "HUNTER",-- Intimidation [131900] = "HUNTER",--a murder of crows [118253] = "HUNTER",--serpent sting [77767] = "HUNTER",--cobra shot @@ -64,7 +241,49 @@ do [53351] = "HUNTER",--kill shot --mage - --> Mage Frost + [108839] = "MAGE",-- Ice Floes + [7302] = "MAGE",-- Frost Armor + [31661] = "MAGE",-- Dragon's Breath + [53140] = "MAGE",-- Teleport: Dalaran + [11417] = "MAGE",-- Portal: Orgrimmar + [42955] = "MAGE",-- Conjure Refreshment + [44457] = "MAGE",-- Living Bomb + [1953] = "MAGE",-- Blink + [108843] = "MAGE",-- Blazing Speed + [131078] = "MAGE",-- Icy Veins + [12043] = "MAGE",-- Presence of Mind + [108978] = "MAGE",-- Alter Time + [55342] = "MAGE",-- Mirror Image + [84714] = "MAGE",-- Frozen Orb + [45438] = "MAGE",-- Ice Block + [115610] = "MAGE",-- Temporal Shield + [110960] = "MAGE",-- Greater Invisibility + [110959] = "MAGE",-- Greater Invisibility + [11129] = "MAGE",-- Combustion + [11958] = "MAGE",-- Cold Snap + [61316] = "MAGE",-- Dalaran Brilliance + [112948] = "MAGE",-- Frost Bomb + [2139] = "MAGE",-- Counterspell + [80353] = "MAGE",-- Time Warp + [2136] = "MAGE",-- Fire Blast + [7268] = "MAGE",-- Arcane Missiles + [111264] = "MAGE",-- Ice Ward + [114923] = "MAGE",-- Nether Tempest + [2120] = "MAGE",-- Flamestrike + [44425] = "MAGE",-- Arcane Barrage + [12042] = "MAGE",-- Arcane Power + [1459] = "MAGE",-- Arcane Brilliance + [127140] = "MAGE",-- Alter Time + [116011] = "MAGE",-- Rune of Power + [116014] = "MAGE",-- Rune of Power + [132627] = "MAGE",-- Teleport: Vale of Eternal Blossoms + [31687] = "MAGE",-- Summon Water Elemental + [3567] = "MAGE",-- Teleport: Orgrimmar + [30449] = "MAGE",-- Spellsteal + [44572] = "MAGE",-- Deep Freeze + [113724] = "MAGE",-- Ring of Frost + [132626] = "MAGE",-- Portal: Vale of Eternal Blossoms + [12472] = "MAGE",-- Icy Veins [116] = "MAGE",--frost bolt [30455] = "MAGE",--ice lance [84721] = "MAGE",--frozen orb @@ -74,24 +293,97 @@ do [44614] = "MAGE",--forstfire bolt [42208] = "MAGE",--blizzard [11426] = "MAGE",--Ice Barrier (heal) - --> Mage Fire [11366] = "MAGE",--pyroblast [133] = "MAGE",--fireball [108853] = "MAGE",--infernoblast [2948] = "MAGE",--scorch - --> Mage Arcane [30451] = "MAGE",--arcane blase [12051] = "MAGE",--evocation --monk - --> Monk + + [115176] = "MONK", -- Zen Meditation cooldown + [115203] = "MONK", -- Fortifying Brew + [115213] = "MONK", -- Avert Harm + + [124081] = "MONK", -- Zen Sphere + [125355] = "MONK", -- Healing Sphere + [122278] = "MONK", -- Dampen Harm + [115450] = "MONK", -- Detox + + [121827] = "MONK", -- Roll + [115315] = "MONK", -- Summon Black Ox Statue + [115399] = "MONK", -- Chi Brew + [101643] = "MONK", -- Transcendence + [115546] = "MONK", -- Provoke + [115294] = "MONK", -- Mana Tea + [116680] = "MONK", -- Thunder Focus Tea + [115070] = "MONK", -- Stance of the Wise Serpent + [115069] = "MONK", -- Stance of the Sturdy Ox + + [119381] = "MONK", -- Leg Sweep + [115695] = "MONK", -- Jab + [137639] = "MONK", -- Storm, Earth, and Fire + [115073] = "MONK", -- Spinning Fire Blossom + [115008] = "MONK", -- Chi Torpedo + [121828] = "MONK", -- --Chi Torpedo + [115180] = "MONK", -- Dizzying Haze + [123986] = "MONK", -- Chi Burst + [130654] = "MONK", -- Chi Burst + [148135] = "MONK", -- Chi Burst + [119392] = "MONK", -- Charging Ox Wave + [116095] = "MONK", -- Disable + [115687] = "MONK", -- Jab + [117993] = "MONK", -- Chi Torpedo + [100780] = "MONK", -- Jab + [116740] = "MONK", -- Tigereye Brew + [124682] = "MONK", -- Enveloping Mist + [101545] = "MONK", -- Flying Serpent Kick + [109132] = "MONK", -- Roll + [122470] = "MONK", -- Touch of Karma + [117418] = "MONK", -- Fists of Fury + [113656] = "MONK", -- Fists of Fury + [115698] = "MONK", -- Jab + [115460] = "MONK", -- Healing Sphere + [115098] = "MONK", -- Chi Wave + [115464] = "MONK", -- Healing Sphere + [115151] = "MONK", -- Renewing Mist + [117952] = "MONK", -- Crackling Jade Lightning + [122783] = "MONK", -- Diffuse Magic + [115078] = "MONK", -- Paralysis + [116705] = "MONK", -- Spear Hand Strike + [123904] = "MONK", -- Invoke Xuen, the White Tiger + [116709] = "MONK", -- Spear Hand Strike + [147489] = "MONK", -- Expel Harm + [101546] = "MONK", -- Spinning Crane Kick + [115313] = "MONK", -- Summon Jade Serpent Statue + [135920] = "MONK", -- Gift of the Serpent + [116841] = "MONK", -- Tiger's Lust + [116694] = "MONK", -- Surging Mist + [116847] = "MONK", -- Rushing Jade Wind + [108557] = "MONK", -- Jab + [115181] = "MONK", -- Breath of Fire + [121253] = "MONK", -- Keg Smash + [124506] = "MONK", -- Gift of the Ox + [124503] = "MONK", -- Gift of the Ox + [115288] = "MONK", -- Energizing Brew + [115308] = "MONK", -- Elusive Brew + [116781] = "MONK", -- Legacy of the White Tiger + [115921] = "MONK", -- Legacy of the Emperor + [115693] = "MONK", -- Jab + [124507] = "MONK", -- Gift of the Ox + [119582] = "MONK", -- Purifying Brew + [115080] = "MONK", -- Touch of Death + [135914] = "MONK", -- Healing Sphere + [126892] = "MONK", -- Zen Pilgrimage + [116849] = "MONK", -- Life Cocoon + [116844] = "MONK", -- Ring of Peace [107428] = "MONK", --rising sun kick [100784] = "MONK", --blackout kick [132467] = "MONK", --Chi wave [107270] = "MONK", --spinning crane kick [100787] = "MONK", --tiger palm [123761] = "MONK", --mana tea - --> Mistwave [119611] = "MONK", --renewing mist [115310] = "MONK", --revival [116670] = "MONK", --uplift @@ -101,17 +393,60 @@ do [132120] = "MONK", -- enveloping mist [132463] = "MONK", -- shi wave [117895] = "MONK", --eminence (statue) - --> drunk monk [115295] = "MONK", --guard [115072] = "MONK", --expel harm --paladin - --> Paladin Retri + + [31850] = "PALADIN", -- Ardent Defender + [31842] = "PALADIN", -- Divine Favor + [1044] = "PALADIN", -- Hand of Freedom + [114039] = "PALADIN", -- Hand of Purity + [4987] = "PALADIN", -- Cleanse + [136494] = "PALADIN", -- Word of Glory + [54428] = "PALADIN", -- Divine Plea + [7328] = "PALADIN", -- Redemption + [116467] = "PALADIN", -- Consecration + [31801] = "PALADIN", -- Seal of Truth + [20165] = "PALADIN", -- Seal of Insight + [20473] = "PALADIN",-- Holy Shock + [114158] = "PALADIN",-- Light's Hammer + [85673] = "PALADIN",-- Word of Glory + [85499] = "PALADIN",-- Speed of Light + [84963] = "PALADIN",-- Inquisition + [31884] = "PALADIN",-- Avenging Wrath + [24275] = "PALADIN",-- Hammer of Wrath + [114165] = "PALADIN",-- Holy Prism + [20925] = "PALADIN",-- Sacred Shield + [53563] = "PALADIN",-- Beacon of Light + [633] = "PALADIN",-- Lay on Hands + [88263] = "PALADIN",-- Hammer of the Righteous + [53595] = "PALADIN",-- Hammer of the Righteous + [53600] = "PALADIN",-- Shield of the Righteous + [26573] = "PALADIN",-- Consecration + [119072] = "PALADIN",-- Holy Wrath + [105593] = "PALADIN",-- Fist of Justice + [114163] = "PALADIN",-- Eternal Flame + [62124] = "PALADIN",-- Reckoning + [121783] = "PALADIN",-- Emancipate + [98057] = "PALADIN",-- Grand Crusader + [642] = "PALADIN",-- Divine Shield + [122032] = "PALADIN",-- Exorcism + [20217] = "PALADIN",-- Blessing of Kings + [96231] = "PALADIN",-- Rebuke + [105809] = "PALADIN",-- Holy Avenger + [25780] = "PALADIN",-- Righteous Fury + [115750] = "PALADIN",-- Blinding Light + [31821] = "PALADIN",-- Devotion Aura + [53385] = "PALADIN",-- Divine Storm + [20154] = "PALADIN",-- Seal of Righteousness + [19740] = "PALADIN",-- Blessing of Might + [148039] = "PALADIN",-- Sacred Shield + [82326] = "PALADIN",-- Divine Light [35395] = "PALADIN",--cruzade strike [879] = "PALADIN",--exorcism [85256] = "PALADIN",--templar's verdict [20167] = "PALADIN",--seal of insight (mana) - --> Paladin Protection [31935] = "PALADIN",--avenger's shield [20271] = "PALADIN", --judgment [35395] = "PALADIN", --cruzader strike @@ -119,7 +454,6 @@ do [31803] = "PALADIN", --censure [65148] = "PALADIN", --Sacred Shield [20167] = "PALADIN", --Seal of Insight - --> holy [86273] = "PALADIN", --illuminated healing [85222] = "PALADIN", --light of dawn [53652] = "PALADIN", --beacon of light @@ -129,8 +463,62 @@ do [19750] = "PALADIN", --flash of light --priest + [19236] = "PRIEST", -- Desperate Prayer + [47788] = "PRIEST", -- Guardian Spirit + [81206] = "PRIEST", -- Chakra: Sanctuary + [62618] = "PRIEST", -- Power Word: Barrier + [32375] = "PRIEST", -- Mass Dispel + [32546] = "PRIEST", -- Binding Heal + [126135] = "PRIEST", -- Lightwell + [81209] = "PRIEST", -- Chakra: Chastise + [81208] = "PRIEST", -- Chakra: Serenity + [2006] = "PRIEST", -- Resurrection + [1706] = "PRIEST", -- Levitate + [73510] = "PRIEST", -- Mind Spike + [127632] = "PRIEST", -- Cascade + [108921] = "PRIEST", -- Psyfiend + [88625] = "PRIEST", -- Holy Word: Chastise + [121135] = "PRIEST", -- Cascade + [122121] = "PRIEST", -- Divine Star + [110744] = "PRIEST", -- Divine Star + [8122] = "PRIEST", -- Psychic Scream + [81700] = "PRIEST", -- Archangel + [123258] = "PRIEST", -- Power Word: Shield + [48045] = "PRIEST", -- Mind Sear + [49821] = "PRIEST", -- Mind Sear + [123040] = "PRIEST", -- Mindbender + [121536] = "PRIEST", -- Angelic Feather + [121557] = "PRIEST", -- Angelic Feather + [88685] = "PRIEST", -- Holy Word: Sanctuary + [88684] = "PRIEST", -- Holy Word: Serenity + [33076] = "PRIEST", -- Prayer of Mending + [32379] = "PRIEST", -- Shadow Word: Death + [129176] = "PRIEST", -- Shadow Word: Death + [586] = "PRIEST", -- Fade + [120517] = "PRIEST", -- Halo + [64901] = "PRIEST", -- Hymn of Hope + [64843] = "PRIEST", -- Divine Hymn + [64844] = "PRIEST", -- Divine Hymn + [34433] = "PRIEST", -- Shadowfiend + [120644] = "PRIEST", -- Halo + [15487] = "PRIEST", -- Silence + [89485] = "PRIEST", -- Inner Focus + [109964] = "PRIEST", -- Spirit Shell + [129197] = "PRIEST", -- Mind Flay (Insanity) + [112833] = "PRIEST", -- Spectral Guise + [47750] = "PRIEST", -- Penance + [33206] = "PRIEST", -- Pain Suppression + [15286] = "PRIEST", -- Vampiric Embrace + [588] = "PRIEST", -- Inner Fire + [21562] = "PRIEST", -- Power Word: Fortitude + [73413] = "PRIEST", -- Inner Will + [10060] = "PRIEST", -- Power Infusion + [2050] = "PRIEST", -- Heal + [15473] = "PRIEST", -- Shadowform + [108920] = "PRIEST", -- Void Tendrils + [47585] = "PRIEST", -- Dispersion + [123259] = "PRIEST", -- Prayer of Mending [34650] = "PRIEST", --mana leech (pet) - --> shadow priest [589] = "PRIEST", --shadow word: pain [34914] = "PRIEST", --vampiric touch [34919] = "PRIEST", --vampiric touch (mana) @@ -139,13 +527,11 @@ do [15290] = "PRIEST",-- Vampiric Embrace [127626] = "PRIEST",--devouring plague (heal) [2944] = "PRIEST",--devouring plague (damage) - --> disc priest [585] = "PRIEST", --smite [47666] = "PRIEST", --penance [14914] = "PRIEST", --holy fire [81751] = "PRIEST", --atonement [47753] = "PRIEST", --divine aegis - --> holy priest [33110] = "PRIEST", --prayer of mending [77489] = "PRIEST", --mastery echo of light [596] = "PRIEST", --prayer of healing @@ -158,10 +544,49 @@ do [88686] = "PRIEST", --santuary [17] = "PRIEST", --power word: shield [64904] = "PRIEST", --hymn of hope - --> talent [129250] = "PRIEST", --power word: solace --rogue + [74001] = "ROGUE", -- Combat Readiness + [14183] = "ROGUE", -- Premeditation + [108211] = "ROGUE", -- Leeching Poison + [5761] = "ROGUE", -- Mind-numbing Poison + [8679] = "ROGUE", -- Wound Poison + + [137584] = "ROGUE", -- Shuriken Toss + [137585] = "ROGUE", -- Shuriken Toss Off-hand + [1833] = "ROGUE", -- Cheap Shot + [121733] = "ROGUE", -- Throw + [1776] = "ROGUE", -- Gouge + [108212] = "ROGUE", -- Burst of Speed + [27576] = "ROGUE", -- Mutilate Off-Hand + [1329] = "ROGUE", -- Mutilate + [5171] = "ROGUE", -- Slice and Dice + [2983] = "ROGUE", -- Sprint + [1966] = "ROGUE", -- Feint + [36554] = "ROGUE", -- Shadowstep + [31224] = "ROGUE", -- Cloak of Shadows + [1784] = "ROGUE", -- Stealth + [84617] = "ROGUE", -- Revealing Strike + [13750] = "ROGUE", -- Adrenaline Rush + [121471] = "ROGUE", -- Shadow Blades + [121473] = "ROGUE", -- Shadow Blade + [1752] = "ROGUE", -- Sinister Strike + [51690] = "ROGUE", -- Killing Spree + [121474] = "ROGUE", -- Shadow Blade Off-hand + [1766] = "ROGUE", -- Kick + [76577] = "ROGUE", -- Smoke Bomb + [5277] = "ROGUE", -- Evasion + [137619] = "ROGUE", -- Marked for Death + [8647] = "ROGUE", -- Expose Armor + [79140] = "ROGUE", -- Vendetta + [51713] = "ROGUE", -- Shadow Dance + [2823] = "ROGUE", -- Deadly Poison + [115191] = "ROGUE", -- Stealth + [108215] = "ROGUE", -- Paralytic Poison + [14185] = "ROGUE", -- Preparation + [2094] = "ROGUE", -- Blind + [121411] = "ROGUE", -- Crimson Tempest [53] = "ROGUE", --backstab [8680] = "ROGUE", --wound pouson [2098] = "ROGUE", --eviscerate @@ -184,7 +609,51 @@ do [51637] = "ROGUE", --venomous vim (energy) --shaman - --> Shaman Elemental + [51886] = "SHAMAN", -- Cleanse Spirit + [98008] = "SHAMAN", -- Spirit Link Totem + [8177] = "SHAMAN", -- Grounding Totem + [8143] = "SHAMAN", -- Tremor Totem + [108273] = "SHAMAN", -- Windwalk Totem + [51514] = "SHAMAN", -- Hex + [73682] = "SHAMAN", -- Unleash Frost + [8033] = "SHAMAN", -- Frostbrand Weapon + [114074] = "SHAMAN", -- Lava Beam + [120668] = "SHAMAN", --Stormlash Totem + [2894] = "SHAMAN", -- Fire Elemental Totem + [2825] = "SHAMAN", -- Bloodlust + [114049] = "SHAMAN", -- Ascendance + [73680] = "SHAMAN", -- Unleash Elements + [5394] = "SHAMAN", -- Healing Stream Totem + [108280] = "SHAMAN", -- Healing Tide Totem + [3599] = "SHAMAN", -- Searing Totem + [73920] = "SHAMAN", -- Healing Rain + [2645] = "SHAMAN", -- Ghost Wolf + [16166] = "SHAMAN", -- Elemental Mastery + [108281] = "SHAMAN", -- Ancestral Guidance + [108270] = "SHAMAN", -- Stone Bulwark Totem + [108285] = "SHAMAN", -- Call of the Elements + [115356] = "SHAMAN", -- Stormblast + [60103] = "SHAMAN", -- Lava Lash + [51533] = "SHAMAN", -- Feral Spirit + [17364] = "SHAMAN", -- Stormstrike + [16188] = "SHAMAN", -- Ancestral Swiftness + [2062] = "SHAMAN", -- Earth Elemental Totem + [8024] = "SHAMAN", -- Flametongue Weapon + [51485] = "SHAMAN", -- Earthgrab Totem + [331] = "SHAMAN", -- Healing Wave + [61882] = "SHAMAN", -- Earthquake + [52127] = "SHAMAN", -- Water Shield + [77472] = "SHAMAN", -- Greater Healing Wave + [108269] = "SHAMAN", -- Capacitor Totem + [79206] = "SHAMAN", -- Spiritwalker's Grace + [57994] = "SHAMAN", -- Wind Shear + [108271] = "SHAMAN", -- Astral Shift + [30823] = "SHAMAN", --istic Rage + [77130] = "SHAMAN", -- Purify Spirit + [58875] = "SHAMAN", -- Spirit Walk + [36936] = "SHAMAN", -- Totemic Recall + [51730] = "SHAMAN", -- Earthliving Weapon + [8056] = "SHAMAN", -- Frost Shock [88765] = "SHAMAN", --rolling thunder (mana) [51490] = "SHAMAN", --thunderstorm (mana) [82987] = "SHAMAN", --telluric currents glyph (mana) @@ -195,7 +664,6 @@ do [403] = "SHAMAN", --lightning bolt [45284] = "SHAMAN", --lightning bolt [421] = "SHAMAN", --chain lightining - --> Shaman Melee [32175] = "SHAMAN", --stormstrike [25504] = "SHAMAN", --windfury [8042] = "SHAMAN", --earthshock @@ -204,7 +672,6 @@ do [73683] = "SHAMAN", --unleash flame [51522] = "SHAMAN", --primal wisdom (mana) [63375] = "SHAMAN", --primal wisdom (mana) - --> Shaman Resto [114942] = "SHAMAN", --healing tide [73921] = "SHAMAN", --healing rain [1064] = "SHAMAN", --chain heal @@ -215,16 +682,74 @@ do [8004] = "SHAMAN", --healing surge --warlock + [80240] = "WARLOCK", -- Havoc + [112921] = "WARLOCK", -- Summon Abyssal + [48020] = "WARLOCK", -- Demonic Circle: Teleport + [111397] = "WARLOCK", -- Blood Horror + [112869] = "WARLOCK", -- Summon Observer + [1454] = "WARLOCK", -- Life Tap + [112868] = "WARLOCK", -- Summon Shivarra + [112869] = "WARLOCK", -- Summon Observer + [120451] = "WARLOCK", -- Flames of Xoroth + [29893] = "WARLOCK", -- Create Soulwell + [114189] = "WARLOCK", -- Health Funnel + [112866] = "WARLOCK", -- Summon Fel Imp + [108683] = "WARLOCK", -- Fire and Brimstone + [688] = "WARLOCK", -- Summon Imp + [112092] = "WARLOCK", -- Shadow Bolt + [113861] = "WARLOCK", -- Dark Soul: Knowledge + [103967] = "WARLOCK", -- Carrion Swarm + [112870] = "WARLOCK", -- Summon Wrathguard + [104316] = "WARLOCK", -- Imp Swarm + [17962] = "WARLOCK", -- Conflagrate + [108359] = "WARLOCK", -- Dark Regeneration + [110913] = "WARLOCK", -- Dark Bargain + [105174] = "WARLOCK", -- Hand of Gul'dan + [697] = "WARLOCK", -- Summon Voidwalker + [6201] = "WARLOCK", -- Create Healthstone + [146739] = "WARLOCK", -- Corruption + [109151] = "WARLOCK", -- Demonic Leap + [104773] = "WARLOCK", -- Unending Resolve + [103958] = "WARLOCK", -- Metamorphosis + [119678] = "WARLOCK", -- Soul Swap + [6229] = "WARLOCK", -- Twilight Ward + [74434] = "WARLOCK", -- Soulburn + [30283] = "WARLOCK", -- Shadowfury + [113860] = "WARLOCK", -- Dark Soul: Misery + [108503] = "WARLOCK", -- Grimoire of Sacrifice + [104232] = "WARLOCK", -- Rain of Fire + [6353] = "WARLOCK", -- Soul Fire + [689] = "WARLOCK", -- Drain Life + [17877] = "WARLOCK", -- Shadowburn + [113858] = "WARLOCK", -- Dark Soul: Instability + [1490] = "WARLOCK", -- Curse of the Elements + [114635] = "WARLOCK", -- Ember Tap + [27243] = "WARLOCK", -- Seed of Corruption + [131623] = "WARLOCK", -- Twilight Ward + [6789] = "WARLOCK", -- Mortal Coil + [111400] = "WARLOCK", -- Burning Rush + [124916] = "WARLOCK", -- Chaos Wave + [1120] = "WARLOCK", -- Drain Soul + [109773] = "WARLOCK", -- Dark Intent + [112927] = "WARLOCK", -- Summon Terrorguard + [1122] = "WARLOCK", -- Summon Infernal + [108416] = "WARLOCK", -- Sacrificial Pact + [5484] = "WARLOCK", -- Howl of Terror + [29858] = "WARLOCK", -- Soulshatter + [18540] = "WARLOCK", -- Summon Doomguard + [89420] = "WARLOCK", -- Drain Life + [20707] = "WARLOCK", -- Soulstone + [132413] = "WARLOCK", -- Shadow Bulwark + [109466] = "WARLOCK", -- Curse of Enfeeblement + [48018] = "WARLOCK", -- Demonic Circle: Summon [77799] = "WARLOCK", --fel flame [63106] = "WARLOCK", --siphon life [1454] = "WARLOCK", --life tap - --> warlock affliction [103103] = "WARLOCK", --malefic grasp [980] = "WARLOCK", --agony [30108] = "WARLOCK", --unstable affliction [172] = "WARLOCK", --corruption [48181] = "WARLOCK", --haunt - --> warlock destruction [29722] = "WARLOCK", --incenerate [348] = "WARLOCK", --Immolate [116858] = "WARLOCK", --Chaos Bolt @@ -232,18 +757,64 @@ do [108686] = "WARLOCK", --immolate [108685] = "WARLOCK", --conflagrate [104233] = "WARLOCK", --rain of fire - --> warlock demo [103964] = "WARLOCK", --touch os chaos [686] = "WARLOCK", --shadow bolt [114328] = "WARLOCK", --shadow bolt glyph [140719] = "WARLOCK", --hellfire [104027] = "WARLOCK", --soul fire [603] = "WARLOCK", --doom - --> talents [108371] = "WARLOCK", --Harvest life - --warrior + [2565] = "WARRIOR", -- Shield Block + [2457] = "WARRIOR", -- Battle Stance + [12328] = "WARRIOR", -- Sweeping Strikes + [114192] = "WARRIOR", -- Mocking Banner + [12323] = "WARRIOR", -- Piercing Howl + [122475] = "WARRIOR", -- Throw + [845] = "WARRIOR", -- Cleave + [5246] = "WARRIOR", -- Intimidating Shout + [7386] = "WARRIOR", -- Sunder Armor + [107566] = "WARRIOR", -- Staggering Shout + [86346] = "WARRIOR", -- Colossus Smash + [18499] = "WARRIOR", -- Berserker Rage + [107570] = "WARRIOR", -- Storm Bolt + [1680] = "WARRIOR", -- Whirlwind + [85384] = "WARRIOR", -- Raging Blow Off-Hand + [85288] = "WARRIOR", -- Raging Blow + [100] = "WARRIOR", -- Charge + [7384] = "WARRIOR", -- Overpower + [23881] = "WARRIOR", -- Bloodthirst + [118000] = "WARRIOR", -- Dragon Roar + [50622] = "WARRIOR", -- Bladestorm + [46924] = "WARRIOR", -- Bladestorm + [6673] = "WARRIOR", -- Battle Shout + [103840] = "WARRIOR", -- Impending Victory + [5308] = "WARRIOR", -- Execute + [57755] = "WARRIOR", -- Heroic Throw + [871] = "WARRIOR", -- Shield Wall + [97462] = "WARRIOR", -- Rallying Cry + [118038] = "WARRIOR", -- Die by the Sword + [114203] = "WARRIOR", -- Demoralizing Banner + [52174] = "WARRIOR", -- Heroic Leap + [1719] = "WARRIOR", -- Recklessness + [114207] = "WARRIOR", -- Skull Banner + [1715] = "WARRIOR", -- Hamstring + [107574] = "WARRIOR", -- Avatar + [46968] = "WARRIOR", -- Shockwave + [6343] = "WARRIOR", -- Thunder Clap + [12292] = "WARRIOR", -- Bloodbath + [64382] = "WARRIOR", -- Shattering Throw + [114028] = "WARRIOR", -- Mass Spell Reflection + [55694] = "WARRIOR", -- Enraged Regeneration + [6552] = "WARRIOR", -- Pummel + [6572] = "WARRIOR", -- Revenge + [112048] = "WARRIOR", -- Shield Barrier + [23920] = "WARRIOR", -- Spell Reflection + [12975] = "WARRIOR", -- Last Stand + [355] = "WARRIOR", -- Taunt + [102060] = "WARRIOR", -- Disrupting Shout + [100130] = "WARRIOR", --wild strike [96103] = "WARRIOR", --raging blow [12294] = "WARRIOR", --mortal strike @@ -412,12 +983,16 @@ do --["SHAMAN"] = {}, [108270] = {60, 5, 1}, -- Stone Bulwark Totem + [108280] = {180, 12}, -- Healing Tide Totem + [98008] = {180, 6}, -- Spirit Link Totem --["WARLOCK"] = {108416, 6229}, [108416] = {60, 20, 1}, -- Sacrificial Pact 1 = self [6229] = {30, 30, 1}, -- Twilight Ward 1 = self --["WARRIOR"] = {}, + [114203] = {180, 15}, -- Demoralizing Banner + [114028] = {60, 5}, -- Mass Spell Reflection } _detalhes.DefensiveCooldownSpells = { @@ -497,14 +1072,881 @@ do [23920] = {25, 5}, -- Spell Reflection [114030] = {120, 12}, -- Vigilance [118038] = {120, 8}, -- Die by the Sword + [2565] = {90, 6}, -- Shield Block ["WARRIOR"] = {871, 12975, 23920, 114030, 118038} } + + _detalhes.HarmfulSpells = { + + --death knight + [49020] = true, -- obliterate + [49143] = true, -- frost strike + [55095] = true, -- frost fever + [55078] = true, -- blood plague + [49184] = true, -- howling blast + [49998] = true, -- death strike + [55090] = true, -- scourge strike + [47632] = true, -- death coil + [108196] = true, --Death Siphon + [47541] = true, -- Death Coil + [48721] = true, -- Blood Boil + [42650] = true, -- Army of the Dead + [130736] = true, -- Soul Reaper + [45524] = true, -- Chains of Ice + [45462] = true, -- Plague Strike + [85948] = true, -- Festering Strike + [56815] = true, -- Rune Strike + [108200] = true, -- Remorseless Winter + [45477] = true, -- Icy Touch + [43265] = true, -- Death and Decay + [77575] = true, -- Outbreak + [115989] = true, -- Unholy Blight + [55050] = true, -- Heart Strike + [114866] = true, -- Soul Reaper + [73975] = true, -- Necrotic Strike + [130735] = true, -- Soul Reaper + [50842] = true, -- Pestilence + [45902] = true, -- Blood Strike + [108194] = true, -- Asphyxiate + [77606] = true, -- Dark Simulacrum + + --druid + [80965] = true, -- Skull Bashs + [78675] = true, -- Solar Beam + [22570] = true, -- Maim + [33831] = true, -- Force of Nature + [102706] = true, -- Force of Nature + [102355] = true, -- Faerie Swarm + [16914] = true, -- Hurricane + [2908] = true, -- Soothe + [62078] = true, -- Swipe + [106996] = true, -- Astral Storm + [6785] = true, -- Ravage + [33891] = true, -- Incarnation: Tree of Life + [102359] = true, -- Mass Entanglement + [5211] = true, -- Mighty Bash + [102795] = true, -- Bear Hug + [1822] = true, --rake + [1079] = true, --rip + [5221] = true, --shred + [33876] = true, --mangle + [102545] = true, --ravage! + [5176] = true, --wrath + [93402] = true, --sunfire + [2912] = true, --starfire + [8921] = true, --moonfire + [6807] = true, -- Maul + [33745] = true, -- Lacerate + [770] = true, -- Faerie Fire + [22568] = true, -- Ferocious Bite + [779] = true, -- Swipe + [77758] = true, -- Thrash + [106830] = true, -- Thrash + [114236] = true, -- Shred! + [48505] = true, -- Starfall + [78674] = true, -- Starsurge + [80964] = true, -- Skull Bash + + --hunter + [19503] = true,-- Scatter Shot + [109259] = true,-- Powershot + [20736] = true,-- Distracting Shot + [131900] = true, --a murder of crows + [118253] = true, --serpent sting + [77767] = true, --cobra shot + [3044] = true, --arcane shot + [53301] = true, --explosive shot + [120361] = true, --barrage + [53351] = true, --kill shot + [3674] = true,-- Black Arrow + [117050] = true,-- Glaive Toss + [1978] = true,-- Serpent Sting + [34026] = true,-- Kill Command + [2643] = true,-- Multi-Shot + [109248] = true,-- Binding Shot + [149365] = true,-- Dire Beast + [120679] = true,-- Dire Beast + [3045] = true,-- Rapid Fire + [19574] = true,-- Bestial Wrath + [19386] = true,-- Wyvern Sting + [19434] = true,-- Aimed Shot + [120697] = true,-- Lynx Rush + [56641] = true,-- Steady Shot + [34490] = true,-- Silencing Shot + [53209] = true,-- Chimera Shot + [82928] = true,-- Aimed Shot! + [5116] = true,-- Concussive Shot + [147362] = true,-- Counter Shot + [19801] = true,-- Tranquilizing Shot + [82654] = true,-- Widow Venom + + --mage + [116] = true, --frost bolt + [30455] = true, --ice lance + [84721] = true, --frozen orb + [1449] = true, --arcane explosion + [113092] = true, --frost bomb + [115757] = true, --frost nova + [44614] = true, --forstfire bolt + [42208] = true, --blizzard + [11366] = true, --pyroblast + [133] = true, --fireball + [108853] = true, --infernoblast + [2948] = true, --scorch + [30451] = true, --arcane blase + [44457] = true,-- Living Bomb + [84714] = true,-- Frozen Orb + [11129] = true,-- Combustion + [112948] = true,-- Frost Bomb + [2139] = true,-- Counterspell + [2136] = true,-- Fire Blast + [7268] = true,-- Arcane Missiles + [114923] = true,-- Nether Tempest + [2120] = true,-- Flamestrike + [44425] = true,-- Arcane Barrage + [44572] = true,-- Deep Freeze + [113724] = true,-- Ring of Frost + [31661] = true,-- Dragon's Breath + + --monk + [107428] = true, --rising sun kick + [100784] = true, --blackout kick + [132467] = true, --Chi wave + [107270] = true, --spinning crane kick + [100787] = true, --tiger palm + [132463] = true, -- shi wave + [100780] = true, -- Jab + [115698] = true, -- Jab + [108557] = true, -- Jab + [115693] = true, -- Jab + [101545] = true, -- Flying Serpent Kick + [122470] = true, -- Touch of Karma + [117418] = true, -- Fists of Fury + [113656] = true, -- Fists of Fury + [115098] = true, -- Chi Wave + [117952] = true, -- Crackling Jade Lightning + [115078] = true, -- Paralysis + [116705] = true, -- Spear Hand Strike + [116709] = true, -- Spear Hand Strike + [101546] = true, -- Spinning Crane Kick + [116847] = true, -- Rushing Jade Wind + [115181] = true, -- Breath of Fire + [121253] = true, -- Keg Smash + [124506] = true, -- Gift of the Ox + [124503] = true, -- Gift of the Ox + [124507] = true, -- Gift of the Ox + [115080] = true, -- Touch of Death + [119381] = true, -- Leg Sweep + [115695] = true, -- Jab + [137639] = true, -- Storm, Earth, and Fire + [115073] = true, -- Spinning Fire Blossom + [115008] = true, -- Chi Torpedo + [121828] = true, -- --Chi Torpedo + [115180] = true, -- Dizzying Haze + [123986] = true, -- Chi Burst + [130654] = true, -- Chi Burst + [148135] = true, -- Chi Burst + [119392] = true, -- Charging Ox Wave + [116095] = true, -- Disable + [115687] = true, -- Jab + [117993] = true, -- Chi Torpedo + + --paladin + [35395] = true,--cruzade strike + [879] = true,--exorcism + [85256] = true,--templar's verdict + [31935] = true,--avenger's shield + [20271] = true, --judgment + [35395] = true, --cruzader strike + [81297] = true, --consacration + [31803] = true, --censure + [20473] = true,-- Holy Shock + [114158] = true,-- Light's Hammer + [24275] = true,-- Hammer of Wrath + [88263] = true,-- Hammer of the Righteous + [53595] = true,-- Hammer of the Righteous + [53600] = true,-- Shield of the Righteous + [26573] = true,-- Consecration + [119072] = true,-- Holy Wrath + [105593] = true,-- Fist of Justice + [122032] = true,-- Exorcism + [96231] = true,-- Rebuke + [115750] = true,-- Blinding Light + [53385] = true,-- Divine Storm + [116467] = true, -- Consecration + [31801] = true, -- Seal of Truth + [20165] = true, -- Seal of Insight + + --priest + [589] = true, --shadow word: pain + [34914] = true, --vampiric touch + [15407] = true, --mind flay + [8092] = true, --mind blast + [15290] = true,-- Vampiric Embrace + [2944] = true,--devouring plague (damage) + [585] = true, --smite + [47666] = true, --penance + [14914] = true, --holy fire + [48045] = true, -- Mind Sear + [49821] = true, -- Mind Sear + [32379] = true, -- Shadow Word: Death + [129176] = true, -- Shadow Word: Death + [120517] = true, -- Halo + [120644] = true, -- Halo + [15487] = true, -- Silence + [129197] = true, -- Mind Flay (Insanity) + [108920] = true, -- Void Tendrils + [73510] = true, -- Mind Spike + [127632] = true, -- Cascade + [108921] = true, -- Psyfiend + [88625] = true, -- Holy Word: Chastise + + --rogue + [53] = true, --backstab + [2098] = true, --eviscerate + [51723] = true, --fan of knifes + [111240] = true, --dispatch + [703] = true, --garrote + [1943] = true, --rupture + [114014] = true, --shuriken toss + [16511] = true, --hemorrhage + [89775] = true, --hemorrhage + [8676] = true, --amcush + [5374] = true, --mutilate + [32645] = true, --envenom + [1943] = true, --rupture + [27576] = true, -- Mutilate Off-Hand + [1329] = true, -- Mutilate + [84617] = true, -- Revealing Strike + [1752] = true, -- Sinister Strike + [121473] = true, -- Shadow Blade + [121474] = true, -- Shadow Blade Off-hand + [1766] = true, -- Kick + [8647] = true, -- Expose Armor + [2094] = true, -- Blind + [121411] = true, -- Crimson Tempest + [137584] = true, -- Shuriken Toss + [137585] = true, -- Shuriken Toss Off-hand + [1833] = true, -- Cheap Shot + [121733] = true, -- Throw + [1776] = true, -- Gouge + + --shaman + [51505] = true, --lava burst + [8050] = true, --flame shock + [117014] = true, --elemental blast + [403] = true, --lightning bolt + [45284] = true, --lightning bolt + [421] = true, --chain lightining + [32175] = true, --stormstrike + [25504] = true, --windfury + [8042] = true, --earthshock + [26364] = true, --lightning shield + [117014] = true, --elemental blast + [73683] = true, --unleash flame + [115356] = true, -- Stormblast + [60103] = true, -- Lava Lash + [17364] = true, -- Stormstrike + [61882] = true, -- Earthquake + [57994] = true, -- Wind Shear + [8056] = true, -- Frost Shock + [114074] = true, -- Lava Beam + + --warlock + [77799] = true, --fel flame + [63106] = true, --siphon life + [103103] = true, --malefic grasp + [980] = true, --agony + [30108] = true, --unstable affliction + [172] = true, --corruption + [48181] = true, --haunt + [29722] = true, --incenerate + [348] = true, --Immolate + [116858] = true, --Chaos Bolt + [114654] = true, --incinerate + [108686] = true, --immolate + [108685] = true, --conflagrate + [104233] = true, --rain of fire + [103964] = true, --touch os chaos + [686] = true, --shadow bolt + [114328] = true, --shadow bolt glyph + [140719] = true, --hellfire + [104027] = true, --soul fire + [603] = true, --doom + [108371] = true, --Harvest life + [17962] = true, -- Conflagrate + [105174] = true, -- Hand of Gul'dan + [146739] = true, -- Corruption + [30283] = true, -- Shadowfury + [104232] = true, -- Rain of Fire + [6353] = true, -- Soul Fire + [689] = true, -- Drain Life + [17877] = true, -- Shadowburn + [1490] = true, -- Curse of the Elements + [27243] = true, -- Seed of Corruption + [6789] = true, -- Mortal Coil + [124916] = true, -- Chaos Wave + [1120] = true, -- Drain Soul + [5484] = true, -- Howl of Terror + [89420] = true, -- Drain Life + [109466] = true, -- Curse of Enfeeblement + [112092] = true, -- Shadow Bolt + [103967] = true, -- Carrion Swarm + + --warrior + [100130] = true, --wild strike + [96103] = true, --raging blow + [12294] = true, --mortal strike + [1464] = true, --Slam + [23922] = true, --shield slam + [20243] = true, --devastate + [11800] = true, --dragon roar + [115767] = true, --deep wounds + [109128] = true, --charge + [11294] = true, --mortal strike + [29842] = true, --undribled wrath + [86346] = true, -- Colossus Smash + [107570] = true, -- Storm Bolt + [1680] = true, -- Whirlwind + [85384] = true, -- Raging Blow Off-Hand + [85288] = true, -- Raging Blow + [7384] = true, -- Overpower + [23881] = true, -- Bloodthirst + [118000] = true, -- Dragon Roar + [50622] = true, -- Bladestorm + [46924] = true, -- Bladestorm + [103840] = true, -- Impending Victory + [5308] = true, -- Execute + [57755] = true, -- Heroic Throw + [1715] = true, -- Hamstring + [46968] = true, -- Shockwave + [6343] = true, -- Thunder Clap + [64382] = true, -- Shattering Throw + [6552] = true, -- Pummel + [6572] = true, -- Revenge + [102060] = true, -- Disrupting Shout + [12323] = true, -- Piercing Howl + [122475] = true, -- Throw + [845] = true, -- Cleave + [5246] = true, -- Intimidating Shout + [7386] = true, -- Sunder Armor + [107566] = true, -- Staggering Shout + } + _detalhes.MiscClassSpells = { + --death knight + [49576] = true, -- Death Grip + [56222] = true, -- Dark Command + [47528] = true, -- Mind Freeze (interrupt) + [123693] = true, -- Plague Leech (consume plegue, get 2 deathrunes) + [3714] = true, -- Path of Frost + [48263] = true, -- Blood Presence + [47568] = true, -- Empower Rune Weapon + [57330] = true, -- Horn of Winter (buff) + [45529] = true, -- Blood Tap + [96268] = true, -- Death's Advance (walk faster) + [48266] = true, -- Frost Presence + [50977] = true, -- Death Gate + [108199] = true, -- Gorefiend's Grasp + [108201] = true, -- Desecrated Ground + [48265] = true, -- Unholy Presence + [61999] = true, -- Raise Ally + + --druid + [16689] = true, -- Nature's Grasp + [102417] = true, -- Wild Charge + [5229] = true, -- Enrage + [9005] = true, -- Pounce + [114282] = true, -- Treant Form + [5215] = true, -- Prowl + [52610] = true, -- Savage Roar + [102401] = true, -- Wild Charge + [102793] = true, -- Ursol's Vortex + [106898] = true, -- Stampeding Roar + [132158] = true, -- Nature's Swiftness (misc) + [1126] = true, -- Mark of the Wild (buff) + [77761] = true, -- Stampeding Roar + [77764] = true, -- Stampeding Roar + [16953] = true, -- Primal Fury + [102693] = true, -- Force of Nature + [145518] = true, -- Genesis + [5225] = true, -- Track Humanoids + [102280] = true, -- Displacer Beast + [1850] = true, -- Dash + [108294] = true, -- Heart of the Wild + [108292] = true, -- Heart of the Wild + [768] = true, -- Cat Form + [127538] = true, -- Savage Roar + [16979] = true, -- Wild Charge + [49376] = true, -- Wild Charge + [6795] = true, -- Growl + [61391] = true, -- Typhoon + [24858] = true, -- Moonkin Form + [81070] = true, --eclipse + [29166] = true, --innervate + + --hunter + [781] = true,-- Disengage + [82948] = true,-- Snake Trap + [82939] = true,-- Explosive Trap + [82941] = true,-- Ice Trap + [883] = true,-- Call Pet 1 + [83242] = true,-- Call Pet 2 + [83243] = true,-- Call Pet 3 + [83244] = true,-- Call Pet 4 + [2641] = true,-- Dismiss Pet + [82726] = true,-- Fervor + [13159] = true,-- Aspect of the Pack + [109260] = true,-- Aspect of the Iron Hawk + [1130] = true,--'s Mark + [5118] = true,-- Aspect of the Cheetah + [34477] = true,-- Misdirection + [19577] = true,-- Intimidation + [83245] = true,-- Call Pet 5 + [51753] = true,-- Camouflage + [13165] = true,-- Aspect of the Hawk + [53271] = true,-- Master's Call + [1543] = true,-- Flare + + --mage + [1953] = true,-- Blink + [108843] = true,-- Blazing Speed + [55342] = true,-- Mirror Image + [110960] = true,-- Greater Invisibility + [110959] = true,-- Greater Invisibility + [11958] = true,-- Cold Snap + [61316] = true,-- Dalaran Brilliance + [1459] = true,-- Arcane Brilliance + [116011] = true,-- Rune of Power + [116014] = true,-- Rune of Power + [132627] = true,-- Teleport: Vale of Eternal Blossoms + [31687] = true,-- Summon Water Elemental + [3567] = true,-- Teleport: Orgrimmar + [30449] = true,-- Spellsteal + [132626] = true,-- Portal: Vale of Eternal Blossoms + [12051] = true, --evocation + [108839] = true,-- Ice Floes + [7302] = true,-- Frost Armor + [53140] = true,-- Teleport: Dalaran + [11417] = true,-- Portal: Orgrimmar + [42955] = true,-- Conjure Refreshment + + --monk + [109132] = true, -- Roll (neutral) + [115313] = true, -- Summon Jade Serpent Statue + [116781] = true, -- Legacy of the White Tiger + [115921] = true, -- Legacy of the Emperor + [119582] = true, -- Purifying Brew + [126892] = true, -- Zen Pilgrimage + [121827] = true, -- Roll + [115315] = true, -- Summon Black Ox Statue + [115399] = true, -- Chi Brew + [101643] = true, -- Transcendence + [115546] = true, -- Provoke + [115294] = true, -- Mana Tea + [116680] = true, -- Thunder Focus Tea + [115070] = true, -- Stance of the Wise Serpent + [115069] = true, -- Stance of the Sturdy Ox + + --paladin + [85499] = true,-- Speed of Light + [84963] = true,-- Inquisition + [62124] = true,-- Reckoning + [121783] = true,-- Emancipate + [98057] = true,-- Grand Crusader + [20217] = true,-- Blessing of Kings + [25780] = true,-- Righteous Fury + [20154] = true,-- Seal of Righteousness + [19740] = true,-- Blessing of Might + [54428] = true, -- Divine Plea --misc + [7328] = true, -- Redemption + + --priest + [8122] = true, -- Psychic Scream + [81700] = true, -- Archangel + [586] = true, -- Fade + [121536] = true, -- Angelic Feather + [121557] = true, -- Angelic Feather + [64901] = true, -- Hymn of Hope + [89485] = true, -- Inner Focus + [112833] = true, -- Spectral Guise + [588] = true, -- Inner Fire + [21562] = true, -- Power Word: Fortitude + [73413] = true, -- Inner Will + [15473] = true, -- Shadowform + [126135] = true, -- Lightwell + [81209] = true, -- Chakra: Chastise + [81208] = true, -- Chakra: Serenity + [2006] = true, -- Resurrection + [1706] = true, -- Levitate + + --rogue + [108212] = true, -- Burst of Speed (misc) + [5171] = true, -- Slice and Dice + [2983] = true, -- Sprint + [36554] = true, -- Shadowstep + [1784] = true, -- Stealth + [115191] = true, -- Stealth + [2823] = true, -- Deadly Poison + [108215] = true, -- Paralytic Poison + [14185] = true, -- Preparation + [74001] = true, -- Combat Readiness + [14183] = true, -- Premeditation + [108211] = true, -- Leeching Poison + [5761] = true, -- Mind-numbing Poison + [8679] = true, -- Wound Poison + + --shaman + [73680] = true, -- Unleash Elements (misc) + [3599] = true, -- Searing Totem + [2645] = true, -- Ghost Wolf + [108285] = true, -- Call of the Elements + [8024] = true, -- Flametongue Weapon + [51730] = true, -- Earthliving Weapon + [51485] = true, -- Earthgrab Totem + [108269] = true, -- Capacitor Totem + [79206] = true, -- Spiritwalker's Grace + [58875] = true, -- Spirit Walk + [36936] = true, -- Totemic Recall + [8177] = true, -- Grounding Totem + [8143] = true, -- Tremor Totem + [108273] = true, -- Windwalk Totem + [51514] = true, -- Hex + [73682] = true, -- Unleash Frost + [8033] = true, -- Frostbrand Weapon + + --warlock + [697] = true, -- Summon Voidwalker + [6201] = true, -- Create Healthstone + [109151] = true, -- Demonic Leap + [103958] = true, -- Metamorphosis + [119678] = true, -- Soul Swap + [74434] = true, -- Soulburn + [108503] = true, -- Grimoire of Sacrifice + [111400] = true, -- Burning Rush + [109773] = true, -- Dark Intent + [112927] = true, -- Summon Terrorguard + [1122] = true, -- Summon Infernal + [18540] = true, -- Summon Doomguard + [29858] = true, -- Soulshatter + [20707] = true, -- Soulstone + [48018] = true, -- Demonic Circle: Summon + [80240] = true, -- Havoc + [112921] = true, -- Summon Abyssal + [48020] = true, -- Demonic Circle: Teleport + [111397] = true, -- Blood Horror + [112869] = true, -- Summon Observer + [1454] = true, -- Life Tap + [112868] = true, -- Summon Shivarra + [112869] = true, -- Summon Observer + [120451] = true, -- Flames of Xoroth + [29893] = true, -- Create Soulwell + [112866] = true, -- Summon Fel Imp + [108683] = true, -- Fire and Brimstone + [688] = true, -- Summon Imp + [112870] = true, -- Summon Wrathguard + [104316] = true, -- Imp Swarm + + --warrior + [18499] = true, -- Berserker Rage (class) + [100] = true, -- Charge + [6673] = true, -- Battle Shout + [52174] = true, -- Heroic Leap + [355] = true, -- Taunt + [2457] = true, -- Battle Stance + [12328] = true, -- Sweeping Strikes + [114192] = true, -- Mocking Banner + + } + + _detalhes.DualSideSpells = { + [114165] = true,-- Holy Prism (paladin) + [47750] = true, -- Penance (priest) + } + + _detalhes.AttackCooldownSpells = { + --death knight + [49016] = true, -- Unholy Frenzy (attack cd) + [49206] = true, -- Summon Gargoyle (attack cd) + [49028] = true, -- Dancing Rune Weapon (attack cd) + [51271] = true, -- Pillar of Frost (attack cd) + [63560] = true, -- Dark Transformation (pet) + + --druid + [106951] = true, -- Berserk (attack cd) + [124974] = true, -- Nature's Vigil (attack cd) + [102543] = true, -- Incarnation: King of the Jungle + [50334] = true, -- Berserk + [102558] = true, -- Incarnation: Son of Ursoc + [102560] = true, -- Incarnation: Chosen of Elune + [112071] = true, -- Celestial Alignment + [127663] = true, -- Astral Communion + [108293] = true, -- Heart of the Wild (attack cd) + [108291] = true, -- Heart of the Wild + + --hunter + [131894] = true,-- A Murder of Crows (attack cd) + [121818] = true,-- Stampede (attack cd) + [82692] = true,-- Focus Fire + [120360] = true,-- Barrage + + --mage + [80353] = true,-- Time Warp + [131078] = true,-- Icy Veins + [12472] = true,-- Icy Veins + [12043] = true,-- Presence of Mind + [108978] = true,-- Alter Time + [127140] = true,-- Alter Time + [12042] = true,-- Arcane Power + + --monk + [116740] = true, -- Tigereye Brew (attack cd?) + [123904] = true, -- Invoke Xuen, the White Tiger + [115288] = true, -- Energizing Brew + + --paladin + [31884] = true,-- Avenging Wrath + [105809] = true,-- Holy Avenger + [31842] = true, -- Divine Favor + + --priest + [34433] = true, -- Shadowfiend + [123040] = true, -- Mindbender + [10060] = true, -- Power Infusion + + --rogue + [13750] = true, -- Adrenaline Rush (attack cd) + [121471] = true, -- Shadow Blades + [137619] = true, -- Marked for Death + [79140] = true, -- Vendetta + [51690] = true, -- Killing Spree + [51713] = true, -- Shadow Dance + + --shaman + [120668] = true, --Stormlash Totem (attack cd) + [2894] = true, -- Fire Elemental Totem + [2825] = true, -- Bloodlust + [114049] = true, -- Ascendance + [16166] = true, -- Elemental Mastery + [108281] = true, -- Ancestral Guidance + [51533] = true, -- Feral Spirit + [16188] = true, -- Ancestral Swiftness + [2062] = true, -- Earth Elemental Totem + + --warlock + [113860] = true, -- Dark Soul: Misery (attack cd) + [113858] = true, -- Dark Soul: Instability + [113861] = true, -- Dark Soul: Knowledge + + --warrior + [1719] = true, -- Recklessness (attack cd) + [114207] = true, -- Skull Banner + [107574] = true, -- Avatar + [12292] = true, -- Bloodbath + } + + _detalhes.HelpfulSpells = { + --death knight + [45470] = true, -- Death Strike (heal) + [77535] = true, -- Blood Shield (heal) + [53365] = true, -- Unholy Strength (heal) + [48707] = true, -- Anti-Magic Shell (heal) + [48982] = true, -- rune tap + [119975] = true, -- Conversion (heal) + [48743] = true, -- Death Pact (heal) + + --druid + [33878] = true, --mangle (energy gain) + [17057] = true, --bear form (energy gain) + [16959] = true, --primal fury (energy gain) + [5217] = true, --tiger's fury (energy gain) + [68285] = true, --leader of the pack (mana) + [774] = true, --rejuvenation + [44203] = true, --tranquility + [48438] = true, --wild growth + [81269] = true, --shiftmend + [102792] = true, --wind moshroom: bloom + [5185] = true, --healing touch + [8936] = true, --regrowth + [33778] = true, --lifebloom + [48503] = true, --living seed + [50464] = true, --nourish + [18562] = true, --Swiftmend (heal) + [145205] = true, -- Wild Mushroom (heal) + [33763] = true, -- Lifebloom (heal) + [102791] = true, -- Wild Mushroom: Bloom + [147349] = true, -- Wild Mushroom + [108238] = true, -- Renewal + [102351] = true, -- Cenarion Ward + + + --hunter + [109304] = true,-- Exhilaration (heal) + + --mage + [11426] = true, --Ice Barrier (heal) + [115610] = true,-- Temporal Shield + [111264] = true,-- Ice Ward + + --monk + [124682] = true, -- Enveloping Mist (helpful) + [115460] = true, -- Healing Sphere + [115464] = true, -- Healing Sphere + [115151] = true, -- Renewing Mist + [122783] = true, -- Diffuse Magic + [147489] = true, -- Expel Harm + [135920] = true, -- Gift of the Serpent + [116841] = true, -- Tiger's Lust + [116694] = true, -- Surging Mist + [115308] = true, -- Elusive Brew + [135914] = true, -- Healing Sphere + [116844] = true, -- Ring of Peace + [123761] = true, --mana tea + [119611] = true, --renewing mist + [115310] = true, --revival + [116670] = true, --uplift + [115175] = true, --soothing mist + [124041] = true, --gift of the serpent + [124040] = true, -- shi torpedo + [132120] = true, -- enveloping mist + [115295] = true, --guard + [115072] = true, --expel harm + [117895] = true, --eminence (statue) + [115176] = true, -- Zen Meditation cooldown + [115203] = true, -- Fortifying Brew + [115213] = true, -- Avert Harm + [124081] = true, -- Zen Sphere + [125355] = true, -- Healing Sphere + [122278] = true, -- Dampen Harm + [115450] = true, -- Detox + + --paladin + [85673] = true,-- Word of Glory (heal) + [20925] = true,-- Sacred Shield + [53563] = true,-- Beacon of Light + [633] = true,-- Lay on Hands + [114163] = true,-- Eternal Flame + [642] = true,-- Divine Shield + [31821] = true,-- Devotion Aura + [148039] = true,-- Sacred Shield + [82326] = true,-- Divine Light + [20167] = true,--seal of insight (mana) + [65148] = true, --Sacred Shield + [20167] = true, --Seal of Insight + [86273] = true, --illuminated healing + [85222] = true, --light of dawn + [53652] = true, --beacon of light + [82327] = true, --holy radiance + [119952] = true, --arcing light + [25914] = true, --holy shock + [19750] = true, --flash of light + [31850] = true, -- Ardent Defender --defensive cd + [1044] = true, -- Hand of Freedom --helpful + [114039] = true, -- Hand of Purity + [4987] = true, -- Cleanse + [136494] = true, -- Word of Glory + + --priest + [19236] = true, -- Desperate Prayer + [47788] = true, -- Guardian Spirit + [81206] = true, -- Chakra: Sanctuary + [62618] = true, -- Power Word: Barrier + [32375] = true, -- Mass Dispel + [32546] = true, -- Binding Heal + [33110] = true, --prayer of mending + [596] = true, --prayer of healing + [34861] = true, --circle of healing + [139] = true, --renew + [120692] = true, --halo + [2060] = true, --greater heal + [110745] = true, --divine star + [2061] = true, --flash heal + [88686] = true, --santuary + [17] = true, --power word: shield + [64904] = true, --hymn of hope + [129250] = true, --power word: solace + [121135] = true, -- Cascade + [122121] = true, -- Divine Star + [110744] = true, -- Divine Star + [123258] = true, -- Power Word: Shield + [88685] = true, -- Holy Word: Sanctuary + [88684] = true, -- Holy Word: Serenity + [33076] = true, -- Prayer of Mending + [15286] = true, -- Vampiric Embrace + [2050] = true, -- Heal + [123259] = true, -- Prayer of Mending + + --rogue + [73651] = true, --Recuperate (heal) + [35546] = true, --combat potency (energy) + [98440] = true, --relentless strikes (energy) + [51637] = true, --venomous vim (energy) + [31224] = true, -- Cloak of Shadows (cooldown) + [1966] = true, -- Feint (helpful) + [76577] = true, -- Smoke Bomb + [5277] = true, -- Evasion + + --shaman + [88765] = true, --rolling thunder (mana) + [51490] = true, --thunderstorm (mana) + [82987] = true, --telluric currents glyph (mana) + [101033] = true, --resurgence (mana) + [51522] = true, --primal wisdom (mana) + [63375] = true, --primal wisdom (mana) + [114942] = true, --healing tide + [73921] = true, --healing rain + [1064] = true, --chain heal + [52042] = true, --healing stream totem + [61295] = true, --riptide + [51945] = true, --earthliving + [114083] = true, --restorative mists + [8004] = true, --healing surge + [5394] = true, -- Healing Stream Totem (heal) + [73920] = true, -- Healing Rain + [108270] = true, -- Stone Bulwark Totem + [331] = true, -- Healing Wave + [52127] = true, -- Water Shield + [77472] = true, -- Greater Healing Wave + [108271] = true, -- Astral Shift + [30823] = true, --Shamanistic Rage + [77130] = true, -- Purify Spirit + [51886] = true, -- Cleanse Spirit + [98008] = true, -- Spirit Link Totem + + --warlock + [108359] = true, -- Dark Regeneration (helpful) + [110913] = true, -- Dark Bargain + [104773] = true, -- Unending Resolve + [6229] = true, -- Twilight Ward + [114635] = true, -- Ember Tap + [131623] = true, -- Twilight Ward + [108416] = true, -- Sacrificial Pact + [132413] = true, -- Shadow Bulwark + [114189] = true, -- Health Funnel + + --warrior + [871] = true, -- Shield Wall + [97462] = true, -- Rallying Cry + [118038] = true, -- Die by the Sword + [114203] = true, -- Demoralizing Banner + [114028] = true, -- Mass Spell Reflection + [55694] = true, -- Enraged Regeneration + [112048] = true, -- Shield Barrier + [23920] = true, -- Spell Reflection + [12975] = true, -- Last Stand + [2565] = true, -- Shield Block + } + + local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) _detalhes.SpellOverwrite = { [124464] = {name = GetSpellInfo (124464) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> shadow word: pain mastery proc (priest) [124465] = {name = GetSpellInfo (124465) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> vampiric touch mastery proc (priest) [124468] = {name = GetSpellInfo (124468) .. " (" .. Loc ["STRING_MASTERY"] .. ")"} --> mind flay mastery proc (priest) } + + function _detalhes:IsCooldown (spellid) + return _detalhes.DefensiveCooldownSpellsNoBuff [spellid] or _detalhes.DefensiveCooldownSpells [spellid] + end end \ No newline at end of file diff --git a/gumps/janela_info.lua b/gumps/janela_info.lua index fe0e5f7f..77b2ace6 100644 --- a/gumps/janela_info.lua +++ b/gumps/janela_info.lua @@ -1084,6 +1084,7 @@ local function SetBarraScripts (esta_barra, instancia, i) --> talvez devesse escurecer a janela no fundo... pois o tooltip é transparente e pode confundir GameTooltip:SetOwner (self, "ANCHOR_TOPRIGHT") + -- ~erro if (self.spellid == "enemies") then --> damage taken enemies if (not self.minha_tabela or not self.minha_tabela:MontaTooltipDamageTaken (self, i)) then -- > poderia ser aprimerado para uma tailcall return @@ -1091,6 +1092,7 @@ local function SetBarraScripts (esta_barra, instancia, i) elseif (not self.minha_tabela or not self.minha_tabela:MontaTooltipAlvos (self, i)) then -- > poderia ser aprimerado para uma tailcall return + end GameTooltip:Show() diff --git a/gumps/janela_options.lua b/gumps/janela_options.lua index 66737c20..a2b0e1bb 100644 --- a/gumps/janela_options.lua +++ b/gumps/janela_options.lua @@ -91,7 +91,7 @@ function _detalhes:OpenOptionsWindow (instance) local info_text = g:NewLabel (window, nil, nil, "infotext", "", "GameFontNormal", 12) info_text:SetPoint ("topleft", window, "topleft", 470, -97) info_text.width = 200 - info_text.height = 240 + info_text.height = 280 info_text.align = "<" info_text.valign = "^" info_text.active = false @@ -179,7 +179,7 @@ function _detalhes:OpenOptionsWindow (instance) -- ~altura if (options_type == 1) then - window.options [1][1].slider:SetMinMaxValues (0, 110) + window.options [1][1].slider:SetMinMaxValues (0, 200) elseif (options_type == 2) then window.options [2][1].slider:SetMinMaxValues (0, 1300) window.options [2][1].slider.scrollMax = 1300 @@ -511,6 +511,13 @@ function _detalhes:OpenOptionsWindow (instance) frame1.fragsPvpSlider:SetHook ("OnLeave", background_on_leave) --------------- Time Type + + --hide on combat + g:NewSwitch (frame1, _, "$parentHideOnCombatSlider", "hideOnCombatSlider", 60, 20, _, _, window.instance.hide_in_combat) + --mini map + g:NewSwitch (frame1, _, "$parentMinimapSlider", "minimapSlider", 60, 20, _, _, not _detalhes.minimap.hide) + + --time type g:NewLabel (frame1, _, "$parentTimeTypeLabel", "timetypeLabel", Loc ["STRING_OPTIONS_TIMEMEASURE"]) frame1.timetypeLabel:SetPoint (10, -290) -- @@ -539,7 +546,6 @@ function _detalhes:OpenOptionsWindow (instance) g:NewLabel (frame1, _, "$parentMinimapLabel", "minimapLabel", Loc ["STRING_OPTIONS_MINIMAP"]) frame1.minimapLabel:SetPoint (10, -310) -- - g:NewSwitch (frame1, _, "$parentMinimapSlider", "minimapSlider", 60, 20, _, _, not _detalhes.minimap.hide) frame1.minimapSlider:SetPoint ("left", frame1.minimapLabel, "right", 2, 0) frame1.minimapSlider.OnSwitch = function (self, _, value) _detalhes.minimap.hide = not value @@ -565,7 +571,6 @@ function _detalhes:OpenOptionsWindow (instance) g:NewLabel (frame1, _, "$parentHideOnCombatAlphaLabel", "hideOnCombatAlphaLabel", Loc ["STRING_OPTIONS_HIDECOMBATALPHA"]) frame1.hideOnCombatAlphaLabel:SetPoint (10, -370) - g:NewSwitch (frame1, _, "$parentHideOnCombatSlider", "hideOnCombatSlider", 60, 20, _, _, window.instance.hide_in_combat) frame1.hideOnCombatSlider:SetPoint ("left", frame1.hideOnCombatLabel, "right", 2, 0) frame1.hideOnCombatSlider.OnSwitch = function (self, instance, value) instance.hide_in_combat = value @@ -588,6 +593,33 @@ function _detalhes:OpenOptionsWindow (instance) frame1.hideOnCombatAlphaSlider:SetHook ("OnEnter", background_on_enter) frame1.hideOnCombatAlphaSlider:SetHook ("OnLeave", background_on_leave) + --------------- abbreviation type + g:NewLabel (frame1, _, "$parentDpsAbbreviateLabel", "dpsAbbreviateLabel", Loc ["STRING_OPTIONS_PS_ABBREVIATE"]) + frame1.dpsAbbreviateLabel:SetPoint (10, -410) + -- + local onSelectTimeAbbreviation = function (_, _, abbreviationtype) + _detalhes.ps_abbreviation = abbreviationtype + _detalhes:AtualizaGumpPrincipal (-1, true) + end + local abbreviationOptions = { + {value = 1, label = Loc ["STRING_OPTIONS_PS_ABBREVIATE_NONE"], onclick = onSelectTimeAbbreviation, icon = "Interface\\Icons\\Achievement_Guild_Challenge_1"}, --, desc = "" + {value = 2, label = Loc ["STRING_OPTIONS_PS_ABBREVIATE_TOK"], onclick = onSelectTimeAbbreviation, icon = "Interface\\Icons\\Achievement_Guild_Challenge_100"}, --, desc = "" + {value = 3, label = Loc ["STRING_OPTIONS_PS_ABBREVIATE_TOK2"], onclick = onSelectTimeAbbreviation, icon = "Interface\\Icons\\Achievement_Guild_Challenge_10"} --, desc = "" + } + local buildAbbreviationMenu = function() + return abbreviationOptions + end + g:NewDropDown (frame1, _, "$parentAbbreviateDropdown", "dpsAbbreviateDropdown", 160, 20, buildAbbreviationMenu, _detalhes.ps_abbreviation) -- func, default + frame1.dpsAbbreviateDropdown:SetPoint ("left", frame1.dpsAbbreviateLabel, "right", 2, 0) + frame1.dpsAbbreviateDropdown:SetFrameStrata ("DIALOG") + + frame1.dpsAbbreviateDropdown.info = Loc ["STRING_OPTIONS_PS_ABBREVIATE_DESC"] + + window:create_line_background (frame1, frame1.dpsAbbreviateLabel, frame1.dpsAbbreviateDropdown) + frame1.dpsAbbreviateDropdown:SetHook ("OnEnter", background_on_enter) + frame1.dpsAbbreviateDropdown:SetHook ("OnLeave", background_on_leave) + + ---------------- appearance local frame2 = window.options [2][1].gump diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index 6316fdaf..1b78a5f3 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -4015,7 +4015,7 @@ function _detalhes:HideMainIcon (value) if (value) then self.hide_icon = true - self.baseframe.cabecalho.atributo_icon:Hide() + gump:Fade (self.baseframe.cabecalho.atributo_icon, 1) self.baseframe.cabecalho.ball:SetParent (self.baseframe) if (self.toolbar_side == 1) then @@ -4032,7 +4032,7 @@ function _detalhes:HideMainIcon (value) else self.hide_icon = false - self.baseframe.cabecalho.atributo_icon:Show() + gump:Fade (self.baseframe.cabecalho.atributo_icon, 0) self.baseframe.cabecalho.ball:SetParent (_detalhes.listener) if (self.toolbar_side == 1) then diff --git a/gumps/janela_welcome.lua b/gumps/janela_welcome.lua index e95a9a6d..fe3c22ce 100644 --- a/gumps/janela_welcome.lua +++ b/gumps/janela_welcome.lua @@ -132,8 +132,8 @@ function _detalhes:OpenWelcomeWindow () Loc ["STRING_WELCOME_3"] = "Choose your DPS and HPS prefered method:" Loc ["STRING_WELCOME_4"] = "Activity Time"..": " Loc ["STRING_WELCOME_5"] = "Effective Time"..": " - Loc ["STRING_WELCOME_6"] = "the timer of each raid member is put on hold if his activity is ceased and back again to count when is resumed, common way of mensure Dps and Hps." - Loc ["STRING_WELCOME_7"] = "used for rankings, this method uses the elapsed combat time for mensure the Dps and Hps of all raid members." + Loc ["STRING_WELCOME_6"] = "the timer of each raid member is put on hold if his activity is ceased and back again to count when is resumed, common way of measure Dps and Hps." + Loc ["STRING_WELCOME_7"] = "used for rankings, this method uses the elapsed combat time for measure the Dps and Hps of all raid members." Loc ["STRING_WELCOME_8"] = "if you change your mind, you can always modify again through options panel" Loc ["STRING_WELCOME_9"] = "Details! reads and calculate combat numbers in a very fast way, but if some kind of data is irrelevant for you, you can disable/enable it 'on-the-fly'." Loc ["STRING_WELCOME_10"] = "Mouse over each slider to see what they represent." diff --git a/images/bar_serenity.tga b/images/bar_serenity.tga new file mode 100644 index 00000000..98b0231a Binary files /dev/null and b/images/bar_serenity.tga differ diff --git a/locales/Details-enUS.lua b/locales/Details-enUS.lua index 710a6ca8..ce864f48 100644 --- a/locales/Details-enUS.lua +++ b/locales/Details-enUS.lua @@ -2,10 +2,7 @@ local Loc = LibStub("AceLocale-3.0"):NewLocale("Details", "enUS", true) if not Loc then return end -------------------------------------------------------------------------------------------------------------------------------------------- --- \n\n|cFFFFFF00-|r - - - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v1.10.0|r\n\n|cFFFFFF00-|r Fixed a issue with overall data Dps when have only one segment.\n\n|cFFFFFF00-|r Changed colors and added some backgrounds for menus.\n\n|cFFFFFF00-|r Options panel has his height size increased.\n\n|cFFFFFF00-|r Added options for hide the window or change the transparency when in combat.\n\n|cFFFFFF00-|r Added a control panel for plugins, where you can enable or disable then.\n\n|cFFFFFF00v1.9.5|r\n\n|cFFFFFF00-|r More fixes on Skins support and new tools for plugins.|r\n\n|cFFFFFF00v1.9.4|r\n\n|cFFFFFF00-|r Minor bug fixes and improvements on Welcome Screen.\n\n|cFFFFFF00v1.9.3|r\n\n|cFFFFFF00-|r The bar now starts after the icon instead of left window border.\n\n|cFFFFFF00-|r Welcome window now is localizated to others languages\n\n|cFFFFFF00-|r Fixed issue with Damage Rank Plugin.\n\n|cFFFFFF00v1.9.1|r\n\n|cFFFFFF00-|r fixed issue with main window icon when no plugin installed. \n\n|cFFFFFF00-|r fixed issue with some options button text which where out of positioning.\n\n|cFFFFFF00-|r fixed sub menu overlap when near right screen edge.\n\n|cFFFFFF00-|r fixed close button position for default skin.\n\n|cFFFFFF00-|r fixed skin error when selecting solo or right plugins.|cFFFFFF00v1.9.0|r\n\n|cFFFFFF00-|r Fixed minimap icon stuck problem.\n\n|cFFFFFF00-|r Skin support has been rewrite and now is more flexibe.\n\n|cFFFFFF00-|r Added up to 20 new customization options over options panel.\n\n|cFFFFFF00v1.8.4|r\n\n|cFFFFFF00-|r Added slash command 'details reinstall' which cleans Details! config in case of erros.\n\n|cFFFFFF00v1.8.3|r\n\n|cFFFFFF00-|r Added new skin: Simple Gray.\n\n|cFFFFFF00-|r Added minimap and interface addon panel buttons.\n\n|cFFFFFF00-|r Added new tutorials bubbles for basic aspects of Details! window.\n\n|cFFFFFF00-|r Fixed a issue with Panic Mode where sometimes his isnt triggered.\n\n|cFFFFFF00v1.8.0|r\n\n|cFFFFFF00-|r Added a new plugin: You Are Not Prepared.\n\n|cFFFFFF00-|r New options panel!\n\n|cFFFFFF00v1.7.0|r\n\n- Fixed some colors issues with enimies bars.\n\n|cFFFFFF00-|r Fixed some phrases which isn't still not translated to enUS.\n\n|cFFFFFF00-|r Major rewrite on CC-Breaks, now it's working properly.\n\n|cFFFFFF00-|r Added new sub attribute for damage: Voidzones & Debuffs.|cFFFFFF00v1.6.7|r\n\n- Added support to skins, you can change over options panel.\n\n|cFFFFFF00v1.6.5|r\n\n|cFFFFFF00-|r Added sub attribute 'Enemies' which shows, of course, only enemies.\n\n|cFFFFFF00-|r Fixed issue with successful spell cast." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v1.11.0|r\n\n|cFFFFFF00-|r Added an option for abbreviate Dps and Hps.\n\n|cFFFFFF00-|r Fixed issue where the window icon fade away when reopening the window.\n\n|cFFFFFF00-|r Improvements in class recognition.\n\n|cFFFFFF00-|r Added follow spells as defensive cooldowns:\nHealing Tide Totem, Spirit Link Totem, Demoralizing Banner, Mass Spell Reflection and Shield Block.\n\n|cFFFFFF00-|r More improvements done in Encounter Details plugin.\n\n|cFFFFFF00-|r Improvements made in the downloadable plugins: Timeline and Advanced Death Logs.\n\n|cFFFFFF00v1.10.0|r\n\n|cFFFFFF00-|r Fixed a issue with overall data Dps when have only one segment.\n\n|cFFFFFF00-|r Changed colors and added some backgrounds for menus.\n\n|cFFFFFF00-|r Options panel has his height size increased.\n\n|cFFFFFF00-|r Added options for hide the window or change the transparency when in combat.\n\n|cFFFFFF00-|r Added a control panel for plugins, where you can enable or disable then.\n\n|cFFFFFF00v1.9.5|r\n\n|cFFFFFF00-|r More fixes on Skins support and new tools for plugins.|r\n\n|cFFFFFF00v1.9.4|r\n\n|cFFFFFF00-|r Minor bug fixes and improvements on Welcome Screen.\n\n|cFFFFFF00v1.9.3|r\n\n|cFFFFFF00-|r The bar now starts after the icon instead of left window border.\n\n|cFFFFFF00-|r Welcome window now is localizated to others languages\n\n|cFFFFFF00-|r Fixed issue with Damage Rank Plugin.\n\n|cFFFFFF00v1.9.1|r\n\n|cFFFFFF00-|r fixed issue with main window icon when no plugin installed. \n\n|cFFFFFF00-|r fixed issue with some options button text which where out of positioning.\n\n|cFFFFFF00-|r fixed sub menu overlap when near right screen edge.\n\n|cFFFFFF00-|r fixed close button position for default skin.\n\n|cFFFFFF00-|r fixed skin error when selecting solo or right plugins.|cFFFFFF00v1.9.0|r\n\n|cFFFFFF00-|r Fixed minimap icon stuck problem.\n\n|cFFFFFF00-|r Skin support has been rewrite and now is more flexibe.\n\n|cFFFFFF00-|r Added up to 20 new customization options over options panel.\n\n|cFFFFFF00v1.8.4|r\n\n|cFFFFFF00-|r Added slash command 'details reinstall' which cleans Details! config in case of erros.\n\n|cFFFFFF00v1.8.3|r\n\n|cFFFFFF00-|r Added new skin: Simple Gray.\n\n|cFFFFFF00-|r Added minimap and interface addon panel buttons.\n\n|cFFFFFF00-|r Added new tutorials bubbles for basic aspects of Details! window.\n\n|cFFFFFF00-|r Fixed a issue with Panic Mode where sometimes his isnt triggered." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails:|r " --> color and details name @@ -421,11 +418,16 @@ if not Loc then return end Loc ["STRING_OPTIONS_MINIMAP"] = "Minimap Icon" Loc ["STRING_OPTIONS_MINIMAP_DESC"] = "Show or Hide minimap icon." Loc ["STRING_OPTIONS_TIMEMEASURE"] = "Time Measure" - Loc ["STRING_OPTIONS_TIMEMEASURE_DESC"] = "|cFFFFFFFFActivity|r: the timer of each raid member is put on hold if his activity is ceased and back again to count when is resumed, common way of mensure Dps and Hps.\n\n|cFFFFFFFFEffective|r: used on rankings, this method uses the elapsed combat time for mensure the Dps and Hps of all raid members." + Loc ["STRING_OPTIONS_TIMEMEASURE_DESC"] = "|cFFFFFFFFActivity|r: the timer of each raid member is put on hold if his activity is ceased and back again to count when is resumed, common way of measure Dps and Hps.\n\n|cFFFFFFFFEffective|r: used on rankings, this method uses the elapsed combat time for measure the Dps and Hps of all raid members." Loc ["STRING_OPTIONS_HIDECOMBAT"] = "Hide On Combat" Loc ["STRING_OPTIONS_HIDECOMBAT_DESC"] = "If enabled, this instance window is hidden when you enter in combat." Loc ["STRING_OPTIONS_HIDECOMBATALPHA"] = "Transparency" Loc ["STRING_OPTIONS_HIDECOMBATALPHA_DESC"] = "The window can be completely hidden or just be more transparent." + Loc ["STRING_OPTIONS_PS_ABBREVIATE"] = "PS Abbreviation" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_DESC"] = "Choose the abbreviation method for Dps and Hps.\n\n|cFFFFFFFFNone|r: no abbreviation, the raw number is shown.\n\n|cFFFFFFFFHundreds I|r: the number is reduced with a letter representing his value.\n\n59874 = 59.8K\n100.000 = 100.0K\n19.530.000 = 19.53M\n\n|cFFFFFFFFHundreds II|r: the number is reduced with a letter representing his value.\n\n59874 = 59.8K\n100.000 = 100K\n19.530.000 = 19.53M" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_NONE"] = "None" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_TOK"] = "Hundrets I" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_TOK2"] = "Hundrets II" Loc ["STRING_OPTIONS_PERFORMANCE1"] = "Performance Tweaks" Loc ["STRING_OPTIONS_PERFORMANCE1_DESC"] = "This options can help save some cpu usage." diff --git a/locales/Details-ptBR.lua b/locales/Details-ptBR.lua index 73bbd6a9..2b9c40a6 100644 --- a/locales/Details-ptBR.lua +++ b/locales/Details-ptBR.lua @@ -3,7 +3,7 @@ if not Loc then return end -------------------------------------------------------------------------------------------------------------------------------------------- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v1.10.0|r\n\n|cFFFFFF00-|r Corrigido um problema no Dps no segmento total quando existia apenas 1 segmento.\n\n|cFFFFFF00-|r Cores e imagem de fundo dos menus foram alterados.\n\n|cFFFFFF00-|r A altura do painel de opcoes foi aumentada.\n\n|cFFFFFF00-|r Adicionada opcao para esconder ou alterar a transparencia da janela quando estiver em combate.\n\n|cFFFFFF00-|r Adicionado um painel de controle de plugins para ativar ou desativa-los.\n\n|cFFFFFF00v1.9.5|r\n\n|cFFFFFF00-|rMais correcoes para as Skins e suporte a novos plugins.|r\n\n|cFFFFFF00v1.9.4|r\n\n|cFFFFFF00-|r Pequenas correcoes e melhorias na tela de boas vindas.\n\n|cFFFFFF00v1.9.3|r\n\n|cFFFFFF00-|r A barra agora comeca apos o icone e nao mais na borda esquerda da janela.\n\n|cFFFFFF00-|r Janela de boas vindas agora esta traduzida para outros idiomas.\n\n|cFFFFFF00-|r Corrigido o problema que estava afetando o plugin de Rank de Dano.\n\n|cFFFFFF00v1.9.1|r\n\n|cFFFFFF00-|r corrigido problema do icone na janela principal quando nao havia nenhum plugin instalado. \n\n|cFFFFFF00-|r corrigido problema com alguns botoes no painel de opcoes onde o texto estava fora do lugar.\n\n|cFFFFFF00-|r corrigido a posicao dos sub menus quando proximos a borda direita do monitor.\n\n|cFFFFFF00-|r corrigida a posicao do botao de fechar do skin padrao.\n\n|cFFFFFF00-|r corrigido um erro nas skins ao selecionar um plugin de raide ou solo.|cFFFFFF00v1.9.0|r\n\n|cFFFFFF00-|r Corrigido o problema de nao movimentar o botao no minimapa.\n\n|cFFFFFF00-|r Suporte a skins foi reescrito e agora ficou mais flexivel.\n\n|cFFFFFF00-|r Adicionadas mais de 20 opcoes de customizacao no painel de opcoes.\n\n|cFFFFFF00v1.8.4|r\n\n|cFFFFFF00-|r Adicionado comando 'details reinstalar' no qual limpa a configuracao do Details! em caso de erros.\n\n|cFFFFFF00v1.8.3|r\n\n|cFFFFFF00-|r Adicionada nova skin: Simple Gray.\n\n|cFFFFFF00-|r Adicionado botoes para o Details! no minimapa e menu de addons no painel de intercace.\n\n|cFFFFFF00-|r Adicionados novas bolhas de tutoriais para aspectos basicos das janelas do Details!.\n\n|cFFFFFF00-|r Corrigido o Modo Panico aonde as vezes ele nao era disparado.\n\n|cFFFFFF00v1.8.0|r\n\n- Adicionado novo plugin: You Are Not Prepared.\n\n|cFFFFFF00-|r Novo painel de opcoes!\n\n|cFFFFFF00v1.7.0|r\n\n- Corrigido alguns problemas com as cores das barras de inimigos.\n\n|cFFFFFF00-|r CC Quebrado foi inteiramente reescrito e agora deve funcionar corretamente.\n\n|cFFFFFF00-|r Adicionado novo sub atributo ao dano: Voidzones & Debuffs.|cFFFFFF00v1.6.7|r\n\n- Adicionado suporte a skins, troque ela atraves do painel de opcoes.\n\n|cFFFFFF00v1.6.5|r\n\n|cFFFFFF00-|r Adicionado o sub atributo 'Inimigos' que mostra, eh claro, somente inimigos.\n\n|cFFFFFF00-|r Corrigido um problema na captura das magias conjuradas." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v1.11.0|r\n\n|cFFFFFF00-|r Adicionado opcao para abreviar o Dps e o Hps.\n\n|cFFFFFF00-|r Corrigido um problema onde o icone da janela desaparecia ao reabri-la.\n\n|cFFFFFF00-|r Melhorias no reconhecimento das classes.\n\n|cFFFFFF00-|r As seguintes magias foram adicionadas como cooldowns: Healing Tide Totem, Spirit Link Totem, Demoralizing Banner, Mass Spell Reflection and Shield Block.\n\n|cFFFFFF00-|r Mais melhorias feitas no plugin Encounter Details.\n\n|cFFFFFF00-|r Melhorias feitas nos plugins disponiveis para download: Timeline e Advanced Death Logs.\n\n|cFFFFFF00v1.10.0|r\n\n|cFFFFFF00-|r Corrigido um problema no Dps no segmento total quando existia apenas 1 segmento.\n\n|cFFFFFF00-|r Cores e imagem de fundo dos menus foram alterados.\n\n|cFFFFFF00-|r A altura do painel de opcoes foi aumentada.\n\n|cFFFFFF00-|r Adicionada opcao para esconder ou alterar a transparencia da janela quando estiver em combate.\n\n|cFFFFFF00-|r Adicionado um painel de controle de plugins para ativar ou desativa-los.\n\n|cFFFFFF00v1.9.5|r\n\n|cFFFFFF00-|rMais correcoes para as Skins e suporte a novos plugins.|r\n\n|cFFFFFF00v1.9.4|r\n\n|cFFFFFF00-|r Pequenas correcoes e melhorias na tela de boas vindas.\n\n|cFFFFFF00v1.9.3|r\n\n|cFFFFFF00-|r A barra agora comeca apos o icone e nao mais na borda esquerda da janela.\n\n|cFFFFFF00-|r Janela de boas vindas agora esta traduzida para outros idiomas.\n\n|cFFFFFF00-|r Corrigido o problema que estava afetando o plugin de Rank de Dano.\n\n|cFFFFFF00v1.9.1|r\n\n|cFFFFFF00-|r corrigido problema do icone na janela principal quando nao havia nenhum plugin instalado. \n\n|cFFFFFF00-|r corrigido problema com alguns botoes no painel de opcoes onde o texto estava fora do lugar.\n\n|cFFFFFF00-|r corrigido a posicao dos sub menus quando proximos a borda direita do monitor.\n\n|cFFFFFF00-|r corrigida a posicao do botao de fechar do skin padrao.\n\n|cFFFFFF00-|r corrigido um erro nas skins ao selecionar um plugin de raide ou solo.|cFFFFFF00v1.9.0|r\n\n|cFFFFFF00-|r Corrigido o problema de nao movimentar o botao no minimapa.\n\n|cFFFFFF00-|r Suporte a skins foi reescrito e agora ficou mais flexivel.\n\n|cFFFFFF00-|r Adicionadas mais de 20 opcoes de customizacao no painel de opcoes.\n\n|cFFFFFF00v1.8.4|r\n\n|cFFFFFF00-|r Adicionado comando 'details reinstalar' no qual limpa a configuracao do Details! em caso de erros.\n\n|cFFFFFF00v1.8.3|r\n\n|cFFFFFF00-|r Adicionada nova skin: Simple Gray.\n\n|cFFFFFF00-|r Adicionado botoes para o Details! no minimapa e menu de addons no painel de intercace.\n\n|cFFFFFF00-|r Adicionados novas bolhas de tutoriais para aspectos basicos das janelas do Details!.\n\n|cFFFFFF00-|r Corrigido o Modo Panico aonde as vezes ele nao era disparado." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetalhes:|r " --> color and details name @@ -419,6 +419,11 @@ if not Loc then return end Loc ["STRING_OPTIONS_HIDECOMBAT_DESC"] = "Se ativada, a janela desta instancia ficara oculta quando voce entrar em combate." Loc ["STRING_OPTIONS_HIDECOMBATALPHA"] = "Transparencia" Loc ["STRING_OPTIONS_HIDECOMBATALPHA_DESC"] = "A janela pode ser completamente escondida ou apenas ficar mais transparente." + Loc ["STRING_OPTIONS_PS_ABBREVIATE"] = "PS Abreviacao" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_DESC"] = "Escolha o metodo de abreviacao para o Dps e Hps.\n\n|cFFFFFFFFNenhuma|r: sem abreviacao, o numero inteiro e mostrado.\n\n|cFFFFFFFFCem I|r: o numero e reduzido e uma letra indica o valor.\n\n59874 = 59.8K\n100.000 = 100.0K\n19.530.000 = 19.53M\n\n|cFFFFFFFFHundreds II|r: o numero e reduzido e uma letra indica o valor.\n\n59874 = 59.8K\n100.000 = 100K\n19.530.000 = 19.53M" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_NONE"] = "Nenhuma" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_TOK"] = "Cem I" + Loc ["STRING_OPTIONS_PS_ABBREVIATE_TOK2"] = "Cem II" Loc ["STRING_OPTIONS_PERFORMANCE1"] = "Ajustes de Performance" Loc ["STRING_OPTIONS_PERFORMANCE1_DESC"] = "Estas opcoes podem ajudar no desempenho deste addon." diff --git a/plugins/Details_EncounterDetails/Details_EncounterDetails.lua b/plugins/Details_EncounterDetails/Details_EncounterDetails.lua index 8b67b7ce..8986b81b 100644 --- a/plugins/Details_EncounterDetails/Details_EncounterDetails.lua +++ b/plugins/Details_EncounterDetails/Details_EncounterDetails.lua @@ -187,7 +187,7 @@ local function CreatePluginFrames (data) end --> create the button to show on toolbar [1] function OnClick [2] texture [3] tooltip [4] width or 14 [5] height or 14 [6] frame name or nil - EncounterDetails.ToolbarButton = _detalhes.ToolBar:NewPluginToolbarButton (EncounterDetails.OpenWindow, "Interface\\Scenarios\\ScenarioIcon-Boss", Loc ["STRING_TOOLTIP"], 12, 12, "ENCOUNTERDETAILS_BUTTON") --"Interface\\COMMON\\help-i" + EncounterDetails.ToolbarButton = _detalhes.ToolBar:NewPluginToolbarButton (EncounterDetails.OpenWindow, "Interface\\Scenarios\\ScenarioIcon-Boss", Loc ["STRING_PLUGIN_NAME"], Loc ["STRING_TOOLTIP"], 12, 12, "ENCOUNTERDETAILS_BUTTON") --"Interface\\COMMON\\help-i" --> setpoint anchors mod if needed EncounterDetails.ToolbarButton.y = 0.5 EncounterDetails.ToolbarButton.x = 0 @@ -217,6 +217,7 @@ end GameCooltip:SetType ("tooltipbar") GameCooltip:SetOwner (row) + for index, event in _ipairs (lastEvents) do --max hp percent (in case of hp cooldowns) @@ -229,7 +230,6 @@ end local nome_magia, _, icone_magia = _GetSpellInfo (event [2]) if (not event[3] and not battleress) then --> battle ress - GameCooltip:AddLine ("+".._cstr ("%.1f", event[4] - timeOfDeath) .."s "..nome_magia.." ("..event[6]..")", "-- -- -- ", 1, "white") GameCooltip:AddIcon ("Interface\\Glues\\CharacterSelect\\Glues-AddOn-Icons", 1, 1, nil, nil, .75, 1, 0, 1) GameCooltip:AddStatusBar (100, 1, "silver", false) @@ -249,7 +249,7 @@ end _school = _detalhes:trim (_school) local texto_esquerdo if (nome_magia) then - texto_esquerdo = "".._cstr ("%.1f", event[4] - timeOfDeath) .."s "..nome_magia.." (".. _school ..")" + texto_esquerdo = "".._cstr ("%.1f", event[4] - timeOfDeath) .."s " .. nome_magia .. " (".. event [6] ..")" --" (".. _school ..")" texto_esquerdo = texto_esquerdo:gsub ("(%()%)", "") else texto_esquerdo = "" @@ -297,7 +297,8 @@ end GameCooltip:SetOption ("StatusBarHeightMod", -6) GameCooltip:SetOption ("FixedWidth", 400) - GameCooltip:SetOption ("TextSize", 9.5) + GameCooltip:SetOption ("TextSize", 9) + GameCooltip:SetOption ("StatusBarTexture", "Interface\\AddOns\\Details\\images\\bar_serenity") GameCooltip:ShowCooltip() end @@ -588,10 +589,16 @@ function EncounterDetails:SetRowScripts (barra, index, container) end --> Here start the data mine --------------------------------------------------------------------------------------------------------- -function EncounterDetails:OpenAndRefresh() +function EncounterDetails:OpenAndRefresh (_, segment) - --> small alias - local frame = EncounterDetailsFrame + local frame = EncounterDetailsFrame --alias + local _combat_object = _combat_object + + if (segment) then + _combat_object = _detalhes.tabela_historico.tabelas [segment] + else + _G [frame:GetName().."SegmentsDropdown"].MyObject:Select (1, true) + end --[ if (frame.ShowType == "main") then @@ -666,11 +673,19 @@ function EncounterDetails:OpenAndRefresh() local barra = container.barras [index] if (not barra) then barra = EncounterDetails:CreateRow (index, container) + _detalhes:SetFontSize (barra.texto_esquerdo, 9) + _detalhes:SetFontSize (barra.texto_direita, 9) + _detalhes:SetFontFace (barra.texto_esquerdo, "Arial Narrow") barra.TTT = "damage_taken" -- tool tip type --> damage taken barra.report_text = Loc ["STRING_PLUGIN_NAME"].."! "..Loc ["STRING_DAMAGE_TAKEN_REPORT"] end - barra.texto_esquerdo:SetText (jogador.nome) + if (jogador.nome:find ("-")) then + barra.texto_esquerdo:SetText (jogador.nome:gsub (("-.*"), "")) + else + barra.texto_esquerdo:SetText (jogador.nome) + end + barra.texto_direita:SetText (_detalhes:comma_value (jogador.damage_taken)) _detalhes:name_space (barra) @@ -792,6 +807,10 @@ function EncounterDetails:OpenAndRefresh() barra = EncounterDetails:CreateRow (index, container) barra.TTT = "habilidades_inimigas" -- tool tip type --enemy abilities barra.report_text = Loc ["STRING_PLUGIN_NAME"].."! " .. Loc ["STRING_ABILITY_DAMAGE"] + _detalhes:SetFontSize (barra.texto_esquerdo, 9) + _detalhes:SetFontSize (barra.texto_direita, 9) + _detalhes:SetFontFace (barra.texto_esquerdo, "Arial Narrow") + barra.t:SetVertexColor (1, .8, .8, .8) end local nome_magia, _, icone_magia = _GetSpellInfo (habilidade[4]) @@ -804,7 +823,7 @@ function EncounterDetails:OpenAndRefresh() barra.jogador = habilidade --> barra.jogador agora tem a tabela com --> [1] total dano causado [2] jogadores que foram alvos [3] jogadores que castaram essa magia [4] ID da magia --barra.textura:SetStatusBarColor (_unpack (_detalhes.class_colors [jogador.classe])) - barra.textura:SetStatusBarColor (1, 1, 1, 1) --> a cor pode ser a spell school da magia + --barra.textura:SetStatusBarColor (1, 1, 1, 1) --> a cor pode ser a spell school da magia if (index == 1) then barra.textura:SetValue (100) @@ -1278,12 +1297,20 @@ function EncounterDetails:OpenAndRefresh() --> {esta_morte, time, este_jogador.nome, este_jogador.classe, _UnitHealthMax (alvo_name), minutos.."m "..segundos.."s", ["dead"] = true} local barra = container.barras [index] if (not barra) then - barra = EncounterDetails:CreateRow (index, container, 3, 3, -4) + barra = EncounterDetails:CreateRow (index, container, 3, 0, -4) barra.TTT = "morte" -- tool tip type barra.report_text = "Details! " .. Loc ["STRING_DEAD_LOG"] + _detalhes:SetFontSize (barra.texto_esquerdo, 9) + _detalhes:SetFontSize (barra.texto_direita, 9) + _detalhes:SetFontFace (barra.texto_esquerdo, "Arial Narrow") end - barra.texto_esquerdo:SetText (index..". "..tabela [3]) + if (tabela [3]:find ("-")) then + barra.texto_esquerdo:SetText (index..". "..tabela [3]:gsub (("-.*"), "")) + else + barra.texto_esquerdo:SetText (index..". "..tabela [3]) + end + barra.texto_direita:SetText (tabela [6]) _detalhes:name_space (barra) diff --git a/plugins/Details_EncounterDetails/enUS.lua b/plugins/Details_EncounterDetails/enUS.lua index 5d0c3c05..7f562094 100644 --- a/plugins/Details_EncounterDetails/enUS.lua +++ b/plugins/Details_EncounterDetails/enUS.lua @@ -35,10 +35,10 @@ Loc ["STRING_TOOLTIP"] = "Show Encounter Details Window" Loc ["STRING_LAST_COOLDOWN"] = "last cooldown used" Loc ["STRING_NOLAST_COOLDOWN"] = "no cooldown used" -Loc ["STRING_ADDS_HELP"] = "Mouse over |cFF00FF00Arrow Up|r for dmg received, |cFFFF0000Arrow Down|r for dmg dealt.\n|cFFFFFF00Click Arrow|r: Report the data shown on tooltip." -Loc ["STRING_INTERRIPT_HELP"] = "\n\n|cFFFFFF00Click|r on a bar: open report window." -Loc ["STRING_DISPELL_HELP"] = "\n\n|cFFFFFF00Click|r on a bar: open report window." -Loc ["STRING_DEATHS_HELP"] = "\n\n|cFFFFFF00Click|r on a bar: open report window." +Loc ["STRING_ADDS_HELP"] = "Mouse over |cFF00FF00Arrow Up|r\nfor dmg received, |cFFFF0000Arrow\n|cFFFF0000Down|r for dmg dealt. |cFFFFFF00Click\n|cFFFFFF00Arrow|r: Report the data\nshown on tooltip." +Loc ["STRING_INTERRIPT_HELP"] = " |cFFFFFF00Click|r on a bar:\nopen report window.\nIn the right we have the\namount interrupted against\nthe total times casted." +Loc ["STRING_DISPELL_HELP"] = " \n|cFFFFFF00Click|r on a bar:\nopen report window." +Loc ["STRING_DEATHS_HELP"] = " \n|cFFFFFF00Click|r on a bar:\nopen report window." --> mechanic types Loc ["STRING_HEAL"] = "heal" diff --git a/plugins/Details_EncounterDetails/frames.lua b/plugins/Details_EncounterDetails/frames.lua index 6c6721b4..259e9d21 100644 --- a/plugins/Details_EncounterDetails/frames.lua +++ b/plugins/Details_EncounterDetails/frames.lua @@ -13,15 +13,18 @@ do function EncounterDetails:CreateRowTexture (row) row.textura = CreateFrame ("StatusBar", nil, row) row.textura:SetAllPoints (row) - row.textura:SetStatusBarTexture ("Interface\\AddOns\\Details\\images\\bar4") + local t = row.textura:CreateTexture (nil, "overlay") + t:SetTexture ("Interface\\AddOns\\Details\\images\\bar_serenity") + row.t = t + row.textura:SetStatusBarTexture (t) row.textura:SetStatusBarColor(.5, .5, .5, 0) row.textura:SetMinMaxValues(0,100) row.texto_esquerdo = row.textura:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall") - row.texto_esquerdo:SetPoint ("LEFT", row.textura, "LEFT", 22, 0) + row.texto_esquerdo:SetPoint ("LEFT", row.textura, "LEFT", 22, -1) row.texto_esquerdo:SetJustifyH ("LEFT") row.texto_esquerdo:SetTextColor (1,1,1,1) - + row.texto_direita = row.textura:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall") row.texto_direita:SetPoint ("RIGHT", row.textura, "RIGHT", -2, 0) row.texto_direita:SetJustifyH ("RIGHT") @@ -533,10 +536,10 @@ Message: ..\AddOns\Details_EncounterDetails\frames.lua line 156: BossFrame["timeamt0"]:Hide() end - BossFrame.StatusBar_damageicon:Show() - BossFrame.StatusBar_healicon:Show() - BossFrame.StatusBar_totaldamage:Show() - BossFrame.StatusBar_totalheal:Show() + --BossFrame.StatusBar_damageicon:Show() + --BossFrame.StatusBar_healicon:Show() + --BossFrame.StatusBar_totaldamage:Show() + --BossFrame.StatusBar_totalheal:Show() BossFrame.ShowType = "main" @@ -652,7 +655,7 @@ Message: ..\AddOns\Details_EncounterDetails\frames.lua line 156: frame.raid_name:SetPoint ("CENTER", frame.boss_name, "CENTER", 0, 14) --> Barra de Status: - + frame.StatusBar_damageicon = frame:CreateTexture (nil, "overlay") frame.StatusBar_damageicon:SetPoint ("bottomleft", frame, "bottomleft", 20, 21) frame.StatusBar_damageicon:SetTexture ("Interface\\AddOns\\Details_EncounterDetails\\images\\boss_icones") @@ -672,6 +675,35 @@ Message: ..\AddOns\Details_EncounterDetails\frames.lua line 156: DetailsFrameWork:NewLabel (frame, frame, nil, "StatusBar_totalheal", Loc ["STRING_TOTAL_HEAL"], "GameFontHighlightSmall") frame.StatusBar_totalheal:SetPoint ("left", frame.StatusBar_healicon, "right", 2, 0) + + frame.StatusBar_damageicon:Hide() + frame.StatusBar_totaldamage:Hide() + frame.StatusBar_healicon:Hide() + frame.StatusBar_totalheal:Hide() + + --> Selecionar o segmento + + local buildSegmentosMenu = function (self) + local historico = _detalhes.tabela_historico.tabelas + local return_table = {} + + for index, combate in ipairs (historico) do + if (combate.is_boss) then + local l, r, t, b, icon = _detalhes:GetBossIcon (combate.is_boss.mapid, combate.is_boss.index) + return_table [#return_table+1] = {value = index, label = "#" .. index .. " " .. combate.is_boss.name, icon = icon, texcoord = {l, r, t, b}, onclick = EncounterDetails.OpenAndRefresh} + end + end + + return return_table + end + + local segmentos_string = DetailsFrameWork:NewLabel (frame, nil, nil, "segmentosString", "Segment:", "GameFontNormal", 12) + segmentos_string:SetPoint ("bottomleft", frame, "bottomleft", 20, 17) + _detalhes:SetFontColor (segmentos_string, "white") + _detalhes:SetFontSize (segmentos_string, 10) + + local segmentos = DetailsFrameWork:NewDropDown (frame, _, "$parentSegmentsDropdown", "segmentosDropdown", 160, 18, buildSegmentosMenu, nil) + segmentos:SetPoint ("left", segmentos_string, "right", 2, 0) --> Caixa do Dano total tomado pela Raid diff --git a/plugins/Details_EncounterDetails/ptBR.lua b/plugins/Details_EncounterDetails/ptBR.lua index af7a5120..015eb984 100644 --- a/plugins/Details_EncounterDetails/ptBR.lua +++ b/plugins/Details_EncounterDetails/ptBR.lua @@ -34,7 +34,7 @@ Loc ["STRING_TOOLTIP"] = "Mostrar os detalhes do combate" Loc ["STRING_LAST_COOLDOWN"] = "ultimo cooldown usado" Loc ["STRING_NOLAST_COOLDOWN"] = "nenhum cooldown usado" -Loc ["STRING_ADDS_HELP"] = "Passe o mouse |cFF00FF00Flecha|r dano recebido, |cFFFF0000Flecha|r dano feito.\n|cFFFFFF00Clique|r: Reporta os dados no tooltip." +Loc ["STRING_ADDS_HELP"] = "Passe o mouse |cFF00FF00Flecha|r\ndano recebido, |cFFFF0000Flecha|r\ndano feito.|cFFFFFF00Clique|r: Reporta\nos dados no tooltip." Loc ["STRING_INTERRIPT_HELP"] = "\n\n|cFFFFFF00Clique|r na barra: abre a janela de enviar relatorio." Loc ["STRING_DISPELL_HELP"] = "\n\n|cFFFFFF00Clique|r na barra: abre a janela de enviar relatorio." Loc ["STRING_DEATHS_HELP"] = "\n\n|cFFFFFF00Clique|r na barra: abre a janela de enviar relatorio." diff --git a/plugins/Details_ErrorReport/Details_ErrorReport.lua b/plugins/Details_ErrorReport/Details_ErrorReport.lua index 936e151a..7278ae87 100644 --- a/plugins/Details_ErrorReport/Details_ErrorReport.lua +++ b/plugins/Details_ErrorReport/Details_ErrorReport.lua @@ -93,7 +93,7 @@ ErrorReport.Frame:SetPoint ("center", UIParent, "center") ErrorReport.Frame:Show() end - ErrorReport.ToolbarButton = _detalhes.ToolBar:NewPluginToolbarButton (ErrorReport.OpenWindow, "Interface\\HELPFRAME\\HelpIcon-Bug", Loc ["STRING_TOOLTIP"], 20, 20, "DETAILS_ERRORREPORT_BUTTON") + ErrorReport.ToolbarButton = _detalhes.ToolBar:NewPluginToolbarButton (ErrorReport.OpenWindow, "Interface\\HELPFRAME\\HelpIcon-Bug", Loc ["STRING_PLUGIN_NAME"], Loc ["STRING_TOOLTIP"], 20, 20, "DETAILS_ERRORREPORT_BUTTON") --> setpoint anchors mod if needed ErrorReport.ToolbarButton.y = 0 ErrorReport.ToolbarButton.x = 0 diff --git a/startup.lua b/startup.lua index 68bab5d5..48e060af 100644 --- a/startup.lua +++ b/startup.lua @@ -1,3 +1,5 @@ +--no inicio da luta gravar tabela com os coolsdowns de cada jogador e ir anotando quando eles sao usados. + --File Revision: 1 --Last Modification: 27/07/2013 -- Change Log: @@ -419,14 +421,50 @@ function _G._detalhes:Start() --377 328 508 409 0.0009765625 t:SetTexCoord (0.7373046875, 0.9912109375, 0.6416015625, 0.7978515625) t:SetPoint ("center", f, "center") - local text = f:CreateFontString (nil, "overlay", "GameFontHighlight") - text:SetPoint ("topleft", t, "topleft", 24, -15) - _detalhes:SetFontSize (text, 9) - text:SetTextColor (.9, .9, .9, 1) - text:SetSize (120, 50) - text:SetJustifyV ("top") - text:SetJustifyH ("left") - f.text = text + + local line1 = f:CreateFontString (nil, "overlay", "GameFontHighlightSmall") + line1:SetPoint ("topleft", t, "topleft", 24, -10) + _detalhes:SetFontSize (line1, 9) + line1:SetTextColor (.9, .9, .9, 1) + line1:SetSize (110, 12) + line1:SetJustifyV ("center") + line1:SetJustifyH ("center") + + local line2 = f:CreateFontString (nil, "overlay", "GameFontHighlightSmall") + line2:SetPoint ("topleft", t, "topleft", 11, -20) + _detalhes:SetFontSize (line2, 9) + line2:SetTextColor (.9, .9, .9, 1) + line2:SetSize (140, 12) + line2:SetJustifyV ("center") + line2:SetJustifyH ("center") + + local line3 = f:CreateFontString (nil, "overlay", "GameFontHighlightSmall") + line3:SetPoint ("topleft", t, "topleft", 7, -30) + _detalhes:SetFontSize (line3, 9) + line3:SetTextColor (.9, .9, .9, 1) + line3:SetSize (144, 12) + line3:SetJustifyV ("center") + line3:SetJustifyH ("center") + + local line4 = f:CreateFontString (nil, "overlay", "GameFontHighlightSmall") + line4:SetPoint ("topleft", t, "topleft", 11, -40) + _detalhes:SetFontSize (line4, 9) + line4:SetTextColor (.9, .9, .9, 1) + line4:SetSize (140, 12) + line4:SetJustifyV ("center") + line4:SetJustifyH ("center") + + local line5 = f:CreateFontString (nil, "overlay", "GameFontHighlightSmall") + line5:SetPoint ("topleft", t, "topleft", 24, -50) + _detalhes:SetFontSize (line5, 9) + line5:SetTextColor (.9, .9, .9, 1) + line5:SetSize (110, 12) + line5:SetJustifyV ("center") + line5:SetJustifyH ("center") + + f.lines = {line1, line2, line3, line4, line5} + + --t:SetPoint ("center", UIParent, "center") function f:FlipHorizontal() if (not f.isHorizontalFlipped) then @@ -465,17 +503,33 @@ function _G._detalhes:Start() end end - function f:SetBubbleText (text) - f.text:SetText (text) + function f:SetBubbleText (line1, line2, line3, line4, line5) + if (not line1) then + for _, line in ipairs (f.lines) do + line:SetText ("") + end + return + end + + if (line1:find ("\n")) then + line1, line2, line3, line4, line5 = strsplit ("\n", line1) + end + + f.lines[1]:SetText (line1) + f.lines[2]:SetText (line2) + f.lines[3]:SetText (line3) + f.lines[4]:SetText (line4) + f.lines[5]:SetText (line5) end - function f:SetOwner (frame, myPoint, hisPoint, x, y) + function f:SetOwner (frame, myPoint, hisPoint, x, y, alpha) f:ClearAllPoints() - f.text:SetText ("") + f:SetBubbleText (nil) t:SetTexCoord (0.7373046875, 0.9912109375, 0.6416015625, 0.7978515625) f.isHorizontalFlipped = false f.isVerticalFlipped = false f:SetPoint (myPoint or "bottom", frame, hisPoint or "top", x or 0, y or 0) + t:SetAlpha (alpha or 1) end function f:ShowBubble() @@ -486,7 +540,7 @@ function _G._detalhes:Start() f:Hide() end - f:SetBubbleText ("Teste do Texto da Bub ble testo texto e mais texto dentro da dubble. continuando o texto dentro da bubble pra ver ate onde ele vai") + f:SetBubbleText (nil) f:Hide()