From 344827d0a0f2fa4f64c2ac8b550dbad120004b79 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 23 Oct 2021 10:36:03 -0400 Subject: [PATCH] peasant: hook up yellow tree dialog --- games/peasant/peasant1.s | 4 +- games/peasant/peasant1_actions.s | 99 ++++++-------------------------- games/peasant/peasant4.s | 4 +- games/peasant/text/peasant1.inc | 3 + 4 files changed, 26 insertions(+), 84 deletions(-) diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index cfff3a19..68baedfa 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -247,14 +247,14 @@ verb_tables_low: .byte gary_verb_table ; 0 -- gary the horse .byte >gary_verb_table ; 1 -- top footprints .byte >gary_verb_table ; 2 -- wishing well - .byte >gary_verb_table ; 3 -- leaning tree + .byte >yellow_tree_verb_table ; 3 -- leaning tree .byte >waterfall_verb_table ; 4 -- waterfall diff --git a/games/peasant/peasant1_actions.s b/games/peasant/peasant1_actions.s index e9917443..a2eb681e 100644 --- a/games/peasant/peasant1_actions.s +++ b/games/peasant/peasant1_actions.s @@ -580,116 +580,55 @@ archery_talk_too_far: ldx #archery_talk_far_message jmp finish_parse_message - +.endif ;======================= ;======================= ;======================= - ; River and Stone + ; Yellow Tree ;======================= ;======================= ;======================= -river_stone_verb_table: - .byte VERB_GET - .word river_stone_get-1 +yellow_tree_verb_table: .byte VERB_LOOK - .word river_stone_look-1 - .byte VERB_STEAL - .word river_stone_steal-1 - .byte VERB_SWIM - .word river_stone_swim-1 - .byte VERB_TAKE - .word river_stone_take-1 + .word yellow_tree_look-1 .byte 0 - - ;================ - ; get - ;================ -river_stone_steal: -river_stone_take: -river_stone_get: - lda CURRENT_NOUN - - cmp #NOUN_ROCK - beq river_get_rock - cmp #NOUN_STONE - beq river_get_rock - - ; else "probably wish" message - - jmp parse_common_get - -river_get_rock: - ldx #river_get_rock_message - jmp finish_parse_message - ;================= ; look ;================= -river_stone_look: +yellow_tree_look: lda CURRENT_NOUN - cmp #NOUN_ROCK - beq river_look_at_rock - cmp #NOUN_STONE - beq river_look_at_rock - cmp #NOUN_WATER - beq river_look_at_water - cmp #NOUN_RIVER - beq river_look_at_water + cmp #NOUN_TREE + beq yellow_tree_look_tree + cmp #NOUN_COTTAGE + beq yellow_tree_look_cottage cmp #NOUN_NONE - beq river_look_at + beq yellow_tree_look_at jmp parse_common_look -river_look_at: - ldx #river_look_message +yellow_tree_look_at: + ldx #yellow_tree_look_message jmp finish_parse_message -river_look_at_rock: - ldx #river_look_at_rock_message +yellow_tree_look_cottage: + ldx #yellow_tree_look_cottage_message jmp finish_parse_message -river_look_at_water: - ldx #river_look_at_water_message +yellow_tree_look_tree: + ldx #yellow_tree_look_tree_message jmp finish_parse_message - - ;=================== - ; swim - ;=================== - -river_stone_swim: - - lda CURRENT_NOUN - - cmp #NOUN_WATER - beq river_swim - cmp #NOUN_RIVER - beq river_swim - cmp #NOUN_ROCK - beq river_swim - cmp #NOUN_STONE - beq river_swim - - jmp parse_common_unknown - -river_swim: - ldx #river_swim_message - jmp finish_parse_message -.endif - ;======================= ;======================= ;======================= diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index 86df9169..e6c97611 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -250,14 +250,14 @@ map_priority_hi: verb_tables_low: - .byte crooked_tree_verb_table ; 15 -- empty hut + .byte >ned_cottage_verb_table ; 15 -- empty hut .byte >crooked_tree_verb_table ; 16 -- ned .byte >crooked_tree_verb_table ; 17 -- bottom footprints .byte >crooked_tree_verb_table ; 18 -- cottage lady diff --git a/games/peasant/text/peasant1.inc b/games/peasant/text/peasant1.inc index ec6e201c..bfe95d70 100644 --- a/games/peasant/text/peasant1.inc +++ b/games/peasant/text/peasant1.inc @@ -265,14 +265,17 @@ gary_talk_message: ;============= ; + look +yellow_tree_look_message: .byte "Rushing river b/w yellow",13 .byte "tree.",0 ; + look tree +yellow_tree_look_tree_message: .byte "You're really hurtin' for",13 .byte "puzzle solutions, huh?",0 ; + look cottage +yellow_tree_look_cottage_message: .byte "You see a cottage in the",13 .byte "distance. You hold your",13 .byte "fingers up to one eye and",13