--- a/city.yaml	Mon Nov 03 13:10:50 2008 +0800
+++ b/city.yaml	Mon Nov 03 13:36:34 2008 +0800
@@ -1,3 +1,4 @@
+# TODO adjust human resources
 ---
 # city level
 # 基本建設規則
@@ -5,10 +6,9 @@
 - is_attacked:
     # we are in Peace :D
     0:
-      # TODO adjust human resources
       - is_constructing:
          0:
-            # XXX: 這樣會一口氣買同等城市數量的船耶
+            # FIXME: 這樣會一口氣買同等城市數量的船耶, 應拉出至全國金錢考量
             # - is_gold_enoughforcargo:
                # 1: increaseTransporter
             - is_corruption:
@@ -24,9 +24,6 @@
                            1: build_townHall
                   - is_wall_enough:
                      0: build_wall
-                  # 倉庫庫存量
-                  - is_warehouse_enough:
-                     0: build_warehouse
                   - is_happiness:
                      0:
                         - is_winepress_researched:
@@ -49,6 +46,8 @@
                            1:
                               - is_barracks_level_enough:
                                  0: build_barracks
+                  - is_warehouse_enough:
+                     0: build_warehouse
             # TODO
             # build_safehouse
             # is_espionage_researched
@@ -61,12 +60,9 @@
             #       - build_workshop 
             # build_academy
 
-            # build_palace (Expansion, Capital only)
-
             # 大使館
             # build_embassy 
 
-            # 要蓋到何種程度?
             # is_culturalexchange_resaerched
             #    1: 
             #       - build_museum