diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-14 15:31:00 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-14 15:31:00 +0000 |
| commit | 2ed4f389c28fa47ae5e16d747d0eb81e3a498acf (patch) | |
| tree | 06494a4ca20aacd8b75dea9d14496d2c15ef37d2 /crawl-ref/source/religion.cc | |
| parent | 85e11d2d3c892c2ffcd53b0bf55c0e83ce13fb9d (diff) | |
| download | crawl-ref-2ed4f389c28fa47ae5e16d747d0eb81e3a498acf.tar.gz crawl-ref-2ed4f389c28fa47ae5e16d747d0eb81e3a498acf.zip | |
* Fix 2477235: Use inscription check when switching back from butchering
tool in case it was autoinscribed {!w}.
* Make TSO reclaim holy wrath weapons an Elyvilon worshipper is
attempting to destroy (flavour only). (FR 2497133)
* Disallow Dissolution outside of the Slime Pits.
* Explain 'e' as "Drain corpses" for Vampires in the command help.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8450 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 5f865a63f4..6c0cae9a37 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3861,14 +3861,28 @@ bool ely_destroy_weapons() gain_piety(1); } - // Elyvilon doesn't care about item sacrifices at altars, so - // I'm stealing _Sacrifice_Messages. - _print_sacrifice_message(GOD_ELYVILON, item, pgain); - if (is_evil_weapon) + if (get_weapon_brand(item) == SPWPN_HOLY_WRATH) { - // Print this is addition to the above! - simple_god_message(" welcomes the destruction of this evil weapon.", - GOD_ELYVILON); + // Weapons blessed by TSO don't get destroyed but are instead + // returned whence they came. (jpeg) +// _print_sacrifice_message(GOD_SHINING_ONE, item, pgain); + simple_god_message( + make_stringf(" %sreclaims %s.", + pgain == PIETY_SOME ? "gladly " : "", + item.name(DESC_NOCAP_THE).c_str()).c_str(), + GOD_SHINING_ONE); + } + else + { + // Elyvilon doesn't care about item sacrifices at altars, so + // I'm stealing _Sacrifice_Messages. + _print_sacrifice_message(GOD_ELYVILON, item, pgain); + if (is_evil_weapon) + { + // Print this is addition to the above! + simple_god_message(" welcomes the destruction of this evil " + "weapon.", GOD_ELYVILON); + } } destroy_item(si.link()); @@ -4173,8 +4187,10 @@ static bool _zin_retribution() if (success) god_speaks(god, "You feel Zin's eyes turn towards you..."); else + { simple_god_message("'s eyes are elsewhere at the moment.", god); + } } else { |