# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1228633953 -28800
# Node ID 073442284ec170f9c22f5e4ed3344092e9a7811e
# Parent  1d0a553182627f9a6fc2431861b9237cdd3043d9# Parent  71af5e05671929a7bdcd4c758e08da2119ecd309
merged

diff -r 1d0a55318262 -r 073442284ec1 ikariam.sql
--- a/ikariam.sql	Sun Dec 07 15:10:51 2008 +0800
+++ b/ikariam.sql	Sun Dec 07 15:12:33 2008 +0800
@@ -1,5 +1,5 @@
 CREATE TABLE "ally" ("id" INTEGER PRIMARY KEY  NOT NULL ,"name" TEXT,"members" INTEGER,"url" TEXT,"time" DATETIME,"score" BIGINT);
-CREATE TABLE cities ( cityId INTEGER PRIMARY KEY UNIQUE, citylevel INTEGER, cityname TEXT, user INTEGER, owner TEXT, ally TEXT, island INTEGER, "status" CHAR, "time" INTEGER, "allyId" INTEGER);
+CREATE TABLE cities ( cityId INTEGER PRIMARY KEY UNIQUE, citylevel INTEGER, cityname TEXT, user INTEGER, owner TEXT, ally TEXT, island INTEGER, "status" CHAR, "time" INTEGER, "allyId" INTEGER, "risk" VARCHAR);
 CREATE TABLE "island" ( id BIGINT PRIMARY KEY UNIQUE, x INTEGER, y INTEGER, name TEXT, tradegood INTEGER, wonder INTEGER, people INTEGER, "time" INTEGER);
 CREATE TABLE "report" ("id" INTEGER PRIMARY KEY  NOT NULL , "cityLevel" INTEGER, "wallLevel" INTEGER, "attacker" TEXT, "defender" TEXT, "winner" TEXT, "targetCity" TEXT, "island" INTEGER NOT NULL , "city" INTEGER NOT NULL , "gold" INTEGER DEFAULT 0, "wood" INTEGER DEFAULT 0, "crystal" INTEGER DEFAULT 0, "wine" INTEGER DEFAULT 0, "sulfur" INTEGER DEFAULT 0, "date" DATETIME, "time" DATETIME);
 CREATE TABLE "user" ("id" INTEGER PRIMARY KEY ,"name" VARCHAR,"ally" VARCHAR,"allyId" INTEGER,"score" INTEGER,"building_score_main" INTEGER,"building_score_secondary" INTEGER,"research_score_main" INTEGER,"research_score_secondary" INTEGER,"army_score_main" INTEGER,"trader_score_secondary" INTEGER, "time" INTEGER);
diff -r 1d0a55318262 -r 073442284ec1 planner.pl
--- a/planner.pl	Sun Dec 07 15:10:51 2008 +0800
+++ b/planner.pl	Sun Dec 07 15:12:33 2008 +0800
@@ -54,7 +54,8 @@
 
 # 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) + 45;
+$city->{distance} = travelTime($targetCity->island->x, $targetCity->island->y, $city->{island}->{x}, $city->{island}->{y}, 8) + 25;
 $city->{type} = "navy";
 push (@cities, $city);
 
diff -r 1d0a55318262 -r 073442284ec1 spy.pl