# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1228209681 -28800
# Node ID 0d2c2a379c63aeb7dfb1196786511791d0dc66a2
# Parent  b5897d63f44ed9d92b457b512d6df9f350907732# Parent  a9847bf80058fbdbf6507e118aa385a0faf50e8b
work merged

diff -r b5897d63f44e -r 0d2c2a379c63 agent.pl
--- a/agent.pl	Tue Dec 02 17:20:56 2008 +0800
+++ b/agent.pl	Tue Dec 02 17:21:21 2008 +0800
@@ -84,7 +84,7 @@
 sub is_warehouse_enough {
     my ($self, $city) = @_;
     # my @warehouse = (qw/undef undef 0 4 9 16 18 19 20 21 22 23 24 25/);
-    my @warehouse = (qw/undef undef 0 4 9 15 17 19 20 21 22 23 24 25/);
+    my @warehouse = (qw/undef undef 0 4 9 15 17 18 19 20 21 22 23 24/);
     my @cities = keys(%{$self->{ikariam}->{cities}});
     my $nextCities = ($#cities + 1) + 1;
 
diff -r b5897d63f44e -r 0d2c2a379c63 freeland.pl
--- a/freeland.pl	Tue Dec 02 17:20:56 2008 +0800
+++ b/freeland.pl	Tue Dec 02 17:21:21 2008 +0800
@@ -36,25 +36,25 @@
     });
 
 if($#islands == -1) {
-        my @cities = Ikariam::Cities->search_lamers(@location);
-        foreach my $city (@cities) {
-            my $island = Ikariam::Island->retrieve($city->island);
-            my $user = Ikariam::User->retrieve($city->user);
-            printf("%s (%d) \"%s\" %d [%d,%d] http://%s/index.php?view=island&id=%d&selectCity=%d\n",
+    my @cities = Ikariam::Cities->search_lamers(@location);
+    foreach my $city (@cities) {
+        my $island = Ikariam::Island->retrieve($city->island);
+        my $user = Ikariam::User->retrieve($city->user);
+        printf("%s (%d) \"%s\" %d [%d,%d] http://%s/index.php?view=island&id=%d&selectCity=%d\n",
                 $user->name, $user->score,
                 $city->cityname, $city->citylevel, 
                 $island->x, $island->y,
                 $::server,
                 $island->id,
                 $city->cityId
-            );
-        }
+              );
+    }
 } else {
     # 依照距離列表
     foreach my $island (@islands)
     {
         printf("%d [%d:%d] %s %s http://%s/index.php?view=island&id=%d%s\n",
-            (abs($x-$island->x) + abs($y-$island->y)), # minutes ?
+                (abs($x-$island->x) + abs($y-$island->y)), # minutes ?
             $island->x, $island->y,
             $tradegoodText[$island->tradegood],
             $wonderText[$island->wonder],