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/shopping.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/shopping.cc')
| -rw-r--r-- | crawl-ref/source/shopping.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 730f635483..ba477cdab2 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1523,7 +1523,6 @@ unsigned int item_value(item_def item, bool ident) valued += 520; break; - case SCR_ENCHANT_WEAPON_III: case SCR_BRAND_WEAPON: valued += 200; break; @@ -1535,6 +1534,7 @@ unsigned int item_value(item_def item, bool ident) case SCR_BLINKING: case SCR_ENCHANT_ARMOUR: + case SCR_ENCHANT_WEAPON: case SCR_TORMENT: case SCR_HOLY_WORD: case SCR_SILENCE: @@ -1542,12 +1542,7 @@ unsigned int item_value(item_def item, bool ident) valued += 75; break; - case SCR_ENCHANT_WEAPON_II: - valued += 55; - break; - case SCR_AMNESIA: - case SCR_ENCHANT_WEAPON_I: case SCR_FEAR: case SCR_IMMOLATION: case SCR_MAGIC_MAPPING: |