From c3cd51915243426fbe7a688ce61284e2c0551a01 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 24 May 2012 01:45:13 -0700
Subject: [PATCH] specify levels with magic attacks (step one to removing
 spell->level)

---
 res/e3a/races.xml         |   6 +-
 res/e3a/spells.xml        | 282 ++++++++++++++++----------------
 res/eressea/races.xml     |  16 +-
 res/eressea/spells.xml    | 328 +++++++++++++++++++-------------------
 res/races/dragon.xml      |   2 +-
 res/races/wyrm.xml        |   2 +-
 res/races/youngdragon.xml |   2 +-
 7 files changed, 319 insertions(+), 319 deletions(-)

diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index 1bf6cccbc..3c28a2319 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -383,7 +383,7 @@
     <attack type="4" damage="1d4"/>
     <attack type="4" damage="1d4"/>
     <attack type="1" damage="1d4"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
   </race>
   <race name="ghost" magres="0.800000" maxaura="0.500000" regaura="0.100000" weight="500" capacity="540" speed="1.0" hp="30" ac="5" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="8" scarepeasants="yes" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes" invinciblenonmagic="yes">
     <ai splitsize="5000"/>
@@ -508,7 +508,7 @@
     <attack type="4" damage="2d4"/>
     <attack type="4" damage="2d4"/>
     <attack type="4" damage="2d4"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
   </race>
 
   <race name="rat" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="100" capacity="540" speed="1.0" hp="10" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk="yes" teach="no" giveitem="yes" getitem="yes">
@@ -889,7 +889,7 @@
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
     <attack type="8" damage="1d10"/>
   </race>
 
diff --git a/res/e3a/spells.xml b/res/e3a/spells.xml
index d48653989..0cebf1040 100644
--- a/res/e3a/spells.xml
+++ b/res/e3a/spells.xml
@@ -30,82 +30,82 @@
   </spell>
 
   <!-- new illaun -->
-  <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true" combat="1">
+  <spell name="shadowknights" rank="4" level="1" index="147" variable="true" combat="1">
     <!-- Schattenritter -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="sparkledream" type="illaun" rank="5" level="1" index="154" parameters="u" los="true" ship="true" variable="true">
+  <spell name="sparkledream" rank="5" level="1" index="154" parameters="u" los="true" ship="true" variable="true">
     <!-- Traumsenden -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="earn_silver#illaun" type="illaun" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#illaun" ship="true" variable="true" rank="5" level="1" index="159">
     <!-- Wahrsagen -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="flee" type="illaun" rank="5" level="2" index="20" variable="true" combat="1">
+  <spell name="flee" rank="5" level="2" index="20" variable="true" combat="1">
     <!-- Grauen der Schlacht -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="puttorest" type="illaun" rank="5" level="2" index="168" variable="true">
+  <spell name="puttorest" rank="5" level="2" index="168" variable="true">
     <!-- Seelenfrieden -->
     <resource name="aura" amount="3" cost="level"/>
     <resource name="balm" amount="10" cost="fixed"/>
   </spell>
-  <spell name="shapeshift" type="illaun" rank="5" level="3" index="93" syntax="race" parameters="uc" variable="true">
+  <spell name="shapeshift" rank="5" level="3" index="93" syntax="race" parameters="uc" variable="true">
     <!-- Gestaltwandlung -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="icastle" type="illaun" rank="5" level="3" index="137" syntax="buildingtype" parameters="c">
+  <spell name="icastle" rank="5" level="3" index="137" syntax="buildingtype" parameters="c">
     <!-- Traumschlößchen -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="dreamreading" type="illaun" rank="5" level="4" index="13" parameters="u" far="true">
+  <spell name="dreamreading" rank="5" level="4" index="13" parameters="u" far="true">
     <!-- Traumlesen -->
     <resource name="aura" amount="8" cost="fixed"/>
   </spell>
-  <spell name="tiredsoldiers" type="illaun" rank="5" level="4" index="15" variable="true" combat="1">
+  <spell name="tiredsoldiers" rank="5" level="4" index="15" variable="true" combat="1">
     <!-- Schwere Glieder -->
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="reanimate" type="illaun" rank="4" level="5" index="85" variable="true" combat="3">
+  <spell name="reanimate" rank="4" level="5" index="85" variable="true" combat="3">
     <!-- Wiederbelebung -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="sleep" type="illaun" rank="5" level="7" index="52" variable="true" combat="2">
+  <spell name="sleep" rank="5" level="7" index="52" variable="true" combat="2">
     <!-- Schlaf -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="readmind" parameters="u" type="illaun" rank="5" level="7" index="114">
+  <spell name="readmind" parameters="u" rank="5" level="7" index="114">
     <!-- Traumdeuten -->
     <function name="cast" value="cast_readmind"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
-  <spell name="gooddreams" type="illaun" rank="5" level="8" index="12" far="true">
+  <spell name="gooddreams" rank="5" level="8" index="12" far="true">
     <!-- Schöne Träume -->
     <resource name="aura" amount="80" cost="fixed"/>
   </spell>
-  <spell name="illaundestroymagic" type="illaun" rank="2" level="8" index="140" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="illaundestroymagic" rank="2" level="8" index="140" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <!-- Traumbilder entwirren -->
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="clone" type="illaun" rank="5" level="9" index="173">
+  <spell name="clone" rank="5" level="9" index="173">
     <!-- Seelenkopie -->
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="20" cost="fixed"/>
     <resource name="dragonblood" amount="5" cost="fixed"/>
     <resource name="silk" amount="20" cost="fixed"/>
   </spell>
-  <spell name="bad_dreams" type="illaun" rank="5" level="10" index="11" far="true">
+  <spell name="bad_dreams" rank="5" level="10" index="11" far="true">
     <!-- Schlechte Träume -->
     <resource name="aura" amount="90" cost="fixed"/>
   </spell>
-  <spell name="mindblast" type="illaun" rank="5" level="11" index="78" variable="true" combat="1">
+  <spell name="mindblast" rank="5" level="11" index="78" variable="true" combat="1">
     <!-- Tod des Geistes -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="create_dreameye" type="illaun" ship="true" rank="5" level="14" index="149">
+  <spell name="create_dreameye" ship="true" rank="5" level="14" index="149">
     <!-- Erschaffe ein Traumauge -->
     <function name="cast" value="lua_castspell"/>
     <resource name="dragonhead" amount="1" cost="fixed"/>
@@ -114,81 +114,81 @@
   <!-- end illaun -->
 
   <!-- new draig -->
-  <spell name="sparklechaos" type="draig" rank="5" level="1" index="153" parameters="u" los="true" variable="true">
+  <spell name="sparklechaos" rank="5" level="1" index="153" parameters="u" los="true" variable="true">
     <!-- Verwünschung -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="earn_silver#draig" type="draig" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#draig" ship="true" variable="true" rank="5" level="1" index="159">
     <!-- Kleine Flüche -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true" combat="2">
+  <spell name="fireball" rank="5" level="2" index="4" variable="true" combat="2">
     <!-- Feuerball -->
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="magicboost" type="draig" rank="3" level="3" index="17" ship="true">
+  <spell name="magicboost" rank="3" level="3" index="17" ship="true">
     <!-- Gabe des Chaos -->
     <resource name="aura" amount="2" cost="linear"/>
   </spell>
-  <spell name="bloodsacrifice" type="draig" rank="1" level="4" index="171" ship="true">
+  <spell name="bloodsacrifice" rank="1" level="4" index="171" ship="true">
     <!-- Kleines Blutopfer -->
     <resource name="hp" amount="4" cost="level"/>
   </spell>
-  <spell name="berserk" type="draig" rank="4" level="5" index="22" variable="true" combat="1">
+  <spell name="berserk" rank="4" level="5" index="22" variable="true" combat="1">
     <!-- Blutrausch -->
     <resource name="aura" amount="5" cost="level"/>
     <resource name="peasant" amount="1" cost="fixed"/>
   </spell>
-  <spell name="fumblecurse" type="draig" rank="4" level="5" index="136" parameters="u" los="true" variable="true">
+  <spell name="fumblecurse" rank="4" level="5" index="136" parameters="u" los="true" variable="true">
     <!-- Chaosfluch -->
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="combatrust" type="draig" rank="5" level="6" index="7" variable="true" combat="2">
+  <spell name="combatrust" rank="5" level="6" index="7" variable="true" combat="2">
     <!-- Rosthauch -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="summonundead" type="draig" rank="5" level="6" index="41" ship="true" far="true" variable="true">
+  <spell name="summonundead" rank="5" level="6" index="41" ship="true" far="true" variable="true">
     <!-- Mächte des Todes -->
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="firewall" type="draig" rank="4" level="7" index="151" syntax="direction" parameters="c" variable="true">
+  <spell name="firewall" rank="4" level="7" index="151" syntax="direction" parameters="c" variable="true">
     <!-- Feuerwand -->
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="chaosrow" type="draig" rank="5" level="8" index="18" variable="true" combat="1">
+  <spell name="chaosrow" rank="5" level="8" index="18" variable="true" combat="1">
     <!-- Wahnsinn des Krieges -->
     <resource name="aura" amount="3" cost="level"/>
     <resource name="peasant" amount="10" cost="fixed"/>
   </spell>
-  <spell name="summonshadow" type="draig" rank="5" level="8" index="34" variable="true">
+  <spell name="summonshadow" rank="5" level="8" index="34" variable="true">
     <!-- Beschwöre Schattendämonen -->
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="undeadhero" type="draig" rank="5" level="9" index="164" variable="true" combat="3">
+  <spell name="undeadhero" rank="5" level="9" index="164" variable="true" combat="3">
     <!-- Untote Helden -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="draigdestroymagic" type="draig" rank="2" level="10" index="139" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="draigdestroymagic" rank="2" level="10" index="139" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <!-- Pentagramm -->
     <resource name="aura" amount="10" cost="level"/>
   </spell>
