summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.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/itemprop.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/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 1adcd19cd9..c7b20339a6 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1848,8 +1848,6 @@ int ring_has_pluses(const item_def &item)
switch (item.sub_type)
{
case RING_SLAYING:
- return 2;
-
case RING_PROTECTION:
case RING_EVASION:
case RING_STRENGTH: