diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-11 12:55:47 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-11 12:55:47 +0100 |
| commit | 0f87da22f3372748c90bf120193f1de5735ccf18 (patch) | |
| tree | f068c8900928b5880fe959abbce8af61adbd14cf /crawl-ref/source/fight.cc | |
| parent | 7bbf91ea2686888dbe0953fbc5d90c6b37626304 (diff) | |
| download | crawl-ref-0f87da22f3372748c90bf120193f1de5735ccf18.tar.gz crawl-ref-0f87da22f3372748c90bf120193f1de5735ccf18.zip | |
Give whips a third damage verb (Mantis 0000143).
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 79adf9c3dc..47d1718bd0 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1898,8 +1898,22 @@ int melee_attack::player_weapon_type_modify(int damage) case DAM_WHIP: if (damage < HIT_MED) attack_verb = "whack"; - else + else if (damage < HIT_STRONG) attack_verb = "thrash"; + else + { + switch(defender->holiness()) + { + case MH_HOLY: + case MH_NATURAL: + case MH_DEMONIC: + attack_verb = "punish"; + verb_degree = " causing immense pain"; + break; + default: + attack_verb = "devastate"; + } + } break; case -1: // unarmed |