changeset 588:294f8fa08285 dev-0_6_1_15

v0.6.1.15; New setting for spamming 'view' or 'map' on ship movement; Improvements in other movement logic.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 24 Dec 2006 20:35:49 +0000
parents 81189696e27b
children a188248b6278
files ggrtf.tf
diffstat 1 files changed, 30 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Sun Dec 24 20:24:08 2006 +0000
+++ b/ggrtf.tf	Sun Dec 24 20:35:49 2006 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.6.1.14-svn - TinyFugue script for BatMUD
+;; GgrTF v0.6.1.15-svn - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2006 Matti Hämäläinen (Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.6.1.14-svn
+/set ggrtf_ver=0.6.1.15-svn
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -702,10 +702,10 @@
 
 /def -i -p9999 -ag -mregexp -t"^([A-Z][a-z]+) holds (.+) over the still form of (its|her|his) fallen foe\.$" loc_blood =\
 	/msw @{BCyellow}%{P1}@{n} @{BCwhite}holds@{n} @{Cred}%{P2}@{n} @{BCwhite}over the still form of %{P3} fallen foe.@{n}%;\
-	/if (set_locaction=~"dig") /dig_grave%;/endif%;\
-	/if (set_locaction=~"eat") /eat_corpse%;/endif%;\
-	/if (set_locaction=~"get") /get_corpse%;/endif%;\
-	/if (set_locaction=~"cmd") %{set_loccommand}%;/endif
+	/if (set_locaction=~"dig") /dig_grave%;\
+	/elseif (set_locaction=~"eat") /eat_corpse%;\
+	/elseif (set_locaction=~"get") /get_corpse%;\
+	/elseif (set_locaction=~"cmd") %{set_loccommand}%;/endif
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -714,9 +714,9 @@
 /lichaction off
 
 /def -i -p9999 -mregexp -t"^([A-Z][a-z]+) chants with an eerie hollow voice some arcane sounding words\.$" lich_suck =\
-        /if (set_lichaction=~"dig") /dig_grave%;/endif%;\
-        /if (set_lichaction=~"eat") /eat_corpse%;/endif%;\
-        /if (set_lichaction=~"get") /get_corpse%;/endif
+	/if (set_lichaction=~"dig") /dig_grave%;\
+	/elseif (set_lichaction=~"eat") /eat_corpse%;\
+	/elseif (set_lichaction=~"get") /get_corpse%;/endif
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -733,26 +733,36 @@
 
 ;; Autopeering
 /def -i prmove_peer = /set prmove_last=%{1}%;/gstatus_update%;@%{1}%;\
-	/if ({1}=~"n" | {1}=~"s") /let pd1=w%;/let pd2=e%;/endif%;\
-	/if ({1}=~"w" | {1}=~"e") /let pd1=n%;/let pd2=s%;/endif%;\
+	/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%;\
 	@@grep '(%{set_peer})' peer %{pd1}%;\
 	@@grep '(%{set_peer})' peer %{pd2}
 
-;; Ship movement
-/prdeftoggle -n"cruise" -d"Cruise speed on ship (off = sail)"
-/def -i prmove_ship =\
-	/set prmove_last=%{1}%;/gstatus_update%;\
-	/if (opt_cruise=~"on") @cruise %{1}%;/else @sail %{1}%;/endif
-
-
 ;; Main handling macro for binding movemement keys, etc.
 /prdefhook -n"move" -d"Keyboard movement hooks" -h"prmove" -s"walk ship peer"
 /move walk
 
 /prdefvalue -n"peer" -d"Regular expression used with autopeering"
 
-;; 'view' on every ship move
-/def -i -F -mregexp -t"^The ship (sails|cruises) " ship_move = @view
+
+
+;; Ship movement
+/prdeftoggle -n"cruise" -d"Cruise speed on ship (off = sail)"
+/def -i prmove_ship =\
+	/set prmove_last=%{1}%;/gstatus_update%;\
+	/if ({1}=~"X") @@sail stop%;\
+	/elseif (opt_cruise=~"on") @@cruise %{1}%;\
+	/else @@sail %{1}%;/endif
+
+
+;; Ship viewing setting
+/prdefsetting -n"shipmove" -d"Action on ship movement" -s"off view map"
+/shipmove off
+
+/def -i -F -mregexp -t"^The ship (sails|cruises) " gship_move =\
+	/if (set_shipmove=~"view") @@view%;\
+	/elseif (set_shipmove=~"map") @@map%;/endif
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;