Mercurial > hg > batmud > ggrtf

changeset 18:f63ff175a301

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Lots of namespace cleanups /prtoggle renamed to /deftoggle with syntax Added /defsetting macro for creating settings
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 Sep 2005 11:17:51 +0000
parents 1acd16c31cf1
children 284750e78f5e
files ggrtf-magical.tf ggrtf-misc.tf ggrtf.tf
diffstat 3 files changed, 133 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-magical.tf	Thu Sep 08 08:59:18 2005 +0000
+++ b/ggrtf-magical.tf	Thu Sep 08 11:17:51 2005 +0000
@@ -13,8 +13,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /set opt_rmagic=off
 /set opt_magic=off
-/prtoggle magic paski
-/prtoggle rmagic Report magic spells
+/prtoggle -n"magic" -d"paski"
+/prtoggle -n"rmagic" -d"Report magic spells"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Fails and fumbles
@@ -35,7 +35,7 @@
 	/set spell_st2=off%;\
 	/set spell_hastes=0%;\
 	/set spell_ghastes=0%;\
-	/set spell_type=%;\
+	/set spell_stype=%;\
 	/if ({opt_magic}=~"on") @@cast info%;/endif%;\
 	/msq @{BCyellow} ---- SPELL START ---- @{n} (@{Cyellow}%{cnt_casts}@{n})
 
@@ -211,48 +211,48 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Aura weakening
 /def -i -p9999 -aCred -msimple -t"Your aura is starting to weaken!" rec_auraweak =\
-	/set st_eaura_weak=on%;/set st_eaura_weak_t=$[time()]%;\
+	/set prot_eaura_weak=on%;/set prot_eaura_weak_t=$[time()]%;\
 	/status_update%;\
-	/msr Energy Aura WEAKENING! $[prgetstime({st_eaura_t})] / $[prgetstime({st_eaura_t2})]
+	/msr Energy Aura WEAKENING! $[prgetstime({prot_eaura_t})] / $[prgetstime({prot_eaura_t2})]
 
 ;; Aura recharged
 /def -i -p9999 -aCred -mregexp -t"^(Not all is lost, however, you did just recharge your aura|You try your hardest but cannot focus enough energy|You try to focus more magic energy into your aura but get no useful result).$" rec_aurarecharged =\
-	/set st_eaura_weak=off%;\
-	/set st_eaura_t=$[time()]%;\
+	/set prot_eaura_weak=off%;\
+	/set prot_eaura_t=$[time()]%;\
 	/status_update%;\
 	/msr Energy Aura Reloaded! 
 
 ;; Aura off
 /def -i -p9999 -aCred -msimple -t"Your aura of glowing light fades to nothing." rec_aura0 =\
-	/set st_eaura_weak=off%;\
+	/set prot_eaura_weak=off%;\
 	/proff eaura
 
 ;; Aura changes
 /def -i -p9999 -aCred -msimple -t"You turn your aura down a step from red to gold." rec_aurach1 =\
-	/set st_eaura=1%;/status_update
+	/set prot_eaura=1%;/status_update
 
 /def -i -p9999 -aCred -msimple -t"You turn your aura down a step from blue to red." rec_aurach2 =\
-	/set st_eaura=2%;/status_update
+	/set prot_eaura=2%;/status_update
 
 ;; Aura on
 /def -i -p9999 -aCred -msimple -t"Suddenly a softly glowing aura of yellow light comes into being around you." rec_aura1 =\
 	/pron eaura [Yellow]%;\
-	/set st_eaura=1%;\
-	/set st_eaura_weak=off%;\
+	/set prot_eaura=1%;\
+	/set prot_eaura_weak=off%;\
 	/status_update%;\
-	/set st_eaura_t2=%{st_eaura_t}
+	/set prot_eaura_t2=%{prot_eaura_t}
 
 /def -i -p9999 -aCred -msimple -t"With a burst of energy, your aura changes from soft yellow to bright red." rec_aura2 =\
 	/pron eaura [Red]%;\
-	/set st_eaura=2%;\
-	/set st_eaura_weak=off%;\
+	/set prot_eaura=2%;\
+	/set prot_eaura_weak=off%;\
 	/status_update%;\
-	/set st_eaura_t2=%{st_eaura_t}
+	/set prot_eaura_t2=%{prot_eaura_t}
 
 /def -i -p9999 -aCred -msimple -t"Tendrils of lightning flit around you as your aura changes from flame red to" rec_aura3 =\
 	/pron eaura [Blue]%;\
-	/set st_eaura=3%;\
-	/set st_eaura_weak=off%;\
+	/set prot_eaura=3%;\
+	/set prot_eaura_weak=off%;\
 	/status_update%;\
