Plus2: Update unrand weapons

Leech receives a buff to +8 and increased penalties (-2 instead of -1).

[Committer's note: Tweaked some more.]

1 files changed, 4 insertions, 9 deletions

diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index a1fcd9be62..2e3cf8235f 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -708,7 +708,7 @@ static void _get_randart_properties(const item_def &item,
     else if (aclass == OBJ_JEWELLERY)
         power_level = 1 + random2(3) + random2(2);
     else // OBJ_WEAPON
-        power_level = item.plus / 3 + item.plus2 / 3;
+        power_level = item.plus / 3;
 
     if (power_level < 0)
         power_level = 0;
@@ -1178,7 +1178,6 @@ void setup_unrandart(item_def &item)
     item.base_type = unrand->base_type;
     item.sub_type  = unrand->sub_type;
     item.plus      = unrand->plus;
-    item.plus2     = unrand->plus2;
     item.colour    = unrand->colour;
 }
 
@@ -2008,10 +2007,7 @@ bool make_item_unrandart(item_def &item, int unrand_index)
     _set_unique_item_status(unrand_index, UNIQ_EXISTS);
 
     if (unrand_index == UNRAND_VARIABILITY)
-    {
-        item.plus  = random_range(-4, 16);
-        item.plus2 = random_range(-4, 16);
-    }
+        item.plus = random_range(-4, 16);
     else if (unrand_index == UNRAND_FAERIE)
         _make_faerie_armour(item);
     else if (unrand_index == UNRAND_OCTOPUS_KING_RING)
@@ -2036,8 +2032,7 @@ bool make_item_unrandart(item_def &item, int unrand_index)
 void unrand_reacts()
 {
     item_def*  weapon     = you.weapon();
-    const int  old_plus   = weapon ? weapon->plus   : 0;
-    const int  old_plus2  = weapon ? weapon->plus2  : 0;
+    const int  old_plus   = weapon ? weapon->plus : 0;
 
     for (int i = 0; i < NUM_EQUIP; i++)
     {
@@ -2050,7 +2045,7 @@ void unrand_reacts()
         }
     }
 
-    if (weapon && (old_plus != weapon->plus || old_plus2 != weapon->plus2))
+    if (weapon && (old_plus != weapon->plus))
         you.wield_change = true;
 }