From 2bb96945821f532f591b3eece2b244f93e6cc350 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 7 Jan 2022 15:02:24 -0500 Subject: [PATCH] peasant: forgot the "climb fence" action in peasant2 --- games/peasant/NOTES | 1 + games/peasant/draw_peasant.s | 4 ++-- games/peasant/peasant2_actions.s | 24 ++++++++++++++++++++++++ games/peasant/sprites/Makefile | 1 - games/peasant/text/peasant2.inc | 5 +++++ 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/games/peasant/NOTES b/games/peasant/NOTES index 30963d53..f457f84d 100644 --- a/games/peasant/NOTES +++ b/games/peasant/NOTES @@ -40,6 +40,7 @@ peasant2 18302 17941 -- after most of text hooked up (more code was moved to qload) 17929 -- after redoing so background is always in PAGE1 18132 -- add in river animation code + 18181 -- forgot the "climb fence" message partial save, can we fit in 4k? 102 lines ; inventory was 115? diff --git a/games/peasant/draw_peasant.s b/games/peasant/draw_peasant.s index ac1f8ae4..1a44e325 100644 --- a/games/peasant/draw_peasant.s +++ b/games/peasant/draw_peasant.s @@ -112,5 +112,5 @@ done_draw_peasant: rts -;.include "sprites/peasant_sprites.inc" -.include "sprites/peasant_robe_sprites.inc" +.include "sprites/peasant_sprites.inc" +;.include "sprites/peasant_robe_sprites.inc" diff --git a/games/peasant/peasant2_actions.s b/games/peasant/peasant2_actions.s index 4707b04d..06759c66 100644 --- a/games/peasant/peasant2_actions.s +++ b/games/peasant/peasant2_actions.s @@ -25,6 +25,8 @@ hay_bale_verb_table: .word hay_bale_steal-1 .byte VERB_TAKE .word hay_bale_take-1 + .byte VERB_CLIMB + .word hay_bale_climb-1 .byte 0 @@ -48,6 +50,9 @@ hay_get_hay: ldy #>hay_get_hay_message jmp finish_parse_message + + + ;================= ; look ;================= @@ -107,6 +112,23 @@ hay_look_at_fence: jmp finish_parse_message + ;================ + ; climb + ;================ +hay_bale_climb: + lda CURRENT_NOUN + + cmp #NOUN_FENCE + beq hay_climb_fence + + jmp parse_common_unknown + +hay_climb_fence: + ldx #hay_climb_fence_message + jmp finish_parse_message + + ;=================== ; enter hay ;=================== @@ -117,6 +139,8 @@ hay_bale_hide: lda CURRENT_NOUN + cmp #NOUN_FENCE + beq hay_climb_fence cmp #NOUN_HAY beq enter_hay diff --git a/games/peasant/sprites/Makefile b/games/peasant/sprites/Makefile index a64b6194..17bf892c 100644 --- a/games/peasant/sprites/Makefile +++ b/games/peasant/sprites/Makefile @@ -64,7 +64,6 @@ gary_sprites.inc: gary_sprites.png $(HGR_SPRITE) -s -l gary_fly2_sprite gary_sprites.png 91 98 104 117 >> gary_sprites.inc $(HGR_SPRITE) -s -l gary_tail1_sprite gary_sprites.png 119 98 132 117 >> gary_sprites.inc $(HGR_SPRITE) -s -l gary_tail2_sprite gary_sprites.png 147 98 160 117 >> gary_sprites.inc - $(HGR_SPRITE) -s -l gary_foot1_sprite gary_sprites.png 91 118 118 128 >> gary_sprites.inc $(HGR_SPRITE) -s -l gary_foot0_sprite gary_sprites.png 63 118 76 128 >> gary_sprites.inc $(HGR_SPRITE) -s -l gary_foot1_sprite gary_sprites.png 91 118 104 128 >> gary_sprites.inc $(HGR_SPRITE) -s -l gary_foot2_sprite gary_sprites.png 119 118 132 128 >> gary_sprites.inc diff --git a/games/peasant/text/peasant2.inc b/games/peasant/text/peasant2.inc index c67c8286..041b3938 100644 --- a/games/peasant/text/peasant2.inc +++ b/games/peasant/text/peasant2.inc @@ -80,6 +80,11 @@ hay_get_hay_message: .byte "Dungeonman? You don't need",13 .byte "any hay.",0 +; + climb/jump fence +hay_climb_fence_message: +.byte "No, you have business to",13 +.byte "attend to here in",13 +.byte "Peasantry.",0 ;============= ; Mud Puddle