From d73182860f94589372837cb2f1bab14347618192 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 14 Aug 2012 16:33:58 +0200
Subject: [PATCH] Bug + ujednolicenie.

---
 common/combat.tf  | 14 +++++++++++---
 nightal/combat.tf |  3 +++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/common/combat.tf b/common/combat.tf
index 5579bcf..d5e6c60 100644
--- a/common/combat.tf
+++ b/common/combat.tf
@@ -7,8 +7,8 @@
 	/if ( {*} !~  NULL )\
     /if (strstr({*}, "|") != -1) \
         /let n=$[strchr({*}, '|')] %;\
-        /set cel=$[substr({*}, 0, n)] %;\
-        /set celu=$[substr({*}, n+1)] %;\
+        /test cel := substr({*}, 0, n) %;\
+        /test celu := substr({*}, n+1) %;\
     /else \
         /set cel %{*} %;\
         /set celu %{*} %;\
@@ -65,7 +65,15 @@
 		/echo -p #@{BC%kolor_info}#@{n}# Typ ataku: @{BC%kolor_info}%opis_ataku@{n} %;\
 	/endif
 
-/alias x /_atak %{*}
+/alias x \
+  /if (strstr({*}, "|") != -1) \
+    /let n=$[strchr({*}, '|')] %;\
+    /test p1 := substr({*}, 0, n) %;\
+    /test p2 := substr({*}, n+1) %;\
+    /_atak %{p1}|%{p2} %;\
+  /else \
+    /_atak %{*}|%{*} %;\
+  /endif
 /alias x1 /_atak %{cel}|%{celu}
 /alias x2 /_atak drugiego %{cel}|drugiego %{celu}
 /alias x3 /_atak trzeciego %{cel}|trzeciego %{celu}
diff --git a/nightal/combat.tf b/nightal/combat.tf
index 402a15c..bdd5267 100644
--- a/nightal/combat.tf
+++ b/nightal/combat.tf
@@ -1,4 +1,7 @@
 /def _atak = \
+  /let n=$[strchr({*}, '|')]%;\
+  /test param1 := substr({*}, 0, n)%;\
+  /test param2 := substr({*}, n+1) %;\
 	/if ( {attackmode} =~ "1" ) \
 		zabij %{param1} %; zabij %{param1} %;\
 	/elseif ( {attackmode} =~ "2" ) \