From 1296e45109804a8a33de3d0d9ea2b1a5318277e4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 23 May 2012 22:24:00 -0700
Subject: [PATCH] fix spellbook data for E2 and E3

---
 res/e3a/spells.xml                |  43 ++++++-------
 res/eressea/spellbooks/draig.xml  |   2 +-
 res/eressea/spellbooks/gwyrrd.xml |   2 +-
 res/eressea/spellbooks/illaun.xml |   2 +-
 res/eressea/spells.xml            | 103 +++++-------------------------
 5 files changed, 41 insertions(+), 111 deletions(-)

diff --git a/res/e3a/spells.xml b/res/e3a/spells.xml
index c677cd6d2..d48653989 100644
--- a/res/e3a/spells.xml
+++ b/res/e3a/spells.xml
@@ -9,7 +9,27 @@
   <xi:include href="spellbooks/cerddor.xml"/>
   <xi:include href="spellbooks/tybied.xml"/>
 
-    <!-- new illaun -->
+  <!-- shared spells -->
+  <spell name="create_roi" ship="true" rank="5" index="130">
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="50" cost="fixed"/>
+    <resource name="money" amount="3000" cost="fixed"/>
+    <resource name="permaura" amount="1" cost="fixed"/>
+  </spell>
+
+  <spell name="create_aots" ship="true" rank="5" index="125">
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="50" cost="fixed"/>
+    <resource name="money" amount="3000" cost="fixed"/>
+    <resource name="permaura" amount="1" cost="fixed"/>
+  </spell>
+
+  <spell name="disturbingdreams" rank="5" index="50" far="true">
+    <!-- Schlechter Schlaf -->
+    <resource name="aura" amount="18" cost="fixed"/>
+  </spell>
+
+  <!-- new illaun -->
   <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true" combat="1">
     <!-- Schattenritter -->
     <resource name="aura" amount="1" cost="level"/>
@@ -52,10 +72,6 @@
     <!-- Wiederbelebung -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="disturbingdreams" type="illaun" rank="5" level="6" index="50" far="true">
-    <!-- Schlechter Schlaf -->
-    <resource name="aura" amount="18" cost="fixed"/>
-  </spell>
   <spell name="sleep" type="illaun" rank="5" level="7" index="52" variable="true" combat="2">
     <!-- Schlaf -->
     <resource name="aura" amount="1" cost="level"/>
@@ -449,20 +465,6 @@
     <resource name="dragonblood" amount="1" cost="fixed"/><!-- Drachenblut -->
   </spell>
 
-  <spell name="create_roi" type="tybied" ship="true" rank="5" level="7" index="130">
-    <!-- Erschaffe einen Ring der Unsichtbarkeit -->
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-  <spell name="create_aots" type="tybied" ship="true" rank="5" level="6" index="125">
-    <!-- Erschaffe ein Amulett des wahren Sehens -->
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
   <spell name="auratransfer" type="tybied" rank="1" level="5" index="31" syntax="aura" parameters="ui" ship="true">
     <!-- Auratransfer -->
     <resource name="aura" amount="1" cost="fixed"/>
@@ -551,9 +553,6 @@
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="oil" amount="5" cost="fixed"/>
   </spell>
-  <spell name="disturbingdreams" type="common" rank="5" level="6" index="50" far="true">
-    <resource name="aura" amount="18" cost="fixed"/>
-  </spell>
   <spell name="appeasement" type="common" rank="5" level="1" index="51" variable="true" combat="1">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
diff --git a/res/eressea/spellbooks/draig.xml b/res/eressea/spellbooks/draig.xml
index 53b6eb020..b31905875 100644
--- a/res/eressea/spellbooks/draig.xml
+++ b/res/eressea/spellbooks/draig.xml
@@ -15,7 +15,7 @@
   <entry spell="chaossuction" level="14" />
   <entry spell="deathcloud" level="11" />
   <entry spell="summondragon" level="11" />
-  <entry spell="draigfamiliar" level="13" />
+  <entry spell="summon_familiar" level="13" />
   <entry spell="fumblecurse" level="5" />
   <entry spell="draigdestroymagic" level="10" />
   <entry spell="draigfumbleshield" level="9" />
diff --git a/res/eressea/spellbooks/gwyrrd.xml b/res/eressea/spellbooks/gwyrrd.xml
index de4b585f8..68d0c4ff0 100644
--- a/res/eressea/spellbooks/gwyrrd.xml
+++ b/res/eressea/spellbooks/gwyrrd.xml
@@ -26,7 +26,7 @@
   <entry spell="magicstreet" level="4" />
   <entry spell="wolfhowl" level="7" />
   <entry spell="blessstonecircle" level="11" />
