Change "activation spells" to use the old style

This fits in better with the rest of the code and lets us clean up the
spell handling a bit.

Activation failure rate for the moved items may have changed slightly,
but it doesn't seem like this would be much of an issue.

1 files changed, 0 insertions, 66 deletions

diff --git a/src/spells5.cc b/src/spells5.cc
index 4ce897b4..4bd1886b 100644
--- a/src/spells5.cc
+++ b/src/spells5.cc
@@ -97,28 +97,6 @@ s16b get_random_stick(byte tval, int level)
 static void spells_init_tome()
 {
 	{
-		spell_type *spell = spell_new(&DEVICE_LEBOHAUM, "Artifact Lebauhaum");
-		spell_type_set_activation_timeout(spell, "3");
-		spell_type_describe(spell, "sing a cheerful song");
-		spell_type_set_mana(spell, 0, 0);
-		spell_type_set_difficulty(spell, 1, 0);
-		spell_type_init_device(spell,
-				       no_info,
-				       device_lebohaum);
-	}
-
-	{
-		spell_type *spell = spell_new(&DEVICE_DURANDIL, "Artifact Durandil");
-		spell_type_set_activation_timeout(spell, "3");
-		spell_type_describe(spell, "sing a cheerful song");
-		spell_type_set_mana(spell, 0, 0);
-		spell_type_set_difficulty(spell, 1, 0);
-		spell_type_init_device(spell,
-				       no_info,
-				       device_durandil);
-	}
-
-	{
 		spell_type *spell = spell_new(&DEVICE_THUNDERLORDS, "Artifact Thunderlords");
 		spell_type_describe(spell, "A thunderlord will appear to transport you quickly to the surface.");
 		spell_type_set_mana(spell, 1, 1);
@@ -384,28 +362,6 @@ static void spells_init_theme()
 			spell_type_add_device_allocation(spell, device_allocation);
 		}
 	}
-
-	{
-		spell_type *spell = spell_new(&DEVICE_RADAGAST, "Artifact Radagast");
-		spell_type_set_activation_timeout(spell, "15000");
-		spell_type_describe(spell, "purity and health");
-		spell_type_set_mana(spell, 0, 0);
-		spell_type_set_difficulty(spell, 1, 10);
-		spell_type_init_device(spell,
-				       no_info,
-				       device_radagast);
-	}
-
-	{
-		spell_type *spell = spell_new(&DEVICE_VALAROMA, "Artifact Valaroma");
-		spell_type_set_activation_timeout(spell, "250");
-		spell_type_describe(spell, "banish evil (level x5)");
-		spell_type_set_mana(spell, 0, 0);
-		spell_type_set_difficulty(spell, 1, 25);
-		spell_type_init_device(spell,
-				       no_info,
-				       device_valaroma);
-	}
 }
 
 void school_spells_init()
@@ -2222,17 +2178,6 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_MAGGOT, "Artifact Maggot");
-		spell_type_set_activation_timeout(spell, "10+d50");
-		spell_type_describe(spell, "terrify");
-		spell_type_set_mana(spell, 7, 7);
-		spell_type_set_difficulty(spell, 1, 20);
-		spell_type_init_device(spell,
-				       device_maggot_info,
-				       device_maggot);
-	}
-
-	{
 		spell_type *spell = spell_new(&DEVICE_HOLY_FIRE, "Holy Fire of Mithrandir");
 		spell_type_describe(spell, "The Holy Fire created by this staff will deeply(double damage) burn");
 		spell_type_describe(spell, "all that is evil.");
@@ -2254,17 +2199,6 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_ETERNAL_FLAME, "Artifact Eternal Flame");
-		spell_type_set_activation_timeout(spell, "0");
-		spell_type_describe(spell, "Imbuing an object with the eternal fire");
-		spell_type_set_mana(spell, 0, 0);
-		spell_type_set_difficulty(spell, 1, 0);
-		spell_type_init_device(spell,
-				       no_info,
-				       device_eternal_flame);
-	}
-
-	{
 		spell_type *spell = spell_new(&MUSIC_STOP, "Stop singing(I)");
 		spell_type_describe(spell, "Stops the current song, if any.");
 		spell_type_set_mana(spell, 0, 0);