diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-09-25 18:20:30 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-09-25 18:20:30 +0000 |
| commit | 85cff943df0b52028b73d4a9e9c130e9ccc27553 (patch) | |
| tree | 2e70b8bbe061786b57b47e91060c001546cef3a2 /lisp/play/dunnet.el | |
| parent | dbabfd5558cc68ac7ce37d3a993c74aa98735e54 (diff) | |
| download | emacs-85cff943df0b52028b73d4a9e9c130e9ccc27553.tar.gz emacs-85cff943df0b52028b73d4a9e9c130e9ccc27553.tar.bz2 emacs-85cff943df0b52028b73d4a9e9c130e9ccc27553.zip | |
(dun-climb): Handle unknown object name.
(dun-objnames): Add "palm" as alias for "tree".
Diffstat (limited to 'lisp/play/dunnet.el')
| -rw-r--r-- | lisp/play/dunnet.el | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index f44f51fda65..6498d539017 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -422,19 +422,22 @@ For an explosive time, go to Fourth St. and Vermont.") (defun dun-climb (obj) (let (objnum) (setq objnum (dun-objnum-from-args obj)) - (if (and (not (= objnum obj-special)) - (not (member objnum (nth dun-current-room dun-room-objects))) - (not (member objnum (nth dun-current-room dun-room-silents))) - (not (member objnum dun-inventory))) - (dun-mprincl "I don't see that here.") - (if (and (= objnum obj-special) - (not (member obj-tree (nth dun-current-room dun-room-silents)))) - (dun-mprincl "There is nothing here to climb.") - (if (and (not (= objnum obj-tree)) (not (= objnum obj-special))) - (dun-mprincl "You can't climb that.") - (dun-mprincl -"You manage to get about two feet up the tree and fall back down. You -notice that the tree is very unsteady.")))))) + (cond ((null objnum) + (dun-mprincl "I don't know that name.")) + ((and (not (eq objnum obj-special)) + (not (member objnum (nth dun-current-room dun-room-objects))) + (not (member objnum (nth dun-current-room dun-room-silents))) + (not (member objnum dun-inventory))) + (dun-mprincl "I don't see that here.")) + ((and (eq objnum obj-special) + (not (member obj-tree (nth dun-current-room dun-room-silents)))) + (dun-mprincl "There is nothing here to climb.")) + ((and (not (eq objnum obj-tree)) (not (eq objnum obj-special))) + (dun-mprincl "You can't climb that.")) + (t + (dun-mprincl + "You manage to get about two feet up the tree and fall back down. You +notice that the tree is very unsteady."))))) (defun dun-eat (obj) (let (objnum) @@ -2096,7 +2099,7 @@ A hole leads north." (floppy . 27) (disk . 27) (boulder . -1) - (tree . -2) (trees . -2) + (tree . -2) (trees . -2) (palm . -2) (bear . -3) (bin . -4) (bins . -4) (cabinet . -5) (computer . -5) (vax . -5) (ibm . -5) |