-  <spell name="deathcloud" type="draig" rank="5" level="11" index="111" far="true">
+  <spell name="deathcloud" rank="5" level="11" index="111" far="true">
     <!-- Todeswolke -->
     <resource name="aura" amount="40" cost="fixed"/>
     <resource name="hp" amount="15" cost="fixed"/>
   </spell>
-  <spell name="summondragon" type="draig" rank="5" level="11" index="113" far="true">
+  <spell name="summondragon" rank="5" level="11" index="113" far="true">
     <!-- Drachenruf -->
     <resource name="aura" amount="80" cost="fixed"/>
     <resource name="dragonhead" amount="1" cost="fixed"/>
   </spell>
-  <spell name="summonshadowlords" type="draig" rank="5" level="12" index="35" variable="true">
+  <spell name="summonshadowlords" rank="5" level="12" index="35" variable="true">
     <!-- Beschwöre Schattenmeister -->
     <resource name="aura" amount="7" cost="level"/>
   </spell>
-  <spell name="create_firesword" type="draig" ship="true" rank="5" level="12" index="148">
+  <spell name="create_firesword" ship="true" rank="5" level="12" index="148">
     <!-- Erschaffe ein Flammenschwert -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
@@ -196,7 +196,7 @@
     <resource name="sword" amount="1" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="unholypower" type="draig" rank="5" level="14" index="169" parameters="u+" los="true" variable="true">
+  <spell name="unholypower" rank="5" level="14" index="169" parameters="u+" los="true" variable="true">
     <!-- Unheilige Kraft -->
     <resource name="aura" amount="10" cost="level"/>
     <resource name="peasant" amount="5" cost="level"/>
@@ -204,188 +204,188 @@
   <!-- end draig -->
 
   <!-- new cerddor -->
-  <spell name="earn_silver#cerddor" type="cerddor" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#cerddor" ship="true" variable="true" rank="5" level="1" index="159">
     <!-- Gaukeleien -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="song_of_healing" type="cerddor" rank="5" level="2" index="10" variable="true" combat="3">
+  <spell name="song_of_healing" rank="5" level="2" index="10" variable="true" combat="3">
     <!-- Lied der Heilung -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="generous" type="cerddor" rank="5" level="2" index="87" ship="true" far="true" variable="true">
+  <spell name="generous" rank="5" level="2" index="87" ship="true" far="true" variable="true">
     <!-- Hohes Lied der Gaukelei -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="song_of_fear" type="cerddor" rank="5" level="3" index="21" variable="true" combat="2">
+  <spell name="song_of_fear" rank="5" level="3" index="21" variable="true" combat="2">
     <!-- Gesang der Furcht -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="song_of_confusion" type="cerddor" rank="5" level="4" index="19" variable="true" combat="1">
+  <spell name="song_of_confusion" rank="5" level="4" index="19" variable="true" combat="1">
     <!-- Gesang der Verwirrung -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="blabbermouth" parameters="u" type="cerddor" los="true" rank="5" level="4" index="115">
+  <spell name="blabbermouth" parameters="u" los="true" rank="5" level="4" index="115">
     <!-- Plappermaul -->
     <function name="cast" value="cast_babbler"/>
     <resource name="aura" amount="10" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
-  <spell name="heroic_song" type="cerddor" rank="4" level="5" index="76" variable="true" combat="1">
+  <spell name="heroic_song" rank="4" level="5" index="76" variable="true" combat="1">
     <!-- Heldengesang -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="seduction" type="cerddor" rank="5" level="6" index="73" parameters="u" los="true">
+  <spell name="seduction" rank="5" level="6" index="73" parameters="u" los="true">
     <!-- Lied der Verführung -->
     <resource name="aura" amount="12" cost="fixed"/>
   </spell>
-  <spell name="calm_monster" type="cerddor" rank="5" level="6" index="75" parameters="u" los="true" ship="true">
+  <spell name="calm_monster" rank="5" level="6" index="75" parameters="u" los="true" ship="true">
     <!-- Monster friedlich stimmen -->
     <resource name="aura" amount="15" cost="fixed"/>
   </spell>
-  <spell name="bloodthirst" type="cerddor" rank="4" level="7" index="23" variable="true" combat="1">
+  <spell name="bloodthirst" rank="4" level="7" index="23" variable="true" combat="1">
     <!-- Kriegsgesang -->
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="frighten" type="cerddor" rank="5" level="8" index="77" variable="true" combat="1">
+  <spell name="frighten" rank="5" level="8" index="77" variable="true" combat="1">
     <!-- Gesang der Angst -->
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="cerddor_destroymagic" type="cerddor" rank="2" level="8" index="141" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="cerddor_destroymagic" rank="2" level="8" index="141" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <!-- Lebenslied festigen -->
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="migration" type="cerddor" rank="5" level="9" index="90" parameters="u" los="true" variable="true">
+  <spell name="migration" rank="5" level="9" index="90" parameters="u" los="true" variable="true">
     <!-- Ritual der Aufnahme -->
     <resource name="aura" amount="3" cost="level"/>
     <resource name="permaura" amount="1" cost="level"/>
   </spell>
-  <spell name="raise_mob" type="cerddor" rank="5" level="10" index="60" variable="true">
+  <spell name="raise_mob" rank="5" level="10" index="60" variable="true">
     <!-- Mob aufwiegeln -->
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="song_resist_magic" type="cerddor" rank="2" level="10" index="100" far="true" variable="true">
+  <spell name="song_resist_magic" rank="2" level="10" index="100" far="true" variable="true">
     <!-- Gesang des wachen Geistes -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="create_roqf" type="cerddor" ship="true" rank="5" level="11" index="63">
+  <spell name="create_roqf" ship="true" rank="5" level="11" index="63">
     <!-- Miriams flinke Finger -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <resource name="money" amount="1000" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="song_of_peace" type="cerddor" rank="5" level="12" index="89" variable="true">
+  <spell name="song_of_peace" rank="5" level="12" index="89" variable="true">
     <!-- Gesang der Friedfertigkeit -->
     <resource name="aura" amount="20" cost="level"/>
   </spell>
-  <spell name="song_suscept_magic" type="cerddor" rank="2" level="12" index="101" far="true" variable="true">
+  <spell name="song_suscept_magic" rank="2" level="12" index="101" far="true" variable="true">
     <!-- Gesang des schwachen Geistes -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="song_of_slavery" type="cerddor" rank="5" level="13" index="123" parameters="u" los="true">
+  <spell name="song_of_slavery" rank="5" level="13" index="123" parameters="u" los="true">
     <!-- Gesang der Versklavung -->
     <resource name="aura" amount="40" cost="fixed"/>
   </spell>
 <!-- TODO: exploitable (transfers items) -->
-  <spell name="big_recruit" type="cerddor" rank="5" level="14" index="179" variable="true">
+  <spell name="big_recruit" rank="5" level="14" index="179" variable="true">
     <!-- Hohe Kunst der Überzeugung -->
     <resource name="aura" amount="20" cost="level"/>
   </spell>
-  <spell name="calm_riot" type="cerddor" rank="5" level="14" index="91" far="true">
+  <spell name="calm_riot" rank="5" level="14" index="91" far="true">
     <!-- Aufruhr beschwichtigen -->
     <resource name="aura" amount="30" cost="fixed"/>
   </spell>
-  <spell name="incite_riot" type="cerddor" rank="5" level="15" index="92" far="true">
+  <spell name="incite_riot" rank="5" level="15" index="92" far="true">
     <!-- Aufruhr verursachen -->
     <resource name="aura" amount="40" cost="fixed"/>
   </spell>
   <!-- end cerddor -->
 
   <!-- new gwyrrd -->
-  <spell name="blessedharvest" type="gwyrrd" rank="5" level="3" index="25" ship="true" far="true" variable="true">
+  <spell name="blessedharvest" rank="5" level="3" index="25" ship="true" far="true" variable="true">
     <!-- Segen der Erde -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="earn_silver#gwyrrd" type="gwyrrd" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#gwyrrd" ship="true" variable="true" rank="5" level="1" index="159">
     <!-- Viehheilung -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="stonegolem" type="gwyrrd" rank="4" level="20" index="32" variable="true">
+  <spell name="stonegolem" rank="4" level="20" index="32" variable="true">
     <!-- Erschaffe Steingolems -->
     <resource name="aura" amount="2" cost="level"/>
     <resource name="stone" amount="1" cost="level"/>
     <resource name="jewel" amount="10" cost="fixed"/>
   </spell>
-  <spell name="treegrow" type="gwyrrd" rank="5" level="2" index="8" far="true" variable="true">
+  <spell name="treegrow" rank="5" level="2" index="8" far="true" variable="true">
     <!-- Hainzauber -->
     <resource name="aura" amount="4" cost="level"/>
     <resource name="log" amount="1" cost="level"/>
     <resource name="myrrh" amount="10" cost="fixed"/>
   </spell>
-  <spell name="hail" type="gwyrrd" rank="5" level="3" index="5" variable="true" combat="2">
+  <spell name="hail" rank="5" level="3" index="5" variable="true" combat="2">
     <!-- Hagel -->
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="goodwinds" type="common" rank="5" level="4" index="56" parameters="s" ship="true" variable="true">
+  <spell name="goodwinds" rank="5" level="4" index="56" parameters="s" ship="true" variable="true">
     <!-- Beschwörung eines Wasserelementares -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="windshield" type="gwyrrd" rank="5" level="4" index="59" variable="true" combat="1">
+  <spell name="windshield" rank="5" level="4" index="59" variable="true" combat="1">
     <!-- Windschild -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="healing" type="gwyrrd" rank="5" level="5" index="9" variable="true" combat="3">
+  <spell name="healing" rank="5" level="5" index="9" variable="true" combat="3">
     <!-- Heilung -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="earthquake" type="gwyrrd" rank="5" level="6" index="53" far="true">
+  <spell name="earthquake" rank="5" level="6" index="53" far="true">
     <!-- Beschwöre einen Erdelementar -->
     <resource name="aura" amount="25" cost="fixed"/>
     <resource name="laen" amount="2" cost="fixed"/>
   </spell>
-  <spell name="stormwinds" type="gwyrrd" rank="5" level="6" index="55" parameters="s+" ship="true" ocean="true" variable="true">
+  <spell name="stormwinds" rank="5" level="6" index="55" parameters="s+" ship="true" ocean="true" variable="true">
     <!-- Beschwöre einen Sturmelementar -->
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="wolfhowl" type="gwyrrd" rank="5" level="7" index="94" variable="true" combat="1">
+  <spell name="wolfhowl" rank="5" level="7" index="94" variable="true" combat="1">
     <!-- Wolfsgeheul -->
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="versteinern" type="gwyrrd" rank="5" level="8" index="67" variable="true" combat="2">
+  <spell name="versteinern" rank="5" level="8" index="67" variable="true" combat="2">
     <!-- Blick des Basilisken -->
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="gwyrrddestroymagic" type="gwyrrd" rank="2" level="8" index="138" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="gwyrrddestroymagic" rank="2" level="8" index="138" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <!-- Geister bannen -->
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="holyground" type="gwyrrd" rank="5" level="9" index="170">
+  <spell name="holyground" rank="5" level="9" index="170">
     <!-- Heiliger Boden -->
     <resource name="aura" amount="80" cost="fixed"/>
     <resource name="permaura" amount="3" cost="fixed"/>
   </spell>
-  <spell name="summonent" type="gwyrrd" rank="5" level="10" index="49" variable="true">
+  <spell name="summonent" rank="5" level="10" index="49" variable="true">
     <!-- Erwecke Ents -->
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="blessstonecircle" type="gwyrrd" rank="5" level="11" index="117" parameters="b">
+  <spell name="blessstonecircle" rank="5" level="11" index="117" parameters="b">
     <!-- Segne Steinkreis -->
     <resource name="aura" amount="350" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
-  <spell name="barkskin" type="gwyrrd" rank="2" level="12" index="142" variable="true" combat="1">
+  <spell name="barkskin" rank="2" level="12" index="142" variable="true" combat="1">
     <!-- Rindenhaut -->
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="summonfireelemental" type="gwyrrd" rank="5" level="13" index="46" far="true">
+  <spell name="summonfireelemental" rank="5" level="13" index="46" far="true">
     <!-- Beschwörung eines Hitzeelementar -->
     <resource name="aura" amount="600" cost="fixed"/>
   </spell>
-  <spell name="maelstrom" type="gwyrrd" rank="5" level="15" index="24" ship="true" ocean="true">
+  <spell name="maelstrom" rank="5" level="15" index="24" ship="true" ocean="true">
     <!-- Mahlstrom -->
     <resource name="aura" amount="200" cost="fixed"/>
     <resource name="seaserpenthead" amount="1" cost="fixed"/>
@@ -393,21 +393,21 @@
   <!-- end gwyrrd -->
 
   <!-- new tybied - spells known to all schools -->
-  <spell name="create_potion_p2" type="tybied" ship="true" rank="5" level="2" variable="true">
+  <spell name="create_potion_p2" ship="true" rank="5" level="2" variable="true">
     <!-- Wasser des Lebens -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="2" cost="linear"/>
     <resource name="h4" amount="1" cost="linear"/><!-- Baumringel -->
     <resource name="h6" amount="1" cost="linear"/><!-- Gurgelkraut -->
   </spell>
-  <spell name="create_potion_p0" type="tybied" ship="true" rank="5" level="3" variable="true">
+  <spell name="create_potion_p0" ship="true" rank="5" level="3" variable="true">
     <!-- Siebenmeilentee -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="2" cost="linear"/>
     <resource name="h12" amount="1" cost="linear"/><!-- Windbeutel -->
     <resource name="h17" amount="1" cost="linear"/><!-- Höhlenglimm -->
   </spell>
-  <spell name="create_potion_p9" type="tybied" ship="true" rank="5" level="4" variable="true">
+  <spell name="create_potion_p9" ship="true" rank="5" level="4" variable="true">
     <!-- Pferdeglück -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="3" cost="linear"/>
@@ -415,7 +415,7 @@
     <resource name="h8" amount="1" cost="linear"/><!-- Blasenmorchel -->
     <resource name="h15" amount="1" cost="linear"/><!-- Steinbeißer -->
   </spell>
-  <spell name="create_potion_peasantblood" type="tybied" ship="true" rank="5" level="5" variable="true">
+  <spell name="create_potion_peasantblood" ship="true" rank="5" level="5" variable="true">
     <!-- Bauernblut -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="3" cost="linear"/>
@@ -425,7 +425,7 @@
     <resource name="peasant" amount="1" cost="fixed"/><!-- Bauer -->
   </spell>
 
-  <spell name="create_potion_ointment" type="tybied" ship="true" rank="5" level="6" variable="true">
+  <spell name="create_potion_ointment" ship="true" rank="5" level="6" variable="true">
     <!-- Wundsalbe -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="4" cost="linear"/>
@@ -434,7 +434,7 @@
     <resource name="h18" amount="1" cost="linear"/><!-- Eisblume -->
     <resource name="h11" amount="1" cost="linear"/><!-- Sandfäule -->
   </spell>
-  <spell name="create_potion_p3" type="tybied" ship="true" rank="5" level="7" variable="true">
+  <spell name="create_potion_p3" ship="true" rank="5" level="7" variable="true">
     <!-- Schaffenstrunk -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="4" cost="linear"/>
@@ -443,7 +443,7 @@
     <resource name="h20" amount="1" cost="linear"/><!-- Schneekristall -->
     <resource name="h9" amount="1" cost="linear"/><!-- Wasserfinder -->
   </spell>
-  <spell name="create_potion_p14" type="tybied" ship="true" rank="5" level="8" variable="true">
+  <spell name="create_potion_p14" ship="true" rank="5" level="8" variable="true">
     <!-- Heiltrank -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="5" cost="linear"/>
@@ -453,7 +453,7 @@
     <resource name="h18" amount="1" cost="linear"/><!-- Eisblume -->
     <resource name="h9" amount="1" cost="linear"/><!-- Wasserfinder -->
   </spell>
-  <spell name="create_potion_p13" type="tybied" ship="true" rank="5" level="9" variable="true">
+  <spell name="create_potion_p13" ship="true" rank="5" level="9" variable="true">
     <!-- Elixier der Macht -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="5" cost="linear"/>
@@ -465,220 +465,220 @@
     <resource name="dragonblood" amount="1" cost="fixed"/><!-- Drachenblut -->
   </spell>
 
-  <spell name="auratransfer" type="tybied" rank="1" level="5" index="31" syntax="aura" parameters="ui" ship="true">
+  <spell name="auratransfer" rank="1" level="5" index="31" syntax="aura" parameters="ui" ship="true">
     <!-- Auratransfer -->
     <resource name="aura" amount="1" cost="fixed"/>
   </spell>
   <!-- end tybied -->
 
   <!-- common spells: randomly given, one per level -->
-  <spell name="create_trollbelt" type="common" ship="true" rank="5" level="9" index="48">
+  <spell name="create_trollbelt" ship="true" rank="5" level="9" index="48">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_antimagic" type="common" ship="true" rank="5" level="7" index="38">
+  <spell name="create_antimagic" ship="true" rank="5" level="7" index="38">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
   </spell>
 
-  <spell name="create_rop" type="common" ship="true" rank="5" level="9" index="1">
+  <spell name="create_rop" ship="true" rank="5" level="9" index="1">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="4000" cost="fixed"/>
   </spell>
 
-  <spell name="create_bagofholding" type="common" ship="true" rank="5" level="10" index="155">
+  <spell name="create_bagofholding" ship="true" rank="5" level="10" index="155">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="5000" cost="fixed"/>
   </spell>
 
-  <spell name="create_focus" type="common" ship="true" rank="5" level="9" index="2">
+  <spell name="create_focus" ship="true" rank="5" level="9" index="2">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_ror" type="common" ship="true" rank="5" level="9" index="3">
+  <spell name="create_ror" ship="true" rank="5" level="9" index="3">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="rustweapon" type="gwyrrd" rank="5" level="3" index="6" parameters="u+" los="true" far="true" variable="true">
+  <spell name="rustweapon" rank="5" level="3" index="6" parameters="u+" los="true" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="plague" type="common" rank="5" level="7" index="16" far="true">
+  <spell name="plague" rank="5" level="7" index="16" far="true">
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="peasant" amount="50" cost="fixed"/>
   </spell>
-  <spell name="raindance" type="common" rank="5" level="2" index="26" ship="true" far="true" variable="true">
+  <spell name="raindance" rank="5" level="2" index="26" ship="true" far="true" variable="true">
     <!-- Regentanz -->
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="irongolem" type="common" rank="4" level="2" index="33" variable="true">
+  <spell name="irongolem" rank="4" level="2" index="33" variable="true">
     <!-- Eisengolem -->
     <resource name="aura" amount="2" cost="level"/>
     <resource name="iron" amount="1" cost="level"/>
     <resource name="incense" amount="1" cost="fixed"/>
   </spell>
-  <spell name="reelingarrows" type="common" rank="5" level="5" index="36" variable="true" combat="1">
+  <spell name="reelingarrows" rank="5" level="5" index="36" variable="true" combat="1">
     <!-- Wirbelwind -->
     <resource name="aura" amount="15" cost="fixed"/>
   </spell>
-  <spell name="antimagiczone" type="common" rank="2" level="5" index="37" far="true" variable="true">
+  <spell name="antimagiczone" rank="2" level="5" index="37" far="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="steal_aura" type="common" rank="3" level="6" index="40" parameters="u" los="true" far="true" variable="true">
+  <spell name="steal_aura" rank="3" level="6" index="40" parameters="u" los="true" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="auraleak" type="common" rank="3" level="9" index="42">
+  <spell name="auraleak" rank="3" level="9" index="42">
     <resource name="aura" amount="35" cost="fixed"/>
     <resource name="dragonblood" amount="1" cost="fixed"/>
   </spell>
