mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Code Issues Projects Releases Wiki Activity

Change top-level setq forms to defvar or defconst

Browse source 
Also collect some code onto fewer lines and reindent.
* lisp/play/dunnet.el (dun-visited, dun-current-room, dun-exitf):
(dun-badcd, dun-computer, dun-floppy, dun-key-level, dun-hole):
(dun-correct-answer, dun-lastdir, dun-numsaves, dun-jar, dun-dead):
(room, dun-numcmds, dun-wizard, dun-endgame-question, dun-logged-in):
(dungeon-mode, dun-unix-verbs, dun-dos-verbs, dun-batch-mode):
(dun-cdpath, dun-cdroom, dun-uncompressed, dun-ethernet):
(dun-restricted, dun-ftptype, dun-endgame, dun-rooms):
(dun-light-rooms, dun-verblist, dun-inbus, dun-nomail, dun-ignore):
(dun-mode, dun-sauna-level, north, south, east, west, northeast):
(southeast, northwest, southwest, up, down, in, out, dungeon-map):
(dun-objnames, obj-special, dun-room-objects, dun-room-silents):
(dun-inventory, dun-objects, dun-object-lbs, dun-object-pts):
(dun-objfiles, dun-perm-objects, dun-physobj-desc, dun-permobj-desc):
(dun-diggables, dun-room-shorts, dun-endgame-questions): Change
declaration to use defvar or defconst.
(dun-doverb, dun-vparse, dun-vparse2, dun-batch-parse):
(dun-batch-parse2): Omit the dun- prefix from arguments dun-ignore
dun-verblist.  Those are now constants and the byte compiler doesn't
allow defconsts in lambda lists.
This commit is contained in:
Mark Oteiza 2017-01-17 21:34:59 -05:00
parent 33400529c6
commit 48cb4a96f3
1 changed files with 346 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

740
lisp/play/dunnet.el
View file

