From b778ad02b08530ecf6c0a7aaab05025180ffaadc Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 19 Nov 2014 16:31:02 +0100 Subject: [PATCH] Bugi w lampie. --- common/equipment.tf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/common/equipment.tf b/common/equipment.tf index 8b228c4..93cff94 100644 --- a/common/equipment.tf +++ b/common/equipment.tf @@ -64,19 +64,24 @@ /rstop /_lampa_warn%;\ /tbind lampa_on_cmd /def -mregexp -p2 -t'Zapalasz .*lampe.$' light_on1 = \ - /eval /repeat -%lampatick 1 /_lampa_warn -/def -mregexp -p2 -t'Zapalasz .* lampe, oprozniajac' light_on2 = \ + /if ({freshoil} != 1)\ + /repeat -%lampatick 1 /_lampa_warn%;\ + /endif%;\ + /set freshoil=0 +/def -mregexp -p2 -t'.* lampe, oprozniajac' light_on2 = \ + /set freshoil=1%;\ + /rstop /_lampa_warn%;\ /repeat -%lampatick 1 /_lampa_warn%;\ /tbind lampa_off_cmd /def -mregexp -p2 -t'Dopelniasz .*lampe .*olej' light_on3 = \ - /rstop /_lampa_warn%;\ - /eval /repeat -%lampatick 1 /_lampa_warn -/def -mregexp -p2 -t'lampa wypala sie i gasnie' light_off0 = \ + /set freshoil=1%;\ + /repeat -%lampatick 1 /_lampa_warn +/def -mregexp -p2 -t'lampa .*wypala sie i gasnie' light_off0 = \ /rstop /_lampa_warn%;\ /tbind lampa_on_cmd /def -mregexp -p2 -t'Gasisz.*lampe' light_off1 = \ /rstop /_lampa_warn -/def -mregexp -p2 -t'lampa .* nie jest zapalona' light_off2 = \ +/def -mregexp -p2 -t'lampa .*nie jest zapalona' light_off2 = \ /rstop /_lampa_warn /def dp = \