summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop-enum.h
diff options
context:
space:
mode:
authorgammafunk <gammafunk@gmail.com>2014-05-25 12:56:17 -0500
committergammafunk <gammafunk@gmail.com>2014-05-28 12:50:50 -0500
commitafd1d1232c60c598fa064e3417b928de33d77a49 (patch)
treeb8aa0814e03567077897e6c6c453987b62503e31 /crawl-ref/source/itemprop-enum.h
parent4412034ca0e58c61c99658f6d498f3415480dcfa (diff)
downloadcrawl-ref-afd1d1232c60c598fa064e3417b928de33d77a49.tar.gz
crawl-ref-afd1d1232c60c598fa064e3417b928de33d77a49.zip
Remove jewelry and armour sources of conservation
The amulet of conservation and cloaks of preservation are no longer necessary without item destruction. Maxwell's patent armour now has the resistance ego and grants rF+ and rC+.
Diffstat (limited to 'crawl-ref/source/itemprop-enum.h')
-rw-r--r--crawl-ref/source/itemprop-enum.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 5b0d1ba40c..c9f3a96f3c 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -191,8 +191,8 @@ enum jewellery_type
AMU_WARDING,
AMU_RESIST_CORROSION,
AMU_THE_GOURMAND,
- AMU_CONSERVATION,
#if TAG_MAJOR_VERSION == 34
+ AMU_CONSERVATION,
AMU_CONTROLLED_FLIGHT,
#endif
AMU_INACCURACY,
@@ -356,7 +356,9 @@ enum special_armour_type
SPARM_RESISTANCE,
SPARM_POSITIVE_ENERGY,
SPARM_ARCHMAGI,
+#if TAG_MAJOR_VERSION == 34
SPARM_PRESERVATION,
+#endif
SPARM_REFLECTION,
SPARM_SPIRIT_SHIELD,
SPARM_ARCHERY,