# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1228633851 -28800
# Node ID 1d0a553182627f9a6fc2431861b9237cdd3043d9
# Parent  15c288dd7dc5045ecd951b3c336193c16b1e99f2# Parent  73c9bf51715531ee27e28f8abac751be202787d0
merged

diff -r 73c9bf517155 -r 1d0a55318262 Ikariam.pm
--- a/Ikariam.pm	Fri Dec 05 22:49:36 2008 +0800
+++ b/Ikariam.pm	Sun Dec 07 15:10:51 2008 +0800
@@ -351,6 +351,17 @@
     return @cities;
 }
 
+sub switchCityBySafehouseLevel {
+    my $self = shift;
+}
+
+sub viewSendSpy {
+    my $self = shift;
+    my $cityId = shift;
+    my $res = $self->{mech}->get(sprintf('http://%s/index.php?view=sendSpy&destinationCityId=%d', $self->{server}, $cityId));
+    return Ikariam::Extractor->new(content => $res->content)->find(sprintf('//div[@class="percentage"]/text()'));
+}
+
 sub increaseTransporter {
     my $self = shift;
     my $param = shift;
diff -r 73c9bf517155 -r 1d0a55318262 scan.pl
--- a/scan.pl	Fri Dec 05 22:49:36 2008 +0800
+++ b/scan.pl	Sun Dec 07 15:10:51 2008 +0800
@@ -17,7 +17,6 @@
 
 sub new {
     my($class, $i) = @_;
-    warn("new scanner");
     my $self = {
         ikariam => $i,
     };
@@ -47,6 +46,8 @@
         } else {
             $c = Ikariam::Cities->insert($h_city);
         }
+ 
+        $c->set(risk => $self->{ikariam}->viewSendSpy($h_city->{cityId}));
         $c->update();
 
         my $user = Ikariam::User->retrieve($h_city->{'user'});
diff -r 73c9bf517155 -r 1d0a55318262 sheep.pl
--- a/sheep.pl	Fri Dec 05 22:49:36 2008 +0800
+++ b/sheep.pl	Sun Dec 07 15:10:51 2008 +0800
@@ -75,9 +75,9 @@
             # 測試風險評估
             # $capture = $capture - ($sheep->army_score_main*100);
                         
-            $line = sprintf("%d %s score %d army %d %s/%s,", 
+            $line = sprintf("%d %s score %d army %d risk %d %s/%s,", 
                 $capture,
-                $c->status, $sheep->score, $sheep->army_score_main, $sheep->name, $sheep->ally);
+                $c->status, $sheep->score, $sheep->army_score_main, $c->risk, $sheep->name, $sheep->ally);
 
             $line .= sprintf("\"%s\" %d [%d,%d] %s http://%s/index.php?view=island&id=%d&selectCity=%d\n",
                 $c->cityname, $c->citylevel,