Plus2: Make weapons only generate with one plus

[Committer's note: Merged a few commits into this.]

10 files changed, 290 insertions, 418 deletions

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index bbfbb51ff9..ee4bcae9bf 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -1381,22 +1381,12 @@ int acquirement_create_item(object_class_type class_wanted,
                     make_item_randart(acq_item, true);
             }
 
-            int plusmod = random2(4);
-            if (agent == GOD_TROG)
+            if (agent == GOD_TROG || agent == GOD_OKAWARU)
             {
-                // More damage, less accuracy.
-                acq_item.plus  -= plusmod;
-                acq_item.plus2 += plusmod;
+                if (agent == GOD_TROG)
+                    acq_item.plus += random2(3);
                 if (!is_artefact(acq_item))
-                    acq_item.plus = max(static_cast<int>(acq_item.plus), 0);
-            }
-            else if (agent == GOD_OKAWARU)
-            {
-                // More accuracy, less damage.
-                acq_item.plus  += plusmod;
-                acq_item.plus2 -= plusmod;
-                if (!is_artefact(acq_item))
-                    acq_item.plus2 = max(static_cast<int>(acq_item.plus2), 0);
+                    acq_item.plus = max(static_cast<int>(acq_item.plus), 1);
             }
         }
         else if (is_deck(acq_item))
diff --git a/crawl-ref/source/dat/des/sprint/linesprint.des b/crawl-ref/source/dat/des/sprint/linesprint.des
index 2e99fd28dd..fabbf885b9 100644
--- a/crawl-ref/source/dat/des/sprint/linesprint.des
+++ b/crawl-ref/source/dat/des/sprint/linesprint.des
@@ -222,32 +222,32 @@ KITEM:    d = wand of fire charges:7 ident:all /\
               wand of cold charges:7 ident:all /\
               wand of draining charges:7 ident:all, \
               staff of energy not_cursed ident:all
-KITEM:    e = cutlass plus:2 plus2:2 ego:electrocution ident:all not_cursed /\
-           cutlass plus:2 plus2:2 ego:draining ident:all not_cursed /\
-           cutlass plus:2 plus2:2 ego:venom ident:all not_cursed /\
-           cutlass plus:2 plus2:2 ego:distortion ident:all not_cursed /\
-           cutlass plus:2 plus2:2 good_item ident:all not_cursed, \
-           war axe plus:2 plus2:3 ego:freezing ident:all not_cursed /\
-           war axe plus:2 plus2:3 ego:vorpal ident:all not_cursed /\
-           war axe plus:2 plus2:3 good_item ident:all not_cursed w:5 /\
-           broad axe plus:2 plus2:0 ego:freezing ident:all not_cursed /\
-           broad axe plus:2 plus2:0 ego:vorpal ident:all not_cursed /\
-           broad axe plus:2 plus2:0 good_item ident:all not_cursed w:5, \
-           dire flail plus:2 plus2:2 ego:protection ident:all not_cursed /\
-           dire flail plus:2 plus2:2 ego:vorpal ident:all not_cursed /\
-           dire flail plus:2 plus2:2 good_item ident:all not_cursed w:5 /\
-           morningstar plus:2 plus2:2 ego:protection ident:all not_cursed /\
-           morningstar plus:2 plus2:2 ego:vorpal ident:all not_cursed /\
-           morningstar plus:2 plus2:2 good_item ident:all not_cursed w:5, \
-           halberd plus:2 plus2:2 ego:protection ident:all not_cursed /\
-           halberd plus:2 plus2:2 ego:venom ident:all not_cursed /\
-           halberd plus:2 plus2:2 good_item ident:all not_cursed w:5, \
-           lajatang plus:0 plus2:0 ident:all not_cursed /\
-           quarterstaff plus:4 plus2:4 ego:speed ident:all not_cursed w:15 /\
-           quarterstaff plus:4 plus2:4 good_item ident:all not_cursed w:5, \
-           scimitar plus:2 plus2:2 ego:flaming ident:all not_cursed /\
-           scimitar plus:2 plus2:2 ego:holy_wrath not_cursed ident:all /\
-           scimitar plus:2 plus2:2 good_item not_cursed ident:all
+KITEM:    e = cutlass plus:2 ego:electrocution ident:all not_cursed /\
+           cutlass plus:2 ego:draining ident:all not_cursed /\
+           cutlass plus:2 ego:venom ident:all not_cursed /\
+           cutlass plus:2 ego:distortion ident:all not_cursed /\
+           cutlass plus:2 good_item ident:all not_cursed, \
+           war axe plus:3 ego:freezing ident:all not_cursed /\
+           war axe plus:3 ego:vorpal ident:all not_cursed /\
+           war axe plus:3 good_item ident:all not_cursed w:5 /\
+           broad axe plus:1 ego:freezing ident:all not_cursed /\
+           broad axe plus:1 ego:vorpal ident:all not_cursed /\
+           broad axe plus:1 good_item ident:all not_cursed w:5, \
+           dire flail plus:2 ego:protection ident:all not_cursed /\
+           dire flail plus:2 ego:vorpal ident:all not_cursed /\
+           dire flail plus:2 good_item ident:all not_cursed w:5 /\
+           morningstar plus:2 ego:protection ident:all not_cursed /\
+           morningstar plus:2 ego:vorpal ident:all not_cursed /\
+           morningstar plus:2 good_item ident:all not_cursed w:5, \
+           halberd plus:2 ego:protection ident:all not_cursed /\
+           halberd plus:2 ego:venom ident:all not_cursed /\
+           halberd plus:2 good_item ident:all not_cursed w:5, \
+           lajatang plus:0 ident:all not_cursed /\
+           quarterstaff plus:4 ego:speed ident:all not_cursed w:15 /\
+           quarterstaff plus:4 good_item ident:all not_cursed w:5, \
+           scimitar plus:2 ego:flaming ident:all not_cursed /\
+           scimitar plus:2 ego:holy_wrath not_cursed ident:all /\
+           scimitar plus:2 good_item not_cursed ident:all
 KITEM:    f = pair of gloves mundane ident:all not_cursed /\
            pair of boots mundane ident:all not_cursed /\
            helmet mundane ident:all not_cursed /\
@@ -413,23 +413,23 @@ KITEM:    a = ring of protection from fire ident:all not_cursed /\
           ring of poison resistance ident:all not_cursed /\
           any jewellery ident:all not_cursed
 KITEM:    b = any weapon level:27 ident:all /\
-          broad axe plus:3 plus2:2 not_cursed ident:all /\
-          battleaxe plus:1 plus2:1 not_cursed ident:all /\
-          executioner's axe plus:0 plus2:0 not_cursed ident:all w:3 /\
-          glaive plus:1 plus2:1 not_cursed ident:all /\
-          bardiche plus:0 plus2:0 not_cursed ident:all w:3 /\
-          dire flail plus:3 plus2:3 not_cursed ident:all /\
-          great mace plus:1 plus2:1 not_cursed ident:all /\
-          demon whip plus:1 plus2:1 not_cursed ident:all w:5 /\
-          giant spiked plus:1 plus2:1 club not_cursed ident:all /\
-          quick blade plus:3 plus2:3 not_cursed ident:all /\
-          great sword plus:1 plus2:1 not_cursed ident:all /\
-          bastard sword plus:1 plus2:1 not_cursed ident:all /\
-          demon blade plus:1 plus2:1 not_cursed ident:all w:3 /\
-          claymore plus:0 plus2:0 not_cursed ident:all w:3 /\
-          lajatang plus:1 plus2:1 not_cursed ident:all /\
-          longbow plus:1 plus2:1 not_cursed ident:all /\
-          crossbow plus:1 plus2:1 not_cursed ident:all /\
+          broad axe plus:3 not_cursed ident:all /\
+          battleaxe plus:1 not_cursed ident:all /\
+          executioner's axe plus:0 not_cursed ident:all w:3 /\
+          glaive plus:1 not_cursed ident:all /\
+          bardiche plus:0 not_cursed ident:all w:3 /\
+          dire flail plus:3 not_cursed ident:all /\
+          great mace plus:1 not_cursed ident:all /\
+          demon whip plus:1 not_cursed ident:all w:5 /\
+          giant spiked club plus:1 not_cursed ident:all /\
+          quick blade plus:3 not_cursed ident:all /\
+          great sword plus:1 not_cursed ident:all /\
+          bastard sword plus:1 not_cursed ident:all /\
+          demon blade plus:1 not_cursed ident:all w:3 /\
+          claymore plus:0 not_cursed ident:all w:3 /\
+          lajatang plus:1 not_cursed ident:all /\
+          longbow plus:1 not_cursed ident:all /\
+          crossbow plus:1 not_cursed ident:all /\
           any weapon good_item ident:all w:30
 KITEM:    d = any armour level:27 ident:all /\
           pair of gloves plus:1 ident:all not_cursed /\