-  <spell name="strongwall" type="common" rank="5" level="8" index="44" variable="true" combat="1">
+  <spell name="strongwall" rank="5" level="8" index="44" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="homestone" type="common" rank="5" level="7" index="45">
+  <spell name="homestone" rank="5" level="7" index="45">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="forestfire" type="common" rank="5" level="10" index="47" far="true">
+  <spell name="forestfire" rank="5" level="10" index="47" far="true">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="oil" amount="5" cost="fixed"/>
   </spell>
-  <spell name="appeasement" type="common" rank="5" level="1" index="51" variable="true" combat="1">
+  <spell name="appeasement" rank="5" level="1" index="51" variable="true" combat="1">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="ironkeeper" type="common" rank="5" level="3" index="54" far="true" variable="true">
+  <spell name="ironkeeper" rank="5" level="3" index="54" far="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="airship" type="common" rank="5" level="6" index="57" parameters="s" ship="true">
+  <spell name="airship" rank="5" level="6" index="57" parameters="s" ship="true">
     <resource name="aura" amount="10" cost="fixed"/>
     <resource name="h12" amount="1" cost="fixed"/>
     <resource name="h20" amount="1" cost="fixed"/>
   </spell>
-  <spell name="sound_out" type="common" rank="5" level="7" index="74" parameters="ur" los="true">
+  <spell name="sound_out" rank="5" level="7" index="74" parameters="ur" los="true">
     <resource name="aura" amount="4" cost="fixed"/>
     <resource name="money" amount="100" cost="fixed"/>
   </spell>
-  <spell name="combat_speed" type="common" rank="5" level="9" index="79" variable="true" combat="1">
+  <spell name="combat_speed" rank="5" level="9" index="79" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="double_time" type="common" rank="5" level="11" index="80" parameters="u+" los="true" ship="true" variable="true">
+  <spell name="double_time" rank="5" level="11" index="80" parameters="u+" los="true" ship="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="magicstreet" type="common" rank="5" level="4" index="84" ship="true" far="true" variable="true">
+  <spell name="magicstreet" rank="5" level="4" index="84" ship="true" far="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
     <resource name="stone" amount="1" cost="fixed"/>
     <resource name="log" amount="1" cost="fixed"/>
   </spell>
-  <spell name="sacrifice_strength" type="common" rank="1" level="15" index="88" syntax="aura" parameters="ui">
+  <spell name="sacrifice_strength" rank="1" level="15" index="88" syntax="aura" parameters="ui">
     <resource name="aura" amount="100" cost="fixed"/>
   </spell>
-  <spell name="resist_magic" type="common" rank="2" level="3" index="97" parameters="u+" los="true" ship="true" variable="true">
+  <spell name="resist_magic" rank="2" level="3" index="97" parameters="u+" los="true" ship="true" variable="true">
     <!-- Schutzzauber -->
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="protective_runes" type="common" rank="2" level="8" index="99" parameters="kc" ship="true">
+  <spell name="protective_runes" rank="2" level="8" index="99" parameters="kc" ship="true">
     <resource name="aura" amount="20" cost="fixed"/>
   </spell>
-  <spell name="analyze_magic" type="common" rank="5" level="1" index="102" parameters="kc?" los="true" ship="true" variable="true">
+  <spell name="analyze_magic" rank="5" level="1" index="102" parameters="kc?" los="true" ship="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="destroy_magic" type="common" rank="2" level="5" index="106" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="destroy_magic" rank="2" level="5" index="106" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="break_curse" type="common" rank="3" level="7" index="107" syntax="spellid" parameters="kcc?" los="true" ship="true" far="true" variable="true">
+  <spell name="break_curse" rank="3" level="7" index="107" syntax="spellid" parameters="kcc?" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="fish_shield" type="common" rank="2" level="8" index="109" variable="true" combat="1">
+  <spell name="fish_shield" rank="2" level="8" index="109" variable="true" combat="1">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="armor_shield" type="common" rank="2" level="12" index="110" variable="true" combat="1">
+  <spell name="armor_shield" rank="2" level="12" index="110" variable="true" combat="1">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="living_rock" type="common" rank="5" level="13" index="116" syntax="direction" parameters="bc" variable="true">
+  <spell name="living_rock" rank="5" level="13" index="116" syntax="direction" parameters="bc" variable="true">
     <resource name="aura" amount="10" cost="level"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="laen" amount="5" cost="fixed"/>
   </spell>
-  <spell name="summon_familiar" type="common" rank="5" level="9" index="118">
+  <spell name="summon_familiar" rank="5" level="9" index="118">
     <function name="cast" value="cast_familiar"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
-  <spell name="draigfumbleshield" type="common" rank="2" level="9" index="143" variable="true" combat="1">
+  <spell name="draigfumbleshield" rank="2" level="9" index="143" variable="true" combat="1">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="gwyrrdfumbleshield" type="common" rank="2" level="5" index="144" variable="true" combat="1">
+  <spell name="gwyrrdfumbleshield" rank="2" level="5" index="144" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="cerrdorfumbleshield" type="common" rank="2" level="5" index="145" variable="true" combat="1">
+  <spell name="cerrdorfumbleshield" rank="2" level="5" index="145" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="tybiedfumbleshield" type="common" rank="2" level="2" index="146" variable="true" combat="1">
+  <spell name="tybiedfumbleshield" rank="2" level="2" index="146" variable="true" combat="1">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="concealing_aura" type="common" rank="5" level="1" index="150" parameters="u" ship="true" variable="true">
+  <spell name="concealing_aura" rank="5" level="1" index="150" parameters="u" ship="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="shockwave" type="common" rank="5" level="5" index="163" variable="true" combat="2">
+  <spell name="shockwave" rank="5" level="5" index="163" variable="true" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="eternal_walls" type="common" rank="5" level="7" index="167" parameters="b" ship="true" variable="true">
+  <spell name="eternal_walls" rank="5" level="7" index="167" parameters="b" ship="true" variable="true">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
   <!-- end common spells -->
 
   <!-- gray spells: given to individuals or monsters -->
-  <spell name="fiery_dragonbreath" type="gray" rank="5" level="3" index="81" combat="2">
+  <spell name="fiery_dragonbreath" rank="5" index="81" combat="2">
     <resource name="aura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="icy_dragonbreath" type="gray" rank="5" level="6" index="82" combat="2">
+  <spell name="icy_dragonbreath" rank="5" index="82" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="powerful_dragonbreath" type="gray" rank="5" level="12" index="83" combat="2">
+  <spell name="powerful_dragonbreath" rank="5" index="83" combat="2">
     <resource name="aura" amount="3" cost="fixed"/>
   </spell>
-  <spell name="meteor_rain" type="gray" rank="5" level="3" index="108" variable="true" combat="2">
+  <spell name="meteor_rain" rank="5" level="3" index="108" variable="true" combat="2">
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="wyrm_transformation" type="gray" rank="5" level="1" index="166">
+  <spell name="wyrm_transformation" rank="5" level="1" index="166">
     <resource name="aura" amount="1" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="transferauratraum" type="gray" rank="1" level="3" index="30" syntax="aura" parameters="ui" ship="true">
+  <spell name="transferauratraum" rank="1" level="3" index="30" syntax="aura" parameters="ui" ship="true">
     <!-- Traum der Magie -->
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="drain_skills" type="gray" rank="5" level="12" index="174" combat="2">
+  <spell name="drain_skills" rank="5" index="174" combat="2">
     <resource name="aura" amount="4" cost="fixed"/>
   </spell>
-  <spell name="aura_of_fear" type="gray" rank="5" level="12" index="175" combat="2">
+  <spell name="aura_of_fear" rank="5" index="175" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="shadowcall" type="gray" rank="5" level="12" index="176" combat="1">
+  <spell name="shadowcall" rank="5" level="12" index="176" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="immolation" type="gray" rank="5" level="12" index="180" combat="2">
+  <spell name="immolation" rank="5" level="12" index="180" combat="2">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="firestorm" type="gray" rank="5" level="8" index="181" combat="2">
+  <spell name="firestorm" rank="5" level="8" index="181" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="coldfront" type="gray" rank="5" level="8" index="182" combat="2">
+  <spell name="coldfront" rank="5" level="8" index="182" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="acidrain" type="gray" rank="5" level="8" index="183" combat="2">
+  <spell name="acidrain" rank="5" level="8" index="183" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
   <!-- end gray spells -->
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index cf529821d..d34d2bb28 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -305,7 +305,7 @@
     <attack type="4" damage="1d4"/>
     <attack type="4" damage="1d4"/>
     <attack type="1" damage="1d4"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
   </race>
   <race name="ghost" magres="0.800000" maxaura="0.500000" regaura="0.100000" recruitcost="50" weight="500" capacity="540" speed="1.000000" hp="30" ac="5" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="8" scarepeasants="yes" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes" invinciblenonmagic="yes">
     <ai splitsize="5000"/>
@@ -460,7 +460,7 @@
     <attack type="4" damage="2d4"/>
     <attack type="4" damage="2d4"/>
     <attack type="4" damage="2d4"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
   </race>
   <race name="rat" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" weight="100" capacity="540" speed="1.000000" hp="10" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="9999"/>
@@ -743,7 +743,7 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
-    <attack type="6" spell="powerful_dragonbreath"/>
+    <attack type="6" spell="powerful_dragonbreath" level="12" />
   </race>
   <race name="dragon" magres="0.700000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" giveitem="yes" resistbash="yes">
     <ai splitsize="2" killpeasants="yes" learn="yes"/>
@@ -756,7 +756,7 @@
     <attack type="4" damage="2d20"/>
     <attack type="4" damage="2d20"/>
     <attack type="4" damage="3d30"/>
