Izchak occasionally stocks wands/scrolls/spellbooks of light

This comes from xNetHack by copperwater <aosdict@gmail.com>

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 5ce9ff8799efbb1024d450c84c0ff58f1902a986..bad9788b1b92697519e873791a8ffaee8822d923 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -618,6 +618,7 @@ similar "The ogre lord yanks Cleaver from your corpses!" due to caching the
        obuf used for each item so that the same one will be reused for the
        next item, to avoid churning through the whole pool of obufs
 gas clouds are a little random in how they spread out from a point
+Izchak occasionally stocks wands/scrolls/spellbooks of light
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/include/mkroom.h b/include/mkroom.h
index 8f184ab67744573ec630a3046c98e42c7dda7e26..e54d6f5b21c61047b9fba060bbe25768d7b88119 100644 (file)
--- a/include/mkroom.h
+++ b/include/mkroom.h
@@ -35,7 +35,7 @@ struct shclass {
     struct itp {
         int iprob;    /* probability of an item type */
         int itype;    /* item type: if >=0 a class, if < 0 a specific item */
-    } iprobs[6];
+    } iprobs[9];
     const char *const *shknms; /* list of shopkeeper names for this type */
 };
 

diff --git a/src/shknam.c b/src/shknam.c
index 2b151f09f6fc729ea639144d09bd8c7a2a7eea38..97dcc7a453121f0b63ac1a832833f8947a3cfa76 100644 (file)
--- a/src/shknam.c
+++ b/src/shknam.c
@@ -330,11 +330,14 @@ const struct shclass shtypes[] = {
       0,
       D_SHOP,
       { { 30, -WAX_CANDLE },
-        { 48, -TALLOW_CANDLE },
+        { 44, -TALLOW_CANDLE },
         { 5, -BRASS_LANTERN },
         { 9, -OIL_LAMP },
         { 3, -MAGIC_LAMP },
-        { 5, -POT_OIL } },
+        { 5, -POT_OIL },
+        { 2, -WAN_LIGHT },
+        { 1, -SCR_LIGHT },
+        { 1, -SPE_LIGHT } },
       shklight },
     /* sentinel */
     { (char *) 0,