Monster cards summon associated corpsenm rather than fading.

Allow the player to exercise Charisma/Intelligence

doc/spl-changelog.txt

@@ -17,6 +17,11 @@ New Materials
   - Gelatinous weapons have -4 damage, and are generally terrible.
   - Sludge golems drop gelatinous items and green slime.
 
+New Artifacts
+- Lenses of Death Perception
+  - As long as the wearer is not blind, they deal double damage, but constantly hallucinate.
+  - Grants searching.
+
 Dungeon
 - Added a minetown variant (Zootown), from SporkHack/EvilHack.
 - Added an original minetown variant (Lavender Town).
@@ -36,6 +41,7 @@ Balance
   This is to prevent abuse of the new methods of taming monsters in order to create an army of
   powerful pets.
 - Pets that are not immune to disintegration will not attack spheres of the void.
+- Monster cards transform when exposed to water, rather than fading.
 
 Miscelaneous
 - The SpliceHack splash screen in curses mode is now rainbow!

include/artilist.h

@@ -113,6 +113,13 @@ static NEARDATA struct artifact artilist[] = {
     A("The End", GRAIN_SCYTHE, (SPFX_RESTR | SPFX_DEFN), 0, 0, COLD(3, 20),
       DRLI(0, 0), NO_CARY, 0, A_NEUTRAL, NON_PM, NON_PM, 6000L, NO_COLOR),
 
+    /*
+    *      Attacks deal double damage, but at the cost of hallucination.
+    *      This effect is only active while the user can see.
+    */
+    A("Lenses of Death Perception", LENSES, (SPFX_RESTR | SPFX_SEARCH), 0, 0, NO_ATTK,
+      NO_DFNS, NO_CARY, 0, A_NONE, NON_PM, NON_PM, 2000L, NO_COLOR),
+
     /*
     *      Gae Bulg can be thrown as a last resort. If it hits, the attack
     *      is automatically fatal, and there is a 2/3 chance the javelin

include/youprop.h

@@ -111,6 +111,8 @@
      && !u.uroleplay.blind && !Blinded && haseyes(g.youmonst.data))
 /* ...blind because of a blindfold, and *only* that */
 
+#define DeathVision (ublindf && ublindf->oartifact == ART_LENSES_OF_DEATH_PERCEPTION && !Blind)
+
 #define Sick u.uprops[SICK].intrinsic
 #define Stoned u.uprops[STONED].intrinsic
 #define Strangled u.uprops[STRANGLED].intrinsic
@@ -126,7 +128,7 @@
 #define EHalluc_resistance u.uprops[HALLUC_RES].extrinsic
 #define Halluc_resistance (HHalluc_resistance || EHalluc_resistance)
 #define Hallucination ((HHallucination && !Halluc_resistance) || \
-                        u.uroleplay.hallu)
+                        u.uroleplay.hallu || DeathVision)
 
 /* Timeout, plus a worn mask */
 #define HDeaf u.uprops[DEAF].intrinsic

src/attrib.c

@@ -487,8 +487,6 @@ int i;
 boolean inc_or_dec;
 {
     debugpline0("Exercise:");
-    if (i == A_INT || i == A_CHA)
-        return; /* can't exercise these */
 
     /* no physical exercise while polymorphed; the body's temporary */
     if (Upolyd && i != A_WIS)
@@ -506,9 +504,9 @@ boolean inc_or_dec;
          */
         AEXE(i) += (inc_or_dec) ? (rn2(19) > ACURR(i)) : -rn2(2);
         debugpline3("%s, %s AEXE = %d",
-                    (i == A_STR) ? "Str" : (i == A_WIS) ? "Wis" : (i == A_DEX)
-                                                                      ? "Dex"
-                                                                      : "Con",
+                    (i == A_STR) ? "Str" : (i == A_WIS) ? "Wis" :
+                    (i == A_DEX) ? "Dex" : (i == A_INT) ? "Int" :
+                    (i == A_CHA) ? "Cha" : (i == A_CON) ? "Con" : "???",
                     (inc_or_dec) ? "inc" : "dec", AEXE(i));
     }
     if (g.moves > 0 && (i == A_STR || i == A_CON))

src/do_wear.c

