diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-03 16:36:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-03 16:36:19 +0000 |
| commit | 5b127194df7d2dccbb1f54b4adc5d36e6243b1c7 (patch) | |
| tree | 83972372235ea41c51189734d297cc129c891dc8 /crawl-ref/source/fight.cc | |
| parent | 6c37300195fef937787923da6e12aca3fe544465 (diff) | |
| download | crawl-ref-5b127194df7d2dccbb1f54b4adc5d36e6243b1c7.tar.gz crawl-ref-5b127194df7d2dccbb1f54b4adc5d36e6243b1c7.zip | |
Add message for continued multiturn eating. (FR 1878123)
Add a variety of humourous attack verbs for killer klowns. (FR 1855567)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3393 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index e7c875ae05..9e8da364e8 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3106,8 +3106,38 @@ int melee_attack::mons_apply_defender_ac(int damage, int damage_max) return damage; } +static const char *klown_attack[] = +{ + "hit", + "poke", + "prod", + "flog", + "pound", + "slap", + "tickle", + "defenestrate", + "sucker-punch", + "elbow", + "pinch", + "strangle-hug", + "squeeze", + "tease", + "eye-gouge", + "karate-kick", + "headlock", + "wrestle", + "trip-wire", + "kneecap" +}; + std::string melee_attack::mons_attack_verb(const mon_attack_def &attk) { + if (attacker->id() == MONS_KILLER_KLOWN && attk.type == AT_HIT) + { + const int num_attacks = sizeof(klown_attack) / sizeof(klown_attack[0]); + return klown_attack[random2(num_attacks)]; + } + static const char *attack_types[] = { "", |