From abda8eb1f0513097c7c3eabdc603d8c683a79ce5 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 9 Mar 2008 16:58:55 +0000 Subject: Yet another TSO update: remove the "Annihilate Undead" ability, and comment out the related code for now, in case it's useful later. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3554 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 16 +++++++--------- crawl-ref/source/enum.h | 3 +-- crawl-ref/source/religion.cc | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 1a4d2ae91a..c3fa783a24 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -114,7 +114,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = { ABIL_ZIN_RECITE, ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION, ABIL_NON_ABILITY, ABIL_ZIN_SANCTUARY }, // TSO - { ABIL_NON_ABILITY, ABIL_TSO_DIVINE_SHIELD, ABIL_TSO_ANNIHILATE_UNDEAD, + { ABIL_NON_ABILITY, ABIL_TSO_DIVINE_SHIELD, ABIL_NON_ABILITY, ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DAEVA }, // Kikubaaqudgha { ABIL_KIKU_RECALL_UNDEAD_SLAVES, ABIL_NON_ABILITY, @@ -240,7 +240,6 @@ static const ability_def Ability_List[] = // The Shining One { ABIL_TSO_DIVINE_SHIELD, "Divine Shield", 3, 0, 50, 2, ABFLAG_NONE }, - { ABIL_TSO_ANNIHILATE_UNDEAD, "Annihilate Undead", 3, 0, 50, 2, ABFLAG_NONE }, { ABIL_TSO_CLEANSING_FLAME, "Cleansing Flame", 5, 0, 100, 2, ABFLAG_NONE }, { ABIL_TSO_SUMMON_DAEVA, "Summon Daeva", 8, 0, 150, 4, ABFLAG_NONE }, @@ -698,7 +697,6 @@ static talent get_talent(ability_type ability, bool check_confused) break; case ABIL_ZIN_REVITALISATION: - case ABIL_TSO_ANNIHILATE_UNDEAD: case ABIL_LUGONU_BANISH: invoc = true; failure = 60 - (you.piety / 20) - (5 * you.skills[SK_INVOCATIONS]); @@ -1398,12 +1396,6 @@ static bool do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 1); break; -*/ - - case ABIL_TSO_DIVINE_SHIELD: - cast_divine_shield(); - exercise( SK_INVOCATIONS, (coinflip()? 3 : 2) ); - break; case ABIL_TSO_ANNIHILATE_UNDEAD: if ( !spell_direction(spd, beam) ) @@ -1414,6 +1406,12 @@ static bool do_ability(const ability_def& abil) zapping(ZAP_DISPEL_UNDEAD, you.skills[SK_INVOCATIONS] * 6, beam); exercise(SK_INVOCATIONS, 2 + random2(4)); break; +*/ + + case ABIL_TSO_DIVINE_SHIELD: + cast_divine_shield(); + exercise( SK_INVOCATIONS, (coinflip()? 3 : 2) ); + break; case ABIL_TSO_CLEANSING_FLAME: if ( !spell_direction(spd, beam) ) diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 6f4695e5fd..8db957e32a 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -79,9 +79,8 @@ enum ability_type ABIL_ZIN_REVITALISATION, ABIL_ZIN_SANCTUARY, ABIL_TSO_DIVINE_SHIELD = 120, // 120 - ABIL_TSO_ANNIHILATE_UNDEAD, ABIL_TSO_CLEANSING_FLAME, - ABIL_TSO_SUMMON_DAEVA, // 124 + ABIL_TSO_SUMMON_DAEVA, // 122 ABIL_KIKU_RECALL_UNDEAD_SLAVES = 130, // 130 ABIL_KIKU_ENSLAVE_UNDEAD = 132, // 132 ABIL_KIKU_INVOKE_DEATH, // 133 diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 72e38ac3dc..cd767dcfb3 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -197,7 +197,7 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] = // TSO { "gain power from killing evil in The Shining One's name", "call upon The Shining One for a divine shield", - "dispel the undead", + "", "hurl blasts of cleansing flame", "summon a divine warrior" }, // Kikubaaqudgha @@ -282,7 +282,7 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] = // TSO { "gain power from killing evil in The Shining One's name", "call upon The Shining One for a divine shield", - "dispel the undead", + "", "hurl blasts of cleansing flame", "summon a divine warrior" }, // Kikubaaqudgha -- cgit v1.2.3-54-g00ecf