changeset 983:921d8ed4a0fd

v0.6.11.5-svn; Misc. cleanups; Added error messages if certain required options of /prdefprot are missing.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 31 Mar 2009 22:04:34 +0000
parents 60ca44cdc9e0
children a18650273c20
files ggrtf.tf
diffstat 1 files changed, 14 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Tue Mar 31 20:17:58 2009 +0000
+++ b/ggrtf.tf	Tue Mar 31 22:04:34 2009 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.6.11.4-svn - TinyFugue script for BatMUD
+;; GgrTF v0.6.11.5-svn - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2009 Matti Hämäläinen (Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.6.11.4-svn
+/set ggrtf_ver=0.6.11.5-svn
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -786,7 +786,8 @@
 /def -i prmove_walk = /set prmove_last=%{1}%;/gstatus_update%;@%{1}
 
 ;; Autopeering
-/def -i prmove_peer = /set prmove_last=%{1}%;/gstatus_update%;@%{1}%;\
+/def -i prmove_peer =\
+	/set prmove_last=%{1}%;/gstatus_update%;@%{1}%;\
 	/if 	({1}=~"n" | {1}=~"s") /let pd1=w%;/let pd2=e%;\
 	/elseif ({1}=~"w" | {1}=~"e") /let pd1=n%;/let pd2=s%;\
 	/else /break%;/endif%;\
@@ -1026,13 +1027,15 @@
 
 
 ;; Clear/setup all variables related to prot
-; -i"<name>"
-; -n"<shortname>"
-; -l"<desc/longname>"
-; -A"<prerequisite regexp #1>"
+; -i"<name>" Prot unique name (must be unique)
+; -n"<shortname>" Short name, shown in /prots output and statusline
+; -l"<desc/longname>" Long name, should also be the same as "show effects" output
+; -A"<prerequisite regexp #1>" Pre-requisite #1 for prot "up" message
 ; -B"<prerequisite regexp #2>"
 ; -C"<prerequisite regexp #3>"
-; -r Use regexp instead of simple matching
+; -u"<up message>"
+; -d"<down message>"
+; -r Use regexp instead of simple matching in up AND down messages
 ; -s Stackable prot
 ; -h Renewable prot (does not stack, but can be renewed)
 ; -p Conjurer minor typeprot (options -u, -s, -r are meaningless)
@@ -1042,12 +1045,14 @@
 ; -M RIP (player's death) removes this prot
 ; -e Extra counter report (don't ask)
 ; -z Handicap (curse, or similar)
-; -c 
+
 /def -i prdefprot =\
 	/if (!getopts("i:n:l:A:B:C:u:d:srhpPqmMez", "")) /gerror Invalid prot definition!%;/break%;/endif%;\
 	/if (opt_i=~"") /gerror Prot definition missing varname (-i)%;/break%;/endif%;\
 	/if (opt_n=~"") /gerror Prot definition '%{opt_i}' missing name (-n)%;/break%;/endif%;\
 	/if (opt_l=~"") /gerror Prot definition '%{opt_i}' missing long name (-l)%;/break%;/endif%;\
+	/if (opt_u=~"") /gerror Prot definition '%{opt_i}' missing up message (-u)%;/break%;/endif%;\
+	/if (opt_d=~"") /gerror Prot definition '%{opt_i}' missing down message (-d)%;/break%;/endif%;\
 	/test prlist_insert("lst_prots", opt_i)%;\
 	/set prot_%{opt_i}=0%;\
 	/set prot_%{opt_i}_t=-1%;\