From 7e8fef01af344dbee29307165f3ef9c80fde54ad Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 11 Sep 2015 22:18:57 +0200
Subject: [PATCH] forgot some flags for volcano terrain, caused integration
 test to crash. neat.

---
 conf/e2/terrains.json |  2 ++
 res/terrains.xml      | 57 -------------------------------------------
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 res/terrains.xml

diff --git a/conf/e2/terrains.json b/conf/e2/terrains.json
index b01295a22..709f1b1a4 100644
--- a/conf/e2/terrains.json
+++ b/conf/e2/terrains.json
@@ -225,6 +225,7 @@
             "size": 500,
             "road": 250,
             "seed": 1,
+            "flags": [ "land", "walk", "sail", "fly" ],
             "production": {
                 "iron": {
                     "chance": 0.5,
@@ -249,6 +250,7 @@
         "activevolcano": {
             "size": 500,
             "road": 250,
+            "flags": [ "land", "walk", "sail", "fly" ],
             "production": {
                 "iron": {
                     "chance": 0.5,
diff --git a/res/terrains.xml b/res/terrains.xml
deleted file mode 100644
index f5786d42a..000000000
--- a/res/terrains.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" ?>
-<terrains>
-    <!-- defaults: walk="yes" sail="yes" fly="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" size="0" -->
-    <terrain name="ocean" size="100" walk="no" swim="yes" land="no" sea="yes" />
-    <terrain name="plain" size="4000" road="50" forest="yes" cavalry="yes" seed="3">
-        <resource name="iron" chance="0.1" level="2d4-1" base="5d8" div="2d20+10" />
-        <resource name="stone" chance="0.15" level="1d4" base="5d8" div="2d30+20" />
-        <resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50" />
-    </terrain>
-    <terrain name="swamp" size="1200" road="75" seed="2">
-        <resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10" />
-        <resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20" />
-        <resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50" />
-    </terrain>
-    <terrain name="desert" size="400" road="100" cavalry="yes" seed="2">
-        <resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
-        <resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
-        <resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
-    </terrain>
-    <terrain name="highland" size="2300" road="100" cavalry="yes" seed="2">
-        <resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
-        <resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
-        <resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
-    </terrain>
-    <terrain name="mountain" size="600" road="250" seed="2">
-        <resource name="iron" chance="1.0" level="1" base="50" div="50" />
-        <resource name="stone" chance="1.0" level="1" base="100" div="100" />
-        <resource name="laen" chance="0.05" level="1" base="4" div="100" />
-    </terrain>
-    <terrain name="glacier" size="150" road="250" arctic="yes" seed="2">
-        <resource name="iron" chance="1.0" level="1" base="3" div="50" />
-        <resource name="stone" chance="1.0" level="1" base="2" div="100" />
-        <resource name="laen" chance="0.05" level="1" base="4" div="100" />
-    </terrain>
-    <terrain name="iceberg_sleep" size="150" road="250" arctic="yes">
-        <resource name="iron" chance="0.9" level="1" base="3" div="50" />
-        <resource name="stone" chance="0.9" level="1" base="2" div="100" />
-        <resource name="laen" chance="0.05" level="1" base="4" div="100" />
-    </terrain>
-    <terrain name="iceberg" size="150" arctic="yes">
-        <resource name="iron" chance="0.9" level="1" base="3" div="50" />
-        <resource name="stone" chance="0.9" level="1" base="2" div="100" />
-    </terrain>
-    <terrain name="firewall" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
-    <terrain name="fog" sail="no" land="no" />
-    <terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" />
-    <terrain name="volcano" size="400" road="250" seed="1">
-        <resource name="iron" chance="0.5" level="1" base="50" div="50" />
-        <resource name="stone" chance="0.5" level="1" base="100" div="100" />
-        <resource name="laen" chance="0.075" level="1" base="4" div="100" />
-    </terrain>
-    <terrain name="activevolcano" size="400" road="250">
-        <resource name="iron" chance="0.5" level="1" base="50" div="50" />
-        <resource name="stone" chance="0.5" level="1" base="100" div="100" />
-        <resource name="laen" chance="0.075" level="1" base="4" div="100" />
-    </terrain>
-</terrains>