diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 3544ee53c..ea5553243 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -117,6 +117,10 @@ const troop no_troop = {0, 0};
 
 static int max_turns = 0;
 static int damage_rules = 0;
+static int skill_formula = 0;
+
+#define FORMULA_ORIG 0
+#define FORMULA_NEW 1
 
 #define DAMAGE_CRITICAL      (1<<0)
 #define DAMAGE_MELEE_BONUS   (1<<1)
@@ -128,6 +132,8 @@ static int damage_rules = 0;
 static void
 static_rules(void)
 {
+  /* new formula to calculate to-hit-chance */
+  skill_formula = get_param_int(global.parameters, "rules.combat.skill_formula", FORMULA_ORIG);
   /* maximum number of combat turns */
   max_turns = get_param_int(global.parameters, "rules.combat.turns", COMBAT_TURNS);
   /* damage calculation */
@@ -536,25 +542,29 @@ reportcasualties(battle * b, fighter * fig, int dead)
 static int
 contest(int skilldiff, const armor_type * ar, const armor_type * sh)
 {
-  int p, vw = BASE_CHANCE - TDIFF_CHANGE * skilldiff;
-  double mod = 1.0;
+  if (skill_formula==FORMULA_ORIG) {
+    int p, vw = BASE_CHANCE - TDIFF_CHANGE * skilldiff;
+    double mod = 1.0;
 
-  if (ar != NULL)
-    mod *= (1 + ar->penalty);
-  if (sh != NULL)
-    mod *= (1 + sh->penalty);
-  vw = (int)(100 - ((100 - vw) * mod));
+    if (ar != NULL)
+      mod *= (1 + ar->penalty);
+    if (sh != NULL)
+      mod *= (1 + sh->penalty);
+    vw = (int)(100 - ((100 - vw) * mod));
 
-  do {
-    p = rng_int() % 100;
-    vw -= p;
+    do {
+      p = rng_int() % 100;
+      vw -= p;
+    }
+    while (vw >= 0 && p >= 90);
+    return (vw <= 0);
+  } else {
+    return 1;
   }
-  while (vw >= 0 && p >= 90);
-  return (vw <= 0);
 }
 
 static boolean
-riding(const troop t) {
+is_riding(const troop t) {
   if (t.fighter->building!=NULL) return false;
   if (t.fighter->horses + t.fighter->elvenhorses > t.index) return true;
   return false;
@@ -683,9 +693,9 @@ weapon_effskill(troop t, troop enemy, const weapon * w, boolean attacking, boole
       int m;
       unsigned int flags = WMF_SKILL|(attacking?WMF_OFFENSIVE:WMF_DEFENSIVE);
 
-      if (riding(t)) flags |= WMF_RIDING;
+      if (is_riding(t)) flags |= WMF_RIDING;
       else flags |= WMF_WALKING;
-      if (riding(enemy)) flags |= WMF_AGAINST_RIDING;
+      if (is_riding(enemy)) flags |= WMF_AGAINST_RIDING;
       else flags |= WMF_AGAINST_WALKING;
 
       for (m=0;wtype->modifiers[m].value;++m) {
@@ -705,7 +715,7 @@ weapon_effskill(troop t, troop enemy, const weapon * w, boolean attacking, boole
   }
 
   /* Burgenbonus, Pferdebonus */
-  if (riding(t) && (wtype==NULL || !fval(wtype, WTF_MISSILE))) {
+  if (is_riding(t) && (wtype==NULL || !fval(wtype, WTF_MISSILE))) {
     skill += 2;
     if (wtype) skill = skillmod(urace(tu)->attribs, tu, tu->region, wtype->skill, skill, SMF_RIDING);
   }
@@ -731,7 +741,7 @@ weapon_effskill(troop t, troop enemy, const weapon * w, boolean attacking, boole
 static const armor_type *
 select_armor(troop t, boolean shield)
 {
-  int type = shield?ATF_SHIELD:0;
+  unsigned int type = shield?ATF_SHIELD:0;
   unit * u = t.fighter->unit;
   const armor * a = t.fighter->armors;
   int geschuetzt = 0;
@@ -1680,9 +1690,11 @@ skilldiff(troop at, troop dt, int dist)
 {
   fighter *af = at.fighter, *df = dt.fighter;
   unit *au = af->unit, *du = df->unit;
-  int is_protected = 0, skdiff = 0, sk;
+  int is_protected = 0, skdiff = 0;
   weapon * awp = select_weapon(at, true, dist>1);
-  weapon * dwp = select_weapon(dt, false, dist>1);
+
+  skdiff += af->person[at.index].attack;
+  skdiff -= df->person[dt.index].defence;
 
   if (df->person[dt.index].flags & FL_SLEEPING)
     skdiff += 2;
@@ -1707,8 +1719,6 @@ skilldiff(troop at, troop dt, int dist)
   /* TODO this should be a skillmod */
   skdiff += jihad(au->faction, du->race);
 #endif
-  skdiff += af->person[at.index].attack;
-  skdiff -= df->person[dt.index].defence;
 
   if (df->building) {
     boolean init = false;
@@ -1756,15 +1766,17 @@ skilldiff(troop at, troop dt, int dist)
       int w;
       for (w=0;awp->type->modifiers[w].value!=0;++w) {
         if (awp->type->modifiers[w].flags & WMF_MISSILE_TARGET) {
-                                  /* skill decreases by targeting difficulty (bow -2, catapult -4) */
+          /* skill decreases by targeting difficulty (bow -2, catapult -4) */
           skdiff -= awp->type->modifiers[w].value;
           break;
         }
       }
     }
   }
-  sk = weapon_effskill(dt, at, dwp, false, dist>1);
-  skdiff -= sk;
+  if (skill_formula==FORMULA_ORIG) {
+    weapon * dwp = select_weapon(dt, false, dist>1);
+    skdiff -= weapon_effskill(dt, at, dwp, false, dist>1);
+  }
   return skdiff;
 }
 
@@ -1814,7 +1826,7 @@ hits(troop at, troop dt, weapon * awp)
   df->person[dt.index].flags |= FL_HIT;
 
   if (af->person[at.index].flags & FL_STUNNED) {
-      af->person[at.index].flags &= ~FL_STUNNED;
+    af->person[at.index].flags &= ~FL_STUNNED;
     return 0;
   }
   if ((af->person[at.index].flags & FL_TIRED && rng_int()%100 < 50)
@@ -1827,7 +1839,6 @@ hits(troop at, troop dt, weapon * awp)
   }
 
   skdiff = skilldiff(at, dt, dist);
-
   /* Verteidiger bekommt eine Rüstung */
   armor = select_armor(dt, true);
   shield = select_armor(dt, false);
@@ -1987,7 +1998,7 @@ attack(battle *b, troop ta, const att *a, int numattack)
           if (hits(ta, td, wp)) {
             const char * d;
             if (wp == NULL) d = au->race->def_damage;
-            else if (riding(ta)) d = wp->type->damage[1];
+            else if (is_riding(ta)) d = wp->type->damage[1];
             else d = wp->type->damage[0];
             terminate(td, ta, a->type, d, missile);
           }
diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c
index f3980edde..d48c24fd6 100644
--- a/src/common/kernel/move.c
+++ b/src/common/kernel/move.c
@@ -1305,12 +1305,10 @@ movement_speed(unit * u)
 
     /* Im Astralraum sind Tyb und Ill-Magier doppelt so schnell.
     * Nicht kumulativ mit anderen Beschleunigungen! */
-    if (get_param_int(global.parameters, "modules.astralspace", 0) != 0) {
-      if (mp*dk <= BP_WALKING*u->race->speed && is_astral(u->region) && is_mage(u)) {
-        sc_mage * mage = get_mage(u);
-        if (mage->magietyp == M_ASTRAL || mage->magietyp == M_TRAUM) {
-          mp *= 2;
-        }
+    if (mp*dk <= BP_WALKING*u->race->speed && is_astral(u->region) && is_mage(u)) {
+      sc_mage * mage = get_mage(u);
+      if (mage->magietyp == M_ASTRAL || mage->magietyp == M_TRAUM) {
+        mp *= 2;
       }
     }
     break;
diff --git a/src/common/kernel/teleport.c b/src/common/kernel/teleport.c
index aab6c7971..e62493d6b 100644
--- a/src/common/kernel/teleport.c
+++ b/src/common/kernel/teleport.c
@@ -174,7 +174,7 @@ get_astralplane(void)
   static int rule_astralplane = -1;
   static int gamecookie = -1;
   if (rule_astralplane<0) {
-    rule_astralplane = get_param_int(global.parameters, "modules.astralspace", 0);
+    rule_astralplane = get_param_int(global.parameters, "modules.astralspace", 1);
   }
   if (!rule_astralplane) {
     return NULL;
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 3b44da246..4daed5586 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -8803,15 +8803,6 @@ border_type bt_chaosgate = {
 static void
 set_spelldata_i(spell * sp, spelldata * data)
 {
-  int n;
-  for (n=0;n!=5 && data->components[n].name;++n);
-  sp->components = malloc(sizeof(spell_component) *(n+1));
-  sp->components[n].type = NULL;
-  while (n-->0) {
-    sp->components[n].type = rt_find(data->components[n].name);
-    sp->components[n].amount = data->components[n].amount;
-    sp->components[n].cost = data->components[n].flags;
-  }
   sp->sp_function = data->sp_function;
   sp->patzer = data->patzer;
 }
@@ -8838,6 +8829,7 @@ init_spells(void)
 
   /* register all the old spells in the spelldata array */
   for (i=0;spelldaten[i].id!=SPL_NOSPELL;++i) {
+    int n;
     spelldata * data = spelldaten+i;
     spell * sp = malloc(sizeof(spell));
 
@@ -8852,6 +8844,16 @@ init_spells(void)
     sp->sptyp = data->sptyp;
     sp->rank = data->rank;
     sp->level = data->level;
+
+    for (n=0;n!=5 && data->components[n].name;++n);
+    sp->components = malloc(sizeof(spell_component) *(n+1));
+    sp->components[n].type = NULL;
+    while (n-->0) {
+      sp->components[n].type = rt_find(data->components[n].name);
+      sp->components[n].amount = data->components[n].amount;
+      sp->components[n].cost = data->components[n].flags;
+    }
+
     set_spelldata_i(sp, data);
     register_spell(sp);
   }
diff --git a/src/eressea/tolua/bindings.c b/src/eressea/tolua/bindings.c
index 81c63331f..c13813df0 100644
--- a/src/eressea/tolua/bindings.c
+++ b/src/eressea/tolua/bindings.c
@@ -736,6 +736,19 @@ tolua_write_spells(lua_State* tolua_S)
       xmlNewProp(node, BAD_CAST "rank", xml_i(sp->rank));
       xmlNewProp(node, BAD_CAST "level", xml_i(sp->level));
       xmlNewProp(node, BAD_CAST "index", xml_i(sp->id));
+      if (sp->syntax) xmlNewProp(node, BAD_CAST "syntax", BAD_CAST sp->syntax);
+      if (sp->parameter) xmlNewProp(node, BAD_CAST "parameters", BAD_CAST sp->parameter);
+      if (sp->components) {
+        spell_component * comp = sp->components;
+        for (;comp->type!=0;++comp) {
+          static const char * costs[] = { "fixed", "level", "linear" };
+          xmlNodePtr cnode = xmlNewNode(NULL, BAD_CAST "resource");
+          xmlNewProp(cnode, BAD_CAST "name", BAD_CAST comp->type->_name[0]);
+          xmlNewProp(cnode, BAD_CAST "amount", xml_i(comp->amount));
+          xmlNewProp(cnode, BAD_CAST "cost", BAD_CAST costs[comp->cost]);
+          xmlAddChild(node, cnode); 
+        }
+      }
 
       if (sp->sptyp & TESTCANSEE) {
         xmlNewProp(node, BAD_CAST "los", BAD_CAST "true");
diff --git a/src/res/eressea.xml b/src/res/eressea.xml
index 8c6c4cdaa..c6bd55360 100644
--- a/src/res/eressea.xml
+++ b/src/res/eressea.xml
@@ -75,8 +75,6 @@
     <skill name="stamina" enable="true"/>
     <skill name="unarmed" enable="true"/>
 
-    <param name="init_spells" value="0"/>
-
     <param name="NewbieImmunity" value="8"/>
     <param name="modules.wormholes" value="1"/>
     <param name="entertain.base" value="0"/>
diff --git a/src/res/eressea/spells.xml b/src/res/eressea/spells.xml
index 0e825b27f..ad955dc4d 100644
--- a/src/res/eressea/spells.xml
+++ b/src/res/eressea/spells.xml
@@ -201,153 +201,4 @@
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true"/>
-  <spell name="hail" type="gwyrrd" rank="5" level="3" index="5" variable="true"/>
-  <spell name="rustweapon" type="gwyrrd" rank="5" level="3" index="6" los="true" far="true" variable="true"/>
-  <spell name="combatrust" type="draig" rank="5" level="6" index="7" variable="true"/>
-  <spell name="treegrow" type="gwyrrd" rank="5" level="2" index="8" far="true" variable="true"/>
-  <spell name="healing" type="gwyrrd" rank="5" level="5" index="9" variable="true"/>
-  <spell name="song_of_healing" type="cerddor" rank="5" level="2" index="10" variable="true"/>
-  <spell name="bad_dreams" type="illaun" rank="5" level="10" index="11" far="true"/>
-  <spell name="gooddreams" type="illaun" rank="5" level="8" index="12" far="true"/>
-  <spell name="dreamreading" type="illaun" rank="5" level="4" index="13" far="true"/>
-  <spell name="tiredsoldiers" type="illaun" rank="5" level="4" index="15" variable="true"/>
-  <spell name="plague" type="draig" rank="5" level="7" index="16" far="true"/>
-  <spell name="magicboost" type="draig" rank="3" level="3" index="17" ship="true"/>
-  <spell name="chaosrow" type="draig" rank="5" level="8" index="18" variable="true"/>
-  <spell name="song_of_confusion" type="cerddor" rank="5" level="4" index="19" variable="true"/>
-  <spell name="flee" type="illaun" rank="5" level="2" index="20" variable="true"/>
-  <spell name="song_of_fear" type="cerddor" rank="5" level="3" index="21" variable="true"/>
-  <spell name="berserk" type="draig" rank="4" level="5" index="22" variable="true"/>
-  <spell name="bloodthirst" type="cerddor" rank="4" level="7" index="23" variable="true"/>
-  <spell name="maelstrom" type="gwyrrd" rank="5" level="15" index="24" ship="true" ocean="true"/>
-  <spell name="blessedharvest" type="gwyrrd" rank="5" level="1" index="25" ship="true" far="true" variable="true"/>
-  <spell name="raindance" type="cerddor" rank="5" level="3" index="26" ship="true" far="true" variable="true"/>
-  <spell name="transferauradruide" type="gwyrrd" rank="1" level="6" index="27" ship="true"/>
-  <spell name="transfer_aura_song" type="cerddor" rank="1" level="5" index="28" ship="true"/>
-  <spell name="transferaurachaos" type="draig" rank="1" level="7" index="29" ship="true"/>
-  <spell name="transferauratraum" type="illaun" rank="1" level="3" index="30" ship="true"/>
-  <spell name="auratransfer" type="tybied" rank="1" level="5" index="31" ship="true"/>
-  <spell name="stonegolem" type="gwyrrd" rank="4" level="1" index="32" variable="true"/>
-  <spell name="irongolem" type="gwyrrd" rank="4" level="2" index="33" variable="true"/>
-  <spell name="summonshadow" type="draig" rank="5" level="8" index="34" variable="true"/>
-  <spell name="summonshadowlords" type="draig" rank="5" level="12" index="35" variable="true"/>
-  <spell name="reelingarrows" type="gwyrrd" rank="5" level="5" index="36" variable="true"/>
-  <spell name="antimagiczone" type="tybied" rank="2" level="5" index="37" far="true" variable="true"/>
-  <spell name="cold_protection" type="gwyrrd" rank="5" level="3" index="39" los="true" ship="true" variable="true"/>
-  <spell name="steal_aura" type="tybied" rank="3" level="6" index="40" los="true" far="true" variable="true"/>
-  <spell name="summonundead" type="draig" rank="5" level="6" index="41" ship="true" far="true" variable="true"/>
-  <spell name="auraleak" type="draig" rank="3" level="9" index="42"/>
-  <spell name="great_drought" type="gwyrrd" rank="5" level="17" index="43" far="true"/>
-  <spell name="strongwall" type="gwyrrd" rank="5" level="8" index="44" variable="true"/>
-  <spell name="homestone" type="gwyrrd" rank="5" level="7" index="45"/>
-  <spell name="summonfireelemental" type="gwyrrd" rank="5" level="13" index="46" far="true"/>
-  <spell name="forestfire" type="draig" rank="5" level="10" index="47" far="true"/>
-  <spell name="summonent" type="gwyrrd" rank="5" level="10" index="49" variable="true"/>
-  <spell name="disturbingdreams" type="illaun" rank="5" level="6" index="50" far="true"/>
-  <spell name="appeasement" type="cerddor" rank="5" level="1" index="51" variable="true"/>
-  <spell name="sleep" type="illaun" rank="5" level="7" index="52" variable="true"/>
-  <spell name="earthquake" type="gwyrrd" rank="5" level="6" index="53" far="true"/>
-  <spell name="ironkeeper" type="gwyrrd" rank="5" level="3" index="54" far="true" variable="true"/>
-  <spell name="stormwinds" type="gwyrrd" rank="5" level="6" index="55" ship="true" ocean="true" variable="true"/>
-  <spell name="goodwinds" type="gwyrrd" rank="5" level="4" index="56" ship="true" variable="true"/>
-  <spell name="airship" type="tybied" rank="5" level="6" index="57" ship="true"/>
-  <spell name="summon_alp" type="illaun" rank="5" level="15" index="58"/>
-  <spell name="windshield" type="gwyrrd" rank="5" level="4" index="59" variable="true"/>
-  <spell name="raise_mob" type="cerddor" rank="5" level="10" index="60" variable="true"/>
-  <spell name="melancholy" type="cerddor" rank="5" level="11" index="61" far="true"/>
-  <spell name="headache" type="cerddor" rank="5" level="7" index="62" los="true"/>
-  <spell name="enterastral" type="tybied" rank="7" level="4" index="64" variable="true"/>
-  <spell name="leaveastral" type="tybied" rank="7" level="4" index="65" variable="true"/>
-  <spell name="versteinern" type="gwyrrd" rank="5" level="8" index="67" variable="true"/>
-  <spell name="treewalkenter" type="gwyrrd" rank="7" level="9" index="68" los="true" variable="true"/>
-  <spell name="treewalkexit" type="gwyrrd" rank="7" level="9" index="69" los="true" variable="true"/>
-  <spell name="chaossuction" type="draig" rank="5" level="14" index="70"/>
-  <spell name="view_reality" type="tybied" rank="5" level="10" index="71"/>
-  <spell name="astral_disruption" type="tybied" rank="4" level="14" index="72" variable="true"/>
-  <spell name="seduction" type="cerddor" rank="5" level="6" index="73" los="true"/>
-  <spell name="sound_out" type="cerddor" rank="5" level="7" index="74" los="true"/>
-  <spell name="calm_monster" type="cerddor" rank="5" level="6" index="75" los="true" ship="true"/>
-  <spell name="heroic_song" type="cerddor" rank="4" level="5" index="76" variable="true"/>
-  <spell name="frighten" type="cerddor" rank="5" level="8" index="77" variable="true"/>
-  <spell name="mindblast" type="illaun" rank="5" level="11" index="78" variable="true"/>
-  <spell name="combat_speed" type="tybied" rank="5" level="9" index="79" variable="true"/>
-  <spell name="double_time" type="tybied" rank="5" level="11" index="80" los="true" ship="true" variable="true"/>
-  <spell name="fiery_dragonbreath" type="gray" rank="5" level="3" index="81"/>
-  <spell name="icy_dragonbreath" type="gray" rank="5" level="6" index="82"/>
-  <spell name="powerful_dragonbreath" type="gray" rank="5" level="12" index="83"/>
-  <spell name="magicstreet" type="gwyrrd" rank="5" level="4" index="84" ship="true" far="true" variable="true"/>
-  <spell name="reanimate" type="illaun" rank="4" level="5" index="85" variable="true"/>
-  <spell name="courting" type="cerddor" rank="5" level="4" index="86" variable="true"/>
-  <spell name="generous" type="cerddor" rank="5" level="2" index="87" ship="true" far="true" variable="true"/>
-  <spell name="sacrifice_strength" type="tybied" rank="1" level="15" index="88"/>
-  <spell name="song_of_peace" type="cerddor" rank="5" level="12" index="89" variable="true"/>
-  <spell name="migration" type="cerddor" rank="5" level="9" index="90" los="true" variable="true"/>
-  <spell name="calm_riot" type="cerddor" rank="5" level="15" index="91" far="true"/>
-  <spell name="incite_riot" type="cerddor" rank="5" level="16" index="92" far="true"/>
-  <spell name="shapeshift" type="illaun" rank="5" level="3" index="93" variable="true"/>
-  <spell name="wolfhowl" type="gwyrrd" rank="5" level="7" index="94" variable="true"/>
-  <spell name="resist_magic" type="tybied" rank="2" level="3" index="97" los="true" ship="true" variable="true"/>
-  <spell name="keeploot" type="tybied" rank="5" level="3" index="98" variable="true"/>
-  <spell name="protective_runes" type="tybied" rank="2" level="8" index="99" ship="true"/>
-  <spell name="song_resist_magic" type="cerddor" rank="2" level="10" index="100" far="true" variable="true"/>
-  <spell name="song_suscept_magic" type="cerddor" rank="2" level="12" index="101" far="true" variable="true"/>
-  <spell name="analyze_magic" type="tybied" rank="5" level="1" index="102" los="true" ship="true" variable="true"/>
-  <spell name="analysedream" type="illaun" rank="5" level="5" index="103" los="true" ship="true"/>
-  <spell name="analysesong_unit" type="cerddor" rank="5" level="5" index="104" los="true" ship="true"/>
-  <spell name="analyse_object" type="cerddor" rank="5" level="8" index="105" ship="true" variable="true"/>
-  <spell name="destroy_magic" type="tybied" rank="2" level="5" index="106" los="true" ship="true" far="true" variable="true"/>
-  <spell name="break_curse" type="tybied" rank="3" level="7" index="107" los="true" ship="true" far="true" variable="true"/>
-  <spell name="meteor_rain" type="gray" rank="5" level="3" index="108" variable="true"/>
-  <spell name="fish_shield" type="tybied" rank="2" level="8" index="109" variable="true"/>
-  <spell name="armor_shield" type="tybied" rank="2" level="12" index="110" variable="true"/>
-  <spell name="deathcloud" type="draig" rank="5" level="11" index="111" far="true"/>
-  <spell name="orkdream" type="illaun" rank="5" level="12" index="112" los="true" variable="true"/>
-  <spell name="summondragon" type="draig" rank="5" level="11" index="113" far="true"/>
-  <spell name="living_rock" type="tybied" rank="5" level="13" index="116" variable="true"/>
-  <spell name="blessstonecircle" type="gwyrrd" rank="5" level="11" index="117"/>
-  <spell name="illaunfamiliar" type="illaun" rank="5" level="9" index="118"/>
-  <spell name="gwyrrdfamiliar" type="gwyrrd" rank="5" level="10" index="119"/>
-  <spell name="draigfamiliar" type="draig" rank="5" level="13" index="120"/>
-  <spell name="summon_familiar" type="cerddor" rank="5" level="9" index="121"/>
-  <spell name="summon_familiar" type="tybied" rank="5" level="12" index="122"/>
-  <spell name="song_of_slavery" type="cerddor" rank="5" level="13" index="123" los="true"/>
-  <spell name="fumblecurse" type="draig" rank="4" level="5" index="136" los="true" variable="true"/>
-  <spell name="icastle" type="illaun" rank="5" level="3" index="137"/>
-  <spell name="gwyrrddestroymagic" type="gwyrrd" rank="2" level="8" index="138" los="true" ship="true" far="true" variable="true"/>
-  <spell name="draigdestroymagic" type="draig" rank="2" level="10" index="139" los="true" ship="true" far="true" variable="true"/>
-  <spell name="illaundestroymagic" type="illaun" rank="2" level="8" index="140" los="true" ship="true" far="true" variable="true"/>
-  <spell name="cerddor_destroymagic" type="cerddor" rank="2" level="8" index="141" los="true" ship="true" far="true" variable="true"/>
-  <spell name="barkskin" type="gwyrrd" rank="2" level="12" index="142" variable="true"/>
-  <spell name="draigfumbleshield" type="draig" rank="2" level="9" index="143" variable="true"/>
-  <spell name="gwyrrdfumbleshield" type="gwyrrd" rank="2" level="5" index="144" variable="true"/>
-  <spell name="cerrdorfumbleshield" type="cerddor" rank="2" level="5" index="145" variable="true"/>
-  <spell name="tybiedfumbleshield" type="tybied" rank="2" level="2" index="146" variable="true"/>
-  <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true"/>
-  <spell name="concealing_aura" type="tybied" rank="5" level="1" index="150" ship="true" variable="true"/>
-  <spell name="firewall" type="draig" rank="4" level="7" index="151" variable="true"/>
-  <spell name="wisps" type="illaun" rank="5" level="7" index="152" far="true" variable="true"/>
-  <spell name="sparklechaos" type="draig" rank="5" level="1" index="153" los="true" variable="true"/>
-  <spell name="sparkledream" type="illaun" rank="5" level="1" index="154" los="true" ship="true" variable="true"/>
-  <spell name="pull_astral" type="tybied" rank="7" level="6" index="156" variable="true"/>
-  <spell name="fetch_astral" type="tybied" rank="7" level="6" index="157" variable="true"/>
-  <spell name="shockwave" type="tybied" rank="5" level="5" index="163" variable="true"/>
-  <spell name="undeadhero" type="draig" rank="5" level="9" index="164" variable="true"/>
-  <spell name="wyrm_transformation" type="gray" rank="5" level="1" index="166"/>
-  <spell name="eternal_walls" type="tybied" rank="5" level="7" index="167" ship="true" variable="true"/>
-  <spell name="puttorest" type="illaun" rank="5" level="2" index="168" variable="true"/>
-  <spell name="unholypower" type="draig" rank="5" level="14" index="169" los="true" variable="true"/>
-  <spell name="holyground" type="gwyrrd" rank="5" level="9" index="170"/>
-  <spell name="bloodsacrifice" type="draig" rank="1" level="4" index="171" ship="true"/>
-  <spell name="magic_roots" type="gwyrrd" rank="5" level="16" index="172" far="true"/>
-  <spell name="clone" type="illaun" rank="5" level="9" index="173"/>
-  <spell name="drain_skills" type="gray" rank="5" level="12" index="174"/>
-  <spell name="aura_of_fear" type="gray" rank="5" level="12" index="175"/>
-  <spell name="shadowcall" type="gray" rank="5" level="12" index="176"/>
-  <spell name="mallorntreegrow" type="gwyrrd" rank="5" level="4" index="177" far="true" variable="true"/>
-  <spell name="big_recruit" type="cerddor" rank="5" level="14" index="179" variable="true"/>
-  <spell name="immolation" type="gray" rank="5" level="12" index="180"/>
-  <spell name="firestorm" type="gray" rank="5" level="8" index="181"/>
-  <spell name="coldfront" type="gray" rank="5" level="8" index="182"/>
-  <spell name="acidrain" type="gray" rank="5" level="8" index="183"/>
 </spells>
diff --git a/src/res/eressea2/spells.xml b/src/res/eressea2/spells.xml
index a766e0a3b..9e786157a 100644
--- a/src/res/eressea2/spells.xml
+++ b/src/res/eressea2/spells.xml
@@ -201,146 +201,499 @@
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true"/>
-  <spell name="hail" type="gwyrrd" rank="5" level="3" index="5" variable="true"/>
-  <spell name="rustweapon" type="gwyrrd" rank="5" level="3" index="6" los="true" far="true" variable="true"/>
-  <spell name="combatrust" type="draig" rank="5" level="6" index="7" variable="true"/>
-  <spell name="treegrow" type="gwyrrd" rank="5" level="2" index="8" far="true" variable="true"/>
-  <spell name="healing" type="gwyrrd" rank="5" level="5" index="9" variable="true"/>
-  <spell name="song_of_healing" type="cerddor" rank="5" level="2" index="10" variable="true"/>
-  <spell name="bad_dreams" type="illaun" rank="5" level="10" index="11" far="true"/>
-  <spell name="gooddreams" type="illaun" rank="5" level="8" index="12" far="true"/>
-  <spell name="dreamreading" type="illaun" rank="5" level="4" index="13" far="true"/>
-  <spell name="tiredsoldiers" type="illaun" rank="5" level="4" index="15" variable="true"/>
-  <spell name="plague" type="draig" rank="5" level="7" index="16" far="true"/>
-  <spell name="magicboost" type="draig" rank="3" level="3" index="17" ship="true"/>
-  <spell name="chaosrow" type="draig" rank="5" level="8" index="18" variable="true"/>
-  <spell name="song_of_confusion" type="cerddor" rank="5" level="4" index="19" variable="true"/>
-  <spell name="flee" type="illaun" rank="5" level="2" index="20" variable="true"/>
-  <spell name="song_of_fear" type="cerddor" rank="5" level="3" index="21" variable="true"/>
-  <spell name="berserk" type="draig" rank="4" level="5" index="22" variable="true"/>
-  <spell name="bloodthirst" type="cerddor" rank="4" level="7" index="23" variable="true"/>
-  <spell name="maelstrom" type="gwyrrd" rank="5" level="15" index="24" ship="true" ocean="true"/>
-  <spell name="blessedharvest" type="gwyrrd" rank="5" level="1" index="25" ship="true" far="true" variable="true"/>
-  <spell name="raindance" type="cerddor" rank="5" level="3" index="26" ship="true" far="true" variable="true"/>
-  <spell name="transferauradruide" type="gwyrrd" rank="1" level="6" index="27" ship="true"/>
-  <spell name="transfer_aura_song" type="cerddor" rank="1" level="5" index="28" ship="true"/>
-  <spell name="transferaurachaos" type="draig" rank="1" level="7" index="29" ship="true"/>
-  <spell name="transferauratraum" type="illaun" rank="1" level="3" index="30" ship="true"/>
-  <spell name="auratransfer" type="tybied" rank="1" level="5" index="31" ship="true"/>
-  <spell name="stonegolem" type="gwyrrd" rank="4" level="1" index="32" variable="true"/>
-  <spell name="irongolem" type="gwyrrd" rank="4" level="2" index="33" variable="true"/>
-  <spell name="summonshadow" type="draig" rank="5" level="8" index="34" variable="true"/>
-  <spell name="summonshadowlords" type="draig" rank="5" level="12" index="35" variable="true"/>
-  <spell name="reelingarrows" type="gwyrrd" rank="5" level="5" index="36" variable="true"/>
-  <spell name="antimagiczone" type="tybied" rank="2" level="5" index="37" far="true" variable="true"/>
-  <spell name="cold_protection" type="gwyrrd" rank="5" level="3" index="39" los="true" ship="true" variable="true"/>
-  <spell name="steal_aura" type="tybied" rank="3" level="6" index="40" los="true" far="true" variable="true"/>
-  <spell name="summonundead" type="draig" rank="5" level="6" index="41" ship="true" far="true" variable="true"/>
-  <spell name="auraleak" type="draig" rank="3" level="9" index="42"/>
-  <spell name="great_drought" type="gwyrrd" rank="5" level="17" index="43" far="true"/>
-  <spell name="strongwall" type="gwyrrd" rank="5" level="8" index="44" variable="true"/>
-  <spell name="homestone" type="gwyrrd" rank="5" level="7" index="45"/>
-  <spell name="summonfireelemental" type="gwyrrd" rank="5" level="13" index="46" far="true"/>
-  <spell name="forestfire" type="draig" rank="5" level="10" index="47" far="true"/>
-  <spell name="summonent" type="gwyrrd" rank="5" level="10" index="49" variable="true"/>
-  <spell name="disturbingdreams" type="illaun" rank="5" level="6" index="50" far="true"/>
-  <spell name="appeasement" type="cerddor" rank="5" level="1" index="51" variable="true"/>
-  <spell name="sleep" type="illaun" rank="5" level="7" index="52" variable="true"/>
-  <spell name="earthquake" type="gwyrrd" rank="5" level="6" index="53" far="true"/>
-  <spell name="ironkeeper" type="gwyrrd" rank="5" level="3" index="54" far="true" variable="true"/>
-  <spell name="stormwinds" type="gwyrrd" rank="5" level="6" index="55" ship="true" ocean="true" variable="true"/>
-  <spell name="goodwinds" type="gwyrrd" rank="5" level="4" index="56" ship="true" variable="true"/>
-  <spell name="airship" type="tybied" rank="5" level="6" index="57" ship="true"/>
-  <spell name="summon_alp" type="illaun" rank="5" level="15" index="58"/>
-  <spell name="windshield" type="gwyrrd" rank="5" level="4" index="59" variable="true"/>
-  <spell name="raise_mob" type="cerddor" rank="5" level="10" index="60" variable="true"/>
-  <spell name="melancholy" type="cerddor" rank="5" level="11" index="61" far="true"/>
-  <spell name="headache" type="cerddor" rank="5" level="7" index="62" los="true"/>
-  <spell name="versteinern" type="gwyrrd" rank="5" level="8" index="67" variable="true"/>
-  <spell name="chaossuction" type="draig" rank="5" level="14" index="70"/>
-  <spell name="view_reality" type="tybied" rank="5" level="10" index="71"/>
-  <spell name="seduction" type="cerddor" rank="5" level="6" index="73" los="true"/>
-  <spell name="sound_out" type="cerddor" rank="5" level="7" index="74" los="true"/>
-  <spell name="calm_monster" type="cerddor" rank="5" level="6" index="75" los="true" ship="true"/>
-  <spell name="heroic_song" type="cerddor" rank="4" level="5" index="76" variable="true"/>
-  <spell name="frighten" type="cerddor" rank="5" level="8" index="77" variable="true"/>
-  <spell name="mindblast" type="illaun" rank="5" level="11" index="78" variable="true"/>
-  <spell name="combat_speed" type="tybied" rank="5" level="9" index="79" variable="true"/>
-  <spell name="double_time" type="tybied" rank="5" level="11" index="80" los="true" ship="true" variable="true"/>
-  <spell name="fiery_dragonbreath" type="gray" rank="5" level="3" index="81"/>
-  <spell name="icy_dragonbreath" type="gray" rank="5" level="6" index="82"/>
-  <spell name="powerful_dragonbreath" type="gray" rank="5" level="12" index="83"/>
-  <spell name="magicstreet" type="gwyrrd" rank="5" level="4" index="84" ship="true" far="true" variable="true"/>
-  <spell name="reanimate" type="illaun" rank="4" level="5" index="85" variable="true"/>
-  <spell name="courting" type="cerddor" rank="5" level="4" index="86" variable="true"/>
-  <spell name="generous" type="cerddor" rank="5" level="2" index="87" ship="true" far="true" variable="true"/>
-  <spell name="sacrifice_strength" type="tybied" rank="1" level="15" index="88"/>
-  <spell name="song_of_peace" type="cerddor" rank="5" level="12" index="89" variable="true"/>
-  <spell name="migration" type="cerddor" rank="5" level="9" index="90" los="true" variable="true"/>
-  <spell name="calm_riot" type="cerddor" rank="5" level="15" index="91" far="true"/>
-  <spell name="incite_riot" type="cerddor" rank="5" level="16" index="92" far="true"/>
-  <spell name="shapeshift" type="illaun" rank="5" level="3" index="93" variable="true"/>
-  <spell name="wolfhowl" type="gwyrrd" rank="5" level="7" index="94" variable="true"/>
-  <spell name="resist_magic" type="tybied" rank="2" level="3" index="97" los="true" ship="true" variable="true"/>
-  <spell name="keeploot" type="tybied" rank="5" level="3" index="98" variable="true"/>
-  <spell name="protective_runes" type="tybied" rank="2" level="8" index="99" ship="true"/>
-  <spell name="song_resist_magic" type="cerddor" rank="2" level="10" index="100" far="true" variable="true"/>
-  <spell name="song_suscept_magic" type="cerddor" rank="2" level="12" index="101" far="true" variable="true"/>
-  <spell name="analyze_magic" type="tybied" rank="5" level="1" index="102" los="true" ship="true" variable="true"/>
-  <spell name="analysedream" type="illaun" rank="5" level="5" index="103" los="true" ship="true"/>
-  <spell name="analysesong_unit" type="cerddor" rank="5" level="5" index="104" los="true" ship="true"/>
-  <spell name="analyse_object" type="cerddor" rank="5" level="8" index="105" ship="true" variable="true"/>
-  <spell name="destroy_magic" type="tybied" rank="2" level="5" index="106" los="true" ship="true" far="true" variable="true"/>
-  <spell name="break_curse" type="tybied" rank="3" level="7" index="107" los="true" ship="true" far="true" variable="true"/>
-  <spell name="meteor_rain" type="gray" rank="5" level="3" index="108" variable="true"/>
-  <spell name="fish_shield" type="tybied" rank="2" level="8" index="109" variable="true"/>
-  <spell name="armor_shield" type="tybied" rank="2" level="12" index="110" variable="true"/>
-  <spell name="deathcloud" type="draig" rank="5" level="11" index="111" far="true"/>
-  <spell name="orkdream" type="illaun" rank="5" level="12" index="112" los="true" variable="true"/>
-  <spell name="summondragon" type="draig" rank="5" level="11" index="113" far="true"/>
-  <spell name="living_rock" type="tybied" rank="5" level="13" index="116" variable="true"/>
-  <spell name="blessstonecircle" type="gwyrrd" rank="5" level="11" index="117"/>
-  <spell name="illaunfamiliar" type="illaun" rank="5" level="9" index="118"/>
-  <spell name="gwyrrdfamiliar" type="gwyrrd" rank="5" level="10" index="119"/>
-  <spell name="draigfamiliar" type="draig" rank="5" level="13" index="120"/>
-  <spell name="summon_familiar" type="cerddor" rank="5" level="9" index="121"/>
-  <spell name="summon_familiar" type="tybied" rank="5" level="12" index="122"/>
-  <spell name="song_of_slavery" type="cerddor" rank="5" level="13" index="123" los="true"/>
-  <spell name="fumblecurse" type="draig" rank="4" level="5" index="136" los="true" variable="true"/>
-  <spell name="icastle" type="illaun" rank="5" level="3" index="137"/>
-  <spell name="gwyrrddestroymagic" type="gwyrrd" rank="2" level="8" index="138" los="true" ship="true" far="true" variable="true"/>
-  <spell name="draigdestroymagic" type="draig" rank="2" level="10" index="139" los="true" ship="true" far="true" variable="true"/>
-  <spell name="illaundestroymagic" type="illaun" rank="2" level="8" index="140" los="true" ship="true" far="true" variable="true"/>
-  <spell name="cerddor_destroymagic" type="cerddor" rank="2" level="8" index="141" los="true" ship="true" far="true" variable="true"/>
-  <spell name="barkskin" type="gwyrrd" rank="2" level="12" index="142" variable="true"/>
-  <spell name="draigfumbleshield" type="draig" rank="2" level="9" index="143" variable="true"/>
-  <spell name="gwyrrdfumbleshield" type="gwyrrd" rank="2" level="5" index="144" variable="true"/>
-  <spell name="cerrdorfumbleshield" type="cerddor" rank="2" level="5" index="145" variable="true"/>
-  <spell name="tybiedfumbleshield" type="tybied" rank="2" level="2" index="146" variable="true"/>
-  <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true"/>
-  <spell name="concealing_aura" type="tybied" rank="5" level="1" index="150" ship="true" variable="true"/>
-  <spell name="firewall" type="draig" rank="4" level="7" index="151" variable="true"/>
-  <spell name="wisps" type="illaun" rank="5" level="7" index="152" far="true" variable="true"/>
-  <spell name="sparklechaos" type="draig" rank="5" level="1" index="153" los="true" variable="true"/>
-  <spell name="sparkledream" type="illaun" rank="5" level="1" index="154" los="true" ship="true" variable="true"/>
-  <spell name="shockwave" type="tybied" rank="5" level="5" index="163" variable="true"/>
-  <spell name="undeadhero" type="draig" rank="5" level="9" index="164" variable="true"/>
-  <spell name="wyrm_transformation" type="gray" rank="5" level="1" index="166"/>
-  <spell name="eternal_walls" type="tybied" rank="5" level="7" index="167" ship="true" variable="true"/>
-  <spell name="puttorest" type="illaun" rank="5" level="2" index="168" variable="true"/>
-  <spell name="unholypower" type="draig" rank="5" level="14" index="169" los="true" variable="true"/>
-  <spell name="holyground" type="gwyrrd" rank="5" level="9" index="170"/>
-  <spell name="bloodsacrifice" type="draig" rank="1" level="4" index="171" ship="true"/>
-  <spell name="magic_roots" type="gwyrrd" rank="5" level="16" index="172" far="true"/>
-  <spell name="clone" type="illaun" rank="5" level="9" index="173"/>
-  <spell name="drain_skills" type="gray" rank="5" level="12" index="174"/>
-  <spell name="aura_of_fear" type="gray" rank="5" level="12" index="175"/>
-  <spell name="shadowcall" type="gray" rank="5" level="12" index="176"/>
-  <spell name="mallorntreegrow" type="gwyrrd" rank="5" level="4" index="177" far="true" variable="true"/>
-  <spell name="big_recruit" type="cerddor" rank="5" level="14" index="179" variable="true"/>
-  <spell name="immolation" type="gray" rank="5" level="12" index="180"/>
-  <spell name="firestorm" type="gray" rank="5" level="8" index="181"/>
-  <spell name="coldfront" type="gray" rank="5" level="8" index="182"/>
-  <spell name="acidrain" type="gray" rank="5" level="8" index="183"/>
+  <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="hail" type="gwyrrd" rank="5" level="3" index="5" variable="true">
+    <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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="combatrust" type="draig" rank="5" level="6" index="7" variable="true">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="treegrow" type="gwyrrd" 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">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="song_of_healing" type="cerddor" rank="5" level="2" index="10" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="bad_dreams" type="illaun" 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">
+    <resource name="aura" amount="80" cost="fixed"/>
+  </spell>
+  <spell name="dreamreading" type="illaun" 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">
+    <resource name="aura" amount="4" cost="level"/>
+  </spell>
+  <spell name="plague" type="draig" 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">
+    <resource name="aura" amount="2" cost="linear"/>
+  </spell>
+  <spell name="chaosrow" type="draig" rank="5" level="8" index="18" variable="true">
+    <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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="flee" type="illaun" rank="5" level="2" index="20" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="song_of_fear" type="cerddor" rank="5" level="3" index="21" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="berserk" type="draig" rank="4" level="5" index="22" variable="true">
+    <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">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="maelstrom" type="gwyrrd" 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="blessedharvest" type="gwyrrd" rank="5" level="1" index="25" ship="true" far="true" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="raindance" type="cerddor" rank="5" level="3" index="26" ship="true" far="true" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="transferauradruide" type="gwyrrd" 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">
+    <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">
+    <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">
+    <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">
+    <resource name="aura" amount="1" cost="fixed"/>
+  </spell>
+  <spell name="stonegolem" type="gwyrrd" 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">
+    <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">
+    <resource name="aura" amount="3" cost="level"/>
+  </spell>
+  <spell name="summonshadowlords" type="draig" 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">
+    <resource name="aura" amount="15" cost="fixed"/>
+  </spell>
+  <spell name="antimagiczone" type="tybied" 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">
+    <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">
+    <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">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="auraleak" type="draig" 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">
+    <resource name="aura" amount="800" cost="fixed"/>
+  </spell>
+  <spell name="strongwall" type="gwyrrd" rank="5" level="8" index="44" variable="true">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="homestone" type="gwyrrd" 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">
+    <resource name="aura" amount="600" cost="fixed"/>
+  </spell>
+  <spell name="forestfire" type="draig" 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">
+    <resource name="aura" amount="6" cost="level"/>
+  </spell>
+  <spell name="disturbingdreams" type="illaun" 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">
+    <resource name="aura" amount="2" cost="fixed"/>
+  </spell>
+  <spell name="sleep" type="illaun" rank="5" level="7" index="52" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="earthquake" type="gwyrrd" 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">
+    <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">
+    <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">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="airship" type="tybied" 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">
+    <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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="raise_mob" type="cerddor" 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">
+    <resource name="aura" amount="40" cost="fixed"/>
+  </spell>
+  <spell name="headache" type="cerddor" 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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="leaveastral" type="tybied" 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">
+    <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">
+    <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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="chaossuction" type="draig" 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">
+    <resource name="aura" amount="40" cost="fixed"/>
+  </spell>
+  <spell name="astral_disruption" type="tybied" 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">
+    <resource name="aura" amount="12" cost="fixed"/>
+  </spell>
+  <spell name="sound_out" type="cerddor" 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">
+    <resource name="aura" amount="15" cost="fixed"/>
+  </spell>
+  <spell name="heroic_song" type="cerddor" rank="4" level="5" index="76" variable="true">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="frighten" type="cerddor" rank="5" level="8" index="77" variable="true">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="mindblast" type="illaun" rank="5" level="11" index="78" variable="true">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="combat_speed" type="tybied" rank="5" level="9" index="79" variable="true">
+    <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">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="fiery_dragonbreath" type="gray" rank="5" level="3" index="81">
+    <resource name="aura" amount="1" cost="fixed"/>
+  </spell>
+  <spell name="icy_dragonbreath" type="gray" rank="5" level="6" index="82">
+    <resource name="aura" amount="2" cost="fixed"/>
+  </spell>
+  <spell name="powerful_dragonbreath" type="gray" rank="5" level="12" index="83">
+    <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">
+    <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">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="courting" type="cerddor" 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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="sacrifice_strength" type="tybied" 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">
+    <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">
+    <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">
+    <resource name="aura" amount="30" cost="fixed"/>
+  </spell>
+  <spell name="incite_riot" type="cerddor" 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">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="wolfhowl" type="gwyrrd" rank="5" level="7" index="94" variable="true">
+    <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">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="keeploot" type="tybied" rank="5" level="3" index="98" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="protective_runes" type="tybied" 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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <resource name="aura" amount="3" cost="level"/>
+  </spell>
+  <spell name="meteor_rain" type="gray" rank="5" level="3" index="108" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="fish_shield" type="tybied" rank="2" level="8" index="109" variable="true">
+    <resource name="aura" amount="4" cost="level"/>
+  </spell>
+  <spell name="armor_shield" type="tybied" rank="2" level="12" index="110" variable="true">
+    <resource name="aura" amount="4" cost="level"/>
+  </spell>
+  <spell name="deathcloud" type="draig" 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">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="summondragon" type="draig" 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">
+    <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">
+    <resource name="aura" amount="350" cost="fixed"/>
+    <resource name="permaura" amount="5" cost="fixed"/>
+  </spell>
+  <spell name="illaunfamiliar" type="illaun" rank="5" level="9" index="118">
+    <resource name="aura" amount="100" cost="fixed"/>
+    <resource name="permaura" amount="5" cost="fixed"/>
+  </spell>
+  <spell name="gwyrrdfamiliar" type="gwyrrd" rank="5" level="10" index="119">
+    <resource name="aura" amount="100" cost="fixed"/>
+    <resource name="permaura" amount="5" cost="fixed"/>
+  </spell>
+  <spell name="draigfamiliar" type="draig" rank="5" level="13" index="120">
+    <resource name="aura" amount="100" cost="fixed"/>
+    <resource name="permaura" amount="5" cost="fixed"/>
+  </spell>
+  <spell name="summon_familiar" type="cerddor" rank="5" level="9" index="121">
+    <resource name="aura" amount="100" cost="fixed"/>
+    <resource name="permaura" amount="5" cost="fixed"/>
+  </spell>
+  <spell name="summon_familiar" type="tybied" rank="5" level="12" index="122">
+    <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">
+    <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">
+    <resource name="aura" amount="4" cost="level"/>
+  </spell>
+  <spell name="icastle" type="illaun" 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">
+    <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">
+    <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">
+    <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">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="barkskin" type="gwyrrd" rank="2" level="12" index="142" variable="true">
+    <resource name="aura" amount="4" cost="level"/>
+  </spell>
+  <spell name="draigfumbleshield" type="draig" rank="2" level="9" index="143" variable="true">
+    <resource name="aura" amount="6" cost="level"/>
+  </spell>
+  <spell name="gwyrrdfumbleshield" type="gwyrrd" rank="2" level="5" index="144" variable="true">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="cerrdorfumbleshield" type="cerddor" rank="2" level="5" index="145" variable="true">
+    <resource name="aura" amount="5" cost="level"/>
+  </spell>
+  <spell name="tybiedfumbleshield" type="tybied" rank="2" level="2" index="146" variable="true">
+    <resource name="aura" amount="3" cost="level"/>
+  </spell>
+  <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="pull_astral" type="tybied" rank="7" level="6" index="156" parameters="ru+" variable="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">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="shockwave" type="tybied" rank="5" level="5" index="163" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="undeadhero" type="draig" rank="5" level="9" index="164" variable="true">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="wyrm_transformation" type="gray" 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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <resource name="hp" amount="4" cost="level"/>
+  </spell>
+  <spell name="magic_roots" type="gwyrrd" 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">
+    <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">
+    <resource name="aura" amount="4" cost="fixed"/>
+  </spell>
+  <spell name="aura_of_fear" type="gray" rank="5" level="12" index="175">
+    <resource name="aura" amount="1" cost="level"/>
+  </spell>
+  <spell name="shadowcall" type="gray" rank="5" level="12" index="176">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="mallorntreegrow" type="gwyrrd" 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">
+    <resource name="aura" amount="20" cost="level"/>
+  </spell>
+  <spell name="immolation" type="gray" rank="5" level="12" index="180">
+    <resource name="aura" amount="2" cost="level"/>
+  </spell>
+  <spell name="firestorm" type="gray" rank="5" level="8" index="181">
+    <resource name="aura" amount="2" cost="fixed"/>
+  </spell>
+  <spell name="coldfront" type="gray" rank="5" level="8" index="182">
+    <resource name="aura" amount="2" cost="fixed"/>
+  </spell>
+  <spell name="acidrain" type="gray" rank="5" level="8" index="183">
+    <resource name="aura" amount="2" cost="fixed"/>
+  </spell>
+
 </spells>