Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-02-06 14:30:18 +00:00
Code Issues Projects Releases Wiki Activity

ootw: c2: left collision update

Browse Source 
have to run so no time to test
This commit is contained in:
Vince Weaver 2019-08-20 14:51:02 -04:00
parent 97370408fb
commit 3ddad85fbb
1 changed files with 100 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
ootw/collision.s
View File

@ -308,6 +308,10 @@ calc_gun_left_collision:
lda #0 lda #0
sta LEFT_SHOOT_TARGET sta LEFT_SHOOT_TARGET
;=============================
; by default set to left limit
; tricky as LEFT_LIMIT does some hacks to put it up above $80
lda LEFT_LIMIT lda LEFT_LIMIT
sec sec
sbc #$80 sbc #$80
@ -317,6 +321,10 @@ calc_gun_left_collision:
left_limit_ok: left_limit_ok:
sta LEFT_SHOOT_LIMIT sta LEFT_SHOOT_LIMIT
;==========================
; stop if hit door
calc_gun_left_door:
lda NUM_DOORS lda NUM_DOORS
beq done_calc_gun_left_door_collision beq done_calc_gun_left_door_collision
@ -326,8 +334,15 @@ calc_gun_left_doors:
ldy NUM_DOORS ldy NUM_DOORS
dey dey
calc_gun_left_door_loop: calc_gun_left_door_loop:
lda PHYSICIST_X
; only if on same level
lda (DOOR_Y),Y
clc
adc #4
cmp PHYSICIST_Y
bne calc_gun_left_door_continue
lda PHYSICIST_X
cmp (DOOR_X),Y cmp (DOOR_X),Y
bcc calc_gun_left_door_continue ; blt bcc calc_gun_left_door_continue ; blt
@ -355,6 +370,84 @@ calc_gun_left_door_continue:
done_calc_gun_left_door_collision: done_calc_gun_left_door_collision:
;==========================
; adjust for shield
calc_gun_left_shield:
lda SHIELD_OUT
beq done_calc_gun_left_shield_collision
ldx #0
calc_gun_left_shield_loop:
lda shield_out,X
beq calc_gun_left_shield_continue
lda PHYSICIST_X
cmp shield_x,X
bcc calc_gun_left_shield_continue ; blt
; be sure closer than current max limit
lda LEFT_SHOOT_LIMIT
cmp shield_x,X
bcc calc_gun_left_shield_continue ; blt
calc_gun_left_shield_there:
lda shield_x,X
sta LEFT_SHOOT_LIMIT
txa ; set target if hit
ora #TARGET_SHIELD
sta LEFT_SHOOT_TARGET
; can't early exit
calc_gun_left_shield_continue:
inx
cpx #MAX_SHIELDS
bne calc_gun_left_shield_loop
done_calc_gun_left_shield_collision:
;==========================
; adjust for friend
calc_gun_left_friend:
lda friend_room
cmp WHICH_ROOM
bne done_calc_gun_left_friend_collision
lda PHYSICIST_X
cmp friend_x
bcc calc_gun_left_friend_continue ; blt
; only if closer than previous found
lda LEFT_SHOOT_LIMIT
cmp friend_x
bcc calc_gun_left_friend_continue ; blt
lda friend_state
cmp #F_DISINTEGRATING
beq calc_gun_left_friend_continue
calc_gun_left_friend_there:
lda friend_x
sta LEFT_SHOOT_LIMIT
; set target if hit
lda #TARGET_FRIEND
sta LEFT_SHOOT_TARGET
calc_gun_left_friend_continue:
done_calc_gun_left_friend_collision:
;========================== ;==========================
; adjust for alien ; adjust for alien
@ -376,6 +469,11 @@ calc_gun_left_alien_loop:
cmp alien_x,X cmp alien_x,X
bcc calc_gun_left_alien_continue ; blt bcc calc_gun_left_alien_continue ; blt
; only if closer than previous found
lda LEFT_SHOOT_LIMIT
cmp alien_x,X
bcc calc_gun_left_alien_continue ; blt
lda alien_state,X lda alien_state,X
cmp #A_DISINTEGRATING cmp #A_DISINTEGRATING
beq calc_gun_left_alien_continue beq calc_gun_left_alien_continue
@ -397,6 +495,7 @@ calc_gun_left_alien_continue:
done_calc_gun_left_alien_collision: done_calc_gun_left_alien_collision:
rts rts