--- a/enemy.pl	Thu Dec 04 03:22:24 2008 +0800
+++ b/enemy.pl	Thu Dec 04 21:54:00 2008 +0800
@@ -2,7 +2,7 @@
 use strict;
 use Ikariam;
 use Data::Dumper;
-use YAML qw/LoadFile/;
+use YAML qw/Dump LoadFile/;
 use POSIX qw(strftime);
 
 package main;
@@ -106,17 +106,32 @@
         my $island = Ikariam::Island->retrieve($city->island);
         my $capture = $city->citylevel * ($city->citylevel - 1) * $u->trader_score_secondary / 10000;
 
-        printf("Name: %s\n", $city->cityname);
+        printf("Name: %s [%s:%s]\n", $city->cityname,  $island->x, $island->y);
         if(defined($city->status)) {
             printf("Status: <<<%s>>>\n", $city->status);
         }
-        printf("Level: %s\n", $city->citylevel);
-        printf("Island: %s\n", $island->name);
         printf("Location: [%s:%s] http://%s/index.php?view=island&id=%s&selectCity=%d\n", 
-            $island->x, $island->y, $::server, $island->id, $city->cityId);
-        printf("Tradegood: %s\n", $tradegoodText[$island->tradegood]);
-        printf("Wonder: %s\n", $wonderText[$island->wonder]);
+                $island->x, $island->y, $::server, $island->id, $city->cityId);
+        if(-f sprintf("spy-%d-dump.yaml", $city->cityId)) {
+            my $spydata = LoadFile(sprintf("spy-%d-dump.yaml", $city->cityId));
+            if($spydata->{city}->{buildings}->{townHall} ne $city->citylevel) {
+                printf("*OUTDATED* ");
+            }
+            printf("Hall: %s, Wall: %s, Port: %s, Safehouse: %s, Risk: %s\n", 
+                    $spydata->{city}->{buildings}->{townHall}, 
+                    $spydata->{city}->{buildings}->{wall}, 
+                    $spydata->{city}->{buildings}->{port}, 
+                    $spydata->{city}->{buildings}->{safehouse}, 
+                    $spydata->{risks}[1]);
+        } else {
+            printf("Level: %s\n", $city->citylevel);
+        }
+
         printf("Capture: %d\n", $capture);
+        printf("Tradegood: %s, Wonder: %s\n", 
+                $tradegoodText[$island->tradegood], $wonderText[$island->wonder]);
+        # printf("Island: %s\n", $island->name);
+
         myTownToVicim($island->id);
         printf("\n");
     }