From 6362d26e50869f733554013471f64fa3ea50fe89 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 26 May 2012 14:20:01 -0700
Subject: [PATCH] kill tybied in E3, make common spells the source for random
 choices

---
 res/e3a/spellbooks/cerddor.xml |  11 +++
 res/e3a/spellbooks/draig.xml   |  11 +++
 res/e3a/spellbooks/gray.xml    | 155 ++++++++++++++++++++++++++++++---
 res/e3a/spellbooks/gwyrrd.xml  |  11 +++
 res/e3a/spellbooks/illaun.xml  |  11 +++
 res/e3a/spellbooks/tybied.xml  |  14 ---
 res/e3a/spells.xml             |   1 -
 7 files changed, 187 insertions(+), 27 deletions(-)
 delete mode 100644 res/e3a/spellbooks/tybied.xml

diff --git a/res/e3a/spellbooks/cerddor.xml b/res/e3a/spellbooks/cerddor.xml
index 8467b4ed1..1f0680352 100644
--- a/res/e3a/spellbooks/cerddor.xml
+++ b/res/e3a/spellbooks/cerddor.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <spellbook name="cerddor">
+  <entry spell="create_potion_p2" level="2" />
+  <entry spell="create_potion_p0" level="3" />
+  <entry spell="create_potion_p9" level="4" />
+  <entry spell="create_potion_peasantblood" level="5" />
+  <entry spell="create_potion_ointment" level="6" />
+  <entry spell="create_potion_p3" level="7" />
+  <entry spell="create_potion_p14" level="8" />
+  <entry spell="create_potion_p13" level="9" />
+  <entry spell="create_roi" level="7" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="auratransfer" level="5" />
     <entry spell="earn_silver#cerddor" level="1" />
     <entry spell="song_of_healing" level="2" />
     <entry spell="generous" level="2" />
diff --git a/res/e3a/spellbooks/draig.xml b/res/e3a/spellbooks/draig.xml
index 6ce282db6..5478fc69d 100644
--- a/res/e3a/spellbooks/draig.xml
+++ b/res/e3a/spellbooks/draig.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <spellbook name="draig">
+  <entry spell="create_potion_p2" level="2" />
+  <entry spell="create_potion_p0" level="3" />
+  <entry spell="create_potion_p9" level="4" />
+  <entry spell="create_potion_peasantblood" level="5" />
+  <entry spell="create_potion_ointment" level="6" />
+  <entry spell="create_potion_p3" level="7" />
+  <entry spell="create_potion_p14" level="8" />
+  <entry spell="create_potion_p13" level="9" />
+  <entry spell="create_roi" level="7" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="auratransfer" level="5" />
     <entry spell="sparklechaos" level="1" />
     <entry spell="earn_silver#draig" level="1" />
     <entry spell="fireball" level="2" />
diff --git a/res/e3a/spellbooks/gray.xml b/res/e3a/spellbooks/gray.xml
index 517add0e3..0ed647fa0 100644
--- a/res/e3a/spellbooks/gray.xml
+++ b/res/e3a/spellbooks/gray.xml
@@ -1,16 +1,147 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <spellbook name="gray">
-    <entry spell="fiery_dragonbreath" level="3" />
-    <entry spell="icy_dragonbreath" level="6" />
-    <entry spell="powerful_dragonbreath" level="12" />
-    <entry spell="meteor_rain" level="3" />
-    <entry spell="wyrm_transformation" level="1" />
-    <entry spell="transferauratraum" level="3" />
-    <entry spell="drain_skills" level="12" />
-    <entry spell="aura_of_fear" level="12" />
-    <entry spell="shadowcall" level="12" />
-    <entry spell="immolation" level="12" />
-    <entry spell="firestorm" level="8" />
-    <entry spell="coldfront" level="8" />
     <entry spell="acidrain" level="8" />
+    <entry spell="airship" level="6" />
+    <entry spell="analyze_magic" level="1" />
+    <entry spell="antimagiczone" level="5" />
+    <entry spell="appeasement" level="1" />
+    <entry spell="armor_shield" level="12" />
+    <entry spell="auraleak" level="9" />
+    <entry spell="aura_of_fear" level="12" />
+    <entry spell="auratransfer" level="5" />
+    <entry spell="bad_dreams" level="10" />
+    <entry spell="barkskin" level="12" />
+    <entry spell="berserk" level="5" />
+    <entry spell="big_recruit" level="14" />
+    <entry spell="blabbermouth" level="4" />
+    <entry spell="blessedharvest" level="3" />
+    <entry spell="blessstonecircle" level="11" />
+    <entry spell="bloodsacrifice" level="4" />
+    <entry spell="bloodthirst" level="7" />
+    <entry spell="break_curse" level="7" />
+    <entry spell="calm_monster" level="6" />
+    <entry spell="calm_riot" level="14" />
+    <entry spell="cerddor_destroymagic" level="8" />
+    <entry spell="cerrdorfumbleshield" level="5" />
+    <entry spell="chaosrow" level="8" />
+    <entry spell="clone" level="9" />
+    <entry spell="coldfront" level="8" />
+    <entry spell="combatrust" level="6" />
+    <entry spell="combat_speed" level="9" />
+    <entry spell="concealing_aura" level="1" />
+    <entry spell="create_antimagic" level="7" />
+    <entry spell="create_aots" level="6" />
+    <entry spell="create_bagofholding" level="10" />
+    <entry spell="create_dreameye" level="14" />
+    <entry spell="create_firesword" level="12" />
+    <entry spell="create_focus" level="9" />
+    <entry spell="create_potion_ointment" level="6" />
+    <entry spell="create_potion_p0" level="3" />
+    <entry spell="create_potion_p13" level="9" />
+    <entry spell="create_potion_p14" level="8" />
+    <entry spell="create_potion_p2" level="2" />
+    <entry spell="create_potion_p3" level="7" />
+    <entry spell="create_potion_p9" level="4" />
+    <entry spell="create_potion_peasantblood" level="5" />
+    <entry spell="create_roi" level="7" />
+    <entry spell="create_rop" level="9" />
+    <entry spell="create_roqf" level="11" />
+    <entry spell="create_ror" level="9" />
+    <entry spell="create_trollbelt" level="9" />
+    <entry spell="deathcloud" level="11" />
+    <entry spell="destroy_magic" level="5" />
+    <entry spell="disturbingdreams" level="6" />
+    <entry spell="double_time" level="11" />
+    <entry spell="draigdestroymagic" level="10" />
+    <entry spell="draigfumbleshield" level="9" />
+    <entry spell="drain_skills" level="12" />
+    <entry spell="dreamreading" level="4" />
+    <entry spell="earn_silver#cerddor" level="1" />
+    <entry spell="earn_silver#draig" level="1" />
+    <entry spell="earn_silver#gwyrrd" level="1" />
+    <entry spell="earn_silver#illaun" level="1" />
+    <entry spell="earthquake" level="6" />
+    <entry spell="eternal_walls" level="7" />
+    <entry spell="fiery_dragonbreath" level="3" />
+    <entry spell="fireball" level="2" />
+    <entry spell="firestorm" level="8" />
+    <entry spell="firewall" level="7" />
+    <entry spell="fish_shield" level="8" />
+    <entry spell="flee" level="2" />
+    <entry spell="forestfire" level="10" />
+    <entry spell="frighten" level="8" />
+    <entry spell="fumblecurse" level="5" />
+    <entry spell="generous" level="2" />
+    <entry spell="gooddreams" level="8" />
+    <entry spell="goodwinds" level="4" />
+    <entry spell="gwyrrddestroymagic" level="8" />
+    <entry spell="gwyrrdfumbleshield" level="5" />
+    <entry spell="hail" level="3" />
+    <entry spell="healing" level="5" />
+    <entry spell="heroic_song" level="5" />
+    <entry spell="holyground" level="9" />
+    <entry spell="homestone" level="7" />
+    <entry spell="icastle" level="3" />
+    <entry spell="icy_dragonbreath" level="6" />
+    <entry spell="illaundestroymagic" level="8" />
+    <entry spell="immolation" level="12" />
+    <entry spell="incite_riot" level="15" />
+    <entry spell="irongolem" level="2" />
+    <entry spell="ironkeeper" level="3" />
+    <entry spell="living_rock" level="13" />
+    <entry spell="maelstrom" level="15" />
+    <entry spell="magicboost" level="3" />
+    <entry spell="magicstreet" level="4" />
+    <entry spell="meteor_rain" level="3" />
+    <entry spell="migration" level="9" />
+    <entry spell="mindblast" level="11" />
+    <entry spell="plague" level="7" />
+    <entry spell="powerful_dragonbreath" level="12" />
+    <entry spell="protective_runes" level="8" />
+    <entry spell="puttorest" level="2" />
+    <entry spell="raindance" level="2" />
+    <entry spell="raise_mob" level="10" />
+    <entry spell="readmind" level="7" />
+    <entry spell="reanimate" level="5" />
+    <entry spell="reelingarrows" level="5" />
+    <entry spell="resist_magic" level="3" />
+    <entry spell="rustweapon" level="3" />
+    <entry spell="sacrifice_strength" level="15" />
+    <entry spell="seduction" level="6" />
+    <entry spell="shadowcall" level="12" />
+    <entry spell="shadowknights" level="1" />
+    <entry spell="shapeshift" level="3" />
+    <entry spell="shockwave" level="5" />
+    <entry spell="sleep" level="7" />
+    <entry spell="song_of_confusion" level="4" />
+    <entry spell="song_of_fear" level="3" />
+    <entry spell="song_of_healing" level="2" />
+    <entry spell="song_of_peace" level="12" />
+    <entry spell="song_of_slavery" level="13" />
+    <entry spell="song_resist_magic" level="10" />
+    <entry spell="song_suscept_magic" level="12" />
+    <entry spell="sound_out" level="7" />
+    <entry spell="sparklechaos" level="1" />
+    <entry spell="sparkledream" level="1" />
+    <entry spell="steal_aura" level="6" />
+    <entry spell="stonegolem" level="20" />
+    <entry spell="stormwinds" level="6" />
+    <entry spell="strongwall" level="8" />
+    <entry spell="summondragon" level="11" />
+    <entry spell="summonent" level="10" />
+    <entry spell="summon_familiar" level="9" />
+    <entry spell="summonfireelemental" level="13" />
+    <entry spell="summonshadow" level="8" />
+    <entry spell="summonshadowlords" level="12" />
+    <entry spell="summonundead" level="6" />
+    <entry spell="tiredsoldiers" level="4" />
+    <entry spell="transferauratraum" level="3" />
+    <entry spell="treegrow" level="2" />
+    <entry spell="tybiedfumbleshield" level="2" />
+    <entry spell="undeadhero" level="9" />
+    <entry spell="unholypower" level="14" />
+    <entry spell="versteinern" level="8" />
+    <entry spell="windshield" level="4" />
+    <entry spell="wolfhowl" level="7" />
+    <entry spell="wyrm_transformation" level="1" />
 </spellbook>
