- Changes to make the live version work with the BfA Beta.
This commit is contained in:
+1
-1
@@ -22,7 +22,7 @@
|
||||
_detalhes:ToggleWindows()
|
||||
</Binding>
|
||||
|
||||
<Binding name="DETAILS_TOOGGLE_WINDOW1" description="Toggle window 1." header="DETAILS_KEYBIND_WINDOW_CONTROL" category="Details!">
|
||||
<Binding name="DETAILS_TOOGGLE_WINDOW1" description="Toggle window 1." category="Details!">
|
||||
_detalhes:ToggleWindow (1)
|
||||
</Binding>
|
||||
<Binding name="DETAILS_TOOGGLE_WINDOW2" description="Toggle window 2." category="Details!">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceAddon-3.0.lua"/>
|
||||
</Ui>
|
||||
</Ui>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
-- make into AceComm.
|
||||
-- @class file
|
||||
-- @name AceComm-3.0
|
||||
-- @release $Id: AceComm-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
|
||||
-- @release $Id: AceComm-3.0.lua 1171 2018-04-20 07:33:22Z nevcairiel $
|
||||
|
||||
--[[ AceComm-3.0
|
||||
|
||||
@@ -20,7 +20,7 @@ TODO: Time out old data rotting around from dead senders? Not a HUGE deal since
|
||||
local CallbackHandler = LibStub("CallbackHandler-1.0")
|
||||
local CTL = assert(ChatThrottleLib, "AceComm-3.0 requires ChatThrottleLib")
|
||||
|
||||
local MAJOR, MINOR = "AceComm-3.0", 10
|
||||
local MAJOR, MINOR = "AceComm-3.0", 11
|
||||
local AceComm,oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||
|
||||
if not AceComm then return end
|
||||
@@ -65,7 +65,11 @@ function AceComm:RegisterComm(prefix, method)
|
||||
if #prefix > 16 then -- TODO: 15?
|
||||
error("AceComm:RegisterComm(prefix,method): prefix length is limited to 16 characters")
|
||||
end
|
||||
RegisterAddonMessagePrefix(prefix)
|
||||
if C_ChatInfo then
|
||||
C_ChatInfo.RegisterAddonMessagePrefix(prefix)
|
||||
else
|
||||
RegisterAddonMessagePrefix(prefix)
|
||||
end
|
||||
|
||||
return AceComm._RegisterComm(self, prefix, method) -- created by CallbackHandler
|
||||
end
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="ChatThrottleLib.lua"/>
|
||||
<Script file="AceComm-3.0.lua"/>
|
||||
</Ui>
|
||||
</Ui>
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
-- LICENSE: ChatThrottleLib is released into the Public Domain
|
||||
--
|
||||
|
||||
local CTL_VERSION = 23
|
||||
local CTL_VERSION = 24
|
||||
|
||||
local _G = _G
|
||||
|
||||
@@ -213,9 +213,15 @@ function ChatThrottleLib:Init()
|
||||
return ChatThrottleLib.Hook_SendChatMessage(...)
|
||||
end)
|
||||
--SendAddonMessage
|
||||
hooksecurefunc("SendAddonMessage", function(...)
|
||||
return ChatThrottleLib.Hook_SendAddonMessage(...)
|
||||
end)
|
||||
if _G.C_ChatInfo then
|
||||
hooksecurefunc(_G.C_ChatInfo, "SendAddonMessage", function(...)
|
||||
return ChatThrottleLib.Hook_SendAddonMessage(...)
|
||||
end)
|
||||
else
|
||||
hooksecurefunc("SendAddonMessage", function(...)
|
||||
return ChatThrottleLib.Hook_SendAddonMessage(...)
|
||||
end)
|
||||
end
|
||||
end
|
||||
self.nBypass = 0
|
||||
end
|
||||
@@ -461,7 +467,7 @@ function ChatThrottleLib:SendAddonMessage(prio, prefix, text, chattype, target,
|
||||
|
||||
local nSize = text:len();
|
||||
|
||||
if RegisterAddonMessagePrefix then
|
||||
if C_ChatInfo or RegisterAddonMessagePrefix then
|
||||
if nSize>255 then
|
||||
error("ChatThrottleLib:SendAddonMessage(): message length cannot exceed 255 bytes", 2)
|
||||
end
|
||||
@@ -478,7 +484,11 @@ function ChatThrottleLib:SendAddonMessage(prio, prefix, text, chattype, target,
|
||||
if not self.bQueueing and nSize < self:UpdateAvail() then
|
||||
self.avail = self.avail - nSize
|
||||
bMyTraffic = true
|
||||
_G.SendAddonMessage(prefix, text, chattype, target)
|
||||
if _G.C_ChatInfo then
|
||||
_G.C_ChatInfo.SendAddonMessage(prefix, text, chattype, target)
|
||||
else
|
||||
_G.SendAddonMessage(prefix, text, chattype, target)
|
||||
end
|
||||
bMyTraffic = false
|
||||
self.Prio[prio].nTotalSent = self.Prio[prio].nTotalSent + nSize
|
||||
if callbackFn then
|
||||
@@ -490,7 +500,7 @@ function ChatThrottleLib:SendAddonMessage(prio, prefix, text, chattype, target,
|
||||
|
||||
-- Message needs to be queued
|
||||
local msg = NewMsg()
|
||||
msg.f = _G.SendAddonMessage
|
||||
msg.f = _G.C_ChatInfo and _G.C_ChatInfo.SendAddonMessage or _G.SendAddonMessage
|
||||
msg[1] = prefix
|
||||
msg[2] = text
|
||||
msg[3] = chattype
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceLocale-3.0.lua"/>
|
||||
</Ui>
|
||||
</Ui>
|
||||
|
||||
@@ -284,4 +284,4 @@ end
|
||||
-- Update embeds
|
||||
for target, v in pairs(AceSerializer.embeds) do
|
||||
AceSerializer:Embed(target)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceSerializer-3.0.lua"/>
|
||||
</Ui>
|
||||
</Ui>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
-- make into AceTimer.
|
||||
-- @class file
|
||||
-- @name AceTimer-3.0
|
||||
-- @release $Id: AceTimer-3.0.lua 1119 2014-10-14 17:23:29Z nevcairiel $
|
||||
-- @release $Id: AceTimer-3.0.lua 1170 2018-03-29 17:38:58Z funkydude $
|
||||
|
||||
local MAJOR, MINOR = "AceTimer-3.0", 17 -- Bump minor on changes
|
||||
local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||
@@ -34,13 +34,15 @@ local function new(self, loop, func, delay, ...)
|
||||
delay = 0.01 -- Restrict to the lowest time that the C_Timer API allows us
|
||||
end
|
||||
|
||||
local timer = {...}
|
||||
timer.object = self
|
||||
timer.func = func
|
||||
timer.looping = loop
|
||||
timer.argsCount = select("#", ...)
|
||||
timer.delay = delay
|
||||
timer.ends = GetTime() + delay
|
||||
local timer = {
|
||||
object = self,
|
||||
func = func,
|
||||
looping = loop,
|
||||
argsCount = select("#", ...),
|
||||
delay = delay,
|
||||
ends = GetTime() + delay,
|
||||
...
|
||||
}
|
||||
|
||||
activeTimers[timer] = timer
|
||||
|
||||
@@ -156,7 +158,7 @@ end
|
||||
|
||||
--- Cancels all timers registered to the current addon object ('self')
|
||||
function AceTimer:CancelAllTimers()
|
||||
for k,v in pairs(activeTimers) do
|
||||
for k,v in next, activeTimers do
|
||||
if v.object == self then
|
||||
AceTimer.CancelTimer(self, k)
|
||||
end
|
||||
@@ -187,8 +189,8 @@ if oldminor and oldminor < 10 then
|
||||
AceTimer.frame:SetScript("OnEvent", nil)
|
||||
AceTimer.frame:UnregisterAllEvents()
|
||||
-- convert timers
|
||||
for object,timers in pairs(AceTimer.selfs) do
|
||||
for handle,timer in pairs(timers) do
|
||||
for object,timers in next, AceTimer.selfs do
|
||||
for handle,timer in next, timers do
|
||||
if type(timer) == "table" and timer.callback then
|
||||
local newTimer
|
||||
if timer.delay then
|
||||
@@ -214,7 +216,7 @@ elseif oldminor and oldminor < 17 then
|
||||
-- Clear old timer table and update upvalue
|
||||
AceTimer.activeTimers = {}
|
||||
activeTimers = AceTimer.activeTimers
|
||||
for handle, timer in pairs(oldTimers) do
|
||||
for handle, timer in next, oldTimers do
|
||||
local newTimer
|
||||
-- Stop the old timer animation
|
||||
local duration, elapsed = timer:GetDuration(), timer:GetElapsed()
|
||||
@@ -232,7 +234,7 @@ elseif oldminor and oldminor < 17 then
|
||||
|
||||
-- Migrate transitional handles
|
||||
if oldminor < 13 and AceTimer.hashCompatTable then
|
||||
for handle, id in pairs(AceTimer.hashCompatTable) do
|
||||
for handle, id in next, AceTimer.hashCompatTable do
|
||||
local t = activeTimers[id]
|
||||
if t then
|
||||
activeTimers[id] = nil
|
||||
@@ -257,7 +259,7 @@ local mixins = {
|
||||
|
||||
function AceTimer:Embed(target)
|
||||
AceTimer.embeds[target] = true
|
||||
for _,v in pairs(mixins) do
|
||||
for _,v in next, mixins do
|
||||
target[v] = AceTimer[v]
|
||||
end
|
||||
return target
|
||||
@@ -271,6 +273,6 @@ function AceTimer:OnEmbedDisable(target)
|
||||
target:CancelAllTimers()
|
||||
end
|
||||
|
||||
for addon in pairs(AceTimer.embeds) do
|
||||
for addon in next, AceTimer.embeds do
|
||||
AceTimer:Embed(addon)
|
||||
end
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceTimer-3.0.lua"/>
|
||||
</Ui>
|
||||
</Ui>
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
-- Returns an array with the set of unit ids for the current group.
|
||||
--]]
|
||||
|
||||
local MAJOR, MINOR = "LibGroupInSpecT-1.1", tonumber (("$Revision: 89 $"):match ("(%d+)") or 0)
|
||||
local MAJOR, MINOR = "LibGroupInSpecT-1.1", 90
|
||||
|
||||
if not LibStub then error(MAJOR.." requires LibStub") end
|
||||
local lib = LibStub:NewLibrary (MAJOR, MINOR)
|
||||
@@ -86,14 +86,14 @@ local INSPECT_TIMEOUT = 10 -- If we get no notification within 10s, give up on u
|
||||
|
||||
local MAX_ATTEMPTS = 2
|
||||
|
||||
--@debug@
|
||||
--[===[@debug@
|
||||
lib.debug = false
|
||||
local function debug (...)
|
||||
if lib.debug then -- allow programmatic override of debug output by client addons
|
||||
print (...)
|
||||
end
|
||||
end
|
||||
--@end-debug@
|
||||
--@end-debug@]===]
|
||||
|
||||
function lib.events:OnUsed(target, eventname)
|
||||
if eventname == INSPECT_READY_EVENT then
|
||||
@@ -172,6 +172,7 @@ local UnitIsConnected = _G.UnitIsConnected
|
||||
local UnitIsPlayer = _G.UnitIsPlayer
|
||||
local UnitIsUnit = _G.UnitIsUnit
|
||||
local UnitName = _G.UnitName
|
||||
local SendAddonMessage = C_ChatInfo and C_ChatInfo.SendAddonMessage or SendAddonMessage -- XXX 8.0 compat
|
||||
|
||||
|
||||
local global_spec_id_roles_detailed = {
|
||||
@@ -254,7 +255,11 @@ function lib:PLAYER_LOGIN ()
|
||||
frame:RegisterEvent ("UNIT_NAME_UPDATE")
|
||||
frame:RegisterEvent ("UNIT_AURA")
|
||||
frame:RegisterEvent ("CHAT_MSG_ADDON")
|
||||
RegisterAddonMessagePrefix (COMMS_PREFIX)
|
||||
if C_ChatInfo then -- XXX 8.0 compat
|
||||
C_ChatInfo.RegisterAddonMessagePrefix (COMMS_PREFIX)
|
||||
else
|
||||
RegisterAddonMessagePrefix (COMMS_PREFIX)
|
||||
end
|
||||
|
||||
local guid = UnitGUID ("player")
|
||||
local info = self:BuildInfo ("player")
|
||||
@@ -312,8 +317,8 @@ function lib:GetCachedTalentInfo (class_id, tier, col, group, is_inspect, unit)
|
||||
local talents = self.static_cache.talents
|
||||
local talent_id, name, icon, sel, avail = GetTalentInfo (tier, col, group, is_inspect, unit)
|
||||
if not talent_id or not class_id then
|
||||
--@debug@
|
||||
debug ("GetCachedTalentInfo("..tostring(class_id)..","..tier..","..col..","..group..","..tostring(is_inspect)..","..tostring(unit)..") returned nil") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("GetCachedTalentInfo("..tostring(class_id)..","..tier..","..col..","..group..","..tostring(is_inspect)..","..tostring(unit)..") returned nil") --@end-debug@]===]
|
||||
return {}
|
||||
end
|
||||
talents[class_id] = talents[class_id] or {}
|
||||
@@ -393,8 +398,8 @@ end
|
||||
function lib:Refresh (unit)
|
||||
local guid = UnitGUID (unit)
|
||||
if not guid then return end
|
||||
--@debug@
|
||||
debug ("Refreshing "..unit) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Refreshing "..unit) --@end-debug@]===]
|
||||
if not self.state.mainq[guid] then
|
||||
self.state.staleq[guid] = 1
|
||||
self.frame:Show ()
|
||||
@@ -413,8 +418,8 @@ function lib:ProcessQueues ()
|
||||
local staleq = self.state.staleq
|
||||
|
||||
if not next (mainq) and next(staleq) then
|
||||
--@debug@
|
||||
debug ("Main queue empty, swapping main and stale queues") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Main queue empty, swapping main and stale queues") --@end-debug@]===]
|
||||
self.state.mainq, self.state.staleq = self.state.staleq, self.state.mainq
|
||||
mainq, staleq = staleq, mainq
|
||||
end
|
||||
@@ -423,17 +428,17 @@ function lib:ProcessQueues ()
|
||||
-- If there was an inspect going, it's timed out, so either retry or move it to stale queue
|
||||
local guid = self.state.current_guid
|
||||
if guid then
|
||||
--@debug@
|
||||
debug ("Inspect timed out for "..guid) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Inspect timed out for "..guid) --@end-debug@]===]
|
||||
|
||||
local count = mainq and mainq[guid] or (MAX_ATTEMPTS + 1)
|
||||
if not self:GuidToUnit (guid) then
|
||||
--@debug@
|
||||
debug ("No longer applicable, removing from queues") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("No longer applicable, removing from queues") --@end-debug@]===]
|
||||
mainq[guid], staleq[guid] = nil, nil
|
||||
elseif count > MAX_ATTEMPTS then
|
||||
--@debug@
|
||||
debug ("Excessive retries, moving to stale queue") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Excessive retries, moving to stale queue") --@end-debug@]===]
|
||||
mainq[guid], staleq[guid] = nil, 1
|
||||
else
|
||||
mainq[guid] = count + 1
|
||||
@@ -447,16 +452,16 @@ function lib:ProcessQueues ()
|
||||
for guid,count in pairs (mainq) do
|
||||
local unit = self:GuidToUnit (guid)
|
||||
if not unit then
|
||||
--@debug@
|
||||
debug ("No longer applicable, removing from queues") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("No longer applicable, removing from queues") --@end-debug@]===]
|
||||
mainq[guid], staleq[guid] = nil, nil
|
||||
elseif not CanInspect (unit) or not UnitIsConnected (unit) then
|
||||
--@debug@
|
||||
debug ("Cannot inspect "..unit..", aka "..(UnitName(unit) or "nil")..", moving to stale queue") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Cannot inspect "..unit..", aka "..(UnitName(unit) or "nil")..", moving to stale queue") --@end-debug@]===]
|
||||
mainq[guid], staleq[guid] = nil, 1
|
||||
else
|
||||
--@debug@
|
||||
debug ("Inspecting "..unit..", aka "..(UnitName(unit) or "nil")) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Inspecting "..unit..", aka "..(UnitName(unit) or "nil")) --@end-debug@]===]
|
||||
mainq[guid] = count + 1
|
||||
self.state.current_guid = guid
|
||||
NotifyInspect (unit)
|
||||
@@ -553,8 +558,8 @@ function lib:INSPECT_READY (guid)
|
||||
if guid == self.state.current_guid then
|
||||
self.state.current_guid = nil -- Got what we asked for
|
||||
finalize = true
|
||||
--@debug@
|
||||
debug ("Got inspection data for requested guid "..guid) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Got inspection data for requested guid "..guid) --@end-debug@]===]
|
||||
end
|
||||
|
||||
local mainq, staleq = self.state.mainq, self.state.staleq
|
||||
@@ -642,8 +647,8 @@ function lib:SendLatestSpecData ()
|
||||
datastr = datastr..COMMS_DELIM..0
|
||||
end
|
||||
|
||||
--@debug@
|
||||
debug ("Sending LGIST update to "..scope) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Sending LGIST update to "..scope) --@end-debug@]===]
|
||||
SendAddonMessage(COMMS_PREFIX, datastr, scope)
|
||||
end
|
||||
|
||||
@@ -667,8 +672,8 @@ msg_idx.end_talents = msg_idx.talents + MAX_TALENT_TIERS - 1
|
||||
|
||||
function lib:CHAT_MSG_ADDON (prefix, datastr, scope, sender)
|
||||
if prefix ~= COMMS_PREFIX or scope ~= self.commScope then return end
|
||||
--@debug@
|
||||
debug ("Incoming LGIST update from "..(scope or "nil").."/"..(sender or "nil")..": "..(datastr:gsub(COMMS_DELIM,";") or "nil")) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Incoming LGIST update from "..(scope or "nil").."/"..(sender or "nil")..": "..(datastr:gsub(COMMS_DELIM,";") or "nil")) --@end-debug@]===]
|
||||
|
||||
local data = { strsplit (COMMS_DELIM,datastr) }
|
||||
local fmt = data[msg_idx.fmt]
|
||||
@@ -735,8 +740,8 @@ function lib:CHAT_MSG_ADDON (prefix, datastr, scope, sender)
|
||||
mainq[guid], staleq[guid] = need_inspect, want_inspect
|
||||
if need_inspect or want_inspect then self.frame:Show () end
|
||||
|
||||
--@debug@
|
||||
debug ("Firing LGIST update event for unit "..unit..", GUID "..guid) --@end-debug@
|
||||
--[===[@debug@
|
||||
debug ("Firing LGIST update event for unit "..unit..", GUID "..guid) --@end-debug@]===]
|
||||
self.events:Fire (UPDATE_EVENT, guid, unit, info)
|
||||
self.events:Fire (QUEUE_EVENT)
|
||||
end
|
||||
@@ -791,8 +796,8 @@ function lib:UNIT_AURA (unit)
|
||||
if UnitIsVisible (unit) then
|
||||
if info.not_visible then
|
||||
info.not_visible = nil
|
||||
--@debug@
|
||||
debug (unit..", aka "..(UnitName(unit) or "nil")..", is now visible") --@end-debug@
|
||||
--[===[@debug@
|
||||
debug (unit..", aka "..(UnitName(unit) or "nil")..", is now visible") --@end-debug@]===]
|
||||
if not self.state.mainq[guid] then
|
||||
self.state.staleq[guid] = 1
|
||||
self.frame:Show ()
|
||||
@@ -800,11 +805,11 @@ function lib:UNIT_AURA (unit)
|
||||
end
|
||||
end
|
||||
elseif UnitIsConnected (unit) then
|
||||
--@debug@
|
||||
--[===[@debug@
|
||||
if not info.not_visible then
|
||||
debug (unit..", aka "..(UnitName(unit) or "nil")..", is no longer visible")
|
||||
end
|
||||
--@end-debug@
|
||||
--@end-debug@]===]
|
||||
info.not_visible = true
|
||||
end
|
||||
end
|
||||
|
||||
@@ -12,6 +12,11 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--> initialization stuff
|
||||
|
||||
local version, build, date, tocversion = GetBuildInfo()
|
||||
--in case someone is using details! retail version on BFA beta
|
||||
--also when BFA launches, it should work in case the player doesn't update it
|
||||
_detalhes.IsBFAClient = tocversion >= 80000
|
||||
|
||||
do
|
||||
|
||||
local _detalhes = _G._detalhes
|
||||
|
||||
@@ -2655,6 +2655,9 @@ local set_text_size = function (bar, instance)
|
||||
end
|
||||
end
|
||||
|
||||
--> this is the in bar icon (icon inside the player bar, like faction or role icon) padding, icon has the row height as is width and height - padding
|
||||
local InBarIconPadding = 0
|
||||
|
||||
--[[ exported]] function _detalhes:SetBarLeftText (bar, instance, enemy, arena_enemy, arena_ally, UsingCustomLeftText)
|
||||
|
||||
local bar_number = ""
|
||||
@@ -2667,9 +2670,9 @@ end
|
||||
if (_detalhes.show_arena_role_icon) then
|
||||
--> show arena role icon
|
||||
if (UsingCustomLeftText) then
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. instance.row_info.height .. ":" .. instance.row_info.height .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t ", self, instance.showing))
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t ", self, instance.showing))
|
||||
else
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. instance.row_info.height .. ":" .. instance.row_info.height .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t " .. self.displayName)
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t " .. self.displayName)
|
||||
end
|
||||
else
|
||||
--don't show arena role icon
|
||||
@@ -2682,24 +2685,24 @@ end
|
||||
else
|
||||
if (_detalhes.faction_against == "Horde") then
|
||||
if (UsingCustomLeftText) then
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\AddOns\\Details\\images\\icones_barra:"..instance.row_info.height..":"..instance.row_info.height..":0:0:256:32:0:32:0:32|t", self, instance.showing))
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\AddOns\\Details\\images\\icones_barra:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:32:0:32:0:32|t", self, instance.showing))
|
||||
else
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\AddOns\\Details\\images\\icones_barra:"..instance.row_info.height..":"..instance.row_info.height..":0:0:256:32:0:32:0:32|t"..self.displayName) --seta o texto da esqueda -- HORDA
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\AddOns\\Details\\images\\icones_barra:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:32:0:32:0:32|t"..self.displayName) --seta o texto da esqueda -- HORDA
|
||||
end
|
||||
else --alliance
|
||||
if (UsingCustomLeftText) then
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\AddOns\\Details\\images\\icones_barra:"..instance.row_info.height..":"..instance.row_info.height..":0:0:256:32:32:64:0:32|t", self, instance.showing))
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\AddOns\\Details\\images\\icones_barra:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:32:32:64:0:32|t", self, instance.showing))
|
||||
else
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\AddOns\\Details\\images\\icones_barra:"..instance.row_info.height..":"..instance.row_info.height..":0:0:256:32:32:64:0:32|t"..self.displayName) --seta o texto da esqueda -- ALLY
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\AddOns\\Details\\images\\icones_barra:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:32:32:64:0:32|t"..self.displayName) --seta o texto da esqueda -- ALLY
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
if (arena_ally and _detalhes.show_arena_role_icon) then
|
||||
if (UsingCustomLeftText) then
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. instance.row_info.height .. ":" .. instance.row_info.height .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t ", self, instance.showing))
|
||||
bar.texto_esquerdo:SetText (_string_replace (instance.row_info.textL_custom_text, bar.colocacao, self.displayName, "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t ", self, instance.showing))
|
||||
else
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. instance.row_info.height .. ":" .. instance.row_info.height .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t " .. self.displayName)
|
||||
bar.texto_esquerdo:SetText (bar_number .. "|TInterface\\LFGFRAME\\UI-LFG-ICON-ROLES:" .. (instance.row_info.height - InBarIconPadding)..":"..(instance.row_info.height - InBarIconPadding) .. ":0:0:256:256:" .. _detalhes.role_texcoord [self.role or "NONE"] .. "|t " .. self.displayName)
|
||||
end
|
||||
else
|
||||
if (UsingCustomLeftText) then
|
||||
|
||||
@@ -475,7 +475,9 @@ end
|
||||
local instance1 = _detalhes:GetInstance (1)
|
||||
local instance2 = _detalhes:GetInstance (2)
|
||||
|
||||
_detalhes:CheckCoupleWindows (instance1, instance2)
|
||||
if (not instance1.ignore_mass_showhide and not instance2.ignore_mass_showhide) then
|
||||
_detalhes:CheckCoupleWindows (instance1, instance2)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
+76
-10
@@ -1264,7 +1264,14 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
checked [his_target] = true
|
||||
|
||||
for debuffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff (target, debuffIndex)
|
||||
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff (target, debuffIndex)
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff (target, debuffIndex)
|
||||
end
|
||||
|
||||
if (name and unitCaster) then
|
||||
local playerGUID = _UnitGUID (unitCaster)
|
||||
if (playerGUID) then
|
||||
@@ -1292,7 +1299,14 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
checked [his_target] = true
|
||||
|
||||
for debuffIndex = 1, 40 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("party"..raidIndex.."target", debuffIndex)
|
||||
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("party"..raidIndex.."target", debuffIndex)
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("party"..raidIndex.."target", debuffIndex)
|
||||
end
|
||||
|
||||
if (name and unitCaster) then
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
local playerGUID = _UnitGUID (unitCaster)
|
||||
@@ -1312,7 +1326,14 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
local rect = UnitReaction ("playertarget", "player")
|
||||
if (his_target and not checked [his_target] and rect and rect <= 4) then
|
||||
for debuffIndex = 1, 40 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
end
|
||||
|
||||
if (name and unitCaster) then
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
local playerGUID = _UnitGUID (unitCaster)
|
||||
@@ -1332,7 +1353,14 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
local reaction = UnitReaction ("playertarget", "player")
|
||||
if (reaction and reaction <= 4) then
|
||||
for debuffIndex = 1, 40 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
end
|
||||
|
||||
if (name and unitCaster) then
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
local playerGUID = _UnitGUID (unitCaster)
|
||||
@@ -1377,7 +1405,13 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
end
|
||||
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura (RaidIndex, buffIndex, nil, "HELPFUL")
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura (RaidIndex, buffIndex, nil, "HELPFUL")
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura (RaidIndex, buffIndex, nil, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and unitCaster == RaidIndex) then
|
||||
_detalhes.parser:add_buff_uptime (nil, cacheGetTime, playerGUID, playerName, 0x00000514, playerGUID, playerName, 0x00000514, 0x0, spellid, name, in_or_out)
|
||||
if (in_or_out == "BUFF_UPTIME_IN") then
|
||||
@@ -1407,7 +1441,13 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
end
|
||||
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura (PartyIndex, buffIndex, nil, "HELPFUL")
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura (PartyIndex, buffIndex, nil, "HELPFUL")
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura (PartyIndex, buffIndex, nil, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and unitCaster == PartyIndex) then
|
||||
_detalhes.parser:add_buff_uptime (nil, cacheGetTime, playerGUID, playerName, 0x00000514, playerGUID, playerName, 0x00000514, 0x0, spellid, name, in_or_out)
|
||||
|
||||
@@ -1425,7 +1465,14 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
|
||||
--> unitCaster return player instead of raidIndex
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and unitCaster == "player") then
|
||||
local playerName = _UnitName ("player")
|
||||
local playerGUID = _UnitGUID ("player")
|
||||
@@ -1469,7 +1516,14 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
|
||||
for groupIndex = 1, _GetNumGroupMembers()-1 do
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("party"..groupIndex, buffIndex, nil, "HELPFUL")
|
||||
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("party"..groupIndex, buffIndex, nil, "HELPFUL")
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("party"..groupIndex, buffIndex, nil, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and unitCaster == "party"..groupIndex) then
|
||||
|
||||
local playerName, realmName = _UnitName ("party"..groupIndex)
|
||||
@@ -1495,7 +1549,13 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
end
|
||||
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and unitCaster == "player") then
|
||||
local playerName = _UnitName ("player")
|
||||
local playerGUID = _UnitGUID ("player")
|
||||
@@ -1536,7 +1596,13 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
local focus_augmentation = {}
|
||||
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
local name, unitCaster, spellid
|
||||
if (_detalhes.IsBFAClient) then --8.0 compatibility
|
||||
name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
else
|
||||
name, _, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and unitCaster == "player") then
|
||||
local playerName = _UnitName ("player")
|
||||
local playerGUID = _UnitGUID ("player")
|
||||
|
||||
+35
-8
@@ -111,12 +111,26 @@
|
||||
end
|
||||
|
||||
local boss_found = function (index, name, zone, mapid, diff, encounterid)
|
||||
|
||||
local ejid = EJ_GetCurrentInstance()
|
||||
if (ejid == 0) then
|
||||
ejid = _detalhes:GetInstanceEJID()
|
||||
|
||||
local ejid
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
local mapID = C_Map.GetBestMapForUnit ("player")
|
||||
if (mapID) then
|
||||
ejid = EJ_GetInstanceForMap (mapID)
|
||||
end
|
||||
|
||||
if (not mapID) then
|
||||
--print ("Details! exeption handled: zone has no map")
|
||||
return
|
||||
end
|
||||
else
|
||||
ejid = EJ_GetCurrentInstance()
|
||||
if (ejid == 0) then
|
||||
ejid = _detalhes:GetInstanceEJID()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local boss_table = {
|
||||
index = index,
|
||||
name = name,
|
||||
@@ -519,10 +533,23 @@
|
||||
local encounterID, encounterName, difficultyID, raidSize, endStatus = unpack (from_encounter_end)
|
||||
if (encounterID) then
|
||||
local ZoneName, InstanceType, DifficultyID, DifficultyName, _, _, _, ZoneMapID = GetInstanceInfo()
|
||||
local ejid = EJ_GetCurrentInstance()
|
||||
if (ejid == 0) then
|
||||
ejid = _detalhes:GetInstanceEJID()
|
||||
|
||||
local ejid
|
||||
if (_detalhes.IsBFAClient) then
|
||||
local mapID = C_Map.GetBestMapForUnit ("player")
|
||||
|
||||
if (not mapID) then
|
||||
mapID = 0
|
||||
end
|
||||
|
||||
ejid = EJ_GetInstanceForMap (mapID)
|
||||
else
|
||||
ejid = EJ_GetCurrentInstance()
|
||||
if (ejid == 0) then
|
||||
ejid = _detalhes:GetInstanceEJID()
|
||||
end
|
||||
end
|
||||
|
||||
local _, boss_index = _detalhes:GetBossEncounterDetailsFromEncounterId (ZoneMapID, encounterID)
|
||||
|
||||
_detalhes.tabela_vigente.is_boss = {
|
||||
|
||||
+7
-1
@@ -9,7 +9,13 @@ local floor = floor
|
||||
|
||||
local GetNumGroupMembers = GetNumGroupMembers
|
||||
local ItemUpgradeInfo = LibStub ("LibItemUpgradeInfo-1.0")
|
||||
local LibGroupInSpecT = LibStub ("LibGroupInSpecT-1.1")
|
||||
|
||||
local LibGroupInSpecT
|
||||
if (_detalhes.IsBFAClient) then
|
||||
--nop
|
||||
else
|
||||
LibGroupInSpecT = LibStub ("LibGroupInSpecT-1.1")
|
||||
end
|
||||
|
||||
local storageDebug = false
|
||||
local store_instances = _detalhes.InstancesToStoreData
|
||||
|
||||
+11
-6
@@ -683,13 +683,18 @@
|
||||
}
|
||||
|
||||
function _detalhes:IsInCity()
|
||||
SetMapToCurrentZone()
|
||||
local mapFileName, _, _, _, microDungeonMapName = GetMapInfo()
|
||||
if (_detalhes.IsBFAClient) then
|
||||
return false
|
||||
else
|
||||
SetMapToCurrentZone()
|
||||
local mapFileName, _, _, _, microDungeonMapName = GetMapInfo()
|
||||
|
||||
if (city_zones [mapFileName]) then
|
||||
return true
|
||||
elseif (microDungeonMapName and type (microDungeonMapName) == "string" and sub_zones [microDungeonMapName]) then
|
||||
return true
|
||||
end
|
||||
|
||||
if (city_zones [mapFileName]) then
|
||||
return true
|
||||
elseif (microDungeonMapName and type (microDungeonMapName) == "string" and sub_zones [microDungeonMapName]) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+57
-6
@@ -2586,10 +2586,22 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
|
||||
AlternatePowerEnableFrame:SetScript ("OnEvent", function (self, event)
|
||||
if (event == "UNIT_POWER_BAR_SHOW") then
|
||||
AlternatePowerMonitorFrame:RegisterEvent ("UNIT_POWER")
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
AlternatePowerMonitorFrame:RegisterEvent ("UNIT_POWER_UPDATE")
|
||||
else
|
||||
AlternatePowerMonitorFrame:RegisterEvent ("UNIT_POWER")
|
||||
end
|
||||
|
||||
AlternatePowerEnableFrame.IsRunning = true
|
||||
elseif (AlternatePowerEnableFrame.IsRunning and (event == "ENCOUNTER_END" or event == "PLAYER_REGEN_ENABLED")) then -- and not InCombatLockdown()
|
||||
AlternatePowerMonitorFrame:UnregisterEvent ("UNIT_POWER")
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
AlternatePowerMonitorFrame:UnregisterEvent ("UNIT_POWER_UPDATE")
|
||||
else
|
||||
AlternatePowerMonitorFrame:UnregisterEvent ("UNIT_POWER")
|
||||
end
|
||||
|
||||
AlternatePowerEnableFrame.IsRunning = false
|
||||
end
|
||||
end)
|
||||
@@ -3511,7 +3523,15 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
for i = 1, (_GetNumGroupMembers() + (unit_type == "party" and -1 or 0)) do
|
||||
for auraIndex = 1, 40 do
|
||||
--gbom
|
||||
local name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura (unit_type .. i, auraIndex, "HELPFUL")
|
||||
|
||||
local name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
name, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura (unit_type .. i, auraIndex, "HELPFUL")
|
||||
else
|
||||
name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura (unit_type .. i, auraIndex, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and caster and (UnitInRaid (caster) or UnitInParty (caster))) then
|
||||
if (spellId == SPELLID_SHAMAN_SLASH_AURA) then
|
||||
local source_serial = UnitGUID (caster)
|
||||
@@ -3532,7 +3552,15 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
if (unit_type == "party") then
|
||||
for auraIndex = 1, 40 do
|
||||
--gbom
|
||||
local name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura ("player", auraIndex, "HELPFUL")
|
||||
|
||||
local name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
name, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura ("player", auraIndex, "HELPFUL")
|
||||
else
|
||||
name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura ("player", auraIndex, "HELPFUL")
|
||||
end
|
||||
|
||||
if (name and caster and (UnitInParty (caster))) then
|
||||
if (spellId == SPELLID_SHAMAN_SLASH_AURA) then
|
||||
local source_serial = UnitGUID (caster)
|
||||
@@ -3561,7 +3589,15 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
return unpack (real_source)
|
||||
else
|
||||
--query the player buffs if not found on cache
|
||||
local name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura (actor_name, spellname)
|
||||
|
||||
local name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
name, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura (actor_name, spellname)
|
||||
else
|
||||
name, rank, texture, count, debuffType, duration, expirationTime, caster, canStealOrPurge, nameplateShowPersonal, spellId = UnitAura (actor_name, spellname)
|
||||
end
|
||||
|
||||
if (name) then
|
||||
local source_serial = UnitGUID (caster)
|
||||
if (source_serial) then
|
||||
@@ -4685,6 +4721,21 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
|
||||
|
||||
function _detalhes:OnParserEvent (evento, time, token, hidding, who_serial, who_name, who_flags, who_flags2, alvo_serial, alvo_name, alvo_flags, alvo_flags2, ...)
|
||||
|
||||
|
||||
-- 8.0 changed
|
||||
if (_detalhes.IsBFAClient) then
|
||||
local time, token, hidding, who_serial, who_name, who_flags, who_flags2, target_serial, target_name, target_flags, target_flags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12 = CombatLogGetCurrentEventInfo()
|
||||
|
||||
local funcao = token_list [token]
|
||||
if (funcao) then
|
||||
return funcao (nil, token, time, who_serial, who_name, who_flags, target_serial, target_name, target_flags, target_flags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
|
||||
end
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
local funcao = token_list [token]
|
||||
|
||||
-- if (token == "COMBATANT_INFO") then
|
||||
@@ -4694,7 +4745,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
-- if (who_name == "Ditador") then
|
||||
-- print (token, alvo_name, ...)
|
||||
-- end
|
||||
|
||||
|
||||
if (funcao) then
|
||||
--if (token ~= "SPELL_AURA_REFRESH" and token ~= "SPELL_AURA_REMOVED" and token ~= "SPELL_AURA_APPLIED") then
|
||||
-- print ("running func:", token)
|
||||
|
||||
+16
-1
@@ -332,7 +332,22 @@ do
|
||||
end
|
||||
|
||||
function _detalhes:GetCurrentDungeonBossListFromEJ()
|
||||
local EJ_CInstance = EJ_GetCurrentInstance()
|
||||
|
||||
local EJ_CInstance
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
local mapID = C_Map.GetBestMapForUnit ("player")
|
||||
|
||||
if (not mapID) then
|
||||
--print ("Details! exeption handled: zone has no map")
|
||||
return
|
||||
end
|
||||
|
||||
EJ_CInstance = EJ_GetInstanceForMap (mapID)
|
||||
else
|
||||
EJ_CInstance = EJ_GetCurrentInstance()
|
||||
end
|
||||
|
||||
if (EJ_CInstance and EJ_CInstance ~= 0) then
|
||||
if (_detalhes.encounter_dungeons [EJ_CInstance]) then
|
||||
return _detalhes.encounter_dungeons [EJ_CInstance]
|
||||
|
||||
@@ -920,3 +920,151 @@ if (debugmode) then
|
||||
end
|
||||
|
||||
-- endd
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
-->
|
||||
|
||||
--[=[
|
||||
C_Timer.After (2, function()
|
||||
|
||||
|
||||
local Details = _G._detalhes
|
||||
|
||||
--create the left side frame, need a minimize button only
|
||||
--title bar and a minimize button
|
||||
|
||||
local f = CreateFrame ("frame", "DetailsBetaRaidTest", UIParent)
|
||||
--f:Hide()
|
||||
|
||||
f:RegisterEvent ("ZONE_CHANGED_NEW_AREA")
|
||||
f:RegisterEvent ("ENCOUNTER_START")
|
||||
f:RegisterEvent ("ENCOUNTER_END")
|
||||
|
||||
|
||||
f:SetScript ("OnEvent", function (self, event, ...)
|
||||
|
||||
if (event == "ZONE_CHANGED_NEW_AREA") then
|
||||
local zoneName, zoneType, _, _, _, _, _, zoneMapID = GetInstanceInfo()
|
||||
if (zoneName and zoneType == "raid") then
|
||||
f.InRaidInstance = true
|
||||
else
|
||||
f.InRaidInstance = false
|
||||
f:Hide()
|
||||
end
|
||||
|
||||
elseif (event == "ENCOUNTER_END" and _G.WeakAuras) then
|
||||
if (f.InRaidInstance) then
|
||||
f:Show()
|
||||
end
|
||||
|
||||
elseif (event == "ENCOUNTER_START") then
|
||||
f:Hide()
|
||||
end
|
||||
|
||||
end)
|
||||
|
||||
f:SetSize (150, 150)
|
||||
f:SetPoint ("left", UIParent, "left", 0, -150)
|
||||
f:SetFrameStrata ("LOW")
|
||||
f:EnableMouse (true)
|
||||
f:SetMovable (true)
|
||||
f:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
|
||||
f:SetBackdropColor (0, 0, 0, 0.9)
|
||||
f:SetBackdropBorderColor (0, 0, 0, 1)
|
||||
|
||||
--minimized frame
|
||||
f.FrameMinimized = CreateFrame ("frame", "DetailsBetaRaidTestMinimized", UIParent)
|
||||
local fMinimized = f.FrameMinimized
|
||||
|
||||
fMinimized:SetSize (20, 20)
|
||||
fMinimized:SetPoint ("left", UIParent, "left", 0, 0)
|
||||
fMinimized:SetFrameStrata ("LOW")
|
||||
fMinimized:EnableMouse (true)
|
||||
fMinimized:SetMovable (true)
|
||||
fMinimized:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
|
||||
fMinimized:SetBackdropColor (0, 0, 0, 0.9)
|
||||
fMinimized:SetBackdropBorderColor (0, 0, 0, 1)
|
||||
fMinimized:Hide()
|
||||
|
||||
f.IsMinimized = false
|
||||
|
||||
--titlebar
|
||||
local titlebar = CreateFrame ("frame", nil, f)
|
||||
titlebar:SetPoint ("topleft", f, "topleft", 2, -3)
|
||||
titlebar:SetPoint ("topright", f, "topright", -2, -3)
|
||||
titlebar:SetHeight (20)
|
||||
titlebar:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]], tileSize = 64, tile = true})
|
||||
titlebar:SetBackdropColor (.5, .5, .5, 1)
|
||||
titlebar:SetBackdropBorderColor (0, 0, 0, 1)
|
||||
|
||||
--> title
|
||||
local titleLabel = _detalhes.gump:NewLabel (titlebar, titlebar, nil, "titulo", "Raid Test Helper", "GameFontHighlightLeft", 12, {227/255, 186/255, 4/255})
|
||||
titleLabel:SetPoint ("center", titlebar , "center")
|
||||
titleLabel:SetPoint ("top", titlebar , "top", 0, -5)
|
||||
f.TitleText = titleLabel
|
||||
|
||||
|
||||
local fw = Details.gump
|
||||
|
||||
--weakauras
|
||||
local open_aura_dbm_timer= function()
|
||||
--> open details! aura panel for
|
||||
|
||||
end
|
||||
|
||||
local open_debuff_aura= function()
|
||||
--> open plugin on the debuffs page
|
||||
|
||||
end
|
||||
|
||||
local DBMTimerButton = fw:CreateButton (f, open_aura_dbm_timer, 140, 20, "Create Big Boss Timer", _, _, _, _, _, -1, fw:GetTemplate ("button", "OPTIONS_BUTTON_TEMPLATE"), fw:GetTemplate ("font", "OPTIONS_FONT_TEMPLATE"))
|
||||
local DebuffAuraButton = fw:CreateButton (f, open_debuff_aura, 140, 20, "Create Boss Debuff Aura", _, _, _, _, _, -1, fw:GetTemplate ("button", "OPTIONS_BUTTON_TEMPLATE"), fw:GetTemplate ("font", "OPTIONS_FONT_TEMPLATE"))
|
||||
|
||||
--all spells
|
||||
|
||||
local open_boss_spells = function()
|
||||
|
||||
end
|
||||
local BossSpellsButton = fw:CreateButton (f, open_boss_spells, 140, 20)
|
||||
|
||||
--set the positions
|
||||
local YStart = -28
|
||||
DBMTimerButton:SetPoint (5, YStart)
|
||||
DebuffAuraButton:SetPoint (5, YStart * 2)
|
||||
|
||||
|
||||
|
||||
|
||||
Details! Beta Helper
|
||||
|
||||
All Spells:
|
||||
- show a list of spells
|
||||
|
||||
Timers:
|
||||
- show when the spell cast some spells
|
||||
|
||||
|
||||
* on hover over the create dbm timer button showing a .gif showing how the timer works
|
||||
* clicking on it open the Spell List in the dbm or bigwigs panel
|
||||
|
||||
* on click on create aura for debuff, open the encoutnern details panel on the aura creation
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
end)
|
||||
|
||||
--]=]
|
||||
+17
-1
@@ -985,6 +985,7 @@ local default_profile = {
|
||||
report_to_who = "",
|
||||
report_heal_links = false,
|
||||
report_schema = 1,
|
||||
deny_score_messages = false,
|
||||
|
||||
--> colors
|
||||
default_bg_color = 0.0941,
|
||||
@@ -1409,7 +1410,22 @@ function _detalhes:RestoreState_CurrentMythicDungeonRun()
|
||||
local savedTable = _detalhes.mythic_dungeon_currentsaved
|
||||
local mythicLevel = C_ChallengeMode.GetActiveKeystoneInfo()
|
||||
local zoneName, _, _, _, _, _, _, currentZoneID = GetInstanceInfo()
|
||||
local ejID = EJ_GetCurrentInstance()
|
||||
|
||||
local ejID = 0
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
local mapID = C_Map.GetBestMapForUnit ("player")
|
||||
|
||||
if (not mapID) then
|
||||
return
|
||||
end
|
||||
|
||||
if (mapID) then
|
||||
ejID = EJ_GetInstanceForMap (mapID) or 0
|
||||
end
|
||||
else
|
||||
ejID = EJ_GetCurrentInstance() or 0
|
||||
end
|
||||
|
||||
--> is there a saved state for the dungeon?
|
||||
if (savedTable.started) then
|
||||
|
||||
@@ -1923,7 +1923,7 @@ local barra_scripts_onleave = function (self)
|
||||
self.mouse_over = false
|
||||
OnLeaveMainWindow (self._instance, self)
|
||||
|
||||
_GameTooltip:Hide()
|
||||
--_GameTooltip:Hide()
|
||||
GameCooltip:ShowMe (false)
|
||||
|
||||
self:SetBackdrop (barra_backdrop_onleave)
|
||||
@@ -2268,7 +2268,7 @@ local icon_frame_on_enter = function (self)
|
||||
end
|
||||
local icon_frame_on_leave = function (self)
|
||||
GameCooltip:Hide()
|
||||
GameTooltip:Hide()
|
||||
--GameTooltip:Hide()
|
||||
|
||||
if (self.row.icone_classe:GetTexture() ~= "") then
|
||||
--self.row.icone_classe:SetSize (self.row.icone_classe:GetWidth()-1, self.row.icone_classe:GetWidth()-1)
|
||||
|
||||
+26
-6
@@ -245,16 +245,17 @@ function _G._detalhes:Start()
|
||||
--> load parser capture options
|
||||
self:CaptureRefresh()
|
||||
--> register parser events
|
||||
if (not _detalhes.IsBFAClient) then
|
||||
self.listener:RegisterEvent ("SPELL_SUMMON")
|
||||
self.listener:RegisterEvent ("PARTY_MEMBERS_CHANGED")
|
||||
self.listener:RegisterEvent ("PARTY_CONVERTED_TO_RAID")
|
||||
end
|
||||
|
||||
self.listener:RegisterEvent ("PLAYER_REGEN_DISABLED")
|
||||
self.listener:RegisterEvent ("PLAYER_REGEN_ENABLED")
|
||||
self.listener:RegisterEvent ("SPELL_SUMMON")
|
||||
self.listener:RegisterEvent ("UNIT_PET")
|
||||
|
||||
self.listener:RegisterEvent ("PARTY_MEMBERS_CHANGED")
|
||||
self.listener:RegisterEvent ("GROUP_ROSTER_UPDATE")
|
||||
self.listener:RegisterEvent ("PARTY_CONVERTED_TO_RAID")
|
||||
|
||||
self.listener:RegisterEvent ("GROUP_ROSTER_UPDATE")
|
||||
self.listener:RegisterEvent ("INSTANCE_ENCOUNTER_ENGAGE_UNIT")
|
||||
|
||||
self.listener:RegisterEvent ("ZONE_CHANGED_NEW_AREA")
|
||||
@@ -284,6 +285,11 @@ function _G._detalhes:Start()
|
||||
--> check if can enabled the immersino stuff
|
||||
|
||||
function immersionFrame.CheckIfCanEnableImmersion()
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
return
|
||||
end
|
||||
|
||||
local mapFileName = GetMapInfo()
|
||||
if (mapFileName and mapFileName:find ("InvasionPoint")) then
|
||||
self.immersion_enabled = true
|
||||
@@ -980,8 +986,22 @@ function _G._detalhes:Start()
|
||||
|
||||
local mythicLevel = C_ChallengeMode.GetActiveKeystoneInfo()
|
||||
local zoneName, _, _, _, _, _, _, currentZoneID = GetInstanceInfo()
|
||||
local ejID = EJ_GetCurrentInstance()
|
||||
|
||||
local ejID
|
||||
|
||||
if (_detalhes.IsBFAClient) then
|
||||
local mapID = C_Map.GetBestMapForUnit ("player")
|
||||
|
||||
if (not mapID) then
|
||||
--print ("Details! exeption handled: zone has no map")
|
||||
return
|
||||
end
|
||||
|
||||
ejID = EJ_GetInstanceForMap (mapID) or 0
|
||||
else
|
||||
ejID = EJ_GetCurrentInstance()
|
||||
end
|
||||
|
||||
--> setup the mythic run info
|
||||
self.MythicPlus.Started = true
|
||||
self.MythicPlus.DungeonName = zoneName
|
||||
|
||||
Reference in New Issue
Block a user