Mercurial > eagle-eye

changeset 164:278bd36708e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged.
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Sun, 02 Nov 2008 00:30:38 +0800
parents eff35293a058 (diff) 1507c2d16b35 (current diff)
children 4f06f72365fa
files
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/overall.yaml	Sat Nov 01 22:21:25 2008 +0800
+++ b/overall.yaml	Sun Nov 02 00:30:38 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!!!!!!!!!!!!!