From 0c4f457800ddcbd340112cb95346ea32d1229516 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 11 Feb 2014 12:44:28 +0100
Subject: [PATCH] Przeniesienie weaponstat do statusbar.tf, dodanie warninga.

---
 arkadia/statusbar.tf | 17 ++++++++++++++++-
 common/equipment.tf  | 13 -------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/arkadia/statusbar.tf b/arkadia/statusbar.tf
index eaf8ad4..d5ffd55 100644
--- a/arkadia/statusbar.tf
+++ b/arkadia/statusbar.tf
@@ -169,7 +169,9 @@
   /set warningstat=[                     ]
   
 /def -mregexp -p2 -t'(.* wytraca ci .* z r|Uderzenie jest tak silne, ze bezwiednie puszczasz|Czujesz potezne szarpniecie)' _wytracenie = \
-  /set warningstat=$[strcat("[", decode_attr(decode_attr(" --* WYTRACENIE *--  ", {zc_bold}), {zc_crit_background}), "] ")]
+  /set warningstat=$[strcat("[", decode_attr(decode_attr(" --* WYTRACENIE *--  ", {zc_bold}), {zc_crit_background}), "] ")]%;\
+  /set weaponstat=!!!%;\
+  /status_edit -r3 weaponstat:4:C%c_crit
 
 /set zc_blue=Cbgblue
 /def -mregexp -p2 -t'(lecac lagodnym lukiem, laduje na ziemi obok ciebie|Bol .* staje sie mniej odczuwalny)' _wytracenie_off = \
@@ -179,6 +181,19 @@
     /set warningstat=[                     ] %%;\
     /set alarm=$[decode_attr("none", {zc_main})]
 
+/def -mregexp -Fp2 -t'(Dobywasz|Wiedziony naglym instynktem siegasz|Trzymasz.*(w prawej|w lewej|oburacz))' weapon_on = \
+  /set weaponstat=ON%;\
+  /status_edit -r3 weaponstat:4:C%c_alarm
+
+/def -mregexp -Fp2 -t'(^Opuszczasz | ogarniajac wzrokiem cala okolice)' weapon_off = \
+  /set weaponstat=off%;\
+  /status_edit -r3 weaponstat:4:C%c_main
+
+/def -ar -mregexp -Fp2 -t'^(?:(?!dzierzon).)*peka!$' weapon_break = \
+  /beep 1%;\
+  /set weaponstat=!!!%;\
+  /status_edit -r3 weaponstat:4:C%c_crit
+
 /def -mregexp -p2 -t'Na rozkaz .* rzucasz sie.*' _no_atak = \
   /set wskazanie=
 
diff --git a/common/equipment.tf b/common/equipment.tf
index 97f09ad..ce80327 100644
--- a/common/equipment.tf
+++ b/common/equipment.tf
@@ -11,19 +11,6 @@
 
 /def -ar -mregexp -Fp2 -t'^[a-z]+ [a-z]+ [a-z]+ rozpada sie\!' = /beep 1
 
-/def -mregexp -Fp2 -t'(Dobywasz|Wiedziony naglym instynktem siegasz|Trzymasz.*(w prawej|w lewej|oburacz))' weapon_on = \
-  /set weaponstat=ON%;\
-  /status_edit -r3 weaponstat:4:C%c_alarm
-
-/def -mregexp -Fp2 -t'(^Opuszczasz | ogarniajac wzrokiem cala okolice)' weapon_off = \
-  /set weaponstat=off%;\
-  /status_edit -r3 weaponstat:4:C%c_main
-
-/def -ar -mregexp -Fp2 -t'^(?:(?!dzierzon).)*peka!$' weapon_break = \
-  /beep 1%;\
-  /set weaponstat=!!!%;\
-  /status_edit -r3 weaponstat:4:C%c_crit
-
 /def -mregexp -p2 -t'bierze twoj.' = /set moje on
 /def -mregexp -p2 -t'konczy prace.$' = \
   /if ( {moje} =~ "on" )\