From 41c6b1311112ba99ed27c6ed5df1afc141a02860 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 10 May 2014 13:50:16 -0700
Subject: [PATCH] familiars with differnt skills for different games

---
 core/res/equipment.xml    | 127 ------------------------------------
 game-e2/config.xml        |   2 +-
 game-e3/config.xml        |   2 +-
 res/e3a/familiars.xml     | 107 ++++++++++++++++++++++++++++++
 res/eressea/familiars.xml | 132 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 241 insertions(+), 129 deletions(-)
 create mode 100644 res/e3a/familiars.xml
 create mode 100644 res/eressea/familiars.xml

diff --git a/core/res/equipment.xml b/core/res/equipment.xml
index a998ef712..a1b00415c 100644
--- a/core/res/equipment.xml
+++ b/core/res/equipment.xml
@@ -1,133 +1,6 @@
 <?xml version="1.0"?>
 <equipment>
 
-  <!-- equipment given to familiars -->
-  <set name="lynx_familiar">
-    <skill name="espionage" level="1"/>
-    <skill name="magic" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="perception" level="1"/>
-  </set>
-
-  <set name="tunnelworm_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="mining" level="1"/>
-    <skill name="forestry" level="1"/>
-    <skill name="stamina" level="1"/>
-  </set>
-
-  <set name="eagle_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="perception" level="1"/>
-  </set>
-
-  <set name="rat_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="espionage" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="perception" level="1"/>
-    <skill name="stamina" level="6"/>
-  </set>
-
-  <set name="songdragon_familiar">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="flee" level="2"/>
-    <spell name="sleep" level="7"/>
-    <spell name="frighten" level="8"/>
-  </set>
-
-  <set name="nymph_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="bow" level="1"/>
-    <skill name="herbalism" level="1"/>
-    <skill name="training" level="1"/>
-    <skill name="riding" level="1"/>
-    <skill name="espionage" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="entertainment" level="1"/>
-    <skill name="perception" level="1"/>
-    <!-- spells -->
-    <spell name="seduction" level="6"/>
-    <spell name="calm_monster" level="6"/>
-    <spell name="song_of_confusion" level="4"/>
-    <spell name="appeasement" level="1"/>
-  </set>
-
-  <set name="unicorn_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="perception" level="1"/>
-    <!-- spells -->
-    <spell name="resist_magic" level="3"/>
-    <spell name="song_of_peace" level="12"/>
-    <spell name="calm_monster" level="6"/>
-    <spell name="heroic_song" level="5"/>
-    <spell name="song_of_healing" level="2"/>
-    <spell name="appeasement" level="1"/>
-  </set>
-
-  <set name="direwolf_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="perception" level="1"/>
-  </set>
-
-  <set name="ghost_familiar">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="steal_aura" level="6"/>
-    <spell name="frighten" level="8"/>
-    <spell name="summonundead" level="6"/>
-  </set>
-
-  <set name="imp_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="espionage" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="perception" level="1"/>
-    <skill name="taxation" level="1"/>
-    <!-- spells -->
-    <spell name="steal_aura" level="6"/>
-    <spell name="shapeshift" level="3"/>
-    <spell name="seduction" level="6"/>
-  </set>
-
-  <set name="dreamcat_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="espionage" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="perception" level="1"/>
-    <skill name="taxation" level="1"/>
-    <!-- spells -->
-    <spell name="shapeshift" level="3"/>
-    <spell name="transferauratraum" level="3"/>
-  </set>
-
-  <set name="fairy_familiar">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="appeasement" level="1"/>
-    <spell name="calm_monster" level="6"/>
-    <spell name="seduction" level="6"/>
-  </set>
-
-  <set name="owl_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="espionage" level="1"/>
-    <skill name="stealth" level="1"/>
-    <skill name="perception" level="1"/>
-  </set>
-
-  <set name="hellcat_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="perception" level="1"/>
-  </set>
-
-  <set name="tiger_familiar">
-    <skill name="magic" level="1"/>
-    <skill name="perception" level="1"/>
-  </set>
-
   <!-- one equipment-set per player-race for the first unit in a faction -->
   <set name="first_dwarf">
     <item name="axe" amount="1"/>
