--- a/ggrtf.tf	Wed Mar 08 17:42:00 2006 +0000
+++ b/ggrtf.tf	Wed Mar 08 17:54:46 2006 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.5.10.1-svn - TinyFugue script for BatMUD
+;; GgrTF v0.5.10.2-svn - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2006 Matti Hämäläinen (Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.5.10.1-svn
+/set ggrtf_ver=0.5.10.2-svn
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -31,6 +31,7 @@
 	/set battle_st=0%;\
 	/set spell_st=off%;\
 	/set skill_st=off%;\
+	/set stun_st=off%;\
 	/set camp_st=1%;\
 	/set cast_info=%;\
 	/set cast_info_t=%;\
@@ -64,6 +65,7 @@
 	/set set_wasinit=1%;\
 	/msq Initialized
 
+/if (set_wasinit != 1) /prinitialize%;/endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Macros which may be re-defined by user or in other modules
@@ -686,6 +688,8 @@
 		/gwarning Tick predictor reset! @{BCyellow}Some ticks required for re-calibration!@{n}%;\
 	/endif
 
+/prtick_reset
+
 ;; Ignore ticks that come from heals/crystals/fires/etc
 /def -i -mregexp -t"^([A-Z][a-z]+'s spell makes you feel little better|You heal a few of your wounds|You feel like [A-Z][a-z]+ healed you a bit|The fire's warmth soothe?s you|The crystal throbs faintly, healing some of your wounds|The sphere pulses softly; your mind and body feel more relaxed).$" prtick_filter =\
 	/set tick_ignore=1
@@ -1178,7 +1182,6 @@
 ;; Unstun (NS)
 /prdefprot -i"unstun"	-n"Unst"	-l"Unstun" -h -q
 
-/set stun_st=off
 
 /def -i -F -aCgreen -mregexp -t"^[A-Z][A-Za-z]+\'s chanting appears to do absolutely nothing.$" rec_unstun_on =\
 	/pron unstun%;/set prot_unstun_w=0
@@ -1369,10 +1372,3 @@
 	/prexecfuncs %{event_battle_end}
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Call initialization functions
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/if (set_wasinit != 1)\
-	/prinitialize%;\
-	/prtick_reset%;\
-	/endif