@@ -588,38 +588,38 @@ KITEM:    a = ring of slaying plus:2 ident:all not_cursed /\
           ring of dexterity plus:6 ident:all not_cursed /\
           ring of wizardry ident:all not_cursed /\
           any jewellery ident:all not_cursed
-KITEM:    b = battleaxe plus:4 plus2:4 ego:none not_cursed ident:all /\
-    battleaxe plus:1 plus2:1 good_item not_cursed ident:all /\
-    executioner's axe plus:2 plus2:2 ego:none not_cursed ident:all /\
-    executioner's axe plus:0 plus2:0 good_item not_cursed ident:all /\
-    broad axe plus:7 plus2:7 ego:none not_cursed ident:all /\
-    broad axe plus:3 plus2:3 good_item not_cursed ident:all /\
-    glaive plus:4 plus2:4 ego:none not_cursed ident:all /\
-    glaive plus:2 plus2:2 good_item not_cursed ident:all /\
-    scythe plus:9 plus2:9 ego:none not_cursed ident:all /\
-    scythe plus:6 plus2:6 good_item not_cursed ident:all /\
-    bardiche plus:2 plus2:2 ego:none not_cursed ident:all /\
-    bardiche plus:0 plus2:0 good_item not_cursed ident:all /\
-    demon trident plus:4 plus2:4 ego:none not_cursed ident:all /\
-    demon trident plus:1 plus2:1 good_item not_cursed ident:all /\
-    great mace plus:4 plus2:4 ego:none not_cursed ident:all /\
-    great mace plus:1 plus2:1 good_item not_cursed ident:all /\
-    giant spiked club plus:4 plus2:4 ego:none not_cursed ident:all /\
-    giant spiked club plus:1 plus2:1 good_item not_cursed ident:all /\
-    demon whip plus:4 plus2:4 ego:none not_cursed ident:all /\
-    demon whip plus:1 plus2:1 good_item not_cursed ident:all /\
-    bastard sword plus:4 plus2:4 ego:none not_cursed ident:all /\
-    bastard sword plus:1 plus2:1 good_item not_cursed ident:all /\
-    claymore plus:2 plus2:2 ego:none not_cursed ident:all /\
-    claymore plus:0 plus2:0 good_item not_cursed ident:all /\
-    demon blade plus:4 plus2:4 ego:none not_cursed ident:all /\
-    demon blade plus:1 plus2:1 good_item not_cursed ident:all /\
-    great sword plus:4 plus2:4 ego:none not_cursed ident:all /\
-    great sword plus:1 plus2:1 good_item not_cursed ident:all /\
-    lajatang plus:4 plus2:4 ego:none not_cursed ident:all /\
-    lajatang plus:1 plus2:1 good_item not_cursed ident:all /\
-    longbow plus:3 plus2:3 good_item not_cursed ident:all w:15 /\
-    crossbow plus:3 plus2:3 good_item not_cursed ident:all w:15
+KITEM:    b = battleaxe plus:4 ego:none not_cursed ident:all /\
+    battleaxe plus:1 good_item not_cursed ident:all /\
+    executioner's axe plus:2 ego:none not_cursed ident:all /\
+    executioner's axe plus:0 good_item not_cursed ident:all /\
+    broad axe plus:7 ego:none not_cursed ident:all /\
+    broad axe plus:3 good_item not_cursed ident:all /\
+    glaive plus:4 ego:none not_cursed ident:all /\
+    glaive plus:2 good_item not_cursed ident:all /\
+    scythe plus:9 ego:none not_cursed ident:all /\
+    scythe plus:6 good_item not_cursed ident:all /\
+    bardiche plus:2 ego:none not_cursed ident:all /\
+    bardiche plus:0 good_item not_cursed ident:all /\
+    demon trident plus:4 ego:none not_cursed ident:all /\
+    demon trident plus:1 good_item not_cursed ident:all /\
+    great mace plus:4 ego:none not_cursed ident:all /\
+    great mace plus:1 good_item not_cursed ident:all /\
+    giant spiked club plus:4 ego:none not_cursed ident:all /\
+    giant spiked club plus:1 good_item not_cursed ident:all /\
+    demon whip plus:4 ego:none not_cursed ident:all /\
+    demon whip plus:1 good_item not_cursed ident:all /\
+    bastard sword plus:4 ego:none not_cursed ident:all /\
+    bastard sword plus:1 good_item not_cursed ident:all /\
+    claymore plus:2 ego:none not_cursed ident:all /\
+    claymore plus:0 good_item not_cursed ident:all /\
+    demon blade plus:4 ego:none not_cursed ident:all /\
+    demon blade plus:1 good_item not_cursed ident:all /\
+    great sword plus:4 ego:none not_cursed ident:all /\
+    great sword plus:1 good_item not_cursed ident:all /\
+    lajatang plus:4 ego:none not_cursed ident:all /\
+    lajatang plus:1 good_item not_cursed ident:all /\
+    longbow plus:3 good_item not_cursed ident:all w:15 /\
+    crossbow plus:3 good_item not_cursed ident:all w:15
 KITEM:    d = plate armour plus:5 not_cursed ident:all /\
     plate armour plus:3 good_item not_cursed ident:all /\
     chain mail plus:5 not_cursed ident:all w:20 /\
@@ -806,53 +806,38 @@ KITEM:    a = amulet of faith randart not_cursed ident:all /\
     ring of intelligence plus:3 randart ident:all not_cursed /\
     ring of dexterity plus:3 randart ident:all not_cursed /\
     ring of wizardry ident:all randart not_cursed
