From ba0794eeb0b99cf6fa5ca4ac84f1a7044eb00443 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 9 Sep 2022 22:00:05 -0400
Subject: [PATCH] basic: add office picture

based on image posted by onedreamergame
---
 basic/appleiibot/Makefile     |  9 ++++++++-
 basic/appleiibot/elite.bas    | 11 ++++-------
 basic/appleiibot/elite.points | 32 ++++++++++++++----------------
 basic/appleiibot/make_boxes.c |  6 ++++--
 basic/appleiibot/office.bas   |  3 +++
 basic/appleiibot/office.boxes | 37 +++++++++++++++++++++++++++++++++++
 6 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 basic/appleiibot/office.bas
 create mode 100644 basic/appleiibot/office.boxes

diff --git a/basic/appleiibot/Makefile b/basic/appleiibot/Makefile
index d39ca36c..e09a791a 100644
--- a/basic/appleiibot/Makefile
+++ b/basic/appleiibot/Makefile
@@ -26,7 +26,7 @@ appleiibot.dsk:	E2.BAS FLAME.BAS FLAME2.BAS HELLO \
 	PARTICLE_HGR.BAS DIAMOND_SCROLL.BAS RANDOM_SCROLL.BAS STAR_BOUNCE.BAS\
 	OOZE.BAS HORIZ_STAR.BAS PLANET.BAS SECRET_COLLECT.BAS PLANET_GR.BAS \
 	BOXES.BAS SOLARIS.BAS SOLARIS2.BAS ASPLODE.BAS SOLARIS3.BAS \
-	TARGET.BAS ELITE.BAS MYSTERY.BAS
+	TARGET.BAS ELITE.BAS MYSTERY.BAS OFFICE.BAS
 	cp $(EMPTY_DISK)/empty_lots_of_dirents.dsk  appleiibot.dsk
 #	cp empty.dsk appleiibot.dsk
 #	$(DOS33) -y appleiibot.dsk BSAVE -a 0x0300 LOAD
@@ -139,6 +139,7 @@ appleiibot.dsk:	E2.BAS FLAME.BAS FLAME2.BAS HELLO \
 	$(DOS33) -y appleiibot.dsk SAVE A TARGET.BAS
 	$(DOS33) -y appleiibot.dsk SAVE A ELITE.BAS
 	$(DOS33) -y appleiibot.dsk SAVE A MYSTERY.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A OFFICE.BAS
 
 
 ####
@@ -781,6 +782,12 @@ MYSTERY.BAS:	mystery.bas
 	$(TOKENIZE) < mystery.bas > MYSTERY.BAS
 
 
+####
+
+OFFICE.BAS:	office.bas
+	$(TOKENIZE) < office.bas > OFFICE.BAS
+
+
 
 ####
 
diff --git a/basic/appleiibot/elite.bas b/basic/appleiibot/elite.bas
index d625f847..ac7d3e62 100644
--- a/basic/appleiibot/elite.bas
+++ b/basic/appleiibot/elite.bas
@@ -1,7 +1,4 @@
-0REM~*:B6S6l;`ALB5@):~B9B>I?I8B9~L8L?T>T:L8"~4-;8NEaNnPZ?L74-N5Y<kLnP~L7O6~Z?Y<~G=I9Q<NAG=~S=YBWFQCS=!
-1HGR:DEFFNP(X)=3*PEEK(2054+I+X)-99
-2IFFNP(0)=279THENHPLOTFNP(1),FNP(2):I=I+3
-6HPLOTTOFNP(0),FNP(1):I=I+2
-7IFFNP(0)=3THENHGR2:I=I+1
-8IFFNP(0)GOTO2
-9P=NOTP:POKE49236+P,0:?CHR$(7):GOTO9
+1HGR2:DEFFNP(X)=3*PEEK(2197+I+X)-99
+2IFI=0ORI=39THENPOKE230,32+32*P:P=NOTP:POKE49236+P,0:CALL-3086
+5IFFNP(0)=6THENHPLOTFNP(1),FNP(2):I=I+3
+6HPLOTTOFNP(0),FNP(1):I=(I+2)*(I<94):GOTO2"#*:B6S6l;`ALB5@):#B9B>I?I8B9#L8L?T>T:L8#4-;8NEaNnPZ?L74-N5Y<kLnP#L7O6#Z?Y<#G=I9Q<NAG=#S=YBWFQCS=
diff --git a/basic/appleiibot/elite.points b/basic/appleiibot/elite.points
index b40492fe..5283eaf3 100644
--- a/basic/appleiibot/elite.points
+++ b/basic/appleiibot/elite.points
@@ -1,21 +1,19 @@
 # 40
