Cut 30 obsoleted spells. (Included in docs/obsolete/cut_spells.txt.)

Breaks saves.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9241 c06c8d41-db1a-0410-9941-cceddc491573

6 files changed, 109 insertions, 647 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 853200fcf5..f46e4c33ec 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -4044,9 +4044,9 @@ static void _compile_time_asserts()
     COMPILE_CHECK(SK_UNARMED_COMBAT == 19       , c1);
     COMPILE_CHECK(SK_EVOCATIONS == 39           , c2);
     COMPILE_CHECK(SP_VAMPIRE == 33              , c3);
-    COMPILE_CHECK(SPELL_BOLT_OF_MAGMA == 19     , c4);
-    COMPILE_CHECK(SPELL_POISON_ARROW == 94      , c5);
-    COMPILE_CHECK(NUM_SPELLS == 229             , c6);
+    COMPILE_CHECK(SPELL_DEBUGGING_RAY == 107    , c4);
+    COMPILE_CHECK(SPELL_PETRIFY == 160          , c5);
+    COMPILE_CHECK(NUM_SPELLS == 198             , c6);
 
     //jmf: NEW ASSERTS: we ought to do a *lot* of these
     COMPILE_CHECK(NUM_JOBS < JOB_UNKNOWN        , c7);
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 5189c24b2f..1613a6f968 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2636,222 +2636,190 @@ enum spell_type
     SPELL_IDENTIFY,
     SPELL_TELEPORT_SELF,
     SPELL_CAUSE_FEAR,
-    SPELL_CREATE_NOISE,
-    SPELL_REMOVE_CURSE,                //    5
-    SPELL_MAGIC_DART,
+    SPELL_REMOVE_CURSE,
+    SPELL_MAGIC_DART,                  //    5
     SPELL_FIREBALL,
-    SPELL_SWAP,
     SPELL_APPORTATION,
-    SPELL_TWIST,                       //   10
-    SPELL_FAR_STRIKE,
     SPELL_DELAYED_FIREBALL,
     SPELL_STRIKING,
-    SPELL_CONJURE_FLAME,
-    SPELL_DIG,                         //   15
+    SPELL_CONJURE_FLAME,               //   10
+    SPELL_DIG,
     SPELL_BOLT_OF_FIRE,
     SPELL_BOLT_OF_COLD,
     SPELL_LIGHTNING_BOLT,
-    SPELL_BOLT_OF_MAGMA,
-    SPELL_POLYMORPH_OTHER,             //   20
+    SPELL_BOLT_OF_MAGMA,               //   15
+    SPELL_POLYMORPH_OTHER,
     SPELL_SLOW,
     SPELL_HASTE,
     SPELL_PARALYSE,
-    SPELL_CONFUSE,
-    SPELL_INVISIBILITY,                //   25
+    SPELL_CONFUSE,                     //   20
+    SPELL_INVISIBILITY,
     SPELL_THROW_FLAME,
     SPELL_THROW_FROST,
     SPELL_CONTROLLED_BLINK,
-    SPELL_FREEZING_CLOUD,
-    SPELL_MEPHITIC_CLOUD,              //   30
+    SPELL_FREEZING_CLOUD,              //   25
+    SPELL_MEPHITIC_CLOUD,
     SPELL_RING_OF_FLAMES,
-    SPELL_RESTORE_STRENGTH,
-    SPELL_RESTORE_INTELLIGENCE,
-    SPELL_RESTORE_DEXTERITY,
-    SPELL_VENOM_BOLT,                  //   35
+    SPELL_VENOM_BOLT,
     SPELL_OLGREBS_TOXIC_RADIANCE,
-    SPELL_TELEPORT_OTHER,
+    SPELL_TELEPORT_OTHER,              //   30
     SPELL_LESSER_HEALING,
     SPELL_GREATER_HEALING,
-    SPELL_CURE_POISON_I,               //   40
-    SPELL_PURIFICATION,
     SPELL_DEATHS_DOOR,
     SPELL_SELECTIVE_AMNESIA,
-    SPELL_MASS_CONFUSION,
-    SPELL_SMITING,                     //   45
-    SPELL_REPEL_UNDEAD,
-    SPELL_HOLY_WORD,
+    SPELL_MASS_CONFUSION,              //   35
+    SPELL_SMITING,
     SPELL_DETECT_CURSE,
     SPELL_SUMMON_SMALL_MAMMALS,
-    SPELL_ABJURATION_I,                //   50
-    SPELL_SUMMON_SCORPIONS,
+    SPELL_ABJURATION,
+    SPELL_SUMMON_SCORPIONS,            //   40
     SPELL_LEVITATION,
     SPELL_BOLT_OF_DRAINING,
     SPELL_LEHUDIBS_CRYSTAL_SPEAR,
-    SPELL_BOLT_OF_INACCURACY,          //   55
-    SPELL_POISONOUS_CLOUD,
+    SPELL_BOLT_OF_INACCURACY,
+    SPELL_POISONOUS_CLOUD,             //   45
     SPELL_FIRE_STORM,
     SPELL_DETECT_TRAPS,
     SPELL_BLINK,
-    SPELL_ISKENDERUNS_MYSTIC_BLAST,    //   60
-    SPELL_SUMMON_SWARM,
+    SPELL_ISKENDERUNS_MYSTIC_BLAST,
+    SPELL_SUMMON_SWARM,                //   50
     SPELL_SUMMON_HORRIBLE_THINGS,
     SPELL_ENSLAVEMENT,
     SPELL_MAGIC_MAPPING,
-    SPELL_HEAL_OTHER,                  //   65
     SPELL_ANIMATE_DEAD,