-KITEM:    b = battleaxe plus:5 plus2:5 good_item not_cursed ident:all /\
-    battleaxe plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    battleaxe plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    executioner's axe plus:5 plus2:5 good_item not_cursed ident:all /\
-    executioner's axe plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    executioner's axe plus:0 plus2:7 randart not_cursed ident:all w:3 /\
-    broad axe plus:5 plus2:5 good_item not_cursed ident:all /\
-    broad axe plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    broad axe plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    glaive plus:5 plus2:5 good_item not_cursed ident:all /\
-    glaive plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    glaive plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    scythe plus:11 plus2:11 good_item not_cursed ident:all /\
-    scythe plus:9 plus2:9 randart not_cursed ident:all w:3 /\
-    scythe plus:5 plus2:15 randart not_cursed ident:all w:3 /\
-    bardiche plus:5 plus2:5 good_item not_cursed ident:all /\
-    bardiche plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    bardiche plus:0 plus2:7 randart not_cursed ident:all w:3 /\
-    demon trident plus:5 plus2:5 good_item not_cursed ident:all /\
-    demon trident plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    demon trident plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    great mace plus:5 plus2:5 good_item not_cursed ident:all /\
-    great mace plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    great mace plus:0 plus2:7 randart not_cursed ident:all w:3 /\
-    giant spiked club plus:5 plus2:5 good_item not_cursed ident:all /\
-    giant spiked club plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    giant spiked club plus:0 plus2:7 randart not_cursed ident:all w:3 /\
-    demon whip plus:5 plus2:5 good_item not_cursed ident:all /\
-    demon whip plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    demon whip plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    bastard sword plus:5 plus2:5 good_item not_cursed ident:all /\
-    bastard sword plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    bastard sword plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    claymore plus:5 plus2:5 good_item not_cursed ident:all /\
-    claymore plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    claymore plus:0 plus2:7 randart not_cursed ident:all w:3 /\
-    demon blade plus:5 plus2:5 good_item not_cursed ident:all /\
-    demon blade plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    demon blade plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    great sword plus:5 plus2:5 good_item not_cursed ident:all /\
-    great sword plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    great sword plus:0 plus2:7 randart not_cursed ident:all w:3 /\
-    lajatang plus:5 plus2:5 good_item not_cursed ident:all /\
-    lajatang plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    lajatang plus:0 plus2:9 randart not_cursed ident:all w:3 /\
-    longbow plus:5 plus2:5 ego:vorpal not_cursed ident:all w:15 /\
-    crossbow plus:5 plus2:5 ego:vorpal not_cursed ident:all w:15
+KITEM:    b = battleaxe plus:5 good_item not_cursed ident:all /\
+    battleaxe plus:5 randart not_cursed ident:all w:5 /\
+    executioner's axe plus:5 good_item not_cursed ident:all /\
+    executioner's axe plus:5 randart not_cursed ident:all w:5 /\
+    broad axe plus:5 good_item not_cursed ident:all /\
+    broad axe plus:5 randart not_cursed ident:all w:5 /\
+    glaive plus:5 good_item not_cursed ident:all /\
+    glaive plus:5 randart not_cursed ident:all w:5 /\
+    scythe plus:11 good_item not_cursed ident:all /\
+    scythe plus:11 randart not_cursed ident:all w:5 /\
+    bardiche plus:5 good_item not_cursed ident:all /\
+    bardiche plus:5 randart not_cursed ident:all w:5 /\
+    demon trident plus:5 good_item not_cursed ident:all /\
+    demon trident plus:5 randart not_cursed ident:all w:5 /\
+    great mace plus:5 good_item not_cursed ident:all /\
+    great mace plus:5 randart not_cursed ident:all w:5 /\
+    giant spiked club plus:5 good_item not_cursed ident:all /\
+    giant spiked club plus:5 randart not_cursed ident:all w:5 /\
+    demon whip plus:5 good_item not_cursed ident:all /\
+    demon whip plus:5 randart not_cursed ident:all w:5 /\
+    bastard sword plus:5 good_item not_cursed ident:all /\
+    bastard sword plus:5 randart not_cursed ident:all w:5 /\
+    claymore plus:5 good_item not_cursed ident:all /\
+    claymore plus:5 randart not_cursed ident:all w:5 /\
+    demon blade plus:5 good_item not_cursed ident:all /\
+    demon blade plus:5 randart not_cursed ident:all w:5 /\
+    great sword plus:5 good_item not_cursed ident:all /\
+    great sword plus:5 randart not_cursed ident:all w:5 /\
+    lajatang plus:5 good_item not_cursed ident:all /\
+    lajatang plus:5 randart not_cursed ident:all w:5 /\
+    longbow plus:5 ego:vorpal not_cursed ident:all w:15 /\
+    crossbow plus:5 ego:vorpal not_cursed ident:all w:15
 KITEM:    d = plate armour plus:6 not_cursed ident:all /\
     plate armour plus:4 good_item not_cursed ident:all /\
     chain mail plus:6 not_cursed ident:all /\
diff --git a/crawl-ref/source/dat/des/sprint/meat.des b/crawl-ref/source/dat/des/sprint/meat.des
index 9b16097c13..6c52054e20 100644
--- a/crawl-ref/source/dat/des/sprint/meat.des
+++ b/crawl-ref/source/dat/des/sprint/meat.des
@@ -9,14 +9,14 @@
   local bag_of_meat =
     "orc hp:400 hd:30 name:bag_of_meat n_rpl n_des n_spe n_zom \
     col:red generate_awake ; ring of slaying plus:30 \
-    not_cursed ident:all no_pickup . war axe plus:9 plus2:9 \
+    not_cursed ident:all no_pickup . war axe plus:9 \
     not_cursed ego:none ident:all no_pickup"
 
   local meat_berserker =
     "ogre hp:500 hd:50 name:meat_berserker n_rpl n_des n_spe n_zom \
     always_corpse col:red perm_ench:berserk generate_awake \
     ; ring of slaying plus:30 not_cursed ident:all \
-    no_pickup . battleaxe plus:9 plus2:9 not_cursed ego:none \
+    no_pickup . battleaxe plus:9 not_cursed ego:none \
     ident:all no_pickup"
 
   local tyrant =
@@ -39,7 +39,7 @@
     n_spe n_zom  col:red generate_awake perm_ench:inner_flame \
     ; ring of slaying plus:100 not_cursed ident:all \
     no_pickup . \
-    giant spiked club plus:9 plus2:9 not_cursed ego:none \
+    giant spiked club plus:9 not_cursed ego:none \
     ident:all no_pickup"
 
   local destroyer =
@@ -47,7 +47,7 @@
     never_corpse col:red generate_awake \
     spells:blink_close;blink_close;blink_close;blink_close;blink_close \
     ; ring of slaying plus:200 not_cursed ident:all \
-    no_pickup . great sword plus:9 plus2:9 ego:vorpal ident:all no_pickup"
+    no_pickup . great sword plus:9 ego:vorpal ident:all no_pickup"
 
   local plague =
     "sea snake hp:500 hd:30 name:scourge n_rpl n_des n_spe \
@@ -59,7 +59,7 @@
     n_des n_spe n_zom never_corpse col:red generate_awake \
     spells:twisted_resurrection;twisted_resurrection;twisted_resurrection \
     ; ring of slaying plus:250 not_cursed ident:all \
-    no_pickup . great sword plus:9 plus2:9 not_cursed ego:none \
+    no_pickup . great sword plus:9 not_cursed ego:none \
     ident:all no_pickup"
 
   local observer =
@@ -88,7 +88,7 @@
     col:lightmagenta generate_awake \
     spells:slow;haste \
     ; ring of slaying plus:400 not_cursed ident:all \
-    no_pickup . great mace plus:9 plus2:9 not_cursed ego:none \
+    no_pickup . great mace plus:9 not_cursed ego:none \
     ident:all no_pickup"
 
   local vile =
@@ -101,7 +101,7 @@
     "harold hp:650 hd:40 name:The_Servant n_rpl col:yellow \
     generate_awake never_corpse spells:.;.;.;. \
     ; ring of slaying plus:130 not_cursed ident:all \
-    no_pickup . glaive plus:9 plus2:9 not_cursed ego:flaming \
+    no_pickup . glaive plus:9 not_cursed ego:flaming \
     ident:all no_pickup"
 
   local captor =
@@ -109,7 +109,7 @@
     generate_awake never_corpse \
     spells:sentinel's_mark;haste;ensnare \
     ; ring of slaying plus:200 not_cursed ident:all \
-    no_pickup . claymore plus:9 plus2:9 not_cursed ego:vorpal \
+    no_pickup . claymore plus:9 not_cursed ego:vorpal \
     ident:all no_pickup"
 
   local defiler =
@@ -117,7 +117,7 @@
     generate_awake never_corpse \
     spells:fireball;fireball;fireball;poisonous_cloud \
     ; ring of slaying plus:250 not_cursed ident:all \
-    no_pickup . demon whip plus:9 plus2:9 not_cursed ego:vorpal \
+    no_pickup . demon whip plus:9 not_cursed ego:vorpal \
     ident:all no_pickup \
     . large shield plus:12 not_cursed ego:none \
     ident:all no_pickup"
@@ -156,10 +156,10 @@
     elseif you.race() == "Spriggan" or
            you.race() == "Kobold"   or
            you.race() == "Halfling" then
