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/fight.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/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index a4f3c9b3f6..58d4a45813 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4280,6 +4280,9 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk) return klown_attack[random2(num_attacks)]; } + if (attacker->id() == MONS_KRAKEN_TENTACLE) + return "slap"; + static const char *attack_types[] = { "", |