changeset 342:f3bdbc706a37

merged
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Thu, 12 Feb 2009 21:13:46 +0800
parents 6296a9cd6878 (diff) fe740b1c6f94 (current diff)
children 85d60a0569bf
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/city.yaml	Thu Feb 12 21:12:16 2009 +0800
+++ b/city.yaml	Thu Feb 12 21:13:46 2009 +0800
@@ -65,7 +65,7 @@
                      0:
                         - is_conservation_researched:
                            1: build_warehouse
-                           0: build_academy
+# 0: build_academy
                   - is_branchOffice_enough:
                      0: build_branchOffice
                   - is_port_enough:
--- a/sheep.pl	Thu Feb 12 21:12:16 2009 +0800
+++ b/sheep.pl	Thu Feb 12 21:13:46 2009 +0800
@@ -11,7 +11,6 @@
 
 # only challenge the small victims
 my $army_score_main = ($mime->army_score_main / 3);
-$army_score_main = 300;
 
 my @tradegoodText = qw/NULL 葡萄酒 大理石 水晶 硫磺/;