Mercurial > hg > batmud > ggrtf

changeset 348:9ba5345c4f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups made in preparation of including new code.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 10 Mar 2006 18:57:51 +0000
parents 230f5de3b493
children 49996a1b406f
files ggrtf-pssmangle.tf
diffstat 1 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-pssmangle.tf	Fri Mar 10 18:25:23 2006 +0000
+++ b/ggrtf-pssmangle.tf	Fri Mar 10 18:57:51 2006 +0000
@@ -10,11 +10,8 @@
 /loaded GgrTF::PSSMangle
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Initialization, output/prettyprinting macros
+;; Output and prettyprinting macros
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/set gparty_gag=0
-/def pstatus = /set gparty_gag=1%;@party status short
-
 /def -i gparty_val =\
 	/if (!{1}) /let qtemp=-%;/else /let qtemp=%{1}%;/endif%;\
 	/return "@{$[prgetnlite({1},{2})]}$[pad(qtemp,4)]@{n}"
@@ -46,6 +43,7 @@
 	/msw |$[gparty_sc1(3,1)]|$[gparty_sc1(3,2)]|$[gparty_sc1(3,3)]|%;\
 	/echo `-----------------------------------------------------------------------'
 
+
 /def -i gparty_show2 =\
 	/echo ,-----------------------------------------------------------------------.%;\
 	/msw |$[gparty_sc1(1,1)]|$[gparty_sc1(2,1)]|$[gparty_sc1(3,1)]|%;\
@@ -57,42 +55,42 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Utility and grabbing triggers
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def -i gparty_clear =\
-	/gparty_set 1.1%;\
-	/gparty_set 1.2%;\
-	/gparty_set 1.3%;\
-	/gparty_set 2.1%;\
-	/gparty_set 2.2%;\
-	/gparty_set 2.3%;\
-	/gparty_set 3.1%;\
-	/gparty_set 3.2%;\
-	/gparty_set 3.3 
+/set gparty_gag=0
+/def pstatus = /set gparty_gag=1%;@@party status short
 
 /def -i gparty_set =\
-	/let gps=$[replace(".","_",{1})]%;\
-	/eval /set gparty_%{gps}_os=$$[gparty_%{gps}_s]%;\
-	/eval /set gparty_%{gps}_opl=$$[gparty_%{gps}_pl]%;\
-	/eval /set gparty_%{gps}_ohp=$$[gparty_%{gps}_hp]%;\
-	/eval /set gparty_%{gps}_ohpm=$$[gparty_%{gps}_hpm]%;\
-	/eval /set gparty_%{gps}_osp=$$[gparty_%{gps}_sp]%;\
-	/eval /set gparty_%{gps}_ospm=$$[gparty_%{gps}_spm]%;\
-	/eval /set gparty_%{gps}_oep=$$[gparty_%{gps}_ep]%;\
-	/eval /set gparty_%{gps}_oepm=$$[gparty_%{gps}_epm]%;\
-	/set gparty_%{gps}_s=%{2}%;\
-	/set gparty_%{gps}_pl=%{3}%;\
-	/set gparty_%{gps}_hp=%{4}%;\
-	/set gparty_%{gps}_hpm=%{5}%;\
-	/set gparty_%{gps}_sp=%{6}%;\
-	/set gparty_%{gps}_spm=%{7}%;\
-	/set gparty_%{gps}_ep=%{8}%;\
-	/set gparty_%{gps}_epm=%{9}
+	/let _gps=$[replace(".","_",{1})]%;\
+	/eval /set gparty_%{_gps}_os=$$[gparty_%{_gps}_s]%;\
+	/eval /set gparty_%{_gps}_opl=$$[gparty_%{_gps}_pl]%;\
+	/eval /set gparty_%{_gps}_ohp=$$[gparty_%{_gps}_hp]%;\
+	/eval /set gparty_%{_gps}_ohpm=$$[gparty_%{_gps}_hpm]%;\
+	/eval /set gparty_%{_gps}_osp=$$[gparty_%{_gps}_sp]%;\
+	/eval /set gparty_%{_gps}_ospm=$$[gparty_%{_gps}_spm]%;\
+	/eval /set gparty_%{_gps}_oep=$$[gparty_%{_gps}_ep]%;\
+	/eval /set gparty_%{_gps}_oepm=$$[gparty_%{_gps}_epm]%;\
+	/set gparty_%{_gps}_s=%{2}%;\
+	/set gparty_%{_gps}_pl=%{3}%;\
+	/set gparty_%{_gps}_hp=%{4}%;\
+	/set gparty_%{_gps}_hpm=%{5}%;\
+	/set gparty_%{_gps}_sp=%{6}%;\
+	/set gparty_%{_gps}_spm=%{7}%;\
+	/set gparty_%{_gps}_ep=%{8}%;\
+	/set gparty_%{_gps}_epm=%{9}
+
+
+/def -i gparty_clear =\
+	/for _ccol 1 3 \
+		/for _crow 1 3 \
+			/gparty_set %%%{_crow}.%%%{_ccol}
+
 
 /def -i -F -p9999 -msimple -t',-----------------------------------------------------------------------------.' pss_getbegin =\
 	/if (gparty_gag)\
+		/substitute -ag%;\
 		/gparty_clear%;\
-		/substitute -ag%;\
 	/endif
 
+
 /def -i -F -p9999 -mregexp -t"^\|.([1-3?].[1-3?])   ([A-Z][a-z ][a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z]?) +(ld|ldr|fol|mbr|form|unc|dead|rest|stun) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\)" pss_getps =\
 	/if ({P1} !~ "?.?")\
 		/test gparty_set({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8},{P9})%;\
@@ -101,12 +99,14 @@
 		/substitute -ag%;\
 	/endif
 
+
 /def -i -F -p9999 -msimple -t'`-----------------------------------------------------------------------------\'' pss_getend =\
 	/if (gparty_gag)\
 		/substitute -ag%;\
 		/gparty_show1%;\
-	/endif%;\
-	/set gparty_gag=0
+		/set gparty_gag=0%;\
+	/endif
+
 
 /def -i -F -p9999 -msimple -t'You are not in a party.' pss_noparty =\
 	/set gparty_gag=0