Mercurial > wow > hansgar_and_franzok_assist

changeset 38:219f04e5ba55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- small bug fixes.
author Tercio
date Mon, 04 Jul 2016 23:06:23 -0300
parents a061f21979d4
children 7944c081e5b4
files Hansgar_And_Franzok_Assist.lua
diffstat 1 files changed, 25 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Hansgar_And_Franzok_Assist.lua	Tue May 31 17:59:38 2016 -0300
+++ b/Hansgar_And_Franzok_Assist.lua	Mon Jul 04 23:06:23 2016 -0300
@@ -248,7 +248,7 @@
 
 function f:CommReceived (_, data, _, source)
 	if (data == "US") then
-		f:SendCommMessage ("HAFR", UnitName ("player") .. " " .. f.version, "RAID")
+		f:SendCommMessage ("HAFR", (UnitName ("player") or "") .. " " .. f.version, "RAID")
 	elseif (f.users) then
 		f.users [data] = true
 	end
@@ -383,7 +383,7 @@
 		if (encounterID == 1693 and difficultyID == 16) then
 		
 			if (event == "ENCOUNTER_START") then
-				print ("|cFFFFAA00Hansgar and Franzok Assist|r: addon enabled, good look!")
+				--print ("|cFFFFAA00Hansgar and Franzok Assist|r: addon enabled, good look!")
 			
 				if (f.StampersPhase) then
 					f:StopTracking()
@@ -836,27 +836,29 @@
 
 f:SetScript ("OnEvent", function (self, event, time, token, _, who_serial, who_name, who_flags, _, target_serial, target_name, target_flags, _, spellid, spellname, spellschool, buff_type, buff_name)
 
-	if (token == "SPELL_AURA_APPLIED" and spellid == 162124 and not f.StampersPhase) then
-		f:StartTracking()
-		f:EndTrackPlayerPosition()
-		
-	elseif (token == "SPELL_AURA_REMOVED" and spellid == 162124 and f.StampersPhase) then
-		f:StopTracking()
-		if (db.SHOW_DANCE) then
-			f:StartTrackPlayerPosition()
+	if (spellid) then
+		if (token == "SPELL_AURA_APPLIED" and spellid == 162124 and not f.StampersPhase) then
+			f:StartTracking()
+			f:EndTrackPlayerPosition()
+			
+		elseif (token == "SPELL_AURA_REMOVED" and spellid == 162124 and f.StampersPhase) then
+			f:StopTracking()
+			if (db.SHOW_DANCE) then
+				f:StartTrackPlayerPosition()
+			end
+			
+		elseif (token == "SPELL_CAST_START" and spellid == 160838 and db.STOP_CAST) then --Disrupting Roar
+			f.stop_casting_frame:Show()
+			f.stop_casting_frame.alert.animOut:Stop()
+			f.stop_casting_frame.alert.animIn:Play()
+			f:ScheduleTimer ("HideStopSpellAlert", 1.2)
+			
 		end
 		
-	elseif (token == "SPELL_CAST_START" and spellid == 160838 and db.STOP_CAST) then --Disrupting Roar
-		f.stop_casting_frame:Show()
-		f.stop_casting_frame.alert.animOut:Stop()
-		f.stop_casting_frame.alert.animIn:Play()
-		f:ScheduleTimer ("HideStopSpellAlert", 1.2)
-		
-	end
-	
-	if (token == "SPELL_INTERRUPT" and spellid == 160838 and db.STOP_CAST) then
-		local link = GetSpellLink (buff_type)
-		print ("Stop Cast Fail:", target_name, link)
+		if (token == "SPELL_INTERRUPT" and spellid == 160838 and db.STOP_CAST) then
+			local link = GetSpellLink (buff_type)
+			print ("Stop Cast Fail:", target_name, link)
+		end
 	end
 
 end)
@@ -916,8 +918,7 @@
 end
 
 function f:StartTracking()
-
-	print ("|cFFFFAA00Hansgar and Franzok Assist|r: Smart Stampers phase started.")
+--	print ("|cFFFFAA00Hansgar and Franzok Assist|r: Smart Stampers phase started.")
 
 	f.StampersPhase = true
 
@@ -940,7 +941,7 @@
 end
 
 function f:StopTracking()
-	print ("|cFFFFAA00Hansgar and Franzok Assist|r: Smart Stampers phase ended.")
+--	print ("|cFFFFAA00Hansgar and Franzok Assist|r: Smart Stampers phase ended.")
 
 	f.StampersPhase = false
 	frame_tracker:SetScript ("OnUpdate", nil)