diff options
-rw-r--r-- | crawl-ref/source/beam.cc | 14 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 6 | ||||
-rw-r--r-- | crawl-ref/source/ghost.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/goditem.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mon-cast.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/mon-spll.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spl-data.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 2 |
11 files changed, 23 insertions, 23 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index e07caf2742..2540116d7b 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1197,14 +1197,14 @@ const zap_info zap_data[] = { }, { - ZAP_SLEEP, + ZAP_HIBERNATION, "0", 100, NULL, NULL, BLACK, true, - BEAM_SLEEP, + BEAM_HIBERNATION, DCHAR_SPACE, false, false, @@ -3789,7 +3789,7 @@ void bolt::affect_player_enchantment() switch (flavour) { - case BEAM_SLEEP: + case BEAM_HIBERNATION: you.put_to_sleep(ench_power); break; @@ -5006,7 +5006,7 @@ bool _ench_flavour_affects_monster(beam_type flavour, const monsters* mon) rc = !mon->res_negative_energy(); break; - case BEAM_SLEEP: + case BEAM_HIBERNATION: rc = mon->can_sleep(); break; @@ -5211,7 +5211,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) mon->hurt(agent(), damage.roll(), flavour); return (MON_AFFECTED); - case BEAM_SLEEP: + case BEAM_HIBERNATION: if (mon->can_sleep()) { if (simple_monster_message(mon, " looks drowsy...")) @@ -5879,7 +5879,7 @@ bool bolt::nasty_to(const monsters *mon) const // degeneration / sleep / enslave soul if (flavour == BEAM_DEGENERATE - || flavour == BEAM_SLEEP + || flavour == BEAM_HIBERNATION || flavour == BEAM_ENSLAVE_SOUL) { return (mon->holiness() == MH_NATURAL); @@ -6129,7 +6129,7 @@ std::string beam_type_name(beam_type type) case BEAM_PETRIFY: return ("petrify"); case BEAM_BACKLIGHT: return ("backlight"); case BEAM_PORKALATOR: return ("porkalator"); - case BEAM_SLEEP: return ("sleep"); + case BEAM_HIBERNATION: return ("sleep"); case BEAM_BERSERK: return ("berserk"); case BEAM_POTION_BLACK_SMOKE: return ("black smoke"); case BEAM_POTION_GREY_SMOKE: return ("grey smoke"); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 9d2eb982c0..775bdc26b8 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -245,7 +245,7 @@ enum beam_type // beam[].flavour BEAM_PETRIFY, BEAM_BACKLIGHT, // 45 BEAM_PORKALATOR, - BEAM_SLEEP, + BEAM_HIBERNATION, BEAM_BERSERK, BEAM_LAST_ENCHANTMENT = BEAM_BERSERK, @@ -2821,7 +2821,7 @@ enum spell_type SPELL_CALL_CANINE_FAMILIAR, SPELL_SUMMON_DRAGON, SPELL_TAME_BEASTS, - SPELL_SLEEP, + SPELL_HIBERNATION, SPELL_MASS_SLEEP, SPELL_DETECT_SECRET_DOORS, SPELL_SEE_INVISIBLE, @@ -3121,7 +3121,7 @@ enum zap_type ZAP_THROW_ICICLE, ZAP_ICE_STORM, ZAP_BACKLIGHT, - ZAP_SLEEP, + ZAP_HIBERNATION, ZAP_FLAME_TONGUE, ZAP_SANDBLAST, ZAP_SMALL_SANDBLAST, diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc index 1886b65f8b..3c813f0a8c 100644 --- a/crawl-ref/source/ghost.cc +++ b/crawl-ref/source/ghost.cc @@ -68,7 +68,7 @@ static spell_type search_order_conj[] = { SPELL_SHOCK, SPELL_SANDBLAST, SPELL_MAGIC_DART, - SPELL_SLEEP, + SPELL_HIBERNATION, SPELL_BACKLIGHT, SPELL_NO_SPELL, // end search }; diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc index 3a1341accb..7976e77994 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_SLEEP || spell == SPELL_MASS_SLEEP) + || spell == SPELL_HIBERNATION || spell == SPELL_MASS_SLEEP) { return (true); } diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 748815eb73..5f1824aa35 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -281,8 +281,8 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power, beam.is_beam = true; break; - case SPELL_SLEEP: - beam.flavour = BEAM_SLEEP; + case SPELL_HIBERNATION: + beam.flavour = BEAM_HIBERNATION; beam.is_beam = true; break; diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 52d6f152a7..84bf0e05a0 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1268,7 +1268,7 @@ { SPELL_VENOM_BOLT, SPELL_BLINK_OTHER, - SPELL_SLEEP, + SPELL_HIBERNATION, SPELL_VENOM_BOLT, SPELL_SLOW, SPELL_MINOR_HEALING diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index c6b3a51d2a..d7fa8b93d4 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2409,9 +2409,9 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell ) case SPELL_BANISHMENT: case SPELL_DISINTEGRATE: case SPELL_PARALYSE: - case SPELL_SLEEP: + case SPELL_HIBERNATION: { - if (monspell == SPELL_SLEEP && (!foe || foe->asleep())) + if (monspell == SPELL_HIBERNATION && (!foe || foe->asleep())) { ret = true; break; diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 8845464757..cfcb8b9c07 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -156,7 +156,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = // 9 - Book of Ice {SPELL_FREEZING_AURA, - SPELL_SLEEP, + SPELL_HIBERNATION, SPELL_CONDENSATION_SHIELD, SPELL_OZOCUBUS_REFRIGERATION, SPELL_BOLT_OF_COLD, @@ -322,7 +322,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = // 24 - Book of Charms {SPELL_BACKLIGHT, SPELL_REPEL_MISSILES, - SPELL_SLEEP, + SPELL_HIBERNATION, SPELL_CONFUSE, SPELL_ENSLAVEMENT, SPELL_SILENCE, diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index bc0e65d97e..7ad9cb8c4f 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1766,7 +1766,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) cast_tame_beasts(powc); break; - case SPELL_SLEEP: + case SPELL_HIBERNATION: { const int sleep_power = stepdown_value(powc * 9 / 10, 5, 35, 45, 50); @@ -1774,7 +1774,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) mprf(MSGCH_DIAGNOSTICS, "Sleep power stepdown: %d -> %d", powc, sleep_power); #endif - if (!zapping(ZAP_SLEEP, sleep_power, beam, true)) + if (!zapping(ZAP_HIBERNATION, sleep_power, beam, true)) return (SPRET_ABORT); break; } diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 724d627fd9..79bea30680 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -1664,7 +1664,7 @@ }, { - SPELL_SLEEP, "Ensorcelled Hibernation", + SPELL_HIBERNATION, "Ensorcelled Hibernation", SPTYP_ENCHANTMENT | SPTYP_ICE, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF, 2, diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 64b2f7e0bc..7e4449feb6 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2794,7 +2794,7 @@ int tileidx_spell(spell_type spell) case SPELL_FREEZE: return TILEG_FREEZE; case SPELL_THROW_FROST: return TILEG_THROW_FROST; case SPELL_FREEZING_AURA: return TILEG_FREEZING_AURA; - case SPELL_SLEEP: return TILEG_ENSORCELLED_HIBERNATION; + case SPELL_HIBERNATION: return TILEG_ENSORCELLED_HIBERNATION; case SPELL_OZOCUBUS_ARMOUR: return TILEG_OZOCUBUS_ARMOUR; case SPELL_THROW_ICICLE: return TILEG_THROW_ICICLE; case SPELL_CONDENSATION_SHIELD: return TILEG_CONDENSATION_SHIELD; |