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

Bouncy Castle and Tracers fixes

Browse Source
This commit is contained in:
Pecusx
2022-09-02 18:00:10 +02:00
parent 216d9f9ca8
commit dc9c724521
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scorch.asm
-1
View File
@@ -407,7 +407,6 @@ NoGameOverYet
jsr SetPMWidth jsr SetPMWidth
lda #0 lda #0
sta Erase
sta COLOR2 ; status line "off" sta COLOR2 ; status line "off"
sta COLOR1 sta COLOR1
scorch.xex
BIN
View File
Binary file not shown.
weapons.asm
+17 -7
View File
@@ -1117,6 +1117,7 @@ ContinueToCheckMaxForce2
lda MaxForceTableL,x lda MaxForceTableL,x
sta ForceTableL,x sta ForceTableL,x
@ @
mva #0 Erase
jsr DisplayStatus ;all digital values like force, angle, wind, etc. jsr DisplayStatus ;all digital values like force, angle, wind, etc.
jsr PutTankNameOnScreen jsr PutTankNameOnScreen
@@ -1194,7 +1195,6 @@ afterInventory
lda #song_ingame lda #song_ingame
jsr RmtSongSelect jsr RmtSongSelect
mva #0 escFlag mva #0 escFlag
sta Erase ; why?
jsr DisplayStatus jsr DisplayStatus
jsr SetMainScreen jsr SetMainScreen
jsr WaitOneFrame jsr WaitOneFrame
@@ -1866,12 +1866,19 @@ EndOfFlight2
@ @
; tank hit - check defensive weapon of this tank ; tank hit - check defensive weapon of this tank
tax tax
dex ; index of tank in X dex ; index of hitted tank in X
ldy TankNr
lda ActiveWeapon,y
cmp #ind_Tracer_________ ; defence not fire by tracers
beq JNoDefence
cmp #ind_Smoke_Tracer___
beq JNoDefence
lda ActiveDefenceWeapon,x lda ActiveDefenceWeapon,x
cmp #ind_Bouncy_Castle__ ; Auto Defence cmp #ind_Bouncy_Castle__ ; Auto Defence
jeq BouncyCastle jeq BouncyCastle
cmp #ind_Mag_Deflector__ ; Mag Deflector cmp #ind_Mag_Deflector__ ; Mag Deflector
beq MagDeflector beq MagDeflector
JNoDefence
jmp NoDefence jmp NoDefence
MagDeflector MagDeflector
; now run defensive-aggressive weapon - Mag Deflector! ; now run defensive-aggressive weapon - Mag Deflector!
@@ -1921,8 +1928,6 @@ NoDefence
BouncyCastle BouncyCastle
mva #sfx_shield_on sfx_effect mva #sfx_shield_on sfx_effect
; now run defensive-aggressive weapon - Bouncy Castle (previously known as Auto Defence)! ; now run defensive-aggressive weapon - Bouncy Castle (previously known as Auto Defence)!
sbb #180 LeapFrogAngle Angle ; swap angle (LeapFrogAngle - because we have strored angle in this variable)
lsrw Force ; Force = Force / 2 - because earlier we multiplied by 2
mva #1 Erase mva #1 Erase
lda TankNr lda TankNr
pha ; store TankNr pha ; store TankNr
@@ -1933,13 +1938,18 @@ BouncyCastle
sta ShieldEnergy,x sta ShieldEnergy,x
sta xtraj ; prepare coordinates sta xtraj ; prepare coordinates
sta ytraj sta ytraj
sta xtraj+2 ; sta xtraj+2
sta ytraj+2 ; sta ytraj+2
sta Erase sta Erase
jsr DrawTankNr ; draw tank without shield jsr DrawTankNr ; draw tank without shield
ldx TankNr ; restore X value :) ; ldx TankNr ; restore X value :) ... but we don't need X now ..
pla pla
sta TankNr ; restore TankNr value :) sta TankNr ; restore TankNr value :)
sec
lda #180
sbc LeapFrogAngle
sta Angle ; swap angle (LeapFrogAngle - because we have strored angle in this variable)
lsrw Force ; Force = Force / 2 - because earlier we multiplied by 2
mwa XHit xtraj+1 mwa XHit xtraj+1
sbw YHit #5 ytraj+1 sbw YHit #5 ytraj+1
mva #1 color mva #1 color