From 70414943b0b5ee327153e35d6ad1d6a97067da6a Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 19 Oct 2008 20:20:44 +0000 Subject: Rework angels somewhat. To synchronize with daevas, angels are now agents of TSO rather than Zin, get the same draining protection, and get the same melee attacks. To differentiate from them, they always get a mace or great mace of holy wrath. TSO's "Summon Daeva" is now "Summon Divine Warrior", and has a 50% chance of summoning either an angel or a daeva. Note that Zin's angel retribution is not changed yet. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7288 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/abl-show.cc') diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 7e93aa74f8..53440c7e27 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -102,7 +102,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = ABIL_NON_ABILITY, ABIL_ZIN_SANCTUARY }, // TSO { ABIL_NON_ABILITY, ABIL_TSO_DIVINE_SHIELD, ABIL_NON_ABILITY, - ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DAEVA }, + ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DIVINE_WARRIOR }, // Kikubaaqudgha { ABIL_KIKU_RECALL_UNDEAD_SLAVES, ABIL_NON_ABILITY, ABIL_KIKU_ENSLAVE_UNDEAD, ABIL_NON_ABILITY, @@ -226,7 +226,7 @@ static const ability_def Ability_List[] = // The Shining One { ABIL_TSO_DIVINE_SHIELD, "Divine Shield", 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 }, + { ABIL_TSO_SUMMON_DIVINE_WARRIOR, "Summon Divine Warrior", 8, 0, 150, 4, ABFLAG_NONE }, // Kikubaaqudgha { ABIL_KIKU_RECALL_UNDEAD_SLAVES, "Recall Undead Slaves", 2, 0, 50, 0, ABFLAG_NONE }, @@ -704,7 +704,7 @@ static talent _get_talent(ability_type ability, bool check_confused) break; case ABIL_ZIN_SANCTUARY: - case ABIL_TSO_SUMMON_DAEVA: + case ABIL_TSO_SUMMON_DIVINE_WARRIOR: case ABIL_KIKU_INVOKE_DEATH: case ABIL_YRED_ENSLAVE_SOUL: case ABIL_ELYVILON_DIVINE_VIGOUR: @@ -1467,8 +1467,11 @@ static bool _do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 3 + random2(6)); break; - case ABIL_TSO_SUMMON_DAEVA: - summon_daeva(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE); + case ABIL_TSO_SUMMON_DIVINE_WARRIOR: + if (coinflip()) + summon_guardian(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE); + else + summon_daeva(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE); exercise(SK_INVOCATIONS, 8 + random2(10)); break; -- cgit v1.2.3-54-g00ecf