From b164a79fd40804f548f8c1ce368658ecf6836ad3 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 5 Jul 2022 09:36:50 +0200 Subject: [PATCH] Napalm and Hot Napalm are working! And they have new prices. --- constants.asm | 2 +- definitions.asm | 6 +++--- scorch.xex | Bin 40873 -> 40871 bytes weapons.asm | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/constants.asm b/constants.asm index 87140ed..946ac94 100644 --- a/constants.asm +++ b/constants.asm @@ -435,7 +435,7 @@ WeaponUnits .by 3 ;Funky_Bomb_____ .by 2 ;MIRV___________ .by 1 ;Death_s_Head___ - .by 10 ;Napalm_________ + .by 4 ;Napalm_________ .by 2 ;Hot_Napalm_____ .by 20 ;Tracer_________ .by 10 ;Smoke_Tracer___ diff --git a/definitions.asm b/definitions.asm index d643c6f..9e263fb 100644 --- a/definitions.asm +++ b/definitions.asm @@ -8,7 +8,7 @@ display = $1010 ;screen takes $2K due to clearing routine MaxPlayers = 6 maxOptions = 7 ;number of all options PMOffset = $23 ; P/M to graphics offset - +napalmRadius = 10 ;Weapon prices (*10 on screen) price_Baby_Missile___ = 0 ;_0 @@ -19,8 +19,8 @@ price_LeapFrog_______ = 192 ;_4 price_Funky_Bomb_____ = 293 ;_5 price_MIRV___________ = 456 ;_6 price_Death_s_Head___ = 337 ;_7 -price_Napalm_________ = 20 ;496 ;_8 -price_Hot_Napalm_____ = 40 ;511 ;_9 +price_Napalm_________ = 125 ;_8 +price_Hot_Napalm_____ = 162 ;_9 price_Tracer_________ = 102 ;_10 price_Smoke_Tracer___ = 291 ;_11 price_Baby_Roller____ = 211 ;_12 diff --git a/scorch.xex b/scorch.xex index e5cf81af77aea32605117edddc3edee05196e63d..529b765ee42fba1c5a64e0cff3ff28db44e613fb 100644 GIT binary patch delta 14018 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 delta 13929 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 diff --git a/weapons.asm b/weapons.asm index 67c2cca..0f0905c 100644 --- a/weapons.asm +++ b/weapons.asm @@ -284,7 +284,7 @@ NoLowerCircle ; ------------------------ .proc napalm inc FallDown2 - mva #(10+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) + mva #(napalmRadius+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) jsr CalculateExplosionRange mva #0 ExplosionRadius ; in this weapon - flag: 0 - napalm, 1 - hotnapalm jmp xnapalm @@ -292,7 +292,7 @@ NoLowerCircle ; ------------------------ .proc hotnapalm inc FallDown2 - mva #(10+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) + mva #(napalmRadius+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) jsr CalculateExplosionRange mva #1 ExplosionRadius ; in this weapon - flag: 0 - napalm, 1 - hotnapalm jmp xnapalm @@ -304,7 +304,7 @@ NoLowerCircle sty magic RepeatNapalm ; external loop (for fire animation) mwa xcircle xdraw - sbw xdraw #(1*10) ; 10 characters on left side hit point + sbw xdraw #(napalmRadius) ; 10 characters on left side hit point ldy #0 sty magic+1 RepeatFlame ; internal loop (draw flames) @@ -351,21 +351,21 @@ CharOffTheScreen adw xdraw #1 ; next char 1 pixels to right inc magic+1 lda magic+1 - cmp #21 ; 10 chars on left, 10 chars on right and 1 in center + cmp #(2*napalmRadius+1) ; 10 chars on left, 10 chars on right and 1 in center jne RepeatFlame dec magic jpl RepeatNapalm + ; after napalm inc FallDown2 ;now we must check tanks in range ldx NumberOfPlayers + dex BurnedCheckLoop - dex lda eXistenZ,x beq EndNurnedCheckLoop ;here the tank exist - mwa xcircle xdraw ; calculate right edge of the fire - adw xdraw #(1*10-8) ; 10 characters on left side hit point (right edge of the fire - character width) + adw xcircle #(napalmRadius-8) xdraw ; 10 characters on right side hit point (right edge of the fire - character width) ; now we compare tank position with right edge of the fire (napalm) lda XtankstableH,x cmp xdraw+1 @@ -375,7 +375,7 @@ BurnedCheckLoop @ bcs TankOutOfFire ; let's calculate left edge of the fire - sbw xdraw #(21-8) ; 10 chars on left, 10 chars on right and 1 in center (- character width) + sbw xcircle #(napalmRadius+1) xdraw ; 10 chars on left and 1 in center bpl @+ mwa #0 xdraw ; left screen edge @ @@ -397,8 +397,8 @@ NotHot jsr DecreaseEnergyX TankOutOfFire EndNurnedCheckLoop - txa - bne BurnedCheckLoop + dex + bpl BurnedCheckLoop mva #sfx_silencer sfx_effect rts .endp