From b4971dd65117b9d20414265fa7e2d1ac3af0ba36 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 11 Sep 2015 22:11:59 +0200
Subject: [PATCH] replace all of the E2 terrains with JSON data (no more XML!)

---
 conf/e2/config.xml       |   1 -
 conf/e2/terrains.json    | 104 +++++++++++++++++++++++++++++++++++++++
 res/core/terrains.xml    |  32 ------------
 res/eressea/terrains.xml |  10 ----
 src/kernel/region.c      |   2 +-
 5 files changed, 105 insertions(+), 44 deletions(-)
 delete mode 100644 res/core/terrains.xml
 delete mode 100644 res/eressea/terrains.xml

diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index 76102de9f..cea730405 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -20,7 +20,6 @@
   <xi:include href="config://core/ships.xml"/>
   <xi:include href="config://core/common/buildings.xml"/>
   <xi:include href="config://game/familiars.xml"/>
-  <xi:include href="config://core/terrains.xml"/>
   <xi:include href="config://game/artrewards.xml"/>
   <xi:include href="config://game/buildings.xml"/>
   <xi:include href="config://core/calendar.xml"/>
diff --git a/conf/e2/terrains.json b/conf/e2/terrains.json
index b5d98b992..b01295a22 100644
--- a/conf/e2/terrains.json
+++ b/conf/e2/terrains.json
@@ -166,6 +166,110 @@
                 }
             }
         },
+        "iceberg": {
+            "size": 100,
+            "herbs": [ "h18", "h19", "h20" ],
+            "flags": [ "arctic", "land", "walk", "sail", "fly" ],
+            "production": {
+                "iron": {
+                    "chance": 0.9,
+                    "base": "3",
+                    "div": "50",
+                    "level": "1"
+                },
+                "stone": {
+                    "chance": 0.9,
+                    "base": "2",
+                    "div": "100",
+                    "level": "1"
+                }
+            }
+        },
+        "iceberg_sleep": {
+            "size": 100,
+            "herbs": [ "h18", "h19", "h20" ],
+            "flags": [ "arctic", "land", "walk", "sail", "fly" ],
+            "production": {
+                "iron": {
+                    "chance": 0.9,
+                    "base": "3",
+                    "div": "50",
+                    "level": "1"
+                },
+                "stone": {
+                    "chance": 0.9,
+                    "base": "2",
+                    "div": "100",
+                    "level": "1"
+                },
+                "laen": {
+                    "chance": 0.05,
+                    "base": "4",
+                    "div": "100",
+                    "level": "1"
+                }
+            }
+        },
+        "firewall": {
+            "size": 100,
+            "road": 250,
+            "flags": [ "forbidden" ]
+        },
+        "fog": {
+            "flags": [ "walk", "fly" ]
+        },
+        "thickfog": {
+            "flags": [ "forbidden" ]
+        },
+        "volcano": {
+            "size": 500,
+            "road": 250,
+            "seed": 1,
+            "production": {
+                "iron": {
+                    "chance": 0.5,
+                    "level": 1,
+                    "base": 50,
+                    "div": 50
+                },
+                "stone": {
+                    "chance": 0.5,
+                    "level": 1,
+                    "base": 100,
+                    "div": 100
+                },
+                "laen": {
+                    "chance": 0.075,
+                    "level": 1,
+                    "base": 4,
+                    "div": 100
+                }
+            }
+        },
+        "activevolcano": {
+            "size": 500,
+            "road": 250,
+            "production": {
+                "iron": {
+                    "chance": 0.5,
+                    "level": 1,
+                    "base": 50,
+                    "div": 50
+                },
+                "stone": {
+                    "chance": 0.5,
+                    "level": 1,
+                    "base": 100,
+                    "div": 100
+                },
+                "laen": {
+                    "chance": 0.075,
+                    "level": 1,
+                    "base": 4,
+                    "div": 100
+                }
+            }
+        },
         "hell": {
             "flags": [ "land", "walk" ]
         },
diff --git a/res/core/terrains.xml b/res/core/terrains.xml
deleted file mode 100644
index 4e07f22cf..000000000
--- a/res/core/terrains.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<terrains>
-    <!-- defaults: walk="yes" sail="yes" fly="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" -->
-    <terrain name="iceberg_sleep" size="100" road="250" arctic="yes">
-        <herb name="h18" />
-        <herb name="h19" />
-        <herb name="h20" />
-        <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="100" arctic="yes">
-        <herb name="h18" />
-        <herb name="h19" />
-        <herb name="h20" />
-        <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" size="100" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
-    <terrain name="fog" sail="no" land="no" size="0" />
-    <terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" size="0" />
-    <terrain name="volcano" size="500" 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="500" 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>
diff --git a/res/eressea/terrains.xml b/res/eressea/terrains.xml
deleted file mode 100644
index e506c5dd4..000000000
--- a/res/eressea/terrains.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<terrains>
-  <!-- used by the experimental dungeon -->
-  <terrain name="hell" fly="no" sail="no" size="0" land="no"/>
-  
-  <!-- used for the museum only -->
-  <terrain name="hall1" fly="no" size="0" />
-  <terrain name="corridor1" fly="no" size="0" />
-  <terrain name="wall1" sail="no" walk="no" fly="no" forbidden="yes" size="0" />
-</terrains>
diff --git a/src/kernel/region.c b/src/kernel/region.c
index ae70c2595..1b4bf838e 100644
--- a/src/kernel/region.c
+++ b/src/kernel/region.c
@@ -1151,7 +1151,7 @@ void terraform_region(region * r, const terrain_type * terrain)
 
 /** ENNO:
  * ich denke, das das hier nicht sein sollte.
- * statt dessen sollte ein attribut an der region sein, das das erledigt,
+ * statt dessen sollte ein attribut an der region sein, dass das erledigt,
  * egal ob durch den spell oder anderes angelegt.
  **/
 #include "curse.h"