summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.h
diff options
context:
space:
mode:
authorSage <SageBasilMint@gmail.com>2014-01-30 05:40:36 +0000
committerPekka Lampila <pekka.lampila@iki.fi>2014-01-30 11:10:22 +0200
commit140b27ce5d3e7d3365842c15262849edea093d52 (patch)
tree99f3662850e66ac3ad865875325482b2563b73bd /crawl-ref/source/misc.h
parent4067f67b76575fa46cda5a7ae5f99f3278323d2d (diff)
downloadcrawl-ref-140b27ce5d3e7d3365842c15262849edea093d52.tar.gz
crawl-ref-140b27ce5d3e7d3365842c15262849edea093d52.zip
Make warnings against penance-causing attacks more prominent.
The prompt to hit an enslaved creature differs very little regardless of your god, even if it would cause penance with that god. This patch makes such attacks require yes_or_no like walking into a Zot trap instead of yesno, and explicitly states that it will cause penance with your god. For reference, only betrayal attacks under Okawaru and the good gods, attacking neutral creatures under Elyvilon or TSO, unchivalric attacks under TSO, and plant betrayal under Fedhas is affected; attacks with brands offensive to your god are not, and neither are attacks which only cause piety loss.
Diffstat (limited to 'crawl-ref/source/misc.h')
-rw-r--r--crawl-ref/source/misc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index 7dc8a4086b..45a0f6d3ea 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -114,6 +114,7 @@ bool interrupt_cmd_repeat(activity_interrupt_type ai,
const activity_interrupt_data &at);
bool bad_attack(const monster *mon, string& adj, string& suffix,
+ bool& would_cause_penance,
coord_def attack_pos = coord_def(0, 0),
bool check_landing_only = false);