From 10175687698f8715ea430af43f585b2a79617ac6 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 2 Nov 2021 00:22:21 -0400
Subject: [PATCH] peasant: hook up more of hay bale land

---
 games/peasant/NOTES              |  3 ++-
 games/peasant/peasant2_actions.s | 36 ++++++++++++++++++++++++++++++++
 games/peasant/text/peasant2.inc  | 28 +++++++++++++++++++++----
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/games/peasant/NOTES b/games/peasant/NOTES
index 29ce013a..37fe83d7 100644
--- a/games/peasant/NOTES
+++ b/games/peasant/NOTES
@@ -180,8 +180,9 @@ POINTS IMPLEMENTED: (in order of implementation)
 +  2 (scare gary)
 +  2 (get arrow)
 +  3 (say haldo to dongolev)
++  3 (jump in hay)
 ======
-  45 points
+  48 points
 
 
 deaths implemented
diff --git a/games/peasant/peasant2_actions.s b/games/peasant/peasant2_actions.s
index d096f448..0f3a8198 100644
--- a/games/peasant/peasant2_actions.s
+++ b/games/peasant/peasant2_actions.s
@@ -113,6 +113,42 @@ hay_bale_hide:
 	jmp	parse_common_unknown
 
 enter_hay:
+
+	lda	GAME_STATE_2
+	and	#COVERED_IN_MUD
+	beq	enter_hay_no_mud
+
+enter_hay_muddy:
+	; check if in range
+	lda	PEASANT_X
+	cmp	#15
+	bcs	really_enter_hay_muddy
+
+enter_hay_too_far:
+	ldx	#<hay_enter_hay_clean_message
+	ldy	#>hay_enter_hay_clean_message
+	jmp	finish_parse_message
+
+really_enter_hay_muddy:
+	ldx	#<hay_enter_hay_muddy_message
+	ldy	#>hay_enter_hay_muddy_message
+	jsr	partial_message_step
+
+	; add 3 points to score
+
+	lda	#3
+	jsr	score_points
+
+	; get in hay
+	lda	GAME_STATE_1
+	ora	#HAY_BALE
+	sta	GAME_STATE_1
+
+	ldx	#<hay_enter_hay_muddy_message2
+	ldy	#>hay_enter_hay_muddy_message2
+	jmp	finish_parse_message
+
+enter_hay_no_mud:
 	ldx	#<hay_enter_hay_clean_message
 	ldy	#>hay_enter_hay_clean_message
 	jmp	finish_parse_message
diff --git a/games/peasant/text/peasant2.inc b/games/peasant/text/peasant2.inc
index adc7d8d5..ec959e03 100644
--- a/games/peasant/text/peasant2.inc
+++ b/games/peasant/text/peasant2.inc
@@ -3,8 +3,14 @@
 ; That Hay Bale
 ;===============
 
+; TODO
 ; After jumping in the haystack, go to any screen except Jhonka
-.byte "Drat. The winds are heavy on all but a couple of key screens... looks like you're no longer in stealth mode.",0
+; both hay and mud go away
+.byte "Drat. The winds are heavy",13
+.byte "on all but a couple of key",13
+.byte "screens... looks like",13
+.byte "you're no longer in stealth",13
+.byte "mode.",0
 
 ; + look
 hay_look_message:
@@ -42,12 +48,26 @@ hay_enter_hay_clean_message:
 .byte "fortnights ago.",0
 
 ; + enter hay / jump in hay (muddy but not nearby)
-.byte "Who do you think you are, MJ? Try from a little closer.",0
+hay_enter_hay_too_far_message:
+.byte "Who do you think you are,",13
+.byte "MJ? Try from a little",13
+.byte "closer.",0
 
 ; + 3 POINTS
 ; + enter hay / jump into hay (muddy)
-.byte "You've not known much better than a roll in the hay alone.",0
-.byte "You leap in the hay like a two years old boy. Uh oh. The hay sticks to your muddy body. You're a walking hay bale! Just like that one guy from that one show!",0
+hay_enter_hay_muddy_message:
+.byte "You've not known much",13
+.byte "better than a roll in the",13
+.byte "hay alone.",0
+; walk over
+hay_enter_hay_muddy_message2:
+.byte "You leap in the hay like a",13
+.byte "two years old boy. Uh oh.",13
+.byte "The hay sticks to your",13
+.byte "muddy body. You're a",13
+.byte "walking hay bale! Just like",13
+.byte "that one guy from that one",13
+.byte "show!",0
 
 ; + hug tree (walks to it)
 hay_hug_tree_message: