# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225421594 -28800
# Node ID 9b8aa30a532c4b6b8db161b8dcdf4743658d287b
# Parent  0da6658697df914ea52a34a4b6f64fd68e47cbd0
counting members by ally

diff -r 0da6658697df -r 9b8aa30a532c sheep.pl
--- a/sheep.pl	Fri Oct 31 10:52:52 2008 +0800
+++ b/sheep.pl	Fri Oct 31 10:53:14 2008 +0800
@@ -48,9 +48,10 @@
         # 查聯盟數量
         my $members = 1;
         unless ($sheep->allyId == '0') {
-            my $ally = $sheep->ally;
-            $members = $ally->members;
-            # Ikariam::User->search(allyId => $sheep->allyId)->count();
+            unless (!defined($sheep->allyId) || $sheep->allyId == 0) {
+                my $ally = Ikariam::Ally->retrieve($sheep->allyId);
+                $members = $ally->members;
+            }
         }
 
         foreach my $c ($sheep->cities) {
@@ -61,7 +62,7 @@
             unless($c->status eq 'i') {
                 # Ignore 聯盟人數大於五
                 # TODO 應該依照影響力來分
-                next if($members > 5);
+                next if($members > 10);
             }
 
             my $island = Ikariam::Island->retrieve($c->island);