-    SPELL_PAIN,
+    SPELL_PAIN,                        //   55
     SPELL_EXTENSION,
     SPELL_CONTROL_UNDEAD,
-    SPELL_ANIMATE_SKELETON,            //   70
+    SPELL_ANIMATE_SKELETON,
     SPELL_VAMPIRIC_DRAINING,
-    SPELL_SUMMON_WRAITHS,
+    SPELL_SUMMON_WRAITHS,              //   60
     SPELL_DETECT_ITEMS,
     SPELL_BORGNJORS_REVIVIFICATION,
-    SPELL_BURN,                        //   75
     SPELL_FREEZE,
     SPELL_SUMMON_ELEMENTAL,
-    SPELL_OZOCUBUS_REFRIGERATION,
+    SPELL_OZOCUBUS_REFRIGERATION,      //   65
     SPELL_STICKY_FLAME,
-    SPELL_SUMMON_ICE_BEAST,            //   80
+    SPELL_SUMMON_ICE_BEAST,
     SPELL_OZOCUBUS_ARMOUR,
     SPELL_CALL_IMP,
-    SPELL_REPEL_MISSILES,
+    SPELL_REPEL_MISSILES,              //   70
     SPELL_BERSERKER_RAGE,
-    SPELL_DISPEL_UNDEAD,               //   85
-    SPELL_SUMMON_ANGEL,
-    SPELL_PESTILENCE,
-    SPELL_THUNDERBOLT,
-    SPELL_FLAME_OF_CLEANSING,
-    SPELL_SHINING_LIGHT,               //   90
-    SPELL_SUMMON_DAEVA,
-    SPELL_ABJURATION_II,
-    SPELL_FULSOME_DISTILLATION,        //   93
-    SPELL_POISON_ARROW,                //   94
-
-    SPELL_TWISTED_RESURRECTION = 110,  //  110
+    SPELL_DISPEL_UNDEAD,
+    SPELL_FULSOME_DISTILLATION,
+    SPELL_POISON_ARROW,
+    SPELL_TWISTED_RESURRECTION,        //   75
     SPELL_REGENERATION,
     SPELL_BONE_SHARDS,
     SPELL_BANISHMENT,
     SPELL_CIGOTUVIS_DEGENERATION,
-    SPELL_STING,                       //  115
+    SPELL_STING,                       //   80
     SPELL_SUBLIMATION_OF_BLOOD,
     SPELL_TUKIMAS_DANCE,
     SPELL_HELLFIRE,
     SPELL_SUMMON_DEMON,
-    SPELL_DEMONIC_HORDE,               //  120
+    SPELL_DEMONIC_HORDE,               //   85
     SPELL_SUMMON_GREATER_DEMON,
     SPELL_CORPSE_ROT,
     SPELL_TUKIMAS_VORPAL_BLADE,
     SPELL_FIRE_BRAND,
-    SPELL_FREEZING_AURA,               //  125
+    SPELL_FREEZING_AURA,               //   90
     SPELL_LETHAL_INFUSION,
-    SPELL_CRUSH,
     SPELL_BOLT_OF_IRON,
     SPELL_STONE_ARROW,
-    SPELL_TOMB_OF_DOROKLOHE,           //  130
     SPELL_STONEMAIL,
-    SPELL_SHOCK,
+    SPELL_SHOCK,                       //   95
     SPELL_SWIFTNESS,
     SPELL_FLY,
-    SPELL_INSULATION,                  //  135
-    SPELL_ORB_OF_ELECTROCUTION,
+    SPELL_INSULATION,
     SPELL_DETECT_CREATURES,
-    SPELL_CURE_POISON_II,
+    SPELL_CURE_POISON,                 //  100
     SPELL_CONTROL_TELEPORT,
-    SPELL_POISON_AMMUNITION,           //  140
+    SPELL_POISON_AMMUNITION,
     SPELL_POISON_WEAPON,
     SPELL_RESIST_POISON,
-    SPELL_PROJECTED_NOISE,
+    SPELL_PROJECTED_NOISE,             //  105
     SPELL_ALTER_SELF,
-    SPELL_DEBUGGING_RAY,               //  145
+    SPELL_DEBUGGING_RAY,
     SPELL_RECALL,
     SPELL_PORTAL,
-    SPELL_AGONY,
+    SPELL_AGONY,                       //  110
     SPELL_SPIDER_FORM,
-    SPELL_DISRUPT,                     //  150
+    SPELL_DISRUPT,
     SPELL_DISINTEGRATE,
     SPELL_BLADE_HANDS,
-    SPELL_STATUE_FORM,
+    SPELL_STATUE_FORM,                 //  115
     SPELL_ICE_FORM,
-    SPELL_DRAGON_FORM,                 //  155
+    SPELL_DRAGON_FORM,
     SPELL_NECROMUTATION,
     SPELL_DEATH_CHANNEL,
-    SPELL_SYMBOL_OF_TORMENT,
+    SPELL_SYMBOL_OF_TORMENT,           //  120
     SPELL_DEFLECT_MISSILES,
-    SPELL_ORB_OF_FRAGMENTATION,        //  160
     SPELL_ICE_BOLT,
     SPELL_ICE_STORM,
-    SPELL_ARC,
     SPELL_AIRSTRIKE,
-    SPELL_SHADOW_CREATURES,            //  165
+    SPELL_SHADOW_CREATURES,            //  125
     SPELL_CONFUSING_TOUCH,
     SPELL_SURE_BLADE,
-//jmf: new spells
     SPELL_FLAME_TONGUE,
     SPELL_PASSWALL,
