summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-15 15:37:10 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-15 15:37:10 +0000
commit66a704276821c4400a67aede782c580e1992bddd (patch)
treecf55188e0b9fe70ee925cd77ab739e1916a18f44
parent9b6421c073c1730758e1e57e608caeded8673d8f (diff)
downloadcrawl-ref-66a704276821c4400a67aede782c580e1992bddd.tar.gz
crawl-ref-66a704276821c4400a67aede782c580e1992bddd.zip
Only stop daevas from smiting unchivalrously if they worship TSO.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9496 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monstuff.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index bb4c6e06ce..c1b5e7f59a 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -6487,12 +6487,14 @@ static bool _handle_spell(monsters *monster, bolt &beem)
{
spellOK = false;
}
- else if (monster->type == MONS_DAEVA)
+ else if (monster->type == MONS_DAEVA
+ && monster->god == GOD_SHINING_ONE)
{
const monsters *mon = &menv[monster->foe];
- // Don't allow daevas to make unchivalric magic
- // attacks, except against appropriate monsters.
+ // Don't allow TSO-worshipping daevas to make
+ // unchivalric magic attacks, except against
+ // appropriate monsters.
if (is_unchivalric_attack(monster, mon)
&& !tso_unchivalric_attack_safe_monster(mon))
{