@@ -1310,6 +1310,10 @@ struct obj *otmp;
     }
     if (ublindf->otyp == MASK)
         use_mask(&ublindf); 
+    if (ublindf->oartifact == ART_LENSES_OF_DEATH_PERCEPTION) {
+        pline("With madness comes clarity.");
+    }
+        
 }
 
 void

src/dothrow.c

@@ -2398,9 +2398,9 @@ struct obj* obj;
         impossible("breaking glass obj in melee but not in inventory?");
         return FALSE;
     }
-    obj->owornmask = 0;
 
     if (obj->quan == 1L) {
+        obj->owornmask = 0;
         pline("%s breaks into pieces!", upstart(yname(obj)));
         obj_extract_self(obj); /* it's being destroyed */
     } else {

src/insight.c

@@ -923,9 +923,13 @@ int final;
         you_are("stunned", "");
     if (Confusion)
         you_are("confused", "");
-    if (Hallucination)
+    if (Hallucination) {
         Sprintf(buf, "%s hallucinating",
-                u.uroleplay.hallu ? "permanently" : "temporarily");
+                u.uroleplay.hallu ? "permanently" : DeathVision ? "deliberately" : "temporarily");
+        you_are(buf, "");
+    }
+    if (DeathVision)
+        you_are("dealing double damage due to comprehending death", "");
     if (Blind) {
         /* from_what() (currently wizard-mode only) checks !haseyes()
            before u.uroleplay.blind, so we should too */

src/trap.c

@@ -4401,11 +4401,17 @@ boolean force;
         if (carried(obj))
             pline("Your %s %s.", ostr, vtense(ostr, "fade"));
 
+        if (obj->corpsenm) {
+            if (obj->otyp == SCR_CREATE_MONSTER) {
+                seffects(obj);
+                delobj(obj);
+                return ER_DESTROYED;
+            }
+            obj->corpsenm = NON_PM;
+        }
         obj->otyp = SCR_BLANK_PAPER;
         obj->dknown = 0;
         obj->spe = 0;
-        if (obj->corpsenm)
-            obj->corpsenm = NON_PM;
         if (carried(obj))
             update_inventory();
         return ER_DAMAGED;

src/uhitm.c

@@ -1481,6 +1481,11 @@ int dieroll;
             tmp = 1;
     }
 
+    /* Lenses of death perception */
+    if (DeathVision) {
+        tmp *= 2;
+    }
+
     /*
   	 * Ki special ability, see cmd.c in function special_ability.
   	 * In this case, we do twice damage! Wow!

win/share/tilemap.c

@@ -49,10 +49,10 @@ struct conditionals {
     const char *name;
 } conditionals[] = {
 #ifndef CHARON /* not supported */
-    { MON_GLYPH, PM_HELL_HOUND, "Cerberus" },
+    { MON_GLYPH, PM_DRAUGLIR, "Cerberus" },
 #endif
     /* commented out in monst.c at present */
-    { MON_GLYPH, PM_SHOCKING_SPHERE, "beholder" },
+    { MON_GLYPH, PM_BLINKING_EYE, "beholder" },
 #ifndef CHARON /* not supported yet */
     { MON_GLYPH, PM_CROESUS, "Charon" },
 #endif
@@ -60,10 +60,10 @@ struct conditionals {
     { MON_GLYPH, PM_FAMINE, "mail daemon" },
 #endif
     /* commented out in monst.c at present */
-    { MON_GLYPH, PM_SHAMAN_KARNOV, "Earendil" },
-    { MON_GLYPH, PM_SHAMAN_KARNOV, "Elwing" },
+    { MON_GLYPH, PM_LORD_OF_THE_CARDS, "Earendil" },
+    { MON_GLYPH, PM_LORD_OF_THE_CARDS, "Elwing" },
     /* commented out in monst.c at present */
-    { MON_GLYPH, PM_CHROMATIC_DRAGON, "Goblin King" },
+    { MON_GLYPH, PM_DAL_ZETHIRE, "Goblin King" },
     { MON_GLYPH, PM_NEANDERTHAL, "High-elf" },
 /* allow slime mold to look like slice of pizza, since we
  * don't know what a slime mold should look like when renamed anyway