diff --git a/basic/appleiibot/Makefile b/basic/appleiibot/Makefile index 18fa28aa..03d088f3 100644 --- a/basic/appleiibot/Makefile +++ b/basic/appleiibot/Makefile @@ -19,7 +19,7 @@ appleiibot.dsk: E2.BAS FLAME.BAS FLAME2.BAS HELLO \ GATOR.BAS CURSOR.BAS STARGATE.BAS TUNNEL.BAS STARFIELD.BAS \ STAROOPS.BAS HGRSTARFIELD.BAS COOL_BOT.BAS WEB.BAS ORB.BAS \ FIREWORKS.BAS THINKING.BAS ARCS.BAS WIRE_HGR.BAS STATIC.BAS \ - OVAL.BAS OVAL_HGR.BAS + OVAL.BAS OVAL_HGR.BAS MOVING.BAS # cp $(EMPTY_DISK)/empty.dsk appleiibot.dsk cp empty.dsk appleiibot.dsk @@ -101,6 +101,7 @@ appleiibot.dsk: E2.BAS FLAME.BAS FLAME2.BAS HELLO \ $(DOS33) -y appleiibot.dsk SAVE A STATIC.BAS $(DOS33) -y appleiibot.dsk SAVE A OVAL.BAS $(DOS33) -y appleiibot.dsk SAVE A OVAL_HGR.BAS + $(DOS33) -y appleiibot.dsk SAVE A MOVING.BAS #### @@ -550,6 +551,11 @@ OVAL.BAS: oval.bas #### +MOVING.BAS: moving.bas + $(TOKENIZE) < moving.bas > MOVING.BAS + +#### + OVAL_HGR.BAS: oval_hgr.bas $(TOKENIZE) < oval_hgr.bas > OVAL_HGR.BAS diff --git a/basic/appleiibot/moving.bas b/basic/appleiibot/moving.bas new file mode 100644 index 00000000..9a285d59 --- /dev/null +++ b/basic/appleiibot/moving.bas @@ -0,0 +1,2 @@ +1FORI=0TO140:POKE1013+I,4*PEEK(2126+I)-204+(PEEK(2267+I/3)-35)/4^(I-INT(I/3)*3):NEXT +2&"/foL:Be;569e7W4>qM5\bO4=Q2EqY3KegilrZb;3o\aCE@lr\b3JVB*ZkX<9XLr\b3JQ3FLj8:4T`M.LW;^D3ESVD4M5j^j\^brbb\ke;f3UTEbAJThf^1[ah_]/0335657807918:7:;SW$@#@;$;*#,04M')'K/')'7YI;)'$C=Y7)']45MNU)*EG2 diff --git a/games/peasant/graphics_inside/Makefile b/games/peasant/graphics_inside/Makefile new file mode 100644 index 00000000..155ea10c --- /dev/null +++ b/games/peasant/graphics_inside/Makefile @@ -0,0 +1,77 @@ + +PNG2RLE = ../../../utils/gr-utils/png2rle +PNG2GR = ../../../utils/gr-utils/png2gr +PNG2HGR = ../../../utils/hgr-utils/png2hgr +LZSA = ~/research/lzsa/lzsa/lzsa +B2D = ../../../utils/bmp2dhr/b2d + +all: inside_graphics.inc \ + priority_inside.inc + +### + +inside_graphics.inc: \ + hidden_glen.lzsa inside_cottage.lzsa inside_nn.lzsa + echo "hidden_glen_lzsa: .incbin \"hidden_glen.lzsa\"" > inside_graphics.inc + echo "inside_cottage_lzsa: .incbin \"inside_cottage.lzsa\"" >> inside_graphics.inc + echo "inside_nn_lzsa: .incbin \"inside_nn.lzsa\"" >> inside_graphics.inc + +### + +hidden_glen.lzsa: hidden_glen.hgr + $(LZSA) -r -f2 hidden_glen.hgr hidden_glen.lzsa + +hidden_glen.hgr: hidden_glen.png + $(PNG2HGR) hidden_glen.png > hidden_glen.hgr + +### + +inside_cottage.lzsa: inside_cottage.hgr + $(LZSA) -r -f2 inside_cottage.hgr inside_cottage.lzsa + +inside_cottage.hgr: inside_cottage.png + $(PNG2HGR) inside_cottage.png > inside_cottage.hgr + +### + +inside_nn.lzsa: inside_nn.hgr + $(LZSA) -r -f2 inside_nn.hgr inside_nn.lzsa + +inside_nn.hgr: inside_nn.png + $(PNG2HGR) inside_nn.png > inside_nn.hgr + + + +### + +priority_inside.inc: \ + todo_priority.lzsa + echo "hidden_glen_priority_lzsa: .incbin \"todo_priority.lzsa\"" > priority_inside.inc + echo "inside_cottage_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_inside.inc + echo "inside_nn_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_inside.inc + + + +#### + +todo_priority.lzsa: todo_priority.gr + $(LZSA) -r -f2 todo_priority.gr todo_priority.lzsa + +todo_priority.gr: todo_priority.png + $(PNG2GR) todo_priority.png todo_priority.gr + +#### + +hidden_glen_priority.lzsa: hidden_glen_priority.gr + $(LZSA) -r -f2 hidden_glen_priority.gr hidden_glen_priority.lzsa + +hidden_glen_priority.gr: hidden_glen_priority.png + $(PNG2GR) hidden_glen_priority.png hidden_glen_priority.gr + + +#### + + +clean: + rm -f *~ inside_graphics.inc priority_inside.inc *.lzsa *.gr *.hgr + diff --git a/games/peasant/graphics_inside/hidden_glen.png b/games/peasant/graphics_inside/hidden_glen.png new file mode 100644 index 00000000..dd1c72bf Binary files /dev/null and b/games/peasant/graphics_inside/hidden_glen.png differ diff --git a/games/peasant/graphics_inside/inside_cottage.png b/games/peasant/graphics_inside/inside_cottage.png new file mode 100644 index 00000000..5b9eec71 Binary files /dev/null and b/games/peasant/graphics_inside/inside_cottage.png differ diff --git a/games/peasant/graphics_inside/inside_nn.png b/games/peasant/graphics_inside/inside_nn.png new file mode 100644 index 00000000..cfc61aef Binary files /dev/null and b/games/peasant/graphics_inside/inside_nn.png differ diff --git a/games/peasant/graphics_inside/todo_priority.png b/games/peasant/graphics_inside/todo_priority.png new file mode 100644 index 00000000..a2c6dff9 Binary files /dev/null and b/games/peasant/graphics_inside/todo_priority.png differ diff --git a/games/peasant/text/inside.inc b/games/peasant/text/inside.inc index 09623780..2dba7651 100644 --- a/games/peasant/text/inside.inc +++ b/games/peasant/text/inside.inc @@ -286,41 +286,82 @@ ;=================================== ; + look -.byte "This place could use some serious sprucing of the 'up' variety. There's a dresser over there and a broom kind of silhouetted all mysterious like.",0 +.byte "This place could use some",13 +.byte "serious sprucing of the",13 +.byte "'up' variety. There's a",13 +.byte "dresser over there and a",13 +.byte "broom kind of silhouetted",13 +.byte "all mysterious like.",0 ; + look broom -.byte "The broom is all black and artistic, implying perhaps that it is closer to the viewer's eye but unlit to avoid emphasis.",0 +.byte "The broom is all black and",13 +.byte "artistic, implying perhaps",13 +.byte "that it is closer to the",13 +.byte "viewer's eye but unlit to",13 +.byte "avoid emphasis.",0 ; + look drawer/dresser (closed) -.byte "This dresser needs a good wipe down with new Indenture(tm), the dust busting miracle spray.",0 -.byte "There is an especially enticing top drawer that is currently closed.",0 +.byte "This dresser needs a good",13 +.byte "wipe down with new",13 +.byte "Indenture(tm), the dust",13 +.byte "busting miracle spray.",13 +.byte "There is an especially enticing",13 +.byte "top drawer that is",13 +.byte "currently closed.",0 ; + look drawer/dresser (open) -.byte "This dresser needs a good wipe down with new Indenture(tm), the dust busting miracle spray.",0 -.byte "There is a drawer open and there are some brown lumpy clothes in it.",0 +.byte "This dresser needs a good",13 +.byte "wipe down with new",13 +.byte "Indenture(tm), the dust",13 +.byte "busting miracle spray.",13 +.byte "There is a drawer open and",13 ; actual game "openand" +.byte "there are some brown lumpy",13 +.byte "clothes in it.",0 ; + look drawer/dresser (after robe) -.byte "This dresser needs a good wipe down with new Indenture(tm), the dust busting miracle spray.",0 -.byte "There is a drawer open, but it's empty.",0 +.byte "This dresser needs a good",13 +.byte "wipe down with new",13 +.byte "Indenture(tm), the dust",13 +.byte "busting miracle spray.",13 +.byte "There is a drawer open, but",13 +.byte "it's empty.",0 ; + open drawer (it's closed, not taken) -.byte "There's a vintage peasant robe in there! Just like grampa used to wear.",0 +.byte "There's a vintage peasant",13 +.byte "robe in there! Just like",13 +.byte "grampa used to wear.",0 ; + open drawer (it's open) -.byte "Yeah, totally! Except it's already open you moron.",0 +.byte "Yeah, totally! Except it's",13 +.byte "already open you moron.",0 ; + open drawer (after getting robe and closing) -.byte "You already closed it, which was nice, and so we gave you some points. Let sleeping drawers lie.",0 +.byte "You already closed it,",13 +.byte "which was nice, and so we",13 +.byte "gave you some points. Let",13 +.byte "sleeping drawers lie.",0 ;+1 POINT ; + close drawer -.byte "Aww, how thoughtful and boring of you. Break into this peasant's home, steal his clothes, but remember to tidy up after yourself. You're a real saint.",0 +.byte "Aww, how thoughtful and",13 +.byte "boring of you. Break into",13 +.byte "this peasant's home, steal",13 +.byte "his clothes, but remember",13 +.byte "to tidy up after yourself.",13 +.byte "You're a real saint.",0 ; + close drawer (w/o taking robe) -.byte "Right, right. Wouldn't want to leave the robes out where any old guy trying to beat an adventure game could take them.",0 +.byte "Right, right. Wouldn't",13 +.byte "want to leave the robes out",13 +.byte "where any old guy trying to",13 +.byte "beat an adventure game",13 +.byte "could take them.",0 ; + close drawer (already closed) -.byte "A riddle: What can be closed that is already closed? (hint: not this drawer)",0 +.byte "A riddle: What can be",13 +.byte "closed that is already",13 +.byte "closed? (hint: not this",13 +.byte "drawer)",0 ; +10 points ; + get robe @@ -330,10 +371,23 @@ .byte "You still remember the time when you took them. Oh, the times have changed ... but the robes?",0 ; + get/take robe (drawer closed) -.byte "You reach into the closed drawer and nearly break your hand slamming it. Just like a bird on a pane of glass minus the blamelessness.",0 +.byte "You reach into the closed",13 +.byte "drawer and nearly break",13 +.byte "your hand slamming it. Just",13 +.byte "like a bird on a pane of",13 +.byte "glass minus the",13 +.byte "blamelessness.",0 ; + get/take drawer/dresser -.byte "You get a hernia from lifting it. -2 Movement points, -10 Constitution. Don't do that again.",0 +.byte "You get a hernia from",13 +.byte "lifting it. -2 Movement",13 +.byte "points, -10 Constitution.",13 +.byte "Don't do that again.",0 ; + get/take broom -.byte "No, no. The broom is in the foreground and you can't take things from the foreground. You don't see me all typing 'get browser window', do you?",0 +.byte "No, no. The broom is in the",13 +.byte "foreground and you can't",13 +.byte "take things from the",13 +.byte "foreground. You don't see",13 +.byte "me all typing ",34,"get",13 +.byte "computer monitor",34,", do you?",0 diff --git a/games/peasant/text/peasant4.inc b/games/peasant/text/peasant4.inc index 010e2027..ff345d50 100644 --- a/games/peasant/text/peasant4.inc +++ b/games/peasant/text/peasant4.inc @@ -24,7 +24,11 @@ ned_cottage_open_door_message: .byte "How? There's no knob.",0 ; + open door (after baby opens) -.byte "It's already open. Since this is an adventure game we're gonna proffer you adventure yourself on in there.",0 +.byte "It's already open. Since",13 +.byte "this is an adventure game",13 +.byte "we're gonna proffer you",13 +.byte "adventure yourself on in",13 +.byte "there.",0 ; + pull door ; + push door @@ -73,7 +77,11 @@ ned_cottage_look_hole_message: .byte "appears to be empty.",0 ; + look hole (after deploying baby) -.byte "There is no baby here, but there's an open door on the other side of the room. If you could only get to it somehow!",0 +.byte "There is no baby here, but",13 +.byte "there's an open door on the",13 +.byte "other side of the room. If",13 +.byte "you could only get to it",13 +.byte "somehow!",0 ; + look rock (before removing it) ned_cottage_look_rock_message: @@ -82,7 +90,9 @@ ned_cottage_look_rock_message: .byte "the cottage.",0 ; + look rock (after removing it) -.byte "Some jerk removed a loose stone from the back of the cottage.",0 +.byte "Some jerk removed a loose",13 +.byte "stone from the back of the",13 +.byte "cottage.",0 ; + get rock +2 POINTS ; + move rock @@ -121,8 +131,25 @@ ned_cottage_try_message: ;+5 POINTS ; + put baby into the hole .byte "Deploying Q-Baby...",0 -.byte "Way to go, baby! It got the cottage door opened and headed off to a new life. He becomes Valedictorian of his graduating class, goes to Scalding Lake State, gets a degree in Advanced Peasantry and lands a job at Thatch-Pro: building better cottages for a better tomorrow.",0 -.byte "You grow apart and the letters from him become fewer and fewer. He develops a severe mead problem and blames you for never being there.",0 + +.byte "Way to go, baby! It got the",13 +.byte "cottage door opened and",13 +.byte "headed off to a new life.",13 +.byte "He becomes Valedictorian",13 +.byte "of his graduating class,",13 +.byte "goes to Scalding Lake",13 +.byte "State, gets a degree in",13 +.byte "Advanced Peasantry and",13 +.byte "lands a job at Thatch-Pro:",13 +.byte "building better cottages",13 +.byte "for a better tomorrow.",0 + +.byte "You grow apart and the",13 +.byte "letters from him become",13 +.byte "fewer and fewer. He",13 +.byte "develops a severe mead",13 +.byte "problem and blames you for",13 +.byte "never being there.",0 ; + deploy/drop/use baby (before baby) ned_cottage_baby_before_message: @@ -134,13 +161,19 @@ ned_cottage_baby_before_message: .byte "Use the baby where? You haven't anywhere inconsiderate to stuff 'm.",0 ; + deploy/drop/use baby (after baby left) -.byte "Li'l P.B. has moved on, and the door seems to be open... I can't see why we'd go through this all over again.",0 +.byte "Li'l P.B. has moved on, and",13 +.byte "the door seems to be",13 +.byte "open... I can't see why",13 +.byte "we'd go through this all",13 +.byte "over again.",0 + ; + close door (before baby opens) .byte "Already done. That was",13 .byte "easy!",0 ; + close door (after baby opens) -.byte "You can't. That baby really wrenched it open good.",0 +.byte "You can't. That baby really",13 +.byte "wrenched it open good.",0 ;================= ; Wavy Tree (Ned)