--- a/ggrtf-magical.tf	Thu Sep 08 05:23:07 2005 +0000
+++ b/ggrtf-magical.tf	Thu Sep 08 08:59:18 2005 +0000
@@ -8,6 +8,17 @@
 ;; NOTICE! This file requires GGRTF (version 0.4.11 or later) to be loaded.
 ;;
 ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Initializing and options
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+/set opt_rmagic=off
+/set opt_magic=off
+/prtoggle magic paski
+/prtoggle rmagic Report magic spells
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Fails and fumbles
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Oh no! You feel energy TEAR from your soul and spread throughout the world!                                            
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -24,6 +35,8 @@
 	/set spell_st2=off%;\
 	/set spell_hastes=0%;\
 	/set spell_ghastes=0%;\
+	/set spell_type=%;\
+	/if ({opt_magic}=~"on") @@cast info%;/endif%;\
 	/msq @{BCyellow} ---- SPELL START ---- @{n} (@{Cyellow}%{cnt_casts}@{n})
 
 
@@ -36,6 +49,15 @@
 	/msq @{Cbggreen} ---- SPELL DONE ---- @{n} in [@{BCred}%{spell_rcount}@{n}] @{BCgreen}rounds!@{n} @{Cyellow}$[prgetstime({spell_t})]@{n}
 
 
+;; Cast info
+/def -i -p9999 -ag -mregexp -t"^You are casting \'([a-z ]+)\'.$" spell_info1 =\
+	/msq You are casting '%{P1}'%;\
+	/if ({opt_rmagic}=~"on") @@emote is casting '%{P1}'%;/endif
+
+/def -i -p9999 -ag -mregexp -t"^You are casting \'([a-z ]+)\' at \'([A-Za-z ,.'-]+)\'.$" spell_info2 =\
+	/msq You are casting '%{P1}' -> '%{P2}'%;\
+	/if ({opt_rmagic}=~"on") @@emote is casting '%{P1}' at '%{P2}'%;/endif
+
 ;; Spell failed
 /def -i spell_fail =\
 /if ({spell_st2}=~"on")\
@@ -106,7 +128,7 @@
 /def -i -p9999 -aCgreen -msimple -t"Your heavy burden slows down your casting." spell_burden =\
 	/set spell_rleft=$[spell_rleft + 1]%;\
 	/set spell_rcount=$[spell_rcount + 1]%;\
-	/msb%;/if ({opt_rspells}=~"on") @@emote slows down%;/endif
+	/msb%;/if ({opt_rmagic}=~"on") @@emote slows down%;/endif
 
 
 ;; Cast haste
@@ -114,7 +136,7 @@
 	/set spell_rleft=$[spell_rleft - 1]%;\
 	/set spell_rcount=$[spell_rcount - 1]%;\
 	/set cnt_hastes=$[cnt_hastes + 1]%;\
-	/msb%;/if ({opt_rspells}=~"on") @@emote hastes%;/endif
+	/msb%;/if ({opt_rmagic}=~"on") @@emote hastes%;/endif
 
 
 ;; Cast greater haste
@@ -122,17 +144,17 @@
 	/set spell_rleft=$[spell_rleft - 2]%;\
 	/set spell_rcount=$[spell_rcount - 2]%;\
 	/set cnt_ghastes=$[cnt_ghastes + 1]%;\
-	/msb%;/if ({opt_rspells}=~"on") @@emote ghastes%;/endif
+	/msb%;/if ({opt_rmagic}=~"on") @@emote ghastes%;/endif
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Miscellaneous
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /def -i -p9999 -aCgreen -msimple -t"You sizzle with magical energy." ent_sizzle =\
-	/if ({opt_rspells}=~"on") @@emote vibrates noisily.%;/endif
+	/if ({opt_rmagic}=~"on") @@emote vibrates noisily.%;/endif
 
 /def -i -p9999 -aCgreen -msimple -t"You surreptitiously conceal your spell casting." ent_conceal =\
-	/if ({opt_rspells}=~"on") @@emote conceals ...%;/endif
+	/if ({opt_rmagic}=~"on") @@emote conceals ...%;/endif
 
 /def -i -p9999 -aCgreen -msimple -t"You feel your skills in handling elemental forces improve." ent_essence =\
 	/mse gains essence!

