From 91b613f166f278dd77eeda4930a6394b055df86b Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 9 Jun 2022 09:46:09 +0200 Subject: [PATCH] Shield witch parachute added Only for test. Now all players has active Shield with energy (99) and witch parachute before game. Alo added display name of active defensive weapon on statusbar, and some fixes. --- constants.asm | 4 ++-- display.asm | 2 +- grafproc.asm | 6 ++++-- scorch.asm | 4 ++-- scorch.xex | Bin 38428 -> 38513 bytes textproc.asm | 47 +++++++++++++++++++++++++++++++++++++++-------- weapons.asm | 13 ++++++++++++- 7 files changed, 60 insertions(+), 16 deletions(-) diff --git a/constants.asm b/constants.asm index 4881c3b..bea253a 100644 --- a/constants.asm +++ b/constants.asm @@ -861,7 +861,7 @@ NamesOfWeapons ;the comment is an index in the tables dta d"----------------" ; 44 dta d"----------------" ; 45 dta d"----------------" ; 46 - dta d"----------------" ; 47 + dta d" " ; 47 ; special (no weapon) name for simplify display dta d"Heat Guidance " ; 48 ($30) dta d"Bal Guidance " ; 49 @@ -872,7 +872,7 @@ NamesOfWeapons ;the comment is an index in the tables dta d"Battery " ; 54 dta d"Mag Deflector " ; 55 dta d"Shield " ; 56 - shield for one shot - dta d"Force Shield " ; 57 + dta d"Force Shield " ; 57 - shield with energy and parachute dta d"Heavy Shield " ; 58 - shield with energy dta d"Super Mag " ; 59 dta d"Auto Defense " ; 60 diff --git a/display.asm b/display.asm index 17371d4..c5366f5 100644 --- a/display.asm +++ b/display.asm @@ -167,7 +167,7 @@ textbuffer ; 0123456789012345678901234567890123456789 dta d"Player: " dta d"Energy: Angle: Force: " - dta d" Round: Wind: " + dta d"Round: Wind: " textbuffer2 dta d"Player: Cash: " dta d"----------------------------------------" diff --git a/grafproc.asm b/grafproc.asm index 5bd871b..b3eab39 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -695,9 +695,11 @@ 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 ; check one shot shield activation + cmp #56 ; one shot shield activation beq ShieldDraw - cmp #58 ; check shield with energy activation + cmp #57 ; shield with energy and parachute activation + beq ShieldDraw + cmp #58 ; shield with energy activation bne NoShieldDraw ShieldDraw jsr DrawTankShield.DrawInPosition diff --git a/scorch.asm b/scorch.asm index 86b45a2..8994e9b 100644 --- a/scorch.asm +++ b/scorch.asm @@ -129,11 +129,11 @@ START jsr RandomizeSequence ; for the round #1 shooting sequence is random - ; activate shield with energy for all players (test) + ; activate shield with energy and parachute for all players (test) ldx numberOfPlayers dex @ - mva #58 ActiveDefenceWeapon,x + mva #57 ActiveDefenceWeapon,x mva #99 ShieldEnergy,x ; set energy of shield dex bpl @- diff --git a/scorch.xex b/scorch.xex index 8ff3476a5a16f9019cefe0fb8d689b72f884afe1..8d4457d4c02ae9b72494623c9c61200a4b58f1f5 100644 GIT binary patch delta 12992 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 Lzxm#_^qc-K1_9NZ delta 12954 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 BW~TrE diff --git a/textproc.asm b/textproc.asm index cb64706..f0adc8c 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1690,8 +1690,6 @@ FinishResultDisplay bpl @- adw temp #NamesOfWeapons - ldy #6 ; from 6th character - ldy #15 @ lda (temp),y @@ -1699,6 +1697,39 @@ FinishResultDisplay dey bpl @- + ;--------------------- + ;displaying name of the defence weapon (if active) + ;--------------------- + lda #$08 ; ( + sta textbuffer+80+22 + lda #$09 ; ) + sta textbuffer+80+39 + lda ActiveDefenceWeapon,x + bne ActiveDefence + ; clear brackets + lda #$00 ; space + sta textbuffer+80+22 + sta textbuffer+80+39 + lda #47 ; no weapon name +ActiveDefence + sta temp ;get back number of the weapon + mva #0 temp+1 + ; times 16 (because this is length of weapon name) + ldy #3 ; shift left 4 times +@ + aslw temp + dey + bpl @- + + adw temp #NamesOfWeapons + + ldy #15 +@ + lda (temp),y + sta textbuffer+40+40+23,y + dey + bpl @- + ;--------------------- ;displaying the energy of a tank ;--------------------- @@ -1785,9 +1816,9 @@ AngleDisplay lda Wind+3 ; highest byte of 4 byte wind bmi DisplayLeftWind lda #$7f ; (tab) char - sta textbuffer+80+28 + sta textbuffer+80+20 lda #0 ;space - sta textbuffer+80+25 + sta textbuffer+80+17 beq DisplayWindValue DisplayLeftWind sec ; Wind = -Wind @@ -1798,14 +1829,14 @@ DisplayLeftWind sbc temp+1 sta temp+1 lda #$7e ;(del) char - sta textbuffer+80+25 + sta textbuffer+80+17 lda #0 ;space - sta textbuffer+80+28 + sta textbuffer+80+20 DisplayWindValue :4 lsrw temp ;divide by 16 to have a nice value on a screen lda temp sta decimal - mwa #textbuffer+80+26 displayposition + mwa #textbuffer+80+18 displayposition jsr displaybyte ;========================= @@ -1813,7 +1844,7 @@ DisplayWindValue ;========================= lda CurrentRoundNr sta decimal - mwa #textbuffer+80+14 displayposition + mwa #textbuffer+80+7 displayposition jsr displaybyte ;decimal (byte), displayposition (word) rts diff --git a/weapons.asm b/weapons.asm index cde7e13..76419c3 100644 --- a/weapons.asm +++ b/weapons.asm @@ -669,6 +669,8 @@ DistanceCheckLoop lda ActiveDefenceWeapon,x cmp #56 ; one hit shield beq UseShield + cmp #57 ; shield with energy and parachute + beq UseShieldWithEnergy cmp #58 ; shield with energy beq UseShieldWithEnergy jsr DecreaseEnergyX @@ -1321,8 +1323,11 @@ ShotUnderGround ; let's check if the given tank has got the parachute ldx TankNr lda ActiveDefenceWeapon,x - cmp #$35 ; parachute + cmp #53 ; parachute + beq ParachuteActive + cmp #57 ; scheld witch energy and parachute bne TankFallsX +ParachuteActive inc Parachute TankFallsX ; coordinates of the first pixel under the tank @@ -1524,7 +1529,11 @@ EndOfFall ; first we clear parachute on the screen mva #1 Erase ldx TankNr + lda ActiveDefenceWeapon,x + cmp #53 ; deactivate weapon only if parachute (53) + bne NoParachuteWeapon mva #0 ActiveDefenceWeapon,x ; deactivate defence weapon (parachute) +NoParachuteWeapon lda #$34 sta CharCode lda Ytankstable,x @@ -1537,6 +1546,8 @@ EndOfFall sta xdraw+1 jsr TypeChar mva #0 Erase + ldx TankNr + jsr DrawTankNr ; redraw tank after erase parachute (exactly for redraw leaky schield :) ) ThereWasNoParachute mva #sfx_silencer sfx_effect rts