From cd69bf22db4677cc73ea4ffa4f018e6429d6d0e9 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 13 Jun 2022 09:18:05 +0200 Subject: [PATCH] Shield energy table added. ... for easier activation. Defensive weapon numbering revised. --- constants.asm | 35 ++++++++++++++++++++++++++--------- grafproc.asm | 10 +++++----- scorch.asm | 6 ++++-- scorch.xex | Bin 39069 -> 39085 bytes weapons.asm | 16 ++++++++-------- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/constants.asm b/constants.asm index a840891..a8cd5ff 100644 --- a/constants.asm +++ b/constants.asm @@ -870,17 +870,34 @@ NamesOfWeapons ;the comment is an index in the tables dta d"Bal Guidance " ; 50 dta d"Horz Guidance " ; 51 dta d"Vert Guidance " ; 52 - dta d"Lazy Boy " ; 53 - no energy - dta d"Parachute " ; 54 - dta d"Battery " ; 55 - witch shield and energy - dta d"Mag Deflector " ; 56 - shield for one shot - no energy - dta d"Shield " ; 57 - shield with energy and parachute - dta d"Force Shield " ; 58 - shield with energy - dta d"Heavy Shield " ; 59 - dta d"Super Mag " ; 60 - witch shield and energy - dta d"Auto Defense " ; 61 + dta d"Lazy Boy " ; 53 + dta d"Parachute " ; 54 - no energy + dta d"Battery " ; 55 + dta d"Mag Deflector " ; 56 - with shield and energy + dta d"Shield " ; 57 - shield for one shot - no energy + dta d"Force Shield " ; 58 - shield with energy and parachute + dta d"Heavy Shield " ; 59 - shield with energy + dta d"Super Mag " ; 60 + dta d"Auto Defense " ; 61 - with shield and energy dta d"Fuel Tank " ; 62 dta d"Contact Trigger " ; 63 +DefensiveEnergy = * - 48 + .by 00 ; White Flag + .by 00 ; Heat Guidance + .by 00 ; Bal Guidance + .by 00 ; Horz Guidance + .by 00 ; Vert Guidance + .by 00 ; Lazy Boy + .by 00 ; Parachute + .by 00 ; Battery + .by 90 ; Mag Deflector + .by 00 ; Shield + .by 99 ; Force Shield + .by 99 ; Heavy Shield + .by 00 ; Super Mag + .by 99 ; Auto Defense + .by 00 ; Fuel Tank + .by 00 ; Contact Trigger weaponsOfDeath dta 1,2,3,7,15,16,17,18,19,20,21,22,23,24,25,26,27 weaponsOfDeathEnd diff --git a/grafproc.asm b/grafproc.asm index fb37969..398706e 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -694,15 +694,15 @@ NoPlayerMissile ; draw defensive weapons like shield ( tank number in X ) ; in xdraw, ydraw we have coordinates left LOWER corner of Tank char lda ActiveDefenceWeapon,x - cmp #56 ; one shot shield activation + cmp #57 ; one shot shield activation beq ShieldDraw - cmp #57 ; shield with energy and parachute activation + cmp #58 ; shield with energy and parachute activation beq ShieldDraw - cmp #58 ; shield with energy activation + cmp #59 ; shield with energy activation beq ShieldDraw - cmp #60 ; Auto Defence + cmp #61 ; Auto Defence beq DrawTankShieldWihHorns - cmp #55 ; Mag Deflector + cmp #56 ; Mag Deflector beq DrawTankShieldWihHorns bne NoShieldDraw ShieldDraw diff --git a/scorch.asm b/scorch.asm index bfe1197..a28be4a 100644 --- a/scorch.asm +++ b/scorch.asm @@ -133,8 +133,10 @@ START ; ldx numberOfPlayers ; dex ;@ -; mva #55 ActiveDefenceWeapon,x -; mva #99 ShieldEnergy,x ; set energy of shield +; mva #56 ActiveDefenceWeapon,x +; tay +; lda DefensiveEnergy,y +; sta ShieldEnergy,x ; set energy of shield ; dex ; bpl @- ; mag deflector activated! (test) diff --git a/scorch.xex b/scorch.xex index 6b038c587e37e55f0e7d52e53d4d780ad60d7202..ed4e205c821856931d7b5cc9d8a3c521af80e454 100644 GIT binary patch delta 11805 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 diff --git a/weapons.asm b/weapons.asm index 3de553e..aaa1091 100644 --- a/weapons.asm +++ b/weapons.asm @@ -667,15 +667,15 @@ DistanceCheckLoop tay ; check shields lda ActiveDefenceWeapon,x - cmp #56 ; one hit shield + cmp #57 ; one hit shield beq UseShield - cmp #57 ; shield with energy and parachute + cmp #58 ; shield with energy and parachute beq UseShieldWithEnergy - cmp #58 ; shield with energy + cmp #59 ; shield with energy beq UseShieldWithEnergy - cmp #60 ; Auto Defence (it works only if hit ground next to tank. Tank hit is handled in Flight proc) + cmp #61 ; Auto Defence (it works only if hit ground next to tank. Tank hit is handled in Flight proc) beq UseShieldWithEnergy - cmp #55 ; Mag deflector (it works only if hit ground next to tank. Tank hit is handled in Flight proc) + cmp #56 ; Mag deflector (it works only if hit ground next to tank. Tank hit is handled in Flight proc) beq UseShieldWithEnergy jsr DecreaseEnergyX jmp EndOfDistanceCheckLoop @@ -1335,9 +1335,9 @@ ShotUnderGround ; let's check if the given tank has got the parachute ldx TankNr lda ActiveDefenceWeapon,x - cmp #53 ; parachute + cmp #54 ; parachute beq ParachuteActive - cmp #57 ; scheld witch energy and parachute + cmp #58 ; scheld witch energy and parachute bne TankFallsX ParachuteActive inc Parachute @@ -1542,7 +1542,7 @@ EndOfFall mva #1 Erase ldx TankNr lda ActiveDefenceWeapon,x - cmp #53 ; deactivate weapon only if parachute (53) + cmp #54 ; deactivate weapon only if parachute (53) bne NoParachuteWeapon mva #0 ActiveDefenceWeapon,x ; deactivate defence weapon (parachute) NoParachuteWeapon