diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 21:01:46 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 21:01:46 +0000 |
| commit | e76fa04ee8cfd52c224e3ec72ff0b23796eb6029 (patch) | |
| tree | 73fa8ac4235a5c609027c62b5534d9c575c3e467 /crawl-ref/source/abl-show.cc | |
| parent | 703ecf2d592818a7bbffc70bc49a943ab7f24a33 (diff) | |
| download | crawl-ref-e76fa04ee8cfd52c224e3ec72ff0b23796eb6029.tar.gz crawl-ref-e76fa04ee8cfd52c224e3ec72ff0b23796eb6029.zip | |
Allow creation of non-friendly god gifts. The BEH_GOD_GIFT behavior has
been removed, and the MF_GOD_GIFT flag is set directly instead.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5503 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 5e6e547816..e3a7b576fb 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1277,13 +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) ); + summon_ice_beast_etc(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) ); + summon_ice_beast_etc(you.experience_level * 4, + summon_any_demon(DEMON_COMMON), + BEH_FRIENDLY, false); break; case ABIL_HELLFIRE: @@ -1436,7 +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, true); + summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_DAEVA, + BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 8 + random2(10)); break; @@ -1459,7 +1462,8 @@ static bool _do_ability(const ability_def& abil) case ABIL_KIKU_INVOKE_DEATH: summon_ice_beast_etc( - 20 + you.skills[SK_INVOCATIONS] * 3, MONS_REAPER, true); + 20 + you.skills[SK_INVOCATIONS] * 3, MONS_REAPER, + BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 10 + random2(14)); break; @@ -1539,10 +1543,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)), - true ); + summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3, + static_cast<monster_type>( + MONS_NEQOXEC + random2(5)), + BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 2 + random2(3)); break; @@ -1601,10 +1605,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)), - true ); + summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3, + static_cast<monster_type>( + MONS_EXECUTIONER + random2(5)), + BEH_FRIENDLY, true); exercise(SK_INVOCATIONS, 6 + random2(6)); break; @@ -1634,7 +1638,7 @@ static bool _do_ability(const ability_def& abil) // Trog abilities don't use or train invocations. summon_berserker(you.piety + random2(you.piety/4) - random2(you.piety/4), - true); + BEH_FRIENDLY, true); break; case ABIL_SIF_MUNA_FORGET_SPELL: |