From 9b362245046e8d9b4f32c22b5fc142b9933703f9 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 12 Mar 2009 06:03:59 +0000 Subject: Remove unused god abilities. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9421 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 65 ++++---------------------------------------- crawl-ref/source/enum.h | 17 +++++------- crawl-ref/source/spells4.cc | 24 ---------------- crawl-ref/source/spells4.h | 1 - 4 files changed, 12 insertions(+), 95 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 5aca3410a4..428a0c2b64 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -273,11 +273,11 @@ static const ability_def Ability_List[] = ABFLAG_CONF_OK }, // Lugonu - { ABIL_LUGONU_ABYSS_EXIT, "Depart the Abyss", 1, 0, 150, 10, ABFLAG_NONE }, - { ABIL_LUGONU_BEND_SPACE, "Bend Space", 1, 0, 50, 0, ABFLAG_PAIN }, - { ABIL_LUGONU_BANISH, "Banish", + { ABIL_LUGONU_ABYSS_EXIT, "Depart the Abyss", 1, 0, 150, 10, ABFLAG_NONE }, + { ABIL_LUGONU_BEND_SPACE, "Bend Space", 1, 0, 50, 0, ABFLAG_PAIN }, + { ABIL_LUGONU_BANISH, "Banish", 4, 0, 200, generic_cost::range(3, 4), ABFLAG_NONE }, - { ABIL_LUGONU_CORRUPT, "Corrupt", + { ABIL_LUGONU_CORRUPT, "Corrupt", 7, 5, 500, generic_cost::range(10, 14), ABFLAG_NONE }, { ABIL_LUGONU_ABYSS_ENTER, "Enter the Abyss", 9, 0, 500, generic_cost::fixed(35), ABFLAG_PAIN }, @@ -295,12 +295,6 @@ static const ability_def Ability_List[] = { ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, "Recall Orcish Followers", 2, 0, 50, 0, ABFLAG_NONE }, - // These six are unused "evil" god abilities: - { ABIL_CHARM_SNAKE, "Charm Snake", 6, 0, 200, 5, ABFLAG_NONE }, - { ABIL_BREATHE_HELLFIRE, "Breathe Hellfire", 0, 8, 200, 0, ABFLAG_BREATH }, - - { ABIL_TORMENT_II, "Call Torment", 9, 0, 0, 3, ABFLAG_PAIN }, - { ABIL_HARM_PROTECTION, "Protection From Harm", 0, 0, 0, 0, ABFLAG_NONE }, { ABIL_HARM_PROTECTION_II, "Reliable Protection From Harm", 0, 0, 0, 0, ABFLAG_PIETY }, @@ -582,12 +576,8 @@ static talent _get_talent(ability_type ability, bool check_confused) perfect = true; failure = 0; break; - - case ABIL_BREATHE_HELLFIRE: - failure = 32 - you.experience_level; - break; // end transformation abilities {dlb} - // + // begin item abilities - some possibly mutagenic {dlb} case ABIL_EVOKE_TURN_INVISIBLE: case ABIL_EVOKE_TELEPORTATION: @@ -747,17 +737,6 @@ static talent _get_talent(ability_type ability, bool check_confused) failure = 50 - (you.piety / 20) - (5 * you.skills[SK_EVOCATIONS]); break; - //jmf: following for to-be-created gods - case ABIL_CHARM_SNAKE: - invoc = true; - failure = 40 - (you.piety / 20) - (3 * you.skills[SK_INVOCATIONS]); - break; - - case ABIL_TORMENT_II: - invoc = true; - failure = 70 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4); - break; - case ABIL_RENOUNCE_RELIGION: invoc = true; perfect = true; @@ -1838,40 +1817,6 @@ static bool _do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 1); break; - //jmf: intended as invocations from evil god(s): - case ABIL_CHARM_SNAKE: - cast_snake_charm( you.experience_level * 2 - + you.skills[SK_INVOCATIONS] * 3 ); - - exercise(SK_INVOCATIONS, 2 + random2(4)); - break; - - case ABIL_BREATHE_HELLFIRE: - if (you.duration[DUR_BREATH_WEAPON]) - { - canned_msg(MSG_CANNOT_DO_YET); - return (false); - } - - if (your_spells(SPELL_HELLFIRE, - 20 + you.experience_level, false ) == SPRET_ABORT) - return (false); - - you.duration[DUR_BREATH_WEAPON] += - 3 + random2(5) + random2(30 - you.experience_level); - break; - - case ABIL_TORMENT_II: - if (you.is_undead) - { - mpr("The unliving cannot use this ability."); - return (false); - } - - torment(TORMENT_GENERIC, you.pos()); - exercise(SK_INVOCATIONS, 2 + random2(4)); - break; - case ABIL_TRAN_BAT: if (!transform(100, TRAN_BAT)) { diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 58c2398e17..727579cf10 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -37,15 +37,14 @@ enum ability_type ABIL_THROW_FLAME, ABIL_THROW_FROST, ABIL_BOLT_OF_DRAINING, - ABIL_BREATHE_HELLFIRE, // 25 - ABIL_FLY_II, + ABIL_FLY_II, // 25 ABIL_DELAYED_FIREBALL, ABIL_MUMMY_RESTORATION, ABIL_EVOKE_MAPPING, - ABIL_EVOKE_TELEPORTATION, // 30 - ABIL_EVOKE_BLINK, - ABIL_RECHARGING, // 32 - // 33 - 50 unused + ABIL_EVOKE_TELEPORTATION, + ABIL_EVOKE_BLINK, // 30 + ABIL_RECHARGING, // 31 + // 32 - 50 unused ABIL_EVOKE_TURN_INVISIBLE = 51, // 51 ABIL_EVOKE_TURN_VISIBLE, ABIL_EVOKE_LEVITATE, @@ -102,11 +101,9 @@ enum ability_type ABIL_BEOGH_SMITING, // 235 ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, - ABIL_CHARM_SNAKE, // 237 - ABIL_TORMENT_II, ABIL_TRAN_BAT, - ABIL_HARM_PROTECTION, // 240 - ABIL_HARM_PROTECTION_II, + ABIL_HARM_PROTECTION, + ABIL_HARM_PROTECTION_II, // 239 ABIL_RENOUNCE_RELIGION = 250 // 250 }; diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 4d1144138b..aa0896c0b1 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1343,30 +1343,6 @@ void cast_fulsome_distillation( int powc ) mpr( "Unfortunately, you can't carry it right now!" ); } -static int _snake_charm_monsters(coord_def where, int pow, int, actor *) -{ - monsters* monster = monster_at(where); - - if (monster == NULL - || one_chance_in(4) - || mons_friendly(monster) - || mons_char(monster->type) != 'S' - || check_mons_resist_magic(monster, pow)) - { - return 0; - } - - monster->attitude = ATT_FRIENDLY; - mprf("%s sways back and forth.", monster->name(DESC_CAP_THE).c_str()); - - return 1; -} - -void cast_snake_charm(int pow) -{ - apply_one_neighbouring_square(_snake_charm_monsters, pow); -} - bool cast_fragmentation(int pow, const dist& spd) { int debris = 0; diff --git a/crawl-ref/source/spells4.h b/crawl-ref/source/spells4.h index be50386c13..15f80501e0 100644 --- a/crawl-ref/source/spells4.h +++ b/crawl-ref/source/spells4.h @@ -44,7 +44,6 @@ void cast_shatter(int pow); void cast_silence(int pow); void cast_tame_beasts(int pow); void cast_dispersal(int pow); -void cast_snake_charm(int pow); void cast_stoneskin(int pow); int cast_semi_controlled_blink(int pow); -- cgit v1.2.3-54-g00ecf