From f80d6f4e45cbee76a1184268a5e10fcde7ba6c52 Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Thu, 12 Nov 2009 19:45:44 +1000 Subject: Rename SPELL_BACKLIGHT -> SPELL_CORONA, and relevant ZAP/BEAM/DUR. --- crawl-ref/source/acr.cc | 2 +- crawl-ref/source/beam.cc | 12 ++++++------ crawl-ref/source/directn.cc | 2 +- crawl-ref/source/enum.h | 10 +++++----- crawl-ref/source/ghost.cc | 4 ++-- crawl-ref/source/it_use2.cc | 4 ++-- crawl-ref/source/item_use.cc | 2 +- crawl-ref/source/mon-cast.cc | 4 ++-- crawl-ref/source/mon-spll.h | 4 ++-- crawl-ref/source/mon-util.cc | 2 +- crawl-ref/source/monster.cc | 10 +++++----- crawl-ref/source/newgame.cc | 4 ++-- crawl-ref/source/player.cc | 16 ++++++++-------- crawl-ref/source/spells4.cc | 8 ++++---- crawl-ref/source/spl-book.cc | 2 +- crawl-ref/source/spl-cast.cc | 4 ++-- crawl-ref/source/spl-data.h | 2 +- crawl-ref/source/spl-mis.cc | 2 +- crawl-ref/source/tilepick.cc | 2 +- 19 files changed, 48 insertions(+), 48 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 83761a7cb6..850991c7de 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2504,7 +2504,7 @@ static void _decrement_durations() Options.tutorial_events[TUT_YOU_ENCHANTED] = tut_slow; } - if (you.duration[DUR_BACKLIGHT] && !--you.duration[DUR_BACKLIGHT] + if (you.duration[DUR_CORONA] && !--you.duration[DUR_CORONA] && !you.backlit()) { mpr("You are no longer glowing.", MSGCH_DURATION); diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 2540116d7b..bd777efe11 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1181,14 +1181,14 @@ const zap_info zap_data[] = { }, { - ZAP_BACKLIGHT, + ZAP_CORONA, "0", 100, NULL, NULL, BLUE, true, - BEAM_BACKLIGHT, + BEAM_CORONA, DCHAR_SPACE, false, false, @@ -3793,7 +3793,7 @@ void bolt::affect_player_enchantment() you.put_to_sleep(ench_power); break; - case BEAM_BACKLIGHT: + case BEAM_CORONA: you.backlight(); obvious_effect = true; break; @@ -5221,7 +5221,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) } return (MON_UNAFFECTED); - case BEAM_BACKLIGHT: + case BEAM_CORONA: if (backlight_monsters(mon->pos(), hit, 0)) { obvious_effect = true; @@ -5324,7 +5324,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) if (!mon->has_ench(ENCH_INVIS) && mon->add_ench(ENCH_INVIS)) { // A casting of invisibility erases backlight. - mon->del_ench(ENCH_BACKLIGHT); + mon->del_ench(ENCH_CORONA); // Can't use simple_monster_message() here, since it checks // for visibility of the monster (and it's now invisible). @@ -6127,7 +6127,7 @@ std::string beam_type_name(beam_type type) case BEAM_ENSLAVE_DEMON: return ("enslave demon"); case BEAM_BLINK: return ("blink"); case BEAM_PETRIFY: return ("petrify"); - case BEAM_BACKLIGHT: return ("backlight"); + case BEAM_CORONA: return ("backlight"); case BEAM_PORKALATOR: return ("porkalator"); case BEAM_HIBERNATION: return ("sleep"); case BEAM_BERSERK: return ("berserk"); diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index b0349a6721..45437ab529 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2992,7 +2992,7 @@ static std::string _describe_mons_enchantment(const monsters &mons, case ENCH_POISON: return "poisoned"; case ENCH_SICK: return "sick"; case ENCH_ROT: return "rotting away"; //jmf: "covered in sores"? - case ENCH_BACKLIGHT: return "softly glowing"; + case ENCH_CORONA: return "softly glowing"; case ENCH_SLOW: return "moving slowly"; case ENCH_BERSERK: return "berserk"; case ENCH_BATTLE_FRENZY: return "consumed by blood-lust"; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index ac07751bde..6408f267ca 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -243,7 +243,7 @@ enum beam_type // beam[].flavour BEAM_ENSLAVE_DEMON, BEAM_BLINK, BEAM_PETRIFY, - BEAM_BACKLIGHT, // 45 + BEAM_CORONA, // 45 BEAM_PORKALATOR, BEAM_HIBERNATION, BEAM_BERSERK, @@ -1147,7 +1147,7 @@ enum duration_type DUR_CONFUSING_TOUCH, DUR_SURE_BLADE, - DUR_BACKLIGHT, + DUR_CORONA, DUR_DEATHS_DOOR, DUR_FIRE_SHIELD, @@ -1221,7 +1221,7 @@ enum enchant_type ENCH_ROT, // 10 ENCH_SUMMON, ENCH_ABJ, - ENCH_BACKLIGHT, + ENCH_CORONA, ENCH_CHARM, ENCH_STICKY_FLAME, // 15 ENCH_GLOWING_SHAPESHIFTER, @@ -2832,7 +2832,7 @@ enum spell_type SPELL_SHATTER, SPELL_DISPERSAL, SPELL_DISCHARGE, - SPELL_BACKLIGHT, + SPELL_CORONA, SPELL_INTOXICATE, SPELL_EVAPORATE, SPELL_FRAGMENTATION, @@ -3120,7 +3120,7 @@ enum zap_type ZAP_ORB_OF_FRAGMENTATION, ZAP_THROW_ICICLE, ZAP_ICE_STORM, - ZAP_BACKLIGHT, + ZAP_CORONA, ZAP_HIBERNATION, ZAP_FLAME_TONGUE, ZAP_SANDBLAST, diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc index 3c813f0a8c..0bfb9a0938 100644 --- a/crawl-ref/source/ghost.cc +++ b/crawl-ref/source/ghost.cc @@ -69,7 +69,7 @@ static spell_type search_order_conj[] = { SPELL_SANDBLAST, SPELL_MAGIC_DART, SPELL_HIBERNATION, - SPELL_BACKLIGHT, + SPELL_CORONA, SPELL_NO_SPELL, // end search }; @@ -114,7 +114,7 @@ static spell_type search_order_misc[] = { SPELL_TELEPORT_OTHER, // 10 SPELL_DIG, - SPELL_BACKLIGHT, + SPELL_CORONA, SPELL_NO_SPELL, // end search }; diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index b8cee7b101..bbe84c93e7 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -304,7 +304,7 @@ bool potion_effect(potion_type pot_eff, int pow, bool drank_it, bool was_known) // And also cancel backlight (for whatever good that will // do). - you.duration[DUR_BACKLIGHT] = 0; + you.duration[DUR_CORONA] = 0; return (true); } @@ -324,7 +324,7 @@ bool potion_effect(potion_type pot_eff, int pow, bool drank_it, bool was_known) } // Invisibility cancels backlight. - you.duration[DUR_BACKLIGHT] = 0; + you.duration[DUR_CORONA] = 0; // Now multiple invisiblity casts aren't as good. -- bwr if (!you.duration[DUR_INVIS]) diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d0644d47ce..eda4114516 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -5069,7 +5069,7 @@ static void _vulnerability_scroll() ENCH_FEAR, ENCH_CONFUSION, ENCH_INVIS, - ENCH_BACKLIGHT, + ENCH_CORONA, ENCH_CHARM, ENCH_PARALYSIS, ENCH_PETRIFYING, diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 5f1824aa35..402576bd14 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -271,8 +271,8 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power, beam.flavour = BEAM_HASTE; break; - case SPELL_BACKLIGHT: - beam.flavour = BEAM_BACKLIGHT; + case SPELL_CORONA: + beam.flavour = BEAM_CORONA; beam.is_beam = true; break; diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 84bf0e05a0..e246092c2a 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1080,7 +1080,7 @@ SPELL_SLOW, SPELL_SUMMON_UGLY_THING, SPELL_PORKALATOR, - SPELL_BACKLIGHT, + SPELL_CORONA, SPELL_INVISIBILITY } }, @@ -1088,7 +1088,7 @@ { MST_DOWAN, { SPELL_THROW_FROST, - SPELL_BACKLIGHT, + SPELL_CORONA, SPELL_BLINK, SPELL_THROW_FLAME, SPELL_HASTE_OTHER, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index d7fa8b93d4..06ec8b7a61 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2355,7 +2355,7 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell ) ret = (!foe || foe->holiness() != MH_UNDEAD); break; - case SPELL_BACKLIGHT: + case SPELL_CORONA: ret = (!foe || foe->backlit()); break; diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 1982175f14..afbb16af7c 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2847,7 +2847,7 @@ bool monsters::asleep() const bool monsters::backlit(bool check_haloed) const { - return (has_ench(ENCH_BACKLIGHT) + return (has_ench(ENCH_CORONA) || ((check_haloed) ? haloed() : false)); } @@ -4319,7 +4319,7 @@ void monsters::remove_enchantment_effect(const mon_enchant &me, bool quiet) behaviour_event(this, ME_EVAL); break; - case ENCH_BACKLIGHT: + case ENCH_CORONA: if (!quiet) { if (visible_to(&you)) @@ -4512,7 +4512,7 @@ void monsters::timeout_enchantments(int levels) { switch (i->first) { - case ENCH_POISON: case ENCH_ROT: case ENCH_BACKLIGHT: + case ENCH_POISON: case ENCH_ROT: case ENCH_CORONA: case ENCH_STICKY_FLAME: case ENCH_ABJ: case ENCH_SHORT_LIVED: case ENCH_SLOW: case ENCH_HASTE: case ENCH_MIGHT: case ENCH_FEAR: case ENCH_INVIS: case ENCH_CHARM: case ENCH_SLEEP_WARY: @@ -4658,7 +4658,7 @@ void monsters::apply_enchantment(const mon_enchant &me) case ENCH_PETRIFYING: case ENCH_PETRIFIED: case ENCH_SICK: - case ENCH_BACKLIGHT: + case ENCH_CORONA: case ENCH_ABJ: case ENCH_CHARM: case ENCH_SLEEP_WARY: @@ -6019,7 +6019,7 @@ int mon_enchant::calc_duration(const monsters *mons, cturn = 1000 * (deg - 1) / _mod_speed(333, mons->speed); cturn += 1000 / _mod_speed(250, mons->speed); break; - case ENCH_BACKLIGHT: + case ENCH_CORONA: if (deg > 1) cturn = 1000 * (deg - 1) / _mod_speed(200, mons->speed); cturn += 1000 / _mod_speed(100, mons->speed); diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index f3115d6d48..b0760bc6de 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -1646,7 +1646,7 @@ static void _give_basic_spells(job_type which_job) which_spell = SPELL_PAIN; break; case JOB_ENCHANTER: - which_spell = SPELL_BACKLIGHT; + which_spell = SPELL_CORONA; break; case JOB_FIRE_ELEMENTALIST: which_spell = SPELL_FLAME_TONGUE; @@ -2427,7 +2427,7 @@ static void _give_wanderer_spell(skill_type skill) break; case SK_ENCHANTMENTS: - spell = SPELL_BACKLIGHT; + spell = SPELL_CORONA; break; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index b3d7218db1..49d210f4ec 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6895,7 +6895,7 @@ bool player::visible_to(const actor *looker) const bool player::backlit(bool check_haloed) const { - return (get_contamination_level() > 0 || duration[DUR_BACKLIGHT] + return (get_contamination_level() > 0 || duration[DUR_CORONA] || (check_haloed ? haloed() : false)); } @@ -6904,22 +6904,22 @@ void player::backlight() { if (!this->duration[DUR_INVIS]) { - if (this->duration[DUR_BACKLIGHT]) + if (this->duration[DUR_CORONA]) mpr("You glow brighter."); else mpr("You are outlined in light."); - this->duration[DUR_BACKLIGHT] += random_range(15, 35); - if (this->duration[DUR_BACKLIGHT] > 250) - this->duration[DUR_BACKLIGHT] = 250; + this->duration[DUR_CORONA] += random_range(15, 35); + if (this->duration[DUR_CORONA] > 250) + this->duration[DUR_CORONA] = 250; } else { mpr("You feel strangely conspicuous."); - this->duration[DUR_BACKLIGHT] += random_range(3, 5); - if (this->duration[DUR_BACKLIGHT] > 250) - this->duration[DUR_BACKLIGHT] = 250; + this->duration[DUR_CORONA] += random_range(3, 5); + if (this->duration[DUR_CORONA] > 250) + this->duration[DUR_CORONA] = 250; } } diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index b046c0ac29..3458dc6671 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1036,22 +1036,22 @@ bool backlight_monsters(coord_def where, int pow, int garbage) if (mons_class_flag(monster->type, M_GLOWS)) return (false); - mon_enchant bklt = monster->get_ench(ENCH_BACKLIGHT); + mon_enchant bklt = monster->get_ench(ENCH_CORONA); const int lvl = bklt.degree; // This enchantment overrides invisibility (neat). if (monster->has_ench(ENCH_INVIS)) { - if (!monster->has_ench(ENCH_BACKLIGHT)) + if (!monster->has_ench(ENCH_CORONA)) { monster->add_ench( - mon_enchant(ENCH_BACKLIGHT, 1, KC_OTHER, random_range(30, 50))); + mon_enchant(ENCH_CORONA, 1, KC_OTHER, random_range(30, 50))); simple_monster_message(monster, " is lined in light."); } return (true); } - monster->add_ench(mon_enchant(ENCH_BACKLIGHT, 1)); + monster->add_ench(mon_enchant(ENCH_CORONA, 1)); if (lvl == 0) simple_monster_message(monster, " is outlined in light."); diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 1c71fbdd8c..989e5db899 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -320,7 +320,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = }, // 24 - Book of Charms - {SPELL_BACKLIGHT, + {SPELL_CORONA, SPELL_REPEL_MISSILES, SPELL_HIBERNATION, SPELL_CONFUSE, diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 7ae0ca5e6e..25c7058974 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1738,8 +1738,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) cast_confusing_touch(powc); break; - case SPELL_BACKLIGHT: - if (!zapping(ZAP_BACKLIGHT, powc + 10, beam, true)) + case SPELL_CORONA: + if (!zapping(ZAP_CORONA, powc + 10, beam, true)) return (SPRET_ABORT); break; diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index e81560a409..f7a118fb82 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -1807,7 +1807,7 @@ }, { - SPELL_BACKLIGHT, "Corona", + SPELL_CORONA, "Corona", SPTYP_ENCHANTMENT, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF, 1, diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc index e348a4c61c..5a1452e7da 100644 --- a/crawl-ref/source/spl-mis.cc +++ b/crawl-ref/source/spl-mis.cc @@ -630,7 +630,7 @@ void MiscastEffect::_potion_effect(int pot_eff, int pot_pow) // There's no levitation enchantment for monsters, and, // anyway, it's not nearly as inconvenient for monsters as // for the player, so backlight them instead. - mon_target->add_ench(mon_enchant(ENCH_BACKLIGHT, pot_pow, kc)); + mon_target->add_ench(mon_enchant(ENCH_CORONA, pot_pow, kc)); break; case POT_BERSERK_RAGE: if (target->can_go_berserk()) diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index c3ec97ed8e..561d790dd1 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2819,7 +2819,7 @@ int tileidx_spell(spell_type spell) // Enchantment case SPELL_CONFUSING_TOUCH: return TILEG_CONFUSING_TOUCH; - case SPELL_BACKLIGHT: return TILEG_CORONA; + case SPELL_CORONA: return TILEG_CORONA; case SPELL_PROJECTED_NOISE: return TILEG_PROJECTED_NOISE; case SPELL_SURE_BLADE: return TILEG_SURE_BLADE; case SPELL_TUKIMAS_VORPAL_BLADE: return TILEG_TUKIMAS_VORPAL_BLADE; -- cgit v1.2.3-54-g00ecf