# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225557063 -28800
# Node ID 4f06f72365fadfb84f01df8eaca02cc39b7d086c
# Parent  278bd36708e89198e975d7706c324cf9c40a7598# Parent  e49137521123464987b4cdc232a7ffbba2cb6487
merged again

diff -r e49137521123 -r 4f06f72365fa overall.yaml
--- a/overall.yaml	Sun Nov 02 00:12:53 2008 +0800
+++ b/overall.yaml	Sun Nov 02 00:31:03 2008 +0800
@@ -22,15 +22,12 @@
      # 發明 (兵工廠)
      - is_invention_researched:
         0: research_knowledge
-     # 異國文化
+     # 異國文化, 建造博物館
      - is_culturalexchange_researched:
-        0: research_seafaring
+        0: research_knowledge
      # 希臘火, 建造噴火船
      - is_greekfire_researched:
         0: research_seafaring
-     # 文化交流, 建造博物館
-     - is_culturalexchange_researched:
-        0: research_knowledge
         
    1: run_defence
    # we are being attacked!!!!!!!!!!!!!