diff options
| author | Chris Oelmueller <chris.oelmueller@gmail.com> | 2014-04-23 17:30:09 +0200 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-14 23:00:53 -0700 |
| commit | ff84095d8b04a5b2e939fbfb1d8688f82ed4d1a2 (patch) | |
| tree | d45c65da89f4dc2aece6099fef841f8cc3f5158f /crawl-ref/source/itemprop-enum.h | |
| parent | 913e1e1b0aa38a63f6397ea793b3944d432afefc (diff) | |
| download | crawl-ref-ff84095d8b04a5b2e939fbfb1d8688f82ed4d1a2.tar.gz crawl-ref-ff84095d8b04a5b2e939fbfb1d8688f82ed4d1a2.zip | |
Plus2: Combine all three enchant weapon scrolls
New item is just called "scroll of enchant weapon". It increases both accuracy
and damage by 1.
Enchant weapon III scrolls have been converted to stacks of 2 enchant weapon
scrolls where placed in vaults, and if already generated will act like a common
"scroll of enchant weapon" as well for sake of simplicity.
Scroll weights have been adjusted a bit; this almost certainly
needs to be revisited.
[Committer's note: merged a few commits into this, where it seemed sensible.
Also reworked the scroll weights, but yeah, that needs another pass.]
Diffstat (limited to 'crawl-ref/source/itemprop-enum.h')
| -rw-r--r-- | crawl-ref/source/itemprop-enum.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h index 8c2b865a18..46fefd0f4b 100644 --- a/crawl-ref/source/itemprop-enum.h +++ b/crawl-ref/source/itemprop-enum.h @@ -297,7 +297,7 @@ enum scroll_type SCR_NOISE, SCR_REMOVE_CURSE, SCR_SUMMONING, - SCR_ENCHANT_WEAPON_I, + SCR_ENCHANT_WEAPON, SCR_ENCHANT_ARMOUR, SCR_TORMENT, SCR_RANDOM_USELESSNESS, @@ -308,10 +308,14 @@ enum scroll_type SCR_MAGIC_MAPPING, SCR_FOG, SCR_ACQUIREMENT, +#if TAG_MAJOR_VERSION == 34 SCR_ENCHANT_WEAPON_II, +#endif SCR_BRAND_WEAPON, SCR_RECHARGING, +#if TAG_MAJOR_VERSION == 34 SCR_ENCHANT_WEAPON_III, +#endif SCR_HOLY_WORD, SCR_VULNERABILITY, SCR_SILENCE, |