--- a/city.yaml	Sun Nov 02 22:31:06 2008 +0800
+++ b/city.yaml	Sun Nov 02 22:32:09 2008 +0800
@@ -5,7 +5,7 @@
 - is_attacked:
     # we are in Peace :D
     0:
-      # adjust human resources
+      # TODO adjust human resources
       - is_constructing:
          0:
             # XXX: 這樣會一口氣買同等城市數量的船耶
@@ -32,36 +32,40 @@
                               - is_bacchanal:
                                  0: set_tavern
                                  1: build_tavern
-            # TODO
-            # http://ikariam.wikia.com/wiki/List_of_buildings
-            # http://ikariam.wikia.com/wiki/Technology_Tree
-            # is_conservation_researched
-            # -build_warehouse
-            # build_academy
-            # build_palace (Expansion, Capital only)
-            # build_embassy (副城, 不建)
-            - is_risk:
-               1: 
+            - is_navyExpenditure_available:
+               1:
                   - is_professionalarmy_researched:
                      1:
                         - is_shipyard_level_enough:
                            0: build_shipyard
+                           1: 
+                              - train_navy:
+            - is_milityExpenditure_available:
+               1:
+                  - is_professionalarmy_researched:
+                     1:
                         - is_barracks_level_enough:
                            0: build_barracks
-                  - is_shipyard_level_enough:
-                     0: 
-                        - is_drydock_researched: 
-                           # requireed more army ?
-                           1: build_shipyard
-                  #    - build one boat
-# 應該把 Barracks 建到最佳等級
-            # 要蓋到何種程度?
+                           1:
+                              - train_army:
+            # TODO
+            # build_safehouse
+            # is_espionage_researched
+            #    1: 
+            #       - build_hideout
+
+            # 水晶島應該建設 
             # is_invention_researched
             #    1: 
             #       - build_workshop 
-            # is_espionage_researched
-            #    1: 
-            #       - build_hideout
+            # build_academy
+
+            # build_palace (Expansion, Capital only)
+
+            # 大使館
+            # build_embassy 
+
+            # 要蓋到何種程度?
             # is_culturalexchange_resaerched
             #    1: 
             #       - build_museum