move master Z files to separate folder, add Mini Zork 2 r15

Makefile

@@ -9,7 +9,8 @@
 # adapted by 4am on 2018-01-07
 #
 
-DISK=Pitch Dark.hdv
+BUILDDISK=build/Pitch Dark.hdv
+VOLUME=PITCH.DARK
 
 # third-party tools required to build
 # https://sourceforge.net/projects/acme-crossass/
@@ -39,45 +40,37 @@ asm: md
 	$(ACME) -r build/zinfo5u.lst src/zinfo/z5u/z5u.s
 
 dsk: md asm
-	cp res/"Pitch Dark.master games collection.do.not.edit.hdv" build/"$(DISK)"
+	cp res/blank.hdv "$(BUILDDISK)"
 	cp res/_FileInformation.txt build/
 	bin/fixFileInformation.sh build/_FileInformation.txt
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/GRUE.SYSTEM"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/ONBEYOND.SYSTEM"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/ZINFO.SYSTEM"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/PITCH.DARK"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "res/PITCH.DARK.CONF"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "res/GAMES.CONF"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "res/CREDITS.TXT"
-	$(CADIUS) CREATEFOLDER build/"$(DISK)" "/PITCH.DARK/LIB/"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ1"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ2"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ3"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ4"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ5"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ5U"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ZINFO1"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ZINFO2"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ZINFO3"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ZINFO4"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ZINFO5"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ZINFO5U"
+	$(CADIUS) CREATEFOLDER "$(BUILDDISK)" "/$(VOLUME)/Z/"
+	for f in res/Z/*; do \
+		$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/Z/$$(basename $$f)" "$$f"; \
+	done
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/" "res/HINTS"
+	for f in "build/GRUE.SYSTEM" "build/ONBEYOND.SYSTEM" "build/ZINFO.SYSTEM" "build/$(VOLUME)" "res/$(VOLUME).CONF" "res/GAMES.CONF" "res/CREDITS.TXT"; do \
+		$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/" "$$f"; \
+	done
+	$(CADIUS) CREATEFOLDER "$(BUILDDISK)" "/$(VOLUME)/LIB/"
+	for f in ONBEYONDZ1 ONBEYONDZ2 ONBEYONDZ3 ONBEYONDZ4 ONBEYONDZ5 ONBEYONDZ5U ZINFO1 ZINFO2 ZINFO3 ZINFO4 ZINFO5 ZINFO5U; do \
+		$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/LIB/" "build/$$f"; \
+	done
 	# sample save game files for development
-	#$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/Z/WISHBRINGER/" "res/R69.850920.SAV"
-	#$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/Z/ZORK.I/" "res/R88.840726.SAV"
+	#$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/Z/WISHBRINGER/" "res/R69.850920.SAV"
+	#$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/Z/ZORK.I/" "res/R88.840726.SAV"
 
 txt: dsk
-	mkdir -p build/text
+	mkdir -p build/TEXT
 	$(PY3) bin/textnormalize.py res/text/*
-	cd build && $(CADIUS) ADDFOLDER "$(DISK)" "/PITCH.DARK/TEXT" text
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/TEXT" build/TEXT
 
 artwork: dsk
-	$(CADIUS) ADDFOLDER build/"$(DISK)" "/PITCH.DARK/ARTWORK" "res/artwork"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/ARTWORK/" "res/DHRSLIDE.SYSTEM"
-	$(CADIUS) ADDFOLDER build/"$(DISK)" "/PITCH.DARK/ARTWORKGS" "res/artworkgs"
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/ARTWORK" "res/artwork"
+	$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/ARTWORK/" "res/DHRSLIDE.SYSTEM"
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/ARTWORKGS" "res/artworkgs"
 
 mount: dsk
-	osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii build/"$(DISK)"
+	osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii "$(BUILDDISK)"
 
 md:
 	mkdir -p build

bin/textnormalize.py

@@ -8,7 +8,7 @@ for f in sys.argv[1:]:
     with open(f) as buffer:
         lines = buffer.readlines()
     shortf = f.replace(".txt", "").replace("res/text/", "").upper()
-    newf = "build/text/" + shortf
+    newf = "build/TEXT/" + shortf
     fileinfo.append(shortf + "=Type(04),AuxType(0000),VersionCreate(70),MinVersion(BE),Access(C3)")
     with open(newf, 'w') as buffer:
         for l in lines:
@@ -22,5 +22,5 @@ for f in sys.argv[1:]:
                 linelength = 64
             elif l.startswith("[description]"):
                 linelength = 77
-with open("build/text/_FileInformation.txt", "w") as infobuff:
+with open("build/TEXT/_FileInformation.txt", "w") as infobuff:
     infobuff.write("\r\n".join(fileinfo))

res/CREDITS.TXT

@@ -0,0 +1 @@
+Pitch Dark is a frontend for exploring
and playing Infocom text adventures.

Release 6 / Serial number DEVELOP

Copyright 2018-2023 4am

https://github.com/a2-4am/pitch-dark

                   ~

On Beyond Z-Machine! is a ProDOS port
of Infocom's Z-Machine interpreters.

Copyright 2018-2023 qkumba

based on code from six different games
copyright 1979-1988 Infocom, Inc.

                   ~

WeeGUI is a compact, easy-to-use GUI
library for 8-bit Apple II computers.

Copyright 2014-2018 Quinn Dunki

https://github.com/blondie7575/WeeGUI/

                   ~

Artwork was scanned from original
retail boxes and converted to Apple II
native formats with the help of

Bmp2DHR copyright 2014 Bill Buckels
A2FCBmp copyright 2012-5 Bill Buckels
buckshot copyright 2017 Dagen Brock
ii-pix copyright 2021-3 Kris Kennaway

https://www.appleoldies.ca/bmp2dhr/
https://apple2.gs/buckshot/
https://github.com/KrisKennaway/ii-pix

                   ~

The PRIZM Project (Pretty Reliable
Invisiclues for Z-Machine) are genuine
Infocom Invisiclues, accessible in
your favorite Z-Machine interpreter.

Copyright 1999 Digby McWiggle and
Steven Marsh

Compiled, edited, and Z-coded by Digby
McWiggle and Steven Marsh from material
supplied by Henrik Dittmann, Paul David
Doherty, Volker Blasius, and Mike
Threepoint

Thanks also to Brian Hall, L. Ross
Raszewski, and Graham Nelson

http://www.waitingforgo.com/ (offline)

                   ~

Games, descriptions, and artwork are
copyright 1979-1988 Infocom, Inc.

Invisiclues are copyright 1993, 1999
Activision, Inc.

Zork and all other game names are
registered trademarks of Activision.

                 [EOF]

res/PITCH.DARK.CONF

@@ -1 +1 @@
-# Pitch Dark preferences file
# Do not edit by hand.
# Or do. I'm a comment, not a cop.

# value=0|1
FORCE40COLUMNS=0
FORCEUPPERCASE=0
SCRIPTTOFILE=0
AUTOSCRIPT=0

# value=game directory
LASTPLAYED=ZORK.I

# key=game directory, value=filename of selected version
AMFV=R79.DEPROT.Z4
BALLYHOO=R99.861014.Z3
BEYOND.ZORK=R60.880610.Z5
BORDER.ZONE=R9.871008.Z5
BUREAUCRACY=R160.DEPROT.Z4
CUTTHROATS=R25.DEPROT.Z3
DEADLINE=R28.850129.Z3
ENCHANTER=R29.860820.Z3
HGTTG=R60.861002.Z3
HOLLYWOOD=R37.861215.Z3
INFIDEL=R22.830916.Z3
LGOP=R59.860730.Z3
LURKING.HORROR=R221.DEPROT.Z3
MINI.ZORK=R34.871124.Z3
MINI.ZORK.2=R2.871123.Z3
MOONMIST=R13.880501.Z3
NORD.AND.BERT=R20.870722.Z4
PLANETFALL=R42.190616.Z5
PLUNDERED=R26.870730.Z3
SEASTALKER=R18.850919.Z3
SHERLOCK=R4.880324.Z5
SORCERER=R18.DEPROT.Z3
SPELLBREAKER=R87.DEPROT.Z3
STARCROSS=R18.DEPROT.Z3
STATIONFALL=R107.DEPROT.Z3
SUSPECT=R18.850222.Z3
SUSPENDED=R8.830521.Z3
TRINITY=R15.870628.Z4
WISHBRINGER=R69.850920.Z3
WITNESS=R23.840925.Z3
ZORK.I=R119.880429.Z3
ZORK.II=R48.840904.Z3
ZORK.III=R25.860811.Z3
ZORK.ZERO=R153.880510.Z5
ZTUU=R16.970828.Z5

[eof]
+# Pitch Dark preferences file
# Do not edit by hand.
# Or do. I'm a comment, not a cop.

# value=0|1
FORCE40COLUMNS=0
FORCEUPPERCASE=0
SCRIPTTOFILE=0
AUTOSCRIPT=0

# value=game directory
LASTPLAYED=ZORK.I

# key=game directory, value=filename of selected version
AMFV=R79.DEPROT.Z4
BALLYHOO=R99.861014.Z3
BEYOND.ZORK=R60.880610.Z5
BORDER.ZONE=R9.871008.Z5
BUREAUCRACY=R160.DEPROT.Z4
CUTTHROATS=R25.DEPROT.Z3
DEADLINE=R28.850129.Z3
ENCHANTER=R29.860820.Z3
HGTTG=R60.861002.Z3
HOLLYWOOD=R37.861215.Z3
INFIDEL=R22.830916.Z3
LGOP=R59.860730.Z3
LURKING.HORROR=R221.DEPROT.Z3
MINI.ZORK=R34.871124.Z3
MINI.ZORK.2=R15.210307.Z3
MOONMIST=R13.880501.Z3
NORD.AND.BERT=R20.870722.Z4
PLANETFALL=R42.190616.Z5
PLUNDERED=R26.870730.Z3
SEASTALKER=R18.850919.Z3
SHERLOCK=R4.880324.Z5
SORCERER=R18.DEPROT.Z3
SPELLBREAKER=R87.DEPROT.Z3
STARCROSS=R18.DEPROT.Z3
STATIONFALL=R107.DEPROT.Z3
SUSPECT=R18.850222.Z3
SUSPENDED=R8.830521.Z3
TRINITY=R15.870628.Z4
WISHBRINGER=R69.850920.Z3
WITNESS=R23.840925.Z3
ZORK.I=R119.880429.Z3
ZORK.II=R48.840904.Z3
ZORK.III=R25.860811.Z3
ZORK.ZERO=R153.880510.Z5
ZTUU=R16.970828.Z5

[eof]