-  <entry spell="gwyrrdfamiliar" level="10" />
+  <entry spell="summon_familiar" level="10" />
   <entry spell="gwyrrddestroymagic" level="8" />
   <entry spell="barkskin" level="12" />
   <entry spell="gwyrrdfumbleshield" level="5" />
diff --git a/res/eressea/spellbooks/illaun.xml b/res/eressea/spellbooks/illaun.xml
index 0d5d6f049..a0d2caf52 100644
--- a/res/eressea/spellbooks/illaun.xml
+++ b/res/eressea/spellbooks/illaun.xml
@@ -14,7 +14,7 @@
   <entry spell="shapeshift" level="3" />
   <entry spell="analysedream" level="5" />
   <entry spell="orkdream" level="12" />
-  <entry spell="illaunfamiliar" level="9" />
+  <entry spell="summon_familiar" level="9" />
   <entry spell="icastle" level="3" />
   <entry spell="illaundestroymagic" level="8" />
   <entry spell="shadowknights" level="1" />
diff --git a/res/eressea/spells.xml b/res/eressea/spells.xml
index 66ce169e6..4d606ac58 100644
--- a/res/eressea/spells.xml
+++ b/res/eressea/spells.xml
@@ -8,6 +8,21 @@
   <xi:include href="spellbooks/cerddor.xml"/>
   <xi:include href="spellbooks/tybied.xml"/>
 
+  <!-- shared spells -->
+  <spell name="create_roi" ship="true" rank="5" index="130">
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="50" cost="fixed"/>
+    <resource name="money" amount="3000" cost="fixed"/>
+    <resource name="permaura" amount="1" cost="fixed"/>
+  </spell>
+
+  <spell name="create_aots" ship="true" rank="5" index="125">
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="50" cost="fixed"/>
+    <resource name="money" amount="3000" cost="fixed"/>
+    <resource name="permaura" amount="1" cost="fixed"/>
+  </spell>
+
   <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true" combat="2">
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
@@ -350,23 +365,8 @@
     <resource name="aura" amount="350" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
-  <spell name="illaunfamiliar" type="illaun" rank="5" level="9" index="118">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="gwyrrdfamiliar" type="gwyrrd" rank="5" level="10" index="119">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="draigfamiliar" type="draig" rank="5" level="13" index="120">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="summon_familiar" type="cerddor" rank="5" level="9" index="121">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="summon_familiar" type="tybied" rank="5" level="12" index="122">
+  <spell name="summon_familiar" rank="5" index="122">
+    <function name="cast" value="cast_familiar"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
@@ -501,25 +501,11 @@
   </spell>
 
   <!-- draig spells -->
-  <spell name="create_roi" type="draig" ship="true" rank="5" level="6" index="130">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#draig" type="draig" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="draig" ship="true" rank="5" level="6" index="125">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_firesword" type="draig" ship="true" rank="5" level="12" index="148">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
@@ -541,25 +527,11 @@
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_roi" type="gwyrrd" ship="true" rank="5" level="6" index="129">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#gwyrrd" type="gwyrrd" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="gwyrrd" ship="true" rank="5" level="6" index="124">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_magicherbbag" type="gwyrrd" ship="true" rank="5" level="5" index="165">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="30" cost="fixed"/>
@@ -568,25 +540,11 @@
   </spell>
 
   <!-- illaun spells -->
-  <spell name="create_roi" type="illaun" ship="true" rank="5" level="6" index="131">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#illaun" type="illaun" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="illaun" ship="true" rank="5" level="6" index="126">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_dreameye" type="illaun" ship="true" rank="5" level="14" index="149">
     <function name="cast" value="lua_castspell"/>
     <resource name="dragonhead" amount="1" cost="fixed"/>
@@ -606,25 +564,12 @@
     <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="create_roi" type="cerddor" ship="true" rank="5" level="6" index="132">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
 
   <spell name="earn_silver#cerddor" type="cerddor" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="cerddor" ship="true" rank="5" level="6" index="127">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_roqf" type="cerddor" ship="true" rank="5" level="11" index="63">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="20" cost="fixed"/>
@@ -645,25 +590,11 @@
   </spell>
 
   <!-- tybied spells -->
-  <spell name="create_roi" type="tybied" ship="true" rank="5" level="6" index="133">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#tybied" type="tybied" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="tybied" ship="true" rank="5" level="6" index="128">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_antimagic" type="tybied" ship="true" rank="5" level="7" index="38">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="50" cost="fixed"/>