# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225631870 -28800
# Node ID c6c6db6eea761ce82515e35dea4552c101e0a38a
# Parent  857a67be1609928d48470009fbf9d79c5f7c769e# Parent  c5e4ef45eaa74b2be60f7e968e92d61f4e58b972
merged.

diff -r 857a67be1609 -r c6c6db6eea76 Ikariam.pm
--- a/Ikariam.pm	Sun Nov 02 21:16:44 2008 +0800
+++ b/Ikariam.pm	Sun Nov 02 21:17:50 2008 +0800
@@ -608,11 +608,19 @@
         $self->{mech}->submit_form(
                 form_number => 1,
                 fields      => {
-                      cargo_army_302 => '2',
-                   }
+                        cargo_army_302 => '2', # 劍士
+                    }
                 );
     } else {
-        warn ($treaty);
+        # put the id in the friends.txt file.
+        Ikariam::Cities->has_a(user => 'Ikariam::User');
+        my $city = Ikariam::Cities->retrieve($cityId);
+        my $sheep = $city->user;
+
+        open(OUT, ">>friends.txt") or Carp::carp("can not open friends.txt");
+        print OUT $sheep->name . "\n";
+        close(OUT);
+        Carp::carp($treaty);
     }
 }
 
diff -r 857a67be1609 -r c6c6db6eea76 warfare.pl
--- a/warfare.pl	Sun Nov 02 21:16:44 2008 +0800
+++ b/warfare.pl	Sun Nov 02 21:17:50 2008 +0800
@@ -53,6 +53,14 @@
     return ($city->{transporters}->{avail} > 0) ? 1 : 0;
 }
 
+sub is_port_available {
+    my ($self, $city) = @_;
+    foreach(1..2) {
+        return 1 if($city->{locations}[$_] eq 'port');
+    }
+    return 0;
+}
+
 sub is_army_available {
     my ($self, $city) = @_;
     return ($city->{army}->{Swordsman} >= 2 ) ? 1 : 0;
diff -r 857a67be1609 -r c6c6db6eea76 warfare.yaml
--- a/warfare.yaml	Sun Nov 02 21:16:44 2008 +0800
+++ b/warfare.yaml	Sun Nov 02 21:17:50 2008 +0800
@@ -5,5 +5,7 @@
           1:
              - is_transporters_available:
                 1:
-                   - is_army_available:
-                      1: engagement
+                   - is_port_available:
+                      1:
+                         - is_army_available:
+                            1: engagement