Mercurial > wow > pvpscan

changeset 22:fedcd7c21db9 v8.0.1.022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- 8.0.1 Update.
author Tercio
date Thu, 19 Jul 2018 21:14:00 -0300
parents e6394bca1798
children 16def64871df
files Libs/AceAddon-3.0/AceAddon-3.0.xml Libs/AceConfig-3.0/AceConfig-3.0.xml Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml Libs/AceConsole-3.0/AceConsole-3.0.xml Libs/AceDB-3.0/AceDB-3.0.xml Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml Libs/AceEvent-3.0/AceEvent-3.0.xml Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua Libs/LibSharedMedia-3.0/lib.xml Libs/LibWindow-1.1/LibWindow-1.1.lua PVPScan.lua PVPScan.toc PVPScan.xml media/bar_background.blp media/bar_serenity.blp media/bar_skyline.blp
diffstat 21 files changed, 81 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/Libs/AceAddon-3.0/AceAddon-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceAddon-3.0/AceAddon-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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>
\ No newline at end of file
+</Ui>
--- a/Libs/AceConfig-3.0/AceConfig-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConfig-3.0/AceConfig-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -5,4 +5,4 @@
 	<Include file="AceConfigDialog-3.0\AceConfigDialog-3.0.xml"/>
 	<!--<Include file="AceConfigDropdown-3.0\AceConfigDropdown-3.0.xml"/>-->
 	<Script file="AceConfig-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceConfigCmd-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua	Thu Jul 19 21:14:00 2018 -0300
@@ -1,13 +1,13 @@
 --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
 -- @class file
 -- @name AceConfigDialog-3.0
--- @release $Id: AceConfigDialog-3.0.lua 1167 2017-08-29 22:08:48Z funkydude $
+-- @release $Id: AceConfigDialog-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
 
 local LibStub = LibStub
 local gui = LibStub("AceGUI-3.0")
 local reg = LibStub("AceConfigRegistry-3.0")
 
-local MAJOR, MINOR = "AceConfigDialog-3.0", 64
+local MAJOR, MINOR = "AceConfigDialog-3.0", 66
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigDialog then return end
@@ -1034,6 +1034,7 @@
 				entry.value = k
 				entry.text = GetOptionsMemberValue("name", v, options, path, appName)
 				entry.icon = GetOptionsMemberValue("icon", v, options, path, appName)
+				entry.iconCoords = GetOptionsMemberValue("iconCoords", v, options, path, appName)
 				entry.disabled = CheckOptionDisabled(v, options, path, appName)
 				tinsert(tree,entry)
 				if recurse and (v.childGroups or "tree") == "tree" then
@@ -1226,6 +1227,8 @@
 								radio:SetWidth(width_multiplier * 2)
 							elseif width == "half" then
 								radio:SetWidth(width_multiplier / 2)
+							elseif (type(width) == "number") then
+								radio:SetWidth(width_multiplier * width)
 							elseif width == "full" then
 								radio.width = "fill"
 							else
@@ -1288,6 +1291,8 @@
 							control:SetWidth(width_multiplier * 2)
 						elseif width == "half" then
 							control:SetWidth(width_multiplier / 2)
+						elseif (type(width) == "number") then
+							control:SetWidth(width_multiplier * width)
 						elseif width == "full" then
 							control.width = "fill"
 						else
@@ -1324,6 +1329,8 @@
 								check:SetWidth(width_multiplier * 2)
 							elseif width == "half" then
 								check:SetWidth(width_multiplier / 2)
+							elseif (type(width) == "number") then
+								control:SetWidth(width_multiplier * width)
 							elseif width == "full" then
 								check.width = "fill"
 							else
@@ -1405,6 +1412,8 @@
 							control:SetWidth(width_multiplier * 2)
 						elseif width == "half" then
 							control:SetWidth(width_multiplier / 2)
+						elseif (type(width) == "number") then
+							control:SetWidth(width_multiplier * width)
 						elseif width == "full" then
 							control.width = "fill"
 						else