-      e.kitem("{ = broad axe plus:27000 plus2:27000 ident:all no_pickup \
+      e.kitem("{ = broad axe plus:27000 ident:all no_pickup \
                not_cursed ego:vorpal unrand:axe_of_woe")
     else
-      e.kitem("{ = executioner's axe plus:27000 plus2:27000 ident:all no_pickup \
+      e.kitem("{ = executioner's axe plus:27000 ident:all no_pickup \
                not_cursed ego:vorpal unrand:axe_of_woe")
     end
   end
diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
index 6852a8fc5e..b63a2cec09 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -196,68 +196,38 @@ function general_item_setup(e)
           scroll of enchant weapon ii ident:all q:2 /\
           scroll of enchant weapon iii ident:all /\
           scroll of enchant armour ident:all q:2")
-  e.kitem(") = battleaxe plus:9 plus2:9 good_item not_cursed ident:all /\
-    battleaxe plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    battleaxe plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    battleaxe plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    executioner's axe plus:7 plus2:7 good_item not_cursed ident:all /\
-    executioner's axe plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    executioner's axe plus:3 plus2:9 randart not_cursed ident:all w:3 /\
-    executioner's axe plus:9 plus2:3 randart not_cursed ident:all w:3 /\
-    broad axe plus:11 plus2:11 good_item not_cursed ident:all /\
-    broad axe plus:9 plus2:9 randart not_cursed ident:all w:3 /\
-    broad axe plus:7 plus2:13 randart not_cursed ident:all w:3 /\
-    broad axe plus:13 plus2:7 randart not_cursed ident:all w:3 /\
-    glaive plus:9 plus2:9 good_item not_cursed ident:all /\
-    glaive plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    glaive plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    glaive plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    scythe plus:11 plus2:11 good_item not_cursed ident:all /\
-    scythe plus:9 plus2:9 randart not_cursed ident:all w:3 /\
-    scythe plus:15 plus2:5 randart not_cursed ident:all w:3 /\
-    scythe plus:5 plus2:15 randart not_cursed ident:all w:3 /\
-    bardiche plus:7 plus2:7 good_item not_cursed ident:all /\
-    bardiche plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    bardiche plus:3 plus2:9 randart not_cursed ident:all w:3 /\
-    bardiche plus:9 plus2:3 randart not_cursed ident:all w:3 /\
-    demon trident plus:9 plus2:9 good_item not_cursed ident:all /\
-    demon trident plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    demon trident plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    demon trident plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    great mace plus:9 plus2:9 good_item not_cursed ident:all /\
-    great mace plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    great mace plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    great mace plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    giant spiked club plus:9 plus2:9 good_item not_cursed ident:all /\
-    giant spiked club plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    giant spiked club plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    giant spiked club plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    demon whip plus:9 plus2:9 good_item not_cursed ident:all /\
-    demon whip plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    demon whip plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    demon whip plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    bastard sword plus:9 plus2:9 good_item not_cursed ident:all /\
-    bastard sword plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    bastard sword plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    bastard sword plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    claymore plus:7 plus2:7 good_item not_cursed ident:all /\
-    claymore plus:5 plus2:5 randart not_cursed ident:all w:3 /\
-    claymore plus:3 plus2:9 randart not_cursed ident:all w:3 /\
-    claymore plus:9 plus2:3 randart not_cursed ident:all w:3 /\
-    demon blade plus:9 plus2:9 good_item not_cursed ident:all /\
-    demon blade plus:9 plus2:9 randart not_cursed ident:all w:3 /\
-    demon blade plus:13 plus2:7 randart not_cursed ident:all w:3 /\
-    demon blade plus:7 plus2:13 randart not_cursed ident:all w:3 /\
-    great sword plus:9 plus2:9 good_item not_cursed ident:all /\
-    great sword plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    great sword plus:11 plus2:11 randart not_cursed ident:all w:3 /\
-    great sword plus:5 plus2:13 randart not_cursed ident:all w:3 /\
-    lajatang plus:9 plus2:9 good_item not_cursed ident:all /\
-    lajatang plus:7 plus2:7 randart not_cursed ident:all w:3 /\
-    lajatang plus:10 plus2:5 randart not_cursed ident:all w:3 /\
-    lajatang plus:5 plus2:10 randart not_cursed ident:all w:3 /\
-    longbow plus:7 plus2:7 ego:vorpal not_cursed ident:all w:15 /\
-    crossbow plus:7 plus2:7 ego:vorpal not_cursed ident:all w:15")
+  e.kitem(") = battleaxe plus:9 good_item not_cursed ident:all /\
+    battleaxe plus:7 randart not_cursed ident:all /\
+    executioner's axe plus:7 good_item not_cursed ident:all /\
+    executioner's axe plus:5 randart not_cursed ident:all /\
+    broad axe plus:11 good_item not_cursed ident:all /\
+    broad axe plus:9 randart not_cursed ident:all /\
+    glaive plus:9 good_item not_cursed ident:all /\
+    glaive plus:7 randart not_cursed ident:all /\
+    scythe plus:11 good_item not_cursed ident:all /\
+    scythe plus:9 randart not_cursed ident:all /\
+    bardiche plus:7 good_item not_cursed ident:all /\
+    bardiche plus:5 randart not_cursed ident:all /\
+    demon trident plus:9 good_item not_cursed ident:all /\
+    demon trident plus:7 randart not_cursed ident:all /\
+    great mace plus:9 good_item not_cursed ident:all /\
+    great mace plus:7 randart not_cursed ident:all /\
+    giant spiked club plus:9 good_item not_cursed ident:all /\
+    giant spiked club plus:7 randart not_cursed ident:all /\
+    demon whip plus:9 good_item not_cursed ident:all /\
+    demon whip plus:7 randart not_cursed ident:all /\
+    bastard sword plus:9 good_item not_cursed ident:all /\
+    bastard sword plus:7 randart not_cursed ident:all /\
+    claymore plus:7 good_item not_cursed ident:all /\
+    claymore plus:5 randart not_cursed ident:all /\
+    demon blade plus:11 good_item not_cursed ident:all /\
+    demon blade plus:9 randart not_cursed ident:all /\
+    great sword plus:9 good_item not_cursed ident:all /\
+    great sword plus:7 randart not_cursed ident:all /\
+    lajatang plus:9 good_item not_cursed ident:all /\
+    lajatang plus:7 randart not_cursed ident:all /\
+    longbow plus:7 ego:vorpal not_cursed ident:all w:15 /\
+    crossbow plus:7 ego:vorpal not_cursed ident:all w:15")
   e.kitem("] = plate armour plus:12 not_cursed ident:all /\
     plate armour plus:8 good_item not_cursed ident:all /\
     chain mail plus:8 not_cursed ident:all /\
@@ -287,38 +257,38 @@ function general_item_setup(e)
     large shield plus:3 good_item not_cursed ident:all /\
     naga barding plus:6 not_cursed ident:all w:5 /\
     centaur barding plus:6 not_cursed ident:all w:5")
-  e.kitem("( = battleaxe plus:6 plus2:6 ego:none not_cursed ident:all /\
-    battleaxe plus:3 plus2:3 good_item not_cursed ident:all /\
-    executioner's axe plus:3 plus2:3 ego:none not_cursed ident:all /\
-    executioner's axe plus:0 plus2:0 good_item not_cursed ident:all /\
-    broad axe plus:9 plus2:9 ego:none not_cursed ident:all /\
-    broad axe plus:6 plus2:6 good_item not_cursed ident:all /\
-    glaive plus:6 plus2:6 ego:none not_cursed ident:all /\
-    glaive plus:3 plus2:3 good_item not_cursed ident:all /\
-    scythe plus:9 plus2:9 ego:none not_cursed ident:all /\
-    scythe plus:6 plus2:6 good_item not_cursed ident:all /\
-    bardiche plus:3 plus2:3 ego:none not_cursed ident:all /\
-    bardiche plus:0 plus2:0 good_item not_cursed ident:all /\
-    demon trident plus:6 plus2:6 ego:none not_cursed ident:all /\
-    demon trident plus:3 plus2:3 good_item not_cursed ident:all /\
-    great mace plus:6 plus2:6 ego:none not_cursed ident:all /\
-    great mace plus:3 plus2:3 good_item not_cursed ident:all /\
-    giant spiked club plus:6 plus2:6 ego:none not_cursed ident:all /\
-    giant spiked club plus:3 plus2:3 good_item not_cursed ident:all /\
-    demon whip plus:6 plus2:6 ego:none not_cursed ident:all /\
-    demon whip plus:3 plus2:3 good_item not_cursed ident:all /\
-    bastard sword plus:6 plus2:6 ego:none not_cursed ident:all /\
-    bastard sword plus:3 plus2:3 good_item not_cursed ident:all /\
-    claymore plus:3 plus2:3 ego:none not_cursed ident:all /\
-    claymore plus:0 plus2:0 good_item not_cursed ident:all /\
-    demon blade plus:6 plus2:6 ego:none not_cursed ident:all /\
-    demon blade plus:3 plus2:3 good_item not_cursed ident:all /\
-    great sword plus:6 plus2:6 ego:none not_cursed ident:all /\
-    great sword plus:3 plus2:3 good_item not_cursed ident:all /\
-    lajatang plus:6 plus2:6 ego:none not_cursed ident:all /\
-    lajatang plus:3 plus2:3 good_item not_cursed ident:all /\
-    longbow plus:5 plus2:5 good_item not_cursed ident:all w:15 /\
-    crossbow plus:5 plus2:5 good_item not_cursed ident:all w:15")
+  e.kitem("( = battleaxe plus:6 ego:none not_cursed ident:all /\
+    battleaxe plus:3 good_item not_cursed ident:all /\
+    executioner's axe plus:3 ego:none not_cursed ident:all /\
+    executioner's axe plus:0 good_item not_cursed ident:all /\
+    broad axe plus:9 ego:none not_cursed ident:all /\
+    broad axe plus:6 good_item not_cursed ident:all /\
+    glaive plus:6 ego:none not_cursed ident:all /\
+    glaive plus:3 good_item not_cursed ident:all /\
+    scythe plus:9 ego:none not_cursed ident:all /\
+    scythe plus:6 good_item not_cursed ident:all /\
+    bardiche plus:3 ego:none not_cursed ident:all /\
+    bardiche plus:0 good_item not_cursed ident:all /\
+    demon trident plus:6 ego:none not_cursed ident:all /\
+    demon trident plus:3 good_item not_cursed ident:all /\
+    great mace plus:6 ego:none not_cursed ident:all /\
+    great mace plus:3 good_item not_cursed ident:all /\
+    giant spiked club plus:6 ego:none not_cursed ident:all /\
+    giant spiked club plus:3 good_item not_cursed ident:all /\
+    demon whip plus:6 ego:none not_cursed ident:all /\
+    demon whip plus:3 good_item not_cursed ident:all /\
+    bastard sword plus:6 ego:none not_cursed ident:all /\
+    bastard sword plus:3 good_item not_cursed ident:all /\
+    claymore plus:3 ego:none not_cursed ident:all /\
+    claymore plus:0 good_item not_cursed ident:all /\
+    demon blade plus:6 ego:none not_cursed ident:all /\
+    demon blade plus:3 good_item not_cursed ident:all /\
+    great sword plus:6 ego:none not_cursed ident:all /\
+    great sword plus:3 good_item not_cursed ident:all /\
+    lajatang plus:6 ego:none not_cursed ident:all /\
+    lajatang plus:3 good_item not_cursed ident:all /\
+    longbow plus:5 good_item not_cursed ident:all w:15 /\
+    crossbow plus:5 good_item not_cursed ident:all w:15")
   e.kitem("[ = plate armour plus:7 not_cursed ident:all /\
     plate armour plus:4 good_item not_cursed ident:all /\
     chain mail plus:7 not_cursed ident:all w:20 /\
@@ -447,23 +417,23 @@ function armoury_setup(e)
   e.kmons("0 = orc knight / vault guard / naga warrior / deep elf knight /\
              deep elf blademaster w:1 / yaktaur captain band w:5")
   e.kitem("a = any weapon level:27 ident:all /\
-          broad axe plus:5 plus2:5 not_cursed ident:all /\
-          battleaxe plus:3 plus2:3 not_cursed ident:all /\
-          executioner's axe plus:1 plus2:1 not_cursed ident:all w:3 /\
-          glaive plus:3 plus2:3 not_cursed ident:all /\
-          bardiche plus:1 plus2:1 not_cursed ident:all w:3 /\
-          dire flail plus:5 plus2:5 not_cursed ident:all /\
-          great mace plus:3 plus2:3 not_cursed ident:all /\
-          demon whip plus:3 plus2:3 not_cursed ident:all w:5 /\
-          giant spiked plus:3 plus2:3 club not_cursed ident:all /\
-          quick blade plus:5 plus2:5 not_cursed ident:all /\
-          great sword plus:3 plus2:3 not_cursed ident:all /\
-          bastard sword plus:3 plus2:3 not_cursed ident:all /\
-          demon blade plus:3 plus2:3 not_cursed ident:all w:3 /\
-          claymore plus:1 plus2:1 not_cursed ident:all w:3 /\
-          lajatang plus:3 plus2:3 not_cursed ident:all /\
-          longbow plus:3 plus2:3 not_cursed ident:all /\
-          crossbow plus:3 plus2:3 not_cursed ident:all /\
+          broad axe plus:5 not_cursed ident:all /\
+          battleaxe plus:3 not_cursed ident:all /\
+          executioner's axe plus:1 not_cursed ident:all w:3 /\
+          glaive plus:3 not_cursed ident:all /\
+          bardiche plus:1 not_cursed ident:all w:3 /\
+          dire flail plus:5 not_cursed ident:all /\
+          great mace plus:3 not_cursed ident:all /\
+          demon whip plus:3 not_cursed ident:all w:5 /\
+          giant spiked club plus:3 not_cursed ident:all /\
+          quick blade plus:5 not_cursed ident:all /\
+          great sword plus:3 not_cursed ident:all /\
+          bastard sword plus:3 not_cursed ident:all /\
+          demon blade plus:3 not_cursed ident:all w:3 /\
+          claymore plus:1 not_cursed ident:all w:3 /\
+          lajatang plus:3 not_cursed ident:all /\
+          longbow plus:3 not_cursed ident:all /\
+          crossbow plus:3 not_cursed ident:all /\
           any weapon good_item ident:all w:30")
   e.kitem("b = any armour level:27 ident:all /\
           pair of gloves plus:1 ident:all not_cursed /\
@@ -677,32 +647,32 @@ KITEM: d = potion of invisibility ident:all q:2, \
        potion of berserk rage ident:all q:2, \
        potion of magic q:2 ident:all
 # The 3rd equipment room
-KITEM: e = cutlass plus:2 plus2:2 ego:electrocution ident:all not_cursed /\
-       cutlass plus:2 plus2:2 ego:draining ident:all not_cursed /\
-       cutlass plus:2 plus2:2 ego:venom ident:all not_cursed /\
-       cutlass plus:2 plus2:2 ego:distortion ident:all not_cursed /\
-       cutlass plus:2 plus2:2 good_item ident:all not_cursed
-KITEM: f = war axe plus:2 plus2:3 ego:freezing ident:all not_cursed /\
-       war axe plus:2 plus2:3 ego:vorpal ident:all not_cursed /\
-       war axe plus:2 plus2:3 good_item ident:all not_cursed w:5 /\
-       broad axe plus:2 plus2:0 ego:freezing ident:all not_cursed /\
-       broad axe plus:2 plus2:0 ego:vorpal ident:all not_cursed /\
-       broad axe plus:2 plus2:0 good_item ident:all not_cursed w:5
-KITEM: g = dire flail plus:2 plus2:2 ego:protection ident:all not_cursed /\
-       dire flail plus:2 plus2:2 ego:vorpal ident:all not_cursed /\
-       dire flail plus:2 plus2:2 good_item ident:all not_cursed w:5 /\
-       morningstar plus:2 plus2:2 ego:protection ident:all not_cursed /\
-       morningstar plus:2 plus2:2 ego:vorpal ident:all not_cursed /\
-       morningstar plus:2 plus2:2 good_item ident:all not_cursed w:5
-KITEM: h = halberd plus:2 plus2:2 ego:protection ident:all not_cursed /\
-       halberd plus:2 plus2:2 ego:venom ident:all not_cursed /\
-       halberd plus:2 plus2:2 good_item ident:all not_cursed w:5
-KITEM: i = lajatang plus:0 plus2:0 ident:all not_cursed /\
-       quarterstaff plus:4 plus2:4 ego:speed ident:all not_cursed w:15 /\
-       quarterstaff plus:4 plus2:4 good_item ident:all not_cursed w:5
-KITEM: j = scimitar plus:2 plus2:2 ego:flaming ident:all not_cursed /\
-       scimitar plus:2 plus2:2 ego:holy_wrath not_cursed ident:all /\
-       scimitar plus:2 plus2:2 good_item not_cursed ident:all
+KITEM: e = cutlass plus:2 ego:electrocution ident:all not_cursed /\
+       cutlass plus:2 ego:draining ident:all not_cursed /\
+       cutlass plus:2 ego:venom ident:all not_cursed /\
+       cutlass plus:2 ego:distortion ident:all not_cursed /\
+       cutlass plus:2 good_item ident:all not_cursed
+KITEM: f = war axe plus:2 ego:freezing ident:all not_cursed /\
+       war axe plus:2 ego:vorpal ident:all not_cursed /\
+       war axe plus:2 good_item ident:all not_cursed w:5 /\
+       broad axe plus:1 ego:freezing ident:all not_cursed /\
+       broad axe plus:1 ego:vorpal ident:all not_cursed /\
+       broad axe plus:1 good_item ident:all not_cursed w:5
+KITEM: g = dire flail plus:2 ego:protection ident:all not_cursed /\
+       dire flail plus:2 ego:vorpal ident:all not_cursed /\
+       dire flail plus:2 good_item ident:all not_cursed w:5 /\
+       morningstar plus:2 ego:protection ident:all not_cursed /\
+       morningstar plus:2 ego:vorpal ident:all not_cursed /\
+       morningstar plus:2 good_item ident:all not_cursed w:5
+KITEM: h = halberd plus:2 ego:protection ident:all not_cursed /\
+       halberd plus:2 ego:venom ident:all not_cursed /\
+       halberd plus:2 good_item ident:all not_cursed w:5
+KITEM: i = lajatang plus:0 ident:all not_cursed /\
+       quarterstaff plus:4 ego:speed ident:all not_cursed w:15 /\
+       quarterstaff plus:4 good_item ident:all not_cursed w:5
+KITEM: j = scimitar plus:2 ego:flaming ident:all not_cursed /\
+       scimitar plus:2 ego:holy_wrath not_cursed ident:all /\
+       scimitar plus:2 good_item not_cursed ident:all
 KITEM: k = pair of gloves mundane ident:all not_cursed /\
        pair of boots mundane ident:all not_cursed /\
        helmet mundane ident:all not_cursed /\
@@ -755,12 +725,12 @@ ENDMAP
 
 NAME:  equipment_1
 TAGS:  equipment_1
-KITEM: a = dagger plus:2 plus2:2 ident:all not_cursed
-KITEM: b = hand axe plus:2 plus2:2 ident:all not_cursed
-KITEM: c = mace plus:2 plus2:2 ident:all not_cursed
-KITEM: d = trident plus:2 plus2:2 ident:all not_cursed
-KITEM: e = quarterstaff plus:2 plus2:2 ident:all not_cursed
-KITEM: f = falchion plus:2 plus2:2 ident:all not_cursed
+KITEM: a = dagger plus:2 ident:all not_cursed
+KITEM: b = hand axe plus:2 ident:all not_cursed
+KITEM: c = mace plus:2 ident:all not_cursed
+KITEM: d = trident plus:2 ident:all not_cursed
+KITEM: e = quarterstaff plus:2 ident:all not_cursed
+KITEM: f = falchion plus:2 ident:all not_cursed
 SHUFFLE: abcdef
 : general_setup(_G)
 : general_item_setup(_G)
diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des
index e30d6b1de7..c223424f38 100644
--- a/crawl-ref/source/dat/des/sprint/zigsprint.des
+++ b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -722,29 +722,29 @@ KITEM:    B = plate armour mundane not_cursed ident:all plus:5, \
 KITEM:    C = buckler mundane not_cursed ident:all plus:3, \
               shield mundane not_cursed ident:all plus:3, \
               large shield mundane not_cursed ident:all plus:3
-KITEM:    D = broad axe mundane not_cursed ident:all plus:5 plus2:5, \
-              battleaxe mundane not_cursed ident:all plus:5 plus2:5, \
-              executioner's axe mundane not_cursed ident:all plus:5 plus2:5
-KITEM:    E = demon trident mundane not_cursed ident:all plus:5 plus2:5, \
-              bardiche mundane not_cursed ident:all plus:5 plus2:5
-KITEM:    F = demon whip mundane not_cursed ident:all plus:5 plus2:5, \
-              great mace mundane not_cursed ident:all plus:5 plus2:5, \
-              giant club mundane not_cursed ident:all plus:5 plus2:5, \
-              giant spiked club mundane not_cursed ident:all plus:5 plus2:5
-KITEM:    G = dagger mundane not_cursed ident:all plus:5 plus2:5, \
-              cutlass mundane not_cursed ident:all plus:5 plus2:5, \
-              quick blade mundane not_cursed ident:all plus:5 plus2:5
-KITEM:    H = demon blade mundane not_cursed ident:all plus:5 plus2:5, \
-              bastard sword mundane not_cursed ident:all plus:5 plus2:5, \
-              great sword mundane not_cursed ident:all plus:5 plus2:5, \
-              claymore mundane not_cursed ident:all plus:5 plus2:5
-KITEM:    I = lajatang mundane not_cursed ident:all plus:5 plus2:5
-KITEM:    J = crossbow mundane not_cursed ident:all plus:5 plus2:5, \
+KITEM:    D = broad axe mundane not_cursed ident:all plus:5, \
+              battleaxe mundane not_cursed ident:all plus:5, \
+              executioner's axe mundane not_cursed ident:all plus:5
+KITEM:    E = demon trident mundane not_cursed ident:all plus:5, \
+              bardiche mundane not_cursed ident:all plus:5
+KITEM:    F = demon whip mundane not_cursed ident:all plus:5, \
+              great mace mundane not_cursed ident:all plus:5, \
+              giant club mundane not_cursed ident:all plus:5, \
+              giant spiked club mundane not_cursed ident:all plus:5
+KITEM:    G = dagger mundane not_cursed ident:all plus:5, \
+              cutlass mundane not_cursed ident:all plus:5, \
+              quick blade mundane not_cursed ident:all plus:5
+KITEM:    H = demon blade mundane not_cursed ident:all plus:5, \
+              bastard sword mundane not_cursed ident:all plus:5, \
+              great sword mundane not_cursed ident:all plus:5, \
+              claymore mundane not_cursed ident:all plus:5
+KITEM:    I = lajatang mundane not_cursed ident:all plus:5
+KITEM:    J = crossbow mundane not_cursed ident:all plus:5, \
               bolt q:1000 mundane ident:all, \
-              shortbow mundane not_cursed ident:all plus:5 plus2:5, \
+              shortbow mundane not_cursed ident:all plus:5, \
               arrow q:1000 mundane ident:all, \
-              longbow mundane not_cursed ident:all plus:5 plus2:5, \
-              sling mundane not_cursed ident:all plus:5 plus2:5, \
+              longbow mundane not_cursed ident:all plus:5, \
+              sling mundane not_cursed ident:all plus:5, \
               sling bullet q:1000 mundane ident:all
 KITEM:    K = potion of curing q:9 ident:all, \
               potion of heal wounds q:9 ident:all, \
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 26217da15d..2eee701ec7 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2463,8 +2463,7 @@ static void _summon_dancing_weapon(int power, deck_rarity_type rarity)
         if (power_level == 0)
         {
             // Wimpy, negative-enchantment weapon.
-            wpn.plus  = -random2(4);
-            wpn.plus2 = -random2(4);
+            wpn.plus = -random2(4);
             wpn.sub_type = (coinflip() ? WPN_SHORT_SWORD : WPN_HAND_AXE);
 
             set_item_ego_type(wpn, OBJ_WEAPONS, SPWPN_NORMAL);
@@ -2472,8 +2471,7 @@ static void _summon_dancing_weapon(int power, deck_rarity_type rarity)
         else if (power_level == 1)
         {
             // This is getting good.
-            wpn.plus  = random2(4) - 1;
-            wpn.plus2 = random2(4) - 1;
+            wpn.plus = random2(4) - 1;
             wpn.sub_type = (coinflip() ? WPN_LONG_SWORD : WPN_TRIDENT);
 
             if (coinflip())
@@ -2487,8 +2485,7 @@ static void _summon_dancing_weapon(int power, deck_rarity_type rarity)
         else if (power_level == 2)
         {
             // Rare and powerful.
-            wpn.plus  = random2(4) + 2;
-            wpn.plus2 = random2(4) + 2;
+            wpn.plus = random2(4) + 2;
             wpn.sub_type = (coinflip() ? WPN_DIRE_FLAIL : WPN_EXECUTIONERS_AXE);
 
             set_item_ego_type(wpn, OBJ_WEAPONS,
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index ef60fa3f23..eb06efb712 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -294,12 +294,9 @@ static void _ely_dull_inventory_weapons()
 
         if (you.inv[i].base_type == OBJ_WEAPONS)
         {
-            // Don't dull artefacts at all, or weapons below -1/-1.
-            if (is_artefact(you.inv[i])
-                || you.inv[i].plus <= -1 && you.inv[i].plus2 <= -1)
-            {
+            // Don't dull artefacts at all, or weapons below -1.
+            if (is_artefact(you.inv[i]) || you.inv[i].plus <= -1)
                 continue;
-            }
 
             // 2/3 of the time, don't do anything.
             if (!one_chance_in(3))
@@ -313,8 +310,6 @@ static void _ely_dull_inventory_weapons()
             // Dull the weapon.
             if (you.inv[i].plus > -1)
                 you.inv[i].plus--;
-            if (you.inv[i].plus2 > -1)
-                you.inv[i].plus2--;
 
             // Update the weapon display, if necessary.
             if (wielded)
@@ -797,7 +792,6 @@ static bool _beogh_retribution()
                 set_item_ego_type(wpn, OBJ_WEAPONS, SPWPN_ELECTROCUTION);
 
                 wpn.plus  = random2(3);
-                wpn.plus2 = random2(3);
                 wpn.sub_type = wpn_type;
 
                 set_ident_flags(wpn, ISFLAG_KNOW_TYPE);
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index d4799b2f5d..e74ea5a798 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -836,25 +836,15 @@ static bool _try_make_weapon_artefact(item_def& item, int force_type,
         // The rest are normal randarts.
         make_item_randart(item);
         // Mean enchantment +6.
-        item.plus  = 12 - biased_random2(7,2) - biased_random2(7,2) - biased_random2(7,2);
-        item.plus2 = 12 - biased_random2(7,2) - biased_random2(7,2) - biased_random2(7,2);
+        item.plus = 12 - biased_random2(7,2) - biased_random2(7,2) - biased_random2(7,2);
 
         if (one_chance_in(5))
         {
             do_curse_item(item);
-            item.plus  = 3 - random2(6);
-            item.plus2 = 3 - random2(6);
+            item.plus = 3 - random2(6);
         }
-        else if ((item.plus < 0
-                  || item.plus2 < 0 && item.sub_type != WPN_BLOWGUN)
-                 && !one_chance_in(3))
-        {
+        else if (item.plus < 0 && !one_chance_in(3))
             do_curse_item(item);
-        }
-
-        // No to-dam enchantment on blowguns.
-        if (item.sub_type == WPN_BLOWGUN)
-            item.plus2 = 0;
 
         if (get_weapon_brand(item) == SPWPN_HOLY_WRATH)
             item.flags &= (~ISFLAG_CURSED);
@@ -1386,8 +1376,7 @@ static void _generate_weapon_item(item_def& item, bool allow_uniques,
         _roll_weapon_type(item, item_level);
     }
 
-    item.plus  = 0;
-    item.plus2 = 0;
+    item.plus = 0;
 
     if (item_level < 0)
     {
@@ -1398,8 +1387,7 @@ static void _generate_weapon_item(item_def& item, bool allow_uniques,
             set_item_ego_type(item, OBJ_WEAPONS,
                 _determine_weapon_brand(item, 2 + 2 * env.absdepth0));
         }
-        item.plus  -= 1 + random2(3);
-        item.plus2 -= 1 + random2(3);
+        item.plus -= 1 + random2(3);
 
         if (item_level == ISPEC_BAD)
             do_curse_item(item);
@@ -1417,10 +1405,7 @@ static void _generate_weapon_item(item_def& item, bool allow_uniques,
 
         // if acquired item still not ego... enchant it up a bit.
         if (force_good && item.special == SPWPN_NORMAL)
-        {
-            item.plus  += 2 + random2(3);
-            item.plus2 += 2 + random2(3);
-        }
+            item.plus += 2 + random2(3);
 
         const int chance = (force_good ? 200 : item_level);
 
@@ -1429,16 +1414,7 @@ static void _generate_weapon_item(item_def& item, bool allow_uniques,
         {
             item.plus += random2(3);
 
-            if (random2(350) > 20 + chance)
-                break;
-        }
-
-        // Odd-looking, but this is how the algorithm compacts {dlb}.
-        for (int i = 0; i < 4; ++i)
-        {
-            item.plus2 += random2(3);
-
-            if (random2(500) > 50 + chance)
+            if (random2(425) > 35 + chance)
                 break;
         }
     }
@@ -1449,14 +1425,9 @@ static void _generate_weapon_item(item_def& item, bool allow_uniques,
             // Make a cursed item.
             do_curse_item(item);
             item.plus  -= random2(4);
-            item.plus2 -= random2(4);
             set_item_ego_type(item, OBJ_WEAPONS, SPWPN_NORMAL);
         }
     }
-
-    // No to-dam enchantment on blowguns.
-    if (item.sub_type == WPN_BLOWGUN)
-        item.plus2 = 0;
 }
 
 // Current list is based on dpeg's original post to the Wiki, found at the
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index c80a25211e..e630ba74df 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -58,9 +58,7 @@ static void _give_monster_item(monster* mon, int thing,
          || mthing.base_type == OBJ_ARMOUR
          || mthing.base_type == OBJ_MISSILES))
     {
-        bool enchanted = mthing.plus
-                      || mthing.base_type == OBJ_WEAPONS && !mthing.plus2;
-
+        bool enchanted = mthing.plus;
         // The item could either lose or gain brand after being generated,
         // adjust the glowing flag.
         if (!mthing.special && !enchanted)
@@ -321,9 +319,8 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
 
         if (coinflip())
         {
-            force_item  = true;
-            item.plus  += 1 + random2(3);
-            item.plus2 += 1 + random2(3);
+            force_item = true;
+            item.plus += 1 + random2(3);
 
             if (one_chance_in(5))
                 set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FREEZING);
@@ -350,9 +347,8 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                                15, WPN_BATTLEAXE, 0);
         if (coinflip())
         {
-            force_item  = true;
-            item.plus  += 1 + random2(4);
-            item.plus2 += 1 + random2(4);
+            force_item = true;
+            item.plus += 1 + random2(4);
         }
         break;
 
@@ -383,9 +379,8 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
 
         if (coinflip())
         {
-            force_item  = true;
-            item.plus  += 1 + random2(4);
-            item.plus2 += 1 + random2(4);
+            force_item = true;
+            item.plus += 1 + random2(4);
         }
         break;
 
@@ -422,8 +417,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                                  2, SPWPN_FREEZING,
                                                  1, SPWPN_ELECTROCUTION,
                                                  0));
-        item.plus  += random2(3);
-        item.plus2 += random2(3);
+        item.plus += random2(3);
         break;
 
     case MONS_GRUM:
@@ -433,8 +427,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                                 1, WPN_HALBERD,
                                                 1, WPN_GLAIVE,
                                                 0);
-        item.plus  += -2 + random2(4);
-        item.plus2 += -1 + random2(2);
+        item.plus += -2 + random2(4);
         break;
 
     case MONS_CRAZY_YIUF:
@@ -443,7 +436,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.sub_type     = WPN_QUARTERSTAFF;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_CHAOS);
         item.plus        += 2 + random2(3);
-        item.plus2       += 2 + random2(3);
         item.flags       |= ISFLAG_KNOW_TYPE;
         break;
 
@@ -635,10 +627,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_VENOM);
         item.flags |= ISFLAG_KNOW_TYPE;
         if (coinflip())
-        {
-            item.plus  = 1 + random2(4);
-            item.plus2 = 1 + random2(4);
-        }
+            item.plus = 1 + random2(4);
         break;
 
     case MONS_TIAMAT:
@@ -833,7 +822,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.base_type = OBJ_WEAPONS;
         item.sub_type  = WPN_TRIDENT;
         item.plus      = random_range(-1, 6, 2);
-        item.plus2     = random_range(-1, 6, 2);
         item.flags    |= ISFLAG_KNOW_TYPE;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FREEZING);
         break;
@@ -912,7 +900,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.base_type = OBJ_WEAPONS;
         item.sub_type  = WPN_LONGBOW;
         item.plus     += 1 + random2(3);
-        item.plus2    += 1 + random2(3);
         item.flags    |= ISFLAG_KNOW_TYPE;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING);
         break;
@@ -930,7 +917,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.base_type = OBJ_WEAPONS;
         item.sub_type  = WPN_SCIMITAR;
         item.plus      = random2(5);
-        item.plus2     = random2(5);
         item.flags    |= ISFLAG_KNOW_TYPE;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING);
         break;
@@ -944,8 +930,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
 
         set_equip_desc(item, ISFLAG_GLOWING);
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_HOLY_WRATH);
-        item.plus  = 1 + random2(3);
-        item.plus2 = 1 + random2(3);
+        item.plus   = 1 + random2(3);
         item.flags |= ISFLAG_KNOW_TYPE;
         break;
 
@@ -966,8 +951,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                        WPN_SCIMITAR,
                                        WPN_FALCHION,
                                        -1);
-        item.plus  = random2(5);
-        item.plus2 = random2(5);
+        item.plus   = random2(5);
         // flaming instead of holy wrath
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING);
         item.flags |= ISFLAG_KNOW_TYPE;
@@ -979,8 +963,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.sub_type  = WPN_GREAT_SWORD;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING);
         // highly enchanted, we're top rank