--- a/ggrtf.tf	Thu Sep 08 05:23:07 2005 +0000
+++ b/ggrtf.tf	Thu Sep 08 08:59:18 2005 +0000
@@ -49,13 +49,6 @@
 /set status_pad=_
 /load map.tf
 
-;; Options
-/set opt_verbose=on
-/set opt_rshape=off
-/set opt_rspells=off
-/set opt_peer=off
-/set opt_rhp=off
-
 ;; Counters
 /set cnt_casts=0
 /set cnt_scasts=0
@@ -88,9 +81,9 @@
 ;; Helper functions, etc.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /def msq = /echo -p @{BCwhite}GGRTF@{n}: %*
-/def msr = /if ({opt_verbose}=~"on") @msr %*%;/else  /msq %*%;/endif
-/def msp = /if ({opt_verbose}=~"on") @msp %*%;/else  /msq %*%;/endif
-/def mse = /if ({opt_verbose}=~"on") @mse %*%;/else  /msq %*%;/endif
+/def msr = /if ({opt_verbose}=~"on") @msr %*%;/else /msq %*%;/endif
+/def msp = /if ({opt_verbose}=~"on") @msp %*%;/else /msq %*%;/endif
+/def mse = /if ({opt_verbose}=~"on") @mse %*%;/else /msq %*%;/endif
 
 
 ;; Report current statistics
@@ -110,7 +103,7 @@
 
 
 ;; Return string describing time elapsed from given timestamp parameter
-/def prgetstime =\
+/def -i prgetstime =\
 /if ({1} > 0)\
 	/let jtime=$[time() - {1}]%;\
 	/let jtimeh=$[jtime / 3600]%;\
@@ -132,16 +125,16 @@
 	/eval /set qtval=$$[opt_%{1}]%;\
 	/eval /set qtval_n=$$[opt_%{1}_n]%;\
 	/if ({qtval}=~"on") /set qtval_s=@{BCgreen} ON@{n}%;/else /set qtval_s=@{Cred}OFF@{n}%;/endif%;\
-	/msq | @{BCyellow}$[pad({1},-8)]@{n} : $[pad({qtval_n},-35)] - [%{qtval_s}] |%;\
+	/msq | /@{BCyellow}$[pad({1},-8)]@{n} : $[pad({qtval_n},-35)] - [%{qtval_s}] |%;\
 	/shift%;\
 /done
 
 /def opts =\
 /msq ,----------------.%;\
 /msq | @{BCgreen}ggrTF@{n} @{Cyellow}Settings@{n} |%;\
-/msq +--------------------------------------------------------.%;\
+/msq +---------------------------------------------------------.%;\
 /opts_dolist %{lst_options}%;\
-/msq `--------------------------------------------------------'
+/msq `---------------------------------------------------------'
 
 
 ;; Option toggles
@@ -149,11 +142,11 @@
 /def prtoggle =\
 	/set lst_options=%{1} %{lst_options}%;\
 	/set opt_%{1}_n=%{-1}%;\
-	/eval /def %{1} = /if ({opt_%{1}}=~"on") /set opt_%{1}=@{Cred}OFF@{n}%%%;/else  /set opt_%{1}=@{BCgreen}ON@{n}%%%;/endif%%%;/msq @{Cyellow}%{-1}@{n} [%%%{opt_%{1}}]
+	/eval /def %{1} = /if ({opt_%{1}}=~"on") /set opt_%{1}=off%%%;/let qstr=@{Cred}OFF@{n}%%%;/else /set opt_%{1}=on%%%;/let qstr=@{BCgreen}ON@{n}%%%;/endif%%%;/msq @{Cyellow}%{-1}@{n} [%%%{qstr}]
 
-/prtoggle verbose Verbose
-/prtoggle rshape Report shape
-/prtoggle rspells Report spells
+;; Define some generic options
+/prtoggle verbose Verbose (off = echo to client only)
+/prtoggle rshape Report shape on every round
 /prtoggle rrounds Report spell/skill rounds
 /prtoggle peer AutoPeer
 /prtoggle rstat Report stats