--- a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceConfigDialog-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua	Thu Jul 19 21:14:00 2018 -0300
@@ -8,10 +8,10 @@
 -- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
 -- @class file
 -- @name AceConfigRegistry-3.0
--- @release $Id: AceConfigRegistry-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
+-- @release $Id: AceConfigRegistry-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
 local CallbackHandler = LibStub("CallbackHandler-1.0")
 
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 17
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 18
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigRegistry then return end
@@ -67,6 +67,7 @@
 local opttable={["nil"]=true,["table"]=true,  _="table"}
 local optbool={["nil"]=true,["boolean"]=true,  _="boolean"}
 local optboolnumber={["nil"]=true,["boolean"]=true,["number"]=true,  _="boolean or number"}
+local optstringnumber={["nil"]=true,["string"]=true,["number"]=true, _="string or number"}
 
 local basekeys={
 	type=isstring,
@@ -90,7 +91,7 @@
 	set=optmethodfalse,
 	func=optmethodfalse,
 	arg={["*"]=true},
-	width=optstring,
+	width=optstringnumber,
 }
 
 local typedkeys={
--- a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceConfigRegistry-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceConsole-3.0/AceConsole-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceConsole-3.0/AceConsole-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceConsole-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceDB-3.0/AceDB-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceDB-3.0/AceDB-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceDB-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceDBOptions-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceEvent-3.0/AceEvent-3.0.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/AceEvent-3.0/AceEvent-3.0.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="AceEvent-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua	Thu Jul 19 21:14:00 2018 -0300
@@ -1,39 +1,12 @@
---[[
-Name: DBIcon-1.0
-Revision: $Rev: 34 $
-Author(s): Rabbit (rabbit.magtheridon@gmail.com)
-Description: Allows addons to register to recieve a lightweight minimap icon as an alternative to more heavy LDB displays.
-Dependencies: LibStub
-License: GPL v2 or later.
-]]
-
---[[
-Copyright (C) 2008-2011 Rabbit
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-]]
 
 -----------------------------------------------------------------------
--- DBIcon-1.0
+-- LibDBIcon-1.0
 --
--- Disclaimer: Most of this code was ripped from Barrel but fixed, streamlined
---             and cleaned up a lot so that it no longer sucks.
+-- Allows addons to easily create a lightweight minimap icon as an alternative to heavier LDB displays.
 --
 
 local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = tonumber(("$Rev: 34 $"):match("(%d+)"))
+local DBICON10_MINOR = 36 -- Bump on changes
 if not LibStub then error(DBICON10 .. " requires LibStub.") end
 local ldb = LibStub("LibDataBroker-1.1", true)
 if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
@@ -45,8 +18,9 @@
 lib.callbackRegistered = lib.callbackRegistered or nil
 lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
 lib.notCreated = lib.notCreated or {}
+lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
 
-function lib:IconCallback(event, name, key, value, dataobj)
+function lib:IconCallback(event, name, key, value)
 	if lib.objects[name] then
 		if key == "icon" then
 			lib.objects[name].icon:SetTexture(value)
@@ -73,7 +47,6 @@
 	lib.callbackRegistered = true
 end
 
--- Tooltip code ripped from StatBlockCore by Funkydude
 local function getAnchors(frame)
 	local x, y = frame:GetCenter()
 	if not x or not y then return "CENTER" end
@@ -86,10 +59,10 @@
 	if self.isMoving then return end
 	local obj = self.dataObject
 	if obj.OnTooltipShow then
-		GameTooltip:SetOwner(self, "ANCHOR_NONE")
-		GameTooltip:SetPoint(getAnchors(self))
-		obj.OnTooltipShow(GameTooltip)
-		GameTooltip:Show()
+		lib.tooltip:SetOwner(self, "ANCHOR_NONE")
+		lib.tooltip:SetPoint(getAnchors(self))
+		obj.OnTooltipShow(lib.tooltip)
+		lib.tooltip:Show()
 	elseif obj.OnEnter then
 		obj.OnEnter(self)
 	end
@@ -97,13 +70,13 @@
 
 local function onLeave(self)
 	local obj = self.dataObject
-	GameTooltip:Hide()
+	lib.tooltip:Hide()
 	if obj.OnLeave then obj.OnLeave(self) end
 end
 
 --------------------------------------------------------------------------------
 
-local onClick, onMouseUp, onMouseDown, onDragStart, onDragStop, onDragEnd, updatePosition
+local onClick, onMouseUp, onMouseDown, onDragStart, onDragStop, updatePosition
 
 do
 	local minimapShapes = {
@@ -165,7 +138,7 @@
 		self.icon:UpdateCoord()
 		self:SetScript("OnUpdate", onUpdate)
 		self.isMoving = true
-		GameTooltip:Hide()
+		lib.tooltip:Hide()
 	end
 end
 
@@ -197,14 +170,14 @@
 	button:SetFrameLevel(8)
 	button:RegisterForClicks("anyUp")
 	button:RegisterForDrag("LeftButton")
-	button:SetHighlightTexture("Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight")
+	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
 	local overlay = button:CreateTexture(nil, "OVERLAY")
 	overlay:SetSize(53, 53)
-	overlay:SetTexture("Interface\\Minimap\\MiniMap-TrackingBorder")
+	overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
 	overlay:SetPoint("TOPLEFT")
 	local background = button:CreateTexture(nil, "BACKGROUND")
 	background:SetSize(20, 20)
-	background:SetTexture("Interface\\Minimap\\UI-Minimap-Background")
+	background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
 	background:SetPoint("TOPLEFT", 7, -5)
 	local icon = button:CreateTexture(nil, "ARTWORK")
 	icon:SetSize(17, 17)
--- a/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua	Thu Jul 19 21:14:00 2018 -0300
@@ -2,7 +2,7 @@
 assert(LibStub, "LibDataBroker-1.1 requires LibStub")
 assert(LibStub:GetLibrary("CallbackHandler-1.0", true), "LibDataBroker-1.1 requires CallbackHandler-1.0")
 
-local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 3)
+local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 4)
 if not lib then return end
 oldminor = oldminor or 0
 
