diff --git a/arkadia/statusbar.tf b/arkadia/statusbar.tf index 25c7bbd..da9d744 100644 --- a/arkadia/statusbar.tf +++ b/arkadia/statusbar.tf @@ -248,7 +248,7 @@ /eval /status_add -r1 "K: ":: kondycja:23 /eval /status_add -r1 "Z: ":: zmeczenie:20 /eval /status_add -r1 "M: ":: mana:20 -/eval /status_add -r1 "Hidden: ":: hide:4:C%c_main +/eval /status_add -r1 "Hidden: ":: hideshow:4:C%c_main /eval /status_add -r1 "Cover: ":: nxt_zaslona:3 /eval /status_add -r1 "Mail: ":: poczta_show:5:C%c_main /eval /status_add -r1 spacebreak:: diff --git a/common/misc.tf b/common/misc.tf index 68be4d3..f92d2f5 100644 --- a/common/misc.tf +++ b/common/misc.tf @@ -8,3 +8,17 @@ ocen madrosc %;\ ocen odwage %;\ powstan + +/def -i pid_of = \ + /quote -S \ + /eval /let pid_czego=`"/@ps -r" %%;\ + /if (strstr({pid_czego},{*}) != -1) \ + /first %%{pid_czego} %%;\ + /endif +/def rstart = \ + /if ($(/pid_of %{-2})=~NULL) \ + /repeat %{1} %{2} %{-2} %;\ + /endif + +/def rstop = \ + /kill $(/pid_of %{*}) diff --git a/common/movement.tf b/common/movement.tf index 64b53dc..dfbfd48 100644 --- a/common/movement.tf +++ b/common/movement.tf @@ -62,10 +62,10 @@ /hide off %;\ /elseif ( {sneak} =~ "ON" )\ /send -h przemknij %{1} %;\ - /hide ON %;\ + /hide on %;\ /elseif ( {sneak} =~ "TEAM" )\ /send -h przemknij z druzyna %{1} %;\ - /hide ON %;\ + /hide on %;\ /endif %;\ /def key_nkp5 @@ -77,10 +77,10 @@ /hide off %;\ /elseif ( {sneak} =~ "ON" )\ /send przemknij %{1} %;\ - /hide ON %;\ + /hide on %;\ /elseif ( {sneak} =~ "TEAM" )\ /send przemknij z druzyna %{1} %;\ - /hide ON %;\ + /hide on %;\ /endif %;\ /_map_go navigate:%{1}%;\ /def key_nkp5 @@ -89,7 +89,7 @@ /set lwgo=1 %;\ /set lwlast=%{1} %;\ /send przemknij %{1} %;\ - /hide ON %;\ + /hide on %;\ /_map_go navigate:%{1}%;\ /def key_nkp5 @@ -97,7 +97,7 @@ /set lwgo=1 %;\ /set lwlast=%{1} %;\ /send przemknij sie z druzyna %{1} %;\ - /hide ON %;\ + /hide on %;\ /_map_go navigate:%{1}%;\ /def key_nkp5 @@ -209,9 +209,7 @@ /def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna u$' = /idzkpt u /def sneak = \ - /if ( {1} =~ NULL )\ - /echo -p #@{C%c_info}#@{n}# Przemykanie: @{C%c_info}%sneak@{n}%;\ - /elseif ( {1} =~ "off" ) \ + /if ( {1} =~ "off" ) \ /set sneak %{1} %;\ /status_edit -r2 sneak:4:C%{c_main} %;\ /elseif ( {1} =~ "ON" ) \ @@ -222,20 +220,43 @@ /status_edit -r2 sneak:4:C%{c_alarm} %;\ /endif +/def hidenum = \ + /set hideshow %{1}%;\ + /status_edit -r1 hideshow:4:C%c_alarm +/def hidecountstart = \ + /rstart -1 1 /hidenum >>1%;\ + /rstart -2 1 /hidenum >>2%;\ + /rstart -3 1 /hidenum >>3%;\ + /rstart -4 1 /hidenum >>4%;\ + /rstart -5 1 /hidenum >>5%;\ + /rstart -6 1 /hidenum >>6%;\ + /rstart -7 1 /hidenum >>7%;\ + /rstart -8 1 /hidenum >>8%;\ + /rstart -9 1 /hidenum >>9%;\ + /rstart -10 1 /hidenum >10%;\ + /rstart -11 1 /hidenum >11%;\ + /rstart -12 1 /hidenum >12%;\ + /rstart -13 1 /hidenum >13%;\ + /rstart -14 1 /hidenum >14%;\ + /rstart -15 1 /hidenum >15%;\ + /def hide = \ - /if ( {1} =~ NULL )\ - /echo -p #@{C%c_info}#@{n}# Ukrycie: @{C%c_info}%hide@{n}%;\ - /elseif ( {1} =~ "off" ) \ + /if ( {1} =~ "off" ) \ /set hide %{1} %;\ - /status_edit -r1 hide:4:C%{c_main} %;\ - /elseif ( {1} =~ "ON" ) \ + /set hideshow %{1} %;\ + /status_edit -r1 hideshow:4:C%{c_main} %;\ + /rstop hidenum %;\ + /elseif ( {1} =~ "on" ) \ /set hide %{1} %;\ - /status_edit -r1 hide:4:C%{c_alarm} %;\ + /set hideshow 0%;\ + /status_edit -r1 hideshow:4:C%{c_alarm} %;\ + /rstop hidenum %;\ + /hidecountstart %;\ /endif -/def -mregexp -Fp2 -t'Chowasz sie .* potrafisz' hideon0 = /hide ON -/def -mregexp -Fp2 -t'Nie potrafisz ukryc sie jeszcze bardziej' hideon1 = /hide ON -/def -E(hide=~"off") -mregexp -Fp2 -t'Podazasz skradajac sie za ' hideon2 = /hide ON +/def -mregexp -Fp2 -t'Chowasz sie .* potrafisz' hideon0 = /hide on +/def -mregexp -Fp2 -t'Nie potrafisz ukryc sie jeszcze bardziej' hideon1 = /hide on +/def -E(hide=~"off") -mregexp -Fp2 -t'Podazasz skradajac sie za ' hideon2 = /hide on /def -mregexp -Fp2 -t'.* ujawnia cie.*' hideoff0 = /hide off /def -mregexp -Fp2 -t'Nie jestes juz schowan.' hideoff1 = /hide off /def -mregexp -Fp2 -t'Nie jestes w stanie sie tu dobrze schowac' hideoff2 = /hide off diff --git a/common/sets.tf b/common/sets.tf index ee229c1..6ffa314 100644 --- a/common/sets.tf +++ b/common/sets.tf @@ -9,7 +9,7 @@ /set attackmode=1 /set sneak=off -/set hide=off +/set hideshow=off /set auto=off /set unnormal=none diff --git a/common/start.tf b/common/start.tf index 062fd14..ff333f9 100644 --- a/common/start.tf +++ b/common/start.tf @@ -54,20 +54,24 @@ /load %{priv_dir}/%{mudworld}/herbs.tf %;\ /load %{priv_dir}/%{mudworld}/names.tf %;\ /load %{priv_dir}/%{mudworld}/players/%{player}/%{player}.tf %;\ - /if ( {poczta_show} !~ "none" )\ + /if ({poczta_show} !~ "none" )\ /status_edit -r1 poczta_show:5:C%{c_alarm} %;\ /endif %;\ - /if ( {bindings} !~ NULL ) \ + /if ({bindings} !~ NULL ) \ /def -b'`' tempbind = /dobind %{bindings} %;\ - /if ( {ktype} =~ "mac" ) \ + /if ({ktype} =~ "mac" ) \ /def key_nkp- = /dobind %{*} %;\ /endif %;\ /endif %;\ /sneak %sneak %;\ - /hide %hide %;\ - /if ( {weaponstat} =~ "ON" )\ + /if ({hide} =~ "on" )\ + /status_edit -r1 hideshow:4:C%c_alarm%;\ + /else \ + /status_edit -r1 hideshow:4:C%c_main%;\ + /endif%;\ + /if ({weaponstat} =~ "ON" )\ /weapon_on%;\ - /elseif ( {weaponstat} =~ "!!!" )\ + /elseif ( {weaponstat} =~ "ERR" )\ /weapon_break%;\ /endif%;\ /f1 %f1 %;\