Mercurial > eagle-eye

changeset 309:9e8dccf177e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged changes
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Sun, 04 Jan 2009 23:53:15 +0800
parents 2972852a4ee5 (current diff) f6f56a47f383 (diff)
children 4fb6b8154524
files
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/agent.pl	Sun Dec 14 02:35:53 2008 +0800
+++ b/agent.pl	Sun Jan 04 23:53:15 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) = @_;
--- a/city.yaml	Sun Dec 14 02:35:53 2008 +0800
+++ b/city.yaml	Sun Jan 04 23:53:15 2009 +0800
@@ -31,7 +31,7 @@
                               1: build_museum
                        - is_winepress_researched:
                            1:
-                              - is_tavern_available:
+                              - is_tavern_enough:
                                  0: build_tavern
                                  1: 
                                     - is_bacchanal: