# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1234372767 -28800
# Node ID 6782280a886b36a3726dba29718a724e3f070377
# Parent  58b36b18809f23431d1d96c875235c8ab53be73c# Parent  0db3e2bcbd0f027fd8b8179ae309052481c51617
merged

diff -r 58b36b18809f -r 6782280a886b planner.pl
--- a/planner.pl	Wed Feb 11 21:59:51 2009 +0800
+++ b/planner.pl	Thu Feb 12 01:19:27 2009 +0800
@@ -56,14 +56,13 @@
 
 # NAVY
 my $city = LoadFile(sprintf("city-%s-dump.yaml", $navyCity));
-# $city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 8) + 45;
-$city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 8) + 25;
+$city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 33) + 25;
 $city->{type} = "navy";
 push (@cities, $city);
 
 # ARMY
 my $city = LoadFile(sprintf("city-%s-dump.yaml", $armyCity));
-$city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 20) + 5;
+$city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 50) + 5;
 $city->{type} = "army";
 push (@cities, $city);
 
@@ -73,9 +72,9 @@
     my $city = LoadFile(sprintf("city-%s-dump.yaml", $cityId));
     $city->{type} = "wingman" . ($i+1);
     if(defined($opt_w)) {
-        $city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 20) - ($i * 20 + 20);
+        $city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 50) - ($i * 20 + 20);
     } else {
-        $city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 20);
+        $city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 50);
     }
     push (@cities, $city);
 }
@@ -126,6 +125,7 @@
                 printf("\tcargo_army_%s => %s, # %s \n", $army->{$k}, $v, $k);
             }
         }
+                printf("\ttransporter   => %s, # transporter\n", $cities[$i]->{transporters}->{avail});
         printf('});' . "\n", $cities[$i]->{id});
     }
     printf('$ikariam->logout;' . "\n");