@ -50,51 +50,51 @@
;;;; All globals which can change must be saved from 'save-game. Add ;;;; All globals which can change must be saved from 'save-game. Add
;;;; all new globals to bottom of file. ;;;; all new globals to bottom of file.
(setq dun-visited '(27)) (defvar dun-visited '(27))
(setq dun-current-room 1) (defvar dun-current-room 1)
(setq dun-exitf nil) (defvar dun-exitf nil)
(setq dun-badcd nil) (defvar dun-badcd nil)
(setq dun-computer nil) (defvar dun-computer nil)
(setq dun-floppy nil) (defvar dun-floppy nil)
(setq dun-key-level 0) (defvar dun-key-level 0)
(setq dun-hole nil) (defvar dun-hole nil)
(setq dun-correct-answer nil) (defvar dun-correct-answer nil)
(setq dun-lastdir 0) (defvar dun-lastdir 0)
(setq dun-numsaves 0) (defvar dun-numsaves 0)
(setq dun-jar nil) (defvar dun-jar nil)
(setq dun-dead nil) (defvar dun-dead nil)
(setq room 0) (defvar room 0)
(setq dun-numcmds 0) (defvar dun-numcmds 0)
(setq dun-wizard nil) (defvar dun-wizard nil)
(setq dun-endgame-question nil) (defvar dun-endgame-question nil)
(setq dun-logged-in nil) (defvar dun-logged-in nil)
(setq dungeon-mode 'dungeon) (defvar dungeon-mode 'dungeon)
(setq dun-unix-verbs '((ls . dun-ls) (ftp . dun-ftp) (echo . dun-echo) (defvar dun-unix-verbs '((ls . dun-ls) (ftp . dun-ftp) (echo . dun-echo)
(exit . dun-uexit) (cd . dun-cd) (pwd . dun-pwd) (exit . dun-uexit) (cd . dun-cd) (pwd . dun-pwd)
(rlogin . dun-rlogin) (ssh . dun-rlogin) (rlogin . dun-rlogin) (ssh . dun-rlogin)
(uncompress . dun-uncompress) (cat . dun-cat))) (uncompress . dun-uncompress) (cat . dun-cat)))
(setq dun-dos-verbs '((dir . dun-dos-dir) (type . dun-dos-type) (defvar dun-dos-verbs '((dir . dun-dos-dir) (type . dun-dos-type)
(exit . dun-dos-exit) (command . dun-dos-spawn) (exit . dun-dos-exit) (command . dun-dos-spawn)
(b: . dun-dos-invd) (c: . dun-dos-invd) (b: . dun-dos-invd) (c: . dun-dos-invd)
(a: . dun-dos-nil))) (a: . dun-dos-nil)))
(setq dun-batch-mode nil) (defvar dun-batch-mode nil)
(setq dun-cdpath "/usr/toukmond") (defvar dun-cdpath "/usr/toukmond")
(setq dun-cdroom -10) (defvar dun-cdroom -10)
(setq dun-uncompressed nil) (defvar dun-uncompressed nil)
(setq dun-ethernet t) (defvar dun-ethernet t)
(setq dun-restricted (defconst dun-restricted
'(dun-room-objects dungeon-map dun-rooms '(dun-room-objects dungeon-map dun-rooms
dun-room-silents dun-combination)) dun-room-silents dun-combination))
(setq dun-ftptype 'ascii) (defvar dun-ftptype 'ascii)
(setq dun-endgame nil) (defvar dun-endgame nil)
(setq dun-gottago t) (defvar dun-gottago t)
(setq dun-black nil) (defvar dun-black nil)
(setq dun-rooms '( (defconst dun-rooms '(
( (
"You are in the treasure room. A door leads out to the north." "You are in the treasure room. A door leads out to the north."
"Treasure room" "Treasure room"
@ -603,44 +603,46 @@ A hole leads north."
) )
)) ))
(setq dun-light-rooms '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 24 25 26 27 28 58 59 (defconst dun-light-rooms
60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 24 25 26 27 28 58 59
77 78 79 80 81 82 83)) 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
77 78 79 80 81 82 83))
(setq dun-verblist '((die . dun-die) (ne . dun-ne) (north . dun-n) (defconst dun-verblist
(south . dun-s) (east . dun-e) (west . dun-w) '((die . dun-die) (ne . dun-ne) (north . dun-n)
(u . dun-up) (d . dun-down) (i . dun-inven) (south . dun-s) (east . dun-e) (west . dun-w)
(inventory . dun-inven) (look . dun-examine) (n . dun-n) (u . dun-up) (d . dun-down) (i . dun-inven)
(s . dun-s) (e . dun-e) (w . dun-w) (se . dun-se) (inventory . dun-inven) (look . dun-examine) (n . dun-n)
(nw . dun-nw) (sw . dun-sw) (up . dun-up) (s . dun-s) (e . dun-e) (w . dun-w) (se . dun-se)
(down . dun-down) (in . dun-in) (out . dun-out) (nw . dun-nw) (sw . dun-sw) (up . dun-up)
(go . dun-go) (drop . dun-drop) (southeast . dun-se) (down . dun-down) (in . dun-in) (out . dun-out)
(southwest . dun-sw) (northeast . dun-ne) (go . dun-go) (drop . dun-drop) (southeast . dun-se)
(northwest . dun-nw) (save . dun-save-game) (southwest . dun-sw) (northeast . dun-ne)
(restore . dun-restore) (long . dun-long) (dig . dun-dig) (northwest . dun-nw) (save . dun-save-game)
(shake . dun-shake) (wave . dun-shake) (restore . dun-restore) (long . dun-long) (dig . dun-dig)
(examine . dun-examine) (describe . dun-examine) (shake . dun-shake) (wave . dun-shake)
(climb . dun-climb) (eat . dun-eat) (put . dun-put) (examine . dun-examine) (describe . dun-examine)
(type . dun-type) (insert . dun-put) (climb . dun-climb) (eat . dun-eat) (put . dun-put)
(score . dun-score) (help . dun-help) (quit . dun-quit) (type . dun-type) (insert . dun-put)
(read . dun-examine) (verbose . dun-long) (score . dun-score) (help . dun-help) (quit . dun-quit)
(urinate . dun-piss) (piss . dun-piss) (read . dun-examine) (verbose . dun-long)
(flush . dun-flush) (sleep . dun-sleep) (lie . dun-sleep) (urinate . dun-piss) (piss . dun-piss)
(x . dun-examine) (break . dun-break) (drive . dun-drive) (flush . dun-flush) (sleep . dun-sleep) (lie . dun-sleep)
(board . dun-in) (enter . dun-in) (turn . dun-turn) (x . dun-examine) (break . dun-break) (drive . dun-drive)
(press . dun-press) (push . dun-press) (swim . dun-swim) (board . dun-in) (enter . dun-in) (turn . dun-turn)
(on . dun-in) (off . dun-out) (chop . dun-break) (press . dun-press) (push . dun-press) (swim . dun-swim)
(switch . dun-press) (cut . dun-break) (exit . dun-out) (on . dun-in) (off . dun-out) (chop . dun-break)
(leave . dun-out) (reset . dun-power) (flick . dun-press) (switch . dun-press) (cut . dun-break) (exit . dun-out)
(superb . dun-superb) (answer . dun-answer) (leave . dun-out) (reset . dun-power) (flick . dun-press)
(throw . dun-drop) (l . dun-examine) (take . dun-take) (superb . dun-superb) (answer . dun-answer)
(get . dun-take) (feed . dun-feed))) (throw . dun-drop) (l . dun-examine) (take . dun-take)
(get . dun-take) (feed . dun-feed)))
(setq dun-inbus nil) (defvar dun-inbus nil)
(setq dun-nomail nil) (defvar dun-nomail nil)
(setq dun-ignore '(the to at)) (defconst dun-ignore '(the to at))
(setq dun-mode 'moby) (defvar dun-mode 'moby)
(setq dun-sauna-level 0) (defvar dun-sauna-level 0)
(defconst north 0) (defconst north 0)
(defconst south 1) (defconst south 1)
@ -655,180 +657,178 @@ A hole leads north."
(defconst in 10) (defconst in 10)
(defconst out 11) (defconst out 11)
(setq dungeon-map '( (defconst dungeon-map
; no so ea we ne se nw sw up do in ot ;; no so ea we ne se nw sw up do in ot
( 96 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;0 '(( 96 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;0
( -1 -1 2 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;1 ( -1 -1 2 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;1
( -1 -1 3 1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;2 ( -1 -1 3 1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;2
( -1 -1 -1 2 4 6 -1 -1 -1 -1 -1 -1 ) ;3 ( -1 -1 -1 2 4 6 -1 -1 -1 -1 -1 -1 ) ;3
( -1 -1 -1 -1 5 -1 -1 3 -1 -1 -1 -1 ) ;4 ( -1 -1 -1 -1 5 -1 -1 3 -1 -1 -1 -1 ) ;4
( -1 -1 -1 -1 255 -1 -1 4 -1 -1 255 -1 ) ;5 ( -1 -1 -1 -1 255 -1 -1 4 -1 -1 255 -1 ) ;5
( -1 -1 -1 -1 -1 7 3 -1 -1 -1 -1 -1 ) ;6 ( -1 -1 -1 -1 -1 7 3 -1 -1 -1 -1 -1 ) ;6
( -1 -1 -1 -1 -1 255 6 27 -1 -1 -1 -1 ) ;7 ( -1 -1 -1 -1 -1 255 6 27 -1 -1 -1 -1 ) ;7
( 255 5 9 10 -1 -1 -1 5 -1 -1 -1 5 ) ;8 ( 255 5 9 10 -1 -1 -1 5 -1 -1 -1 5 ) ;8
( -1 -1 -1 8 -1 -1 -1 -1 -1 -1 -1 -1 ) ;9 ( -1 -1 -1 8 -1 -1 -1 -1 -1 -1 -1 -1 ) ;9
( -1 -1 8 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;10 ( -1 -1 8 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;10
( -1 8 -1 58 -1 -1 -1 -1 -1 -1 -1 -1 ) ;11 ( -1 8 -1 58 -1 -1 -1 -1 -1 -1 -1 -1 ) ;11
( -1 -1 13 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;12 ( -1 -1 13 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;12
( 15 -1 14 12 -1 -1 -1 -1 -1 -1 -1 -1 ) ;13 ( 15 -1 14 12 -1 -1 -1 -1 -1 -1 -1 -1 ) ;13
( -1 -1 -1 13 -1 -1 -1 -1 -1 -1 -1 -1 ) ;14 ( -1 -1 -1 13 -1 -1 -1 -1 -1 -1 -1 -1 ) ;14
( -1 13 16 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;15 ( -1 13 16 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;15
( -1 -1 -1 15 -1 -1 -1 -1 -1 17 16 -1 ) ;16 ( -1 -1 -1 15 -1 -1 -1 -1 -1 17 16 -1 ) ;16
( -1 -1 17 17 17 17 255 17 255 17 -1 -1 ) ;17 ( -1 -1 17 17 17 17 255 17 255 17 -1 -1 ) ;17
( 18 18 18 18 18 -1 18 18 19 18 -1 -1 ) ;18 ( 18 18 18 18 18 -1 18 18 19 18 -1 -1 ) ;18
( -1 18 18 19 19 20 19 19 -1 18 -1 -1 ) ;19 ( -1 18 18 19 19 20 19 19 -1 18 -1 -1 ) ;19
( -1 -1 -1 18 -1 -1 -1 -1 -1 21 -1 -1 ) ;20 ( -1 -1 -1 18 -1 -1 -1 -1 -1 21 -1 -1 ) ;20
( -1 -1 -1 -1 -1 20 22 -1 -1 -1 -1 -1 ) ;21 ( -1 -1 -1 -1 -1 20 22 -1 -1 -1 -1 -1 ) ;21
( 18 18 18 18 16 18 23 18 18 18 18 18 ) ;22 ( 18 18 18 18 16 18 23 18 18 18 18 18 ) ;22
( -1 255 -1 -1 -1 19 -1 -1 -1 -1 -1 -1 ) ;23 ( -1 255 -1 -1 -1 19 -1 -1 -1 -1 -1 -1 ) ;23
( 23 25 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;24 ( 23 25 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;24
( 24 255 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;25 ( 24 255 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;25
(255 28 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;26 (255 28 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;26
( -1 -1 -1 -1 7 -1 -1 -1 -1 -1 -1 -1 ) ;27 ( -1 -1 -1 -1 7 -1 -1 -1 -1 -1 -1 -1 ) ;27
( 26 255 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;28 ( 26 255 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;28
( -1 -1 30 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;29 ( -1 -1 30 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;29
( -1 -1 31 29 -1 -1 -1 -1 -1 -1 -1 -1 ) ;30 ( -1 -1 31 29 -1 -1 -1 -1 -1 -1 -1 -1 ) ;30
( 32 33 -1 30 -1 -1 -1 -1 -1 -1 -1 -1 ) ;31 ( 32 33 -1 30 -1 -1 -1 -1 -1 -1 -1 -1 ) ;31
( -1 31 -1 255 -1 -1 -1 -1 -1 34 -1 -1 ) ;32 ( -1 31 -1 255 -1 -1 -1 -1 -1 34 -1 -1 ) ;32
( 31 -1 -1 -1 -1 -1 -1 -1 -1 35 -1 -1 ) ;33 ( 31 -1 -1 -1 -1 -1 -1 -1 -1 35 -1 -1 ) ;33
( -1 35 -1 -1 -1 -1 -1 -1 32 37 -1 -1 ) ;34 ( -1 35 -1 -1 -1 -1 -1 -1 32 37 -1 -1 ) ;34
( 34 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;35 ( 34 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;35
( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;36 ( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;36
( -1 -1 -1 -1 -1 -1 -1 38 34 -1 -1 -1 ) ;37 ( -1 -1 -1 -1 -1 -1 -1 38 34 -1 -1 -1 ) ;37
( -1 -1 40 41 37 -1 -1 39 -1 -1 -1 -1 ) ;38 ( -1 -1 40 41 37 -1 -1 39 -1 -1 -1 -1 ) ;38
( -1 -1 -1 -1 38 -1 -1 -1 -1 -1 -1 -1 ) ;39 ( -1 -1 -1 -1 38 -1 -1 -1 -1 -1 -1 -1 ) ;39
( -1 -1 -1 38 -1 -1 -1 -1 42 -1 -1 -1 ) ;40 ( -1 -1 -1 38 -1 -1 -1 -1 42 -1 -1 -1 ) ;40
( -1 -1 38 -1 -1 -1 -1 -1 -1 43 -1 -1 ) ;41 ( -1 -1 38 -1 -1 -1 -1 -1 -1 43 -1 -1 ) ;41
( -1 -1 -1 -1 -1 -1 -1 -1 -1 40 -1 -1 ) ;42 ( -1 -1 -1 -1 -1 -1 -1 -1 -1 40 -1 -1 ) ;42
( 44 -1 46 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;43 ( 44 -1 46 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;43
( -1 43 45 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;44 ( -1 43 45 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;44
( -1 46 -1 44 -1 -1 -1 -1 -1 -1 -1 -1 ) ;45 ( -1 46 -1 44 -1 -1 -1 -1 -1 -1 -1 -1 ) ;45
( 45 -1 -1 43 -1 -1 -1 -1 -1 255 -1 -1 ) ;46 ( 45 -1 -1 43 -1 -1 -1 -1 -1 255 -1 -1 ) ;46
( 48 50 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;47 ( 48 50 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;47
( 49 47 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;48 ( 49 47 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;48
( -1 48 -1 -1 -1 -1 -1 -1 52 -1 -1 -1 ) ;49 ( -1 48 -1 -1 -1 -1 -1 -1 52 -1 -1 -1 ) ;49
( 47 51 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;50 ( 47 51 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;50
( 50 104 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;51 ( 50 104 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;51
( -1 -1 -1 -1 -1 -1 -1 -1 53 49 -1 -1 ) ;52 ( -1 -1 -1 -1 -1 -1 -1 -1 53 49 -1 -1 ) ;52
( -1 -1 -1 -1 -1 -1 -1 -1 54 52 -1 -1 ) ;53 ( -1 -1 -1 -1 -1 -1 -1 -1 54 52 -1 -1 ) ;53
( -1 -1 -1 -1 55 -1 -1 -1 -1 53 -1 -1 ) ;54 ( -1 -1 -1 -1 55 -1 -1 -1 -1 53 -1 -1 ) ;54
( -1 -1 -1 -1 56 -1 -1 54 -1 -1 -1 54 ) ;55 ( -1 -1 -1 -1 56 -1 -1 54 -1 -1 -1 54 ) ;55
( -1 -1 -1 -1 -1 -1 -1 55 -1 31 -1 -1 ) ;56 ( -1 -1 -1 -1 -1 -1 -1 55 -1 31 -1 -1 ) ;56
( -1 -1 32 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;57 ( -1 -1 32 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;57
( 59 -1 11 -1 -1 -1 -1 -1 -1 -1 255 255) ;58 ( 59 -1 11 -1 -1 -1 -1 -1 -1 -1 255 255) ;58
( 60 58 63 -1 -1 -1 255 -1 -1 -1 255 255) ;59 ( 60 58 63 -1 -1 -1 255 -1 -1 -1 255 255) ;59
( 61 59 64 -1 -1 -1 -1 -1 -1 -1 255 255) ;60 ( 61 59 64 -1 -1 -1 -1 -1 -1 -1 255 255) ;60
( 62 60 65 -1 -1 -1 -1 -1 -1 -1 255 255) ;61 ( 62 60 65 -1 -1 -1 -1 -1 -1 -1 255 255) ;61
( -1 61 66 -1 -1 -1 -1 -1 -1 -1 255 255) ;62 ( -1 61 66 -1 -1 -1 -1 -1 -1 -1 255 255) ;62
( 64 -1 67 59 -1 -1 -1 -1 -1 -1 255 255) ;63 ( 64 -1 67 59 -1 -1 -1 -1 -1 -1 255 255) ;63
( 65 63 68 60 -1 -1 -1 -1 -1 -1 255 255) ;64 ( 65 63 68 60 -1 -1 -1 -1 -1 -1 255 255) ;64
( 66 64 69 61 -1 -1 -1 -1 -1 -1 255 255) ;65 ( 66 64 69 61 -1 -1 -1 -1 -1 -1 255 255) ;65
( -1 65 70 62 -1 -1 -1 -1 -1 -1 255 255) ;66 ( -1 65 70 62 -1 -1 -1 -1 -1 -1 255 255) ;66
( 68 -1 71 63 -1 -1 -1 -1 -1 -1 255 255) ;67 ( 68 -1 71 63 -1 -1 -1 -1 -1 -1 255 255) ;67
( 69 67 72 64 -1 -1 -1 -1 -1 -1 255 255) ;68 ( 69 67 72 64 -1 -1 -1 -1 -1 -1 255 255) ;68
( 70 68 73 65 -1 -1 -1 -1 -1 -1 255 255) ;69 ( 70 68 73 65 -1 -1 -1 -1 -1 -1 255 255) ;69
( -1 69 74 66 -1 -1 -1 -1 -1 -1 255 255) ;70 ( -1 69 74 66 -1 -1 -1 -1 -1 -1 255 255) ;70
( 72 -1 75 67 -1 -1 -1 -1 -1 -1 255 255) ;71 ( 72 -1 75 67 -1 -1 -1 -1 -1 -1 255 255) ;71
( 73 71 76 68 -1 -1 -1 -1 -1 -1 255 255) ;72 ( 73 71 76 68 -1 -1 -1 -1 -1 -1 255 255) ;72
( 74 72 77 69 -1 -1 -1 -1 -1 -1 255 255) ;73 ( 74 72 77 69 -1 -1 -1 -1 -1 -1 255 255) ;73
( -1 73 78 70 -1 -1 -1 -1 -1 -1 255 255) ;74 ( -1 73 78 70 -1 -1 -1 -1 -1 -1 255 255) ;74
( 76 -1 79 71 -1 -1 -1 -1 -1 -1 255 255) ;75 ( 76 -1 79 71 -1 -1 -1 -1 -1 -1 255 255) ;75
( 77 75 80 72 -1 -1 -1 -1 -1 -1 255 255) ;76 ( 77 75 80 72 -1 -1 -1 -1 -1 -1 255 255) ;76
( 78 76 81 73 -1 -1 -1 -1 -1 -1 255 255) ;77 ( 78 76 81 73 -1 -1 -1 -1 -1 -1 255 255) ;77
( -1 77 82 74 -1 -1 -1 -1 -1 -1 255 255) ;78 ( -1 77 82 74 -1 -1 -1 -1 -1 -1 255 255) ;78
( 80 -1 -1 75 -1 -1 -1 -1 -1 -1 255 255) ;79 ( 80 -1 -1 75 -1 -1 -1 -1 -1 -1 255 255) ;79
( 81 79 255 76 -1 -1 -1 -1 -1 -1 255 255) ;80 ( 81 79 255 76 -1 -1 -1 -1 -1 -1 255 255) ;80
( 82 80 -1 77 -1 -1 -1 -1 -1 -1 255 255) ;81 ( 82 80 -1 77 -1 -1 -1 -1 -1 -1 255 255) ;81
( -1 81 -1 78 -1 -1 -1 -1 -1 -1 255 255) ;82 ( -1 81 -1 78 -1 -1 -1 -1 -1 -1 255 255) ;82
( 84 -1 -1 -1 -1 59 -1 -1 -1 -1 255 255) ;83 ( 84 -1 -1 -1 -1 59 -1 -1 -1 -1 255 255) ;83
( -1 83 85 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;84 ( -1 83 85 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;84
( 86 -1 87 84 -1 -1 -1 -1 -1 -1 -1 -1 ) ;85 ( 86 -1 87 84 -1 -1 -1 -1 -1 -1 -1 -1 ) ;85
( -1 85 88 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;86 ( -1 85 88 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;86
( 88 -1 -1 85 -1 -1 -1 -1 -1 -1 -1 -1 ) ;87 ( 88 -1 -1 85 -1 -1 -1 -1 -1 -1 -1 -1 ) ;87
( -1 87 255 86 -1 -1 -1 -1 -1 -1 -1 -1 ) ;88 ( -1 87 255 86 -1 -1 -1 -1 -1 -1 -1 -1 ) ;88
( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;89 ( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 -1 ) ;89
( 91 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;90 ( 91 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;90
( 92 90 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;91 ( 92 90 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;91
( -1 91 -1 -1 -1 -1 -1 -1 93 94 -1 -1 ) ;92 ( -1 91 -1 -1 -1 -1 -1 -1 93 94 -1 -1 ) ;92
( -1 -1 -1 88 -1 -1 -1 -1 -1 92 -1 -1 ) ;93 ( -1 -1 -1 88 -1 -1 -1 -1 -1 92 -1 -1 ) ;93
( -1 -1 -1 -1 95 -1 -1 -1 92 -1 -1 -1 ) ;94 ( -1 -1 -1 -1 95 -1 -1 -1 92 -1 -1 -1 ) ;94
( -1 -1 -1 -1 -1 -1 -1 94 -1 -1 -1 -1 ) ;95 ( -1 -1 -1 -1 -1 -1 -1 94 -1 -1 -1 -1 ) ;95
( 97 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;96 ( 97 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;96
( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;97 ( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;97
( 99 97 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;98 ( 99 97 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;98
( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;99 ( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;99
( 101 99 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;100 ( 101 99 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;100
( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;101 ( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;101
( 103 101 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;102 ( 103 101 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;102
( -1 102 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;103 ( -1 102 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;103
( 51 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ) ;104 ( 51 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 ));104
) ;; no so ea we ne se nw sw up do in ot
; no so ea we ne se nw sw up do in ot
) )
;;; How the user references *all* objects, permanent and regular. ;;; How the user references *all* objects, permanent and regular.
(setq dun-objnames '( (defconst dun-objnames
(shovel . 0) '((shovel . 0)
(lamp . 1) (lamp . 1)
(cpu . 2) (board . 2) (card . 2) (chip . 2) (cpu . 2) (board . 2) (card . 2) (chip . 2)
(food . 3) (food . 3)
(key . 4) (key . 4)
(paper . 5) (slip . 5) (paper . 5) (slip . 5)
(rms . 6) (statue . 6) (statuette . 6) (stallman . 6) (rms . 6) (statue . 6) (statuette . 6) (stallman . 6)
(diamond . 7) (diamond . 7)
(weight . 8) (weight . 8)
(life . 9) (preserver . 9) (life . 9) (preserver . 9)
(bracelet . 10) (emerald . 10) (bracelet . 10) (emerald . 10)
(gold . 11) (gold . 11)
(platinum . 12) (platinum . 12)
(towel . 13) (beach . 13) (towel . 13) (beach . 13)
(axe . 14) (axe . 14)
(silver . 15) (silver . 15)
(license . 16) (license . 16)
(coins . 17) (coins . 17)
(egg . 18) (egg . 18)
(jar . 19) (jar . 19)
(bone . 20) (bone . 20)
(acid . 21) (nitric . 21) (acid . 21) (nitric . 21)
(glycerine . 22) (glycerine . 22)
(ruby . 23) (ruby . 23)
(amethyst . 24) (amethyst . 24)
(mona . 25) (mona . 25)
(bill . 26) (bill . 26)
(floppy . 27) (disk . 27) (floppy . 27) (disk . 27)
(boulder . -1) (boulder . -1)
(tree . -2) (trees . -2) (palm . -2) (tree . -2) (trees . -2) (palm . -2)
(bear . -3) (bear . -3)
(bin . -4) (bins . -4) (bin . -4) (bins . -4)
(cabinet . -5) (computer . -5) (vax . -5) (ibm . -5) (cabinet . -5) (computer . -5) (vax . -5) (ibm . -5)
(protoplasm . -6) (protoplasm . -6)
(dial . -7) (dial . -7)
(button . -8) (button . -8)
(chute . -9) (chute . -9)
(painting . -10) (painting . -10)
(bed . -11) (bed . -11)
(urinal . -12) (urinal . -12)
(URINE . -13) (URINE . -13)
(pipes . -14) (pipe . -14) (pipes . -14) (pipe . -14)
(box . -15) (slit . -15) (box . -15) (slit . -15)
(cable . -16) (ethernet . -16) (cable . -16) (ethernet . -16)
(mail . -17) (drop . -17) (mail . -17) (drop . -17)
(bus . -18) (bus . -18)
(gate . -19) (gate . -19)
(cliff . -20) (cliff . -20)
(skeleton . -21) (dinosaur . -21) (skeleton . -21) (dinosaur . -21)
(fish . -22) (fish . -22)
(tanks . -23) (tank . -23) (tanks . -23) (tank . -23)
(switch . -24) (switch . -24)
(blackboard . -25) (blackboard . -25)
(disposal . -26) (garbage . -26) (disposal . -26) (garbage . -26)
(ladder . -27) (ladder . -27)
(subway . -28) (train . -28) (subway . -28) (train . -28)
(pc . -29) (drive . -29) (coconut . -30) (coconuts . -30) (pc . -29) (drive . -29) (coconut . -30) (coconuts . -30)
(lake . -32) (water . -32) (lake . -32) (water . -32)))
))
(dolist (x dun-objnames) (dolist (x dun-objnames)
(let (name) (let (name)
@ -844,7 +844,7 @@ A hole leads north."
;;; Stuff that is described and might change are 255, and are ;;; Stuff that is described and might change are 255, and are
;;; handled specially by 'dun-describe-room. ;;; handled specially by 'dun-describe-room.
(setq dun-room-objects (list nil (defvar dun-room-objects (list nil
(list obj-shovel) ;; treasure-room (list obj-shovel) ;; treasure-room
(list obj-boulder) ;; dead-end (list obj-boulder) ;; dead-end
@ -901,7 +901,7 @@ nil))
;;; These are objects in a room that are only described in the ;;; These are objects in a room that are only described in the
;;; room description. They are permanent. ;;; room description. They are permanent.
(setq dun-room-silents (list nil (defconst dun-room-silents (list nil
(list obj-tree obj-coconut) ;; dead-end (list obj-tree obj-coconut) ;; dead-end
(list obj-tree obj-coconut) ;; e-w-dirt-road (list obj-tree obj-coconut) ;; e-w-dirt-road
nil nil nil nil nil nil nil nil nil nil nil nil
@ -945,96 +945,81 @@ nil))
(list obj-pc) ;; pc-area (list obj-pc) ;; pc-area
nil nil nil nil nil nil nil nil nil nil nil nil
)) ))
(setq dun-inventory '(1)) (defvar dun-inventory '(1))
;;; Descriptions of objects, as they appear in the room description, and ;;; Descriptions of objects, as they appear in the room description, and
;;; the inventory. ;;; the inventory.
(setq dun-objects '( (defconst dun-objects
("There is a shovel here." "A shovel") ;0 '(("There is a shovel here." "A shovel") ;0
("There is a lamp nearby." "A lamp") ;1 ("There is a lamp nearby." "A lamp") ;1
("There is a CPU card here." "A computer board") ;2 ("There is a CPU card here." "A computer board") ;2
("There is some food here." "Some food") ;3 ("There is some food here." "Some food") ;3
("There is a shiny brass key here." "A brass key") ;4 ("There is a shiny brass key here." "A brass key") ;4
("There is a slip of paper here." "A slip of paper") ;5 ("There is a slip of paper here." "A slip of paper") ;5
("There is a wax statuette of Richard Stallman here." ;6 ("There is a wax statuette of Richard Stallman here." ;6
"An RMS statuette") "An RMS statuette")
("There is a shimmering diamond here." "A diamond") ;7 ("There is a shimmering diamond here." "A diamond") ;7
("There is a 10 pound weight here." "A weight") ;8 ("There is a 10 pound weight here." "A weight") ;8
("There is a life preserver here." "A life preserver");9 ("There is a life preserver here." "A life preserver");9
("There is an emerald bracelet here." "A bracelet") ;10 ("There is an emerald bracelet here." "A bracelet") ;10
("There is a gold bar here." "A gold bar") ;11 ("There is a gold bar here." "A gold bar") ;11
("There is a platinum bar here." "A platinum bar") ;12 ("There is a platinum bar here." "A platinum bar") ;12
("There is a beach towel on the ground here." "A beach towel") ("There is a beach towel on the ground here." "A beach towel")
("There is an axe here." "An axe") ;14 ("There is an axe here." "An axe") ;14
("There is a silver bar here." "A silver bar") ;15 ("There is a silver bar here." "A silver bar") ;15
("There is a bus driver's license here." "A license") ;16 ("There is a bus driver's license here." "A license") ;16
("There are some valuable coins here." "Some valuable coins") ("There are some valuable coins here." "Some valuable coins")
("There is a jewel-encrusted egg here." "A valuable egg") ;18 ("There is a jewel-encrusted egg here." "A valuable egg") ;18
("There is a glass jar here." "A glass jar") ;19 ("There is a glass jar here." "A glass jar") ;19
("There is a dinosaur bone here." "A bone") ;20 ("There is a dinosaur bone here." "A bone") ;20
("There is a packet of nitric acid here." "Some nitric acid") ("There is a packet of nitric acid here." "Some nitric acid")
("There is a packet of glycerine here." "Some glycerine") ;22 ("There is a packet of glycerine here." "Some glycerine") ;22
("There is a valuable ruby here." "A ruby") ;23 ("There is a valuable ruby here." "A ruby") ;23
("There is a valuable amethyst here." "An amethyst") ;24 ("There is a valuable amethyst here." "An amethyst") ;24
("The Mona Lisa is here." "The Mona Lisa") ;25 ("The Mona Lisa is here." "The Mona Lisa") ;25
("There is a 100 dollar bill here." "A $100 bill") ;26 ("There is a 100 dollar bill here." "A $100 bill") ;26
("There is a floppy disk here." "A floppy disk") ;27 ("There is a floppy disk here." "A floppy disk"))) ;27
)
)
;;; Weight of objects ;;; Weight of objects
(setq dun-object-lbs (defconst dun-object-lbs
'(2 1 1 1 1 0 2 2 10 3 1 1 1 0 1 1 0 1 1 1 1 0 0 2 2 1 0 0)) '(2 1 1 1 1 0 2 2 10 3 1 1 1 0 1 1 0 1 1 1 1 0 0 2 2 1 0 0))
(setq dun-object-pts (defconst dun-object-pts
'(0 0 0 0 0 0 0 10 0 0 10 10 10 0 0 10 0 10 10 0 0 0 0 10 10 10 10 0)) '(0 0 0 0 0 0 0 10 0 0 10 10 10 0 0 10 0 10 10 0 0 0 0 10 10 10 10 0))
;;; Unix representation of objects. ;;; Unix representation of objects.
(setq dun-objfiles '( (defconst dun-objfiles
"shovel.o" "lamp.o" "cpu.o" "food.o" "key.o" "paper.o" '("shovel.o" "lamp.o" "cpu.o" "food.o" "key.o" "paper.o"
"rms.o" "diamond.o" "weight.o" "preserver.o" "bracelet.o" "rms.o" "diamond.o" "weight.o" "preserver.o" "bracelet.o"
"gold.o" "platinum.o" "towel.o" "axe.o" "silver.o" "license.o" "gold.o" "platinum.o" "towel.o" "axe.o" "silver.o" "license.o"
"coins.o" "egg.o" "jar.o" "bone.o" "nitric.o" "glycerine.o" "coins.o" "egg.o" "jar.o" "bone.o" "nitric.o" "glycerine.o"
"ruby.o" "amethyst.o" "ruby.o" "amethyst.o"))
))
;;; These are the descriptions for the negative numbered objects from ;;; These are the descriptions for the negative numbered objects from
;;; dun-room-objects ;;; dun-room-objects
(setq dun-perm-objects '( (defconst dun-perm-objects
nil '(nil
("There is a large boulder here.") ("There is a large boulder here.")
nil nil
("There is a ferocious bear here!") ("There is a ferocious bear here!")
nil nil nil
nil ("There is a worthless pile of protoplasm here.")
("There is a worthless pile of protoplasm here.") nil nil nil nil nil nil
nil ("There is a strange smell in this room.")
nil nil
nil ("There is a box with a slit in it, bolted to the wall here.")
nil nil nil
nil ("There is a bus here.")
nil nil nil nil))
("There is a strange smell in this room.")
nil
(
"There is a box with a slit in it, bolted to the wall here."
)
nil
nil
("There is a bus here.")
nil
nil
nil
))
;;; These are the descriptions the user gets when regular objects are ;;; These are the descriptions the user gets when regular objects are
;;; examined. ;;; examined.
(setq dun-physobj-desc '( (defconst dun-physobj-desc '(
"It is a normal shovel with a price tag attached that says $19.99." "It is a normal shovel with a price tag attached that says $19.99."
"The lamp is hand-crafted by Geppetto." "The lamp is hand-crafted by Geppetto."
"The CPU board has a VAX chip on it. It seems to have "The CPU board has a VAX chip on it. It seems to have
@ -1048,29 +1033,20 @@ famous EMACS editor. You notice that he is not wearing any shoes."
nil nil
"You observe that the weight is heavy." "You observe that the weight is heavy."
"It says S. S. Minnow." "It says S. S. Minnow."
nil nil nil nil
nil
nil
"It has a picture of snoopy on it." "It has a picture of snoopy on it."
nil nil nil
nil
"It has your picture on it!" "It has your picture on it!"
"They are old coins from the 19th century." "They are old coins from the 19th century."
"It is a valuable Fabrege egg." "It is a valuable Fabrege egg."
"It is a plain glass jar." "It is a plain glass jar."
nil nil nil nil nil nil))
nil
nil
nil
nil
)
)
;;; These are the descriptions the user gets when non-regular objects ;;; These are the descriptions the user gets when non-regular objects
;;; are examined. ;;; are examined.
(setq dun-permobj-desc '( (defconst dun-permobj-desc
nil '(nil
"It is just a boulder. It cannot be moved." "It is just a boulder. It cannot be moved."
"They are palm trees with a bountiful supply of coconuts in them." "They are palm trees with a bountiful supply of coconuts in them."
"It looks like a grizzly to me." "It looks like a grizzly to me."
@ -1082,11 +1058,10 @@ names:
Robert Toukmond Robert Toukmond
Thomas Stock Thomas Stock
" "
nil nil
"It is just a garbled mess." "It is just a garbled mess."
"The dial points to a temperature scale which has long since faded away." "The dial points to a temperature scale which has long since faded away."
nil nil nil
nil
"It is a velvet painting of Elvis Presley. It seems to be nailed to the "It is a velvet painting of Elvis Presley. It seems to be nailed to the
wall, and you cannot move it." wall, and you cannot move it."
"It is a queen sized bed, with a very firm mattress." "It is a queen sized bed, with a very firm mattress."
@ -1095,8 +1070,7 @@ isn't even any rust. Upon close examination you realize that the drain at the
bottom is missing, and there is just a large hole leading down the bottom is missing, and there is just a large hole leading down the
pipes into nowhere. The hole is too small for a person to fit in. The pipes into nowhere. The hole is too small for a person to fit in. The
flush handle is so clean that you can see your reflection in it." flush handle is so clean that you can see your reflection in it."
nil nil nil
nil
"The box has a slit in the top of it, and on it, in sloppy handwriting, is "The box has a slit in the top of it, and on it, in sloppy handwriting, is
written: ‘For key upgrade, put key in here.’" written: ‘For key upgrade, put key in here.’"
nil nil
@ -1107,67 +1081,45 @@ nil
"Unfortunately you do not know enough about dinosaurs to tell very much about "Unfortunately you do not know enough about dinosaurs to tell very much about
it. It is very big, though." it. It is very big, though."
"The fish look like they were once quite beautiful." "The fish look like they were once quite beautiful."
nil nil nil nil nil
nil
nil
nil
"It is a normal ladder that is permanently attached to the hole." "It is a normal ladder that is permanently attached to the hole."
"It is a passenger train that is ready to go." "It is a passenger train that is ready to go."
"It is a personal computer that has only one floppy disk drive." "It is a personal computer that has only one floppy disk drive."))
)
)
(setq dun-diggables (defconst dun-diggables
(list nil nil nil (list obj-cpu) nil nil nil nil nil nil nil (list nil nil nil (list obj-cpu) nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil ;11-20 nil nil nil nil nil nil nil nil nil nil ;11-20
nil nil nil nil nil nil nil nil nil nil ;21-30 nil nil nil nil nil nil nil nil nil nil ;21-30
nil nil nil nil nil nil nil nil nil nil ;31-40 nil nil nil nil nil nil nil nil nil nil ;31-40
nil (list obj-platinum) nil nil nil nil nil nil nil nil)) nil (list obj-platinum) nil nil nil nil nil nil nil nil))
(setq dun-room-shorts nil) (defvar dun-room-shorts nil)
(setq dun-endgame-questions '( (defconst dun-endgame-questions
( '(("What is your password on the machine called ‘pokey’?" "robert")
"What is your password on the machine called ‘pokey’?" "robert") ("What password did you use during anonymous ftp to gamma?" "foo")
( ("Excluding the endgame, how many places are there where you can put
"What password did you use during anonymous ftp to gamma?" "foo")
(
"Excluding the endgame, how many places are there where you can put
treasures for points?" "4" "four") treasures for points?" "4" "four")
( ("What is your login name on the ‘endgame’ machine?" "toukmond")
"What is your login name on the ‘endgame’ machine?" "toukmond" ("What is the nearest whole dollar to the price of the shovel?"
) "20" "twenty")
( ("What is the name of the bus company serving the town?" "mobytours")
"What is the nearest whole dollar to the price of the shovel?" "20" "twenty") ("Give either of the two last names in the mailroom, other than your own."
( "collier" "stock")
"What is the name of the bus company serving the town?" "mobytours") ("What cartoon character is on the towel?" "snoopy")
( ("What is the last name of the author of EMACS?" "stallman")
"Give either of the two last names in the mailroom, other than your own." ("How many megabytes of memory is on the CPU board for the Vax?" "2")
"collier" "stock") ("Which street in town is named after a U.S. state?" "vermont")
( ("How many pounds did the weight weigh?" "ten" "10")
"What cartoon character is on the towel?" "snoopy") ("Name the STREET which runs right over the subway stop."
( "fourth" "4" "4th")
"What is the last name of the author of EMACS?" "stallman") ("How many corners are there in town (excluding the one with the Post Office)?"
( "24" "twentyfour" "twenty-four")
"How many megabytes of memory is on the CPU board for the Vax?" "2") ("What type of bear was hiding your key?" "grizzly")
( ("Name either of the two objects you found by digging."
"Which street in town is named after a U.S. state?" "vermont") "cpu" "card" "vax" "board" "platinum")
( ("What network protocol is used between pokey and gamma?"
"How many pounds did the weight weigh?" "ten" "10") "tcp/ip" "ip" "tcp")))
(
"Name the STREET which runs right over the subway stop." "fourth" "4" "4th")
(
"How many corners are there in town (excluding the one with the Post Office)?"
"24" "twentyfour" "twenty-four")
(
"What type of bear was hiding your key?" "grizzly")
(
"Name either of the two objects you found by digging." "cpu" "card" "vax"
"board" "platinum")
(
"What network protocol is used between pokey and gamma?" "tcp/ip" "ip" "tcp")
))
;;;; Mode definitions for interactive mode ;;;; Mode definitions for interactive mode
@ -2231,15 +2183,15 @@ for a moment, then straighten yourself up.
;;; Function which takes a verb and a list of other words. Calls proper ;;; Function which takes a verb and a list of other words. Calls proper
;;; function associated with the verb, and passes along the other words. ;;; function associated with the verb, and passes along the other words.
(defun dun-doverb (dun-ignore dun-verblist verb rest) (defun dun-doverb (ignore verblist verb rest)
(if (not verb) (if (not verb)
nil nil
(if (member (intern verb) dun-ignore) (if (member (intern verb) ignore)
(if (not (car rest)) -1 (if (not (car rest)) -1
(dun-doverb dun-ignore dun-verblist (car rest) (cdr rest))) (dun-doverb ignore verblist (car rest) (cdr rest)))
(if (not (cdr (assq (intern verb) dun-verblist))) -1 (if (not (cdr (assq (intern verb) verblist))) -1
(setq dun-numcmds (1+ dun-numcmds)) (setq dun-numcmds (1+ dun-numcmds))
(funcall (cdr (assq (intern verb) dun-verblist)) rest))))) (funcall (cdr (assq (intern verb) verblist)) rest)))))
;;; Function to take a string and change it into a list of lowercase words. ;;; Function to take a string and change it into a list of lowercase words.
@ -2291,15 +2243,15 @@ for a moment, then straighten yourself up.
;;; parse a line passed in as a string Call the proper verb with the ;;; parse a line passed in as a string Call the proper verb with the
;;; rest of the line passed in as a list. ;;; rest of the line passed in as a list.
(defun dun-vparse (dun-ignore dun-verblist line) (defun dun-vparse (ignore verblist line)
(dun-mprinc "\n") (dun-mprinc "\n")
(setq line-list (dun-listify-string (concat line " "))) (setq line-list (dun-listify-string (concat line " ")))
(dun-doverb dun-ignore dun-verblist (car line-list) (cdr line-list))) (dun-doverb ignore verblist (car line-list) (cdr line-list)))
(defun dun-parse2 (dun-ignore dun-verblist line) (defun dun-parse2 (ignore verblist line)
(dun-mprinc "\n") (dun-mprinc "\n")
(setq line-list (dun-listify-string2 (concat line " "))) (setq line-list (dun-listify-string2 (concat line " ")))
(dun-doverb dun-ignore dun-verblist (car line-list) (cdr line-list))) (dun-doverb ignore verblist (car line-list) (cdr line-list)))
;;; Read a line, in window mode ;;; Read a line, in window mode
@ -3263,13 +3215,13 @@ File not found")))
(send-string-to-terminal (prin1-to-string arg)) (send-string-to-terminal (prin1-to-string arg))
(send-string-to-terminal "\n"))) (send-string-to-terminal "\n")))
(defun dun-batch-parse (dun-ignore dun-verblist line) (defun dun-batch-parse (ignore verblist line)
(setq line-list (dun-listify-string (concat line " "))) (setq line-list (dun-listify-string (concat line " ")))
(dun-doverb dun-ignore dun-verblist (car line-list) (cdr line-list))) (dun-doverb ignore verblist (car line-list) (cdr line-list)))
(defun dun-batch-parse2 (dun-ignore dun-verblist line) (defun dun-batch-parse2 (ignore verblist line)
(setq line-list (dun-listify-string2 (concat line " "))) (setq line-list (dun-listify-string2 (concat line " ")))
(dun-doverb dun-ignore dun-verblist (car line-list) (cdr line-list))) (dun-doverb ignore verblist (car line-list) (cdr line-list)))
(defun dun-batch-read-line () (defun dun-batch-read-line ()
(read-from-minibuffer "" nil dungeon-batch-map)) (read-from-minibuffer "" nil dungeon-batch-map))