Apple-2-SW
/
dos33fsprogs
mirror of https://github.com/deater/dos33fsprogs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

peasant: split off inventory code 

put in language card?
This commit is contained in:
Vince Weaver 2021-10-17 00:41:52 -04:00
parent ca018ebd00
commit 929c8e50c3
14 changed files with 143 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
games/peasant/Makefile
View File

@ -5,12 +5,13 @@ DOS33_RAW = ../../utils/dos33fs-utils/dos33_raw
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
LINKER_SCRIPTS = ../../linker_scripts
EMPTY_DISK = ../../empty_disk
LZSA = ~/research/lzsa/lzsa/lzsa
all: peasant.dsk peasant_side2.dsk
peasant.dsk: QBOOT QLOAD VID_LOGO TITLE INTRO \
PEASANT1 PEASANT2 PEASANT3 PEASANT4 ENDING TROGDOR \
SAVE1 SAVE2 SAVE3 MUSIC
SAVE1 SAVE2 SAVE3 MUSIC INVENTORY
cp $(EMPTY_DISK)/empty.dsk peasant.dsk
$(DOS33_RAW) peasant.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) peasant.dsk 0 2 QBOOT 1 1
@ -132,6 +133,22 @@ music.inc: generate_common MUSIC
./generate_common -a 0xd000 -s done_pt3_irq_handler music.lst >> music.inc
./generate_common -a 0xd000 -s PT3_LOC music.lst >> music.inc
###
inventory.inc: generate_common INVENTORY
./generate_common -a 0xd000 -s show_inventory inventory.lst > inventory.inc
###
INVENTORY: inventory.o
ld65 -o INVENTORY inventory.o -C $(LINKER_SCRIPTS)/apple2_d000.inc
inventory.o: inventory.s \
sprites/inventory_sprites.inc \
hgr_2x16_sprite.s
ca65 -o inventory.o inventory.s -l inventory.lst
###
VID_LOGO: vid_logo.o
@ -194,7 +211,7 @@ music.o: music.s zp.inc \
CLIFF: cliff.o
ld65 -o CLIFF cliff.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
cliff.o: cliff.s zp.inc \
cliff.o: cliff.s zp.inc inventory.inc \
graphics_cliff/cliff_graphics.inc sprites/peasant_sprites.inc \
graphics_cliff/priority_cliff.inc \
draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
@ -228,7 +245,7 @@ game_over.o: game_over.s zp.inc \
PEASANT1: peasant1.o
ld65 -o PEASANT1 peasant1.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
peasant1.o: peasant1.s zp.inc \
peasant1.o: peasant1.s zp.inc inventory.inc \
sprites/peasant_sprites.inc sprites/inventory_sprites.inc \
graphics_peasantry/graphics_peasant1.inc \
graphics_peasantry/priority_peasant1.inc \
@ -244,7 +261,7 @@ peasant1.o: peasant1.s zp.inc \
PEASANT2: peasant2.o
ld65 -o PEASANT2 peasant2.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
peasant2.o: peasant2.s zp.inc \
peasant2.o: peasant2.s zp.inc inventory.inc \
graphics_peasantry/graphics_peasant2.inc sprites/peasant_sprites.inc \
graphics_peasantry/priority_peasant2.inc \
sprites/inventory_sprites.inc \
@ -260,7 +277,7 @@ peasant2.o: peasant2.s zp.inc \
PEASANT3: peasant3.o
ld65 -o PEASANT3 peasant3.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
peasant3.o: peasant3.s zp.inc \
peasant3.o: peasant3.s zp.inc inventory.inc \
graphics_peasantry/graphics_peasant3.inc sprites/peasant_sprites.inc \
graphics_peasantry/priority_peasant3.inc \
draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
@ -275,7 +292,7 @@ peasant3.o: peasant3.s zp.inc \
PEASANT4: peasant4.o
ld65 -o PEASANT4 peasant4.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
peasant4.o: peasant4.s zp.inc \
peasant4.o: peasant4.s zp.inc inventory.inc \
graphics_peasantry/graphics_peasant4.inc sprites/peasant_sprites.inc \
graphics_peasantry/priority_peasant4.inc \
draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
@ -358,11 +375,74 @@ save3.o: save3.s
###
dialog_test: dialog_test.o
ld65 -o dialog_test dialog_test.o -C ../../linker_scripts/apple2_6000.inc
DIALOG_PEASANT1.LZSA: dialog_peasant1
$(LZSA) -r -f2 dialog_peasant1 DIALOG_PEASANT1.LZSA
dialog_peasant1: dialog_peasant1.o
ld65 -o dialog_peasant1 dialog_peasant1.o -C ../../linker_scripts/apple2_6000.inc
dialog_peasant1.o: dialog_peasant1.s
ca65 -o dialog_peasant1.o dialog_peasant1.s -l dialog_peasant1.lst
###
DIALOG_PEASANT2.LZSA: dialog_peasant2
$(LZSA) -r -f2 dialog_peasant2 DIALOG_PEASANT2.LZSA
dialog_peasant2: dialog_peasant2.o
ld65 -o dialog_peasant2 dialog_peasant2.o -C ../../linker_scripts/apple2_6000.inc
dialog_peasant2.o: dialog_peasant2.s
ca65 -o dialog_peasant2.o dialog_peasant2.s -l dialog_peasant2.lst
###
DIALOG_PEASANT3.LZSA: dialog_peasant3
$(LZSA) -r -f2 dialog_peasant3 DIALOG_PEASANT3.LZSA
dialog_peasant3: dialog_peasant3.o
ld65 -o dialog_peasant3 dialog_peasant3.o -C ../../linker_scripts/apple2_6000.inc
dialog_peasant3.o: dialog_peasant3.s
ca65 -o dialog_peasant3.o dialog_peasant3.s -l dialog_peasant3.lst
###
DIALOG_PEASANT4.LZSA: dialog_peasant4
$(LZSA) -r -f2 dialog_peasant4 DIALOG_PEASANT4.LZSA
dialog_peasant4: dialog_peasant4.o
ld65 -o dialog_peasant4 dialog_peasant4.o -C ../../linker_scripts/apple2_6000.inc
dialog_peasant4.o: dialog_peasant4.s
ca65 -o dialog_peasant4.o dialog_peasant4.s -l dialog_peasant4.lst
###
DIALOG_INSIDE.LZSA: dialog_inside
$(LZSA) -r -f2 dialog_inside DIALOG_INSIDE.LZSA
dialog_inside: dialog_inside.o
ld65 -o dialog_inside dialog_inside.o -C ../../linker_scripts/apple2_6000.inc
dialog_inside.o: dialog_inside.s
ca65 -o dialog_inside.o dialog_inside.s -l dialog_inside.lst
###
DIALOG_CLIFF.LZSA: dialog_cliff
$(LZSA) -r -f2 dialog_cliff DIALOG_CLIFF.LZSA
dialog_cliff: dialog_cliff.o
ld65 -o dialog_cliff dialog_cliff.o -C ../../linker_scripts/apple2_6000.inc
dialog_cliff.o: dialog_cliff.s
ca65 -o dialog_cliff.o dialog_cliff.s -l dialog_cliff.lst
dialog_test.o: dialog_test.s
ca65 -o dialog_test.o dialog_test.s -l dialog_test.lst
####

