diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-28 19:43:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-28 19:43:31 +0000 |
| commit | 7fbcd22e430fcc3db5bf8e09a6dc02b80adeda77 (patch) | |
| tree | dc6be651f1132a3e33a0e8b4cd8d428dfe29f10e /crawl-ref/source/religion.cc | |
| parent | b30be80f8944e4ca675add68e8d769788f00cd7d (diff) | |
| download | crawl-ref-7fbcd22e430fcc3db5bf8e09a6dc02b80adeda77.tar.gz crawl-ref-7fbcd22e430fcc3db5bf8e09a6dc02b80adeda77.zip | |
Fix sort_menus option to let "any" override the default "pickup" setting
and still use any as "anything but those already defined" when needed.
(If that makes any sense.)
Remove need for prayer for Vehumet's prayer boost effects. I admit I'm
not entirely convinced of this change myself, but currently the problem
is that there's hardly ever any reason *not* to pray. What we'd need
instead are sensible drawbacks...
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4757 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 3ad061bdfb..6534e9b4fc 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1516,8 +1516,7 @@ static void _do_god_gift(bool prayed_for) else if (!you.had_book[BOOK_ANNIHILATIONS]) gift = BOOK_ANNIHILATIONS; // conj books - if (you.skills[SK_CONJURATIONS] < - you.skills[SK_SUMMONINGS] + if (you.skills[SK_CONJURATIONS] < you.skills[SK_SUMMONINGS] || gift == NUM_BOOKS) { if (!you.had_book[BOOK_CALLINGS]) @@ -4933,8 +4932,8 @@ bool god_hates_butchery(god_type god) harm_protection_type god_protects_from_harm(god_type god, bool actual) { const int min_piety = piety_breakpoint(0); - bool praying = (you.duration[DUR_PRAYER] && - random2(you.piety) >= min_piety); + bool praying = (you.duration[DUR_PRAYER] + && random2(you.piety) >= min_piety); bool anytime = (one_chance_in(10) || you.piety > random2(1000)); bool penance = you.penance[god]; |