Re-add regular bracers, minor bug fixes from initial Druid commit.

Author: k21971

doc/evilhack-changelog.md

@@ -3383,4 +3383,6 @@ The following changes to date are:
 - Fix: prevent Nazgul from attacking undead hobbit types
 - Fix: Monks incurring to-hit penalty when wearing bracers (martial arts)
 - Fix: Kathryn the Enchantress and 'summon insects' spell
+- Revert Druid role
+- Re-add regular bracers, minor bug fixes from initial Druid commit
 

include/obj.h

@@ -270,7 +270,7 @@ struct obj {
 #define is_suit(otmp) \
     (otmp->oclass == ARMOR_CLASS && objects[otmp->otyp].oc_armcat == ARM_SUIT)
 #define is_bracer(otmp) \
-    ((otmp)->otyp == DARK_ELVEN_BRACERS)
+    ((otmp)->otyp == BRACERS || (otmp)->otyp == DARK_ELVEN_BRACERS)
 #define is_elven_armor(otmp) \
     ((otmp)->otyp == ELVEN_HELM                                         \
      || (otmp)->otyp == ELVEN_CHAIN_MAIL || (otmp)->otyp == ELVEN_CLOAK \

src/apply.c

@@ -2195,7 +2195,7 @@ struct obj *obj;
             break;
         case 6:
             if (Slow)
-            goto end; /* unicorn horns don't cure being slow */
+                goto end; /* unicorn horns don't cure being slow */
             break;
         case 7:
             if (Deaf) /* make_deaf() won't give feedback when already deaf */

src/do_wear.c

@@ -853,6 +853,7 @@ Shield_on(VOID_ARGS)
     switch (uarms->otyp) {
     case SMALL_SHIELD:
     case ELVEN_SHIELD:
+    case BRACERS:
     case DARK_ELVEN_BRACERS:
     case URUK_HAI_SHIELD:
     case ORCISH_SHIELD:
@@ -889,6 +890,7 @@ Shield_off(VOID_ARGS)
     switch (otmp->otyp) {
     case SMALL_SHIELD:
     case ELVEN_SHIELD:
+    case BRACERS:
     case DARK_ELVEN_BRACERS:
     case URUK_HAI_SHIELD:
     case ORCISH_SHIELD:

src/files.c

@@ -2596,7 +2596,12 @@ char *origbuf;
         (void) strncpy(catname, bufp, PL_PSIZ - 1);
     } else if (match_varname(buf, "RATNAME", 3)) {
         (void) strncpy(ratname, bufp, PL_PSIZ - 1);
-
+    } else if (match_varname(buf, "PSEUDONAME", 6)) {
+        (void) strncpy(pseudoname, bufp, PL_PSIZ - 1);
+    } else if (match_varname(buf, "HOMUNNAME", 5)) {
+        (void) strncpy(homunname, bufp, PL_PSIZ - 1);
+    } else if (match_varname(buf, "SPIDERNAME", 6)) {
+        (void) strncpy(spidername, bufp, PL_PSIZ - 1);
 #ifdef SYSCF
     } else if (src == SET_IN_SYS && match_varname(buf, "WIZARDS", 7)) {
         if (sysopt.wizards)

src/mkobj.c

@@ -3509,6 +3509,19 @@ static const struct icp sling_bullet_materials[] = {
     { 10, PLATINUM}
 };
 
+static const struct icp bracers_materials[] = {
+    {500, LEATHER},
+    {200, IRON},
+    {100, BONE},
+    { 50, MINERAL},
+    { 50, METAL},
+    { 30, MITHRIL},
+    { 20, SILVER},
+    { 20, COPPER},
+    { 20, GOLD},
+    { 10, DRAGON_HIDE}
+};
+
 /* Return the appropriate above list for a given object, or NULL if there isn't
  * an appropriate list. */
 const struct icp*
@@ -3634,6 +3647,8 @@ struct obj* obj;
             return rod_materials;
         case SLING_BULLET:
             return sling_bullet_materials;
+        case BRACERS:
+            return bracers_materials;
         default:
             break;
     }

src/objects.c

@@ -536,8 +536,6 @@ SHIELD("small shield", None,
        1, 0, 0,           0, 4, 0,  30,   3, 9, 0,  WOOD, HI_WOOD),
 SHIELD("elven shield", "blue and green shield",
        0, 0, 0,           0, 2, 0,  40,   7, 8, 0,  WOOD, CLR_GREEN),
-SHIELD("dark elven bracers", "etched bracers",
-       0, 0, 0,           0, 1, 0,  25,  30, 8, 0,  ADAMANTINE, CLR_BLACK),
 SHIELD("Uruk-hai shield", "white-handed shield",
        0, 0, 0,           0, 2, 0,  50,   7, 9, 0,  IRON, HI_METAL),
 SHIELD("orcish shield", "red-eyed shield",
@@ -552,6 +550,10 @@ SHIELD("shield of light", "shiny shield",
        0, 1, 0,           0, 3, 0,  60, 400, 8, 0,  GOLD, CLR_YELLOW),
 SHIELD("shield of mobility", "slippery shield",
        0, 1, 0, FREE_ACTION, 3, 0,  50, 300, 8, 0,  METAL, HI_METAL),
+SHIELD("bracers", None,
+       1, 0, 0,           0, 4, 0,  10,  10, 9, 0,  LEATHER, CLR_BROWN),
+SHIELD("dark elven bracers", "etched bracers",
+       0, 0, 0,           0, 1, 0,  20,  30, 8, 0,  ADAMANTINE, CLR_BLACK),
 
 /* gloves */
 /* These have their color but not material shuffled, so the IRON must

src/objnam.c

@@ -609,7 +609,7 @@ struct obj *obj;
  * identification status */
 #define force_material_name(typ) \
     ((typ) == ARMOR || (typ) == STUDDED_ARMOR                     \
-     || (typ) == JACKET || (typ) == CLOAK                         \
+     || (typ) == JACKET || (typ) == CLOAK || (typ) == BRACERS     \
      || ((typ) == GLOVES && objects[GLOVES].oc_name_known)        \
      || ((typ) == GAUNTLETS && objects[GAUNTLETS].oc_name_known))
 
@@ -762,7 +762,7 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
         }
 
         if (is_boots(obj)
-            || typ == DARK_ELVEN_BRACERS
+            || is_bracer(obj)
             || (is_gloves(obj) && typ != MUMMIFIED_HAND))
             Strcat(buf, "pair of ");
 
@@ -778,13 +778,13 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
         }
 
         if (obj->otyp >= ELVEN_SHIELD && obj->otyp <= ORCISH_SHIELD
-            && obj->otyp != DARK_ELVEN_BRACERS && !dknown) {
+            && !is_bracer(obj) && !dknown) {
             Strcat(buf, "shield");
             propnames(buf, obj->oprops, obj->oprops_known,
                       FALSE, FALSE);
             break;
         }
-        if (obj->otyp == DARK_ELVEN_BRACERS && !dknown) {
+        if (is_bracer(obj) && !dknown) {
             Strcat(buf, "bracers");
             propnames(buf, obj->oprops, obj->oprops_known,
                       FALSE, FALSE);
@@ -812,6 +812,8 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
                 Strcat(buf, helm_simple_name(obj));
             else if (is_shield(obj))
                 Strcat(buf, "shield");
+            else if (is_bracer(obj))
+                Strcat(buf, "bracers");
             else
                 Strcat(buf, "armor");
             propnames(buf, obj->oprops, obj->oprops_known,
@@ -2612,7 +2614,7 @@ static struct sing_plur one_off[] = {
 static const char *const as_is[] = {
     /* makesingular() leaves these plural due to how they're used */
     "boots",   "shoes",     "gloves",    "lenses",   "scales",
-    "eyes",    "gauntlets", "iron bars", "goggles",
+    "eyes",    "gauntlets", "iron bars", "goggles",  "bracers",
     /* both singular and plural are spelled the same */
     "bison",   "deer",      "elk",       "fish",      "fowl",
     "tuna",    "yaki",      "-hai",      "krill",     "manes",
@@ -3203,6 +3205,7 @@ STATIC_OVL NEARDATA const struct o_range o_ranges[] = {
     { "candle", TOOL_CLASS, TALLOW_CANDLE, WAX_CANDLE },
     { "horn", TOOL_CLASS, TOOLED_HORN, HORN_OF_PLENTY },
     { "shield", ARMOR_CLASS, SMALL_SHIELD, SHIELD_OF_MOBILITY },
+    { "bracers", ARMOR_CLASS, BRACERS, DARK_ELVEN_BRACERS },
     { "hat", ARMOR_CLASS, DUNCE_CAP, FEDORA },
     { "helm", ARMOR_CLASS, DUNCE_CAP, HELM_OF_TELEPATHY },
     { "gloves", ARMOR_CLASS, GLOVES, MUMMIFIED_HAND },
@@ -3294,6 +3297,7 @@ static const struct alt_spellings {
     { "drow boots", DARK_ELVEN_BOOTS },
     /* armor */
     { "gloves", GLOVES },
+    { "bracers", BRACERS },
     { (const char *) 0, 0 },
 };
 

src/options.c

@@ -2398,15 +2398,6 @@ boolean tinitial, tfrom_file;
         return retval;
     }
 
-    fullname = "ratname";
-    if (match_optname(opts, fullname, 3, TRUE)) {
-        if (negated)
-            bad_negation(fullname, FALSE);
-        else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0)
-            nmcpy(ratname, op, PL_PSIZ);
-        return retval;
-    }
-
     fullname = "number_pad";
     if (match_optname(opts, fullname, 10, TRUE)) {
         boolean compat = (strlen(opts) <= 10);

src/spell.c

@@ -2084,7 +2084,7 @@ int spell;
      * player's role-specific spell.  Metallic shields still adversely
      * affect spellcasting, no matter how light they are.
      */
-    if (uarms && ((is_metallic(uarms) && uarms->otyp != DARK_ELVEN_BRACERS)
+    if (uarms && ((is_metallic(uarms) && !is_bracer(uarms))
                   || (weight(uarms) > (int) objects[SMALL_SHIELD].oc_weight))) {
         if (spellid(spell) == urole.spelspec) {
             chance /= 2;

src/u_init.c

@@ -1028,10 +1028,11 @@ u_init()
         break;
 
     case PM_TORTLE:
-        if (!rn2(4)
-            && !Role_if(PM_ARCHEOLOGIST) && !Role_if(PM_ROGUE)) {
-            /* in case they want to go for a swim */
-            ini_inv(Oilskin);
+        if (!Role_if(PM_ARCHEOLOGIST) && !Role_if(PM_ROGUE)) {
+            if (!rn2(4)) {
+                /* in case they want to go for a swim */
+                ini_inv(Oilskin);
+            }
         }
         break;
 
@@ -1690,6 +1691,8 @@ register struct trobj *origtrop;
                 u.twoweap = FALSE;
             } else if (is_helmet(obj) && !uarmh)
                 setworn(obj, W_ARMH);
+            else if (is_bracer(obj) && !uarms)
+                setworn(obj, W_ARMS);
             else if (is_gloves(obj) && !uarmg)
                 setworn(obj, W_ARMG);
             else if (is_shirt(obj) && !uarmu)