-    <attack type="6" spell="icy_dragonbreath"/>
+    <attack type="6" spell="icy_dragonbreath" level="6" />
   </race>
   <race name="youngdragon" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="10000" weight="20000" capacity="10000" speed="1.000000" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="6" killpeasants="yes" learn="yes"/>
@@ -770,7 +770,7 @@
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
   </race>
   <race name="illusion" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" weight="0" capacity="0" speed="1.000000" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" walk="yes" canlearn="no" teach="no" noweapons="yes" illusionary="yes">
     <ai splitsize="999999"/>
@@ -1178,7 +1178,7 @@
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
+    <attack type="6" spell="fiery_dragonbreath" level="3" />
     <attack type="8" damage="1d10"/>
   </race>
   <race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
@@ -1341,8 +1341,8 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
-    <attack type="6" spell="drain_skills"/>
-    <attack type="6" spell="aura_of_fear"/>
+    <attack type="6" spell="drain_skills" level="12"/>
+    <attack type="6" spell="aura_of_fear" level="12"/>
     <precombatspell spell="shadowcall"/>
   </race>
   <race name="shadowbat" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="500" capacity="540" speed="1.000000" hp="1" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes">
diff --git a/res/eressea/spells.xml b/res/eressea/spells.xml
index 4d606ac58..ad299fdb9 100644
--- a/res/eressea/spells.xml
+++ b/res/eressea/spells.xml
@@ -23,345 +23,345 @@
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true" combat="2">
+  <spell name="fireball" rank="5" level="2" index="4" variable="true" combat="2">
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="hail" type="gwyrrd" rank="5" level="3" index="5" variable="true" combat="2">
+  <spell name="hail" rank="5" level="3" index="5" variable="true" combat="2">
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="rustweapon" type="gwyrrd" rank="5" level="3" index="6" parameters="u+" los="true" far="true" variable="true">
+  <spell name="rustweapon" rank="5" level="3" index="6" parameters="u+" los="true" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="combatrust" type="draig" rank="5" level="6" index="7" variable="true" combat="2">
+  <spell name="combatrust" rank="5" level="6" index="7" variable="true" combat="2">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="treegrow" type="gwyrrd" rank="5" level="2" index="8" far="true" variable="true">
+  <spell name="treegrow" rank="5" level="2" index="8" far="true" variable="true">
     <resource name="aura" amount="4" cost="level"/>
     <resource name="log" amount="1" cost="level"/>
     <resource name="p2" amount="1" cost="fixed"/>
   </spell>
-  <spell name="healing" type="gwyrrd" rank="5" level="5" index="9" variable="true" combat="3">
+  <spell name="healing" rank="5" level="5" index="9" variable="true" combat="3">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="song_of_healing" type="cerddor" rank="5" level="2" index="10" variable="true" combat="3">
+  <spell name="song_of_healing" rank="5" level="2" index="10" variable="true" combat="3">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="bad_dreams" type="illaun" rank="5" level="10" index="11" far="true">
+  <spell name="bad_dreams" rank="5" level="10" index="11" far="true">
     <resource name="aura" amount="90" cost="fixed"/>
   </spell>
-  <spell name="gooddreams" type="illaun" rank="5" level="8" index="12" far="true">
+  <spell name="gooddreams" rank="5" level="8" index="12" far="true">
     <resource name="aura" amount="80" cost="fixed"/>
   </spell>
-  <spell name="dreamreading" type="illaun" rank="5" level="4" index="13" parameters="u" far="true">
+  <spell name="dreamreading" rank="5" level="4" index="13" parameters="u" far="true">
     <resource name="aura" amount="8" cost="fixed"/>
   </spell>
-  <spell name="tiredsoldiers" type="illaun" rank="5" level="4" index="15" variable="true" combat="1">
+  <spell name="tiredsoldiers" rank="5" level="4" index="15" variable="true" combat="1">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="plague" type="draig" rank="5" level="7" index="16" far="true">
+  <spell name="plague" rank="5" level="7" index="16" far="true">
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="peasant" amount="50" cost="fixed"/>
   </spell>
-  <spell name="magicboost" type="draig" rank="3" level="3" index="17" ship="true">
+  <spell name="magicboost" rank="3" level="3" index="17" ship="true">
     <resource name="aura" amount="2" cost="linear"/>
   </spell>
-  <spell name="chaosrow" type="draig" rank="5" level="8" index="18" variable="true" combat="1">
+  <spell name="chaosrow" rank="5" level="8" index="18" variable="true" combat="1">
     <resource name="aura" amount="3" cost="level"/>
     <resource name="peasant" amount="10" cost="fixed"/>
   </spell>
-  <spell name="song_of_confusion" type="cerddor" rank="5" level="4" index="19" variable="true" combat="1">
+  <spell name="song_of_confusion" rank="5" level="4" index="19" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="flee" type="illaun" rank="5" level="2" index="20" variable="true" combat="1">
+  <spell name="flee" rank="5" level="2" index="20" variable="true" combat="1">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="song_of_fear" type="cerddor" rank="5" level="3" index="21" variable="true" combat="2">
+  <spell name="song_of_fear" rank="5" level="3" index="21" variable="true" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="berserk" type="draig" rank="4" level="5" index="22" variable="true" combat="1">
+  <spell name="berserk" rank="4" level="5" index="22" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
     <resource name="peasant" amount="1" cost="fixed"/>
   </spell>
-  <spell name="bloodthirst" type="cerddor" rank="4" level="7" index="23" variable="true" combat="1">
+  <spell name="bloodthirst" rank="4" level="7" index="23" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="maelstrom" type="gwyrrd" rank="5" level="15" index="24" ship="true" ocean="true">
+  <spell name="maelstrom" rank="5" level="15" index="24" ship="true" ocean="true">
     <resource name="aura" amount="200" cost="fixed"/>
     <resource name="seaserpenthead" amount="1" cost="fixed"/>
   </spell>
-  <spell name="transferauradruide" type="gwyrrd" rank="1" level="6" index="27" syntax="aura" parameters="ui" ship="true">
+  <spell name="transferauradruide" rank="1" level="6" index="27" syntax="aura" parameters="ui" ship="true">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="transfer_aura_song" type="cerddor" rank="1" level="5" index="28" syntax="aura" parameters="ui" ship="true">
+  <spell name="transfer_aura_song" rank="1" level="5" index="28" syntax="aura" parameters="ui" ship="true">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="transferaurachaos" type="draig" rank="1" level="7" index="29" syntax="aura" parameters="ui" ship="true">
+  <spell name="transferaurachaos" rank="1" level="7" index="29" syntax="aura" parameters="ui" ship="true">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="transferauratraum" type="illaun" rank="1" level="3" index="30" syntax="aura" parameters="ui" ship="true">
+  <spell name="transferauratraum" rank="1" level="3" index="30" syntax="aura" parameters="ui" ship="true">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="auratransfer" type="tybied" rank="1" level="5" index="31" syntax="aura" parameters="ui" ship="true">
+  <spell name="auratransfer" rank="1" level="5" index="31" syntax="aura" parameters="ui" ship="true">
     <resource name="aura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="stonegolem" type="gwyrrd" rank="4" level="1" index="32" variable="true">
+  <spell name="stonegolem" rank="4" level="1" index="32" variable="true">
     <resource name="aura" amount="2" cost="level"/>
     <resource name="stone" amount="1" cost="level"/>
     <resource name="p2" amount="1" cost="fixed"/>
   </spell>
-  <spell name="irongolem" type="gwyrrd" rank="4" level="2" index="33" variable="true">
+  <spell name="irongolem" rank="4" level="2" index="33" variable="true">
     <resource name="aura" amount="2" cost="level"/>
     <resource name="iron" amount="1" cost="level"/>
     <resource name="p2" amount="1" cost="fixed"/>
   </spell>
-  <spell name="summonshadow" type="draig" rank="5" level="8" index="34" variable="true">
+  <spell name="summonshadow" rank="5" level="8" index="34" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="summonshadowlords" type="draig" rank="5" level="12" index="35" variable="true">
+  <spell name="summonshadowlords" rank="5" level="12" index="35" variable="true">
     <resource name="aura" amount="7" cost="level"/>
   </spell>
-  <spell name="reelingarrows" type="gwyrrd" rank="5" level="5" index="36" variable="true" combat="1">
+  <spell name="reelingarrows" rank="5" level="5" index="36" variable="true" combat="1">
     <resource name="aura" amount="15" cost="fixed"/>
   </spell>
-  <spell name="antimagiczone" type="tybied" rank="2" level="5" index="37" far="true" variable="true">
+  <spell name="antimagiczone" rank="2" level="5" index="37" far="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="cold_protection" type="gwyrrd" rank="5" level="3" index="39" parameters="u+" los="true" ship="true" variable="true">
+  <spell name="cold_protection" rank="5" level="3" index="39" parameters="u+" los="true" ship="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="steal_aura" type="tybied" rank="3" level="6" index="40" parameters="u" los="true" far="true" variable="true">
+  <spell name="steal_aura" rank="3" level="6" index="40" parameters="u" los="true" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="summonundead" type="draig" rank="5" level="6" index="41" ship="true" far="true" variable="true">
+  <spell name="summonundead" rank="5" level="6" index="41" ship="true" far="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="auraleak" type="draig" rank="3" level="9" index="42">
+  <spell name="auraleak" rank="3" level="9" index="42">
     <resource name="aura" amount="35" cost="fixed"/>
     <resource name="dragonblood" amount="1" cost="fixed"/>
   </spell>
-  <spell name="great_drought" type="gwyrrd" rank="5" level="17" index="43" far="true">
+  <spell name="great_drought" rank="5" level="17" index="43" far="true">
     <resource name="aura" amount="800" cost="fixed"/>
   </spell>
