ootw: can run now

ootw/TODO

@@ -1,14 +1,13 @@
+
+
+KNOWN BUGS:
++ ootw: pool monster grabs you a edge of pool (glitch)
++ intro: there's still a bit of a pause when the elevator door finishes opening
+
 TODO:
 
-BUGS:
-+ beast grab you a edge of pool (glitch)
-
-intro:
-+ there's still a bit of a pause when the elevator door finishes opening
-
 movement -- note these are hard due to limitations of the Apple II keyboard
-+ ability to run
++ running: Missing one running frame
-	Missing one running frame
 + ability to jump
 + ability to kick while crouching
 + ability to shoot

ootw/keyboard.s

@@ -15,23 +15,28 @@ keypress:
 	and	#$7f		; clear high bit
 
 check_quit:
-;	cmp	#'Q'
+	cmp	#27		; quit if ESCAPE pressed
-;	beq	quit
+	bne	check_walk_left
-	cmp	#27
+
-	bne	check_left
+	;=====================
+	; QUIT
+	;=====================
 quit:
 	lda	#$ff		; could just dec
 	sta	GAME_OVER
 	rts
 
-check_left:
+check_walk_left:
 	cmp	#'A'
-	beq	left
+	beq	walk_left
 	cmp	#$8		; left arrow
-	bne	check_right
+	bne	check_walk_right
-left:
 
-	; walk left
+
+	;====================
+	; Walk left
+	;====================
+walk_left:
 
 	lda	#P_WALKING
 	sta	PHYSICIST_STATE		; stand from crouching
@@ -59,8 +64,6 @@ too_far_left:
 
 just_fine_left:
 
-
-
 	jmp	done_keypress		; done
 
 face_left:
@@ -69,12 +72,17 @@ face_left:
 	sta	GAIT
 	jmp	done_keypress
 
-check_right:
+check_walk_right:
 	cmp	#'D'
-	beq	right
+	beq	walk_right
 	cmp	#$15
-	bne	check_down
+	bne	check_run_left
-right:
+
+
+	;===================
+	; Walk Right
+	;===================
+walk_right:
 	lda	#P_WALKING
 	sta	PHYSICIST_STATE
 
@@ -113,11 +121,79 @@ face_right:
 	sta	DIRECTION
 	jmp	done_keypress
 
+
+
+check_run_left:
+	cmp	#'Q'
+	bne	check_run_right
+
+
+	;====================
+	; Run left
+	;====================
+run_left:
+
+	lda	#P_RUNNING
+	sta	PHYSICIST_STATE		; stand from crouching
+
+	lda	DIRECTION		; if facing right, turn to face left
+	bne	face_left
+
+	inc	GAIT			; cycle through animation
+	inc	GAIT			; cycle through animation
+
+	dec	PHYSICIST_X		; walk left
+
+	jmp	no_move_left
+
+
+check_run_right:
+	cmp	#'E'
+	bne	check_up
+
+	;===================
+	; Run Right
+	;===================
+run_right:
+	lda	#P_RUNNING
+	sta	PHYSICIST_STATE
+
+	lda	DIRECTION
+	beq	face_right
+
+	inc	GAIT
+	inc	GAIT
+
+	inc	PHYSICIST_X
+
+	jmp	no_move_right
+
+check_up:
+	cmp	#'W'
+	beq	up
+	cmp	#$0B
+	bne	check_down
+up:
+	;========================
+	; Jump
+	;========================
+
+	lda	#P_JUMPING
+	sta	PHYSICIST_STATE
+	lda	#0
+	sta	GAIT
+
+	jmp	done_keypress
+
 check_down:
 	cmp	#'S'
 	beq	down
 	cmp	#$0A
 	bne	check_space
+
+	;======================
+	; Crouch
+	;======================
 down:
 	lda	#P_CROUCHING
 	sta	PHYSICIST_STATE
@@ -131,6 +207,10 @@ check_space:
 	beq	space
 	cmp	#$15
 	bne	unknown
+
+	;======================
+	; Kick
+	;======================
 space:
 	lda	#P_KICKING
 	sta	PHYSICIST_STATE

ootw/physicist.s

@@ -4,12 +4,14 @@ pstate_table_lo:
 	.byte <physicist_running
 	.byte <physicist_crouching
 	.byte <physicist_kicking
+	.byte <physicist_jumping
 pstate_table_hi:
 	.byte >physicist_standing
 	.byte >physicist_standing
 	.byte >physicist_running
 	.byte >physicist_crouching
 	.byte >physicist_kicking
+	.byte >physicist_jumping
 
 pjump:
 	.word	$0000
@@ -79,6 +81,23 @@ physicist_crouching:
 
 	jmp	finally_draw_him
 
+;===================================
+; JUMPING
+;===================================
+
+physicist_jumping:
+
+	; FIXME: we have an animation?
+
+	lda	#<crouch2
+	sta	INL
+
+	lda	#>crouch2
+	sta	INH
+
+	jmp	finally_draw_him
+
+
 
 ;===============================
 ; Walking

ootw/sluggy.s

@@ -185,7 +185,7 @@ check_kicked:
 
 	lda	PHYSICIST_STATE
 	cmp	#P_KICKING
-	beq	check_attack
+	bne	check_attack
 
 	lda	PHYSICIST_X
 	sec

ootw/zp.inc

@@ -133,8 +133,6 @@ CURSOR		= $9D
 ; More zero-page addresses
 ; we try not to conflict with anything DOS, MONITOR or BASIC related
 
-JUMPING		= $D0
-
 LEFT_LIMIT	= $E0
 RIGHT_LIMIT	= $E1
 WHICH_SLUG	= $E2
@@ -161,6 +159,7 @@ PHYSICIST_STATE	= $EA
 	P_RUNNING   = $02
 	P_CROUCHING = $03
 	P_KICKING   = $04
+	P_JUMPING   = $05
 
 ;	CROUCHING	= $EA
 ;	KICKING		= $EB