--- a/gm-bmaster.tf	Mon Nov 15 16:52:31 2010 +0000
+++ b/gm-bmaster.tf	Tue Nov 16 14:23:32 2010 +0000
@@ -42,12 +42,10 @@
 	/if (regmatch("^([A-Za-z ]+) [0-9]+$", _mount))\
 		/let _mount=%{P1}%;\
 	/endif%;\
-	/echo short: '%{*}' -> '%{_mount}'%;\
 	/return _mount
 
 /def -i -p1 -mregexp -t"^(.+?) gives you a big slobbery lick\.$" gbmaster_arrives =\
 	/let _mount=%{P1}%;\
-	/echo arrives: '%{_mount}'%;\
 	/if (_mount =~ gbmaster_short(bmount_curr))\
 		/test gbmaster_ride(_mount)%;\
 	/else \
@@ -64,7 +62,6 @@
 /def -i gbmaster_ride =\
 	/set bmount_last=$[gbmaster_getmount({1})]%;\
 	/let _short=$[gbmaster_short(bmount_curr)]%;\
-	/echo ride: '%{bmount_last}' '%{_short}'%;\
 	/if (bmount_last =~ _short)\
 		@@release%;\
 	/endif%;\
@@ -79,6 +76,30 @@
 	/set bmount_last=%{_mount}%;\
 	@@use heel at %{_mount}
 
+;; Remount or lead
+/def -i gbmaster_remount =\
+	/let _mount=$[gbmaster_short(bmount_curr)]%;\
+	@@ride %{_mount}%;\
+	@@lead %{_mount}
+
+
+
+;; Heel mount
+/def -i -mregexp -t" seems to perk up. It will now respond to:$|^This animal already responds to your call with the syntax:$" gbmaster_get_heel1 =\
+	/set bmount_flag=1
+	
+/def -i -ag -Ebmount_flag -mregexp -t"^use heel at (.+)$" gbmaster_get_heel2 =\
+	/set bmount_flag=0%;\
+	/set bmount_curr=%{P1}%;\
+	/msq @{BCwhite}Mount heel id@{n}: '@{BCgreen}%{bmount_curr}@{n}'.
+
+
+;; Auto remount
+/def -i -mregexp -t"^(You are knocked off your mount!|Your mount throws you!|Your annoyed mount throws you!)$" gbmaster_dismount =\
+	/msr Thrown off mount!%;\
+	/repeat -0.5 1 /gbmaster_remount
+
+
 /def -i ride = @@release $[gbmaster_short(bmount_curr)]%;/test gbmaster_ride({*})
 /def -i rele = @@release $[gbmaster_getmount({*})]
 /def -i lead = /test gbmaster_lead({*})
@@ -90,23 +111,3 @@
 	/set bmount_last=$[gbmaster_getmount({*})]%;\
 	@@party report Ride underground -> %{bmount_last}%;\
 	@@use ride underground at %{bmount_last}
-
-
-/def -i -mregexp -t" seems to perk up. It will now respond to:$|^This animal already responds to your call with the syntax:$" gbmaster_get_heel1 =\
-	/set bmount_flag=1
-	
-/def -i -ag -Ebmount_flag -mregexp -t"^use heel at (.+)$" gbmaster_get_heel2 =\
-	/set bmount_flag=0%;\
-	/set bmount_curr=%{P1}%;\
-	/msq @{BCwhite}Mount heel id@{n}: '@{BCgreen}%{bmount_curr}@{n}'.
-
-
-/def -i gbmaster_remount =\
-	/let _mount=$[gbmaster_short(bmount_curr)]%;\
-	@@ride %{_mount}%;\
-	@@lead %{_mount}
-
-/def -i -mregexp -t"^(You are knocked off your mount!|Your mount throws you!|Your annoyed mount throws you!)$" gbmaster_dismount =\
-	/msr Thrown off mount!%;\
-	/repeat -0.5 1 /gbmaster_remount
-