diff --git a/res/e3a/spellbooks/gwyrrd.xml b/res/e3a/spellbooks/gwyrrd.xml
index 3cfe9f5e2..4de9d8da8 100644
--- a/res/e3a/spellbooks/gwyrrd.xml
+++ b/res/e3a/spellbooks/gwyrrd.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <spellbook name="gwyrrd">
+  <entry spell="create_potion_p2" level="2" />
+  <entry spell="create_potion_p0" level="3" />
+  <entry spell="create_potion_p9" level="4" />
+  <entry spell="create_potion_peasantblood" level="5" />
+  <entry spell="create_potion_ointment" level="6" />
+  <entry spell="create_potion_p3" level="7" />
+  <entry spell="create_potion_p14" level="8" />
+  <entry spell="create_potion_p13" level="9" />
+  <entry spell="create_roi" level="7" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="auratransfer" level="5" />
   <entry spell="blessedharvest" level="3" />
   <entry spell="earn_silver#gwyrrd" level="1" />
   <entry spell="stonegolem" level="20" />
diff --git a/res/e3a/spellbooks/illaun.xml b/res/e3a/spellbooks/illaun.xml
index 31a6d8ada..020705d2f 100644
--- a/res/e3a/spellbooks/illaun.xml
+++ b/res/e3a/spellbooks/illaun.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <spellbook name="illaun">
+  <entry spell="create_potion_p2" level="2" />
+  <entry spell="create_potion_p0" level="3" />
+  <entry spell="create_potion_p9" level="4" />
+  <entry spell="create_potion_peasantblood" level="5" />
+  <entry spell="create_potion_ointment" level="6" />
+  <entry spell="create_potion_p3" level="7" />
+  <entry spell="create_potion_p14" level="8" />
+  <entry spell="create_potion_p13" level="9" />
+  <entry spell="create_roi" level="7" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="auratransfer" level="5" />
   <entry spell="shadowknights" level="1" />
   <entry spell="sparkledream" level="1" />
   <entry spell="earn_silver#illaun" level="1" />
diff --git a/res/e3a/spellbooks/tybied.xml b/res/e3a/spellbooks/tybied.xml
deleted file mode 100644
index e71ab45b5..000000000
--- a/res/e3a/spellbooks/tybied.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<spellbook name="tybied">
-  <entry spell="create_potion_p2" level="2" />
-  <entry spell="create_potion_p0" level="3" />
-  <entry spell="create_potion_p9" level="4" />
-  <entry spell="create_potion_peasantblood" level="5" />
-  <entry spell="create_potion_ointment" level="6" />
-  <entry spell="create_potion_p3" level="7" />
-  <entry spell="create_potion_p14" level="8" />
-  <entry spell="create_potion_p13" level="9" />
-  <entry spell="create_roi" level="7" />
-  <entry spell="create_aots" level="6" />
-  <entry spell="auratransfer" level="5" />
-</spellbook>
diff --git a/res/e3a/spells.xml b/res/e3a/spells.xml
index cf60c9571..23ce5d1a3 100644
--- a/res/e3a/spells.xml
+++ b/res/e3a/spells.xml
@@ -7,7 +7,6 @@
   <xi:include href="spellbooks/draig.xml"/>
   <xi:include href="spellbooks/illaun.xml"/>
   <xi:include href="spellbooks/cerddor.xml"/>
-  <xi:include href="spellbooks/tybied.xml"/>
 
   <!-- shared spells -->
   <spell name="create_roi" ship="true" rank="5" index="130">