diff --git a/game-e2/config.xml b/game-e2/config.xml
index 1696f8f58..62ea9ef85 100644
--- a/game-e2/config.xml
+++ b/game-e2/config.xml
@@ -20,7 +20,7 @@
   <xi:include href="config:///core/ships.xml"/>
   <xi:include href="config:///core/common/buildings.xml"/>
   <xi:include href="config:///core/equipment.xml"/>
-  <xi:include href="config:///core/familiars.xml"/>
+  <xi:include href="config:///game/familiars.xml"/>
   <xi:include href="config:///core/terrains.xml"/>
   <xi:include href="config:///game/terrains.xml"/>
   <xi:include href="config:///default/directions.xml"/>
diff --git a/game-e3/config.xml b/game-e3/config.xml
index 84c2f4685..dbc011983 100644
--- a/game-e3/config.xml
+++ b/game-e3/config.xml
@@ -13,7 +13,7 @@
   <xi:include href="config:///core/prefixes.xml"/>
   <xi:include href="config:///core/common/buildings.xml"/>
   <xi:include href="config:///core/equipment.xml"/>
-  <xi:include href="config:///core/familiars.xml"/>
+  <xi:include href="config:///game/familiars.xml"/>
 
   <xi:include href="config:///game/ships.xml"/>
   <xi:include href="config:///game/shipnames.xml"/>
