From: Ron Schnell Date: Sat, 14 Jun 2014 20:57:34 +0000 (-0400) Subject: Changed Dunnet so that if a lamp is in the room that would otherwise be dark, the... X-Git-Tag: emacs-25.0.90~2612^2~709^2~705 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=799d2f3d87185a51835d0594a89485932d0f4c23;p=emacs.git Changed Dunnet so that if a lamp is in the room that would otherwise be dark, the player will not be eaten by a grue. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ce8092f79e..bd8bd6ac1e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,6 @@ +2014-06-14 Ron Schnell + * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue. + 2014-06-13 Glenn Morris * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el) diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index 0028b7258ae..c82660feffc 100644 --- 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