-#279	27	75	99	63	#  Ship1 body
-#	150	63			#  
-#	225	78			#  
-#	189	96			#  
-#	129	99			#  
-#	60	93			#
-#	26	75			#
-#279	99	72	99	87	# Ship1 left thruster
-#	120	90
-#	120	69
-#	99	72
-#279	129	69	129	90	# Ship1 left thruster
-#	153	87
-#	153	75
-#	129	69
-#3
-
+279	27	75	99	63	#  Ship1 body
+	150	63			#  
+	225	78			#  
+	189	96			#  
+	129	99			#  
+	60	93			#
+	26	75			#
+279	99	72	99	87	# Ship1 left thruster
+	120	90
+	120	69
+	99	72
+279	129	69	129	90	# Ship1 left thruster
+	153	87
+	153	75
+	129	69
 # 56
 279	57	36	78	69	# ship 2 body
 	135	108
diff --git a/basic/appleiibot/make_boxes.c b/basic/appleiibot/make_boxes.c
index 4cdc8137..a7161f1d 100644
--- a/basic/appleiibot/make_boxes.c
+++ b/basic/appleiibot/make_boxes.c
@@ -19,8 +19,10 @@ int main(int argc, char **argv) {
 		ptr=fgets(buffer,1024,stdin);
 		if (ptr==NULL) break;
 
-		sscanf(buffer,"%d %d %d %d %d",
-			&color,&x1,&x2,&y1,&y2);
+		if (buffer[0]==';') continue;
+
+		if (sscanf(buffer,"%d %d %d %d %d",
+			&color,&x1,&x2,&y1,&y2)!=5) continue;
 
 		output[out_ptr]=color+add;
 		output[out_ptr+1]=x1+add;
diff --git a/basic/appleiibot/office.bas b/basic/appleiibot/office.bas
new file mode 100644
index 00000000..3ab38ad2
--- /dev/null
+++ b/basic/appleiibot/office.bas
@@ -0,0 +1,3 @@
+0REM##JJR*((*+*((.?*++(+***->*33'9*<<'=%,0(+%+1-A%49'A%=B'>#06:@)15;?#14AC&11AA&00BB#+,:A%++<<(,,?A(**EN(*/CC(49CC(99JN#=@<>%@@==+=?>>(=?<<(>@;;':::=';<990<<::
+1GR:POKE49234,0:DEFFNP(X)=PEEK(2054+I*5+X)-35:FORI=0TO30:COLOR=FNP(0):FORY=FNP(3)TOFNP(4):HLINFNP(1),FNP(2)ATY:NEXTY,I
+
diff --git a/basic/appleiibot/office.boxes b/basic/appleiibot/office.boxes
new file mode 100644
index 00000000..9022b181
--- /dev/null
+++ b/basic/appleiibot/office.boxes
@@ -0,0 +1,37 @@
+0	0	39	39	47	; 0
+7	5	5	7	8	; 1 left  x1 x2 y1 y2
+7	5	5	11	28	; 2 left
+7	8	8	5	8	; 3
+7	7	7	10	27	; 4
+7	16	16	4	22	; 5
+7	25	25	4	26	; 6
+2	9	13	5	8	; 7 left top
+2	8	14	10	30	; 8 left bottom
+2	17	22	4	30	; 9 center
+2	26	31	4	27	; 10 right
+0	13	19	23	29	; 11 screen
+6	14	18	24	28	; 12 screen	
+0	14	17	30	32	; 13 screen base
+3	14	14	30	30	; 14
+3	13	13	31	31	; 15
+0	8	9	23	30	; 16 coffee
+2	8	8	25	25	; 17 coffee
+5	9	9	28	30	; 18
+5	7	7	34	43	; 19 left leg
+5	7	12	32	32	; 20 table top
+5	17	22	32	32	; 21 table top
+5	22	22	39	43	; 22 right leg
+0	26	29	25	27	; 23 printer
+2	29	29	26	26	; 24
+8	26	28	27	27	; 25
+5	26	28	25	25	; 26
+5	27	29	24	24	; 27
+4	23	23	23	26	; 28 light
+4	24	25	22	22	; 29
+13	25	25	23	23	; 30 light
+
+;4	24	24	21	23	; 29 light
+;4	25	25	22	22	; 30 light
+;2	2	2	30	32	; 28 accent
+;15	2	2	36	36	; 29 accent
+