diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-28 20:39:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-28 20:39:31 +0000 |
| commit | 0ffadca40b94c481141887d294d311ff738c2ad1 (patch) | |
| tree | 2f45968b11a526f839411b19d13b5b4217bbd72c /crawl-ref/source/religion.cc | |
| parent | 3183b13800fe91b715929ef5f08b5683c1856a87 (diff) | |
| download | crawl-ref-0ffadca40b94c481141887d294d311ff738c2ad1.tar.gz crawl-ref-0ffadca40b94c481141887d294d311ff738c2ad1.zip | |
Fix 2005269: trolls being capable of wearing almost all armour types.
Remove dated mentions of item sacrifices in print_god_likes().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6188 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 227e956d84..36bfd110ec 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -512,9 +512,8 @@ std::string print_god_likes(god_type which_god, bool verbose) switch (which_god) { - case GOD_SHINING_ONE: case GOD_KIKUBAAQUDGHA: case GOD_OKAWARU: - case GOD_MAKHLEB: case GOD_SIF_MUNA: case GOD_TROG: - snprintf(info, INFO_SIZE, "sacrifice items%s", + case GOD_SHINING_ONE: + snprintf(info, INFO_SIZE, "sacrifice evil items%s", verbose ? " (by dropping them on an altar and praying)" : ""); likes.push_back(info); @@ -2497,7 +2496,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_LUGONU: simple_god_message( make_stringf(" accepts your %skill.", - thing_done == DID_KILL_HOLY ? "" : "collateral ").c_str()); + thing_done == DID_KILL_HOLY ? "" : "collateral ") + .c_str()); ret = true; if (random2(level + 18) > 2) @@ -3237,12 +3237,14 @@ void lose_piety(int pgn) // are withheld. if (!player_under_penance() && you.piety != old_piety) { - if (you.piety <= 160 && old_piety > 160 && - (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU) - && you.num_gifts[you.religion] == 0) + if (you.piety <= 160 && old_piety > 160 + && (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU) + && you.num_gifts[you.religion] == 0) + { simple_god_message(" is no longer ready to bless your weapon."); + } - for ( int i = 0; i < MAX_GOD_ABILITIES; ++i ) + for (int i = 0; i < MAX_GOD_ABILITIES; ++i) { if (you.piety < piety_breakpoint(i) && old_piety >= piety_breakpoint(i)) |