Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Zork to address issue with bad message when opening non-functional windows #2257

Merged
merged 3 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 82 additions & 8 deletions build/zork.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,86 @@ respond "*" ":link sys1;ts zork, sys; ts rbye\r"

mkdir "cfs"

respond "*" ":xxfile lcf;comp log_lcf;comp xxfile\r"
expect -timeout 6000 "Job XXFILE interrupted: .VALUE;"
type "\033p"
expect ":KILL"

respond "*" ":xxfile lcf;zork log_lcf;zork xxfile\r"
expect "Job XXFILE interrupted: .VALUE;"
type "\033p"
respond "*" ":pcomp\r"
respond "T" "<SNAME \"LCF\">"
respond "LCF" "<FILE-COMPILE \"prim >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<FILE-COMPILE \"defs >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<FILE-COMPILE \"util >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<FILE-COMPILE \"makstr >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<FILE-COMPILE \"typhak >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":assem \"lcf;tell >\" \"lcf;tell nbin\"\r"
respond "Is this assembly for TENEX?" "n"
respond ":KILL" ":pcomp\r"
respond "T" "<FLOAD \"lcf;comp preamb\">"
respond "DONE" "<FILE-COMPILE \"rooms >\">"
expect -timeout 900 "Job PCOMP wants the TTY"
type "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":pcomp\r"
respond "T" "<FLOAD \"lcf;comp preamb\">"
respond "DONE" "<FILE-COMPILE \"parser >\">"
expect -timeout 900 "Job PCOMP wants the TTY"
type "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":pcomp\r"
respond "T" "<FLOAD \"lcf;comp preamb\">"
respond "DONE" "<FILE-COMPILE \"act1 >\">"
expect -timeout 900 "Job PCOMP wants the TTY"
type "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":pcomp\r"
respond "T" "<FLOAD \"lcf;comp preamb\">"
respond "DONE" "<FILE-COMPILE \"act2 >\">"
expect -timeout 900 "Job PCOMP wants the TTY"
type "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":pcomp\r"
respond "T" "<FLOAD \"lcf;comp preamb\">"
respond "DONE" "<FILE-COMPILE \"act3 >\">"
expect -timeout 900 "Job PCOMP wants the TTY"
type "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<FILE-COMPILE \"act4 >\">"
expect -timeout 900 "Job PCOMP wants the TTY"
type "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":pcomp\r"
respond "T" "<FLOAD \"lcf;comp preamb\">"
respond "DONE" "<FILE-COMPILE \"melee >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<FILE-COMPILE \"sr >\">"
respond "Job PCOMP wants the TTY" "p"
respond "\"So you re-owned me, eh? I'm done anyway.\"" "<QUIT>"
respond ":KILL" ":mudsav;mud55\r"
respond "LISTENING-AT-LEVEL 1 PROCESS 1" "<BLOAT 150000 1 3 2000 30 9>"
type "<SNAME \"LCF\">"
respond "LCF" "<FLOAD \"prim nbin\">"
respond "\"DONE\"" "<FLOAD \"defs nbin\">"
respond "\"DONE\"" "<FLOAD \"util nbin\">"
respond "\"DONE\"" "<FLOAD \"makstr nbin\">"
respond "\"DONE\"" "<FLOAD \"typhak nbin\">"
respond "\"DONE\"" "<FLOAD \"rooms nbin\">"
respond "\"DONE\"" "<FLOAD \"parser nbin\">"
respond "\"DONE\"" "<FLOAD \"act1 nbin\">"
respond "\"DONE\"" "<FLOAD \"act2 nbin\">"
respond "\"DONE\"" "<FLOAD \"act3 nbin\">"
respond "\"DONE\"" "<FLOAD \"act4 nbin\">"
respond "\"DONE\"" "<FLOAD \"tell nbin\">"
respond "\"DONE\"" "<FLOAD \"melee nbin\">"
respond "\"DONE\"" "<FLOAD \"sr nbin\">"
respond "\"DONE\"" "<FLOAD \"dung\">"
respond "\"DONE\"" "<RSUBR-LINK <>>"
respond "T" "%%<HANDLER <GET ERROR!-INTERRUPTS INTERRUPT> ,ERRH>"
type "<SETG MUD-HAND <OFF <3 <GET ,INCHAN INTERRUPT>>>>"
respond "#HANDLER #SUBR" "%%<SETG ZORK-HAND <OFF <HANDLER <GET ,INCHAN INTERRUPT> ,CTRL-S>>>"
type "<SETG END-GAME-EXISTS? T>"
type "<GC-MON T>"
type "<PSETG WINNERS '\[\"EJS\", \"TAA\"\]>"
type "<SAVE-IT \"cfs;madadv save\" <>>"
type "<QUIT>"
expect ":KILL"
5 changes: 5 additions & 0 deletions src/lcf/act1.255 → src/lcf/act1.256
Original file line number Diff line number Diff line change
Expand Up @@ -1661,6 +1661,11 @@ probably).">
(<VERB? "MUNG">
<TELL <PICK-ONE ,DOORMUNGS>>)>>

<DEFINE DWIND-FUNCTION ()
<COND (<VERB? "OPEN">
<TELL
"The window cannot be opened.">)>>

<DEFINE PUMPER ("AUX" (P <SFIND-OBJ "PUMP">))
<COND (<OR <IN-ROOM? .P>
<MEMQ .P <AOBJS ,WINNER>>>
Expand Down
6 changes: 6 additions & 0 deletions src/lcf/comp.xxfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

:vk
R
:pcomp
<SNAME "LCF">
Expand Down Expand Up @@ -37,6 +39,10 @@ n
<FILE-COMPILE "act1 >">
p
J
<QUIT>
:pcomp
<FLOAD "lcf;comp preamb">
J
<FILE-COMPILE "act2 >">
p
J
Expand Down
8 changes: 4 additions & 4 deletions src/lcf/dung.355 → src/lcf/dung.356
Original file line number Diff line number Diff line change
Expand Up @@ -1509,11 +1509,11 @@ threat to his livelihood."]]!]>
WATER-FUNCTION>

<GOBJECT DWINDOW
["WINDO"]
["DWIND" "WINDO"]
[]
"window"
,OVISON
<>>
DWIND-FUNCTION>

\

Expand Down Expand Up @@ -1597,7 +1597,7 @@ and all the windows are barred."
"North of House"
<EXIT "WEST" "WHOUS" "EAST" "EHOUS" "NORTH" "FORE3"
"SOUTH" #NEXIT "The windows are all barred.">
()
(<GET-OBJ "DWIND">)
<>
<+ ,RLANDBIT ,RLIGHTBIT ,RNWALLBIT ,RSACREDBIT>
(RGLOBAL <+ ,DWINDOW ,HOUSEBIT>)>
Expand All @@ -1608,7 +1608,7 @@ and all the windows are barred."
"South of House"
<EXIT "WEST" "WHOUS" "EAST" "EHOUS" "SOUTH" "FORE2"
"NORTH" #NEXIT "The windows are all barred.">
()
(<GET-OBJ "DWIND">)
<>
<+ ,RLANDBIT ,RLIGHTBIT ,RNWALLBIT ,RSACREDBIT>
(RGLOBAL <+ ,DWINDOW ,HOUSEBIT>)>
Expand Down
2 changes: 2 additions & 0 deletions src/lcf/zork.xxfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

:vk
R
:mudsav;mud55
<BLOAT 150000 1 3 2000 30 9>
Expand Down