diff options
-rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/goditem.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-data.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/xom.cc | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 775bdc26b8..ac07751bde 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2822,7 +2822,7 @@ enum spell_type SPELL_SUMMON_DRAGON, SPELL_TAME_BEASTS, SPELL_HIBERNATION, - SPELL_MASS_SLEEP, + SPELL_ENGLACIATION, SPELL_DETECT_SECRET_DOORS, SPELL_SEE_INVISIBLE, SPELL_PHASE_SHIFT, diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc index 7976e77994..cfe29fcd8f 100644 --- a/crawl-ref/source/goditem.cc +++ b/crawl-ref/source/goditem.cc @@ -598,7 +598,7 @@ bool god_dislikes_spell_type(spell_type spell, god_type god) // into a state where attacking them would be unchivalrous. if (spell == SPELL_CAUSE_FEAR || spell == SPELL_PARALYSE || spell == SPELL_CONFUSE || spell == SPELL_MASS_CONFUSION - || spell == SPELL_HIBERNATION || spell == SPELL_MASS_SLEEP) + || spell == SPELL_HIBERNATION || spell == SPELL_ENGLACIATION) { return (true); } diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index cfcb8b9c07..1c71fbdd8c 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -161,7 +161,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_OZOCUBUS_REFRIGERATION, SPELL_BOLT_OF_COLD, SPELL_SIMULACRUM, - SPELL_MASS_SLEEP, + SPELL_ENGLACIATION, SPELL_NO_SPELL, }, @@ -402,7 +402,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_TAME_BEASTS, SPELL_MASS_CONFUSION, SPELL_CONTROL_UNDEAD, - SPELL_MASS_SLEEP, + SPELL_ENGLACIATION, SPELL_NO_SPELL, SPELL_NO_SPELL, }, diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 7ad9cb8c4f..7ae0ca5e6e 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1807,7 +1807,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) mass_enchantment(ENCH_CONFUSION, powc, MHITYOU); break; - case SPELL_MASS_SLEEP: + case SPELL_ENGLACIATION: cast_mass_sleep(powc); break; diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 79bea30680..e81560a409 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -1677,7 +1677,7 @@ }, { - SPELL_MASS_SLEEP, "Metabolic Englaciation", + SPELL_ENGLACIATION, "Metabolic Englaciation", SPTYP_ENCHANTMENT | SPTYP_ICE, SPFLAG_AREA, 7, diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 7e4449feb6..c3ec97ed8e 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2801,7 +2801,7 @@ int tileidx_spell(spell_type spell) case SPELL_OZOCUBUS_REFRIGERATION: return TILEG_OZOCUBUS_REFRIGERATION; case SPELL_BOLT_OF_COLD: return TILEG_BOLT_OF_COLD; case SPELL_FREEZING_CLOUD: return TILEG_FREEZING_CLOUD; - case SPELL_MASS_SLEEP: return TILEG_METABOLIC_ENGLACIATION; + case SPELL_ENGLACIATION: return TILEG_METABOLIC_ENGLACIATION; case SPELL_SIMULACRUM: return TILEG_SIMULACRUM; case SPELL_ICE_STORM: return TILEG_ICE_STORM; diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 60e7dc50bf..8ceda15fb7 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -85,7 +85,7 @@ static const spell_type _xom_nontension_spells[] = // Spells to be cast at tension > 0, i.e. usually in battle situations. static const spell_type _xom_tension_spells[] = { - SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_CAUSE_FEAR, SPELL_MASS_SLEEP, + SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_CAUSE_FEAR, SPELL_ENGLACIATION, SPELL_DISPERSAL, SPELL_STONESKIN, SPELL_RING_OF_FLAMES, SPELL_OLGREBS_TOXIC_RADIANCE, SPELL_TUKIMAS_VORPAL_BLADE, SPELL_MAXWELLS_SILVER_HAMMER, SPELL_FIRE_BRAND, SPELL_FREEZING_AURA, |