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 @@
-
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
-
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"