From 2238df5cb4665611ea901e0761b976db0b7f8b23 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 19 Nov 2014 19:29:54 +0100 Subject: [PATCH] Poprawki do /postepy. --- arkadia/stats.tf | 8 +++++--- common/init.tf | 4 ++++ common/stats.tf | 25 +++---------------------- nightal/stats.tf | 2 ++ 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/arkadia/stats.tf b/arkadia/stats.tf index 45fe1d3..dd6f152 100644 --- a/arkadia/stats.tf +++ b/arkadia/stats.tf @@ -184,18 +184,20 @@ /def czysc_spece = /quote -S /unset `/listvar -s spec_*%; ; postepy +/set _postepy_max=16 /set _postepy_list=\ + logowanie|\ minimalne|\ nieznaczne|\ - bmale|\ + bardzo male|\ male|\ nieduze|\ zadowalajace|\ spore|\ - dduze|\ + dosc duze|\ znaczne|\ duze|\ - bduze|\ + bardzo duze|\ ogromne|\ imponujace|\ wspaniale|\ diff --git a/common/init.tf b/common/init.tf index 2025957..7a35093 100644 --- a/common/init.tf +++ b/common/init.tf @@ -7,6 +7,10 @@ /f7 empty /f8 empty +/eval /set _postepy_czas_0=$[ftime("%H:%M", time())] +/set _postepy_own_0=0 +/set _postepy_all_0=0 + ;; kompatybilność wsteczna: /eval /set kolor_info=%c_info /eval /set obecnie_swiat=%mudworld diff --git a/common/stats.tf b/common/stats.tf index a958b1e..01dda79 100644 --- a/common/stats.tf +++ b/common/stats.tf @@ -144,24 +144,11 @@ /done%; \ /return "" -/def -Fp2 -mregexp -t'Poczynil.s (.*) postepy, od momentu kiedy wszedles do gry\.' _postepy_lap = \ - /if ({3} =~ "male")\ - /let __postep=$[strcat({2}," ", {3})]%;\ - /elseif ({3} =~ "duze")\ - /let __postep=$[strcat({2}," ", {3})]%;\ - /else \ - /let __postep=%{2}%;\ - /endif%;\ - /if ({__postep} =~ "bardzo male")\ - /let __postep=bmale%;\ - /elseif ({__postep} =~ "dosc duze")\ - /let __postep=dduze%;\ - /elseif ({__postep} =~ "bardzo duze")\ - /let __postep=bduze%;\ - /endif%;\ +/def -Fp2 -mregexp -t'Poczynil.s (.*) postepy, od momentu kiedy' _postepy_lap = \ + /let __postep=%{P1}%;\ /let __index=$[_get_index({__postep}, {_postepy_list})]%;\ /_postepy_zanotuj %{__index}%;\ - /_sub %__index/15 + /_sub %{__index}/%{_postepy_max} /def _postepy_zanotuj = \ /let __postep=%{1}%; \ @@ -198,9 +185,3 @@ /echo -p @{n}| | |%; \ /endif%; \ /echo +--------------+-------+-----+-----+ - -/def _postepy_show = \ - /let __postep=%{2}%; \ - /let __index=$[_get_index({__postep}, {_postepy_list})]%; \ - /_postepy_zanotuj %{__index}%; \ - /test substitute(strcat("@{B}", {1}, " [",{__index},"/15]"),"",1) diff --git a/nightal/stats.tf b/nightal/stats.tf index 44af5ca..33a1a39 100644 --- a/nightal/stats.tf +++ b/nightal/stats.tf @@ -1,5 +1,7 @@ ; postepy +/set _postepy_max=20 /set _postepy_list=\ + logowanie|\ znikome|\ minimalne|\ mizerne|\