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

1 files changed, 72 insertions, 104 deletions

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