-    SPELL_IGNITE_POISON,               //  170
+    SPELL_IGNITE_POISON,               //  130
     SPELL_STICKS_TO_SNAKES,
-    SPELL_CALL_CANINE_FAMILIAR,        // e.g. hound
+    SPELL_CALL_CANINE_FAMILIAR,
     SPELL_SUMMON_DRAGON,
-    SPELL_TAME_BEASTS,                 // charm/enslave but only animals
-    SPELL_SLEEP,                       //  175
+    SPELL_TAME_BEASTS,
+    SPELL_SLEEP,                       //  135
     SPELL_MASS_SLEEP,
-    SPELL_DETECT_MAGIC,                //jmf: unfinished, perhaps useless
     SPELL_DETECT_SECRET_DOORS,
     SPELL_SEE_INVISIBLE,
-    SPELL_FORESCRY,                    //  180
-    SPELL_SUMMON_BUTTERFLIES,
+    SPELL_FORESCRY,
+    SPELL_SUMMON_BUTTERFLIES,          //  140
     SPELL_WARP_BRAND,
     SPELL_SILENCE,
     SPELL_SHATTER,
-    SPELL_DISPERSAL,                   //  185
-    SPELL_DISCHARGE,
-    SPELL_BEND,
+    SPELL_DISPERSAL,
+    SPELL_DISCHARGE,                   //  145
     SPELL_BACKLIGHT,
-    SPELL_INTOXICATE,   // confusion but only "smart" creatures
-    SPELL_EVAPORATE,    // 190, turn a potion into a cloud
-    SPELL_FRAGMENTATION,               // replacement for "orb of frag"
-    SPELL_AIR_WALK,                    // "dematerialise" (air/transmutation)
-    SPELL_SANDBLAST,     // mini-frag; can use stones for material comp
-    SPELL_ROTTING,       // evil god power or necromantic transmutation
-    SPELL_MAXWELLS_SILVER_HAMMER,      // 195, vorpal-brand maces etc.
-    SPELL_CONDENSATION_SHIELD,         // "shield" of icy vapour
-    SPELL_SEMI_CONTROLLED_BLINK,       //jmf: to test effect
+    SPELL_INTOXICATE,
+    SPELL_EVAPORATE,
+    SPELL_FRAGMENTATION,
+    SPELL_SANDBLAST,                   //  150
+    SPELL_MAXWELLS_SILVER_HAMMER,
+    SPELL_CONDENSATION_SHIELD,
     SPELL_STONESKIN,
     SPELL_SIMULACRUM,
-    SPELL_CONJURE_BALL_LIGHTNING,      //  200
+    SPELL_CONJURE_BALL_LIGHTNING,      //  155
     SPELL_CHAIN_LIGHTNING,
     SPELL_EXCRUCIATING_WOUNDS,
     SPELL_PORTAL_PROJECTILE,
     SPELL_SUMMON_UGLY_THING,
-    SPELL_PETRIFY,                     //  205
+    SPELL_PETRIFY,                     //  160
 
     // Mostly monster-only spells after this point:
-    SPELL_HELLFIRE_BURST,
+    SPELL_HELLFIRE_BURST = 175,
     SPELL_VAMPIRE_SUMMON,
     SPELL_BRAIN_FEED,
     SPELL_FAKE_RAKSHASA_SUMMON,
-    SPELL_STEAM_BALL,                  //  210
-    SPELL_SUMMON_UFETUBUS,
+    SPELL_STEAM_BALL,
+    SPELL_SUMMON_UFETUBUS,             //  180
     SPELL_SUMMON_BEAST,
     SPELL_ENERGY_BOLT,
     SPELL_POISON_SPLASH,
-    SPELL_SUMMON_UNDEAD,               //  215
-    SPELL_CANTRIP,
+    SPELL_SUMMON_UNDEAD,
+    SPELL_CANTRIP,                     //  185
     SPELL_QUICKSILVER_BOLT,
     SPELL_METAL_SPLINTERS,
     SPELL_MIASMA,
-    SPELL_SUMMON_DRAKES,               //  220
-    SPELL_BLINK_OTHER,
+    SPELL_SUMMON_DRAKES,
+    SPELL_BLINK_OTHER,                 //  190
     SPELL_SUMMON_MUSHROOMS,
     SPELL_ACID_SPLASH,
     SPELL_STICKY_FLAME_SPLASH,
-    SPELL_FIRE_BREATH,                 // 225
-    SPELL_COLD_BREATH,
+    SPELL_FIRE_BREATH,
+    SPELL_COLD_BREATH,                 // 195
     SPELL_DRACONIAN_BREATH,
-    SPELL_WATER_ELEMENTALS,
+    SPELL_WATER_ELEMENTALS,            // 197
 
-    NUM_SPELLS                         // 229
+    NUM_SPELLS                         // 198
 };
 
 enum slot_select_mode
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 8cc33fbc8c..e150201a28 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3712,9 +3712,8 @@ bool god_hates_spell_type(spell_type spell, god_type god)
     case GOD_SHINING_ONE:
         // TSO hates using poison, but is fine with curing it, resisting
         // it, or destroying it.
-        if ((disciplines & SPTYP_POISON)     && spell != SPELL_CURE_POISON_I
-            && spell != SPELL_CURE_POISON_II && spell != SPELL_RESIST_POISON
-            && spell != SPELL_IGNITE_POISON)
+        if ((disciplines & SPTYP_POISON) && spell != SPELL_CURE_POISON
+            && spell != SPELL_RESIST_POISON && spell != SPELL_IGNITE_POISON)
         {
             return (true);
         }
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 4f17ce7ca4..4c7ac86e17 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -127,7 +127,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      SPELL_NO_SPELL,
      },
     // 7 - Book of Summonings
