# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1227296018 -28800
# Node ID 83e3ce37779ddf14ae50a0919dee68449b75ec0d
# Parent  1b435cd26a7b928f9ecaebaa144ae25ed806ca13
refined army scheme

diff -r 1b435cd26a7b -r 83e3ce37779d Ikariam.pm
--- a/Ikariam.pm	Thu Nov 20 00:30:21 2008 +0800
+++ b/Ikariam.pm	Sat Nov 22 03:33:38 2008 +0800
@@ -647,7 +647,8 @@
             $self->{mech}->submit_form(
                     form_number => 1,
                     fields      => {
-                           cargo_army_302 => '3', # 劍士
+                           cargo_army_302 => '2', # 劍士
+                           cargo_army_303 => '1', # 方陣
                     }
                     );
         }
diff -r 1b435cd26a7b -r 83e3ce37779d warfare.pl
--- a/warfare.pl	Thu Nov 20 00:30:21 2008 +0800
+++ b/warfare.pl	Sat Nov 22 03:33:38 2008 +0800
@@ -64,7 +64,8 @@
 
 sub is_army_available {
     my ($self, $city) = @_;
-    return ($city->{army}->{Swordsman} >= 2 ) ? 1 : 0;
+    # 方陣撞不死
+    return ($city->{army}->{Swordsman} >= 2 && $city->{army}->{Phalanx} >= 1) ? 1 : 0;
 }
 
 sub locateVictim {