Mercurial > eagle-eye

changeset 165:4f06f72365fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged again
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Sun, 02 Nov 2008 00:31:03 +0800
parents 278bd36708e8 (diff) e49137521123 (current diff)
children f7fd2738b9b4
files
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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!!!!!!!!!!!!!