summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2010-01-09 19:09:36 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2010-01-09 19:10:03 +1000
commit3000618dd5792940428032515011000860d885b5 (patch)
tree739b431063af8148bd6b9d6acd17afab1a2f1877
parent40fad994a1b6173796dd53e638fd9a611b92add9 (diff)
downloadcrawl-ref-3000618dd5792940428032515011000860d885b5.tar.gz
crawl-ref-3000618dd5792940428032515011000860d885b5.zip
Don't autokill with berserkitis (Twinge).
-rw-r--r--crawl-ref/source/travel.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 296e39318a..0d2561a44b 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -2212,6 +2212,10 @@ bool travel_kill_monster(const monsters * monster)
if (!wielded_weapon_check(you.weapon(), true))
return (false);
+ // Don't auto-kill things with berserkitis or *rage.
+ if (player_mutation_level(MUT_BERSERK) || scan_artefacts(ARTP_ANGRY))
+ return (false);
+
return (monster->type == MONS_TOADSTOOL);
}