-        item.plus  = 3 + random2(6);
-        item.plus2 = 3 + random2(6);
+        item.plus   = 3 + random2(6);
         item.flags |= ISFLAG_KNOW_TYPE;
         break;
 
@@ -997,8 +980,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
 
         set_equip_desc(item, ISFLAG_GLOWING);
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_HOLY_WRATH);
-        item.plus  = 1 + random2(3);
-        item.plus2 = 1 + random2(3);
+        item.plus   = 1 + random2(3);
         item.flags |= ISFLAG_KNOW_TYPE;
         break;
 
@@ -1010,8 +992,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                            : WPN_WHIP);
 
         set_equip_desc(item, ISFLAG_GLOWING);
-        item.plus  = 1 + random2(3);
-        item.plus2 = 1 + random2(3);
+        item.plus   = 1 + random2(3);
         item.flags |= ISFLAG_KNOW_TYPE;
         break;
 
@@ -1067,8 +1048,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                                      0));
         }
 
-        item.plus  += random2(6);
-        item.plus2 += random2(6);
+        item.plus += random2(6);
         break;
 
     case MONS_FREDERICK:
@@ -1091,8 +1071,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
             level = MAKE_GOOD_ITEM;
         else
         {
-            item.plus  += random2(6);
-            item.plus2 += random2(6);
+            item.plus += random2(6);
             force_item = true;
         }
         break;