-    {SPELL_ABJURATION_I,
+    {SPELL_ABJURATION,
      SPELL_RECALL,
      SPELL_CALL_CANINE_FAMILIAR,
      SPELL_SUMMON_UGLY_THING,
@@ -189,7 +189,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      },
     // 13 - Young Poisoner's Handbook
     {SPELL_STING,
-     SPELL_CURE_POISON_II,
+     SPELL_CURE_POISON,
      SPELL_POISON_WEAPON,
      SPELL_MEPHITIC_CLOUD,
      SPELL_VENOM_BOLT,
@@ -403,7 +403,6 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      SPELL_ALTER_SELF,
      // SPELL_IGNITE_POISON,    // moved to Fire which was a bit slim -- bwr
      SPELL_SHATTER,
-     // SPELL_AIR_WALK,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
@@ -515,7 +514,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      },
 
     // 43 - Book of Demonology - Vehumet special
-    {SPELL_ABJURATION_I,
+    {SPELL_ABJURATION,
      SPELL_RECALL,
      SPELL_CALL_IMP,
      SPELL_SUMMON_DEMON,
@@ -605,7 +604,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      },
 
     // 51 - Rod of summoning
-    {SPELL_ABJURATION_I,
+    {SPELL_ABJURATION,
      SPELL_RECALL,
      SPELL_SUMMON_ELEMENTAL,
      SPELL_SUMMON_SWARM,
@@ -655,7 +654,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      SPELL_NO_SPELL,
      },
     // 56 - Rod of warding
-    {SPELL_ABJURATION_I,
+    {SPELL_ABJURATION,
      SPELL_CONDENSATION_SHIELD,
      SPELL_CAUSE_FEAR,
      SPELL_DEFLECT_MISSILES,
@@ -675,7 +674,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      SPELL_NO_SPELL,
      },
     // 58 - Rod of demonology
-    {SPELL_ABJURATION_I,
+    {SPELL_ABJURATION,
      SPELL_RECALL,
      SPELL_CALL_IMP,
      SPELL_SUMMON_DEMON,
@@ -695,7 +694,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
      SPELL_NO_SPELL,
      },
     // 60 - Rod of venom
-    {SPELL_CURE_POISON_II,
+    {SPELL_CURE_POISON,
      SPELL_VENOM_BOLT,
      SPELL_POISON_ARROW,
      SPELL_POISONOUS_CLOUD,
@@ -1195,12 +1194,11 @@ bool you_cannot_memorise(spell_type spell)
     case US_HUNGRY_DEAD: // Ghouls
         switch (spell)
         {
-        case SPELL_AIR_WALK:
         case SPELL_ALTER_SELF:
         case SPELL_BERSERKER_RAGE:
         case SPELL_BLADE_HANDS:
         case SPELL_BORGNJORS_REVIVIFICATION:
-        case SPELL_CURE_POISON_II:
+        case SPELL_CURE_POISON:
         case SPELL_DEATHS_DOOR:
         case SPELL_DRAGON_FORM:
         case SPELL_ICE_FORM:
@@ -1236,12 +1234,11 @@ bool you_cannot_memorise(spell_type spell)
     case US_UNDEAD: // Mummies
         switch (spell)
         {
-        case SPELL_AIR_WALK:
         case SPELL_ALTER_SELF:
         case SPELL_BERSERKER_RAGE:
         case SPELL_BLADE_HANDS:
         case SPELL_BORGNJORS_REVIVIFICATION:
-        case SPELL_CURE_POISON_II:
+        case SPELL_CURE_POISON:
         case SPELL_DEATHS_DOOR:
         case SPELL_DRAGON_FORM:
         case SPELL_ICE_FORM:
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index dc3026862c..f7b3db1861 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -841,11 +841,10 @@ static bool _vampire_cannot_cast(spell_type spell)
     // Satiated or less
     switch (spell)
     {
-    case SPELL_AIR_WALK:
     case SPELL_ALTER_SELF:
     case SPELL_BERSERKER_RAGE:
     case SPELL_BLADE_HANDS:
-    case SPELL_CURE_POISON_II:
+    case SPELL_CURE_POISON:
     case SPELL_DRAGON_FORM:
     case SPELL_ICE_FORM:
     case SPELL_RESIST_POISON:
@@ -954,10 +953,7 @@ beam_type _spell_to_beam_type(spell_type spell)
 {
     switch (spell)
     {
-    case SPELL_BURN: return BEAM_FIRE;
     case SPELL_FREEZE: return BEAM_COLD;
-    case SPELL_CRUSH: return BEAM_MISSILE;
-    case SPELL_ARC: return BEAM_ELECTRICITY;
     default: break;
     }
     return BEAM_NONE;
@@ -1076,8 +1072,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
 
         if (testbits(flags, SPFLAG_NOT_SELF) && spd.isMe)
         {
-            if (spell == SPELL_TELEPORT_OTHER || spell == SPELL_HEAL_OTHER
-                || spell == SPELL_POLYMORPH_OTHER || spell == SPELL_BANISHMENT)
+            if (spell == SPELL_TELEPORT_OTHER || spell == SPELL_POLYMORPH_OTHER
+                || spell == SPELL_BANISHMENT)
             {
                 mpr( "Sorry, this spell works on others only." );
             }
@@ -1181,10 +1177,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
     switch (spell)
     {
     // spells using burn_freeze()
-    case SPELL_BURN:
     case SPELL_FREEZE:
-    case SPELL_CRUSH:
-    case SPELL_ARC:
         if (!burn_freeze(powc, _spell_to_beam_type(spell),
                          monster_at(you.pos() + spd.delta)))
         {
@@ -1320,11 +1313,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_THUNDERBOLT:
-        if (!zapping(ZAP_LIGHTNING, powc, beam, true))
-            return (SPRET_ABORT);
-        break;
-
     case SPELL_AGONY:
         if (!zapping(ZAP_AGONY, powc, beam, true))
             return (SPRET_ABORT);
@@ -1345,33 +1333,11 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_ORB_OF_FRAGMENTATION:
-        if (!zapping(ZAP_ORB_OF_FRAGMENTATION, powc, beam, true))
-            return (SPRET_ABORT);
-        break;
-
     case SPELL_CIGOTUVIS_DEGENERATION:
         if (!zapping(ZAP_DEGENERATION, powc, beam, true))
             return (SPRET_ABORT);
         break;
 
-    case SPELL_ORB_OF_ELECTROCUTION:
-        if (!zapping(ZAP_ORB_OF_ELECTRICITY, powc, beam, true))
-            return (SPRET_ABORT);
-        break;
-
-    case SPELL_FLAME_OF_CLEANSING:
-        cleansing_flame(powc, CLEANSING_FLAME_SPELL, you.pos(), &you);
-        break;
-
-    case SPELL_HOLY_WORD:
-        holy_word(100, HOLY_WORD_SPELL, you.pos(), true, &you);
-        break;
-
-    case SPELL_REPEL_UNDEAD:
-        turn_undead(100);
-        break;
-
     case SPELL_HELLFIRE:
         // Should only be available from
         // staff of Dispater & Sceptre of Asmodeus
@@ -1457,10 +1423,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_TWIST:
-        cast_twist(powc, beam.target);
-        break;
-
     case SPELL_AIRSTRIKE:
         airstrike(powc, spd);
         break;
@@ -1470,10 +1432,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_FAR_STRIKE:
-        cast_far_strike(powc);
-        break;
-
     case SPELL_PORTAL_PROJECTILE:
         if (!cast_portal_projectile(powc))
             return SPRET_ABORT;
@@ -1496,10 +1454,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_shatter(powc);
         break;
 
-    case SPELL_BEND:
-        cast_bend(powc);
-        break;
-
     case SPELL_SYMBOL_OF_TORMENT:
         torment(TORMENT_SPELL, you.pos());
         break;
@@ -1512,10 +1466,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_ignite_poison(powc);
         break;
 
-    case SPELL_ROTTING:
-        cast_rotting(powc);
-        break;
-
     // Summoning spells, and other spells that create new monsters.
     // If a god is making you cast one of these spells, any monsters
     // produced will count as god gifts.
@@ -1560,16 +1510,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_summon_dragon(powc, god);
         break;
 
-    case SPELL_SUMMON_ANGEL:
-        summon_holy_being_type(MONS_ANGEL, powc, god, (int)spell);
-        break;
-
-    case SPELL_SUMMON_DAEVA:
-        summon_holy_being_type(MONS_DAEVA, powc, god, (int)spell);
-        break;
-
     case SPELL_TUKIMAS_DANCE:
-        // Temporarily turn a wielded weapon into a dancing weapon.
+        // Temporarily turns a wielded weapon into a dancing weapon.
         if (normal_cast)
             crawl_state.cant_cmd_repeat("You can't repeat Tukima's Dance.");
         cast_tukimas_dance(powc, god);
@@ -1720,8 +1662,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         mass_enchantment(ENCH_CHARM, powc, MHITYOU);
         break;
 
-    case SPELL_ABJURATION_I:
-    case SPELL_ABJURATION_II:
+    case SPELL_ABJURATION:
         abjuration(powc);
         break;
 
@@ -1760,10 +1701,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_HEAL_OTHER:
-        zapping(ZAP_HEALING, powc, beam);
-        break;
-
     // Self-enchantments. (Spells that can only affect the player.)
     // Resistances.
     case SPELL_INSULATION:
@@ -1783,28 +1720,10 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         break;
 
     // Healing.
-    case SPELL_CURE_POISON_I:   // Ely version
-    case SPELL_CURE_POISON_II:  // Poison magic version
-        // both use same function
+    case SPELL_CURE_POISON:
         cast_cure_poison(powc);
         break;
 
-    case SPELL_PURIFICATION:
-        purification();
-        break;
-
-    case SPELL_RESTORE_STRENGTH:
-        restore_stat(STAT_STRENGTH, 0, false);
-        break;
-
-    case SPELL_RESTORE_INTELLIGENCE:
-        restore_stat(STAT_INTELLIGENCE, 0, false);
-        break;
-
-    case SPELL_RESTORE_DEXTERITY:
-        restore_stat(STAT_DEXTERITY, 0, false);
-        break;
-
     // Weapon brands.
     case SPELL_SURE_BLADE:
         cast_sure_blade(powc);
@@ -1885,11 +1804,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             canned_msg(MSG_SPELL_FIZZLES);
         break;
 
-    case SPELL_AIR_WALK:
-        if (!transform(powc, TRAN_AIR))
-            canned_msg(MSG_SPELL_FIZZLES);
-        break;
-
     case SPELL_ALTER_SELF:
         // Trying is already enough, even if it fails.
         did_god_conduct(DID_DELIBERATE_MUTATING, 10);
@@ -2006,12 +1920,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         you_teleport();
         break;
 
-    case SPELL_SEMI_CONTROLLED_BLINK:
-        //jmf: powc is ignored
-        if (cast_semi_controlled_blink(powc) == -1)
-            return (SPRET_ABORT);
-        break;
-
     case SPELL_CONTROLLED_BLINK:
         if (blink(powc, true) == -1)
             return (SPRET_ABORT);
@@ -2083,10 +1991,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         }
         break;
 
-    case SPELL_CREATE_NOISE:  // Unused, the player can shout to do this. - bwr
-        noisy(25, you.pos(), "You hear a voice calling your name!");
-        break;
-
     case SPELL_PROJECTED_NOISE:
         project_noise();
         break;
@@ -2105,21 +2009,11 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_passwall(powc);
         break;
 
-    case SPELL_TOMB_OF_DOROKLOHE:
-        entomb(powc);
-        break;
-
     case SPELL_APPORTATION:
         if (!cast_apportation(powc, beam.target))
             return (SPRET_ABORT);
         break;
 
-    case SPELL_SWAP:
-        if (normal_cast)
-            crawl_state.cant_cmd_repeat("You can't swap.");
-        cast_swap(powc);
-        break;
-
     case SPELL_RECALL:
         recall(0);
         break;
@@ -2139,10 +2033,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_fulsome_distillation(powc);
         break;
 
-    case SPELL_DETECT_MAGIC:
-        mpr("FIXME: implement!");
-        break;
-
     case SPELL_DEBUGGING_RAY:
         if (!zapping(ZAP_DEBUGGING_RAY, powc, beam, true))
             return (SPRET_ABORT);
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 896ea1f126..911ed55c38 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -22,8 +22,8 @@
 
    Enchantment
    These spells mostly cause some kind of durational effect, which lasts only
-   until the magic wears off. Enchantments are distinguished from trans-
-   migrations in that the latter cause a permanent alteration in something
+   until the magic wears off. Enchantments are distinguished from
+   transmutations in that the latter cause a permanent alteration in something
    which persists even after the magic has faded, while the effects of the
    former last only so long as the magic does. Sometimes enchantments may take
    advantage of the more powerful aspects of transmutation to induce some
@@ -119,7 +119,6 @@
  *   Trigger contingency
  *   Preserve Corpses
  *   Permanency
- *   Ball Lightning
  *   Explosive rune?
  *   Fennel wands
  *   More summonings!
@@ -169,19 +168,6 @@
 },
 
 {
-    SPELL_CREATE_NOISE, "Create Noise",
-     SPTYP_ENCHANTMENT,
-     SPFLAG_NONE,
-     1,
-     0,
-     LOS_RADIUS, LOS_RADIUS,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
     SPELL_REMOVE_CURSE, "Remove Curse",
      SPTYP_ENCHANTMENT,
      SPFLAG_NONE,
@@ -221,19 +207,6 @@
 },
 
 {
-    SPELL_SWAP, "Swap",
-     SPTYP_TRANSLOCATION,
-     SPFLAG_NONE,
-     4,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_APPORTATION, "Apportation",
      SPTYP_TRANSLOCATION,
      SPFLAG_GRID | SPFLAG_NOT_SELF,
@@ -247,32 +220,6 @@
 },
 
 {
-    SPELL_TWIST, "Twist",
-     SPTYP_TRANSLOCATION,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
-     1,
-     25,
-     LOS_RADIUS, LOS_RADIUS,
-     0,
-     NULL,
-     true,
-     false
-},
-
-{
-    SPELL_FAR_STRIKE, "Far Strike",
-     SPTYP_TRANSLOCATION,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
-     3,
-     100,
-     LOS_RADIUS, LOS_RADIUS,
-     0,
-     NULL,
-     true,
-     false
-},
-
-{
     SPELL_DELAYED_FIREBALL, "Delayed Fireball",
      SPTYP_FIRE | SPTYP_CONJURATION,
      SPFLAG_NONE,
@@ -288,7 +235,7 @@
 {
     SPELL_STRIKING, "Striking",
      0,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_BATTLE,
+     SPFLAG_DIR_OR_TARGET | SPFLAG_BATTLE, // rod of striking
      1,
      25,
      5, 5,
@@ -420,7 +367,7 @@
 {
     SPELL_PARALYSE, "Paralyse",
      SPTYP_ENCHANTMENT,
-     SPFLAG_DIR_OR_TARGET,
+     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
      4,
      200,
      LOS_RADIUS, LOS_RADIUS,
@@ -548,45 +495,6 @@
 },
 
 {
-    SPELL_RESTORE_STRENGTH, "Restore Strength",
-     SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
-     2,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
-    SPELL_RESTORE_INTELLIGENCE, "Restore Intelligence",
-     SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
-     2,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
-    SPELL_RESTORE_DEXTERITY, "Restore Dexterity",
-     SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
-     2,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
     SPELL_VENOM_BOLT, "Venom Bolt",
      SPTYP_CONJURATION | SPTYP_POISON,
      SPFLAG_DIR_OR_TARGET,
@@ -628,7 +536,7 @@
 {
     SPELL_LESSER_HEALING, "Lesser Healing",
      SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
+     SPFLAG_RECOVERY | SPFLAG_HELPFUL | SPFLAG_MONSTER,
      2,
      0,
      LOS_RADIUS, LOS_RADIUS,
@@ -641,7 +549,7 @@
 {
     SPELL_GREATER_HEALING, "Greater Healing",
      SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
+     SPFLAG_RECOVERY | SPFLAG_HELPFUL | SPFLAG_MONSTER,
      6,
      0,
      LOS_RADIUS, LOS_RADIUS,
@@ -652,32 +560,6 @@
 },
 
 {
-    SPELL_CURE_POISON_I, "Cure Poison",
-     SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
-     3,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
-    SPELL_PURIFICATION, "Purification",
-     SPTYP_HOLY,
-     SPFLAG_RECOVERY | SPFLAG_HELPFUL,
-     5,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
     SPELL_DEATHS_DOOR, "Death's Door",
      SPTYP_ENCHANTMENT | SPTYP_NECROMANCY,
      SPFLAG_NONE,
@@ -719,7 +601,7 @@
 {
     SPELL_SMITING, "Smiting",
      SPTYP_NONE,
-     SPFLAG_TARGET | SPFLAG_NOT_SELF,
+     SPFLAG_TARGET | SPFLAG_NOT_SELF, // divine ability, rod, monsters
      4,
      200,
      LOS_RADIUS, LOS_RADIUS,
@@ -730,32 +612,6 @@
 },
 
 {
-    SPELL_REPEL_UNDEAD, "Repel Undead",
-     SPTYP_HOLY,
-     SPFLAG_AREA,
-     3,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
-    SPELL_HOLY_WORD, "Holy Word",
-     SPTYP_HOLY,
-     SPFLAG_AREA,
-     7,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_DETECT_CURSE, "Detect Curse",
      SPTYP_DIVINATION,
      SPFLAG_NONE,
@@ -782,7 +638,7 @@
 },
 
 {
-    SPELL_ABJURATION_I, "Abjuration",
+    SPELL_ABJURATION, "Abjuration",
      SPTYP_SUMMONING,
      SPFLAG_AREA | SPFLAG_NEUTRAL | SPFLAG_ESCAPE,
      3,
@@ -849,7 +705,7 @@
 {
     SPELL_BOLT_OF_INACCURACY, "Bolt of Inaccuracy",
      SPTYP_CONJURATION,
-     SPFLAG_DIR_OR_TARGET,
+     SPFLAG_DIR_OR_TARGET, // rod/tome of destruction
      3,
      1000,
      7, 7,
@@ -929,7 +785,7 @@
 {
     SPELL_SUMMON_SWARM, "Summon Swarm",
      SPTYP_SUMMONING,
-     SPFLAG_BATTLE,
+     SPFLAG_BATTLE, // rod of summoning, and Xom may cast this.
      6,
      200,
      -1, -1,
@@ -979,19 +835,6 @@
 },
 
 {
-    SPELL_HEAL_OTHER, "Heal Other",
-     SPTYP_HOLY,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_HELPFUL | SPFLAG_NOT_SELF,
-     3,
-     100,
-     LOS_RADIUS, LOS_RADIUS,
-     0,
-     NULL,
-     true,
-     true
-},
-
-{
    SPELL_ANIMATE_DEAD, "Animate Dead",
      SPTYP_NECROMANCY,
      SPFLAG_AREA | SPFLAG_NEUTRAL,
@@ -1108,19 +951,6 @@
 },
 
 {
-    SPELL_BURN, "Burn", // used by wanderers
-     SPTYP_FIRE,
-     SPFLAG_DIR | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
-     1,
-     25,
-     1, 1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_FREEZE, "Freeze",
      SPTYP_ICE,
      SPFLAG_DIR | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
@@ -1251,98 +1081,6 @@
 },
 
 {
-    SPELL_SUMMON_ANGEL, "Summon Angel",
-     SPTYP_HOLY,
-     SPFLAG_NONE,
-     7,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
-    SPELL_PESTILENCE, "Pestilence",
-     SPTYP_HOLY,
-     SPFLAG_NONE,
-     4,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
-    SPELL_THUNDERBOLT, "Thunderbolt",
-     SPTYP_HOLY | SPTYP_AIR,
-     SPFLAG_DIR_OR_TARGET,
-     6,         // why is this the only holy spell with a secondary? {dlb}
-     200,
-     8, 8,
-     0,
-     NULL,
-     true,
-     false
-}
-,
-
-{
-    SPELL_FLAME_OF_CLEANSING, "Flame of Cleansing",
-     SPTYP_HOLY,
-     SPFLAG_DIR_OR_TARGET,
-     8,
-     200,
-     6, 6,
-     0,
-     NULL,
-     true,
-     false
-},
-
-{
-    SPELL_SHINING_LIGHT, "Shining Light",
-     SPTYP_HOLY,
-     SPFLAG_NONE,
-     7,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
-    SPELL_SUMMON_DAEVA, "Summon Daeva",
-     SPTYP_HOLY,
-     SPFLAG_NONE,
-     8,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
-    SPELL_ABJURATION_II, "Abjuration",
-     SPTYP_HOLY,
-     SPFLAG_AREA | SPFLAG_NEUTRAL | SPFLAG_ESCAPE,
-     4,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_FULSOME_DISTILLATION, "Fulsome Distillation",
      SPTYP_TRANSMUTATION | SPTYP_NECROMANCY,
      SPFLAG_NONE,
@@ -1475,7 +1213,8 @@
 {
     SPELL_HELLFIRE, "Hellfire",
      SPTYP_CONJURATION | SPTYP_FIRE,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_UNHOLY,
+     SPFLAG_DIR_OR_TARGET | SPFLAG_UNHOLY | SPFLAG_MONSTER,
+        // plus DS ability, staff of Dispater & Sceptre of Asmodeus
      9,
      200,
      7, 7,
@@ -1590,19 +1329,6 @@
 },
 
 {
-    SPELL_CRUSH, "Crush",
-     SPTYP_EARTH,
-     SPFLAG_DIR | SPFLAG_NOT_SELF | SPFLAG_DEVEL | SPFLAG_BATTLE,
-     1,
-     25,
-     1, 1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_BOLT_OF_IRON, "Bolt of Iron",
      SPTYP_CONJURATION | SPTYP_EARTH,
      SPFLAG_DIR_OR_TARGET,
@@ -1629,20 +1355,6 @@
 },
 
 {
-    SPELL_TOMB_OF_DOROKLOHE, "Tomb of Doroklohe",
-     SPTYP_CONJURATION | SPTYP_EARTH, // conj makes more sense than tmig -- bwr
-     SPFLAG_CARD,
-     7,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     false
-}
-,
-
-{
     SPELL_STONEMAIL, "Stonemail",
      SPTYP_ENCHANTMENT | SPTYP_EARTH,
      SPFLAG_NONE,
@@ -1708,19 +1420,6 @@
 },
 
 {
-    SPELL_ORB_OF_ELECTROCUTION, "Orb of Electrocution",
-     SPTYP_CONJURATION | SPTYP_AIR,
-     SPFLAG_DIR_OR_TARGET,
-     7,
-     200,
-     7, 12,
-     0,
-     NULL,
-     true,
-     false
-},
-
-{
     SPELL_DETECT_CREATURES, "Detect Creatures",
      SPTYP_DIVINATION,
      SPFLAG_MAPPING,
@@ -1734,7 +1433,7 @@
 },
 
 {
-    SPELL_CURE_POISON_II, "Cure Poison",
+    SPELL_CURE_POISON, "Cure Poison",
      SPTYP_POISON,
      SPFLAG_RECOVERY | SPFLAG_HELPFUL,
      2,
@@ -1905,7 +1604,7 @@
 {
     SPELL_DISINTEGRATE, "Disintegrate",
      SPTYP_TRANSMUTATION,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_CARD,
+     SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_CARD, // also: wand
      6,
      200,
      6, 6,
@@ -2020,19 +1719,6 @@
 },
 
 {
-    SPELL_ORB_OF_FRAGMENTATION, "Orb of Fragmentation",
-     SPTYP_CONJURATION | SPTYP_EARTH,
-     SPFLAG_DIR_OR_TARGET,
-     7,
-     200,
-     5, 5,
-     0,
-     NULL,
-     true,
-     false
-},
-
-{
     SPELL_ICE_BOLT, "Ice Bolt",
      SPTYP_CONJURATION | SPTYP_ICE,
      SPFLAG_DIR_OR_TARGET,
@@ -2059,19 +1745,6 @@
 },
 
 {
-    SPELL_ARC, "Arc",
-     SPTYP_AIR,
-     SPFLAG_DIR | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
-     1,
-     25,
-     1, 1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_AIRSTRIKE, "Airstrike",
      SPTYP_AIR,
      SPFLAG_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
@@ -2086,7 +1759,7 @@
 
 {
     SPELL_SHADOW_CREATURES, "Shadow Creatures",
-     SPTYP_SUMMONING, // jmf: or SPTYP_SUMMONING | SPTYP_CONJURATION
+     SPTYP_SUMMONING,
      SPFLAG_UNHOLY,
      5,
      0,
@@ -2191,7 +1864,7 @@
 {
     SPELL_SUMMON_DRAGON, "Summon Dragon",
      SPTYP_FIRE | SPTYP_SUMMONING,
-     SPFLAG_NONE,
+     SPFLAG_NONE, // Xom may cast this spell.
      9,
      200,
      -1, -1,
@@ -2241,19 +1914,6 @@
 },
 
 {
-    SPELL_DETECT_MAGIC, "Detect Magic",
-     SPTYP_DIVINATION,
-     SPFLAG_DEVEL,
-     1,
-     0,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
     SPELL_DETECT_SECRET_DOORS, "Detect Secret Doors",
      SPTYP_DIVINATION,
      SPFLAG_NONE,
@@ -2371,19 +2031,6 @@
 },
 
 {
-    SPELL_BEND, "Bend",
-     SPTYP_TRANSLOCATION,
-     SPFLAG_DIR | SPFLAG_BATTLE,
-     1,
-     100,
-     1, 1,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_BACKLIGHT, "Corona",
      SPTYP_ENCHANTMENT,
      SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF,
@@ -2436,19 +2083,6 @@
 },
 
 {
-    SPELL_AIR_WALK, "Air Walk",
-     SPTYP_TRANSMUTATION | SPTYP_AIR,
-     SPFLAG_HELPFUL,
-     9,
-     200,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
     SPELL_SANDBLAST, "Sandblast",
      SPTYP_TRANSMUTATION | SPTYP_EARTH,
      SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
@@ -2462,19 +2096,6 @@
 },
 
 {
-    SPELL_ROTTING, "Rotting",
-     SPTYP_TRANSMUTATION | SPTYP_NECROMANCY,
-     SPFLAG_AREA,
-     5,
-     200,
-     LOS_RADIUS, LOS_RADIUS,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_MAXWELLS_SILVER_HAMMER, "Maxwell's Silver Hammer",
      SPTYP_TRANSMUTATION | SPTYP_EARTH,
      SPFLAG_HELPFUL | SPFLAG_BATTLE,
@@ -2501,19 +2122,6 @@
 },
 
 {
-    SPELL_SEMI_CONTROLLED_BLINK, "Semi-Controlled Blink",
-     SPTYP_TRANSLOCATION,
-     SPFLAG_ESCAPE,
-     3,
-     100,
-     -1, -1,
-     0,
-     NULL,
-     false,
-     true
-},
-
-{
     SPELL_STONESKIN, "Stoneskin",
      SPTYP_EARTH | SPTYP_TRANSMUTATION, // was ench -- bwr
      SPFLAG_HELPFUL,
@@ -2893,7 +2501,7 @@
 {
     SPELL_WATER_ELEMENTALS, "Summon Water Elementals",
      SPTYP_SUMMONING,
-     SPFLAG_NONE,
+     SPFLAG_MONSTER,
      5,
      0,
      -1, -1,