diff agent.pl @ 310:68138c99ee16

merged changes
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Sun, 04 Jan 2009 23:52:55 +0800
parents f6f56a47f383
children 6aeedda23e3a
line wrap: on
line diff
--- a/agent.pl	Sun Dec 14 02:35:53 2008 +0800
+++ b/agent.pl	Sun Jan 04 23:52:55 2009 +0800
@@ -50,7 +50,12 @@
 sub is_museum_enough {
     my ($self, $city) = @_;
     return 1 if($city->{buildings}->{museum} >= 8);
-    return ($city->{buildings}->{museum} >= ($city->{buildings}->{tavern}/2) ? 1 : 0);
+}
+
+sub is_tavern_enough {
+    my ($self, $city) = @_;
+    return 0 if(!defined($city->{buildings}->{tavern}));
+    return 1 if($city->{buildings}->{museum} >= 12);
 }
 
 sub is_branchOffice_enough {
@@ -132,10 +137,6 @@
     return 1 if($city->{buildings}->{townHall} >= 20);
 }
 
-sub is_tavern_available {
-    my ($self, $city) = @_;
-    return (defined($city->{buildings}->{tavern}) ? 1 : 0);
-}
 
 sub is_bacchanal {
     my ($self, $city) = @_;