Mercurial > hg > batmud > ggrtf

changeset 662:47f881160fc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent "DMP hit you" spam in some situations; Minor optimizations.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 06 Sep 2007 16:35:13 +0000
parents 7f512cf36a1a
children 4b4f49f5a4ba
files ggrtf.tf
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Sat Sep 01 20:25:15 2007 +0000
+++ b/ggrtf.tf	Thu Sep 06 16:35:13 2007 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.6.2-pre4 - TinyFugue script for BatMUD
+;; GgrTF v0.6.2-pre5 - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2007 Matti Hämäläinen (Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.6.2-pre4
+/set ggrtf_ver=0.6.2-pre5
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -1201,8 +1201,8 @@
 	/set gripstr=%;\
 	/while ({#})\
 		/eval /set qtval=$$[prot_%{1}]%;\
-		/eval /set qtval_n=$$[prot_%{1}_n]%;\
 		/if (qtval)\
+			/eval /set qtval_n=$$[prot_%{1}_n]%;\
 			/set prot_%{1}=0%;\
 			/if (gripstr!~"") \
 				/set gripstr=%{gripstr}, %{qtval_n}%;\
@@ -1229,9 +1229,9 @@
 	/set gdmpstr=%;\
 	/while ({#})\
 		/eval /set qtval=$$[prot_%{1}]%;\
-		/eval /set qtval_n=$$[prot_%{1}_n]%;\
 		/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}%;\
@@ -1243,10 +1243,12 @@
 	/done
 
 /def -i -p9999 -F -ag -mregexp -t"^You feel (unprotected|much more vulnerable)\.$" gprots_dmp =\
-	/msq @{BCred}Dispel Magical Protection@{n} hit you!%;\
 	/prcleardmp %{lst_cprots} %{lst_dmpprots}%;\
 	/gprots_get%;/gstatus_update%;\
-	/msr DMP removed: %{gdmpstr}
+	/if (gdmpstr!~"")\
+		/msq @{BCred}Dispel Magical Protection@{n} hit you!%;\
+		/msr DMP removed: %{gdmpstr}%;\
+	/endif
 
 
 ;; Login after reboot
@@ -1262,7 +1264,7 @@
 
 /prdefprot -i"infra"	-n"Infra" 	-l"Infravision" -h -A"\'demoni on pomoni\'$" -u"You have infravision." -d"Everything no longer seems so red."
 /prdefprot -i"ww"	-n"WW" 		-l"Water Walking" -h -A" \'Jeeeeeeeeeeeesuuuuuuuus\'$" -r -u"^(You feel light|Your feet feel lighter than before)\." -d"^You feel heavier\."
-/prdefprot -i"float"	-n"Float"	-l"Floating" 	-r -u"^You feel light, and rise into the air.$" -d"^(Your old floating spell dissipates|You slowly descend until your feet are on the ground).$"
+/prdefprot -i"float"	-n"Float"	-l"Floating" 	-s -r -u"^You feel light, and rise into the air.$" -d"^(Your old floating spell dissipates|You slowly descend until your feet are on the ground).$"
 /prdefprot -i"invis"	-n"Invis"	-l"Invisibility" -r -u"^You (suddenly can\'t see yourself|twist the ring and suddenly you become invisible).$" -d"^You turn visible.$"
 /prdefprot -i"godpr"	-n"GodPr"	-l"Godly Presence"
 /prdefprot -i"seeinvis"	-n"SeeInv"	-l"See Invisible" -u"You feel you can see more than ever." -d"Your vision is less sensitive now."