summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-23 17:29:13 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-23 17:29:13 +0000
commit2837f061c56edb4410700be7cc8f552e8e7acfda (patch)
tree5b0c653b92c1db3be8d871c76e0bc74a8b27681e /crawl-ref/source/religion.cc
parentf7d34b29bdd41086a10c8135466e4b974674eae5 (diff)
downloadcrawl-ref-2837f061c56edb4410700be7cc8f552e8e7acfda.tar.gz
crawl-ref-2837f061c56edb4410700be7cc8f552e8e7acfda.zip
For TSOites, restrict unchivalric attacks to monsters of normal
intelligence or higher. This should solve the jelly annoyance problem, among other things. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7551 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index a302cdadd8..ebc4502011 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -6430,6 +6430,7 @@ int piety_breakpoint(int i)
bool tso_unchivalric_attack_safe_monster(const monsters *mon)
{
const mon_holy_type holiness = mon->holiness();
- return (mons_is_evil(mon)
+ return (mons_intel(mon) < I_NORMAL
+ || mons_is_evil(mon)
|| (holiness != MH_NATURAL && holiness != MH_HOLY));
}