From 1d13af488ebac955d75c7267c2bb2ba7601b838c Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sun, 19 Aug 2012 01:46:47 +0200
Subject: [PATCH] Poprawki speca zboja + drobna kosmetyka.

---
 arkadia/specs.tf     |  4 ++-
 arkadia/statusbar.tf |  2 +-
 common/team.tf       | 74 ++++++++++++++++++++++----------------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/arkadia/specs.tf b/arkadia/specs.tf
index fbccabc..ba8b469 100644
--- a/arkadia/specs.tf
+++ b/arkadia/specs.tf
@@ -96,7 +96,9 @@
 
 ; zboj
 /eval /def -PBC%kolor_spec -Fp5 -t'.* uderzeniem .* trafia cie .*' spec_zb_kolor_0
+/eval /def -PBC%kolor_spec -Fp5 -t'.* wali cie na odlew.*' spec_zb_kolor_0_1
 /eval /def -PC%kolor_spec -Fp5 -t'.* uderzeniem .* trafia (?<!cie) .*' spec_zb_kolor_1
+/eval /def -PC%kolor_spec -Fp5 -t'.* wali.*(?<! cie ).*na odlew.*' spec_zb_kolor_1_1
 
 /def -mregexp -Fp2 -t'uderzeniem .* trafia.* (muskajac nieznacznie)' spec_zb_0 = /show_spec ZBOJ 1 8
 /def -mregexp -Fp2 -t'uderzeniem .* trafia.* (trafiajac lekko)' spec_zb_1 = /show_spec ZBOJ 2 8
@@ -104,7 +106,7 @@
 /def -mregexp -Fp2 -t'uderzeniem .* trafia.* (duze krwistoczerwone)' spec_zb_3 = /show_spec ZBOJ 4 8
 /def -mregexp -Fp2 -t'uderzeniem .* trafia.* (pojawia sie duza rana)' spec_zb_4 = /show_spec ZBOJ 5 8
 /def -mregexp -Fp2 -t'uderzeniem .* trafia.* (pojawia sie ogromna rana)' spec_zb_5 = /show_spec ZBOJ 6 8
-/def -mregexp -Fp2 -t'szeroki zamach .* wali.* (Ten cios przeciwnik)' spec_zb_6 = /show_spec ZBOJ 7 8
+/def -mregexp -Fp2 -t'szeroki zamach .* wali .* na odlew' spec_zb_6 = /show_spec ZBOJ 7 8
 /def -mregexp -Fp2 -t'uderza.* mocno w glowe .* bez zycia' spec_zb_7 = /show_spec ZBOJ 8 8
 
 ; fanatyk
diff --git a/arkadia/statusbar.tf b/arkadia/statusbar.tf
index 0194ec3..6737546 100644
--- a/arkadia/statusbar.tf
+++ b/arkadia/statusbar.tf
@@ -164,7 +164,7 @@
 /def -mregexp -Fp2 -t'(probujesz|muskasz|ranisz|masakrujesz) .* (noga|stopa|lokciem|piescia|kolanem)' _bez_broni = \
 	/set alarm=$[decode_attr("WALKA BEZ BRONI","BCyellow")]
 
-/def -mregexp -Fp2 -t'(Powoli osuwasz sie na ziemie|Potem robi sie ciemno|Sila uderzania zamroczyla cie|czujesz, ze tracisz przytomnosc|Nagle czujesz jak na glowe spada ci ciezki sznur|Nagle czujesz, ze tracisz kontrole nad swym cialem)' _stun = \
+/def -mregexp -Fp2 -t'(Powoli osuwasz sie na ziemie|Potem robi sie ciemno|Sila uderzania zamroczyla cie|czujesz, ze tracisz przytomnosc|Nagle czujesz jak na glowe spada ci ciezki sznur|Nagle czujesz, ze tracisz kontrole nad swym cialem| wali cie na odlew)' _stun = \
 	/set warningstat=$[strcat("[", decode_attr(" --* OGLUSZENIE *-- ", "BCbgblue"), "] ")]
 
 /def -mregexp -p2 -t'(Powoli dochodzisz do siebie|Czujesz jak slabosc po zadanym ciosie w glowe mija|Udaje ci sie uwolnic z sieci|Powoli odzyskujesz swobode ruchow)' _nostun = \
diff --git a/common/team.tf b/common/team.tf
index e63474b..4a7cf97 100644
--- a/common/team.tf
+++ b/common/team.tf
@@ -66,45 +66,45 @@
 		/set ogolne_leader_bie=$$(/_l_odmien B %%{ogolne_leader}) %%;\
 		/set ogolne_leader_nar=$$(/_l_odmien N %%{ogolne_leader}) %%;\
 ;; nightal
-	/set ogolne_leader_bie=$$[replace("arda", "arde", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("rydharde", "rydharda", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("larella", "larelle", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("enta", "entu", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("tyrania", "tyranie", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("naraka", "naraku", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("isobella", "isobell", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("perla", "perle", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("ayrena", "ayren", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("szassa", "szass", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("venisa", "venise", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("maevea", "maeve", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("rteca", "rtec", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("myrela", "myrale", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("squibiea", "squibiego", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("rhera", "rhere", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("arda", "arde", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("rydharde", "rydharda", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("larella", "larelle", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("enta", "entu", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("tyrania", "tyranie", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("naraka", "naraku", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("isobella", "isobell", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("perla", "perle", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("ayrena", "ayren", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("szassa", "szass", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("venisa", "venise", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("maevea", "maeve", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("rteca", "rtec", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("myrela", "myrale", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("squibiea", "squibiego", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("rhera", "rhere", {ogolne_leader_bie})]%%;\
 ;; arkadia
-	/set ogolne_leader_bie=$$[replace("myra", "myre", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("elikea", "elike", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("bara", "bare", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("necra", "necre", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("ayletta", "aylett", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("deliego", "deli", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("ilanea", "ilane", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("aida", "aide", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("ineza", "inez", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("nastilla", "nastille", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("lidia", "lidie", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("gerdia", "gerdie", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("arroniego", "arronie", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("istrida","istrid", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("vaea","vae", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("jinesha","jinesh", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("ursa", "urse", {ogolne_leader_bie})]%%;\
-	/set ogolne_leader_bie=$$[replace("aenya", "aenye", {ogolne_leader_bie})]%%;\
-	/set ogolne_druzyna=%%{P5-DRUZYNA} %%;\
-		/_ustaw_druzyne%;\
+		/set ogolne_leader_bie=$$[replace("myra", "myre", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("elikea", "elike", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("bara", "bare", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("necra", "necre", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("ayletta", "aylett", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("deliego", "deli", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("ilanea", "ilane", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("aida", "aide", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("ineza", "inez", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("nastilla", "nastille", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("lidia", "lidie", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("gerdia", "gerdie", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("arroniego", "arronie", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("istrida","istrid", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("vaea","vae", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("jinesha","jinesh", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("ursa", "urse", {ogolne_leader_bie})]%%;\
+		/set ogolne_leader_bie=$$[replace("aenya", "aenye", {ogolne_leader_bie})]%%;\
+		/set ogolne_druzyna=%%{P5-DRUZYNA} %%;\
+	/_ustaw_druzyne%;\
 	/if ( {1} !~ "-q" )\
-		/repeat -1 1 /echo -p #@{BC%kolor_info}#@{n}# Team set, attack mode: @{BC%kolor_info}%opis_ataku@{n}.%;\
+		/echo -p #@{BC%kolor_info}#@{n}# Team set, attack mode: @{BC%kolor_info}%opis_ataku@{n}.%;\
 	/endif
 
 /def _ustaw_druzyne = \