Mercurial > wow > pvpscan

diff PVPScan.lua @ 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 d200c55c85fb
children
line wrap: on
line diff
--- 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