@@ -1164,8 +1143,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                               random_choose_weighted(3, SPWPN_CHAOS,
                                                      1, SPWPN_DISTORTION,
                                                      0));
-            item.plus  = random2(5);
-            item.plus2 = random2(5);
+            item.plus = random2(5);
         }
         break;
 
@@ -1210,7 +1188,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.sub_type  = WPN_CUTLASS;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_ELECTROCUTION);
         item.plus      = random2(5);
-        item.plus2     = random2(5);
         item.flags    |= ISFLAG_KNOW_TYPE;
         if (one_chance_in(100) && !get_unique_item_status(UNRAND_ARC_BLADE))
             make_item_unrandart(item, UNRAND_ARC_BLADE);
@@ -1270,10 +1247,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         }
 
         if (one_chance_in(4))
-        {
-            item.plus   = random2(5);
-            item.plus2  = random2(5);
-        }
+            item.plus = random2(5);
     }
     break;
 
@@ -1285,10 +1259,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING);
         item.flags |= ISFLAG_KNOW_TYPE;
         if (one_chance_in(3))
-        {
-            item.plus   = 2 + random2(4);
-            item.plus2  = 2 + random2(4);
-        }
+            item.plus = 2 + random2(4);
 
         break;
 
@@ -1354,8 +1325,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         {
             force_item = true;
             set_item_ego_type(item, OBJ_WEAPONS, SPWPN_DISTORTION);
-            item.plus      = random2(5);
-            item.plus2     = random2(5);
+            item.plus  = random2(5);
         }
         break;
 