19
games/peasant/NOTES
View File

@ -1,3 +1,21 @@
Dialog issues:
Uncompressed LZSA
DIALOG_PEASANT1 7394 4002
DIALOG_PEASANT2 6857 3943
DIALOG_PEASANT3 5809 3411
DIALOG_PEASANT4 6900 3851
DIALOG_CLIFF 4768 2825
DIALOG_INSIDE 10832 5741
Inventory:
3CEE - 4a5f = D71 = 3441 bytes
Common parser:
4ac - 11af = D03 3331 bytes
peasant2 18302
18043 (decompress fast moved)
15899 (much of hgr code moved to qload)
@ -7,6 +25,7 @@ peasant2 18302
19577 -- at release 0.75
19944 -- after all priorities added
20050 -- parse lookup table
20493 -- more parse code
partial save, can we fit in 4k?
102 lines ; inventory was 115?

4
games/peasant/cliff.s
View File

@ -10,7 +10,7 @@ WHICH_PEASANTRY=0
.include "zp.inc"
.include "qload.inc"
.include "inventory.inc"
cliff_base:
lda #0
@ -151,7 +151,7 @@ game_over:
.include "parse_input.s"
.include "inventory.s"
;.include "inventory.s"
.include "score.s"

4
games/peasant/inventory.s
View File

@ -1,4 +1,6 @@
; note this is around 2k
.include "zp.inc"
.include "hardware.inc"
.include "qload.inc"
;=====================
; show inventory

4
games/peasant/peasant1.s
View File

@ -13,7 +13,7 @@ WHICH_PEASANTRY = 0
.include "zp.inc"
.include "qload.inc"
.include "inventory.inc"
peasant_quest:
lda #0
@ -154,7 +154,7 @@ game_over:
.include "parse_input.s"
.include "inventory.s"
;.include "inventory.s"
.include "score.s"

4
games/peasant/peasant2.s
View File

@ -15,7 +15,7 @@ WHICH_PEASANTRY=1
.include "zp.inc"
.include "qload.inc"
.include "inventory.inc"
peasant_quest:
lda #0
@ -192,7 +192,7 @@ to_left:
.include "version.inc"
.include "inventory.s"
;.include "inventory.s"
.include "loadsave_menu.s"

4
games/peasant/peasant3.s
View File

@ -14,7 +14,7 @@ WHICH_PEASANTRY = 2
.include "zp.inc"
.include "qload.inc"
.include "inventory.inc"
peasant_quest:
lda #0
@ -166,7 +166,7 @@ game_over:
.include "parse_input.s"
.include "inventory.s"
;.include "inventory.s"
.include "keyboard.s"

