diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-17 16:15:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-17 16:15:20 +0000 |
| commit | e06f39be1017c28488a0ca4b61bb9962ad5ee196 (patch) | |
| tree | 1c07d339c478cf73db6e03febda70d3023782d20 /crawl-ref/source/misc.cc | |
| parent | 58fadd8bee0e04b270522f5024bb2777ea1fb66d (diff) | |
| download | crawl-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/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 6181cea8f0..177e235569 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2697,6 +2697,7 @@ bool mons_is_safe(const monsters *mon, bool want_move, bool is_safe = (mons_wont_attack(mon) || mons_class_flag(mon->type, M_NO_EXP_GAIN) + && mon->type != MONS_KRAKEN_TENTACLE || mons_is_pacified(mon) && dist > 1 #ifdef WIZARD // Wizmode skill setting enforces hiddenness. |