From d1c1118d39d5d1816c6abf43d7c206e90398f0eb Mon Sep 17 00:00:00 2001 From: Tercio Date: Wed, 26 Oct 2016 17:42:33 -0200 Subject: [PATCH] - Ballon tutorial for encounter details is now clamped to screen. - Raid check plugins shall work on dungeons as well. - Potion of the Prolongued Power should be tracker now. --- boot.lua | 12 +-- classes/classe_custom.lua | 26 +++++- functions/spells.lua | 3 +- .../Details_RaidCheck/Details_RaidCheck.lua | 91 ++++++++++++++----- 4 files changed, 100 insertions(+), 32 deletions(-) diff --git a/boot.lua b/boot.lua index e0cb3b82..9eaa2132 100644 --- a/boot.lua +++ b/boot.lua @@ -3,7 +3,7 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 3097 + _detalhes.build_counter = 3114 _detalhes.userversion = "v7.1.0." .. _detalhes.build_counter _detalhes.realversion = 115 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -21,14 +21,14 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v7.0.3.3067 (|cFFFFCC00October 14th, 2016|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r renamed 'report history' to 'latest reports'.\n\n -|cFFFFFF00-|r attempt to make all Details! users on the party or raid to track rogue's akaari's soul.\n\n - +|cFFFFFF00v7.0.3.3114.115 (|cFFFFCC00October 26th, 2016|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Encounter Details (plugin): tooltip tutorial is now clamped to screen and its close button should be visible.\n\n +|cFFFFFF00-|r Raid Check (plugin): now also works on dungeons.\n\n +|cFFFFFF00-|r Added Potion of the Prolongued Power to the tracker.\n\n --]] -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v7.1.0.3097.115 (|cFFFFCC00October 25th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r renamed 'report history' to 'latest reports'.\n\n|cFFFFFF00-|r attempt to make all Details! users on the party or raid to track rogue's akaari's soul.\n\n|cFFFFFF00v7.0.3.2994 (|cFFFFCC00September 25th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r |cFF0088EE[Devilsaur Shock-Baton]|r added to custom spells, its effect should be displayed: 'Devilsaur Shock Leash (trinket)'.\n\n|cFFFFFF00-|r More fixes for dungeon trash being tag as a dungeon boss.\n\n|cFFFFFF00-|r Fixed the item level calculation when the player is using a main hand and offhand artifact.\n\n|cFFFFFF00-|r Added option to auto erase world segments (outdoors, e.g. doing world quests).\n\n|cFFFFFF00-|r Fixed the avoidance tab on the player detail window for Demon Hunters.\n\n|cFFFFFF00-|r Added the tag {target} on custom text for the interrupt announcer.\n\n|cFFFFFF00-|r Merging Demon Hunter 'Fury of the Illidari' spell when the consolidade option is enabled under Spell Customization.\n\n|cFFFFFF00v7.0.3.2961 (|cFFFFCC00September 17th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for consolidade spells with the same name (isn't working with all spells yet).\nThe option is under Spell Customization on options panel.\n\n|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_VERSION_LOG"] = "|cFFFFFF00v7.0.3.3114.115 (|cFFFFCC00October 26th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Encounter Details (plugin): tooltip tutorial is now clamped to screen and its close button should be visible.\n\n|cFFFFFF00-|r Raid Check (plugin): now also works on dungeons.\n\n|cFFFFFF00-|r Added Potion of the Prolongued Power to the tracker.\n\n|cFFFFFF00v7.1.0.3097.115 (|cFFFFCC00October 25th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r renamed 'report history' to 'latest reports'.\n\n|cFFFFFF00-|r attempt to make all Details! users on the party or raid to track rogue's akaari's soul.\n\n|cFFFFFF00v7.0.3.2994 (|cFFFFCC00September 25th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r |cFF0088EE[Devilsaur Shock-Baton]|r added to custom spells, its effect should be displayed: 'Devilsaur Shock Leash (trinket)'.\n\n|cFFFFFF00-|r More fixes for dungeon trash being tag as a dungeon boss.\n\n|cFFFFFF00-|r Fixed the item level calculation when the player is using a main hand and offhand artifact.\n\n|cFFFFFF00-|r Added option to auto erase world segments (outdoors, e.g. doing world quests).\n\n|cFFFFFF00-|r Fixed the avoidance tab on the player detail window for Demon Hunters.\n\n|cFFFFFF00-|r Added the tag {target} on custom text for the interrupt announcer.\n\n|cFFFFFF00-|r Merging Demon Hunter 'Fury of the Illidari' spell when the consolidade option is enabled under Spell Customization.\n\n|cFFFFFF00v7.0.3.2961 (|cFFFFCC00September 17th, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for consolidade spells with the same name (isn't working with all spells yet).\nThe option is under Spell Customization on options panel.\n\n|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 " diff --git a/classes/classe_custom.lua b/classes/classe_custom.lua index 1aeb9b02..03c5ce19 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 = 2, + script_version = 3, script = [[ --init: local combat, instance_container, instance = ... @@ -1231,6 +1231,21 @@ end end + --potion of prolongued power + local prolongued_power = buff_uptime_container [229206] --Legion + if (prolongued_power) then + local used = prolongued_power.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 + --potion of the mountains local mountains_potion = buff_uptime_container [188029] --Legion if (mountains_potion) then @@ -1302,6 +1317,15 @@ GameCooltip:AddIcon (icon, 1, 1, 14, 14) end + --prolongued power + local prolongued_power = buff_uptime_container [229206] --Legion + if (prolongued_power) then + local name, _, icon = GetSpellInfo (229206) --Legion + GameCooltip:AddLine (name, prolongued_power.activedamt) + _detalhes:AddTooltipBackgroundStatusbar() + GameCooltip:AddIcon (icon, 1, 1, 14, 14) + end + --potion of the mountains local mountains_potion = buff_uptime_container [188029] --Legion if (mountains_potion) then diff --git a/functions/spells.lua b/functions/spells.lua index 785bdbba..8b5f2608 100644 --- a/functions/spells.lua +++ b/functions/spells.lua @@ -21,7 +21,8 @@ do [188027] = true, --Potion of Deadly Grace [188029] = true, --Unbending Potion [188017] = true, --Ancient Mana Potion - [188030] = true, --Leytorrent Potion + [188030] = true, --Leytorrent Potion + [229206] = true, --Potion of Prolongued Power --mana and heal potions -- [188016] = true, --Ancient Healing Potion diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index 2ccecc6c..52a84588 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -44,6 +44,27 @@ local runes_id = { [224001] = true, } +local get_unit_id = function (i) + local unitID + + local unitType = "raid" + if (not IsInRaid()) then --o jogador esta em grupo + unitType = "party" + end + + if (unitType == "party") then + if (i == GetNumGroupMembers()) then + unitID = "player" + else + unitID = unitType .. i + end + else + unitID = unitType .. i + end + + return unitID +end + --> localization local Loc = LibStub ("AceLocale-3.0"):GetLocale ("Details") --> create the plugin object @@ -365,7 +386,9 @@ local runes_id = { end for i = 1, amt, 1 do - local name = UnitName ("raid" .. i) + local unitID = get_unit_id (i) + + local name = UnitName (unitID) if (not DetailsRaidCheck.havefood_table [name]) then added [name] = true s = s .. DetailsRaidCheck:GetOnlyName (name) .. " " @@ -380,7 +403,11 @@ local runes_id = { DetailsRaidCheck.report_lines = s DetailsRaidCheck:SendReportWindow (reportFunc) else - DetailsRaidCheck:SendMsgToChannel (s, "RAID") + if (IsInRaid()) then + DetailsRaidCheck:SendMsgToChannel (s, "RAID") + else + DetailsRaidCheck:SendMsgToChannel (s, "PARTY") + end end elseif (button == "RightButton") then @@ -396,11 +423,12 @@ local runes_id = { for i = 1, amt, 1 do - local role = _UnitGroupRolesAssigned ("raid" .. i) + local unitID = get_unit_id (i) + local role = _UnitGroupRolesAssigned (unitID) if (role == "DAMAGER" or (role == "HEALER" and DetailsRaidCheck.db.pre_pot_healers) or (role == "TANK" and DetailsRaidCheck.db.pre_pot_tanks)) then - local playerName, realmName = _UnitName ("raid" .. i) + local playerName, realmName = _UnitName (unitID) if (realmName and realmName ~= "") then playerName = playerName .. "-" .. realmName end @@ -416,13 +444,14 @@ local runes_id = { DetailsRaidCheck.report_lines = s DetailsRaidCheck:SendReportWindow (reportFunc) else - DetailsRaidCheck:SendMsgToChannel (s, "RAID") + if (IsInRaid()) then + DetailsRaidCheck:SendMsgToChannel (s, "RAID") + else + DetailsRaidCheck:SendMsgToChannel (s, "PARTY") + end end elseif (button == "MiddleButton") then - - --_detalhes:DisablePlugin ("DETAILS_PLUGIN_RAIDCHECK") - --report focus aug local s = "Details!: Not using Rune: " @@ -433,7 +462,8 @@ local runes_id = { end for i = 1, amt do - local name = UnitName ("raid" .. i) + local unitID = get_unit_id (i) + local name = UnitName (unitID) if (not DetailsRaidCheck.havefocusaug_table [name]) then s = s .. DetailsRaidCheck:GetOnlyName (name) .. " " end @@ -443,7 +473,11 @@ local runes_id = { DetailsRaidCheck.report_lines = s DetailsRaidCheck:SendReportWindow (reportFunc) else - DetailsRaidCheck:SendMsgToChannel (s, "RAID") + if (IsInRaid()) then + DetailsRaidCheck:SendMsgToChannel (s, "RAID") + else + DetailsRaidCheck:SendMsgToChannel (s, "PARTY") + end end end @@ -451,8 +485,8 @@ local runes_id = { end) local update_panel = function (self, elapsed) - - if (not IsInRaid()) then + + if (not IsInRaid() and not IsInGroup()) then return end @@ -497,11 +531,14 @@ local runes_id = { if (difficulty == 16 and DetailsRaidCheck.db.mythic_1_4 and amt > 20) then amt = 20 end - + for i = 1, amt, 1 do - local name = UnitName ("raid" .. i) + --UNITID + local unitID = get_unit_id (i) + local name = UnitName (unitID) + --FOOD if (not DetailsRaidCheck.havefood_table [name]) then local _, class = _UnitClass (name) local class_color = "FFFFFFFF" @@ -516,6 +553,7 @@ local runes_id = { amount1 = amount1 + 1 end + --FLASK if (not DetailsRaidCheck.haveflask_table [name]) then local _, class = _UnitClass (name) local class_color = "FFFFFFFF" @@ -534,7 +572,7 @@ local runes_id = { food_str:SetText (s) flask_str:SetText (f) - --> used pre pot + --DID PRE POT for player_name, potid in pairs (DetailsRaidCheck.usedprepot_table) do local name, _, icon = _GetSpellInfo (potid) local _, class = _UnitClass (player_name) @@ -549,7 +587,7 @@ local runes_id = { amount3 = amount3 + 1 end - --> not used pre pot + --NO PRE POT local amt = GetNumGroupMembers() local _, _, difficulty = GetInstanceInfo() if (difficulty == 16 and DetailsRaidCheck.db.mythic_1_4 and amt > 20) then @@ -558,10 +596,12 @@ local runes_id = { for i = 1, amt, 1 do - local role = _UnitGroupRolesAssigned ("raid" .. i) + local unitID = get_unit_id (i) + + local role = _UnitGroupRolesAssigned (unitID) if (role == "DAMAGER" or (role == "HEALER" and DetailsRaidCheck.db.pre_pot_healers) or (role == "TANK" and DetailsRaidCheck.db.pre_pot_tanks)) then - local playerName, realmName = _UnitName ("raid" .. i) + local playerName, realmName = _UnitName (unitID) if (realmName and realmName ~= "") then playerName = playerName .. "-" .. realmName end @@ -586,7 +626,7 @@ local runes_id = { prepot_str:SetText (p) prepot_str2:SetText (n) - --> not used focus augmentation + -- NO RUNE n = "" local amt = GetNumGroupMembers() @@ -597,7 +637,8 @@ local runes_id = { for i = 1, amt do - local name = UnitName ("raid" .. i) + local unitID = get_unit_id (i) + local name = UnitName (unitID) if (not DetailsRaidCheck.havefocusaug_table [name]) then local _, class = _UnitClass (name) @@ -652,8 +693,7 @@ local runes_id = { if (not zone_type) then zone_type = select (2, GetInstanceInfo()) end - - if (zone_type == "raid") then + if (zone_type == "raid" or zone_type == "party") then DetailsRaidCheck:ShowToolbarIcon (DetailsRaidCheck.ToolbarButton, "star") @@ -690,9 +730,12 @@ local runes_id = { local with_flask, with_food = 0, 0 for i = 1, amt_players, 1 do - local name = _UnitName ("raid" .. i) + + local unitID = get_unit_id (i) + local name = _UnitName (unitID) + for buffIndex = 1, 41 do - local bname, _, _, _, _, _, _, _, _, _, spellid = _UnitAura ("raid" .. i, buffIndex, nil, "HELPFUL") + local bname, _, _, _, _, _, _, _, _, _, spellid = _UnitAura (unitID, buffIndex, nil, "HELPFUL") if (bname and flask_list [spellid]) then DetailsRaidCheck.haveflask_table [name] = spellid