diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-30 19:08:31 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-30 19:08:31 +0000 |
commit | 450f6fd14fe0c09e89ad90eac2a9a6ee9521af69 (patch) | |
tree | e0fe406b53cd28215f3e5c1c5c00ff541bc32ad6 /crawl-ref/source/religion.cc | |
parent | 5680f596aa91070a0a580947e7115f01bbf130fd (diff) | |
download | crawl-ref-450f6fd14fe0c09e89ad90eac2a9a6ee9521af69.tar.gz crawl-ref-450f6fd14fe0c09e89ad90eac2a9a6ee9521af69.zip |
Add various holy being-related cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7312 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r-- | crawl-ref/source/religion.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 7db608706a..5fa56ac0e2 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3536,25 +3536,29 @@ static bool _tso_retribution() { const god_type god = GOD_SHINING_ONE; - // daevas/cleansing theme + // holy warriors/cleansing theme int punishment = random2(7); switch (punishment) { case 0: case 1: - case 2: // summon daevas (3/7) + case 2: // summon holy warriors (3/7) { bool success = false; int how_many = 1 + random2(you.experience_level / 5) + random2(3); for (int i = 0; i < how_many; ++i) { - if (create_monster( - mgen_data::hostile_at(coinflip() ? MONS_ANGEL : MONS_DAEVA, - you.pos(), 0, 0, true, god)) != -1) + if (coinflip()) { - success = true; + if (summon_daeva(100, god, true, true, true)) + success = true; + } + else + { + if (summon_angel(100, god, true, true, true)) + success = true; } } @@ -3646,12 +3650,8 @@ static bool _zin_retribution() for (int i = 0; i < how_many; ++i) { - if (create_monster( - mgen_data::hostile_at(MONS_ANGEL, - you.pos(), 0, 0, true, god)) != -1) - { + if (summon_angel(100, god, true, true, true)) success = true; - } } simple_god_message(success ? " sends the divine host to punish " |