changeset 566:01afb41d74b8

v0.6.1.13; Use @@ instead of @ for escaping the BatMUD parser in some places; Fix problems with Demonic Ring of Invisibility (closes ID#16)
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 22 Nov 2006 13:15:41 +0000
parents cf92be66fb1e
children 82a3def121a8
files ggrtf-nun.tf ggrtf.tf
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-nun.tf	Wed Nov 22 13:09:19 2006 +0000
+++ b/ggrtf-nun.tf	Wed Nov 22 13:15:41 2006 +0000
@@ -31,6 +31,7 @@
 /def -i -aBCred -mregexp -t"^OOPS, You should have used a pattern" nskill_fumble1 = /gskill_fumble
 
 /def -i -aCred -msimple -t"You fail to channel your god's power." nskill_fail1 = /gskill_fail
+/def -i -aCred -msimple -t"OUCH, you poke yourself with your needle." nskill_fail2 = /gskill_fail
 
 
 ;/def -i -aBCred -msimple -t"" nskill_fumble1 = /gskill_fumble
--- a/ggrtf.tf	Wed Nov 22 13:09:19 2006 +0000
+++ b/ggrtf.tf	Wed Nov 22 13:15:41 2006 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.6.1.12-svn - TinyFugue script for BatMUD
+;; GgrTF v0.6.1.13-svn - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2006 Matti Hämäläinen (Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.6.1.12-svn
+/set ggrtf_ver=0.6.1.13-svn
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -66,7 +66,7 @@
 	/set cast_info_t=%;\
 	/set cast_info_n=%;\
 	/set opt_verbose=on%;\
-	/set set_round=@scan all%;\
+	/set set_round=@@scan all%;\
 	/set set_ripcommand=@whee%;\
 	/set set_peer=embedded%;\
 	/set set_roundmin=2%;\
@@ -99,15 +99,16 @@
 /def msq = /echo -p @{BCwhite}GgrTF@{n}: %*
 /def gerror = /msq @{BCred}ERROR!@{n} %*
 /def gwarning = /msq @{BCred}WARNING!@{n} %*
+/def goutput = %*
 
 /def msr = /if (opt_verbose=~"on") @@party report %*%;/else /msq %*%;/endif
 /def msp = /if (opt_verbose=~"on") @@party say %*%;/else /msq %*%;/endif
 /def mse = /if (opt_verbose=~"on") @@party say emote %*%;/else /msq %*%;/endif
 /def msb = @party report %*
 
-/def dig_grave = @dig grave
-/def eat_corpse = @get corpse%;@eat corpse
-/def get_corpse = @get corpse
+/def dig_grave = @@dig grave
+/def eat_corpse = @@get corpse%;@@eat corpse
+/def get_corpse = @@get corpse
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1166,7 +1167,7 @@
 /prdefprot -i"infra"	-n"Infra" 	-l"Infravision" -s -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"invis"	-n"Invis"	-l"Invisibility" -r -A" \'..... .... ... ..  .    .!\'$" -u"^You (suddenly can\'t see yourself|twist the ring and suddenly you become invisible).$" -d"^You turn visible.$"
+/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."
 /prdefprot -i"seemagic"	-n"SeeMag"	-l"See Magic" -u"You can now see magical things." -d"You are no longer sensitive to magical things."