diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/dat/database/godspeak.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/crawl-ref/source/dat/database/godspeak.txt b/crawl-ref/source/dat/database/godspeak.txt index f7b9a03dfd..bf9cfbd4b0 100644 --- a/crawl-ref/source/dat/database/godspeak.txt +++ b/crawl-ref/source/dat/database/godspeak.txt @@ -346,14 +346,16 @@ Your arrogance infuriates Beogh. ##################################### # TSO rants on killing a holy being # ##################################### -# An evil worshipper has killed a holy being +# an evil worshipper has killed a holy being TSO holy evil + The Shining One thunders, "Cease your foul attacks on the divine!" The Shining One shouts, "That base death shall not go unavenged!" %%%% -# A non-good worshipper or atheist has killed a holy being +# a non-good worshipper or atheist has killed a holy being TSO holy other + The Shining One says, "As holy lives are taken, so shall yours be." The Shining One warns, "Defile yourself no further with such kills." diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index a275fef8a8..2d693329c7 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2841,8 +2841,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; case DID_DESTROY_ORCISH_IDOL: - beogh_idol_revenge(); - if (you.religion == GOD_BEOGH) { piety_change = -level * 2; @@ -2894,6 +2892,14 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } #endif + if (thing_done == DID_DESTROY_ORCISH_IDOL) + beogh_idol_revenge(); + else if (thing_done == DID_KILL_HOLY + || thing_done == DID_HOLY_KILLED_BY_SERVANT) + { + tso_holy_revenge(); + } + return (ret); } |