Reform SH to be more transparent

Before: SH was a function of items and skills.  Blocking was a function
of SH, skills, and stats.

Now: SH is a function of items, skills, and stats.  Blocking is a
function of SH and SH alone.

Your ability to block attacks in given equipment should be more or less
the same, although there will be small differences.  Condensation Shield
was doubled (since nobody uses it), Divine Shield was made to not use
intelligence.

SH values have been rescaled to be on approximately the same scale as
AC and EV.  This meant increasing the max enchant of shields to +3.

1 files changed, 8 insertions, 3 deletions

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 96a3f4d3ed..755078c862 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -142,11 +142,11 @@ static armour_def Armour_prop[NUM_ARMOURS] =
         true,  EQ_BOOTS,       SIZE_MEDIUM, SIZE_LARGE },
 
     // Note: shields use ac-value as sh-value, EV pen is used for heavy_shield.
-    { ARM_BUCKLER,              "buckler",                3,  0,   90,
+    { ARM_BUCKLER,              "buckler",                5,  0,   90,
         true,  EQ_SHIELD,      SIZE_LITTLE, SIZE_MEDIUM },
-    { ARM_SHIELD,               "shield",                 5, -1,  150,
+    { ARM_SHIELD,               "shield",                 8, -1,  150,
         false, EQ_SHIELD,      SIZE_SMALL,  SIZE_BIG    },
-    { ARM_LARGE_SHIELD,         "large shield",           7, -2,  230,
+    { ARM_LARGE_SHIELD,         "large shield",          13, -2,  230,
         false, EQ_SHIELD,      SIZE_MEDIUM, SIZE_GIANT  },
 };
 
@@ -1017,6 +1017,11 @@ int armour_max_enchant( const item_def &item )
         max_plus = MAX_ARM_ENCHANT;
     }
 
+    if (eq_slot == EQ_SHIELD)
+    {
+        max_plus = 3;
+    }
+
     return (max_plus);
 }