summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/melee_attack.cc
diff options
context:
space:
mode:
authorChris Oelmueller <chris.oelmueller@gmail.com>2014-04-10 01:06:32 +0200
committerNicholas Feinberg <pleasingfung@gmail.com>2014-06-13 23:41:47 -0700
commit6537abdd850278128eb7b5d4954eba2d7d0a5526 (patch)
tree527c10ebda198a195aa04a4692427aec6b9d3c85 /crawl-ref/source/melee_attack.cc
parent1b4b79b5505598c32d5aabc183851e8b556b74dd (diff)
downloadcrawl-ref-6537abdd850278128eb7b5d4954eba2d7d0a5526.tar.gz
crawl-ref-6537abdd850278128eb7b5d4954eba2d7d0a5526.zip
Combine plus/plus2 for rings of slaying, and Acc+/Dam+ on artefacts
Phase out ARTP_ACCURACY, rename ARTP_DAMAGE to ARTP_SLAYING which now combines both Acc+ and Dam+ bonuses. Bracers of archery are +4 now instead of +5,+3. [Committer's note: fixed a description and cleaned up various other small issues.]
Diffstat (limited to 'crawl-ref/source/melee_attack.cc')
-rw-r--r--crawl-ref/source/melee_attack.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index c5d8b393ec..b3dfa46741 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -3940,7 +3940,7 @@ int melee_attack::calc_your_to_hit_unarmed(int uattack, bool vampiric)
else if (you.species != SP_VAMPIRE && you.hunger_state == HS_STARVING)
your_to_hit -= 3;
- your_to_hit += slaying_bonus(PWPN_HIT);
+ your_to_hit += slaying_bonus();
return your_to_hit;
}