diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 17:57:10 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 18:15:26 -0600 |
| commit | f9f2105b119464e055df7999096593fa105ed5ea (patch) | |
| tree | 77669c8d978ae6cb1790b4c653ba54e8dd4f5a06 /crawl-ref/source | |
| parent | a6b73ff91760a1cbbc876b39861c0d1c60ab78c6 (diff) | |
| download | crawl-ref-f9f2105b119464e055df7999096593fa105ed5ea.tar.gz crawl-ref-f9f2105b119464e055df7999096593fa105ed5ea.zip | |
Don't specially display Zin's taking of unclean/chaotic kills.
First, they're the only kills he takes. Second, they don't stack with
other kills as the other specially displayed kills do (e.g. kill-living
and kill-wizard for Trog).
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/religion.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 0e9118c43b..d6b83bbdf8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -641,6 +641,10 @@ std::string get_god_likes(god_type which_god, bool verbose) switch (which_god) { + case GOD_ZIN: + likes.push_back("you kill unclean or chaotic beings"); + break; + case GOD_SHINING_ONE: likes.push_back("you or your allies kill living unholy or evil beings"); break; @@ -719,10 +723,6 @@ std::string get_god_likes(god_type which_god, bool verbose) // Especially appreciated kills. switch (which_god) { - case GOD_ZIN: - really_likes.push_back("you kill unclean and chaotic monsters"); - break; - case GOD_YREDELEMNUL: really_likes.push_back("you kill holy beings"); break; @@ -2866,7 +2866,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, if (you.religion == GOD_FEDHAS && (!victim || !fedhas_protects(victim) || victim->mons_species() == MONS_TOADSTOOL)) + { break; + } // fall through case GOD_OKAWARU: @@ -2949,7 +2951,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, // Holy gods are easier to please this way. if (random2(level + 18 - (is_good_god(you.religion) ? 0 : you.experience_level / 2)) > 4) + { piety_change = 1; + } break; default: @@ -2999,8 +3003,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, if (you.religion == GOD_ZIN && !god_hates_attacking_friend(you.religion, victim)) { - simple_god_message(" appreciates your killing of a spawn of " - "chaos."); + simple_god_message(" accepts your kill."); retval = true; if (random2(level + 18) > 3) piety_change = 1; @@ -3037,7 +3040,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, { simple_god_message(" appreciates the change of pace."); retval = true; - if (random2(level+18) > 3) + if (random2(level + 18) > 3) piety_change = 1; } break; |