From 6a19a4e3a351f74a8c5d138d199620c97da650b2 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Tue, 3 Feb 2015 01:36:18 +0100 Subject: [PATCH] Dalsza unifikacja warnow. --- common/combat.tf | 1 - common/warn.tf | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/common/combat.tf b/common/combat.tf index 7b00c06..4ed52db 100644 --- a/common/combat.tf +++ b/common/combat.tf @@ -134,7 +134,6 @@ /def -mregexp -Fp3 -t'((powaznie|bardzo ciezko) [a-z]+ | masakruj(e|ac) )cie ' cios_warn0 = /beep 1 -/def -mregexp -Fp2 -t'rzuca sie .* przebijajac' lamanie_warn = /echo -p @{C%c_alarm} <<< udane przelamanie >>>@{n} /def -mregexp -Fp2 -t'rzucasz sie na (.*) przebijajac' lamanie_atak = \ /if ( {attackmode} != "1" )\ /echo %;\ diff --git a/common/warn.tf b/common/warn.tf index 818fef9..ffdf861 100644 --- a/common/warn.tf +++ b/common/warn.tf @@ -1,3 +1,4 @@ +; drobne /def -mregexp -Fp2 -t' daje ci (?!sie we znaki)' warn_give = \ /echo %;\ /echo -p @{C%c_main_bold} <<< podanie >>> %;\ @@ -8,17 +9,15 @@ /echo -p @{C%c_main_bold} <<< zaproszenie >>> %;\ /echo -/def -mregexp -Fp2 -t'porzuca twoja druzyne' warn_sygnal = \ - /echo %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- SYGNAL ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- SYGNAL ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- SYGNAL ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo +;walka innych +/def -mregexp -Fp2 -t'rzuca sie .* przebijajac' lamanie_warn = \ + /echo -p @{C%c_alarm} <<< udane przelamanie >>>@{n} +; informacyjne /def _lampa_warn = \ /echo %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- LAMPA ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- LAMPA ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- LAMPA ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- OLEJ --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- OLEJ --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- OLEJ --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ /echo %;\ /tbind lampa_on_cmd