peasant: cliff_heights: can at least walk around now

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
-	ldy	#>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
-	ldy	#>cliff_base_climb_message
-	jsr	partial_message_step
-
-	ldx	#<cliff_base_climb2_message
-	ldy	#>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"

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

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
+cliff_heights_priority.zx02:	cliff_heights_priority.combined
-	$(ZX02) -f outer_priority.gr outer_priority.zx02
+	$(ZX02) -f cliff_heights_priority.combined cliff_heights_priority.zx02
 
-outer_priority.gr:	outer_priority.png
+cliff_heights_priority.combined:	cliff_heights_priority.gr cliff_heights_collision.bin
-	$(PNG2GR) outer_priority.png outer_priority.gr
+	cat cliff_heights_priority.gr >  cliff_heights_priority.combined
-
+	cat cliff_heights_collision.bin >> cliff_heights_priority.combined
-####
-
-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.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
 
 ####