4
games/peasant/peasant4.s
View File

@ -14,7 +14,7 @@ WHICH_PEASANTRY = 3
.include "zp.inc"
.include "qload.inc"
.include "inventory.inc"
peasant_quest:
lda #0
@ -174,7 +174,7 @@ game_over:
.include "parse_input.s"
.include "inventory.s"
;.include "inventory.s"
.include "keyboard.s"

5
games/peasant/text/inside.inc
View File

@ -6,6 +6,8 @@
.byte "Hopefully this guy will have some sense and not shoot you.",0
; {Dongolev shoots you in the head}
.byte "That guy has no sense. He shot you. Dumb, dumb, dumb. Nice one, William Tell. You dead. Thanks for playing.",0
; +3 points
; + haldo
.byte "the archer stops arching and turns to you. ",34,"My brother told you to tell me haldo? He must want to start the old business back up!",34,0
@ -42,6 +44,7 @@
; + climb/jump fence
.byte "Not going to dignify that with a response.",0
; + 2 points
; + get arrow
.byte "You pick out a really good one and yank it from the tree. Hooray! Now you have an arrow!",0
@ -133,7 +136,7 @@
; + talk lady (after she's gone)
.byte "You'd call out her name and let it ring through the empty room, enveloping you in sorrow, but you don't actually know her name.",0
; 1 PT!
; +1 POINT!
; + get/take/steal chicken feed [walks you to it]
.byte "You used to eat this stuff",13
.byte "like crazy when you were a",13

2
games/peasant/text/peasant1.inc
View File

@ -20,6 +20,7 @@
; + look stump
.byte "You run out of ideas as to what to do next, and stare at the stump.",0
; +2 POINTS
; + wear mask
.byte "You slip on the hideous monster maskus.",0
.byte "You scared the crap outta Poor Gary! He broke on through to the other side!",0
@ -93,6 +94,7 @@
; + look tree
.byte "That's one orange tree alright.",0
; +2 POINTS
; + put pebbles in bucket
.byte "You plunk all your pebbles into the bucket. The weight causes it to descend to the bottom of the well with a quickness!",0

1
games/peasant/text/peasant2.inc
View File

@ -114,6 +114,7 @@
.byte "It says 'archery' on it. My",13
.byte "wife's drunk.",0
; POINTS +2
; + talk man (you walk over) [ note, did verify the quotes here]
.byte 34,"Oh, hi. I'm Mendelev,",34,13
.byte "says the archer. ",34,"I used to",13

4
games/peasant/text/peasant3.inc
View File

@ -173,7 +173,7 @@
; + get berries
.byte "NO MAN! JEEZ!",0
; + get stones
; + get stones ; +1 POINT
; + get pebbles
.byte "You grab up a handful of",13
.byte "fairly substantial",13
@ -262,7 +262,7 @@
.byte "center of the lake. Looks",13
.byte "deeper there.",0
; 1PT!
; +2 points
; + throw chicken feed
.byte "You toss the feed into the",13
.byte "lake. You shed a tear for",13

1
games/peasant/text/peasant4.inc
View File

@ -214,6 +214,7 @@
.byte "squished berries, cuz hey:",13
.byte "jackpot!",0
; +2 POINTS
; + get berries (fourth bush)
.byte "You reach into the bush to",13
.byte "snag you some berries but",13

12
graphics/gr/plasma/Makefile
View File

@ -10,7 +10,7 @@ all: plasma.dsk
plasma.dsk: HELLO PLASMA PLASMA2 \
DIAMONDS STATIC STATIC_BOT \
PLASMA_128 PLASMA_TINY PLASMA_BOT WIRES WIRES_BOT \
SMALLCIRCS STAR OVAL
SMALLCIRCS STAR OVAL OVAL_BOT
cp $(EMPTYDISK) plasma.dsk
$(DOS33) -y plasma.dsk SAVE A HELLO
$(DOS33) -y plasma.dsk BSAVE -a 0x70 PLASMA
@ -26,6 +26,7 @@ plasma.dsk: HELLO PLASMA PLASMA2 \
$(DOS33) -y plasma.dsk BSAVE -a 0xc00 SMALLCIRCS
$(DOS33) -y plasma.dsk BSAVE -a 0xc00 STAR
$(DOS33) -y plasma.dsk BSAVE -a 0xc00 OVAL
$(DOS33) -y plasma.dsk BSAVE -a 0x375 OVAL_BOT
###
@ -73,6 +74,15 @@ OVAL: oval.o
oval.o: oval.s
ca65 -o oval.o oval.s -l oval.lst
###
OVAL_BOT: oval_bot.o
ld65 -o OVAL_BOT oval_bot.o -C $(LINKERSCRIPTS)/apple2_375.inc
oval_bot.o: oval_bot.s
ca65 -o oval_bot.o oval_bot.s -l oval_bot.lst
###