ootw: c4: more laser progress

ootw/laser.s

@@ -1,53 +1,133 @@
 ; Handle laser
 
+; should handle multiple at once?
 
+; when pressed, find empty slot?
+; initially 10 wide, from gun to right or left
+; expand to 20 wide
+; stop when encounter door, enemy, or edge of screen
+; should bounds check carefully
+
+; should handle shooting while crouching
+
+laser0_out:		.byte $0
+laser0_start:		.byte $0
+laser0_end:		.byte $0
+laser0_y:		.byte $0
+laser0_direction:	.byte $0
+
+
+	;=========================
+	; fire laser
+	;=========================
+
+fire_laser:
+
+	lda	laser0_out
+	bne	done_fire_laser
+
+	inc	laser0_out
+
+	; set y
+
+	lda	PHYSICIST_Y
+	clc
+	adc	#4
+	sta	laser0_y
+
+	lda	DIRECTION
+	sta	laser0_direction
+
+	beq	laser_left
+	bne	laser_right
+
+	; set x
+
+
+laser_left:
+
+	ldx	PHYSICIST_X
+	dex
+	stx	laser0_end
+	lda	#0
+	sta	laser0_start
+
+	jmp	done_fire_laser
+
+laser_right:
+
+	lda	PHYSICIST_X
+	clc
+	adc	#5
+	sta	laser0_start
+
+	sec
+	lda	#39
+	sbc	TEMP
+	sta	laser0_end
+
+done_fire_laser:
+	rts
+
+
+	;====================
+	; draw laser
+	;====================
 
 draw_laser:
 
+	lda	laser0_out
+	beq	done_draw_laser
+
 	lda	#$10
 	sta	hlin_color_smc+1
 
 	lda	#$0f
 	sta	hlin_mask_smc+1
 
-	lda	PHYSICIST_Y
-	clc
-	adc	#4
-	tay
-
-	lda	DIRECTION
-	beq	laser_left
-	bne	laser_right
-
-laser_left:
-
-	ldx	PHYSICIST_X
-	dex
-	lda	#0
-
-	jmp	laser_hlin
-
-laser_right:
-
-	lda	PHYSICIST_Y
-	clc
-	adc	#4
-	tay
-
-	lda	PHYSICIST_X
-	clc
-	adc	#5
-	sta	TEMP
-
-	sec
-	lda	#39
-	sbc	TEMP
-	tax
-
-	lda	TEMP
-
-laser_hlin:
+	ldy	laser0_y
+	ldx	laser0_end
+	lda	laser0_start
 
 	jsr	hlin
 
+done_draw_laser:
+
 	rts
+
+
+
+	;===================
+	; move laser
+	;===================
+move_laser:
+	lda	laser0_out
+	beq	done_move_laser
+
+	lda	laser0_start
+	clc
+	adc	#10
+	sta	laser0_start
+	cmp	#39
+	bcs	disable_laser
+
+	lda	laser0_start
+	clc
+	adc	#20
+	cmp	#40
+	bcc	done_laser_len		; blt
+
+	lda	#39
+
+done_laser_len:
+	sta	laser0_end
+
+done_move_laser:
+
+	rts
+
+disable_laser:
+	lda	#0
+	sta	laser0_out
+	rts
+

ootw/ootw_c4_city.s

@@ -539,15 +539,28 @@ regular_room:
 	jsr	draw_physicist
 
 
+	;================
+	; fire laser
+	;================
+
+	lda	LASER_OUT
+	beq	no_fire_laser
+	jsr	fire_laser
+no_fire_laser:
+	lda	#0
+	sta	LASER_OUT
 
 	;================
 	; draw laser
 	;================
 
-	lda	LASER_OUT
-	beq	done_draw_laser
 	jsr	draw_laser
-done_draw_laser:
+
+	;================
+	; move laser
+	;================
+
+	jsr	move_laser
 
 
 	;========================