From 2dee9cde068f812d06fee0531ab6038ea2e68719 Mon Sep 17 00:00:00 2001 From: dolorous Date: Tue, 25 Mar 2008 20:23:39 +0000 Subject: More evil ally fixes. If you worship a good god, don't allow the taming of e.g. death yaks, and don't allow Summon Small Mammals to pull in orange rats. Do the latter only on the player side for now, since mo monsters seem to cast Summon Small Mammals, instead preferring Vampire Summon. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3881 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells4.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/spells4.cc') diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 556024aa99..c4ee7a0b8c 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -755,8 +755,12 @@ static int tame_beast_monsters(int x, int y, int pow, int garbage) monsters *monster = &menv[which_mons]; - if (!is_domesticated_animal(monster->type) || mons_friendly(monster)) + if (!is_domesticated_animal(monster->type) || mons_friendly(monster) + || (is_good_god(you.religion) + && mons_is_evil_or_unholy(monster))) + { return 0; + } // 50% bonus for dogs if (monster->type == MONS_HOUND || monster->type == MONS_WAR_DOG ) -- cgit v1.2.3-54-g00ecf