diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 23:21:58 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 23:21:58 +0000 |
| commit | 679f7173c733b733c431bf9424ab3e4de8e70fce (patch) | |
| tree | 374f64f546a483f0ef8fa61022c1eeeb5f7131e3 /crawl-ref/source/abl-show.cc | |
| parent | 699a10feb706349c09dc5037ae8f2e8c0335f13b (diff) | |
| download | crawl-ref-679f7173c733b733c431bf9424ab3e4de8e70fce.tar.gz crawl-ref-679f7173c733b733c431bf9424ab3e4de8e70fce.zip | |
Consolidate summon_ugly_thing() into summon_ice_beast_etc(), and rename
the latter summon_general_creature().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5511 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index e3a7b576fb..aa433cb15e 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1277,15 +1277,15 @@ static bool _do_ability(const ability_def& abil) // DEMONIC POWERS: case ABIL_SUMMON_MINOR_DEMON: - summon_ice_beast_etc(you.experience_level * 4, - summon_any_demon(DEMON_LESSER), - BEH_FRIENDLY, false); + summon_general_creature(you.experience_level * 4, + summon_any_demon(DEMON_LESSER), + BEH_FRIENDLY, false); break; case ABIL_SUMMON_DEMONS: - summon_ice_beast_etc(you.experience_level * 4, - summon_any_demon(DEMON_COMMON), - BEH_FRIENDLY, false); + summon_general_creature(you.experience_level * 4, + summon_any_demon(DEMON_COMMON), + BEH_FRIENDLY, false); break; case ABIL_HELLFIRE: @@ -1438,8 +1438,8 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_TSO_SUMMON_DAEVA: - summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_DAEVA, - BEH_FRIENDLY, true); + summon_general_creature(you.skills[SK_INVOCATIONS] * 4, + MONS_DAEVA, BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 8 + random2(10)); break; @@ -1461,9 +1461,8 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_KIKU_INVOKE_DEATH: - summon_ice_beast_etc( - 20 + you.skills[SK_INVOCATIONS] * 3, MONS_REAPER, - BEH_FRIENDLY, true); + summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, + MONS_REAPER, BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 10 + random2(14)); break; @@ -1543,11 +1542,10 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB: - summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3, - static_cast<monster_type>( - MONS_NEQOXEC + random2(5)), - BEH_FRIENDLY, true); - + summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, + static_cast<monster_type>( + MONS_NEQOXEC + random2(5)), + BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 2 + random2(3)); break; @@ -1605,11 +1603,10 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB: - summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3, - static_cast<monster_type>( - MONS_EXECUTIONER + random2(5)), - BEH_FRIENDLY, true); - + summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, + static_cast<monster_type>( + MONS_EXECUTIONER + random2(5)), + BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 6 + random2(6)); break; |