--- a/ggrtf-misc.tf	Tue Feb 14 10:52:41 2006 +0000
+++ b/ggrtf-misc.tf	Wed Feb 15 05:42:26 2006 +0000
@@ -54,6 +54,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Some special hilites and miscellaneous
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+/def -i msm = /if (opt_rmisc=~"on") /msr %*%;/endif
+
 ;; Highlite plants and mineral deposits
 /def -i -F -p9999 -aCgreen -mregexp -t"(plant stands|plant lies|growing|grows here|is starting to grow|tree stands|bush is here|oak tree)" lite_plant1
 /def -i -F -p9999 -aCyellow -mregexp -t"in the ground" lite_mineral1
@@ -62,28 +64,30 @@
 	/mse improved in %{P1}
 
 ;; Floating disc
-/def -i -p9999 -msimple -t"Your disc wavers dangerously." misc_fdweak = /msr Disc falling!
-/def -i -p9999 -msimple -t"You reload magical energy to the disc that is floating in the air." misc_fdreload = /msr Disc reloaded.
+/def -i -p9999 -msimple -t"Your disc wavers dangerously." misc_fdweak =\
+	/msm Disc falling!
 
+/def -i -p9999 -msimple -t"You reload magical energy to the disc that is floating in the air." misc_fdreload =\
+	/msm Disc reloaded.
 
 ;; Ambush
 /def -i -p9999 -aCred -msimple -t"You cannot leave, you have been AMBUSHED." misc_ambush1 =\
-	/if (opt_rmisc=~"on") /msr AMBUSHED!%;/endif
+	/msm AMBUSHED!
 
 ;; Poison removed
 /def -i -p9999 -aCred -msimple -t"You feel the poison leaving your veins!" misc_poisonrem =\
-	/msr Poison removed!
+	/msm Poison removed!
 
 ;; Uncon
 /def -i -p9999 -ag -mregexp -t"^([A-Z][A-Za-z]+) lapses into unconsciousness from severe loss of blood.$" misc_uncon =\
 	/msq @{BCred}!!!@{n} @{BCwhite}%{P1}@{n} is @{BCgreen}UNCON@{n} @{BCred}!!!@{n}%;\
-	/if (opt_rmisc=~"on") /msr %{P1} is UNCON!%;/endif
+	/msm %{P1} is UNCON!
 
 
 ;; Warn about changes in party formation
 /def -i -p9999 -ag -mregexp -t"^([A-Z][a-z]+) is now in the 1st row.$" misc_firstrow =\
 	/msq @{BCred}!!!@{n} @{BCwhite}%{P1}@{n} @{BCyellow}is now in 1st row@{n} @{BCred}!!!@{n}%;\
-	/if (opt_rmisc=~"on" & {P1}=~set_plrname) /msr %{P1} is now in 1st row!%;/endif
+	/if ({P1}=~set_plrname) /msm %{P1} is now in 1st row!%;/endif
 
 
 ;; Multicolored Demons (event)
@@ -103,14 +107,15 @@
 	/endif
 
 ;; Etc
-/def -i -aCred -msimple -t"You fail to start the fire." misc_fbfail = /skill_fail
+/def -i -F -aCred -msimple -t"You fail to start the fire." misc_fbfail = /skill_fail
 
-/def -i -aBCred -mregexp -t"^Your ([A-Za-z ]+) gets damaged; it's now in ([a-z]+) condition.$" misc_eqdamage =\
-	/msr NOTICE! %{P1} got damaged! (%{P2})
+/def -i -ag -mregexp -t"^Your ([A-Za-z ]+) gets damaged; it's now in ([a-z]+) condition.$" misc_eqdamage =\
+	/msq @{BCred}!!!@{n} @{BCwhite}%{P1}@{n} @{BCyellow}got damaged!@{n} (@{BCgreen}%{P2}@{n}) @{BCred}!!!@{n}%;\
+	/msm NOTICE! %{P1} got damaged! (%{P2})
 
 ;; Resist curses
 /def -i -p1 -aCred -mregexp -t"^You are not affected by ([a-z ]+)\.$" misc_curseres =\
-	/msr Resisted %{P1}!
+	/msm Resisted %{P1}!
 
 ;; Psi scanning warnings
 /def -i -ag -msimple -t"You get the feeling that someone is looking over your shoulder." misc_mglance =\