From d3ea7817a6ce4e90f509a6a4fff2ab45c3ed14a4 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 28 Nov 2021 00:02:01 -0500 Subject: [PATCH] peasant: fix bug at well baby was getting you soda and a robe from there, not right --- games/peasant/save1.s | 8 +++++--- games/peasant/text/peasant1.inc | 4 ++++ games/peasant/zp.inc | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/games/peasant/save1.s b/games/peasant/save1.s index a0cbe9d8..1f7d1490 100644 --- a/games/peasant/save1.s +++ b/games/peasant/save1.s @@ -1,4 +1,4 @@ -; SAVE1 -- ?? +; SAVE1 -- After getting the sub .include "zp.inc" @@ -15,7 +15,8 @@ .byte TALKED_TO_MENDELEV | HALDO_TO_DONGOLEV | ARROW_BEATEN| GARY_SCARED | TRINKET_GIVEN | LADY_GONE ; BABY_IN_WELL | BUCKET_DOWN_WELL ; GAME_STATE_0 = $97 -.byte PUDDLE_WET|RAINING +.byte PUDDLE_WET + ; RAINING ; FISH_FED | IN_HAY_BALE | NIGHT | POT_ON_HEAD | WEARING_ROBE ; GAME_STATE_1 = $98 .byte TALKED_TO_KNIGHT @@ -31,7 +32,8 @@ .byte $20 ; SCORE_TENSONES= $9F .byte INV1_ARROW | INV1_BABY | INV1_KERREK_BELT | INV1_BOW | INV1_MONSTER_MASK | INV1_PEBBLES ; INVENTORY_1 = $A0 -.byte INV2_RICHES|INV2_TRINKET ; INVENTORY_2 = $A1 +.byte INV2_RICHES|INV2_MEATBALL_SUB | INV2_TRINKET + ; INVENTORY_2 = $A1 .byte INV3_SHIRT|INV3_MAP ; INVENTORY_3 = $A2 .byte INV1_ARROW|INV1_PEBBLES diff --git a/games/peasant/text/peasant1.inc b/games/peasant/text/peasant1.inc index 03a617f6..be8782a9 100644 --- a/games/peasant/text/peasant1.inc +++ b/games/peasant/text/peasant1.inc @@ -294,6 +294,10 @@ well_put_baby_message: ; + 3 POINTS ; + put baby in bucket +; [note, if you do this when baby already +; at bottom, it will just do it again +; also, baby stays in inventory all along. + well_put_baby_in_bucket_message: .byte "Okay, Father of the Year.",13 .byte "You put a baby in a bucket",13 diff --git a/games/peasant/zp.inc b/games/peasant/zp.inc index 5c805e3b..6ec791ae 100644 --- a/games/peasant/zp.inc +++ b/games/peasant/zp.inc @@ -186,7 +186,7 @@ INVENTORY_2 = $A1 INV2_RICHES = $01 INV2_ROBE = $02 INV2_SODA = $04 - INV2_MEATBALL_SUB = $06 + INV2_MEATBALL_SUB = $08 INV2_TRINKET = $10 INV2_TROGHELM = $20 INV2_TROGSHIELD = $40