summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ranged_attack.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-07-09 19:52:40 +0100
committerChris Campbell <chriscampbell89@gmail.com>2014-07-09 19:52:40 +0100
commit4e5aae5fdf2f8f4ccd531511ff9b10e8cb79a92c (patch)
treeb39b4e74e8f28b7aba6226d066a41ca8bc62dea7 /crawl-ref/source/ranged_attack.cc
parentf9d185bb4727298cf6d45927aae460804fd29626 (diff)
downloadcrawl-ref-4e5aae5fdf2f8f4ccd531511ff9b10e8cb79a92c.tar.gz
crawl-ref-4e5aae5fdf2f8f4ccd531511ff9b10e8cb79a92c.zip
Don't apply unarmed melee bonuses from forms to throwing weapons
Diffstat (limited to 'crawl-ref/source/ranged_attack.cc')
-rw-r--r--crawl-ref/source/ranged_attack.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/ranged_attack.cc b/crawl-ref/source/ranged_attack.cc
index 2a14f2e9b1..c02228210a 100644
--- a/crawl-ref/source/ranged_attack.cc
+++ b/crawl-ref/source/ranged_attack.cc
@@ -360,8 +360,10 @@ int ranged_attack::calc_base_unarmed_damage()
if (is_launched(attacker, weapon, *projectile) == LRET_FUMBLED)
return 0;
+ int damage = you.skill_rdiv(wpn_skill);
+
// Stones get half bonus; everything else gets full bonus.
- return div_rand_round(attack::calc_base_unarmed_damage()
+ return div_rand_round(damage
* min(4, property(*projectile, PWPN_DAMAGE)), 4);
}