diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 23:45:43 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 23:45:43 +0000 |
| commit | a93993cc7b9e26ee669979d00ed34c3649e2b4ec (patch) | |
| tree | 2e04ae6c9ca4e78e8b6b9a401a39ed2e35128b4d /crawl-ref/source/abl-show.cc | |
| parent | 0380e33912ed90d0cf6f9aac69b1ff2a63bd292f (diff) | |
| download | crawl-ref-a93993cc7b9e26ee669979d00ed34c3649e2b4ec.tar.gz crawl-ref-a93993cc7b9e26ee669979d00ed34c3649e2b4ec.zip | |
Clean up some more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5564 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 83388249d2..8a616712b3 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1277,15 +1277,11 @@ static bool _do_ability(const ability_def& abil) // DEMONIC POWERS: case ABIL_SUMMON_MINOR_DEMON: - summon_general_creature(you.experience_level * 4, false, - summon_any_demon(DEMON_LESSER), - BEH_FRIENDLY); + summon_minor_demon(you.experience_level * 4); break; case ABIL_SUMMON_DEMON: - summon_general_creature(you.experience_level * 4, false, - summon_any_demon(DEMON_COMMON), - BEH_FRIENDLY); + summon_demon(you.experience_level * 4); break; case ABIL_HELLFIRE: @@ -1438,8 +1434,7 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_TSO_SUMMON_DAEVA: - summon_general_creature(you.skills[SK_INVOCATIONS] * 4, false, - MONS_DAEVA, BEH_FRIENDLY, true); + cast_summon_daeva(you.skills[SK_INVOCATIONS] * 4, true); exercise(SK_INVOCATIONS, 8 + random2(10)); break; @@ -1461,8 +1456,8 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_KIKU_INVOKE_DEATH: - summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false, - MONS_REAPER, BEH_FRIENDLY, true); + summon_specific_demon(MONS_REAPER, + 20 + you.skills[SK_INVOCATIONS] * 3, true); exercise(SK_INVOCATIONS, 10 + random2(14)); break; @@ -1542,10 +1537,9 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB: - summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false, - static_cast<monster_type>( - MONS_NEQOXEC + random2(5)), - BEH_FRIENDLY, true); + summon_specific_demon(static_cast<monster_type>( + MONS_NEQOXEC + random2(5)), + 20 + you.skills[SK_INVOCATIONS] * 3, true); exercise(SK_INVOCATIONS, 2 + random2(3)); break; @@ -1603,10 +1597,9 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB: - summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false, - static_cast<monster_type>( - MONS_EXECUTIONER + random2(5)), - BEH_FRIENDLY, true); + summon_specific_demon(static_cast<monster_type>( + MONS_EXECUTIONER + random2(5)), + 20 + you.skills[SK_INVOCATIONS] * 3, true); exercise(SK_INVOCATIONS, 6 + random2(6)); break; |