Pecus/scorch_src
1
0
Fork 0
mirror of https://github.com/Pecusx/scorch_src.git synced 2026-05-20 22:33:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bouncing Kastel bounces Laser - fixed

Browse Source
This commit is contained in:
Pecusx
2022-11-22 14:58:07 +01:00
parent ba780df597
commit 05a289ffea
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scorch.bin
BIN
View File
Binary file not shown.
scorch.xex
BIN
View File
Binary file not shown.
weapons.asm
+12 -2
View File
@@ -1876,6 +1876,8 @@ EndOfFlight2
beq JNoDefence beq JNoDefence
cmp #ind_Smoke_Tracer___ cmp #ind_Smoke_Tracer___
beq JNoDefence beq JNoDefence
cmp #ind_Laser__________ ; Bouncy and Mag not fire by Laser
beq JNoDefence
lda ActiveDefenceWeapon,x lda ActiveDefenceWeapon,x
cmp #ind_Bouncy_Castle__ ; Auto Defence cmp #ind_Bouncy_Castle__ ; Auto Defence
jeq BouncyCastle jeq BouncyCastle
@@ -2926,9 +2928,17 @@ CheckCollisionWithTankLoop
cmp ydraw cmp ydraw
bcs OverTheTank bcs OverTheTank
; with or without shield ? ; with or without shield ?
lda ShieldEnergy,x /*
lda ActiveDefenceWeapon,x
cmp #ind_Mag_Deflector__ ; first shielded weapon
bcc CheckCollisionWithNotShieldedTank
cmp #ind_Bouncy_Castle__+1 ; last shielded weapon
bcs CheckCollisionWithShieldedTank ; tank with shield is bigger :)
*/
lda ShieldEnergy,x ; there is wrong method to check shield :)
bne CheckCollisionWithShieldedTank ; tank with shield is bigger :) bne CheckCollisionWithShieldedTank ; tank with shield is bigger :)
CheckCollisionWithNotShieldedTank
lda xtankstableH,x lda xtankstableH,x
cmp xdraw+1 cmp xdraw+1
bne @+ bne @+