# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225813488 -28800
# Node ID f41ee87f4f7ae30539045c0770d7b93f7bcdb26c
# Parent  792e6e23f2a1442caf379a2c276384daa9066b8c# Parent  f3502833be7cd0eb5f588e38402b5f9f723e63ef
merged

diff -r f3502833be7c -r f41ee87f4f7a city.yaml
--- a/city.yaml	Tue Nov 04 23:32:06 2008 +0800
+++ b/city.yaml	Tue Nov 04 23:44:48 2008 +0800
@@ -46,11 +46,6 @@
                      0:
                         - is_espionage_researched:
                            1: build_safehouse
-                  - is_warehouse_enough:
-                     0:
-                        - is_conservation_researched:
-                           1: build_warehouse
-                           0: build_academy
                   - is_academy_enough:
                      0: build_academy
                   # 大使館
@@ -62,6 +57,11 @@
                      0:
                         - is_culturalexchange_resaerched:
                            1: build_museum
+                  - is_warehouse_enough:
+                     0:
+                        - is_conservation_researched:
+                           1: build_warehouse
+                           0: build_academy
 
 # 水晶島應該建設 
 # is_invention_researched