From 0ed365e539942b7cb0debb95fcfbacb29cde5577 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 12 Sep 2015 18:15:36 +0200
Subject: [PATCH] remove the game section from XML config

---
 conf/e2/config.xml  | 32 --------------------------------
 conf/e3/config.json |  8 ++++++++
 conf/e3/config.xml  | 34 ----------------------------------
 conf/e4/config.json |  8 ++++++++
 conf/e4/config.xml  | 33 ---------------------------------
 5 files changed, 16 insertions(+), 99 deletions(-)

diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index 2c9ac7022..d1eac12d8 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -52,38 +52,6 @@
   <xi:include href="config://default/names-zombies.xml"/>
   <xi:include href="config://default/names-ghouls.xml"/>
   <xi:include href="config://default/names-dragons.xml"/>
-
-  <game>
-    <skill name="alchemy" enable="true"/>
-    <skill name="crossbow" enable="true"/>
-    <skill name="mining" enable="true"/>
-    <skill name="bow" enable="true"/>
-    <skill name="building" enable="true"/>
-    <skill name="trade" enable="true"/>
-    <skill name="forestry" enable="true"/>
-    <skill name="catapult" enable="true"/>
-    <skill name="herbalism" enable="true"/>
-    <skill name="magic" enable="true"/>
-    <skill name="training" enable="true"/>
-    <skill name="riding" enable="true"/>
-    <skill name="armorer" enable="true"/>
-    <skill name="shipcraft" enable="true"/>
-    <skill name="melee" enable="true"/>
-    <skill name="sailing" enable="true"/>
-    <skill name="polearm" enable="true"/>
-    <skill name="espionage" enable="true"/>
-    <skill name="quarrying" enable="true"/>
-    <skill name="roadwork" enable="true"/>
-    <skill name="tactics" enable="true"/>
-    <skill name="stealth" enable="true"/>
-    <skill name="entertainment" enable="true"/>
-    <skill name="weaponsmithing" enable="true"/>
-    <skill name="cartmaking" enable="true"/>
-    <skill name="perception" enable="true"/>
-    <skill name="taxation" enable="true"/>
-    <skill name="stamina" enable="true"/>
-    <skill name="unarmed" enable="true"/>
-  </game>
   <strings>
     <string name="mailto">
       <text locale="de">eressea-server@eressea.de</text>
diff --git a/conf/e3/config.json b/conf/e3/config.json
index 871b131a7..236001e1d 100644
--- a/conf/e3/config.json
+++ b/conf/e3/config.json
@@ -5,6 +5,14 @@
         "e3/terrains.json"
 	],
     "disabled": [
+        "herbalism",
+        "alchemy",
+        "entertainment",
+        "espionage",
+        "perception",
+        "stealth",
+        "taxation",
+        "trade",
         "besiege",
         "steal",
         "buy",
diff --git a/conf/e3/config.xml b/conf/e3/config.xml
index 68e61b7d1..1a1f5f26f 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/config.xml
@@ -41,40 +41,6 @@
   <xi:include href="config://default/names-zombies.xml"/>
   <xi:include href="config://default/names-ghouls.xml"/>
   <xi:include href="config://default/names-dragons.xml"/>
-
-  <game>
-    <skill name="armorer" enable="true"/>
-    <skill name="bow" enable="true"/>
-    <skill name="building" enable="true"/>
-    <skill name="cartmaking" enable="true"/>
-    <skill name="catapult" enable="true"/>
-    <skill name="crossbow" enable="true"/>
-    <skill name="forestry" enable="true"/>
-    <skill name="magic" enable="true"/>
-    <skill name="melee" enable="true"/>
-    <skill name="mining" enable="true"/>
-    <skill name="polearm" enable="true"/>
-    <skill name="quarrying" enable="true"/>
-    <skill name="riding" enable="true"/>
-    <skill name="roadwork" enable="true"/>
-    <skill name="sailing" enable="true"/>
-    <skill name="shipcraft" enable="true"/>
-    <skill name="stamina" enable="true"/>
-    <skill name="tactics" enable="true"/>
-    <skill name="training" enable="true"/>
-    <skill name="unarmed" enable="true"/>
-    <skill name="weaponsmithing" enable="true"/>
-
-    <skill name="herbalism" enable="false"/>
-
-    <skill name="alchemy" enable="false"/>
-    <skill name="entertainment" enable="false"/>
-    <skill name="espionage" enable="false"/>
-    <skill name="perception" enable="false"/>
-    <skill name="stealth" enable="false"/>
-    <skill name="taxation" enable="false"/>
-    <skill name="trade" enable="false"/>
-  </game>
   <rules>
     <function name="wage" value="minimum_wage"/>
   </rules>
diff --git a/conf/e4/config.json b/conf/e4/config.json
index 2aaa1e998..ffa11443c 100644
--- a/conf/e4/config.json
+++ b/conf/e4/config.json
@@ -5,6 +5,14 @@
         "e3/terrains.json"
 	],
     "disabled": [
+        "herbalism",
+        "alchemy",
+        "entertainment",
+        "espionage",
+        "perception",
+        "stealth",
+        "taxation",
+        "trade",
         "besiege",
         "steal",
         "buy",
diff --git a/conf/e4/config.xml b/conf/e4/config.xml
index 0d6ea5704..ffa1c5df8 100644
--- a/conf/e4/config.xml
+++ b/conf/e4/config.xml
@@ -42,39 +42,6 @@
   <xi:include href="config://default/names-ghouls.xml"/>
   <xi:include href="config://default/names-dragons.xml"/>
 
-  <game>
-    <skill name="armorer" enable="true"/>
-    <skill name="bow" enable="true"/>
-    <skill name="building" enable="true"/>
-    <skill name="cartmaking" enable="true"/>
-    <skill name="catapult" enable="true"/>
-    <skill name="crossbow" enable="true"/>
-    <skill name="forestry" enable="true"/>
-    <skill name="magic" enable="true"/>
-    <skill name="melee" enable="true"/>
-    <skill name="mining" enable="true"/>
-    <skill name="polearm" enable="true"/>
-    <skill name="quarrying" enable="true"/>
-    <skill name="riding" enable="true"/>
-    <skill name="roadwork" enable="true"/>
-    <skill name="sailing" enable="true"/>
-    <skill name="shipcraft" enable="true"/>
-    <skill name="stamina" enable="true"/>
-    <skill name="tactics" enable="true"/>
-    <skill name="training" enable="true"/>
-    <skill name="unarmed" enable="true"/>
-    <skill name="weaponsmithing" enable="true"/>
-
-    <skill name="herbalism" enable="false"/>
-
-    <skill name="alchemy" enable="false"/>
-    <skill name="entertainment" enable="false"/>
-    <skill name="espionage" enable="false"/>
-    <skill name="perception" enable="false"/>
-    <skill name="stealth" enable="false"/>
-    <skill name="taxation" enable="false"/>
-    <skill name="trade" enable="false"/>
-  </game>
   <rules>
     <function name="wage" value="minimum_wage"/>
   </rules>