-	/set st_eaura_t2=%{st_eaura_t}
+	/set prot_eaura_t2=%{prot_eaura_t}
 
--- a/ggrtf-misc.tf	Thu Sep 08 08:59:18 2005 +0000
+++ b/ggrtf-misc.tf	Thu Sep 08 11:17:51 2005 +0000
@@ -60,12 +60,12 @@
 
 ;; Warn about invis tells and emotes
 /def -i -p9999 -F -aCgreen -mregexp -t"^You tell ([^']*)" rec_tell =\
-/if ({st_invis} > 0 & !regmatch("(monster)", {P1}))\
+/if ({prot_invis} > 0 & !regmatch("(monster)", {P1}))\
 	/msq WARNING! You are using 'tell' while INVISIBLE!%;\
 	/endif
 
 /def -i -p9999 -F -aCgreen -mregexp -t"^You emote to " rec_emote =\
-/if ({st_invis} > 0)\
+/if ({prot_invis} > 0)\
 	/msq WARNING! You are using 'emote' while INVISIBLE!%;\
 	/endif
 
--- a/ggrtf.tf	Thu Sep 08 08:59:18 2005 +0000
+++ b/ggrtf.tf	Thu Sep 08 11:17:51 2005 +0000
@@ -86,15 +86,16 @@
 /def mse = /if ({opt_verbose}=~"on") @mse %*%;/else /msq %*%;/endif
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Report current statistics
-/def stats =\
+/def -i stats =\
 /let qs1=%{cnt_casts} casts, %{cnt_scasts} succ, %{cnt_fcasts} fail, %{cnt_icasts} intr, %{cnt_fucasts} fumbled.%;\
 /let qs2=%{cnt_hastes} hastes, %{cnt_ghastes} ghastes, %{cnt_trounds} total rounds.%;\
 /let qs3=%{cnt_damcrits} total, %{cnt_dcrit1} lvl#1, %{cnt_dcrit2} lvl#2, %{cnt_dcrit3} lvl#3, %{cnt_dcrit4} lvl#4%;\
 /let qs4=%{cnt_skills} skills, %{cnt_sskills} succ, %{cnt_fskills} fail, %{cnt_iskills} intr, %{cnt_fuskills} fumbled.%;\
 /msq ,------------------.%;\
 /msq | @{BCgreen}ggrTF@{n} @{Cyellow}Statistics@{n} |%;\
-/msq +--------------------------------------------------------------------.%;\
+/msq +------------------+-------------------------------------------------.%;\
 /msq | Spells........: $[pad({qs1},-50)] |%;\
 /msq | Cast time.....: $[pad({qs2},-50)] |%;\
 /msq | Damcrits......: $[pad({qs3},-50)] |%;\
