summaryrefslogtreecommitdiffstats
path: root/crawl-ref/settings
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-17 16:15:20 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-17 16:15:20 +0000
commite06f39be1017c28488a0ca4b61bb9962ad5ee196 (patch)
tree1c07d339c478cf73db6e03febda70d3023782d20 /crawl-ref/settings
parent58fadd8bee0e04b270522f5024bb2777ea1fb66d (diff)
downloadcrawl-ref-e06f39be1017c28488a0ca4b61bb9962ad5ee196.tar.gz
crawl-ref-e06f39be1017c28488a0ca4b61bb9962ad5ee196.zip
Add the most recent version of Adam's kraken patch into trunk.
Might still need some tweaks but overall looks great! And... we need more tiles (kraken head + tentacles). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10691 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/init.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 7a5643f3fe..44df7f194d 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -184,9 +184,14 @@ runrest_ignore_message = engulfed in a cloud of smoke
runrest_ignore_message = safely over a trap
runrest_ignore_message = You feel.*sick
runrest_ignore_poison = 2:30
+runrest_ignore_monster = butterfly:1
+# acquatic monsters
runrest_ignore_monster = fish:2
runrest_ignore_monster = shark:2
-runrest_ignore_monster = butterfly:1
+runrest_ignore_monster = kraken:2
+# special case for tentacled monstrosity
+runrest_ignore_monster = tentacled:8
+runrest_ignore_monster = tentacle:2
# runrest_ignore_monster = swamp worm:3
# trap_prompt = false