@@ -1365,7 +1335,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.sub_type  = WPN_EXECUTIONERS_AXE;
         set_item_ego_type(item, OBJ_WEAPONS, SPWPN_PAIN);
         item.plus      = 2 + random2(7);
-        item.plus2     = 2 + random2(7);
         item.flags    |= ISFLAG_KNOW_TYPE;
         break;
 
@@ -1393,8 +1362,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                                       0));
         }
 
-        item.plus  += random2(4);
-        item.plus2 += random2(4);
+        item.plus += random2(4);
         break;
 
     case MONS_SOJOBO:
@@ -1465,7 +1433,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
             force_item = true;
             set_item_ego_type(item, OBJ_WEAPONS, SPWPN_CHAOS);
             item.plus  = random2(9) - 2;
-            item.plus2 = random2(9) - 2;
         }
         else
             level = random2(300);
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc
index 6cc40a941f..685bfad5df 100644
--- a/crawl-ref/source/ng-wanderer.cc
+++ b/crawl-ref/source/ng-wanderer.cc
@@ -83,7 +83,6 @@ static bool _give_wanderer_weapon(int & slot, int wpn_skill, int plus)
     you.inv[slot].quantity  = 1;
     you.inv[slot].special   = 0;
     you.inv[slot].plus  = plus;
-    you.inv[slot].plus2 = plus;
 
     return true;
 }
@@ -560,7 +559,6 @@ static void _wanderer_good_equipment(skill_type & skill,
         // +2 dagger and a good consumable
         newgame_make_item(slot, EQ_WEAPON, OBJ_WEAPONS, WPN_DAGGER);
         you.inv[slot].plus  = 2;
-        you.inv[slot].plus2 = 2;
         slot++;
         _good_potion_or_scroll(slot);
         break;