diff options
| author | Ron Schnell <[email protected]> | 2014-06-14 16:57:34 -0400 |
|---|---|---|
| committer | Ron Schnell <[email protected]> | 2014-06-14 16:57:34 -0400 |
| commit | 799d2f3d87185a51835d0594a89485932d0f4c23 (patch) | |
| tree | 618433c5ea4a7cd5eb473bc89668bd6f27f2906d /lisp | |
| parent | f9d80c51100e230f37df6bd3864e607f6b145cc7 (diff) | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/play/dunnet.el | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ce8092f79..bd8bd6ac1e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,6 @@ +2014-06-14 Ron Schnell <[email protected]> + * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue. + 2014-06-13 Glenn Morris <[email protected]> * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el) diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index 0028b7258a..c82660feff 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 |