From d5491050bcb9c4a593bed8816c4c7874707f81d8 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 6 Oct 2024 11:22:50 -0400 Subject: [PATCH] peasant: cliff_heights: can at least walk around now --- games/peasant/cliff_heights/cliff_actions.s | 59 +---------------- games/peasant/cliff_heights/cliff_heights.s | 14 ++++ .../cliff_heights/graphics_cliff/Makefile | 60 +++++++++--------- .../cliff_heights_collision.png | Bin 0 -> 8037 bytes .../graphics_cliff/cliff_heights_priority.png | Bin 8037 -> 6928 bytes .../graphics_cliff/outer_collision.png | Bin 0 -> 1044 bytes .../graphics_cliff/outer_priority.png | Bin 1044 -> 7574 bytes 7 files changed, 46 insertions(+), 87 deletions(-) create mode 100644 games/peasant/cliff_heights/graphics_cliff/cliff_heights_collision.png create mode 100644 games/peasant/cliff_heights/graphics_cliff/outer_collision.png diff --git a/games/peasant/cliff_heights/cliff_actions.s b/games/peasant/cliff_heights/cliff_actions.s index 9107d1f9..9f946dd2 100644 --- a/games/peasant/cliff_heights/cliff_actions.s +++ b/games/peasant/cliff_heights/cliff_actions.s @@ -1,62 +1,5 @@ .include "../tokens.inc" - ;======================= - ;======================= - ;======================= - ; cliff base - ;======================= - ;======================= - ;======================= - -cliff_base_verb_table: - .byte VERB_LOOK - .word cliff_base_look-1 - .byte VERB_CLIMB - .word cliff_base_climb-1 - .byte 0 - - ;================= - ; look - ;================= - -cliff_base_look: - - lda CURRENT_NOUN - cmp #NOUN_NONE - beq cliff_base_look_at - - jmp parse_common_look - -cliff_base_look_at: - ldx #cliff_base_look_message - jmp finish_parse_message - - - ;================= - ; climb - ;================= - -cliff_base_climb: - - lda CURRENT_NOUN - cmp #NOUN_CLIFF - beq cliff_base_do_climb - cmp #NOUN_NONE - beq cliff_base_do_climb - - jmp parse_common_unknown - -cliff_base_do_climb: - ldx #cliff_base_climb_message - jsr partial_message_step - - ldx #cliff_base_climb2_message - jmp finish_parse_message - - ;======================= ;======================= ;======================= @@ -247,4 +190,4 @@ cave_outer_do_climb: -.include "../dialog_cliff.inc" +.include "../text/dialog_cliff_heights.inc" diff --git a/games/peasant/cliff_heights/cliff_heights.s b/games/peasant/cliff_heights/cliff_heights.s index 493c9afa..1b9cecee 100644 --- a/games/peasant/cliff_heights/cliff_heights.s +++ b/games/peasant/cliff_heights/cliff_heights.s @@ -43,6 +43,20 @@ cliff_heights: jsr update_score + + ; FIXME! + ; only set this if just arrived, not if loading saved game + + lda #14 + sta PEASANT_X + lda #150 + sta PEASANT_Y + + lda #0 + sta PEASANT_XADD + sta PEASANT_YADD + + ;============================= ;============================= ; new screen location diff --git a/games/peasant/cliff_heights/graphics_cliff/Makefile b/games/peasant/cliff_heights/graphics_cliff/Makefile index 4e195f58..54d77028 100644 --- a/games/peasant/cliff_heights/graphics_cliff/Makefile +++ b/games/peasant/cliff_heights/graphics_cliff/Makefile @@ -1,7 +1,7 @@ - PNG2GR = ../../../../utils/gr-utils/png2gr PNG2HGR = ../../../../utils/hgr-utils/png2hgr ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG2COLLISION = ../../../../utils/gr-utils/png2collision all: cliff_graphics.inc \ priority_cliff.inc @@ -15,6 +15,14 @@ cliff_graphics.inc: \ ### +priority_cliff.inc: \ + cliff_heights_priority.zx02 \ + outer_priority.zx02 + echo "cliff_heights_priority_zx02: .incbin \"cliff_heights_priority.zx02\"" >> priority_cliff.inc + echo "outer_priority_zx02: .incbin \"outer_priority.zx02\"" >> priority_cliff.inc + +### + cliff_heights.zx02: cliff_heights.hgr $(ZX02) -f cliff_heights.hgr cliff_heights.zx02 @@ -29,41 +37,35 @@ outer.zx02: outer.hgr outer.hgr: outer.png $(PNG2HGR) outer.png > outer.hgr - - -### - -priority_cliff.inc: \ - outer_priority.zx02 \ - cliff_heights_priority.zx02 - echo "cliff_heights_priority_zx02: .incbin \"cliff_heights_priority.zx02\"" >> priority_cliff.inc - echo "outer_priority_zx02: .incbin \"outer_priority.zx02\"" >> priority_cliff.inc - - #### -outer_priority.zx02: outer_priority.gr - $(ZX02) -f outer_priority.gr outer_priority.zx02 +cliff_heights_priority.zx02: cliff_heights_priority.combined + $(ZX02) -f cliff_heights_priority.combined cliff_heights_priority.zx02 -outer_priority.gr: outer_priority.png - $(PNG2GR) outer_priority.png outer_priority.gr - -#### - -cliff_base_priority.zx02: cliff_base_priority.gr - $(ZX02) -f cliff_base_priority.gr cliff_base_priority.zx02 - -cliff_base_priority.gr: cliff_base_priority.png - $(PNG2GR) cliff_base_priority.png cliff_base_priority.gr - -#### - -cliff_heights_priority.zx02: cliff_heights_priority.gr - $(ZX02) -f cliff_heights_priority.gr cliff_heights_priority.zx02 +cliff_heights_priority.combined: cliff_heights_priority.gr cliff_heights_collision.bin + cat cliff_heights_priority.gr > cliff_heights_priority.combined + cat cliff_heights_collision.bin >> cliff_heights_priority.combined cliff_heights_priority.gr: cliff_heights_priority.png $(PNG2GR) cliff_heights_priority.png cliff_heights_priority.gr +cliff_heights_collision.bin: cliff_heights_collision.png + $(PNG2COLLISION) cliff_heights_collision.png cliff_heights_collision.bin + +#### + +outer_priority.zx02: outer_priority.combined + $(ZX02) -f outer_priority.combined outer_priority.zx02 + +outer_priority.combined: outer_priority.gr outer_collision.bin + cat outer_priority.gr > outer_priority.combined + cat outer_collision.bin >> outer_priority.combined + +outer_priority.gr: outer_priority.png + $(PNG2GR) outer_priority.png outer_priority.gr + +outer_collision.bin: outer_collision.png + $(PNG2COLLISION) outer_collision.png outer_collision.bin #### diff --git a/games/peasant/cliff_heights/graphics_cliff/cliff_heights_collision.png b/games/peasant/cliff_heights/graphics_cliff/cliff_heights_collision.png new file mode 100644 index 0000000000000000000000000000000000000000..ac711233a5ccf6255cfff8ac1684ddbf72c4e5e0 GIT binary patch literal 8037 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 literal 0 HcmV?d00001 diff --git a/games/peasant/cliff_heights/graphics_cliff/cliff_heights_priority.png b/games/peasant/cliff_heights/graphics_cliff/cliff_heights_priority.png index ac711233a5ccf6255cfff8ac1684ddbf72c4e5e0..282e09818013012fd6842b0f4bbf77f6288f7736 100644 GIT binary patch literal 6928 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 M(~e5q5T8^2FXYfqB>(^b delta 4500 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 N(o}s4t9@b{@jvtmOUwWO diff --git a/games/peasant/cliff_heights/graphics_cliff/outer_collision.png b/games/peasant/cliff_heights/graphics_cliff/outer_collision.png new file mode 100644 index 0000000000000000000000000000000000000000..c9298e68d7df7fb49acfc427580c0d5d75201698 GIT binary patch literal 1044 zcmeAS@N?(olHy`uVBq!ia0y~yV3Yu|4{$I8$roNd9zcPXOlRi+PiJR^f};Gi%$!sP z291fe6Ky>XJIEZ34|csM#%|qVk+Om>$uZ7CnUwS%ka0ei>n*^?J_Px-Nb$pxij&5!H$?Eb!^nw{gT(d9LLg$|cEA{y0qpWnUvcJJTnWjF8hdn*=AH&ZO}2S$r=fKP}kkbW$ekl?rX zzsp~S#R+rf%n>>N_rl@-2}R8Rvux(ho%?^m1(B~d7w+~J{lD=4|9_zRx&3VoK#H@# zBeIx*LBa=!OBm;`a8LjWvX^-Jy0Smz;bk#mRM>g53@9X7;u=xnoS&PUnpeW$T$Gwv zlA5AWo>`Ki;O^-g5Z=fq4on;SJzX3_DsH{K;h1+=L4Y-&Jlgft-~8LImsmv?-8f@$ zW6%E0Le*(;Dor={Et$p3C}EIrpn;K@jR(kJ0TD1B6Ick!gDL>?dSJ>id2TSxAXAh< zM6uAB@Bcx%XB7h8ScyXqmHE*UUjaw1af19pS>_X2y;nWqEmT>@xdNHHlRg@GY+N+ zCEimHad+2zUo8T(+=s{KjC21Xo_Pn~w`GQQwB7_d%$Oy3?Uesr(|51~9d)L~;BR(x zUDQ>eiN)+QI4|4FgB+6r3W839^WkA_E9XycWMod`d8Qi__tiMH=JRHQ{oVRNMM{aQ z>$lZ$1OfpUfBhcTN4PbWkWnN-q0y^28n=Ak&gp&G56_(Pl>G uXM6_B*M4%W=LZFa(V3R_Gl2}wll*G0W*vOOr!NeQZw60SKbLh*2~7YbRH-xo literal 0 HcmV?d00001 diff --git a/games/peasant/cliff_heights/graphics_cliff/outer_priority.png b/games/peasant/cliff_heights/graphics_cliff/outer_priority.png index c9298e68d7df7fb49acfc427580c0d5d75201698..020ba0749a82a7b9ded09a855ffe3d8fac4522ca 100644 GIT binary patch literal 7574 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 delta 899 zcmbPcJ%wX}ay?^9rn7T^r?ay{K~a8MW=<*tgT}<#iMAex9b}Hi2fJPrW4G?GNLj&` zz|{W1O@s`129Lq>UGjc}Z_xv{KMt&^^?5d5z-Zji)NRH;1j;^vw1rx3gt!>de%sGlb} z^)*GR^#CriAz#VTcb{HI;noMW5)#>8wlN#);h zhmma_&&?^ZnjXO?o;Q9s{uSh8~U6W)RXjvf(>>buYH3f_IY z_iy#GoA>#>6^o{uDVF$8o+};8^^}K~#fVX1=gqRoEHWDP`#oJ8Ln>~)z2TU5SV4d_ zpgh|3)ZhHuu9sLv7u`5xabwT^%|g{_aVkwW_br*l%P3)xaG-&anT-d?U;z;@9ursy z%7ZEZ^Lk*)F?ntW8tM^Bl|g0|3!VA?A0#&8Xu_x8EX-^^8a}HZwAcaVcAEHX?RHI& zTMsl)jd|HsR*>y)+F!nBg1IA2Z^plx6AKm_10~LIU%nr8EXDAubG;>y8zcPeh4Dd{ zQ`!=p$}@})_V}^Y18p*#aWG9N@t%5!ySwK5Y7wCAK0H2Wocj;)%scqLEi<&E^(N3| z#w@{Wr~L1lzJnd;sxvJHf3u_OqOJmsEM}j4-acwIe&5^BXb(h zGu@!Lug0l0pEn!q@74z@Qc7H9XZZNtF*cwnxryOk^S37ad-EA+!DPPRziaAWrGvsD zQgYdslPC800GXD&YKEWXjy5wgKjSl4zV?%2JwGTgjLx*Yp9y4ep5#}1HS6FLK7C;Z OAn