From 1b054ff99da97957629b8543bb5da4ade209e327 Mon Sep 17 00:00:00 2001
From: Eric Swenson <eric@swenson.org>
Date: Sat, 18 Nov 2023 10:52:38 -0800
Subject: [PATCH 1/3] Don't use XXFILE to build Zork.

Updated zork.tcl to no longer use XXFILE to either compile or
load/save zork.

XXFILE seems too brittle and doesn't function consistently.
---
 build/zork.tcl | 90 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 8 deletions(-)

diff --git a/build/zork.tcl b/build/zork.tcl
index 3b5c325c3..bc26fc391 100644
--- a/build/zork.tcl
+++ b/build/zork.tcl
@@ -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"

From 6be9aecc7270fa3c8c7067ebbaf0ab335db878a3 Mon Sep 17 00:00:00 2001
From: Eric Swenson <eric@swenson.org>
Date: Sat, 18 Nov 2023 10:52:38 -0800
Subject: [PATCH 2/3] Updated lcf/comp.xxfile so that it doesn't fail during
 ACT2 build.

Seems the occasional failures during zork build can be mitigated by
breaking up some of the compiles into separate jobs.
---
 src/lcf/comp.xxfile | 6 ++++++
 src/lcf/zork.xxfile | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/lcf/comp.xxfile b/src/lcf/comp.xxfile
index c2622a8c6..590057b03 100644
--- a/src/lcf/comp.xxfile
+++ b/src/lcf/comp.xxfile
@@ -1,3 +1,5 @@
+ 
+:vk
 R
 :pcomp
 <SNAME "LCF">
@@ -37,6 +39,10 @@ n
 <FILE-COMPILE "act1 >">
 p
 J
+<QUIT>
+:pcomp
+<FLOAD "lcf;comp preamb">
+J
 <FILE-COMPILE "act2 >">
 p
 J
diff --git a/src/lcf/zork.xxfile b/src/lcf/zork.xxfile
index 82bba6711..2389a0f4f 100644
--- a/src/lcf/zork.xxfile
+++ b/src/lcf/zork.xxfile
@@ -1,3 +1,5 @@
+ 
+:vk
 R
 :mudsav;mud55
 <BLOAT 150000 1 3 2000 30 9>

From 59156deff8ede068863b6ca8498d47f25fc95e69 Mon Sep 17 00:00:00 2001
From: Eric Swenson <eric@swenson.org>
Date: Sat, 18 Nov 2023 10:52:38 -0800
Subject: [PATCH 3/3] Fix Zork issue when opening non-functional windows.

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

Addresses this issue:  https://github.com/heasm66/mdlzork/issues/58
And this fix: https://github.com/heasm66/mdlzork/pull/59
---
 src/lcf/{act1.255 => act1.256} | 5 +++++
 src/lcf/{dung.355 => dung.356} | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename src/lcf/{act1.255 => act1.256} (99%)
 rename src/lcf/{dung.355 => dung.356} (99%)

diff --git a/src/lcf/act1.255 b/src/lcf/act1.256
similarity index 99%
rename from src/lcf/act1.255
rename to src/lcf/act1.256
index 1bd609f8e..521ad5f60 100644
--- a/src/lcf/act1.255
+++ b/src/lcf/act1.256
@@ -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>>>
diff --git a/src/lcf/dung.355 b/src/lcf/dung.356
similarity index 99%
rename from src/lcf/dung.355
rename to src/lcf/dung.356
index 26abd71e5..9317fdf48 100644
--- a/src/lcf/dung.355
+++ b/src/lcf/dung.356
@@ -1509,11 +1509,11 @@ threat to his livelihood."]]!]>
 	 WATER-FUNCTION>
 
 <GOBJECT DWINDOW
-	 ["WINDO"]
+	 ["DWIND" "WINDO"]
 	 []
 	 "window"
 	 ,OVISON
-	 <>>
+	 DWIND-FUNCTION>
 
 \
 
@@ -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>)>
@@ -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>)>