summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/wiz-item.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/wiz-item.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/wiz-item.cc')
-rw-r--r--crawl-ref/source/wiz-item.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index eda98fc76f..c2b9eba8df 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -326,8 +326,10 @@ static int8_t _prop_type[] =
ARTP_VAL_POS, //METABOLISM
#endif
ARTP_VAL_POS, //MUTAGENIC
+#if TAG_MAJOR_VERSION == 34
ARTP_VAL_ANY, //ACCURACY
- ARTP_VAL_ANY, //DAMAGE
+#endif
+ ARTP_VAL_ANY, //SLAYING
ARTP_VAL_POS, //CURSED
ARTP_VAL_ANY, //STEALTH
ARTP_VAL_ANY, //MAGICAL_POWER
@@ -1385,8 +1387,10 @@ static void _debug_rap_stats(FILE *ostat)
0, //ARTP_METABOLISM
#endif
-1, //ARTP_MUTAGENIC
+#if TAG_MAJOR_VERSION == 34
0, //ARTP_ACCURACY
- 0, //ARTP_DAMAGE
+#endif
+ 0, //ARTP_SLAYING
-1, //ARTP_CURSED
0, //ARTP_STEALTH
0, //ARTP_MAGICAL_POWER
@@ -1543,8 +1547,10 @@ static void _debug_rap_stats(FILE *ostat)
"ARTP_METABOLISM",
#endif
"ARTP_MUTAGENIC",
+#if TAG_MAJOR_VERSION == 34
"ARTP_ACCURACY",
- "ARTP_DAMAGE",
+#endif
+ "ARTP_SLAYING",
"ARTP_CURSED",
"ARTP_STEALTH",
"ARTP_MAGICAL_POWER",