-  <spell name="strongwall" type="gwyrrd" rank="5" level="8" index="44" variable="true" combat="1">
+  <spell name="strongwall" rank="5" level="8" index="44" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="homestone" type="gwyrrd" rank="5" level="7" index="45">
+  <spell name="homestone" rank="5" level="7" index="45">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="summonfireelemental" type="gwyrrd" rank="5" level="13" index="46" far="true">
+  <spell name="summonfireelemental" rank="5" level="13" index="46" far="true">
     <resource name="aura" amount="600" cost="fixed"/>
   </spell>
-  <spell name="forestfire" type="draig" rank="5" level="10" index="47" far="true">
+  <spell name="forestfire" rank="5" level="10" index="47" far="true">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="oil" amount="1" cost="fixed"/>
   </spell>
-  <spell name="summonent" type="gwyrrd" rank="5" level="10" index="49" variable="true">
+  <spell name="summonent" rank="5" level="10" index="49" variable="true">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="disturbingdreams" type="illaun" rank="5" level="6" index="50" far="true">
+  <spell name="disturbingdreams" rank="5" level="6" index="50" far="true">
     <resource name="aura" amount="18" cost="fixed"/>
   </spell>
-  <spell name="appeasement" type="cerddor" rank="5" level="1" index="51" variable="true" combat="1">
+  <spell name="appeasement" rank="5" level="1" index="51" variable="true" combat="1">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="sleep" type="illaun" rank="5" level="7" index="52" variable="true" combat="2">
+  <spell name="sleep" rank="5" level="7" index="52" variable="true" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="earthquake" type="gwyrrd" rank="5" level="6" index="53" far="true">
+  <spell name="earthquake" rank="5" level="6" index="53" far="true">
     <resource name="aura" amount="25" cost="fixed"/>
     <resource name="laen" amount="2" cost="fixed"/>
   </spell>
-  <spell name="ironkeeper" type="gwyrrd" rank="5" level="3" index="54" far="true" variable="true">
+  <spell name="ironkeeper" rank="5" level="3" index="54" far="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="stormwinds" type="gwyrrd" rank="5" level="6" index="55" parameters="s+" ship="true" ocean="true" variable="true">
+  <spell name="stormwinds" rank="5" level="6" index="55" parameters="s+" ship="true" ocean="true" variable="true">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="goodwinds" type="gwyrrd" rank="5" level="4" index="56" parameters="s" ship="true" variable="true">
+  <spell name="goodwinds" rank="5" level="4" index="56" parameters="s" ship="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="airship" type="tybied" rank="5" level="6" index="57" parameters="s" ship="true">
+  <spell name="airship" rank="5" level="6" index="57" parameters="s" ship="true">
     <resource name="aura" amount="10" cost="fixed"/>
     <resource name="h12" amount="1" cost="fixed"/>
     <resource name="h20" amount="1" cost="fixed"/>
   </spell>
-  <spell name="summon_alp" type="illaun" rank="5" level="15" index="58" parameters="u" target_global="true">
+  <spell name="summon_alp" rank="5" level="15" index="58" parameters="u" target_global="true">
     <resource name="aura" amount="350" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
     <resource name="h8" amount="1" cost="fixed"/>
   </spell>
-  <spell name="windshield" type="gwyrrd" rank="5" level="4" index="59" variable="true" combat="1">
+  <spell name="windshield" rank="5" level="4" index="59" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="raise_mob" type="cerddor" rank="5" level="10" index="60" variable="true">
+  <spell name="raise_mob" rank="5" level="10" index="60" variable="true">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="melancholy" type="cerddor" rank="5" level="11" index="61" far="true">
+  <spell name="melancholy" rank="5" level="11" index="61" far="true">
     <resource name="aura" amount="40" cost="fixed"/>
   </spell>
-  <spell name="headache" type="cerddor" rank="5" level="7" index="62" parameters="u" los="true">
+  <spell name="headache" rank="5" level="7" index="62" parameters="u" los="true">
     <resource name="aura" amount="4" cost="linear"/>
     <resource name="h7" amount="3" cost="fixed"/>
     <resource name="money" amount="50" cost="fixed"/>
   </spell>
-  <spell name="enterastral" type="tybied" rank="7" level="4" index="64" parameters="u+" variable="true">
+  <spell name="enterastral" rank="7" level="4" index="64" parameters="u+" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="leaveastral" type="tybied" rank="7" level="4" index="65" parameters="ru+" variable="true">
+  <spell name="leaveastral" rank="7" level="4" index="65" parameters="ru+" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="versteinern" type="gwyrrd" rank="5" level="8" index="67" variable="true" combat="2">
+  <spell name="versteinern" rank="5" level="8" index="67" variable="true" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="treewalkenter" type="gwyrrd" rank="7" level="9" index="68" parameters="u+" los="true" variable="true">
+  <spell name="treewalkenter" rank="7" level="9" index="68" parameters="u+" los="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="treewalkexit" type="gwyrrd" rank="7" level="9" index="69" parameters="ru+" los="true" variable="true">
+  <spell name="treewalkexit" rank="7" level="9" index="69" parameters="ru+" los="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="chaossuction" type="draig" rank="5" level="14" index="70">
+  <spell name="chaossuction" rank="5" level="14" index="70">
     <resource name="aura" amount="150" cost="fixed"/>
     <resource name="peasant" amount="200" cost="fixed"/>
   </spell>
-  <spell name="view_reality" type="tybied" rank="5" level="10" index="71">
+  <spell name="view_reality" rank="5" level="10" index="71">
     <resource name="aura" amount="40" cost="fixed"/>
   </spell>
-  <spell name="astral_disruption" type="tybied" rank="4" level="14" index="72" variable="true">
+  <spell name="astral_disruption" rank="4" level="14" index="72" variable="true">
     <resource name="aura" amount="140" cost="fixed"/>
   </spell>
-  <spell name="seduction" type="cerddor" rank="5" level="6" index="73" parameters="u" los="true">
+  <spell name="seduction" rank="5" level="6" index="73" parameters="u" los="true">
     <resource name="aura" amount="12" cost="fixed"/>
   </spell>
-  <spell name="sound_out" type="cerddor" rank="5" level="7" index="74" parameters="ur" los="true">
+  <spell name="sound_out" rank="5" level="7" index="74" parameters="ur" los="true">
     <resource name="aura" amount="4" cost="fixed"/>
     <resource name="money" amount="100" cost="fixed"/>
   </spell>
-  <spell name="calm_monster" type="cerddor" rank="5" level="6" index="75" parameters="u" los="true" ship="true">
+  <spell name="calm_monster" rank="5" level="6" index="75" parameters="u" los="true" ship="true">
     <resource name="aura" amount="15" cost="fixed"/>
   </spell>
-  <spell name="heroic_song" type="cerddor" rank="4" level="5" index="76" variable="true" combat="1">
+  <spell name="heroic_song" rank="4" level="5" index="76" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="frighten" type="cerddor" rank="5" level="8" index="77" variable="true" combat="1">
+  <spell name="frighten" rank="5" level="8" index="77" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="mindblast" type="illaun" rank="5" level="11" index="78" variable="true" combat="1">
+  <spell name="mindblast" rank="5" level="11" index="78" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="combat_speed" type="tybied" rank="5" level="9" index="79" variable="true" combat="1">
+  <spell name="combat_speed" rank="5" level="9" index="79" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="double_time" type="tybied" rank="5" level="11" index="80" parameters="u+" los="true" ship="true" variable="true">
+  <spell name="double_time" rank="5" level="11" index="80" parameters="u+" los="true" ship="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="fiery_dragonbreath" type="gray" rank="5" level="3" index="81" combat="2">
+  <spell name="fiery_dragonbreath" rank="5" index="81" combat="2">
     <resource name="aura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="icy_dragonbreath" type="gray" rank="5" level="6" index="82" combat="2">
+  <spell name="icy_dragonbreath" rank="5" index="82" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="powerful_dragonbreath" type="gray" rank="5" level="12" index="83" combat="2">
+  <spell name="powerful_dragonbreath" rank="5" index="83" combat="2">
     <resource name="aura" amount="3" cost="fixed"/>
   </spell>
-  <spell name="magicstreet" type="gwyrrd" rank="5" level="4" index="84" ship="true" far="true" variable="true">
+  <spell name="magicstreet" rank="5" level="4" index="84" ship="true" far="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
     <resource name="stone" amount="1" cost="fixed"/>
     <resource name="log" amount="1" cost="fixed"/>
   </spell>
-  <spell name="reanimate" type="illaun" rank="4" level="5" index="85" variable="true" combat="3">
+  <spell name="reanimate" rank="4" level="5" index="85" variable="true" combat="3">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="courting" type="cerddor" rank="5" level="4" index="86" variable="true">
+  <spell name="courting" rank="5" level="4" index="86" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="generous" type="cerddor" rank="5" level="2" index="87" ship="true" far="true" variable="true">
+  <spell name="generous" rank="5" level="2" index="87" ship="true" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="sacrifice_strength" type="tybied" rank="1" level="15" index="88" syntax="aura" parameters="ui">
+  <spell name="sacrifice_strength" rank="1" level="15" index="88" syntax="aura" parameters="ui">
     <resource name="aura" amount="100" cost="fixed"/>
   </spell>
-  <spell name="song_of_peace" type="cerddor" rank="5" level="12" index="89" variable="true">
+  <spell name="song_of_peace" rank="5" level="12" index="89" variable="true">
     <resource name="aura" amount="20" cost="level"/>
   </spell>
-  <spell name="migration" type="cerddor" rank="5" level="9" index="90" parameters="u" los="true" variable="true">
+  <spell name="migration" rank="5" level="9" index="90" parameters="u" los="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
     <resource name="permaura" amount="1" cost="level"/>
   </spell>
-  <spell name="calm_riot" type="cerddor" rank="5" level="15" index="91" far="true">
+  <spell name="calm_riot" rank="5" level="15" index="91" far="true">
     <resource name="aura" amount="30" cost="fixed"/>
   </spell>
-  <spell name="incite_riot" type="cerddor" rank="5" level="16" index="92" far="true">
+  <spell name="incite_riot" rank="5" level="16" index="92" far="true">
     <resource name="aura" amount="40" cost="fixed"/>
   </spell>
-  <spell name="shapeshift" type="illaun" rank="5" level="3" index="93" syntax="race" parameters="uc" variable="true">
+  <spell name="shapeshift" rank="5" level="3" index="93" syntax="race" parameters="uc" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="wolfhowl" type="gwyrrd" rank="5" level="7" index="94" variable="true" combat="1">
+  <spell name="wolfhowl" rank="5" level="7" index="94" variable="true" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="resist_magic" type="tybied" rank="2" level="3" index="97" parameters="u+" los="true" ship="true" variable="true">
+  <spell name="resist_magic" rank="2" level="3" index="97" parameters="u+" los="true" ship="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="keeploot" type="tybied" rank="5" level="3" index="98" variable="true" combat="3">
+  <spell name="keeploot" rank="5" level="3" index="98" variable="true" combat="3">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="protective_runes" type="tybied" rank="2" level="8" index="99" parameters="kc" ship="true">
+  <spell name="protective_runes" rank="2" level="8" index="99" parameters="kc" ship="true">
     <resource name="aura" amount="20" cost="fixed"/>
   </spell>
-  <spell name="song_resist_magic" type="cerddor" rank="2" level="10" index="100" far="true" variable="true">
+  <spell name="song_resist_magic" rank="2" level="10" index="100" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="song_suscept_magic" type="cerddor" rank="2" level="12" index="101" far="true" variable="true">
+  <spell name="song_suscept_magic" rank="2" level="12" index="101" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="analyze_magic" type="tybied" rank="5" level="1" index="102" parameters="kc+" los="true" ship="true" variable="true">
+  <spell name="analyze_magic" rank="5" level="1" index="102" parameters="kc+" los="true" ship="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="analysedream" type="illaun" rank="5" level="5" index="103" parameters="u" los="true" ship="true">
+  <spell name="analysedream" rank="5" level="5" index="103" parameters="u" los="true" ship="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="analysesong_unit" type="cerddor" rank="5" level="5" index="104" parameters="u" los="true" ship="true">
+  <spell name="analysesong_unit" rank="5" level="5" index="104" parameters="u" los="true" ship="true">
     <resource name="aura" amount="10" cost="fixed"/>
   </spell>
-  <spell name="analyse_object" type="cerddor" rank="5" level="8" index="105" parameters="kc+" ship="true" variable="true">
+  <spell name="analyse_object" rank="5" level="8" index="105" parameters="kc+" ship="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="destroy_magic" type="tybied" rank="2" level="5" index="106" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="destroy_magic" rank="2" level="5" index="106" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="break_curse" type="tybied" rank="3" level="7" index="107" syntax="spellid" parameters="kcc?" los="true" ship="true" far="true" variable="true">
+  <spell name="break_curse" rank="3" level="7" index="107" syntax="spellid" parameters="kcc?" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="meteor_rain" type="gray" rank="5" level="3" index="108" variable="true" combat="2">
+  <spell name="meteor_rain" rank="5" level="3" index="108" variable="true" combat="2">
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="fish_shield" type="tybied" rank="2" level="8" index="109" variable="true" combat="1">
+  <spell name="fish_shield" rank="2" level="8" index="109" variable="true" combat="1">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="armor_shield" type="tybied" rank="2" level="12" index="110" variable="true" combat="1">
+  <spell name="armor_shield" rank="2" level="12" index="110" variable="true" combat="1">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="deathcloud" type="draig" rank="5" level="11" index="111" far="true">
+  <spell name="deathcloud" rank="5" level="11" index="111" far="true">
     <resource name="aura" amount="40" cost="fixed"/>
     <resource name="hp" amount="15" cost="fixed"/>
   </spell>
-  <spell name="orkdream" type="illaun" rank="5" level="12" index="112" parameters="u+" los="true" variable="true">
+  <spell name="orkdream" rank="5" level="12" index="112" parameters="u+" los="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="summondragon" type="draig" rank="5" level="11" index="113" far="true">
+  <spell name="summondragon" rank="5" level="11" index="113" far="true">
     <resource name="aura" amount="80" cost="fixed"/>
     <resource name="dragonhead" amount="1" cost="fixed"/>
   </spell>
-  <spell name="living_rock" type="tybied" rank="5" level="13" index="116" syntax="direction" parameters="bc" variable="true">
+  <spell name="living_rock" rank="5" level="13" index="116" syntax="direction" parameters="bc" variable="true">
     <resource name="aura" amount="10" cost="level"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="laen" amount="5" cost="fixed"/>
   </spell>
-  <spell name="blessstonecircle" type="gwyrrd" rank="5" level="11" index="117" parameters="b">
+  <spell name="blessstonecircle" rank="5" level="11" index="117" parameters="b">
     <resource name="aura" amount="350" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
@@ -370,143 +370,143 @@
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
-  <spell name="song_of_slavery" type="cerddor" rank="5" level="13" index="123" parameters="u" los="true">
+  <spell name="song_of_slavery" rank="5" level="13" index="123" parameters="u" los="true">
     <resource name="aura" amount="40" cost="fixed"/>
   </spell>
-  <spell name="fumblecurse" type="draig" rank="4" level="5" index="136" parameters="u" los="true" variable="true">
+  <spell name="fumblecurse" rank="4" level="5" index="136" parameters="u" los="true" variable="true">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="icastle" type="illaun" rank="5" level="3" index="137" syntax="buildingtype" parameters="c">
+  <spell name="icastle" rank="5" level="3" index="137" syntax="buildingtype" parameters="c">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="gwyrrddestroymagic" type="gwyrrd" rank="2" level="8" index="138" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="gwyrrddestroymagic" rank="2" level="8" index="138" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="draigdestroymagic" type="draig" rank="2" level="10" index="139" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="draigdestroymagic" rank="2" level="10" index="139" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="10" cost="level"/>
   </spell>
-  <spell name="illaundestroymagic" type="illaun" rank="2" level="8" index="140" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="illaundestroymagic" rank="2" level="8" index="140" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="cerddor_destroymagic" type="cerddor" rank="2" level="8" index="141" parameters="kc+" los="true" ship="true" far="true" variable="true">
+  <spell name="cerddor_destroymagic" rank="2" level="8" index="141" parameters="kc+" los="true" ship="true" far="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="barkskin" type="gwyrrd" rank="2" level="12" index="142" variable="true" combat="1">
+  <spell name="barkskin" rank="2" level="12" index="142" variable="true" combat="1">
     <resource name="aura" amount="4" cost="level"/>
   </spell>
-  <spell name="draigfumbleshield" type="draig" rank="2" level="9" index="143" variable="true" combat="1">
+  <spell name="draigfumbleshield" rank="2" level="9" index="143" variable="true" combat="1">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="gwyrrdfumbleshield" type="gwyrrd" rank="2" level="5" index="144" variable="true" combat="1">
+  <spell name="gwyrrdfumbleshield" rank="2" level="5" index="144" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="cerrdorfumbleshield" type="cerddor" rank="2" level="5" index="145" variable="true" combat="1">
+  <spell name="cerrdorfumbleshield" rank="2" level="5" index="145" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="tybiedfumbleshield" type="tybied" rank="2" level="2" index="146" variable="true" combat="1">
+  <spell name="tybiedfumbleshield" rank="2" level="2" index="146" variable="true" combat="1">
     <resource name="aura" amount="3" cost="level"/>
   </spell>
-  <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true" combat="1">
+  <spell name="shadowknights" rank="4" level="1" index="147" variable="true" combat="1">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="concealing_aura" type="tybied" rank="5" level="1" index="150" parameters="u" ship="true" variable="true">
+  <spell name="concealing_aura" rank="5" level="1" index="150" parameters="u" ship="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="firewall" type="draig" rank="4" level="7" index="151" syntax="direction" parameters="c" variable="true">
+  <spell name="firewall" rank="4" level="7" index="151" syntax="direction" parameters="c" variable="true">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
-  <spell name="wisps" type="illaun" rank="5" level="7" index="152" syntax="direction" parameters="c" far="true" variable="true">
+  <spell name="wisps" rank="5" level="7" index="152" syntax="direction" parameters="c" far="true" variable="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="sparklechaos" type="draig" rank="5" level="1" index="153" parameters="u" los="true" variable="true">
+  <spell name="sparklechaos" rank="5" level="1" index="153" parameters="u" los="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="sparkledream" type="illaun" rank="5" level="1" index="154" parameters="u" los="true" ship="true" variable="true">
+  <spell name="sparkledream" rank="5" level="1" index="154" parameters="u" los="true" ship="true" variable="true">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="pull_astral" type="tybied" rank="7" level="6" index="156" parameters="ru+" variable="true" target_global="true">
+  <spell name="pull_astral" rank="7" level="6" index="156" parameters="ru+" variable="true" target_global="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="fetch_astral" type="tybied" rank="7" level="6" index="157" parameters="u+" variable="true" target_global="true">
+  <spell name="fetch_astral" rank="7" level="6" index="157" parameters="u+" variable="true" target_global="true">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="shockwave" type="tybied" rank="5" level="5" index="163" variable="true" combat="2">
+  <spell name="shockwave" rank="5" level="5" index="163" variable="true" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="undeadhero" type="draig" rank="5" level="9" index="164" variable="true" combat="3">
+  <spell name="undeadhero" rank="5" level="9" index="164" variable="true" combat="3">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="wyrm_transformation" type="gray" rank="5" level="1" index="166">
+  <spell name="wyrm_transformation" rank="5" level="1" index="166">
     <resource name="aura" amount="1" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="eternal_walls" type="tybied" rank="5" level="7" index="167" parameters="b" ship="true" variable="true">