@@ -102,6 +103,7 @@
 /msq `--------------------------------------------------------------------'
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Return string describing time elapsed from given timestamp parameter
 /def -i prgetstime =\
 /if ({1} > 0)\
@@ -119,38 +121,90 @@
 	/return%;\
 	/endif
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; List available options
 /def -i opts_dolist =\
 /while ({#})\
 	/eval /set qtval=$$[opt_%{1}]%;\
-	/eval /set qtval_n=$$[opt_%{1}_n]%;\
+	/eval /set qtval_d=$$[opt_%{1}_d]%;\
 	/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},-10)]@{n} : $[pad({qtval_d},-40)] - [%{qtval_s}]      |%;\
+	/shift%;\
+/done
+
+/def -i settings_dolist =\
+/while ({#})\
+	/eval /set qtval=$$[set_%{1}]%;\
+	/eval /set qtval_d=$$[set_%{1}_d]%;\
+	/eval /set qtval_s=$$[set_%{1}_s]%;\
+	/msq | /@{BCyellow}$[pad({1},-10)]@{n} : $[pad({qtval_d},-40)] - [@{Cgreen}$[pad({qtval},8)]@{n}] |%;\
 	/shift%;\
 /done
 
-/def opts =\
+/def -i opts =\
 /msq ,----------------.%;\
 /msq | @{BCgreen}ggrTF@{n} @{Cyellow}Settings@{n} |%;\
-/msq +---------------------------------------------------------.%;\
+/msq +----------------+----------------------------------------------------.%;\
 /opts_dolist %{lst_options}%;\
-/msq `---------------------------------------------------------'
+/settings_dolist %{lst_settings}%;\
+/msq `---------------------------------------------------------------------'
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Option toggles
 /set lst_options=
-/def prtoggle =\
-	/set lst_options=%{1} %{lst_options}%;\
-	/set opt_%{1}_n=%{-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}]
+/def -i deftoggle =\
+	/if (!getopts("n:d:", "")) /msq ERROR! Invalid toggle creation command!%;/break%;/endif%;\
+	/set lst_options=%{opt_n} %{lst_options}%;\
+	/set opt_%{opt_n}_d=%{opt_d}%;\
+	/eval /def -i %{opt_n} = /if ({opt_%{opt_n}}=~"on") /set opt_%{opt_n}=off%%%;/let qstr=@{Cred}OFF@{n}%%%;/else /set opt_%{opt_n}=on%%%;/let qstr=@{BCgreen}ON@{n}%%%;/endif%%%;/msq @{Cyellow}%{opt_d}@{n} [%%%{qstr}]
+
+;; Settings
+/set lst_settings=
+
+/def chksetting =\
+	/set qrvals=0%;\
+	/let qtvals=%{1}%;\
+	/shift%;\
+	/while ({#})\
+		/if ({1}=~{qtvals}) /set qrvals=1%;/break%;/endif%;\
+		/shift%;\
+	/done
+
+
 
-;; 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
-/prtoggle pss Auto party short status
+/def defsetting =\
+	/if (!getopts("n:d:s:", "")) /msq ERROR! Invalid setting creation command!%;/break%;/endif%;\
+	/set lst_settings=%{opt_n} %{lst_settings}%;\
+	/set set_%{opt_n}_d=%{opt_d}%;\
+	/set set_%{opt_n}_s=%{opt_s}%;\
+	/eval /def %{opt_n} =\
+		/if ({#})\
+			/chksetting %%%{1} %%%{set_%{opt_n}_s}%%%;\
+			/if ({qrvals}>0)\
+				/set set_%{opt_n}=%%%{1}%%%;\
+				/msq @{Cyellow}%{opt_n}@{n} : Set to [@{BCgreen}%%%{set_%{opt_n}}@{n}]%%%;\
+				/else \
+				/msq @{Cyellow}%{opt_n}@{n} : @{BCred}Invalid setting@{n} [@{BCgreen}%%%{1}@{n}]!%%%;\
+				/endif%%%;\
+			/else \
+			/msq @{BCred}/%{opt_n}@{n} - @{Cyellow}%{opt_d}@{n} [@{BCgreen}%%%{set_%{opt_n}_s}@{n}]%%%;\
+			/endif
+	
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Define some generic option toggles and settings
+/set opt_verbose=on
+/set opt_pss=on
+/deftoggle -n"verbose"	-d"Verbose (off = echo to client only)"
+/deftoggle -n"rshape"	-d"Report shape on every round"
+/deftoggle -n"rrounds"	-d"Report spell/skill rounds"
+/deftoggle -n"peer"	-d"Automatic peer on move"
+/deftoggle -n"rstat"	-d"Report your hp/sp/ep every round"
+/deftoggle -n"pss"	-d"Auto party short status"
+
+/set set_ripaction=dig
+/defsetting -n"ripaction" -d"Set the action performed at RIP" -s"dig blood eat"
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -190,18 +244,18 @@
 
 ;; Add aura item
 /def -i status_add_aura =\
-/if ({st_eaura} > 0)\
-	/if ({st_eaura} == 1) /let qtcolor=BCyellow%;/endif%;\
-	/if ({st_eaura} == 2) /let qtcolor=BCred%;/endif%;\
-	/if ({st_eaura} == 3) /let qtcolor=BCblue%;/endif%;\
-	/if ({st_eaura_weak}=~"on")\
-		/let qttimes=$[prgetstime({st_eaura_weak_t})]%;\
+/if ({prot_eaura} > 0)\
+	/if ({prot_eaura} == 1) /let qtcolor=BCyellow%;/endif%;\
+	/if ({prot_eaura} == 2) /let qtcolor=BCred%;/endif%;\
+	/if ({prot_eaura} == 3) /let qtcolor=BCblue%;/endif%;\
+	/if ({prot_eaura_weak}=~"on")\
+		/let qttimes=$[prgetstime({prot_eaura_weak_t})]%;\
 		/let qtweak=/" "WEAK":4:Cred "%{qttimes}" "%;\
 		/else \
 		/let qtweak=%;\
 		/endif%;\
-	/let qttimes=$[prgetstime({st_eaura_t})]%;\
-	/set status_pstr=%{status_pstr} :1 "[" "EAura%{st_eaura}":6:%{qtcolor} "%{qttimes}%{qtweak}]"%;\
+	/let qttimes=$[prgetstime({prot_eaura_t})]%;\
+	/set status_pstr=%{status_pstr} :1 "[" "EAura%{prot_eaura}":6:%{qtcolor} "%{qttimes}%{qtweak}]"%;\
 	/endif
 
 
@@ -298,58 +352,58 @@
 /def -i prcreate =\
 	/if (!getopts("i:n:l:A:B:C:u:d:srkh", "")) /msq ERROR! Invalid prot creation command!%;/break%;/endif%;\
 	/set lst_prots=%{opt_i} %{lst_prots}%;\
-	/set st_%{opt_i}=0%;\
-	/set st_%{opt_i}_t=-1%;\
-	/set st_%{opt_i}_n=%{opt_n}%;\
-	/set st_%{opt_i}_l=%{opt_l}%;\
-	/if (opt_s) /set st_%{opt_i}_stack=1%;/else /set st_%{opt_i}_stack=0%;/endif%;\
-	/if (opt_h) /set st_%{opt_i}_renew=1%;/else /set st_%{opt_i}_renew=0%;/endif%;\
+	/set prot_%{opt_i}=0%;\
+	/set prot_%{opt_i}_t=-1%;\
+	/set prot_%{opt_i}_n=%{opt_n}%;\
+	/set prot_%{opt_i}_l=%{opt_l}%;\
+	/if (opt_s) /set prot_%{opt_i}_stack=1%;/else /set prot_%{opt_i}_stack=0%;/endif%;\
+	/if (opt_h) /set prot_%{opt_i}_renew=1%;/else /set prot_%{opt_i}_renew=0%;/endif%;\
 	/if ({opt_u}=~"" | {opt_d}=~"") /break%;/endif%;\
 	/if (opt_k | opt_r) /let qmatch=regexp%;/else /let qmatch=simple%;/endif%;\
 	/let pstr=0%;\
-	/if ({opt_A}!~"") /let pstr=1%;/def -i -p9999 -F -aCyellow -mregexp -t'%{opt_A}' rec_%{opt_i}_A=/set st_%{opt_i}_p=1%;/endif%;\
-	/if ({opt_B}!~"") /let pstr=2%;/def -i -p9999 -F -aCyellow -mregexp -t'%{opt_B}' rec_%{opt_i}_B=/if ({st_%{opt_i}_p}=1) /set st_%{opt_i}_p=2%%;/endif%;/endif%;\
-	/if ({opt_C}!~"") /let pstr=3%;/def -i -p9999 -F -aCyellow -mregexp -t'%{opt_C}' rec_%{opt_i}_C=/if ({st_%{opt_i}_p}=2) /set st_%{opt_i}_p=3%%;/endif%;/endif%;\
+	/if ({opt_A}!~"") /let pstr=1%;/def -i -p9999 -F -aCyellow -mregexp -t'%{opt_A}' rec_%{opt_i}_A=/set prot_%{opt_i}_p=1%;/endif%;\
+	/if ({opt_B}!~"") /let pstr=2%;/def -i -p9999 -F -aCyellow -mregexp -t'%{opt_B}' rec_%{opt_i}_B=/if ({prot_%{opt_i}_p}=1) /set prot_%{opt_i}_p=2%%;/endif%;/endif%;\
+	/if ({opt_C}!~"") /let pstr=3%;/def -i -p9999 -F -aCyellow -mregexp -t'%{opt_C}' rec_%{opt_i}_C=/if ({prot_%{opt_i}_p}=2) /set prot_%{opt_i}_p=3%%;/endif%;/endif%;\
 	/if ({pstr}>0)\
 		/if (opt_k)\
-		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/if ({st_%{opt_i}_p}==%{pstr}) /set st_%{opt_i}_p=0%%;/pron %{opt_i} [%%{P1}]%%;/endif%;\
+		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/if ({prot_%{opt_i}_p}==%{pstr}) /set prot_%{opt_i}_p=0%%;/pron %{opt_i} [%%{P1}]%%;/endif%;\
 		/else \
-		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/if ({st_%{opt_i}_p}==%{pstr}) /set st_%{opt_i}_p=0%%;/pron %{opt_i}%%;/endif%;\
+		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/if ({prot_%{opt_i}_p}==%{pstr}) /set prot_%{opt_i}_p=0%%;/pron %{opt_i}%%;/endif%;\
 		/endif%;\
 	/else \
 		/if (opt_k)\
-		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/set st_%{opt_i}_p=0%%;/pron %{opt_i} [%%{P1}]%;\
+		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/set prot_%{opt_i}_p=0%%;/pron %{opt_i} [%%{P1}]%;\
 		/else \
-		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/set st_%{opt_i}_p=0%%;/pron %{opt_i}%;\
+		/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_u}' rec_%{opt_i}_on=/set prot_%{opt_i}_p=0%%;/pron %{opt_i}%;\
 		/endif%;\
 	/endif%;\
-	/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_d}' rec_%{opt_i}_off=/set st_%{opt_i}_p=0%%;/proff %{opt_i}
+	/def -i -p9999 -F -aCgreen -m%{qmatch} -t'%{opt_d}' rec_%{opt_i}_off=/set prot_%{opt_i}_p=0%%;/proff %{opt_i}
 
 
 ;; Turn prot ON
 /def -i pron =\
-	/eval /set qtval_l=$$[st_%{1}_l]%;\
-	/eval /set qtval_s=$$[st_%{1}_stack]%;\
-	/eval /set qtval_h=$$[st_%{1}_renew]%;\
-	/eval /set qtval_c=$$[st_%{1}]%;\
+	/eval /set qtval_l=$$[prot_%{1}_l]%;\
+	/eval /set qtval_s=$$[prot_%{1}_stack]%;\
+	/eval /set qtval_h=$$[prot_%{1}_renew]%;\
+	/eval /set qtval_c=$$[prot_%{1}]%;\
 	/if ({qtval_c}==0 | {qtval_h}==1)\
 		/if ({qtval_c} > 0)\
-			/eval /set qtval_t=$$[st_%{1}_t]%;\
+			/eval /set qtval_t=$$[prot_%{1}_t]%;\
 			/let qtstrs=Renewed! $[prgetstime({qtval_t})]%;\
 			/else \
 			/let qtstrs=ON!%;\
 			/endif%;\
-		/set st_%{1}=1%;\
+		/set prot_%{1}=1%;\
 		/else \
 		/if ({qtval_s})\
-			/set st_%{1}=$[qtval_c + 1]%;\
+			/set prot_%{1}=$[qtval_c + 1]%;\
 			/let qtstrs=ON [#$[qtval_c + 1]]%;\
 			/else \
 			/msq ERROR! Prot '%{1}' (%{qtval_l}) increased even though not flagged stackable!%;\
 			/break%;\
 			/endif%;\
 		/endif%;\
-	/set st_%{1}_t=$[time()]%;\
+	/set prot_%{1}_t=$[time()]%;\
 	/if ({-1}!~"")\
 		/msr %{qtval_l} %{-1} %{qtstrs}%;\
 		/else \
@@ -359,11 +413,11 @@
 
 ;; Turn prot OFF
 /def -i proff =\
-	/eval /set qtval=$$[st_%{1}]%;\
+	/eval /set qtval=$$[prot_%{1}]%;\
 	/if ({qtval})\
-		/eval /set qtval_t=$$[st_%{1}_t]%;\
-		/eval /set qtval_l=$$[st_%{1}_l]%;\
-		/set st_%{1}=0%;\
+		/eval /set qtval_t=$$[prot_%{1}_t]%;\
+		/eval /set qtval_l=$$[prot_%{1}_l]%;\
+		/set prot_%{1}=0%;\
 		/msr %{qtval_l} OFF! $[prgetstime({qtval_t})]%;\
 	/endif
 
@@ -437,9 +491,9 @@
 ;; Form the "current prots" strings
 /def -i prots_doget =\
 /while ({#})\
-	/eval /set qtval=$$[st_%{1}]%;\
-	/eval /set qtval_t=$$[st_%{1}_t]%;\
-	/eval /set qtval_n=$$[st_%{1}_n]%;\
+	/eval /set qtval=$$[prot_%{1}]%;\
+	/eval /set qtval_t=$$[prot_%{1}_t]%;\
+	/eval /set qtval_n=$$[prot_%{1}_n]%;\
 	/if ({qtval} > 0)\
 		/set protcount=$[protcount + 1]%;\
 		/let qtstr=%{qtval_n}$[prgetstime({qtval_t})]%;\
@@ -478,7 +532,7 @@
 /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 st_unstun_w=0
+	/pron unstun%;/set prot_unstun_w=0
 
 /def -i -F -aCgreen -msimple -t"You feel no longer protected from being stunned." rec_unstun_off =\
 	/proff unstun
@@ -493,8 +547,8 @@
 	/proff unstun
 
 /def -i -F -aCgreen -msimple -t"It doesn't hurt at all!" stun_notall =\
-	/set st_unstun_w=$[st_unstun_w + 1]%;\
-	/msr Unstun weakened [#%{st_unstun_w}]
+	/set prot_unstun_w=$[prot_unstun_w + 1]%;\
+	/msr Unstun weakened [#%{prot_unstun_w}]
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;