Removed the ring of psychic resistance.

This was a bit of an unfinished import from SpliceHack. It was meant to deal with more psychic related threats (gnomish psychers and some other AD_PSYC attacks) but these didn't really port in well from splice). Right now the only thing this item is good for is easy removal of the afraid status - which isn't really enough for me to keep it. Players are encouraged to drink booze to combat fear.

.hackemrc

@@ -412,7 +412,6 @@ AUTOPICKUP_EXCEPTION=">.*ring of warning"
 AUTOPICKUP_EXCEPTION=">.*ring of poison resistance"
 AUTOPICKUP_EXCEPTION=">.*ring of fire resistance"
 AUTOPICKUP_EXCEPTION=">.*ring of cold resistance"
-AUTOPICKUP_EXCEPTION=">.*ring of psychic resistance"
 AUTOPICKUP_EXCEPTION=">.*ring of sonic resistance"
 AUTOPICKUP_EXCEPTION=">.*ring of shock resistance"
 AUTOPICKUP_EXCEPTION=">.*ring of free action"

src/do.c

@@ -745,9 +745,6 @@ register struct obj *obj;
             pline_The(
                   "sink momentarily looks like a regularly erupting geyser.");
             break;
-        case RIN_PSYCHIC_RESISTANCE:
-            pline_The("sink glows purple for a moment.");
-            break;
         case RIN_SONIC_RESISTANCE:
             pline_The("ring silently bounces down the drain.");
             break;

src/do_wear.c

@@ -1570,12 +1570,6 @@ register struct obj *obj;
         if (obj->spe)
             find_ac(); /* updates botl */
         break;
-    case RIN_PSYCHIC_RESISTANCE:
-        if (Afraid) {
-            make_afraid(0L, TRUE);
-            context.botl = TRUE;
-        }
-        break;
     case RIN_DISPLACEMENT:
         toggle_displacement(obj, oldprop, TRUE);
         break;
@@ -1617,7 +1611,6 @@ boolean gone;
     case RIN_SLOW_DIGESTION:
     case RIN_SUSTAIN_ABILITY:
     case MEAT_RING:
-    case RIN_PSYCHIC_RESISTANCE:
     case RIN_SONIC_RESISTANCE:
         break;
     case RIN_SLEEPING:

src/muse.c

@@ -3914,8 +3914,6 @@ struct obj *obj;
             return (!(resists_poison(mon) || defended(mon, AD_DRST)));
         if (typ == RIN_SONIC_RESISTANCE)
             return (!(resists_sonic(mon) || defended(mon, AD_LOUD)));
-        if (typ == RIN_PSYCHIC_RESISTANCE)
-            return (!(resists_psychic(mon) || defended(mon, AD_PSYC)));
         if (typ == RIN_SLOW_DIGESTION)
             return (!mon_prop(mon, SLOW_DIGESTION));
         if (typ == RIN_REGENERATION)

src/objects.c

@@ -731,7 +731,6 @@ RING("warning", "diamond",                       WARNING,                  100,
 RING("poison resistance", "pearl",               POISON_RES,               150, 1, 1, 0,  4, BONE, CLR_WHITE),
 RING("fire resistance", "iron",                  FIRE_RES,                 200, 1, 1, 0,  5, IRON, HI_METAL),
 RING("cold resistance", "brass",                 COLD_RES,                 150, 1, 1, 0,  4, COPPER, HI_COPPER),
-RING("psychic resistance", "crystal",            PSYCHIC_RES,              150, 1, 1, 0,  3, GLASS, HI_GLASS),     /* SpliceHack */
 RING("sonic resistance",   "embossed",           SONIC_RES,                150, 1, 1, 0,  3, GLASS, HI_GLASS),     /* SpliceHack */
 RING("shock resistance", "copper",               SHOCK_RES,                150, 1, 1, 0,  3, COPPER, HI_COPPER),
 RING("free action", "twisted",                   FREE_ACTION,              200, 1, 1, 0,  6, METAL, HI_METAL),

src/worn.c

@@ -815,7 +815,6 @@ boolean racialexception;
                     && obj->otyp != RIN_POISON_RESISTANCE
                     && obj->otyp != RIN_SHOCK_RESISTANCE
                     && obj->otyp != RIN_SONIC_RESISTANCE
-                    && obj->otyp != RIN_PSYCHIC_RESISTANCE
                     && obj->otyp != RIN_REGENERATION
                     && obj->otyp != RIN_TELEPORTATION
                     && obj->otyp != RIN_TELEPORT_CONTROL