@@ -64,3 +64,27 @@
 		return self.namestorage[dataobject]
 	end
 end
+
+if oldminor < 4 then
+	local next = pairs(attributestorage)
+	function lib:pairs(dataobject_or_name)
+		local t = type(dataobject_or_name)
+		assert(t == "string" or t == "table", "Usage: ldb:pairs('dataobjectname') or ldb:pairs(dataobject)")
+
+		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
+		assert(attributestorage[dataobj], "Data object not found")
+
+		return next, attributestorage[dataobj], nil
+	end
+
+	local ipairs_iter = ipairs(attributestorage)
+	function lib:ipairs(dataobject_or_name)
+		local t = type(dataobject_or_name)
+		assert(t == "string" or t == "table", "Usage: ldb:ipairs('dataobjectname') or ldb:ipairs(dataobject)")
+
+		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
+		assert(attributestorage[dataobj], "Data object not found")
+
+		return ipairs_iter, attributestorage[dataobj], 0
+	end
+end
--- a/Libs/LibSharedMedia-3.0/lib.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/LibSharedMedia-3.0/lib.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -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="LibSharedMedia-3.0.lua" />
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/LibWindow-1.1/LibWindow-1.1.lua	Sat Dec 09 11:05:03 2017 -0200
+++ b/Libs/LibWindow-1.1/LibWindow-1.1.lua	Thu Jul 19 21:14:00 2018 -0300
@@ -1,4 +1,4 @@
---[[
+--[[
 Name: LibWindow-1.1
 Revision: $Rev: 8 $
 Author(s): Mikk (dpsgnome@mail.com)
--- a/PVPScan.lua	Sat Dec 09 11:05:03 2017 -0200
+++ b/PVPScan.lua	Thu Jul 19 21:14:00 2018 -0300
@@ -1,3 +1,4 @@
+
 
 PVPScan = LibStub ("AceAddon-3.0"):NewAddon ("PVPScan", "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0")
 
@@ -7,12 +8,15 @@
 local LibWindow = LibStub ("LibWindow-1.1")
 local SharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0")
 
+SharedMedia:Register ("statusbar", "Details Serenity", [[Interface\AddOns\PVPScan\media\bar_serenity]])
+SharedMedia:Register ("statusbar", "Skyline", [[Interface\AddOns\PVPScan\media\bar_skyline]])
+SharedMedia:Register ("statusbar", "DGround", [[Interface\AddOns\PVPScan\media\bar_background]])
+
 local _bit_band = bit.band
 local GetTime = GetTime
 
 local REACTION_HOSTILE = 0x00000040
 local REACTION_NEUTRAL = 0x00000020
-
 local OBJECT_TYPE_PLAYER = 0x00000400
 
 PVPScan.IsInBattleground = false
@@ -26,7 +30,7 @@
 		SpotBarHeight = 20,
 		SpotBarAmount = 5,
 		SpotBarWidth = 150,
-		SpotBarTexture = "Blizzard Character Skills Bar",
+		SpotBarTexture = "DGround",
 		SpotBarTimeOut = 10,
 		SpotBarCooldown = 5,
 		SpotBarPlayerCooldown = 10,
@@ -307,10 +311,12 @@
 	PVPScan.EventFrame = CreateFrame ("frame", "PVPScanCombatLobReader", UIParent)
 	PVPScan.EventFrame:RegisterEvent ("COMBAT_LOG_EVENT_UNFILTERED")
 
-	function PVPScan:OnParserEvent (event, time, token, hidding, who_serial, who_name, who_flags, who_flags2, target_serial, target_name, target_flags, target_flags2, ...)
+	function PVPScan:OnParserEvent()
+	
+		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()
 
 		if (PVPScan.NeedClass [who_name]) then
-			local class = PVPScan:GuessClass (...)
+			local class = PVPScan:GuessClass (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
 			if (class) then
 				PVPScan:UpdateBar (PVPScan.SpotBars [PVPScan.CurrentShownPlayers [who_name]], who_name, class, true)
 				PVPScan.NeedClass [who_name] = nil
@@ -324,7 +330,7 @@
 				if (pvpType ~= "contested" and pvpType ~= "hostile") then
 					return
 				end
-				local class = PVPScan:GuessClass (...)
+				local class = PVPScan:GuessClass (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
 				PVPScan:EnemySpoted (target_name, target_serial, target_flags, class)
 			end
 		end
@@ -335,7 +341,7 @@
 				if (pvpType ~= "contested" and pvpType ~= "hostile") then
 					return
 				end
-				local class = PVPScan:GuessClass (...)
+				local class = PVPScan:GuessClass (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
 				PVPScan:EnemySpoted (who_name, who_serial, who_flags, class)
 			end
 		end
--- a/PVPScan.toc	Sat Dec 09 11:05:03 2017 -0200
+++ b/PVPScan.toc	Thu Jul 19 21:14:00 2018 -0300
@@ -1,4 +1,4 @@
-## Interface: 70300
+## Interface: 80000
 ## Title: PVPScan
 ## Notes: Track enemies near you
 ## Version: 0.1
@@ -8,5 +8,6 @@
 libs.xml
 #@end-no-lib-strip@
 
+PVPScan.lua
 PVPScan.xml
 Details_ClassSpellList.lua
\ No newline at end of file
--- a/PVPScan.xml	Sat Dec 09 11:05:03 2017 -0200
+++ b/PVPScan.xml	Thu Jul 19 21:14:00 2018 -0300
@@ -1,5 +1,4 @@
-<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
-	<Script file="PVPScan.lua"/>
+<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">
 	
 	<Frame name="PVPScanFrame" frameStrata="HIGH" hidden="false" parent="UIParent" movable="true">
 		<Size>
Binary file media/bar_background.blp has changed
Binary file media/bar_serenity.blp has changed
Binary file media/bar_skyline.blp has changed