Changed Dunnet so that if a lamp is in the room that would otherwise be dark, the...

be eaten by a grue.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ce8092f79efda392181b1b78c5ac46d5106d17a..bd8bd6ac1e047840b8703600742312b77b278bfa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
+2014-06-14  Ron Schnell  <ronnie@driver-aces.com>      
+       * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue.
+       
 2014-06-13  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)

diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 0028b7258aec5d79753a458daa256a8ccc9e76e8..c82660feffc2dc2f9cb24e909bbea5a6a1f35ba0 100644 (file)
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -100,7 +100,8 @@
 
 (defun dun-describe-room (room)
   (if (and (not (member (abs room) dun-light-rooms))
-          (not (member obj-lamp dun-inventory)))
+          (not (member obj-lamp dun-inventory))
+          (not (member obj-lamp (nth dun-current-room dun-room-objects))))
       (dun-mprincl "It is pitch dark.  You are likely to be eaten by a grue.")
     (dun-mprincl (cadr (nth (abs room) dun-rooms)))
     (if (and (and (or (member room dun-visited)
@@ -615,7 +616,8 @@ just try dropping it.")
 
 (defun dun-move (dir)
   (if (and (not (member dun-current-room dun-light-rooms))
-          (not (member obj-lamp dun-inventory)))
+          (not (member obj-lamp dun-inventory))
+          (not (member obj-lamp (nth dun-current-room dun-room-objects))))
       (progn
        (dun-mprinc
 "You trip over a grue and fall into a pit and break every bone in your