diff options
| author | Stefan O'Rear <stefanor@cox.net> | 2009-12-31 04:05:19 -0800 |
|---|---|---|
| committer | Stefan O'Rear <stefanor@cox.net> | 2009-12-31 04:05:19 -0800 |
| commit | 66a86ff1f08b7f291f5831d0c54d8947809d7ba4 (patch) | |
| tree | 2e9cab489b665716fcc0c5419bef19c8327bce99 /crawl-ref/source/mon-util.cc | |
| parent | 17d55a7806b3c9106b3f922021ef8302e94f3004 (diff) | |
| download | crawl-ref-66a86ff1f08b7f291f5831d0c54d8947809d7ba4.tar.gz crawl-ref-66a86ff1f08b7f291f5831d0c54d8947809d7ba4.zip | |
Give tentacles zombie damage. (syllogism)
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index d148495560..b7e6c40e97 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1052,6 +1052,14 @@ mon_attack_def downscale_zombie_attack(const monsters *mons, mon_attack_def mons_attack_spec(const monsters *mon, int attk_number) { int mc = mon->type; + + if (mc == MONS_KRAKEN_TENTACLE + && !invalid_monster_index(mon->number)) + { + // Use the zombie, etc info from the kraken + mon = &menv[mon->number]; + } + const bool zombified = mons_is_zombified(mon); if (attk_number < 0 || attk_number > 3 || mon->has_hydra_multi_attack()) @@ -1069,7 +1077,7 @@ mon_attack_def mons_attack_spec(const monsters *mon, int attk_number) return (mon_attack_def::attk(0, AT_NONE)); } - if (zombified) + if (zombified && mc != MONS_KRAKEN_TENTACLE) mc = mons_zombie_base(mon); ASSERT(smc); |