diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-25 10:02:38 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-25 10:02:38 -0500 |
| commit | 58eff259a0f37495f45b2d14d6d916c054c3cfb1 (patch) | |
| tree | 4d326e6251a514756db86d95513377f676f6c6a3 /crawl-ref/source/fight.cc | |
| parent | f07a8e99cdcbb23198112b41cd1f38f90ee9f156 (diff) | |
| download | crawl-ref-58eff259a0f37495f45b2d14d6d916c054c3cfb1.tar.gz crawl-ref-58eff259a0f37495f45b2d14d6d916c054c3cfb1.zip | |
Add a vorpal type for tentacle attacks, and use it for the tentacle-slap
attack type. Also, allow unarmed attacks to work on submerged monsters
if they use the tentacle vorpal type. Finally, make kraken tentacles
use the tentacle-slap attack type.
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index a50a99904a..bb134d5530 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -149,7 +149,7 @@ int effective_stat_bonus( int wepType ) #endif } -// Returns the to-hit for your extra unarmed.attacks. +// Returns the to-hit for your extra unarmed attacks. // DOES NOT do the final roll (i.e., random2(your_to_hit)). static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK, bool vampiric = false) @@ -411,7 +411,7 @@ void melee_attack::init_attack() } if (defender && defender->submerged()) - unarmed_ok = false; + unarmed_ok = (attacker->damage_type() == DVORP_TENTACLE); miscast_level = -1; miscast_type = SPTYP_NONE; @@ -721,6 +721,7 @@ static int _modify_blood_amount(const int damage, const int dam_type) switch (dam_type) { case DVORP_CRUSHING: // flails, also unarmed + case DVORP_TENTACLE: // unarmed, tentacles factor = 2; break; case DVORP_SLASHING: // whips |