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/makeitem.cc | |
| 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/makeitem.cc')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index e74ea5a798..bd822a8538 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2284,8 +2284,8 @@ static void _generate_scroll_item(item_def& item, int force_type, 33, SCR_RECHARGING, 33, SCR_BLINKING, 33, SCR_ENCHANT_ARMOUR, - 33, SCR_ENCHANT_WEAPON_I, - 33, SCR_ENCHANT_WEAPON_II, + // roughly similar to combined weights of old ew 1-3 scrolls + 66, SCR_ENCHANT_WEAPON, 33, SCR_AMNESIA, // [Cha] don't generate noise scrolls if in sprint 33, (crawl_state.game_is_sprint() ? NUM_SCROLLS : SCR_NOISE), @@ -2295,7 +2295,6 @@ static void _generate_scroll_item(item_def& item, int force_type, // Higher-level scrolls. 27, (depth_mod < 4 ? NUM_SCROLLS : SCR_VULNERABILITY), 14, (depth_mod < 4 ? NUM_SCROLLS : SCR_ACQUIREMENT), - 14, (depth_mod < 4 ? NUM_SCROLLS : SCR_ENCHANT_WEAPON_III), 14, (depth_mod < 4 ? NUM_SCROLLS : SCR_SUMMONING), 14, (depth_mod < 4 ? NUM_SCROLLS : SCR_SILENCE), 14, (depth_mod < 4 ? NUM_SCROLLS : SCR_BRAND_WEAPON), @@ -2312,7 +2311,6 @@ static void _generate_scroll_item(item_def& item, int force_type, // determine quantity if (item.sub_type == SCR_BRAND_WEAPON - || item.sub_type == SCR_ENCHANT_WEAPON_III || item.sub_type == SCR_ACQUIREMENT || item.sub_type == SCR_TORMENT || item.sub_type == SCR_HOLY_WORD |