# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225818648 -28800
# Node ID 2d65c786084e94c524e49e9e215181576d528acd
# Parent  8a11302abf7f71ab3a24600449c64ba7f566170e
happiness first, then wall

diff -r 8a11302abf7f -r 2d65c786084e city.yaml
--- a/city.yaml	Wed Nov 05 00:14:37 2008 +0800
+++ b/city.yaml	Wed Nov 05 01:10:48 2008 +0800
@@ -22,8 +22,6 @@
                      0: 
                         - is_resource_enoghforHall:
                            1: build_townHall
-                  - is_wall_enough:
-                     0: build_wall
                   - is_happiness:
                      0:
                         - is_winepress_researched:
@@ -34,6 +32,8 @@
                                     - is_bacchanal:
                                        0: set_tavern
                                        1: build_tavern
+                  - is_wall_enough:
+                     0: build_wall
                   - is_shipyard_level_enough:
                      0:
                         - is_professionalarmy_researched: