From 753694ef4d602b9a6777d811e82327400a48d084 Mon Sep 17 00:00:00 2001 From: Tercio Date: Wed, 14 Sep 2016 19:30:56 -0300 Subject: [PATCH] - updated raid check plugin to check for Legion flask. --- boot.lua | 25 ++- classes/classe_custom.lua | 114 ++++-------- functions/spells.lua | 36 +++- .../Details_RaidCheck/Details_RaidCheck.lua | 166 +++++++++--------- 4 files changed, 157 insertions(+), 184 deletions(-) diff --git a/boot.lua b/boot.lua index 02edb48e..8e87a793 100644 --- a/boot.lua +++ b/boot.lua @@ -3,9 +3,9 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 2942 --it's 2941 for release - _detalhes.userversion = "v7.0.3.2942" - _detalhes.realversion = 111 --core version + _detalhes.build_counter = 2955 + _detalhes.userversion = "v7.0.3." .. _detalhes.build_counter + _detalhes.realversion = 112 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" Details = _detalhes @@ -21,14 +21,15 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v7.0.3.2942 (|cFFFFCC00September 14th, 2016|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r removed the config button from the Player Details Window.\n\n -|cFFFFFF00-|r the alert for this news window won't popup for each characters after the player opened it once for the update.\n\n -|cFFFFFF00-|r added tooltip information for the two new arenas added in Legion.\n\n +|cFFFFFF00v7.0.3.2955 (|cFFFFCC00September 14th, 2016|r|cFFFFFF00)|r:\n\n + + --]] -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v7.0.3.2942 (|cFFFFCC00September 14th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r removed the config button from the Player Details Window.\n\n|cFFFFFF00-|r the alert for this news window won't popup for each characters after the player opened it once for the update.\n\n|cFFFFFF00-|r added tooltip information for the two new arenas added in Legion.\n\n|cFFFFFF00v7.0.3.2941 (|cFFFFCC00September 13th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r fix for total bar where sometimes it desappears.\n\n|cFFFFFF00-|r fix for overall data reseting its elapsed time making dps and hps goes to millions.\n\n|cFFFFFF00-|r fix for overall not reseting when entering in a new dungeon.\n\n|cFFFFFF00-|r fix for trash cleanup on dungeons.\n\n|cFFFFFF00-|r fix for item level detection on dungeons.\n\n|cFFFFFF00-|r fix for artifact offhand always being counter as 750 item level.\n\n|cFFFFFF00-|r fix for segments menu sometimes not opening at all after a dungeon boss.\n\n|cFFFFFF00-|r fix for segments menu not showing the boss icon above the sub panel.\n\n|cFFFFFF00-|r fix for the top left corner of the window be ignoring the 'hide icon' setting at a /reload.\n\n|cFFFFFF00v7.0.3.2927 (|cFFFFCC00September 3rd, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Attempt to fix an issue with total bar hidding the latest bar shown.\n\n|cFFFFFF00v7.0.3.2899 (|cFFFFCC00August 26, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a bug on tiny threat where it won't used the font set after a /reload.\n\n|cFFFFFF00-|r Bar spacing can now be set to -2 to 10 (from 0 to 10).\n\n|cFFFFFF00-|r Attempt to fix GBoM and Stormlash on dungeon boss fights.\n\n|cFFFFFF00v5.21 (|cFFFFCC00August 14, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for Monk's Soothing Mist on Streamer Plugin.\n\n|cFFFFFF00v5.20 (|cFFFFCC00August 13, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Warlock's Grimoire of Synergy buff uptime fix.\n\n|cFFFFFF00-|r Fix for the options panel background when using Classic panels.\n\n|cFFFFFF00-|r Tooltips are now slightly bigger.\n\n|cFFFFFF00-|r Fix for bookmark background where sometimes it has a light silver color.\n\n|cFFFFFF00-|r Fix for channel cast on Streamer Plugin.\n\n|cFFFFFF00-|r Legion followers fix.\n\n|cFFFFFF00-|r Boss detection for Legion dungeons.\n\n|cFFFFFF00-|r Priest spec detection review (thanks Yakumile-Azralon).\n\n|cFFFFFF00v5.15 (|cFFFFCC00August 5, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r fix for an error which happen sometimes during encounter start.\n\n|cFFFFFF00v5.14 (|cFFFFCC00August 2, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added outline option for bar's Left Text (experimental).\n\n|cFFFFFF00-|r 'Minimalistic' is once again the default skin for new windows, changed from the 'Safe Beta Skin'.\n\n|cFFFFFF00-|r Fixed some issues with spec detection and LibGroupInSpecT-1.1 has need enabled back again.\n\n|cFFFFFF00-|r Fixed an issue with micro displays not loading settings after a logon.\n\n|cFFFFFF00-|r Another wave of workarounds to prevent the client image cache bug.\n\n|cFFFFFF00-|r fixed the spam of 'segment not added to overall'.\n\n|cFFFFFF00-|r stormlash and blessing of might workarouds.\n\n|cFFFFFF00-|r warrior rampage fix.\n\n|cFFFFFF00-|r hunter throw axe fix.\n\n|cFFFFFF00v5.10c (|cFFFFCC00July 22, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Trying a workaround for the wow client's texture cache bug which causes FPS drops, please delete the file 'spec_icons_normal.TGA' from details/image folder.\n\n|cFFFFFF00v5.10b (|cFFFFCC00July 21, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed warlock's Soul Effigy.\n\n|cFFFFFF00v5.10a (|cFFFFCC00July 20, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with Calc Leech plugin.\n\n|cFFFFFF00v5.10 (|cFFFFCC00July 19, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Using .BLP format for images. If you have FPS drops caused by Details!, delete ALL .TGA files inside the folder Details/Images/\n\n|cFFFFFF00v5.8 (|cFFFFCC00July 11, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Big framework update. May have some bugs, please report to us if you find any.\n\n|cFFFFFF00v5.8 (|cFFFFCC00June 27, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Energy and Resources are working properly now.\n\n|cFFFFFF00-|r Added raid information for The Emerald Nightmare.\n\n|cFFFFFF00v5.7 (|cFFFFCC00June 16, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Most of the raid plugins got added on this version.\n\n|cFFFFFF00-|r Plugin 'Damage, The Game!' also got damage goals updated.\n\n|cFFFFFF00v5.5 (|cFFFFCC00June 03, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Default skin is now 'Safe Skin Legion Beta' which helps a little with the disabled texture issue.\n|cFFFFFF00-|r If you're using another skin, you may change at the options panel /details options > Skin Selection.\n|cFFFFFF00-|r You also can disable the class icons at Bars: General > Icon File." + + + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v7.0.3.2955 (|cFFFFCC00September 14th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Built-in custom displays has been updated to Legion.\n\n|cFFFFFF00-|r Raid Check (plugin) now checks for Legion food, rune and flash.\n\n|cFFFFFF00-|r removed the config button from the Player Details Window.\n\n|cFFFFFF00-|r the alert for this news window won't popup for each characters after the player opened it once for the update.\n\n|cFFFFFF00-|r added tooltip information for the two new arenas added in Legion.\n\n|cFFFFFF00v7.0.3.2941 (|cFFFFCC00September 13th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r fix for total bar where sometimes it desappears.\n\n|cFFFFFF00-|r fix for overall data reseting its elapsed time making dps and hps goes to millions.\n\n|cFFFFFF00-|r fix for overall not reseting when entering in a new dungeon.\n\n|cFFFFFF00-|r fix for trash cleanup on dungeons.\n\n|cFFFFFF00-|r fix for item level detection on dungeons.\n\n|cFFFFFF00-|r fix for artifact offhand always being counter as 750 item level.\n\n|cFFFFFF00-|r fix for segments menu sometimes not opening at all after a dungeon boss.\n\n|cFFFFFF00-|r fix for segments menu not showing the boss icon above the sub panel.\n\n|cFFFFFF00-|r fix for the top left corner of the window be ignoring the 'hide icon' setting at a /reload.\n\n|cFFFFFF00v7.0.3.2927 (|cFFFFCC00September 3rd, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Attempt to fix an issue with total bar hidding the latest bar shown.\n\n|cFFFFFF00v7.0.3.2899 (|cFFFFCC00August 26, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a bug on tiny threat where it won't used the font set after a /reload.\n\n|cFFFFFF00-|r Bar spacing can now be set to -2 to 10 (from 0 to 10).\n\n|cFFFFFF00-|r Attempt to fix GBoM and Stormlash on dungeon boss fights.\n\n|cFFFFFF00v5.21 (|cFFFFCC00August 14, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for Monk's Soothing Mist on Streamer Plugin.\n\n|cFFFFFF00v5.20 (|cFFFFCC00August 13, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Warlock's Grimoire of Synergy buff uptime fix.\n\n|cFFFFFF00-|r Fix for the options panel background when using Classic panels.\n\n|cFFFFFF00-|r Tooltips are now slightly bigger.\n\n|cFFFFFF00-|r Fix for bookmark background where sometimes it has a light silver color.\n\n|cFFFFFF00-|r Fix for channel cast on Streamer Plugin.\n\n|cFFFFFF00-|r Legion followers fix.\n\n|cFFFFFF00-|r Boss detection for Legion dungeons.\n\n|cFFFFFF00-|r Priest spec detection review (thanks Yakumile-Azralon).\n\n|cFFFFFF00v5.15 (|cFFFFCC00August 5, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r fix for an error which happen sometimes during encounter start.\n\n|cFFFFFF00v5.14 (|cFFFFCC00August 2, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added outline option for bar's Left Text (experimental).\n\n|cFFFFFF00-|r 'Minimalistic' is once again the default skin for new windows, changed from the 'Safe Beta Skin'.\n\n|cFFFFFF00-|r Fixed some issues with spec detection and LibGroupInSpecT-1.1 has need enabled back again.\n\n|cFFFFFF00-|r Fixed an issue with micro displays not loading settings after a logon.\n\n|cFFFFFF00-|r Another wave of workarounds to prevent the client image cache bug.\n\n|cFFFFFF00-|r fixed the spam of 'segment not added to overall'.\n\n|cFFFFFF00-|r stormlash and blessing of might workarouds.\n\n|cFFFFFF00-|r warrior rampage fix.\n\n|cFFFFFF00-|r hunter throw axe fix.\n\n|cFFFFFF00v5.10c (|cFFFFCC00July 22, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Trying a workaround for the wow client's texture cache bug which causes FPS drops, please delete the file 'spec_icons_normal.TGA' from details/image folder.\n\n|cFFFFFF00v5.10b (|cFFFFCC00July 21, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed warlock's Soul Effigy.\n\n|cFFFFFF00v5.10a (|cFFFFCC00July 20, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with Calc Leech plugin.\n\n|cFFFFFF00v5.10 (|cFFFFCC00July 19, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Using .BLP format for images. If you have FPS drops caused by Details!, delete ALL .TGA files inside the folder Details/Images/\n\n|cFFFFFF00v5.8 (|cFFFFCC00July 11, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Big framework update. May have some bugs, please report to us if you find any.\n\n|cFFFFFF00v5.8 (|cFFFFCC00June 27, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Energy and Resources are working properly now.\n\n|cFFFFFF00-|r Added raid information for The Emerald Nightmare.\n\n|cFFFFFF00v5.7 (|cFFFFCC00June 16, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Most of the raid plugins got added on this version.\n\n|cFFFFFF00-|r Plugin 'Damage, The Game!' also got damage goals updated.\n\n|cFFFFFF00v5.5 (|cFFFFCC00June 03, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Default skin is now 'Safe Skin Legion Beta' which helps a little with the disabled texture issue.\n|cFFFFFF00-|r If you're using another skin, you may change at the options panel /details options > Skin Selection.\n|cFFFFFF00-|r You also can disable the class icons at Bars: General > Icon File." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " @@ -215,6 +216,14 @@ do _detalhes.StatusBar.NameTable = {} --> constants + --[[global]] DETAILS_HEALTH_POTION_LIST = { + [188016] = true, --Ancient Healing Potion + [188018] = true, --Ancient Rejuvenation Potion + [6262] = true, --warlock's healthstone + } + --[[global]] DETAILS_HEALTH_POTION_ID = 188016 + --[[global]] DETAILS_REJU_POTION_ID = 188018 + _detalhes._detalhes_props = { DATA_TYPE_START = 1, --> Something on start DATA_TYPE_END = 2, --> Something on end diff --git a/classes/classe_custom.lua b/classes/classe_custom.lua index b9853e52..1aeb9b02 100644 --- a/classes/classe_custom.lua +++ b/classes/classe_custom.lua @@ -1149,7 +1149,7 @@ desc = Loc ["STRING_CUSTOM_POT_DEFAULT_DESC"], source = false, target = false, - script_version = 1, + script_version = 2, script = [[ --init: local combat, instance_container, instance = ... @@ -1170,8 +1170,7 @@ local debuff_uptime_container = player.debuff_uptime and player.debuff_uptime_spells and player.debuff_uptime_spells._ActorTable if (debuff_uptime_container) then --potion of focus (can't use as pre-potion, so, its amount is always 1 - local focus_potion = debuff_uptime_container [156432] --WoD - --local focus_potion = debuff_uptime_container [105701] --MoP + local focus_potion = debuff_uptime_container [188030] --Legion if (focus_potion) then total = total + 1 found_potion = true @@ -1188,8 +1187,7 @@ if (buff_uptime_container) then --potion of the jade serpent - local jade_serpent_potion = buff_uptime_container [156426] --WoD - --local jade_serpent_potion = buff_uptime_container [105702] --MoP + local jade_serpent_potion = buff_uptime_container [188027] --Legion if (jade_serpent_potion) then local used = jade_serpent_potion.activedamt if (used > 0) then @@ -1204,8 +1202,7 @@ end --potion of mogu power - local mogu_power_potion = buff_uptime_container [156428] --WoD - --local mogu_power_potion = buff_uptime_container [105706] --MoP + local mogu_power_potion = buff_uptime_container [188028] --Legion if (mogu_power_potion) then local used = mogu_power_potion.activedamt if (used > 0) then @@ -1219,26 +1216,10 @@ end end - --virmen's bite - local virmens_bite_potion = buff_uptime_container [156423] --WoD - --local virmens_bite_potion = buff_uptime_container [105697] --MoP - if (virmens_bite_potion) then - local used = virmens_bite_potion.activedamt - if (used > 0) then - total = total + used - found_potion = true - if (used > top) then - top = used - end - --add amount to the player - instance_container:AddValue (player, used) - end - end - - --pure rage - local pure_rage_potion = buff_uptime_container [175821] --WoD - if (pure_rage_potion) then - local used = pure_rage_potion.activedamt + --mana potion + local mana_potion = buff_uptime_container [188017] --Legion + if (mana_potion) then + local used = mana_potion.activedamt if (used > 0) then total = total + used found_potion = true @@ -1251,8 +1232,7 @@ end --potion of the mountains - local mountains_potion = buff_uptime_container [156430] --WoD - --local mountains_potion = buff_uptime_container [105698] --MoP + local mountains_potion = buff_uptime_container [188029] --Legion if (mountains_potion) then local used = mountains_potion.activedamt if (used > 0) then @@ -1283,11 +1263,9 @@ --get the debuff container for potion of focus local debuff_uptime_container = player.debuff_uptime and player.debuff_uptime_spells and player.debuff_uptime_spells._ActorTable if (debuff_uptime_container) then - local focus_potion = debuff_uptime_container [156432] --WoD - --local focus_potion = debuff_uptime_container [105701] --MoP + local focus_potion = debuff_uptime_container [188030] --Legion if (focus_potion) then - local name, _, icon = GetSpellInfo (156432) --WoD - --local name, _, icon = GetSpellInfo (105701) --MoP + local name, _, icon = GetSpellInfo (188030) --Legion GameCooltip:AddLine (name, 1) --> can use only 1 focus potion (can't be pre-potion) _detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddIcon (icon, 1, 1, 14, 14) @@ -1298,53 +1276,36 @@ local buff_uptime_container = player.buff_uptime and player.buff_uptime_spells and player.buff_uptime_spells._ActorTable if (buff_uptime_container) then --potion of the jade serpent - local jade_serpent_potion = buff_uptime_container [156426] --WoD - --local jade_serpent_potion = buff_uptime_container [105702] --MoP + local jade_serpent_potion = buff_uptime_container [188027] --Legion if (jade_serpent_potion) then - local name, _, icon = GetSpellInfo (156426) --WoD - --local name, _, icon = GetSpellInfo (105702) --MoP + local name, _, icon = GetSpellInfo (188027) --Legion GameCooltip:AddLine (name, jade_serpent_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddIcon (icon, 1, 1, 14, 14) end --potion of mogu power - local mogu_power_potion = buff_uptime_container [156428] --WoD - --local mogu_power_potion = buff_uptime_container [105706] --MoP + local mogu_power_potion = buff_uptime_container [188028] --Legion if (mogu_power_potion) then - local name, _, icon = GetSpellInfo (156428) --WoD - --local name, _, icon = GetSpellInfo (105706) --MoP + local name, _, icon = GetSpellInfo (188028) --Legion GameCooltip:AddLine (name, mogu_power_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddIcon (icon, 1, 1, 14, 14) end - --pure rage - local pure_rage_potion = buff_uptime_container [175821] --WoD - if (pure_rage_potion) then - local name, _, icon = GetSpellInfo (175821) --WoD - GameCooltip:AddLine (name, pure_rage_potion.activedamt) - _detalhes:AddTooltipBackgroundStatusbar() - GameCooltip:AddIcon (icon, 1, 1, 14, 14) - end - - --virmen's bite - local virmens_bite_potion = buff_uptime_container [156423] --WoD - --local virmens_bite_potion = buff_uptime_container [105697] --MoP - if (virmens_bite_potion) then - local name, _, icon = GetSpellInfo (156423) --WoD - --local name, _, icon = GetSpellInfo (105697) --MoP - GameCooltip:AddLine (name, virmens_bite_potion.activedamt) + --mana potion + local mana_potion = buff_uptime_container [188017] --Legion + if (mana_potion) then + local name, _, icon = GetSpellInfo (188017) --Legion + GameCooltip:AddLine (name, mana_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddIcon (icon, 1, 1, 14, 14) end --potion of the mountains - local mountains_potion = buff_uptime_container [156430] --WoD - --local mountains_potion = buff_uptime_container [105698] --MoP + local mountains_potion = buff_uptime_container [188029] --Legion if (mountains_potion) then - local name, _, icon = GetSpellInfo (156430) --WoD - --local name, _, icon = GetSpellInfo (105698) --MoP + local name, _, icon = GetSpellInfo (188029) --Legion GameCooltip:AddLine (name, mountains_potion.activedamt) _detalhes:AddTooltipBackgroundStatusbar() GameCooltip:AddIcon (icon, 1, 1, 14, 14) @@ -1373,6 +1334,7 @@ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -- /run _detalhes:AddDefaultCustomDisplays() + local Healthstone = { name = Loc ["STRING_CUSTOM_HEALTHSTONE_DEFAULT"], icon = [[Interface\ICONS\warlock_ healthstone]], @@ -1394,7 +1356,7 @@ local AllSpells = character:GetSpellList() local found = false for spellid, spell in pairs (AllSpells) do - if (spellid == 6262 or spellid == 156445 or spellid == 156438 or spellid == 82184 or spellid == 173260) then --healthstone, reju potion, health potion, spinal healing injector, shieldtronic shield + if (DETAILS_HEALTH_POTION_LIST [spellid]) then instance_container:AddValue (character, spell.total) total = total + spell.total if (top < spell.total) then @@ -1427,31 +1389,17 @@ GameCooltip:AddStatusBar (100, 1, R, G, B, A) end - local pot = actor:GetSpell (156445) + local pot = actor:GetSpell (DETAILS_HEALTH_POTION_ID) if (pot) then - GameCooltip:AddLine (select (1, GetSpellInfo(156445)), _detalhes:ToK(pot.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (156445)), 1, 1, 16, 16) + GameCooltip:AddLine (select (1, GetSpellInfo(DETAILS_HEALTH_POTION_ID)), _detalhes:ToK(pot.total)) + GameCooltip:AddIcon (select (3, GetSpellInfo (DETAILS_HEALTH_POTION_ID)), 1, 1, 16, 16) GameCooltip:AddStatusBar (100, 1, R, G, B, A) end - local pot = actor:GetSpell (156438) + local pot = actor:GetSpell (DETAILS_REJU_POTION_ID) if (pot) then - GameCooltip:AddLine (select (1, GetSpellInfo(156438)), _detalhes:ToK(pot.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (156438)), 1, 1, 16, 16) - GameCooltip:AddStatusBar (100, 1, R, G, B, A) - end - - local injector = actor:GetSpell (82184) - if (injector) then - GameCooltip:AddLine (select (1, GetSpellInfo(82184)), _detalhes:ToK(injector.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (82184)), 1, 1, 16, 16) - GameCooltip:AddStatusBar (100, 1, R, G, B, A) - end - - local shieldtronic = actor:GetSpell (173260) - if (shieldtronic) then - GameCooltip:AddLine (select (1, GetSpellInfo(173260)), _detalhes:ToK(shieldtronic.total)) - GameCooltip:AddIcon (select (3, GetSpellInfo (173260)), 1, 1, 16, 16) + GameCooltip:AddLine (select (1, GetSpellInfo(DETAILS_REJU_POTION_ID)), _detalhes:ToK(pot.total)) + GameCooltip:AddIcon (select (3, GetSpellInfo (DETAILS_REJU_POTION_ID)), 1, 1, 16, 16) GameCooltip:AddStatusBar (100, 1, R, G, B, A) end @@ -1459,7 +1407,7 @@ ]], percent_script = false, total_script = false, - script_version = 12, + script_version = 13, } -- /run _detalhes:AddDefaultCustomDisplays() local have = false diff --git a/functions/spells.lua b/functions/spells.lua index b83075c1..785bdbba 100644 --- a/functions/spells.lua +++ b/functions/spells.lua @@ -4,16 +4,34 @@ do _detalhes.PotionList = { --> MoP - [105702] = true, --jade serpent - [105706] = true, --mogu power - [105697] = true, --virmen's bite - [105698] = true, --montains +-- [105702] = true, --jade serpent +-- [105706] = true, --mogu power +-- [105697] = true, --virmen's bite +-- [105698] = true, --montains + --> WoD - [156426] = true, --draenic intellect potion - [156430] = true, --draenic armor potion - [156423] = true, --draenic agility potion - [156428] = true, --draenic strength potion - [175821] = true, --draenic pure rage potion +-- [156426] = true, --draenic intellect potion +-- [156430] = true, --draenic armor potion +-- [156423] = true, --draenic agility potion +-- [156428] = true, --draenic strength potion +-- [175821] = true, --draenic pure rage potion + + --> Legion + [188028] = true, --Potion of the Old War + [188027] = true, --Potion of Deadly Grace + [188029] = true, --Unbending Potion + [188017] = true, --Ancient Mana Potion + [188030] = true, --Leytorrent Potion + + --mana and heal potions +-- [188016] = true, --Ancient Healing Potion +-- [188018] = true, --Ancient Rejuvenation Potion + + --flask +-- [188033] = true, --Flask of the Seventh Demon +-- [188031] = true, --Flask of the Whispered Pact +-- [188034] = true, --Flask of the Countless Armies +-- [188035] = true, --Flask of Ten Thousand Scars } _detalhes.SpecSpellList = { --~spec diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index 155d1752..2ccecc6c 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -7,70 +7,41 @@ local _UnitGroupRolesAssigned = UnitGroupRolesAssigned local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS local flask_list = { - [156064] = true, --Greater Draenic Agility Flask - [156070] = true, --Draenic Intellect Flask - [156071] = true, --Draenic Strength Flask - [156073] = true, --Draenic Agility Flask - [156077] = true, --Draenic Stamina Flask - [156079] = true, --Greater Draenic Intellect Flask - [156080] = true, --Greater Draenic Strength Flask - [156084] = true, --Greater Draenic Stamina Flask + [188033] = true, --Flask of the Seventh Demon + [188031] = true, --Flask of the Whispered Pact + [188034] = true, --Flask of the Countless Armies + [188035] = true, --Flask of Ten Thousand Scars } local food_list = { - [160600] = true, -- - [160724] = true, -- - [160726] = true, -- - [160793] = true, -- - [160832] = true, -- - [160839] = true, -- - [160883] = true, -- - [160889] = true, -- - [160893] = true, -- - [160897] = true, -- - [160900] = true, -- - [160902] = true, -- - [175218] = true, -- - [175219] = true, -- - [175220] = true, -- - [175222] = true, -- - [175223] = true, -- + tier1 = { + [201330] = true, --225 haste - 201496 + [201334] = true, --225 versatility - 201498 + [201332] = true, --225 mastery - 201497 + [201223] = true, --225 critical - 201413 + + [201499] = true, --deals damage - Spiced Rib Roast + }, - [180745] = true, --125 crit - [180746] = true, --125 versa - [180747] = true, --187 stam - [180748] = true, --125 haste - [180749] = true, --125 multi - [180750] = true, --125 mastery + tier2 = { + [225598] = true, --300 haste - 201501 + [225600] = true, --300 versatility - 201503 + [225599] = true, --300 mastery - 201502 + [225597] = true, --300 critical - 201500 + [225601] = true, --deals damage - 201504 + }, - --the food it self inside the player backback - [180757] = true, --125 multi - [180758] = true, --125 crit - [180761] = true, --125 haste - [180759] = true, --125 versa - [180762] = true, --125 mastery - [180760] = true, --187 stam - - [188534] = true, --Felmouth Frenzy + tier3 = { + [225603] = true, --375 haste - 201506 + [225605] = true, --375 versatility - 201508 + [225604] = true, --375 mastery - 201507 + [225602] = true, --375 critical - 201505 + [225606] = true, --deals damage - 201511 + }, } -local best_food = { - [180745] = true, --125 crit - [180746] = true, --125 versa - [180747] = true, --187 stam - [180748] = true, --125 haste - [180749] = true, --125 multi - [180750] = true, --125 mastery -} - -local focus_augmentation = 175457 -local hyper_augmentation = 175456 -local stout_augmentation = 175439 - local runes_id = { - [175457] = true, -- focus - [175456] = true, --hyper - [175439] = true, --stout + [224001] = true, } --> localization @@ -80,9 +51,10 @@ local runes_id = { tinsert (UISpecialFrames, "DetailsRaidCheck") DetailsRaidCheck:SetPluginDescription (Loc ["STRING_RAIDCHECK_PLUGIN_DESC"]) - local version = "v0.5" + local version = "v0.6" local debugmode = false + --local debugmode = true local CreatePluginFrames = function() @@ -219,7 +191,8 @@ local runes_id = { local report_string1 = show_panel:CreateFontString (nil, "overlay", "GameFontNormal") report_string1:SetPoint ("bottomleft", show_panel, "bottomleft", 10, 10) - report_string1:SetText ("|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:225:307|t Report No Food/Flask |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:328:409|t Report No Pre-Pot |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:126:204|t Report No Rune") + report_string1:SetText ("|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:225:307|t Report No Food/Flask |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:328:409|t Report No Pre-Pot |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:12:12:0:1:512:512:8:70:126:204|t Report No Rune | |cFFFFFFFFShift+Click: Options|r") + DetailsRaidCheck:SetFontSize (report_string1, 10) DetailsRaidCheck:SetFontColor (report_string1, "white") report_string1:SetAlpha (0.6) @@ -376,6 +349,11 @@ local runes_id = { DetailsRaidCheck.ToolbarButton:RegisterForClicks ("AnyUp") DetailsRaidCheck.ToolbarButton:SetScript ("OnClick", function (self, button) + if (IsShiftKeyDown()) then + DetailsRaidCheck.OpenOptionsPanel() + return + end + if (button == "LeftButton") then --> link no food/flask local s, added = "Details!: No Flask or Food: ", {} @@ -511,28 +489,6 @@ local runes_id = { end --t.name, t.ilvl, t.time - --best food - --[[ - local b = "" - for name, foodid in pairs (DetailsRaidCheck.havefood_table) do - if (best_food [foodid]) then - --print (name, foodid, best_food [foodid], type (foodid)) - local _, class = _UnitClass (name) - local class_color = "FFFFFFFF" - - if (class) then - local coords = CLASS_ICON_TCOORDS [class] - class_color = "|TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:-5:128:128:" .. coords[1]*128 .. ":" .. coords[2]*128 .. ":" .. coords[3]*128 .. ":" .. coords[4]*128 .. "|t |c" .. RAID_CLASS_COLORS [class].colorStr - end - - b = b .. class_color .. DetailsRaidCheck:GetOnlyName (name) .. "|r\n" - - amount6 = amount6 + 1 - end - end - bestfood_str:SetText (b) - --]] - --food local s, f, p, n = "", "", "", "" @@ -743,9 +699,25 @@ local runes_id = { with_flask = with_flask + 1 end - if (bname and food_list [spellid]) then - DetailsRaidCheck.havefood_table [name] = spellid - with_food = with_food + 1 + if (DetailsRaidCheck.db.food_tier1) then + if (bname and food_list.tier1 [spellid]) then + DetailsRaidCheck.havefood_table [name] = 1 + with_food = with_food + 1 + end + end + + if (DetailsRaidCheck.db.food_tier2) then + if (bname and food_list.tier2 [spellid]) then + DetailsRaidCheck.havefood_table [name] = 2 + with_food = with_food + 1 + end + end + + if (DetailsRaidCheck.db.food_tier3) then + if (bname and food_list.tier3 [spellid]) then + DetailsRaidCheck.havefood_table [name] = 3 + with_food = with_food + 1 + end end if (bname and runes_id [spellid]) then @@ -836,9 +808,31 @@ local build_options_panel = function() desc = "If enabled, clicking to report open the report panel instead (to be able to choose where to send the report).", name = "Use Report Panel" }, + + { + type = "toggle", + get = function() return DetailsRaidCheck.db.food_tier1 end, + set = function (self, fixedparam, value) DetailsRaidCheck.db.food_tier1 = value end, + desc = "Consider players using Tier 1 food.", + name = "Food Tier 1 [225]" + }, + { + type = "toggle", + get = function() return DetailsRaidCheck.db.food_tier2 end, + set = function (self, fixedparam, value) DetailsRaidCheck.db.food_tier2 = value end, + desc = "Consider players using Tier 2 food.", + name = "Food Tier 2 [300]" + }, + { + type = "toggle", + get = function() return DetailsRaidCheck.db.food_tier3 end, + set = function (self, fixedparam, value) DetailsRaidCheck.db.food_tier3 = value end, + desc = "Consider players using Tier 3 food.", + name = "Food Tier 3 [375]" + }, } - _detalhes.gump:BuildMenu (options_frame, menu, 15, -65, 260) + _detalhes.gump:BuildMenu (options_frame, menu, 15, -65, 180) end @@ -868,6 +862,10 @@ end pre_pot_tanks = false, --do not report pre pot for tanks mythic_1_4 = true, --only track groups 1-4 on mythic use_report_panel = true, --if true, shows the report panel + + food_tier1 = true, --legion food tiers + food_tier2 = true, + food_tier3 = true, } --> install