+  <spell name="eternal_walls" rank="5" level="7" index="167" parameters="b" ship="true" variable="true">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
-  <spell name="puttorest" type="illaun" rank="5" level="2" index="168" variable="true">
+  <spell name="puttorest" rank="5" level="2" index="168" variable="true">
     <resource name="aura" amount="3" cost="level"/>
     <resource name="p2" amount="1" cost="fixed"/>
   </spell>
-  <spell name="unholypower" type="draig" rank="5" level="14" index="169" parameters="u+" los="true" variable="true">
+  <spell name="unholypower" rank="5" level="14" index="169" parameters="u+" los="true" variable="true">
     <resource name="aura" amount="10" cost="level"/>
     <resource name="peasant" amount="5" cost="level"/>
   </spell>
-  <spell name="holyground" type="gwyrrd" rank="5" level="9" index="170">
+  <spell name="holyground" rank="5" level="9" index="170">
     <resource name="aura" amount="80" cost="fixed"/>
     <resource name="permaura" amount="3" cost="fixed"/>
   </spell>
-  <spell name="bloodsacrifice" type="draig" rank="1" level="4" index="171" ship="true">
+  <spell name="bloodsacrifice" rank="1" level="4" index="171" ship="true">
     <resource name="hp" amount="4" cost="level"/>
   </spell>
-  <spell name="magic_roots" type="gwyrrd" rank="5" level="16" index="172" far="true">
+  <spell name="magic_roots" rank="5" level="16" index="172" far="true">
     <resource name="aura" amount="250" cost="fixed"/>
     <resource name="permaura" amount="10" cost="fixed"/>
     <resource name="toadslime" amount="1" cost="fixed"/>
   </spell>
-  <spell name="clone" type="illaun" rank="5" level="9" index="173">
+  <spell name="clone" rank="5" level="9" index="173">
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="20" cost="fixed"/>
     <resource name="dragonblood" amount="5" cost="fixed"/>
     <resource name="p2" amount="5" cost="fixed"/>
   </spell>
-  <spell name="drain_skills" type="gray" rank="5" level="12" index="174" combat="2">
+  <spell name="drain_skills" rank="5" index="174" combat="2">
     <resource name="aura" amount="4" cost="fixed"/>
   </spell>
-  <spell name="aura_of_fear" type="gray" rank="5" level="12" index="175" combat="2">
+  <spell name="aura_of_fear" rank="5" index="175" combat="2">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
-  <spell name="shadowcall" type="gray" rank="5" level="12" index="176" combat="1">
+  <spell name="shadowcall" rank="5" level="12" index="176" combat="1">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="mallorntreegrow" type="gwyrrd" rank="5" level="4" index="177" far="true" variable="true">
+  <spell name="mallorntreegrow" rank="5" level="4" index="177" far="true" variable="true">
     <resource name="aura" amount="6" cost="level"/>
     <resource name="mallorn" amount="1" cost="level"/>
     <resource name="p2" amount="1" cost="fixed"/>
   </spell>
-  <spell name="big_recruit" type="cerddor" rank="5" level="14" index="179" variable="true">
+  <spell name="big_recruit" rank="5" level="14" index="179" variable="true">
     <resource name="aura" amount="20" cost="level"/>
   </spell>
-  <spell name="immolation" type="gray" rank="5" level="12" index="180" combat="2">
+  <spell name="immolation" rank="5" level="12" index="180" combat="2">
     <resource name="aura" amount="2" cost="level"/>
   </spell>
-  <spell name="firestorm" type="gray" rank="5" level="8" index="181" combat="2">
+  <spell name="firestorm" rank="5" level="8" index="181" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="coldfront" type="gray" rank="5" level="8" index="182" combat="2">
+  <spell name="coldfront" rank="5" level="8" index="182" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
-  <spell name="acidrain" type="gray" rank="5" level="8" index="183" combat="2">
+  <spell name="acidrain" rank="5" level="8" index="183" combat="2">
     <resource name="aura" amount="2" cost="fixed"/>
   </spell>
 
   <!-- draig spells -->
-  <spell name="earn_silver#draig" type="draig" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#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_firesword" type="draig" ship="true" rank="5" level="12" index="148">
+  <spell name="create_firesword" ship="true" rank="5" level="12" index="148">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="p10" amount="1" cost="fixed"/>
@@ -514,25 +514,25 @@
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_trollbelt" type="draig" ship="true" rank="5" level="9" index="48">
+  <spell name="create_trollbelt" ship="true" rank="5" level="9" index="48">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
   <!-- gwyrrd spells -->
-  <spell name="blessedharvest" type="gwyrrd" rank="5" level="1" index="25" ship="true" far="true" variable="true">
+  <spell name="blessedharvest" rank="5" level="1" index="25" ship="true" far="true" variable="true">
     <!-- Segen der Erde -->
     <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="earn_silver#gwyrrd" type="gwyrrd" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#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_magicherbbag" type="gwyrrd" ship="true" rank="5" level="5" index="165">
+  <spell name="create_magicherbbag" ship="true" rank="5" level="5" index="165">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
@@ -540,18 +540,18 @@
   </spell>
 
   <!-- illaun spells -->
-  <spell name="earn_silver#illaun" type="illaun" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#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_dreameye" type="illaun" ship="true" rank="5" level="14" index="149">
+  <spell name="create_dreameye" ship="true" rank="5" level="14" index="149">
     <function name="cast" value="lua_castspell"/>
     <resource name="dragonhead" amount="1" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
 
-  <spell name="create_invisibility_sphere" type="illaun" ship="true" rank="5" level="13" index="178">
+  <spell name="create_invisibility_sphere" ship="true" rank="5" level="13" index="178">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="150" cost="fixed"/>
     <resource name="money" amount="30000" cost="fixed"/>
@@ -559,56 +559,56 @@
   </spell>
 
   <!-- cerddor spells -->
-  <spell name="raindance" type="cerddor" rank="5" level="3" index="26" ship="true" far="true" variable="true">
+  <spell name="raindance" rank="5" level="3" index="26" ship="true" far="true" variable="true">
     <!-- Segen der Erde -->
     <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="earn_silver#cerddor" type="cerddor" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#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_roqf" type="cerddor" ship="true" rank="5" level="11" index="63">
+  <spell name="create_roqf" ship="true" rank="5" level="11" index="63">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <resource name="money" amount="1000" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="blabbermouth" parameters="u" type="cerddor" los="true" rank="5" level="4" index="115">
+  <spell name="blabbermouth" parameters="u" los="true" rank="5" level="4" index="115">
     <function name="cast" value="cast_babbler"/>
     <resource name="aura" amount="10" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
 
-  <spell name="readmind" parameters="u" type="illaun" rank="5" level="7" index="114">
+  <spell name="readmind" parameters="u" rank="5" level="7" index="114">
     <function name="cast" value="cast_readmind"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
 
   <!-- tybied spells -->
-  <spell name="earn_silver#tybied" type="tybied" ship="true" variable="true" rank="5" level="1" index="159">
+  <spell name="earn_silver#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_antimagic" type="tybied" ship="true" rank="5" level="7" index="38">
+  <spell name="create_antimagic" ship="true" rank="5" level="7" index="38">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
   </spell>
 
-  <spell name="create_rop" type="tybied" ship="true" rank="5" level="9" index="1">
+  <spell name="create_rop" ship="true" rank="5" level="9" index="1">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="4000" cost="fixed"/>
   </spell>
 
-  <spell name="create_bagofholding" type="tybied" ship="true" rank="5" level="10" index="155">
+  <spell name="create_bagofholding" ship="true" rank="5" level="10" index="155">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
@@ -616,7 +616,7 @@
   </spell>
 
   <!-- gray magic -->
-  <spell name="create_runesword" type="gray" ship="true" rank="5" level="6" index="135">
+  <spell name="create_runesword" ship="true" rank="5" level="6" index="135">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
@@ -624,20 +624,20 @@
     <resource name="laensword" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_chastitybelt" type="gray" ship="true" rank="5" level="7" index="134">
+  <spell name="create_chastitybelt" ship="true" rank="5" level="7" index="134">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
   </spell>
 
-  <spell name="create_focus" type="gray" ship="true" rank="5" level="9" index="2">
+  <spell name="create_focus" ship="true" rank="5" level="9" index="2">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_ror" type="gray" ship="true" rank="5" level="9" index="3">
+  <spell name="create_ror" ship="true" rank="5" level="9" index="3">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
diff --git a/res/races/dragon.xml b/res/races/dragon.xml
index 1e508db89..ecb7e04da 100644
--- a/res/races/dragon.xml
+++ b/res/races/dragon.xml
@@ -9,6 +9,6 @@
   <attack type="4" damage="2d20"/>
   <attack type="4" damage="2d20"/>
   <attack type="4" damage="3d30"/>
-  <attack type="6" spell="icy_dragonbreath"/>
+  <attack type="6" spell="icy_dragonbreath" level="6" />
 </race>
 
diff --git a/res/races/wyrm.xml b/res/races/wyrm.xml
index 924178c25..8569f4c19 100644
--- a/res/races/wyrm.xml
+++ b/res/races/wyrm.xml
@@ -7,5 +7,5 @@
   <attack type="4" damage="3d20"/>
   <attack type="4" damage="3d20"/>
   <attack type="4" damage="5d30"/>
-  <attack type="6" spell="powerful_dragonbreath"/>
+  <attack type="6" spell="powerful_dragonbreath" level="12" />
 </race>
diff --git a/res/races/youngdragon.xml b/res/races/youngdragon.xml
index 18af1f46a..a853d874b 100644
--- a/res/races/youngdragon.xml
+++ b/res/races/youngdragon.xml
@@ -8,6 +8,6 @@
   <attack type="4" damage="1d30"/>
   <attack type="4" damage="1d30"/>
   <attack type="4" damage="1d30"/>
-  <attack type="6" spell="fiery_dragonbreath"/>
+  <attack type="6" spell="fiery_dragonbreath" level="3" />
 </race>