diff --git a/res/e3a/familiars.xml b/res/e3a/familiars.xml
new file mode 100644
index 000000000..13626e664
--- /dev/null
+++ b/res/e3a/familiars.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<equipment>
+
+  <!-- equipment given to familiars -->
+  <set name="lynx_familiar">
+    <skill name="magic" level="1"/>
+  </set>
+
+  <set name="tunnelworm_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="mining" level="1"/>
+    <skill name="forestry" level="1"/>
+    <skill name="stamina" level="1"/>
+  </set>
+
+  <set name="eagle_familiar">
+    <skill name="magic" level="1"/>
+  </set>
+
+  <set name="rat_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="stamina" level="6"/>
+  </set>
+
+  <set name="songdragon_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="flee" level="2"/>
+    <spell name="sleep" level="7"/>
+    <spell name="frighten" level="8"/>
+  </set>
+
+  <set name="nymph_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="bow" level="1"/>
+    <skill name="herbalism" level="1"/>
+    <skill name="training" level="1"/>
+    <skill name="riding" level="1"/>
+    <!-- spells -->
+    <spell name="seduction" level="6"/>
+    <spell name="calm_monster" level="6"/>
+    <spell name="song_of_confusion" level="4"/>
+    <spell name="appeasement" level="1"/>
+  </set>
+
+  <set name="unicorn_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="resist_magic" level="3"/>
+    <spell name="song_of_peace" level="12"/>
+    <spell name="calm_monster" level="6"/>
+    <spell name="heroic_song" level="5"/>
+    <spell name="song_of_healing" level="2"/>
+    <spell name="appeasement" level="1"/>
+  </set>
+
+  <set name="direwolf_familiar">
+    <skill name="magic" level="1"/>
+  </set>
+
+  <set name="ghost_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="steal_aura" level="6"/>
+    <spell name="frighten" level="8"/>
+    <spell name="summonundead" level="6"/>
+  </set>
+
+  <set name="imp_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="taxation" level="1"/>
+    <!-- spells -->
+    <spell name="steal_aura" level="6"/>
+    <spell name="shapeshift" level="3"/>
+    <spell name="seduction" level="6"/>
+  </set>
+
+  <set name="dreamcat_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="taxation" level="1"/>
+    <!-- spells -->
+    <spell name="shapeshift" level="3"/>
+    <spell name="transferauratraum" level="3"/>
+  </set>
+
+  <set name="fairy_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="appeasement" level="1"/>
+    <spell name="calm_monster" level="6"/>
+    <spell name="seduction" level="6"/>
+  </set>
+
+  <set name="owl_familiar">
+    <skill name="magic" level="1"/>
+  </set>
+
+  <set name="hellcat_familiar">
+    <skill name="magic" level="1"/>
+  </set>
+
+  <set name="tiger_familiar">
+    <skill name="magic" level="1"/>
+  </set>
+
+</equipment>
+
diff --git a/res/eressea/familiars.xml b/res/eressea/familiars.xml
new file mode 100644
index 000000000..8503123cb
--- /dev/null
+++ b/res/eressea/familiars.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<equipment>
+
+  <!-- equipment given to familiars -->
+  <set name="lynx_familiar">
+    <skill name="espionage" level="1"/>
+    <skill name="magic" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="perception" level="1"/>
+  </set>
+
+  <set name="tunnelworm_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="mining" level="1"/>
+    <skill name="forestry" level="1"/>
+    <skill name="stamina" level="1"/>
+  </set>
+
+  <set name="eagle_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="perception" level="1"/>
+  </set>
+
+  <set name="rat_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="espionage" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="perception" level="1"/>
+    <skill name="stamina" level="6"/>
+  </set>
+
+  <set name="songdragon_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="flee" level="2"/>
+    <spell name="sleep" level="7"/>
+    <spell name="frighten" level="8"/>
+  </set>
+
+  <set name="nymph_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="bow" level="1"/>
+    <skill name="herbalism" level="1"/>
+    <skill name="training" level="1"/>
+    <skill name="riding" level="1"/>
+    <skill name="espionage" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="entertainment" level="1"/>
+    <skill name="perception" level="1"/>
+    <!-- spells -->
+    <spell name="seduction" level="6"/>
+    <spell name="calm_monster" level="6"/>
+    <spell name="song_of_confusion" level="4"/>
+    <spell name="appeasement" level="1"/>
+  </set>
+
+  <set name="unicorn_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="perception" level="1"/>
+    <!-- spells -->
+    <spell name="resist_magic" level="3"/>
+    <spell name="song_of_peace" level="12"/>
+    <spell name="calm_monster" level="6"/>
+    <spell name="heroic_song" level="5"/>
+    <spell name="song_of_healing" level="2"/>
+    <spell name="appeasement" level="1"/>
+  </set>
+
+  <set name="direwolf_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="perception" level="1"/>
+  </set>
+
+  <set name="ghost_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="steal_aura" level="6"/>
+    <spell name="frighten" level="8"/>
+    <spell name="summonundead" level="6"/>
+  </set>
+
+  <set name="imp_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="espionage" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="perception" level="1"/>
+    <skill name="taxation" level="1"/>
+    <!-- spells -->
+    <spell name="steal_aura" level="6"/>
+    <spell name="shapeshift" level="3"/>
+    <spell name="seduction" level="6"/>
+  </set>
+
+  <set name="dreamcat_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="espionage" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="perception" level="1"/>
+    <skill name="taxation" level="1"/>
+    <!-- spells -->
+    <spell name="shapeshift" level="3"/>
+    <spell name="transferauratraum" level="3"/>
+  </set>
+
+  <set name="fairy_familiar">
+    <skill name="magic" level="1"/>
+    <!-- spells -->
+    <spell name="appeasement" level="1"/>
+    <spell name="calm_monster" level="6"/>
+    <spell name="seduction" level="6"/>
+  </set>
+
+  <set name="owl_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="espionage" level="1"/>
+    <skill name="stealth" level="1"/>
+    <skill name="perception" level="1"/>
+  </set>
+
+  <set name="hellcat_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="perception" level="1"/>
+  </set>
+
+  <set name="tiger_familiar">
+    <skill name="magic" level="1"/>
+    <skill name="perception" level="1"/>
+  </set>
+
+</equipment>
+