# HG changeset patch # User Matti Hamalainen # Date 1430836140 -10800 # Node ID 824fc8a981fd676b7f3f57431b552a3b6db50756 # Parent d43359389e671c7a5594c1e199327dcc0680c51c Adjust coloring. diff -r d43359389e67 -r 824fc8a981fd gm-pssmangle.tf --- a/gm-pssmangle.tf Tue May 05 16:51:07 2015 +0300 +++ b/gm-pssmangle.tf Tue May 05 17:29:00 2015 +0300 @@ -41,22 +41,26 @@ /def -i gparty_get_color =\ /if ({1}=~"unc")\ - /let _tmpc=@{BCwhite,BCbgred}%;\ - /elseif ({1}=~"stun")\ - /let _tmpc=@{BCred}%;\ + /let _tmpc=BCwhite,BCbgred%;\ + /elseif ({1}=~"stun"|{1}=~"stu")\ + /let _tmpc=BCred%;\ /elseif ({1}=~"amb")\ - /let _tmpc=@{BCred}%;\ + /let _tmpc=BCred%;\ /elseif ({1}=~"Glaced")\ - /let _tmpc=@{BCwhite,Cbgblue}%;\ + /let _tmpc=BCwhite,Cbgblue%;\ /elseif ({1}=~"form"|{1}=~"mbr")\ - /let _tmpc=@{Cmagenta}%;\ + /let _tmpc=Cmagenta%;\ /elseif ({1}=~"rest")\ - /let _tmpc=@{Ccyan}%;\ + /let _tmpc=Ccyan%;\ /elseif (_gp_i=~"*")\ - /let _tmpc=@{BCblue}%;\ - /else /let _tmpc=@{BCwhite}%;\ + /let _tmpc=BCblack%;\ + /else /let _tmpc=BCwhite%;\ /endif%;\ - /return _tmpc + /if ({2})\ + /return _tmpc%;\ + /else \ + /return "@{%{_tmpc}}"%;\ + /endif /def -i gparty_sc =\ @@ -123,6 +127,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; TF5 status line PSS +;; NOTE: This is not finished and probably does not work. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; /def -i gparty_pc =\ /eval /set _gp_i=$$[gparty_%{1}_%{2}_i]%;\ @@ -134,7 +139,7 @@ /eval /set _gp_spm=$$[gparty_%{1}_%{2}_spm]%;\ /eval /set _gp_ep=$$[gparty_%{1}_%{2}_ep]%;\ /eval /set _gp_epm=$$[gparty_%{1}_%{2}_epm]%;\ - /let _tmpc=$[gparty_get_color(_gp_pl)]%;\ + /let _tmpc=$[gparty_get_color(_gp_pl,1)]%;\ /let _tmps="$[prsubpad(_gp_s,9)]"::%{_tmpc} ":"::Cblue "%{_gp_hp}":4:$[prgetnlite(_gp_hp,_gp_hpm)] ":"::Cblue "%{_gp_sp}":4:$[prgetnlite(_gp_sp,_gp_spm)] ":"::Cblue "%{_gp_ep}":4:$[prgetnlite(_gp_ep,_gp_epm)]%;\ /return _tmps