Mercurial > hg > batmud > ggrtf

changeset 716:130b64afb7e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added a new option for disabling /pss output prettying, /prettypss.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 26 Jan 2008 12:12:40 +0000
parents 3c0c84672043
children 1218f189f064
files ggrtf-pssmangle.tf
diffstat 1 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-pssmangle.tf	Sat Jan 26 12:11:44 2008 +0000
+++ b/ggrtf-pssmangle.tf	Sat Jan 26 12:12:40 2008 +0000
@@ -13,6 +13,8 @@
 ;; Settings
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /prdeftoggle -n"fullparty"	-d"Always show full party formation"
+/prdeftoggle -n"prettypss"	-d"Make output of /pss and autopss pretty"
+/set opt_prettypss=on
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -26,7 +28,7 @@
 	/endif%;\
 	/return "@{$[prgetnlite({1},{2})]}$[pad(_qtmp,4)]@{n}"
 
-/def -i gparty_sc1 =\
+/def -i gparty_sc =\
 	/eval /set _gp_s=$$[gparty_%{1}_%{2}_s]%;\
 	/eval /set _gp_pl=$$[gparty_%{1}_%{2}_pl]%;\
 	/eval /set _gp_hp=$$[gparty_%{1}_%{2}_hp]%;\
@@ -46,13 +48,13 @@
 	/return "%{tmpc}$[pad(tmps,8)]@{n}@{Cblue}:@{n}$[gparty_val(_gp_hp,_gp_hpm)]@{Cblue}:@{n}$[gparty_val(_gp_sp,_gp_spm)]@{Cblue}:@{n}$[gparty_val(_gp_ep,_gp_epm)]"
 
 
-/def -i gparty_show1 =\
+/def -i gparty_show =\
 	/echo ,-----------------------------------------------------------------------.%;\
-	/msw |$[gparty_sc1(1,1)]|$[gparty_sc1(1,2)]|$[gparty_sc1(1,3)]|%;\
+	/msw |$[gparty_sc(1,1)]|$[gparty_sc(1,2)]|$[gparty_sc(1,3)]|%;\
 	/if (gparty_row2 | gparty_row3 | opt_fullparty=~"on")\
-	/msw |$[gparty_sc1(2,1)]|$[gparty_sc1(2,2)]|$[gparty_sc1(2,3)]|%;\
+	/msw |$[gparty_sc(2,1)]|$[gparty_sc(2,2)]|$[gparty_sc(2,3)]|%;\
 	/if (gparty_row3 | opt_fullparty=~"on")\
-	/msw |$[gparty_sc1(3,1)]|$[gparty_sc1(3,2)]|$[gparty_sc1(3,3)]|%;\
+	/msw |$[gparty_sc(3,1)]|$[gparty_sc(3,2)]|$[gparty_sc(3,3)]|%;\
 	/endif%;\
 	/endif%;\
 	/echo `-----------------------------------------------------------------------'
@@ -99,23 +101,25 @@
 		/gparty_set %%%{_crow}.%%%{_ccol}
 
 
-/def -i -F -Egparty_gag -ag -p9999 -msimple -t',-----------------------------------------------------------------------------.' gpss_getbegin =\
+/def -i -F -Egparty_gag -p9999 -msimple -t',-----------------------------------------------------------------------------.' gpss_getbegin =\
+	/if (opt_prettypss=~"on") /substitute -ag%;/endif%;\
 	/gparty_clear
 
 
-/def -i -F -Egparty_gag -ag -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-]+)\)" gpss_getps =\
+/def -i -F -Egparty_gag -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-]+)\)" gpss_getps =\
+	/if (opt_prettypss=~"on") /substitute -ag%;/endif%;\
 	/test gparty_set({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8},{P9})
 
 
-/def -i -F -Egparty_gag -ag -p9999 -msimple -t'`-----------------------------------------------------------------------------\'' gpss_getend =\
+/def -i -F -Egparty_gag -p9999 -msimple -t'`-----------------------------------------------------------------------------\'' gpss_getend =\
 	/set gparty_gag=0%;\
 	/set gparty_members=%{gparty_mtmp}%;\
-	/gparty_show1%;\
+	/if (opt_prettypss=~"on") /substitute -ag%;/gparty_show%;/endif%;\
 	/prexecfuncs %{event_pss_once}%;\
 	/set event_pss_once=
 
 
-/def -i -F -p9999 -msimple -t'You are not in a party.' gpss_noparty =\
+/def -i -F -p9999 -msimple -t"You are not in a party." gpss_noparty =\
 	/set gparty_gag=0%;\
 	/set event_pss_once=