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.]

1 files changed, 3 insertions, 16 deletions

diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 837a88bed2..ca5f88a018 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -507,10 +507,7 @@ static string _no_selectables_message(int item_selector)
         return "You aren't wearing any piece of uncursed jewellery.";
     case OSEL_BRANDABLE_WEAPON:
         return "You aren't carrying any weapons that can be branded.";
-    case OSEL_ENCHANTABLE_WEAPON_I:
-    case OSEL_ENCHANTABLE_WEAPON_II:
-    case OSEL_ENCHANTABLE_WEAPON_III:
-        // TODO: this message isn't quite right for _I and _II
+    case OSEL_ENCHANTABLE_WEAPON:
         return "You aren't carrying any weapons that can be enchanted.";
     }
 
@@ -1216,9 +1213,7 @@ static bool _item_class_selected(const item_def &i, int selector)
     case OSEL_BRANDABLE_WEAPON:
         return is_brandable_weapon(i, true);
 
-    case OSEL_ENCHANTABLE_WEAPON_I:
-    case OSEL_ENCHANTABLE_WEAPON_II:
-    case OSEL_ENCHANTABLE_WEAPON_III:
+    case OSEL_ENCHANTABLE_WEAPON:
     {
         if (!is_weapon(i))
             return false;
@@ -1233,15 +1228,7 @@ static bool _item_class_selected(const item_def &i, int selector)
         if (!item_ident(i, ISFLAG_KNOW_PLUSES))
             return true;
 
-        // Might this enchant +acc?
-        const bool acc = selector != OSEL_ENCHANTABLE_WEAPON_II
-                         || i.sub_type == WPN_BLOWGUN;
-        const bool dam = selector != OSEL_ENCHANTABLE_WEAPON_I
-                         && i.sub_type != WPN_BLOWGUN;
-
-        if (acc && i.plus < MAX_WPN_ENCHANT)
-            return true;
-        if (dam && i.plus2 < MAX_WPN_ENCHANT)
+        if (i.plus < MAX_WPN_ENCHANT)
             return true;
         return false;
     }