Fix: Enchanting armor of excellence didn't adjust charisma

Commit 6306c1f last year took some "redundant" code out of adj_abon(), but it turns out adj_abon had been used to adjust charisma bonuses when the armor's enchantment was modified by scrolls, cancellation, etc. Oops.

Revert the change to adj_abon, and instead special-case helms of brilliance and gauntlets of dexterity inside oprops_o(n|ff).

Author: saltwaterterrapin

doc/evilhack-changelog.md

@@ -3496,4 +3496,4 @@ The following changes to date are:
 - Draugr are properly vulnerable to fire
 - Fix: Infidel Draugr kept getting fire resistance back after
   save/reload
-
+- Fix: Enchanting armor of excellence didn't adjust charisma

src/do_wear.c

@@ -207,9 +207,12 @@ long mask;
         EHunger |= mask;
     if (props & ITEM_EXCEL) {
         int which = A_CHA, old_attrib = ACURR(which);
-        /* borrowing this from Ring_on() as I may want
-           to add other attributes in the future */
-        ABON(which) += otmp->spe;
+        /* HoB and GoD adjust CHA in adj_abon() */
+        if (otmp->otyp != HELM_OF_BRILLIANCE
+            && otmp->otyp != GAUNTLETS_OF_DEXTERITY)
+            /* borrowing this from Ring_on() as I may want
+               to add other attributes in the future */
+            ABON(which) += otmp->spe;
         if (old_attrib != ACURR(which))
             otmp->oprops_known |= ITEM_EXCEL;
         set_moreluck();
@@ -255,9 +258,12 @@ long mask;
         EHunger &= ~mask;
     if (props & ITEM_EXCEL) {
         int which = A_CHA, old_attrib = ACURR(which);
-        /* borrowing this from Ring_off() as I may want
-           to add other attributes in the future */
-        ABON(which) -= otmp->spe;
+        /* HoB and GoD adjust CHA in adj_abon() */
+        if (otmp->otyp != HELM_OF_BRILLIANCE
+            && otmp->otyp != GAUNTLETS_OF_DEXTERITY)
+            /* borrowing this from Ring_off() as I may want
+               to add other attributes in the future */
+            ABON(which) -= otmp->spe;
         if (old_attrib != ACURR(which))
             otmp->oprops_known |= ITEM_EXCEL;
         otmp->oprops &= ~ITEM_EXCEL;
@@ -3713,6 +3719,17 @@ register schar delta;
         }
         context.botl = 1;
     }
+    if (otmp && (otmp->oprops & ITEM_EXCEL) && (otmp->owornmask & W_ARMOR)) {
+        if (delta) {
+            int which = A_CHA,
+                old_attrib = ACURR(which);
+            ABON(which) += (delta);
+            if (old_attrib != ACURR(which))
+                otmp->oprops_known |= ITEM_EXCEL;
+            set_moreluck();
+        }
+        context.botl = 1;
+    }
 }
 
 /* decide whether a worn item is covered up by some other worn item,