diff options
19 files changed, 84 insertions, 77 deletions
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt index 1a7d4f8734..b0b2f7b497 100644 --- a/crawl-ref/source/dat/descript/spells.txt +++ b/crawl-ref/source/dat/descript/spells.txt @@ -278,6 +278,10 @@ Haste This spell speeds the actions of a creature. %%%% +Haunt + +This spell calls on the powers of the undead to aid the caster. +%%%% Hellfire This spell should only be available from Dispater's staff. So how are you reading this? @@ -570,10 +574,6 @@ Summon Ugly Thing This spell summons a mutated otherworldly creature to the caster's aid. %%%% -Summon Wraiths - -This spell calls on the powers of the undead to aid the caster. -%%%% Sure Blade This spell forms a mystical bond between the caster and a wielded short blade, making the blade much easier to use. diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 84acf15828..a98d43b465 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -835,7 +835,7 @@ void direct_effect(monsters *source, spell_type spell, } break; - case SPELL_SUMMON_WRAITHS: + case SPELL_HAUNT: if (!def) mpr("You feel haunted."); else diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 58376fb08c..291c0bf43a 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2780,7 +2780,7 @@ enum spell_type SPELL_CONTROL_UNDEAD, SPELL_ANIMATE_SKELETON, SPELL_VAMPIRIC_DRAINING, - SPELL_SUMMON_WRAITHS, // 60 + SPELL_HAUNT, // 60 SPELL_DETECT_ITEMS, SPELL_BORGNJORS_REVIVIFICATION, SPELL_FREEZE, diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc index f78487fed4..fffe1dc4eb 100644 --- a/crawl-ref/source/ghost.cc +++ b/crawl-ref/source/ghost.cc @@ -76,7 +76,7 @@ static spell_type search_order_third[] = { SPELL_SYMBOL_OF_TORMENT, SPELL_SUMMON_GREATER_DEMON, SPELL_SUMMON_HORRIBLE_THINGS, - SPELL_SUMMON_WRAITHS, + SPELL_HAUNT, SPELL_SUMMON_DEMON, SPELL_DEMONIC_HORDE, SPELL_HASTE, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index d0b8981a23..6195b80834 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1695,7 +1695,7 @@ int exper_value(const monsters *monster) { case SPELL_PARALYSE: case SPELL_SMITING: - case SPELL_SUMMON_WRAITHS: + case SPELL_HAUNT: case SPELL_HELLFIRE_BURST: case SPELL_HELLFIRE: case SPELL_SYMBOL_OF_TORMENT: @@ -3232,13 +3232,15 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell ) static bool _ms_los_spell(spell_type monspell) { - // True, the tentacles _are_ summoned but they are restricted to water - // just like the kraken is, so it makes more sense not to count them here. + // True, the tentacles _are_ summoned, but they are restricted to + // water just like the kraken is, so it makes more sense not to + // count them here. if (SPELL_KRAKEN_TENTACLES) return (false); - if (monspell == SPELL_SMITING || monspell == SPELL_AIRSTRIKE - || monspell == SPELL_SUMMON_WRAITHS + if (monspell == SPELL_SMITING + || monspell == SPELL_AIRSTRIKE + || monspell == SPELL_HAUNT || spell_typematch(monspell, SPTYP_SUMMONING)) { return (true); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 42df85b2e0..eca5e7c0ad 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1711,10 +1711,10 @@ int monster_die(monsters *monster, killer_type killer, } // Yes, we are splitting undead pets from the others // as a way to focus Necromancy vs. Summoning - // (ignoring Summon Wraith here)... at least we're - // being nice and putting the natural creature - // summons together with the demonic ones. Note - // that Vehumet gets a free pass here since those + // (ignoring Haunt here)... at least we're being + // nice and putting the natural creature summons + // together with the demonic ones. Note that + // Vehumet gets a free pass here since those // followers are assumed to come from summoning // spells... the others are from invocations (TSO, // Makhleb, Kiku). - bwr diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 7873eb8477..ef95a45c67 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -124,7 +124,7 @@ static bool _los_free_spell(spell_type spell_cast) return (spell_cast == SPELL_HELLFIRE_BURST || spell_cast == SPELL_BRAIN_FEED || spell_cast == SPELL_SMITING - || spell_cast == SPELL_SUMMON_WRAITHS + || spell_cast == SPELL_HAUNT || spell_cast == SPELL_FIRE_STORM || spell_cast == SPELL_AIRSTRIKE); } @@ -139,17 +139,21 @@ static bool _legs_msg_applicable() void mons_cast_haunt(monsters *monster) { coord_def fpos; + switch (monster->foe) { case MHITNOT: return; + case MHITYOU: fpos = you.pos(); break; + default: fpos = menv[monster->foe].pos(); } - _do_high_level_summon(monster, mons_near(monster), SPELL_SUMMON_WRAITHS, + + _do_high_level_summon(monster, mons_near(monster), SPELL_HAUNT, _pick_random_wraith, random_range(3, 6), GOD_NO_GOD, &fpos); } @@ -1152,7 +1156,7 @@ void setup_mons_cast(monsters *monster, bolt &pbolt, case SPELL_CONJURE_BALL_LIGHTNING: case SPELL_SUMMON_DRAKES: case SPELL_SUMMON_HORRIBLE_THINGS: - case SPELL_SUMMON_WRAITHS: + case SPELL_HAUNT: case SPELL_SYMBOL_OF_TORMENT: case SPELL_SUMMON_GREATER_DEMON: case SPELL_CANTRIP: diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt index 29c1502964..be9e60fe2f 100644 --- a/crawl-ref/source/rltiles/dc-spells.txt +++ b/crawl-ref/source/rltiles/dc-spells.txt @@ -10,7 +10,7 @@ necromancy SPELL_NECROMANCY poison SPELL_POISON summoning SPELL_SUMMONING translocation SPELL_TRANSLOCATION -transmigration SPELL_TRANSMIGRATION +transmutation SPELL_TRANSMUTATION %sdir spells/air airstrike AIRSTRIKE @@ -117,6 +117,7 @@ deaths_door DEATHS_DOOR dispel_undead DISPEL_UNDEAD excruciating_wounds EXCRUCIATING_WOUNDS fulsome_distillation FULSOME_DISTILLATION +haunt HAUNT lethal_infusion LETHAL_INFUSION necromutation NECROMUTATION pain PAIN @@ -158,7 +159,6 @@ summon_scorpions SUMMON_SCORPIONS summon_shadow_creatures SUMMON_SHADOW_CREATURES summon_small_mammals SUMMON_SMALL_MAMMALS summon_ugly_thing SUMMON_UGLY_THING -summon_wraiths SUMMON_WRAITHS %sdir spells/translocation apportation APPORTATION @@ -174,7 +174,7 @@ teleport TELEPORT teleport_other TELEPORT_OTHER warp_weapon WARP_WEAPON -%sdir spells/transmigration +%sdir spells/transmutation alter_self ALTER_SELF blade_hands BLADE_HANDS polymorph_other POLYMORPH_OTHER diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_wraiths.png b/crawl-ref/source/rltiles/spells/necromancy/haunt.png Binary files differindex 70feb473e9..70feb473e9 100644 --- a/crawl-ref/source/rltiles/spells/summoning/summon_wraiths.png +++ b/crawl-ref/source/rltiles/spells/necromancy/haunt.png diff --git a/crawl-ref/source/rltiles/spells/transmigration/alter_self.png b/crawl-ref/source/rltiles/spells/transmutation/alter_self.png Binary files differindex 179a0a5dea..179a0a5dea 100644 --- a/crawl-ref/source/rltiles/spells/transmigration/alter_self.png +++ b/crawl-ref/source/rltiles/spells/transmutation/alter_self.png diff --git a/crawl-ref/source/rltiles/spells/transmigration/blade_hands.png b/crawl-ref/source/rltiles/spells/transmutation/blade_hands.png Binary files differindex c2c8a3fde3..c2c8a3fde3 100644 --- a/crawl-ref/source/rltiles/spells/transmigration/blade_hands.png +++ b/crawl-ref/source/rltiles/spells/transmutation/blade_hands.png diff --git a/crawl-ref/source/rltiles/spells/transmigration/polymorph_other.png b/crawl-ref/source/rltiles/spells/transmutation/polymorph_other.png Binary files differindex 648f83c86c..648f83c86c 100644 --- a/crawl-ref/source/rltiles/spells/transmigration/polymorph_other.png +++ b/crawl-ref/source/rltiles/spells/transmutation/polymorph_other.png diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index b5cff1372f..0987840647 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1259,43 +1259,45 @@ bool cast_twisted_resurrection(int pow, god_type god) return (true); } -bool cast_summon_wraiths(int pow, const coord_def& where, god_type god) +bool cast_haunt(int pow, const coord_def& where, god_type god) { monsters *m = monster_at(where); if (m == NULL) { - mpr("An evil force gathers but it quickly dissipates."); + mpr("An evil force gathers, but it quickly dissipates."); return (true); } + int mi = monster_index(m); - ASSERT(!(invalid_monster_index(mi))); + ASSERT(!invalid_monster_index(mi)); if (stop_attack_prompt(m, false, you.pos())) - return false; + return (false); bool friendly = true; int success = 0; int to_summon = stepdown_value(2 + (random2(pow) / 10) + (random2(pow) / 10), 2, 2, 6, -1); - while(to_summon--) + while (to_summon--) { const int chance = random2(25); - monster_type mon = ((chance > 22) ? MONS_PHANTOM : // 8% - (chance > 20) ? MONS_HUNGRY_GHOST : // 8% - (chance > 18) ? MONS_FLAYED_GHOST : // 8% - (chance > 7) ? MONS_WRAITH : // 44%/40% - (chance > 2) ? MONS_FREEZING_WRAITH // 20%/16% - : MONS_SPECTRAL_WARRIOR); // 12% + monster_type mon = ((chance > 22) ? MONS_PHANTOM : // 8% + (chance > 20) ? MONS_HUNGRY_GHOST : // 8% + (chance > 18) ? MONS_FLAYED_GHOST : // 8% + (chance > 7) ? MONS_WRAITH : // 44%/40% + (chance > 2) ? MONS_FREEZING_WRAITH // 20%/16% + : MONS_SPECTRAL_WARRIOR); // 12% + if ((chance == 3 || chance == 8) && player_see_invis()) - mon = MONS_SHADOW_WRAITH; // 0%/8% + mon = MONS_SHADOW_WRAITH; // 0%/8% const int monster = create_monster( mgen_data(mon, BEH_FRIENDLY, - 5, SPELL_SUMMON_WRAITHS, + 5, SPELL_HAUNT, where, mi, MG_FORCE_BEH, god)); if (monster != -1) diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h index 0bbe327f6a..0d47622da8 100644 --- a/crawl-ref/source/spells3.h +++ b/crawl-ref/source/spells3.h @@ -61,7 +61,7 @@ int animate_dead(actor *caster, int pow, beh_type beha, unsigned short hitting, bool cast_simulacrum(int pow, god_type god = GOD_NO_GOD); bool cast_twisted_resurrection(int pow, god_type god = GOD_NO_GOD); -bool cast_summon_wraiths(int pow, const coord_def& where, god_type god = GOD_NO_GOD); +bool cast_haunt(int pow, const coord_def& where, god_type god = GOD_NO_GOD); bool cast_death_channel(int pow, god_type god = GOD_NO_GOD); void you_teleport(); diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 0e0fd0ea5b..df1b03760d 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -137,7 +137,6 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_CALL_CANINE_FAMILIAR, SPELL_SUMMON_UGLY_THING, SPELL_SHADOW_CREATURES, - SPELL_SUMMON_WRAITHS, SPELL_SUMMON_HORRIBLE_THINGS, SPELL_NO_SPELL, }, @@ -542,7 +541,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = // 44 - Necronomicon - Kikubaaqudgha special {SPELL_SYMBOL_OF_TORMENT, SPELL_CONTROL_UNDEAD, - SPELL_SUMMON_WRAITHS, + SPELL_HAUNT, SPELL_DEATHS_DOOR, SPELL_NECROMUTATION, SPELL_DEATH_CHANNEL, diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 295a3bf957..66b835d736 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -781,7 +781,7 @@ bool cast_a_spell(bool check_range, spell_type spell) random_uselessness(); else { - const spret_type cast_result = your_spells( spell ); + const spret_type cast_result = your_spells(spell); if (cast_result == SPRET_ABORT) { crawl_state.zero_turns_taken(); @@ -1166,10 +1166,10 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) int potion = -1; - // XXX: This handles only some of the cases where spells need targetting... - // there are others that do their own that will be missed by this - // (and thus will not properly ESC without cost because of it). - // Hopefully, those will eventually be fixed. -- bwr + // XXX: This handles only some of the cases where spells need + // targetting. There are others that do their own that will be + // missed by this (and thus will not properly ESC without cost + // because of it). Hopefully, those will eventually be fixed. - bwr if ((flags & SPFLAG_TARGETTING_MASK) && spell != SPELL_PORTAL_PROJECTILE) { targ_mode_type targ = @@ -1179,11 +1179,11 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) targ = TARG_ANY; targetting_type dir = - ( (spell == SPELL_APPORTATION) ? DIR_TARGET_OBJECT : - testbits(flags, SPFLAG_TARGET) ? DIR_TARGET : - testbits(flags, SPFLAG_GRID) ? DIR_TARGET : - testbits(flags, SPFLAG_DIR) ? DIR_DIR : - DIR_NONE ); + ((spell == SPELL_APPORTATION) ? DIR_TARGET_OBJECT : + testbits(flags, SPFLAG_TARGET) ? DIR_TARGET : + testbits(flags, SPFLAG_GRID) ? DIR_TARGET : + testbits(flags, SPFLAG_DIR) ? DIR_DIR : + DIR_NONE ); const char *prompt = get_spell_target_prompt(spell); if (spell == SPELL_EVAPORATE) @@ -1239,10 +1239,10 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) if (powc == 0 || allow_fail) _surge_power(spell); - // Added this so that the passed in powc can have meaning -- bwr + // Added this so that the passed in powc can have meaning. - bwr // Remember that most holy spells don't yet use powc! if (powc == 0) - powc = calc_spell_power( spell, true ); + powc = calc_spell_power(spell, true); const god_type god = (crawl_state.is_god_acting()) ? crawl_state.which_god_acting() @@ -1253,7 +1253,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) // Make some noise if it's actually the player casting. if (god == GOD_NO_GOD) - noisy( spell_noise(spell), you.pos() ); + noisy(spell_noise(spell), you.pos()); if (allow_fail) { @@ -1268,7 +1268,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) spfl = -you.penance[GOD_SIF_MUNA]; // Reduced penance reduction here because casting spells - // is a player controllable act. -- bwr + // is a player controllable act. - bwr if (one_chance_in(12)) dec_penance(GOD_SIF_MUNA, 1); } @@ -1288,9 +1288,9 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) { _spellcasting_side_effects(spell, true); - mpr( "You miscast the spell." ); - flush_input_buffer( FLUSH_ON_FAILURE ); - learned_something_new( TUT_SPELL_MISCAST ); + mpr("You miscast the spell."); + flush_input_buffer(FLUSH_ON_FAILURE); + learned_something_new(TUT_SPELL_MISCAST); if (you.religion == GOD_SIF_MUNA && !player_under_penance() @@ -1300,21 +1300,21 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) return (SPRET_FAIL); } - // all spell failures give a bit of magical radiation.. - // failure is a function of power squared multiplied - // by how badly you missed the spell. High power - // spells can be quite nasty: 9 * 9 * 90 / 500 = 15 - // points of contamination! + // All spell failures give a bit of magical radiation. + // Failure is a function of power squared multiplied by how + // badly you missed the spell. High power spells can be + // quite nasty: 9 * 9 * 90 / 500 = 15 points of + // contamination! int nastiness = spell_mana(spell) * spell_mana(spell) * (spfail_chance - spfl) + 250; const int cont_points = div_rand_round(nastiness, 500); // miscasts are uncontrolled - contaminate_player( cont_points ); + contaminate_player(cont_points); - MiscastEffect( &you, NON_MONSTER, spell, spell_mana(spell), - spfail_chance - spfl ); + MiscastEffect(&you, NON_MONSTER, spell, spell_mana(spell), + spfail_chance - spfl); return (SPRET_FAIL); } @@ -1495,8 +1495,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) break; case SPELL_HELLFIRE: - // Should only be available from - // staff of Dispater & Sceptre of Asmodeus + // Should only be available from Staff of Dispater and Sceptre + // of Asmodeus. if (!zapping(ZAP_HELLFIRE, powc, beam, true)) return (SPRET_ABORT); break; @@ -1561,16 +1561,16 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) // casting Fireball in their standard equipment. However, // the power level for the actual fireball is determined at // release, so if you do swap out your enhancers you'll - // get a less powerful ball when its released. -- bwr + // get a less powerful ball when it's released. - bwr // - if (!you.attribute[ ATTR_DELAYED_FIREBALL ]) + if (!you.attribute[ATTR_DELAYED_FIREBALL]) { - // okay, this message is weak but functional -- bwr - mpr( "You feel magically charged." ); - you.attribute[ ATTR_DELAYED_FIREBALL ] = 1; + // Okay, this message is weak but functional. - bwr + mpr("You feel magically charged."); + you.attribute[ATTR_DELAYED_FIREBALL] = 1; } else - canned_msg( MSG_NOTHING_HAPPENS ); + canned_msg(MSG_NOTHING_HAPPENS); break; // LOS spells @@ -1725,8 +1725,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) cast_twisted_resurrection(powc, god); break; - case SPELL_SUMMON_WRAITHS: - cast_summon_wraiths(powc, beam.target, god); + case SPELL_HAUNT: + cast_haunt(powc, beam.target, god); break; case SPELL_DEATH_CHANNEL: diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index bc28ababf3..1f580dd1e1 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -856,7 +856,7 @@ }, { - SPELL_SUMMON_WRAITHS, "Haunt", + SPELL_HAUNT, "Haunt", SPTYP_NECROMANCY, SPFLAG_TARGET | SPFLAG_NOT_SELF, 7, diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 0571f3f253..25b855e1d7 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -883,7 +883,7 @@ void redraw_screen(void) // STEPDOWN FUNCTION to replace conditional chains in spells2.cc 12jan2000 {dlb} // it is a bit more extensible and optimises the logical structure, as well -// usage: cast_summon_swarm() cast_summon_wraiths() cast_summon_scorpions() +// usage: cast_summon_swarm() cast_haunt() cast_summon_scorpions() // cast_summon_horrible_things() // ex(1): stepdown_value (foo, 2, 2, 6, 8) replaces the following block: // diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 5373fd9284..c714de0c30 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2866,7 +2866,6 @@ int tileidx_spell(spell_type spell) case SPELL_SUMMON_ICE_BEAST: return TILEG_SUMMON_ICE_BEAST; case SPELL_DEMONIC_HORDE: return TILEG_DEMONIC_HORDE; case SPELL_SUMMON_GREATER_DEMON: return TILEG_SUMMON_GREATER_DEMON; - case SPELL_SUMMON_WRAITHS: return TILEG_SUMMON_WRAITHS; case SPELL_SUMMON_HORRIBLE_THINGS: return TILEG_SUMMON_HORRIBLE_THINGS; // Necromancy @@ -2881,6 +2880,7 @@ int tileidx_spell(spell_type spell) case SPELL_REGENERATION: return TILEG_REGENERATION; case SPELL_ANIMATE_DEAD: return TILEG_ANIMATE_DEAD; case SPELL_DISPEL_UNDEAD: return TILEG_DISPEL_UNDEAD; + case SPELL_HAUNT: return TILEG_HAUNT; case SPELL_BORGNJORS_REVIVIFICATION: return TILEG_BORGNJORS_REVIVIFICATION; case SPELL_CIGOTUVIS_DEGENERATION: return TILEG_CIGOTUVIS_DEGENERATION; case SPELL_AGONY: return TILEG_AGONY; @@ -2892,7 +2892,7 @@ int tileidx_spell(spell_type spell) case SPELL_DEATHS_DOOR: return TILEG_DEATHS_DOOR; case SPELL_DEATH_CHANNEL: return TILEG_DEATH_CHANNEL; - // Transformation + // Transmutation case SPELL_STICKS_TO_SNAKES: return TILEG_STICKS_TO_SNAKES; case SPELL_SPIDER_FORM: return TILEG_SPIDER_FORM; case SPELL_ICE_FORM: return TILEG_ICE_FORM; |
