Mercurial > hg > batmud > ggrtf
changeset 1593:023dddbfa587
Hopefully add number of rescuers to pss-mangled output.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 05 May 2015 17:42:18 +0300 |
parents | 28dc80de64c0 |
children | 59aece5b2793 |
files | gm-pssmangle.tf |
diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gm-pssmangle.tf Tue May 05 17:29:25 2015 +0300 +++ b/gm-pssmangle.tf Tue May 05 17:42:18 2015 +0300 @@ -67,6 +67,7 @@ /eval /set _gp_i=$$[gparty_%{1}_%{2}_i]%;\ /eval /set _gp_s=$$[gparty_%{1}_%{2}_s]%;\ /eval /set _gp_pl=$$[gparty_%{1}_%{2}_pl]%;\ + /eval /set _gp_pr=$$[gparty_%{1}_%{2}_pr]%;\ /eval /set _gp_hp=$$[gparty_%{1}_%{2}_hp]%;\ /eval /set _gp_hpm=$$[gparty_%{1}_%{2}_hpm]%;\ /eval /set _gp_sp=$$[gparty_%{1}_%{2}_sp]%;\ @@ -74,7 +75,7 @@ /eval /set _gp_ep=$$[gparty_%{1}_%{2}_ep]%;\ /eval /set _gp_epm=$$[gparty_%{1}_%{2}_epm]%;\ /let _tmpc=$[gparty_get_color(_gp_pl)]%;\ - /return "%{_tmpc}$[prsubpad(_gp_s,9)]@{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)]" + /return "@{BCcyan}$[prsubpad(_gp_pr,1)]@{n}%{_tmpc}$[prsubpad(_gp_s,9)]@{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_scd =\ /eval /set _gp_hp=$$[gparty_%{1}_%{2}_hp]%;\ @@ -83,7 +84,7 @@ /eval /set _gp_osp=$$[gparty_%{1}_%{2}_osp]%;\ /eval /set _gp_ep=$$[gparty_%{1}_%{2}_ep]%;\ /eval /set _gp_oep=$$[gparty_%{1}_%{2}_oep]%;\ - /return " ------- @{Cblue}:@{n}$[gparty_dval(_gp_hp,_gp_ohp)]@{BCblue}:@{n}$[gparty_dval(_gp_sp,_gp_osp)]@{Cblue}:@{n}$[gparty_dval(_gp_ep,_gp_oep)]" + /return " @{BCblack}-------@{n} @{Cblue}:@{n}$[gparty_dval(_gp_hp,_gp_ohp)]@{BCblue}:@{n}$[gparty_dval(_gp_sp,_gp_osp)]@{Cblue}:@{n}$[gparty_dval(_gp_ep,_gp_oep)]" /def -i gparty_show_souls =\ /if ({#} <= 0) /return%;/endif%;\ @@ -94,7 +95,7 @@ /eval /set _gp_hp=$$[gparty_%{1}_sl_hp]%;\ /if (_gp_pl=~"") /set _gp_pl=@{BCblue} ?@{n}%;/endif%;\ /let _tmpc=$[gparty_get_color(_gp_pl)]%;\ - /let _tmps=%{_tmps}$[prsubpad({1},9)]@{Cblue}:@{n}%{_tmpc}%{_gp_pl}@{n}@{Cblue}:@{n}$[gparty_val(_gp_hp,100)]@{Cblue}:@{n} |%;\ + /let _tmps=%{_tmps}$[prsubpad({1},10)]@{Cblue}:@{n}%{_tmpc}%{_gp_pl}@{n}@{Cblue}:@{n}$[gparty_val(_gp_hp,100)]@{Cblue}:@{n} |%;\ /shift%;\ /if (mod(++_souls,3) == 0)\ /msw |%{_tmps}%;\ @@ -102,16 +103,16 @@ /endif%;\ /done%;\ /while (mod(_souls,3) != 0)\ - /let _tmps=%{_tmps} |%;\ + /let _tmps=%{_tmps} |%;\ /let _souls=$[_souls+1]%;\ /done%;\ /if (_tmps!~"")\ /msw |%{_tmps}%;\ /endif%;\ - /echo `--------------------------------------------------------------------------' + /echo `-------------------------+-------------------------+-------------------------' /def -i gparty_show =\ - /echo ,--------------------------------------------------------------------------.%;\ + /echo ,-----------------------------------------------------------------------------.%;\ /msw |$[gparty_sc(1,1)]|$[gparty_sc(1,2)]|$[gparty_sc(1,3)]|%;\ /if (opt_diffpss=~"on") /msw |$[gparty_scd(1,1)]|$[gparty_scd(1,2)]|$[gparty_scd(1,3)]|%;/endif%;\ /if (gparty_row2 | gparty_row3 | opt_fullparty=~"on")\ @@ -122,7 +123,7 @@ /if (opt_diffpss=~"on") /msw |$[gparty_scd(3,1)]|$[gparty_scd(3,2)]|$[gparty_scd(3,3)]|%;/endif%;\ /endif%;\ /endif%;\ - /echo `--------------------------------------------------------------------------' + /echo `-----------------------------------------------------------------------------' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -246,7 +247,7 @@ /gparty_clear -/def -i -F -Egparty_grab>0 -p999 -mregexp -t"^\|(.)([1-3?]\.[1-3?]) +([A-Z][A-Za-z ][A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z]?) +(ld|ldr|fol|mbr|form|unc|amb|dead|rest|stun) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\)" gpss_getps =\ +/def -i -F -Egparty_grab>0 -p999 -mregexp -t"^\|(.)([1-3?]\.[1-3?]) +([A-Z][A-Za-z ][A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z]?) +(ld|ldr|fol|mbr|form|unc|amb|dead|rest|stun|unc\|[0-9]+|stu\|[0-9]+) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\)" gpss_getps =\ /if (opt_prettypss=~"on") /substitute -ag%;/endif%;\ /test gparty_set({P2},{P3},{P4},{P5},{P6},{P7},{P8},{P9},{P10},{P1}) @@ -254,7 +255,7 @@ /if (opt_prettypss=~"on") /substitute -ag%;/endif%;\ /test gparty_set_familiar({P1},{P2},{P3}) -/def -i -F -Egparty_grab>0 -p999 -mregexp -t"^\|(.)([1-3?]\.[1-3?]) +\+([A-Z][A-Za-z ][A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z]?) +(ld|ldr|fol|mbr|form|unc|amb|dead|rest|stun) +([0-9-]+)\( *([0-9-]+)\) " gpss_getps3 =\ +/def -i -F -Egparty_grab>0 -p999 -mregexp -t"^\|(.)([1-3?]\.[1-3?]) +\+([A-Z][A-Za-z ][A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z ]?[A-Za-z]?) +(ld|ldr|fol|mbr|form|unc|amb|dead|rest|stun|unc\|[0-9]+|stu\|[0-9]+) +([0-9-]+)\( *([0-9-]+)\) " gpss_getps3 =\ /if (opt_prettypss=~"on") /substitute -ag%;/endif%;\ /test gparty_set({P2},{P3},{P4},{P5})