Mercurial > hg > batmud > ggrtf

changeset 985:9b9ef109ecb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up DMP handling macros.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 31 Mar 2009 23:51:11 +0000
parents a18650273c20
children 39bdd68b628f
files ggrtf.tf
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Tue Mar 31 23:46:36 2009 +0000
+++ b/ggrtf.tf	Tue Mar 31 23:51:11 2009 +0000
@@ -1255,28 +1255,30 @@
 
 ;; Dispel magical protection (dmp)
 /def -i prcleardmp =\
-	/set gdmpstr=%;\
+	/let _dmpstr=%;\
 	/while ({#})\
 		/eval /set qtval=$$[prot_%{1}]%;\
 		/eval /set qtval_st=$$[prot_%{1}_st]%;\
 		/if (qtval & qtval_st == 0)\
 			/eval /set qtval_n=$$[prot_%{1}_n]%;\
 			/set prot_%{1}=0%;\
-			/if (gdmpstr!~"") \
-				/set gdmpstr=%{gdmpstr}, %{qtval_n}%;\
+			/if (_dmpstr!~"") \
+				/let _dmpstr=%{gdmpstr}, %{qtval_n}%;\
 			/else \
-				/set gdmpstr=%{qtval_n}%;\
+				/let _dmpstr=%{qtval_n}%;\
 			/endif%;\
 		/endif%;\
 		/shift%;\
-	/done
+	/done%;\
+	/result _dmpstr
+
 
 /def -i -p9999 -F -ag -mregexp -t"^You feel (unprotected|much more vulnerable)\.$" gprots_dmp =\
-	/prcleardmp %{lst_cprots} %{lst_dmpprots}%;\
+	/let _dmpstr=$(/prcleardmp %{lst_cprots} %{lst_dmpprots})%;\
 	/gprots_get%;/gstatus_update%;\
-	/if (gdmpstr!~"")\
+	/if (_dmpstr!~"")\
 		/msq @{BCred}Dispel Magical Protection@{n} hit you!%;\
-		/msr DMP removed: %{gdmpstr}%;\
+		/msr DMP removed: %{_dmpstr}%;\
 	/endif