From dc896f81b05c2312d2c9cba120287297acae8cb7 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 31 Aug 2022 10:26:00 +0200 Subject: [PATCH 01/14] SoilDown optimization - 63 bytes saved --- grafproc.asm | 52 +++++++++++++++++++++------------------------- scorch.asm | 14 ++++++------- scorch.xex | Bin 50632 -> 50505 bytes weapons.asm | 57 ++++++++++++++++++++++++++------------------------- 4 files changed, 59 insertions(+), 64 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 2779518..6935036 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1263,20 +1263,37 @@ drawmountainsloop beq NoMountain sta ydraw sty ydraw+1 - jsr DrawLine +; jsr DrawLine +; there was Drawline proc + lda #screenheight + sec + sbc ydraw + sta tempbyte01 + jsr plot.MakePlot + ; after plot we have: (xbyte),y - addres of screen byte; X - index in bittable (number of bit) +; jmp IntoDraw ; jumps inside Draw routine + ; because one pixel is already plotted (and who cares? :) ) +@ + lda (xbyte),y + and bittable2,x + sta (xbyte),y +;IntoDraw + adw xbyte #screenBytes + dec tempbyte01 + bne @- +; end of Drawline proc NoMountain inw modify inw xdraw cpw xdraw #screenwidth bne drawmountainsloop rts +/* ;-------------------------------------------------- -drawmountainspixel +drawmountainspixel ; never used ? ;-------------------------------------------------- mwa #0 xdraw mwa #mountaintable modify - - drawmountainspixelloop ldy #0 lda (modify),y @@ -1287,8 +1304,8 @@ drawmountainspixelloop inw xdraw cpw xdraw #screenwidth bne drawmountainspixelloop - rts + */ .endp ;-------------------------------------------------- .proc SoilDown2 @@ -1761,31 +1778,8 @@ ClearPlot eor #$ff and bittable,x rts -.endp;-------------------------------------------------- -.proc DrawLine -;-------------------------------------------------- - mva #0 ydraw+1 - lda #screenheight - sec - sbc ydraw - sta tempbyte01 - jsr plot.MakePlot - ;rts - jmp IntoDraw ; jumps inside Draw routine - ; because one pixel is already plotted - -@ - lda (xbyte),y - and bittable2,x - sta (xbyte),y -IntoDraw - adw xbyte #screenBytes - dec tempbyte01 - bne @- - rts .endp - -; ------------------------------------------ +;-------------------------------------------------- .proc TypeChar ; puts char on the graphics screen ; in: CharCode diff --git a/scorch.asm b/scorch.asm index bced622..8da64e0 100644 --- a/scorch.asm +++ b/scorch.asm @@ -103,7 +103,7 @@ .zpvar Counter .byte ;temporary Counter for outside loops .zpvar ExplosionRadius .word ;because when adding in xdraw it is double byte .zpvar ResultY .byte - .zpvar FallDown2 .byte +; .zpvar FallDown2 .byte .zpvar xcircle .word .zpvar ycircle .word .zpvar vy .word @@ -643,7 +643,7 @@ ShootNow lda #0 sta FallDown1 - sta FallDown2 +; sta FallDown2 jsr Explosion continueMainRoundLoopAfterSeppuku @@ -658,9 +658,9 @@ AfterExplode mva #1 Erase jsr drawtanks mva #0 Erase - lda FallDown2 - beq NoFallDown2 - jsr SoilDown2 +; lda FallDown2 +; beq NoFallDown2 + jsr SoilDown2 ; allways NoFallDown2 ;here tanks are falling down @@ -812,7 +812,7 @@ NoPlayerNoDeath sta RangeRight sta RangeRight+1 sta FallDown1 - sta FallDown2 +; sta FallDown2 mwa #screenwidth RangeLeft ; We are randomizing the weapon now. @@ -920,7 +920,7 @@ NotNegativeShieldEnergy .proc Seppuku lda #0 sta FallDown1 - sta FallDown2 + ;sta FallDown2 sta ydraw+1 ; get position of the tank ldx TankNr diff --git a/scorch.xex b/scorch.xex index 06e314df5338bee94ccb05045713470d71533675..d393ec7bba5a29898f9185a5f101bf402cd85d62 100644 GIT binary patch delta 17178 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 diff --git a/weapons.asm b/weapons.asm index c7e3313..3178ecb 100644 --- a/weapons.asm +++ b/weapons.asm @@ -17,6 +17,7 @@ pha lda ExplosionRoutines,x pha +; inc FallDown2 rts ExplosionRoutines .word babymissile-1 ;Baby_Missile___;_00 @@ -61,7 +62,7 @@ tracer ; ------------------------ .proc babymissile mva #sfx_baby_missile sfx_effect - inc FallDown2 +; inc FallDown2 mva #11 ExplosionRadius jsr CalculateExplosionRange jmp xmissile @@ -69,7 +70,7 @@ tracer ; ------------------------ .proc missile ; mva #sfx_baby_missile sfx_effect - inc FallDown2 +; inc FallDown2 mva #17 ExplosionRadius jsr CalculateExplosionRange jmp xmissile @@ -77,7 +78,7 @@ tracer ; ------------------------ .proc babynuke mva #sfx_nuke sfx_effect - inc FallDown2 +; inc FallDown2 mva #25 ExplosionRadius jsr CalculateExplosionRange jmp xmissile @@ -85,7 +86,7 @@ tracer ; ------------------------ .proc nuke mva #sfx_nuke sfx_effect - inc FallDown2 +; inc FallDown2 mva #30 ExplosionRadius jsr CalculateExplosionRange jmp xmissile @@ -93,7 +94,7 @@ tracer ; ------------------------ .proc leapfrog mva #sfx_baby_missile sfx_effect - inc FallDown2 +; inc FallDown2 mva #17 ExplosionRadius jsr CalculateExplosionRange jsr xmissile @@ -163,7 +164,7 @@ EndOfLeapping .endp ; ------------------------ .proc mirv ; the whole mirv is performed by Flight routine - inc FallDown2 +; inc FallDown2 rts .endp ; ------------------------ @@ -171,7 +172,7 @@ EndOfLeapping mva #sfx_baby_missile sfx_effect mwa xtraj+1 xtrajfb sbw ytraj+1 #$05 ytrajfb ; funky missiles start point goes 5 pixel UP to prevent multiple explosion at one point if tank is hit (4 pixels tank height + 1) - inc FallDown2 +; inc FallDown2 ;central Explosion mva #21 ExplosionRadius jsr CalculateExplosionRange0 @@ -229,7 +230,7 @@ NoWallsInFunky .endp ; ------------------------ .proc deathshead - inc FallDown2 +; inc FallDown2 mva #30 ExplosionRadius jsr CalculateExplosionRange @@ -285,7 +286,7 @@ NoLowerCircle ; ------------------------ .proc napalm mva #sfx_napalm sfx_effect - inc FallDown2 +; inc FallDown2 mva #(napalmRadius+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) jsr CalculateExplosionRange mva #0 ExplosionRadius ; in this weapon - flag: 0 - napalm, 1 - hotnapalm @@ -294,7 +295,7 @@ NoLowerCircle ; ------------------------ .proc hotnapalm mva #sfx_napalm sfx_effect - inc FallDown2 +; inc FallDown2 mva #(napalmRadius+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) jsr CalculateExplosionRange mva #1 ExplosionRadius ; in this weapon - flag: 0 - napalm, 1 - hotnapalm @@ -359,7 +360,7 @@ CharOffTheScreen dec magic jpl RepeatNapalm ; after napalm - inc FallDown2 +; inc FallDown2 ;now we must check tanks in range ldx NumberOfPlayers dex @@ -407,32 +408,32 @@ EndNurnedCheckLoop .endp ; ------------------------ .proc babyroller - inc FallDown2 +; inc FallDown2 mva #11 ExplosionRadius jmp xroller .endp ; ------------------------ .proc roller ; - inc FallDown2 +; inc FallDown2 mva #21 ExplosionRadius jmp xroller .endp ; ------------------------ .proc heavyroller - inc FallDown2 +; inc FallDown2 mva #30 ExplosionRadius jmp xroller .endp ; ------------------------ .proc riotbomb - inc FallDown2 +; inc FallDown2 mva #17 ExplosionRadius jsr CalculateExplosionRange jmp xriotbomb .endp ; ------------------------ .proc heavyriotbomb - inc FallDown2 +; inc FallDown2 mva #29 ExplosionRadius jsr CalculateExplosionRange jmp xriotbomb @@ -441,7 +442,7 @@ EndNurnedCheckLoop .proc babydigger mva #sfx_digger sfx_effect mva #0 sandhogflag - inc FallDown2 +; inc FallDown2 mva #13 DigLong mva #1 diggery ; how many branches (-1) jmp xdigger @@ -450,7 +451,7 @@ EndNurnedCheckLoop .proc digger ; mva #sfx_digger sfx_effect mva #0 sandhogflag - inc FallDown2 +; inc FallDown2 mva #13 DigLong mva #3 diggery ; how many branches (-1) jmp xdigger @@ -459,7 +460,7 @@ EndNurnedCheckLoop .proc heavydigger mva #sfx_digger sfx_effect mva #0 sandhogflag - inc FallDown2 +; inc FallDown2 mva #13 DigLong mva #7 diggery ; how many branches (-1) jmp xdigger @@ -583,7 +584,7 @@ DiggerCharacter .proc babysandhog mva #sfx_sandhog sfx_effect mva #char_sandhog_offset sandhogflag - inc FallDown2 +; inc FallDown2 mva #13 DigLong mva #1 diggery ; how many branches (-1) jmp xdigger @@ -592,7 +593,7 @@ DiggerCharacter .proc sandhog mva #sfx_sandhog sfx_effect mva #char_sandhog_offset sandhogflag - inc FallDown2 +; inc FallDown2 mva #13 DigLong mva #3 diggery ; how many branches (-1) jmp xdigger @@ -601,35 +602,35 @@ DiggerCharacter .proc heavysandhog mva #sfx_sandhog sfx_effect mva #char_sandhog_offset sandhogflag - inc FallDown2 +; inc FallDown2 mva #13 DigLong mva #5 diggery ; how many branches (-1) jmp xdigger .endp ; ------------------------ .proc dirtclod - inc FallDown2 +; inc FallDown2 mva #12 ExplosionRadius jsr CalculateExplosionRange jmp xdirt .endp ; ------------------------ .proc dirtball - inc FallDown2 +; inc FallDown2 mva #22 ExplosionRadius jsr CalculateExplosionRange jmp xdirt .endp ; ------------------------ .proc tonofdirt - inc FallDown2 +; inc FallDown2 mva #31 ExplosionRadius jsr CalculateExplosionRange jmp xdirt .endp ; ------------------------ .proc dirtcharge - inc FallDown2 +; inc FallDown2 mva #61 ExplosionRadius jsr CalculateExplosionRange jmp ofdirt @@ -637,7 +638,7 @@ DiggerCharacter ; ------------------------ .proc riotcharge mva #sfx_riot_blast sfx_effect - inc FallDown2 +; inc FallDown2 mva #31 ExplosionRadius jsr CalculateExplosionRange jmp cleanDirt @@ -645,7 +646,7 @@ DiggerCharacter ; ------------------------ .proc riotblast mva #sfx_riot_blast sfx_effect - inc FallDown2 +; inc FallDown2 mva #61 ExplosionRadius jsr CalculateExplosionRange jmp cleanDirt From 3bd870e2454bb8c9d9cd8aae682c227cceff3625 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 31 Aug 2022 14:23:16 +0200 Subject: [PATCH 02/14] Minor optimizations (9b :) ) --- scorch.asm | 3 --- scorch.xex | Bin 50505 -> 50496 bytes variables.asm | 1 - 3 files changed, 4 deletions(-) diff --git a/scorch.asm b/scorch.asm index 8da64e0..a29a9c2 100644 --- a/scorch.asm +++ b/scorch.asm @@ -642,7 +642,6 @@ ShootNow beq missed lda #0 - sta FallDown1 ; sta FallDown2 jsr Explosion @@ -811,7 +810,6 @@ NoPlayerNoDeath ;cleanup of the soil fall down ranges (left and right) sta RangeRight sta RangeRight+1 - sta FallDown1 ; sta FallDown2 mwa #screenwidth RangeLeft @@ -919,7 +917,6 @@ NotNegativeShieldEnergy ;--------------------------------- .proc Seppuku lda #0 - sta FallDown1 ;sta FallDown2 sta ydraw+1 ; get position of the tank diff --git a/scorch.xex b/scorch.xex index d393ec7bba5a29898f9185a5f101bf402cd85d62..09d1bd647dd69e64df3371da7a9e43d1eb1ef2a9 100644 GIT binary patch delta 14617 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 AB>(^b delta 14736 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 diff --git a/variables.asm b/variables.asm index 6573a2a..379ae63 100644 --- a/variables.asm +++ b/variables.asm @@ -315,7 +315,6 @@ decimalresult .DS 5 ;ExplosionRadius .DS 2 ;because when adding in xdraw it is double byte ;round CurrentRoundNr .DS 1 -FallDown1 .DS 1 ;FallDown2 .DS 1 ;leapfrog LeapFrogAngle .DS 1 From c8eb7601c27ce0762f048ef38c03bc877989b366 Mon Sep 17 00:00:00 2001 From: pkali Date: Wed, 31 Aug 2022 08:43:35 -0400 Subject: [PATCH 03/14] align align --- display.asm | 77 +++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/display.asm b/display.asm index 817666e..7c4a95e 100644 --- a/display.asm +++ b/display.asm @@ -1,12 +1,9 @@ ; @com.wudsn.ide.asm.mainsourcefile=scorch.asm .IF *>0 ;this is a trick that prevents compiling this file alone -; ------------------------------------------------- - ; .ALIGN $1000 ; WARNING!!!! 4KiB barrier crossing here, might need reassignment!!! ;----------------------------------------------- -;------------------------ ; start of "variables" (RAM) -; --------------- +;----------------------------------------------- OptionsHere ; 0123456789012345678901234567890123456789 dta d"Players : 2 3 4 5 6 " @@ -105,7 +102,7 @@ DLCreditsAddr .word GameOverDL ;------------------------ ; end of "variables" (RAM) -; --------------- +;------------------------ ; start of "constants" (ROM) ;----------------------------------------------- ;Screen displays go first to avoid crossing 4kb barrier @@ -122,7 +119,6 @@ MoreUp dta d" more " dta 92,92,92 dta d" " - .ALIGN $1000 ; WARNING!!!! 4KiB barrier crossing here, might need reassignment!!! MoreDown dta d" " dta 93,93,93 @@ -163,40 +159,6 @@ GameOverTitle2 ;----------------------------------------------------- ;-------------display-lists--------------------------- ;----------------------------------------------------- -OptionsDL - .byte $70 - .byte $47 - .word OptionsTitle - .byte $70,$70 - .byte $42 - .word OptionsScreen - .byte $30,$02,$02,$70 - .byte $42 - .word OptionsHere - .byte $10 - :maxOptions-1 .by $02,$10 - :(9-maxOptions) .by $70,$10 - .byte $80 - .byte $4f - .word (display+140*40) - :21 .by $0f ;76 - .byte $41 - .word OptionsDL -;------------------------ -;Enter names of tanks DL -NameDL - .byte $70 - .byte $47 - .word DifficultyTitle - .byte $70,$70 - .byte $42 - .word NameScreen - .byte $30 - .byte $02,$30+$80,$02 - .byte $10,$02,$02,$02,$30,$02,$02 - .byte $41 - .word NameDL -; ------------------------------------------------- dl ; MAIN game display list .byte 0 @@ -245,6 +207,41 @@ dl ; MAIN game display list .byte $41 .word dl ;----------------------------------------------- + .ALIGN $1000 ; WARNING!!!! 4KiB barrier crossing here, might need reassignment!!! +OptionsDL + .byte $70 + .byte $47 + .word OptionsTitle + .byte $70,$70 + .byte $42 + .word OptionsScreen + .byte $30,$02,$02,$70 + .byte $42 + .word OptionsHere + .byte $10 + :maxOptions-1 .by $02,$10 + :(9-maxOptions) .by $70,$10 + .byte $80 + .byte $4f + .word (display+140*40) + :21 .by $0f ;76 + .byte $41 + .word OptionsDL +;------------------------ +;Enter names of tanks DL +NameDL + .byte $70 + .byte $47 + .word DifficultyTitle + .byte $70,$70 + .byte $42 + .word NameScreen + .byte $30 + .byte $02,$30+$80,$02 + .byte $10,$02,$02,$02,$30,$02,$02 + .byte $41 + .word NameDL +; ------------------------------------------------- GameOverResults = display+$0ff0 ; reuse after game Credits = GameOverResults +(6*40) CreditsLastLine = Credits + (CreditsLines*40) From f45cbde341f90a2ad5a0615d325b84bd324d7bfc Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 31 Aug 2022 17:14:35 +0200 Subject: [PATCH 04/14] AI optimization (50b saved) --- ai.asm | 80 +++++++++++++++++++---------------------------------- scorch.xex | Bin 50496 -> 50446 bytes 2 files changed, 29 insertions(+), 51 deletions(-) diff --git a/ai.asm b/ai.asm index ab9e339..0c464db 100644 --- a/ai.asm +++ b/ai.asm @@ -155,13 +155,8 @@ endo ; choose the best weapon - ldy #last_offensive_____ ;the last weapon -loop - dey - lda (temp),y ; this is set up before calling the routine, has address of TanksWeaponsTable - beq loop - tya - sta ActiveWeapon,x + ldy #last_offensive_____ ;the last weapon to choose +1 + jsr ChooseBestOffensive rts .endp ;---------------------------------------------- @@ -207,17 +202,8 @@ endo ; choose the best weapon - lda TanksWeaponsTableL,x - sta temp - lda TanksWeaponsTableH,x - sta temp+1 - ldy #ind_Laser__________ ;the last offensive weapon -loop - dey - lda (temp),y - beq loop - tya - sta ActiveWeapon,x + ldy #ind_Laser__________ ;the last offensive weapon to choose +1 + jsr ChooseBestOffensive rts ;---------------------------------------------- @@ -331,17 +317,8 @@ NoUseDefensive jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - lda TanksWeaponsTableL,x - sta temp - lda TanksWeaponsTableH,x - sta temp+1 - ldy #ind_LeapFrog_______ ;the last offensive weapon to use -loop - dey - lda (temp),y - beq loop - tya - sta ActiveWeapon,x + ldy #ind_LeapFrog_______ ;the last offensive weapon to use +1 + jsr ChooseBestOffensive ; randomizing force +-100 sbw Force #100 RandBoundaryLow @@ -372,17 +349,8 @@ HighForce jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - lda TanksWeaponsTableL,x - sta temp - lda TanksWeaponsTableH,x - sta temp+1 - ldy #ind_LeapFrog_______ ;the last offensive weapon to use -loop - dey - lda (temp),y - beq loop - tya - sta ActiveWeapon,x + ldy #ind_LeapFrog_______ ;the last offensive weapon to use +1 + jsr ChooseBestOffensive ; randomizing force +-50 sbw Force #50 RandBoundaryLow @@ -412,17 +380,8 @@ HighForce jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - lda TanksWeaponsTableL,x - sta temp - lda TanksWeaponsTableH,x - sta temp+1 - ldy #ind_LeapFrog_______ ;the last offensive weapon to use -loop - dey - lda (temp),y - beq loop - tya - sta ActiveWeapon,x + ldy #ind_LeapFrog_______ ;the last offensive weapon to use +1 + jsr ChooseBestOffensive lda Force sta ForceTableL,x @@ -1052,3 +1011,22 @@ SorryNoPurchase rts .endp +;---------------------------------------------- +.proc ChooseBestOffensive +; choose the best weapon +; Y - the last offensive weapon to use + 1 +; X - TankNr +;---------------------------------------------- + + lda TanksWeaponsTableL,x + sta temp + lda TanksWeaponsTableH,x + sta temp+1 +loop + dey + lda (temp),y + beq loop + tya + sta ActiveWeapon,x + rts +.endp \ No newline at end of file diff --git a/scorch.xex b/scorch.xex index 09d1bd647dd69e64df3371da7a9e43d1eb1ef2a9..91079c2b4b5e31dfd25cba27cfd311bf48a5a57e 100644 GIT binary patch delta 16278 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 delta 16392 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 From aa6c37eb6145a17b598e1778ef582f2a5b4dd248 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 31 Aug 2022 20:35:20 +0200 Subject: [PATCH 05/14] AI optimizations and more (81b loss :( ) --- MANUAL_EN.md | 10 ++++---- MANUAL_PL.md | 10 ++++---- ai.asm | 62 +++++++++++++++++++++++++++++++++++++------------- constants.asm | 2 +- scorch.xex | Bin 50446 -> 50527 bytes 5 files changed, 57 insertions(+), 27 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index 137a0ab..951b003 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -209,11 +209,11 @@ The game has 8 difficulty levels of computer-controlled opponents. Or actually 7 ** **Tosser** - When attacking, he acts exactly like **Poolshark** however, he may have a "better" weapon inventory due to a different purchase tactic. He always activates the best defensive weapon he has before shooting. And just like **Poolshark** he uses **Battery** and **White Flag**. At the beginning of the round, he assesses how much money he has and depending on that, he makes (money/5100) attempts to buy defensive weapons and then checks again how much money he has left and makes (money/1250) attempts to buy offensive weapons. -** **Chooser** - Takes as a target the weakest opponent (with the least amount of energy) and aims very precisely, but before the shot the energy of the shot is modified by the parameter of luck :) , that is, despite the precise aiming it does not always hit. He shoots with the best weapon he has unless low energy is required (the target is close). Then he changes his weapon to **Baby Missile** to avoid hitting himself. He always activates the best defensive weapon he has before shooting and, like **Poolshark**, uses **Battery** and **White Flag**. He purchases just like **Tosser**. +** **Chooser** - Takes as a target the weakest opponent (with the least amount of energy) and aims very precisely, but before the shot the energy of the shot is modified by the parameter of luck :) , that is, despite the precise aiming it does not always hit. He shoots with the best weapon he has unless the target is close. Then he changes his weapon to **Baby Missile** to avoid hitting himself. He always activates the best defensive weapon he has before shooting and, like **Poolshark**, uses **Battery** and **White Flag**. He purchases just like **Tosser**. * **Spoiler** - He shoots exactly like **Chooser** except that he has more luck :) , which means that even if he doesn't hit the target of his choice, it can be a more precise shot than **Chooser**. He uses defensive weapons exactly like **Chooser**. At the beginning of the round, he assesses how much money he has and depending on that, he makes (money/5100) attempts to buy defensive weapons and then checks again how much money he has left and makes (money/320) attempts to buy offensive weapons. When buying defensive weapons, he buys only strong and precise weapons - that is, weapons that won't accidentally hurt him. -** **Cyborg** - Takes aim at the weakest opponent (with the least amount of energy) but prefers human-controlled opponents. Aims very accurately and in the vast majority of cases hits on the first shot. He fires the shot with the best weapon he has unless low energy is required (the target is close). Then he changes his weapon to **Baby Missile** to avoid hitting himself. He uses defensive weapons exactly like **Chooser**. He shops exactly like **Spoiler**. +** **Cyborg** - Takes aim at the weakest opponent (with the least amount of energy) but prefers human-controlled opponents. Aims very accurately and in the vast majority of cases hits on the first shot. He fires the shot with the best weapon he has unless the target is close. Then he changes his weapon to **Baby Missile** to avoid hitting himself. He uses defensive weapons exactly like **Chooser**. He shops exactly like **Spoiler**. * **Unknown** - Before firing each shot, he randomly chooses a course of action from **Poolshark** to **Cyborg** and applies his tactics. However, the tactics of weapon purchases are always identical to **Tosser**. @@ -241,9 +241,9 @@ Table of weapons purchased by: **Spoiler** and **Cyborg**. | Offensive weapons | Defensive weapons | | --- | --- | -| Baby Nuke | Battery | -| Nuke | Strong Parachute | -| Death's Head | Mag Deflector | +| Missile | Battery | +| Baby Nuke | Strong Parachute | +| Nuke | Mag Deflector | | Hot Napalm | Heavy Shield | | | Force Shield | | | Bouncy Castle | diff --git a/MANUAL_PL.md b/MANUAL_PL.md index e66fe67..adff1fa 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -204,11 +204,11 @@ Gra posiada 8 poziomów trudności przeciwników sterowanych przez komputer. A w * **Tosser** - Atakując działa dokładnie tak jak **Poolshark** jednak może posiadać "lepszy" zasób broni dzięki innej taktyce zakupów. Zawsze przed strzałem aktywuje najlepszą posiadaną broń defensywną. i tak jak **Poolshark** stosuje **Battery** i **White Flag**. Na początku rundy ocenia ile ma pieniędzy i w zależności od tego podejmuje (pieniądze/5100) prób zakupu broni defensywnych a następnie jeszcze raz sprawdza ile pieniędzy mu zostało i podejmuje (pieniądze/1250) prób zakupu broni ofensywnych. -* **Chooser** - Obiera sobie za cel najsłabszego przeciwnika (o najmniejszym zasobie energii) i celuje bardzo dokładnie, jednak przed samym strzałem energia strzału modyfikowana jest o parametr szczęścia :) , czyli mimo precyzyjnego wycelowania nie zawsze trafia. Strzał oddaje najlepszą posiadaną bronią chyba że wymagana jest małą energia (cel jest blisko). Wtedy zmienia broń na **Baby Missile** by unikać trafienia samego siebie. Zawsze przed strzałem aktywuje najlepszą posiadaną broń defensywną i tak jak **Poolshark** stosuje **Battery** i **White Flag**. Zakupów dokonuje tak samo jak **Tosser**. +* **Chooser** - Obiera sobie za cel najsłabszego przeciwnika (o najmniejszym zasobie energii) i celuje bardzo dokładnie, jednak przed samym strzałem energia strzału modyfikowana jest o parametr szczęścia :) , czyli mimo precyzyjnego wycelowania nie zawsze trafia. Strzał oddaje najlepszą posiadaną bronią chyba że cel jest blisko. Wtedy zmienia broń na **Baby Missile** by unikać trafienia samego siebie. Zawsze przed strzałem aktywuje najlepszą posiadaną broń defensywną i tak jak **Poolshark** stosuje **Battery** i **White Flag**. Zakupów dokonuje tak samo jak **Tosser**. * **Spoiler** - Strzela dokładnie tak jak **Chooser** tyle, że ma więcej szczęścia :) , co oznacza że nawet jeśli nie trafi w wybrany cel, to może być to strzał precyzyjniejszy niż **Chooser**. Broni defensywnych używa dokładnie tak jak **Chooser**. Na początku rundy ocenia ile ma pieniędzy i w zależności od tego podejmuje (pieniądze/5100) prób zakupu broni defensywnych a następnie jeszcze raz sprawdza ile pieniędzy mu zostało i podejmuje (pieniądze/320) prób zakupu broni ofensywnych. Przy zakupie broni defensywnych kupuje tylko bronie silne i precyzyjne - czyli takie, które nie zrobią mu przypadkiem krzywdy. -* **Cyborg** - Obiera sobie za cel najsłabszego przeciwnika (o najmniejszym zasobie energii) lecz preferuje przeciwników sterowanych przez człowieka. Celuje bardzo dokładnie i w zdecydowanej większości przypadków trafia za pierwszym strzałem. Strzał oddaje najlepszą posiadaną bronią chyba że wymagana jest małą energia (cel jest blisko). Wtedy zmienia broń na **Baby Missile** by unikać trafienia samego siebie. Broni defensywnych używa dokładnie tak jak **Chooser**. Zakupy robi dokładnie tak jak **Spoiler** +* **Cyborg** - Obiera sobie za cel najsłabszego przeciwnika (o najmniejszym zasobie energii) lecz preferuje przeciwników sterowanych przez człowieka. Celuje bardzo dokładnie i w zdecydowanej większości przypadków trafia za pierwszym strzałem. Strzał oddaje najlepszą posiadaną bronią chyba że cel jest blisko. Wtedy zmienia broń na **Baby Missile** by unikać trafienia samego siebie. Broni defensywnych używa dokładnie tak jak **Chooser**. Zakupy robi dokładnie tak jak **Spoiler** * **Unknown** - Przed oddaniem każdego strzału losowo wybiera sposób działania od **Poolsharka** do **Cyborga** i stosuje jego taktykę. Taktyka zakupów broni jest jednak zawsze identyczna jak **Tosser** @@ -236,9 +236,9 @@ Tabela broni kupowanych przez: **Spoiler** i **Cyborg** | bronie ofensywne | bronie defensywne | | --- | --- | -| Baby Nuke | Battery | -| Nuke | Strong Parachute | -| Death's Head | Mag Deflector | +| Missile | Battery | +| Baby Nuke | Strong Parachute | +| Nuke | Mag Deflector | | Hot Napalm | Heavy Shield | | | Force Shield | | | Bouncy Castle | diff --git a/ai.asm b/ai.asm index 0c464db..e65a98d 100644 --- a/ai.asm +++ b/ai.asm @@ -155,7 +155,6 @@ endo ; choose the best weapon - ldy #last_offensive_____ ;the last weapon to choose +1 jsr ChooseBestOffensive rts .endp @@ -202,7 +201,6 @@ endo ; choose the best weapon - ldy #ind_Laser__________ ;the last offensive weapon to choose +1 jsr ChooseBestOffensive rts @@ -317,7 +315,6 @@ NoUseDefensive jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - ldy #ind_LeapFrog_______ ;the last offensive weapon to use +1 jsr ChooseBestOffensive ; randomizing force +-100 @@ -327,9 +324,10 @@ NoUseDefensive NotNegativeEnergy adw Force #100 RandBoundaryHigh jsr RandomizeForce - lda ForceTableH,x - bne HighForce - ; if Force lower than 256 - set weapon to Baby Missile (for security :) ) + ; if target distance lower than 24 - set weapon to Baby Missile (for security :) + jsr GetDistance + cpw temp2 #24 + bcs HighForce lda #ind_Baby_Missile___ sta ActiveWeapon,x HighForce @@ -349,7 +347,6 @@ HighForce jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - ldy #ind_LeapFrog_______ ;the last offensive weapon to use +1 jsr ChooseBestOffensive ; randomizing force +-50 @@ -359,9 +356,10 @@ HighForce NotNegativeEnergy adw Force #50 RandBoundaryHigh jsr RandomizeForce - lda ForceTableH,x - bne HighForce - ; if Force lower than 256 - set weapon to Baby Missile (for security :) ) + ; if target distance lower than 24 - set weapon to Baby Missile (for security :) + jsr GetDistance + cpw temp2 #24 + bcs HighForce lda #ind_Baby_Missile___ sta ActiveWeapon,x HighForce @@ -380,15 +378,17 @@ HighForce jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - ldy #ind_LeapFrog_______ ;the last offensive weapon to use +1 - jsr ChooseBestOffensive + ldy ind_Nuke___________+1 + jsr ChooseBestOffensive.NotFromAll lda Force sta ForceTableL,x lda Force+1 sta ForceTableH,x - bne HighForce - ; if Force lower than 256 - set weapon to Baby Missile (for security :) ) + ; if target distance lower than 32 - set weapon to Baby Missile (for security :) + jsr GetDistance + cpw temp2 #32 + bcs HighForce lda #ind_Baby_Missile___ sta ActiveWeapon,x HighForce @@ -1014,10 +1014,11 @@ SorryNoPurchase ;---------------------------------------------- .proc ChooseBestOffensive ; choose the best weapon -; Y - the last offensive weapon to use + 1 ; X - TankNr ;---------------------------------------------- - + ldy #last_offensive_____+1 ;the last weapon to choose +1 +NotFromAll +; Y - the last offensive weapon to use + 1 lda TanksWeaponsTableL,x sta temp lda TanksWeaponsTableH,x @@ -1029,4 +1030,33 @@ loop tya sta ActiveWeapon,x rts +.endp +;---------------------------------------------- +.proc GetDistance +; calculates distance from tank X to TargetTankNr(Y) +; result in temp2 +;---------------------------------------------- + ldy TargetTankNr + lda xTanksTableH,x + cmp xTanksTableH,y + bne @+ + lda xTanksTableL,x + cmp xTanksTableL,y +@ bcs YisLower + sec + lda xTanksTableL,y + sbc xTanksTableL,x + sta temp2 + lda xTanksTableH,y + sbc xTanksTableH,x + sta temp2+1 + rts +YisLower + lda xTanksTableL,x + sbc xTanksTableL,y + sta temp2 + lda xTanksTableH,x + sbc xTanksTableH,y + sta temp2+1 + rts .endp \ No newline at end of file diff --git a/constants.asm b/constants.asm index 7a4dd52..2f55d79 100644 --- a/constants.asm +++ b/constants.asm @@ -397,7 +397,7 @@ PurchaseMeTable2 ;weapons good to be purchased by the robot (Cyborg) ;the comment is an index in the tables ; "Baby Missile ","Missile ","Baby Nuke ","Nuke " ; "LeapFrog ","Funky Bomb ","MIRV ","Death's Head " - .by %00110001 + .by %01110000 ; "Napalm ","Hot Napalm ","Tracer ","Smoke Tracer " ; "Baby Roller ","Roller ","Heavy Roller ","Riot Charge " .by %01000000 diff --git a/scorch.xex b/scorch.xex index 91079c2b4b5e31dfd25cba27cfd311bf48a5a57e..a5cf2245350abaf9a2ea3a291ecbfea63f8d1bc5 100644 GIT binary patch delta 10531 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 Xymj?w^H<*8TK#U#e#A8~|* From 73db3edb453d2d7b09cee6fbb680ccc09d004f83 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 31 Aug 2022 21:09:26 +0200 Subject: [PATCH 06/14] More AI optimization (59b saved :) ) --- ai.asm | 78 +++++++++++++++++++++++------------------------------ scorch.xex | Bin 50527 -> 50468 bytes 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/ai.asm b/ai.asm index e65a98d..2006d6c 100644 --- a/ai.asm +++ b/ai.asm @@ -8,26 +8,6 @@ ; - shoots random direction and force ; greeeting to myself 10 years older in 2013-11-09... still no idea -;---------------------------------------------- -.proc MakeLowResDistances - ; create low precision table of positions - ; by dividing positions by 4 - - ldy #MaxPlayers-1 -loop - lda xtankstableL,y - sta temp - lda xtankstableH,y - sta temp+1 - - ;= /4 - :2 lsrw temp - lda temp - sta LowResDistances,y - dey - bpl loop - rts -.endp ;---------------------------------------------- .proc ArtificialIntelligence ; @@ -43,6 +23,25 @@ loop lda AIRoutines,y pha +;---------------------------------------------- +;.proc MakeLowResDistances + ; create low precision table of positions + ; by dividing positions by 4 + ldy #MaxPlayers-1 +loop + lda xtankstableL,y + sta temp + lda xtankstableH,y + sta temp+1 + ;= /4 + :2 lsrw temp + lda temp + sta LowResDistances,y + dey + bpl loop +; rts +;.endp + ; common values used in AI routines ; address of weapons table (for future use) lda TanksWeaponsTableL,x @@ -326,7 +325,7 @@ NotNegativeEnergy jsr RandomizeForce ; if target distance lower than 24 - set weapon to Baby Missile (for security :) jsr GetDistance - cpw temp2 #24 + cmp #6 ; 24/4 bcs HighForce lda #ind_Baby_Missile___ sta ActiveWeapon,x @@ -358,7 +357,7 @@ NotNegativeEnergy jsr RandomizeForce ; if target distance lower than 24 - set weapon to Baby Missile (for security :) jsr GetDistance - cpw temp2 #24 + cmp #6 ; 24/4 bcs HighForce lda #ind_Baby_Missile___ sta ActiveWeapon,x @@ -378,7 +377,7 @@ HighForce jsr TakeAim ; direction still in A (0 - left, >0 - right) ; choose the best weapon - ldy ind_Nuke___________+1 + ldy #ind_Nuke___________+1 jsr ChooseBestOffensive.NotFromAll lda Force @@ -387,7 +386,7 @@ HighForce sta ForceTableH,x ; if target distance lower than 32 - set weapon to Baby Missile (for security :) jsr GetDistance - cpw temp2 #32 + cmp #8 ;32/4 bcs HighForce lda #ind_Baby_Missile___ sta ActiveWeapon,x @@ -404,7 +403,7 @@ HighForce ; direcion of shoot in A (0 - left, >0 - right) ;---------------------------------------------- sta PreferHumansFlag - jsr MakeLowResDistances +; jsr MakeLowResDistances lda #202 sta temp2 ; max possible energy lda #0 @@ -456,7 +455,7 @@ skipThisPlayer ; returns target tank number in Y and ; direcion of shoot in A (0 - left, >0 - right) ;---------------------------------------------- - jsr MakeLowResDistances +; jsr MakeLowResDistances mva #$ff temp2 ; min possible distance mva #0 tempor2 ; direction of shoot @@ -1033,30 +1032,19 @@ loop .endp ;---------------------------------------------- .proc GetDistance -; calculates distance from tank X to TargetTankNr(Y) -; result in temp2 +; calculates lores ( /4 ) distance from tank X to TargetTankNr(Y) +; result in A ;---------------------------------------------- ldy TargetTankNr - lda xTanksTableH,x - cmp xTanksTableH,y - bne @+ - lda xTanksTableL,x - cmp xTanksTableL,y + lda LowResDistances,x + cmp LowResDistances,y @ bcs YisLower sec - lda xTanksTableL,y - sbc xTanksTableL,x - sta temp2 - lda xTanksTableH,y - sbc xTanksTableH,x - sta temp2+1 + lda LowResDistances,y + sbc LowResDistances,x rts YisLower - lda xTanksTableL,x - sbc xTanksTableL,y - sta temp2 - lda xTanksTableH,x - sbc xTanksTableH,y - sta temp2+1 + lda LowResDistances,x + sbc LowResDistances,y rts .endp \ No newline at end of file diff --git a/scorch.xex b/scorch.xex index a5cf2245350abaf9a2ea3a291ecbfea63f8d1bc5..f22a17ce5360e7a312b3159765785cb547bd65d2 100644 GIT binary patch delta 10434 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 delta 10521 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 Date: Thu, 1 Sep 2022 14:31:58 +0200 Subject: [PATCH 07/14] Minor otimizations (32b saved) --- scorch.asm | 21 +++++++++------------ scorch.xex | Bin 50468 -> 50436 bytes textproc.asm | 3 +-- weapons.asm | 3 +-- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/scorch.asm b/scorch.asm index a29a9c2..7f32d8a 100644 --- a/scorch.asm +++ b/scorch.asm @@ -171,8 +171,7 @@ WeaponFont ; Game Code ;-------------------------------------------------- FirstSTART - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen ; one time zero variables in RAM (non zero page) lda #0 @@ -227,14 +226,12 @@ START jsr Options ;startup screen - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen bit escFlag bmi START jsr EnterPlayerNames - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen bit escFlag bmi START @@ -255,8 +252,7 @@ SettingBarrel jsr CallPurchaseForEveryTank ; issue #72 (glitches when switches) - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen bit escFlag bmi START @@ -386,14 +382,12 @@ eskipzeroing lda GameIsOver beq NoGameOverYet GoGameOver - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen jsr GameOverScreen jmp START NoGameOverYet inc CurrentRoundNr - lda #$0 - sta dmactls ; issue #72 + jsr MakeDarkScreen ; issue #72 jsr RmtSongSelect mva #sfx_silencer sfx_effect jsr PMoutofscreen @@ -1629,6 +1623,9 @@ peopleAreHere noKey rts .endp +MakeDarkScreen + mva #0 dmactls ; dark screen + ; and wait one frame :) .proc WaitOneFrame lda CONSOL and #%00000101 ; Start + Option diff --git a/scorch.xex b/scorch.xex index f22a17ce5360e7a312b3159765785cb547bd65d2..3b553305a8729cfce39142352dbc8739d95b834d 100644 GIT binary patch delta 14643 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 diff --git a/textproc.asm b/textproc.asm index c58b447..46a37b2 100644 --- a/textproc.asm +++ b/textproc.asm @@ -2161,8 +2161,7 @@ FastTank bpl AllTanksFloatingDown jsr IsKeyPressed bne MainTanksFloatingLoop ; neverending loop - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen jsr GameOverResultsClear rts RandomizeTankPos diff --git a/weapons.asm b/weapons.asm index 3178ecb..d0658c0 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1230,8 +1230,7 @@ callInventory mva #$ff isInventory jsr Purchase afterInventory - mva #0 dmactls ; dark screen - jsr WaitOneFrame + jsr MakeDarkScreen lda #song_ingame jsr RmtSongSelect mva #0 escFlag From aa02b10bdae17461aeba40add78a6253bbb6bcd4 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 1 Sep 2022 15:06:57 +0200 Subject: [PATCH 08/14] Optimization (10b saved :) ) --- scorch.xex | Bin 50436 -> 50426 bytes textproc.asm | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scorch.xex b/scorch.xex index 3b553305a8729cfce39142352dbc8739d95b834d..905f5344f57339eba704247086cc7c0e1ea65a4e 100644 GIT binary patch delta 12671 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 bKJaI-dyMv_1Jm3?LUdN) 0 GetRandomDefensive - randomize ind_Battery________ ind_Nuclear_Winter_ + randomize ind_Battery________ last_defensive_____ tay - lda WeaponUnits,y ; check if weapon exist - beq GetRandomDefensive +; lda WeaponUnits,y ; check if weapon exist +; beq GetRandomDefensive NoSuprise lda TanksWeaponsTableL,x @@ -1267,7 +1267,7 @@ NotFirstLetter cpy PositionInName bne @+ ora #$80 ; place cursor -@ sta NameAdr,y +@ sta NameAdr,y dey bpl CursorLoop rts From a44135794859831a47ecaead9c1fabbfd7572b2e Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 2 Sep 2022 13:54:57 +0200 Subject: [PATCH 09/14] More optimizations (158b saved) - please test! --- grafproc.asm | 16 ++++++++--- scorch.asm | 13 ++------- scorch.xex | Bin 50426 -> 50268 bytes weapons.asm | 73 +++++++-------------------------------------------- 4 files changed, 24 insertions(+), 78 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 6935036..924f6b5 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -584,6 +584,11 @@ UnequalTanks .endp ;------------------------------------------------- +.proc ClearTanks + jsr PMoutofScreen + mva #1 Erase ; erase tanks flag +.endp +;-- .proc drawtanks ;------------------------------------------------- lda TankNr @@ -601,6 +606,7 @@ DrawNextTank pla sta TankNr + mva #1 Erase ; no erase tanks flag rts .endp ;--------- @@ -645,7 +651,8 @@ DrawTankNrX jsr SetupXYdraw jsr TypeChar - + lda Erase + jne noTankNoPM ; now P/M graphics on the screen (only for 5 tanks) ; horizontal position ldx TankNr @@ -729,7 +736,7 @@ ZeroesToGo6 bne ClearPM6 NoPlayerMissile - +noTankNoPM ldy #$01 lda Erase beq @+ @@ -1334,8 +1341,8 @@ drawmountainspixelloop ; how it works. I have just translated Polish comment ; but I do not understand a word of it :) ; If you know how it works, please write here :)))) - - jsr PMoutofscreen + jsr ClearTanks +NoClearTanks ; First we look for highest pixels and fill with their coordinates ; both tables @@ -1433,6 +1440,7 @@ ColumnIsReady ; now correct heights are in the mountaintable sta color ; Pozor! :) we know - now A=1 mva #sfx_silencer sfx_effect + jsr DrawTanks rts .endp diff --git a/scorch.asm b/scorch.asm index 7f32d8a..c8301a5 100644 --- a/scorch.asm +++ b/scorch.asm @@ -271,11 +271,8 @@ SettingBarrel jsr SortSequence ; Hide all (easier than hide last ;) ) tanks - mva #1 Erase - jsr drawtanks - mva #0 Erase + jsr cleartanks sta COLBAKS ; set background color to black - jsr PMoutofScreen ;let P/M disappear ; here gains and losses should be displayed (dollars) ; finally we have changed our minds and money of players @@ -410,6 +407,7 @@ NoGameOverYet jsr SetPMWidth lda #0 + sta Erase sta COLOR2 ; status line "off" sta COLOR1 @@ -647,14 +645,7 @@ continueMainRoundLoopAfterSeppuku AfterExplode - ;temporary tanks removal (would fall down with soil) - mva #1 Erase - jsr drawtanks - mva #0 Erase -; lda FallDown2 -; beq NoFallDown2 jsr SoilDown2 ; allways - NoFallDown2 ;here tanks are falling down mva tankNr tempor2 diff --git a/scorch.xex b/scorch.xex index 905f5344f57339eba704247086cc7c0e1ea65a4e..e3638a6f5d34981f714a0cc5c28eee3ce4b9b205 100644 GIT binary patch delta 15650 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 M>fRdn&gq2z4{?PrX#fBK delta 15776 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 diff --git a/weapons.asm b/weapons.asm index d0658c0..38b8137 100644 --- a/weapons.asm +++ b/weapons.asm @@ -64,7 +64,6 @@ tracer mva #sfx_baby_missile sfx_effect ; inc FallDown2 mva #11 ExplosionRadius - jsr CalculateExplosionRange jmp xmissile .endp ; ------------------------ @@ -72,7 +71,6 @@ tracer mva #sfx_baby_missile sfx_effect ; inc FallDown2 mva #17 ExplosionRadius - jsr CalculateExplosionRange jmp xmissile .endp ; ------------------------ @@ -80,7 +78,6 @@ tracer mva #sfx_nuke sfx_effect ; inc FallDown2 mva #25 ExplosionRadius - jsr CalculateExplosionRange jmp xmissile .endp ; ------------------------ @@ -88,7 +85,6 @@ tracer mva #sfx_nuke sfx_effect ; inc FallDown2 mva #30 ExplosionRadius - jsr CalculateExplosionRange jmp xmissile .endp ; ------------------------ @@ -96,20 +92,11 @@ tracer mva #sfx_baby_missile sfx_effect ; inc FallDown2 mva #17 ExplosionRadius - jsr CalculateExplosionRange jsr xmissile ; soil must fall down now! there is no other way... ; hide tanks or they fall down with soil - lda TankNr - pha - mva #1 Erase - jsr drawtanks - mva #0 Erase jsr SoilDown2 - jsr drawtanks - pla - sta TankNr ; it looks like force is divided by 4 here BUT" ; in Flight routine force is multiplied by 2 and left @@ -128,19 +115,11 @@ tracer mva #15 ExplosionRadius jsr CalculateExplosionRange0 mva #sfx_baby_missile sfx_effect - jsr xmissile + jsr xmissile.NoRangeCalc ; soil must fall down now! there is no other way... ; hide tanks or they fall down with soil - lda TankNr - pha - mva #1 Erase - jsr drawtanks - mva #0 Erase jsr SoilDown2 - jsr drawtanks - pla - sta TankNr ; it looks like force is divided by 4 here BUT" ; in Flight routine force is multiplied by 2 and left @@ -158,7 +137,7 @@ tracer mva #13 ExplosionRadius jsr CalculateExplosionRange0 mva #sfx_baby_missile sfx_effect - jmp xmissile + jmp xmissile.NoRangeCalc EndOfLeapping rts .endp @@ -176,22 +155,12 @@ EndOfLeapping ;central Explosion mva #21 ExplosionRadius jsr CalculateExplosionRange0 - jsr xmissile - - lda TankNr - pha - mva #1 Erase - jsr drawtanks - mva #0 Erase + jsr xmissile.NoRangeCalc jsr SoilDown2 ; - mva #1 Erase - jsr drawtanks - mva #0 Erase + jsr cleartanks ; maybe not? sta FunkyWallFlag - pla - sta TankNr mva #1 color mva #5 FunkyBombCounter FunkyBombLoop @@ -212,7 +181,6 @@ FunkyBombLoop mva #sfx_funky_hit sfx_effect jsr Flight - jsr CalculateExplosionRange lda HitFlag beq NoExplosionInFunkyBomb mva #sfx_baby_missile sfx_effect @@ -232,20 +200,16 @@ NoWallsInFunky .proc deathshead ; inc FallDown2 mva #30 ExplosionRadius - jsr CalculateExplosionRange - mva #sfx_nuke sfx_effect SaveDrawXY jsr xmissile UnSaveDrawXY sbw xdraw #34 - jsr CalculateExplosionRange mva #sfx_nuke sfx_effect SaveDrawXY jsr xmissile UnSaveDrawXY adw xdraw #68 - jsr CalculateExplosionRange mva #sfx_nuke sfx_effect SaveDrawXY jsr xmissile @@ -720,6 +684,8 @@ LaserMisses ; ----------------- .proc xmissile ; ; ----------------- + jsr CalculateExplosionRange +NoRangeCalc lda #1 sta radius sta color @@ -931,7 +897,6 @@ ExplodeNow mwa ycircle ydraw ;(bad) ; finally a little explosion - jsr CalculateExplosionRange mva #sfx_baby_missile sfx_effect jmp xmissile rts @@ -1212,9 +1177,7 @@ QuitToGameover bne @+ callActivation ; Hide all tanks - after inventory they may have other shapes - mva #1 Erase - jsr DrawTanks - mva #0 Erase + jsr ClearTanks jsr DefensivesActivate jmp afterInventory @@ -1223,9 +1186,7 @@ callActivation bne @+ callInventory ; Hide all tanks - after inventory they may have other shapes - mva #1 Erase - jsr DrawTanks - mva #0 Erase + jsr ClearTanks ; mva #$ff isInventory jsr Purchase @@ -1234,6 +1195,7 @@ afterInventory lda #song_ingame jsr RmtSongSelect mva #0 escFlag + sta Erase ; why? jsr DisplayStatus jsr SetMainScreen jsr WaitOneFrame @@ -2331,14 +2293,8 @@ MIRValreadyAll jsr DisplayOffensiveTextNr ; temporary removing tanks from the screen (otherwise they will fall down with soil) - mva TankNr tempor2 - mva #1 Erase - jsr drawtanks - mva tempor2 TankNr - mva #0 Erase jsr SoilDown2 mva #$ff HitFlag ; but why ?? - ;jsr drawtanks rts .endp ; ------------------------------------------------- @@ -2460,8 +2416,7 @@ NextLine2 ldx TankNr sta ActiveDefenceWeapon,x ; deactivate Nuclear Winter jsr SetFullScreenSoilRange - jsr SoilDown2 - jsr drawtanks ; for restore PM + jsr SoilDown2.NoClearTanks rts ; in order to optimize the fragment repeated in both internal loops @@ -2572,11 +2527,7 @@ ReachSky adc #0 sta RangeRight+1 ; hide tanks and ... - mva #1 Erase - jsr DrawTanks jsr SoilDown2 - mva #0 Erase - jsr DrawTanks ldx TankNr ; check keyboard/joy and move tank left/right - code copied from BeforeFire @@ -2868,11 +2819,7 @@ OnGround adc #0 sta RangeRight+1 ; hide tanks and ... - mva #1 Erase - jsr DrawTanks jsr SoilDown2 - mva #0 Erase - jsr DrawTanks ldx TankNr rts .endp From 216d9f9ca863feaba56fae8b23743f1aa1431a4a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 2 Sep 2022 14:50:20 +0200 Subject: [PATCH 10/14] Small DrawTanks fix --- grafproc.asm | 2 +- scorch.xex | Bin 50268 -> 50264 bytes weapons.asm | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 924f6b5..2319ef6 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -606,7 +606,7 @@ DrawNextTank pla sta TankNr - mva #1 Erase ; no erase tanks flag + mva #0 Erase ; no erase tanks flag rts .endp ;--------- diff --git a/scorch.xex b/scorch.xex index e3638a6f5d34981f714a0cc5c28eee3ce4b9b205..b375120c85d4ed3bf0656b63418bca071aa6215f 100644 GIT binary patch delta 13471 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 Date: Fri, 2 Sep 2022 18:00:10 +0200 Subject: [PATCH 11/14] Bouncy Castle and Tracers fixes --- scorch.asm | 1 - scorch.xex | Bin 50264 -> 50271 bytes weapons.asm | 24 +++++++++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/scorch.asm b/scorch.asm index c8301a5..451d42c 100644 --- a/scorch.asm +++ b/scorch.asm @@ -407,7 +407,6 @@ NoGameOverYet jsr SetPMWidth lda #0 - sta Erase sta COLOR2 ; status line "off" sta COLOR1 diff --git a/scorch.xex b/scorch.xex index b375120c85d4ed3bf0656b63418bca071aa6215f..4f419808d331eb5d4e7a8259b1c59264329b9aa2 100644 GIT binary patch delta 14252 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�RWg2B`t5Yj&P_=>?`P5f>J%+1FF)-FA(4 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 tma0AfJk}msw&U6#F0aO*<+vAWZs%UF8Tr Date: Fri, 2 Sep 2022 23:38:56 +0200 Subject: [PATCH 12/14] Tank Hit fix And TankWidth as variable (definition). --- definitions.asm | 1 + grafproc.asm | 4 ++-- scorch.xex | Bin 50271 -> 50274 bytes weapons.asm | 18 ++++++++++-------- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/definitions.asm b/definitions.asm index 0b04e1e..25bb623 100644 --- a/definitions.asm +++ b/definitions.asm @@ -4,6 +4,7 @@ screenheight = 200 screenBytes = 40 screenwidth = screenBytes*8 ; Max screenwidth = 512!!! +TankWidth = 8 ;---------------------------------------------- ; Player/missile memory PMGraph = $0800 ; real PM start = $0b00 diff --git a/grafproc.asm b/grafproc.asm index 2319ef6..76db853 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1137,10 +1137,10 @@ FallingRight bvs EndRightFall ; we finish falling right if the tank reached the edge of the screen lda XtanksTableH,x - cmp #>(screenwidth-8-2) ; 2 pixels correction due to a barrel wider than tank + cmp #>(screenwidth-TankWidth-2) ; 2 pixels correction due to a barrel wider than tank bne @+ lda XtanksTableL,x - cmp #<(screenwidth-8-2) ; 2 pixels correction due to a barrel wider than tank + cmp #<(screenwidth-TankWidth-2) ; 2 pixels correction due to a barrel wider than tank @ bcs EndRightFall NotRightEdge ; tank is falling right - modify coorinates diff --git a/scorch.xex b/scorch.xex index 4f419808d331eb5d4e7a8259b1c59264329b9aa2..d54baeae4b517bdb5fd07991ba525ded000b9956 100644 GIT binary patch delta 13155 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 delta 13066 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 f>yN2=@y37LrUt|7(screenwidth-12) ; tank width correction +4 + cmp #>(screenwidth-TankWidth-4) ; tank width correction +4 bne @+ lda XtankstableL,x - cmp #<(screenwidth-12) ; tank width correction +4 pixels + cmp #<(screenwidth-TankWidth-4) ; tank width correction +4 pixels @ bcs RightScreenEdge inc XtankstableL,x sne:inc XtankstableH,x @@ -2686,10 +2686,10 @@ pressedSpace ; left or right from center of screen ? ldy #0 lda XtankstableH,x - cmp #>((screenwidth/2)-8) + cmp #>((screenwidth/2)-TankWidth) bne @+ lda XtankstableL,x - cmp #<((screenwidth/2)-8) + cmp #<((screenwidth/2)-TankWidth) @ bcc TankOnLeftSide TankOnRightSide dey @@ -2865,11 +2865,13 @@ CheckCollisionWithTankLoop lda xtankstableL,x cmp xdraw @ - bcs LeftFromTheTank ;add 8 double byte + bcs LeftFromTheTank + ; add 8 double byte ; now we use Y as low byte and A as high byte of checked position (right edge of tank) ; it is tricky but fast and much shorter clc - adc #8 + lda xtankstableL,x + adc #TankWidth tay lda xtankstableH,x adc #0 @@ -2910,7 +2912,7 @@ CheckCollisionWithShieldedTank bcs LeftFromTheTank tya ;add 16 double byte clc - adc #16 + adc #TankWidth+4+4 tay lda xtankstableH,x adc #0 From d4e616abbb62ef4c87cf8d4fc561df8c3de24ce8 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sun, 4 Sep 2022 20:28:50 +0200 Subject: [PATCH 13/14] Batter manuals --- MANUAL_EN.md | 134 +++++++++++++++++++++++---------------------------- MANUAL_PL.md | 90 +++++++++++++++------------------- 2 files changed, 99 insertions(+), 125 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index 951b003..240b039 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -67,107 +67,91 @@ The keyboard controls here are simple, cursor keys or joystick: left/right - cha * [START] + [OPTION] - immediately force the end of the game (Game Over), just like [O] but without confirmation. * [ESC] - during the entire game at any time (unless the computer is playing, then sometimes you have to wait a while) you can press the [ESC] key, which allows you to abort the game and return to the beginning (of course, there is protection against accidental pressing). -## 5. Game mechanics +## 5. Game mechanics - offensive weapons -And here's a rundown of the description of how each weapon works, scoring rules, etc: +### Energy of tanks. +- At the beginning of each round, each tank has 99 ash units of energy. +- Tanks' energy is depleted in 3 ways: + * one unit after each shot is fired + * while falling (one pixel down 2 units). + * when a projectile hits the tank or next to it - and here the amount of energy subtracted depends on the distance from the center of the explosion and the type/power of the projectile. -### First, what we know about tank energy -- Tanks have energy (and Ogres have layers - like an onion) - 99 units at the start of a round. -- Energy of tanks is depleted in 3 ways: - * one unit after firing each shot, - * while falling (one pixel down takes 2 units of energy), - * when a projectile hits a tank or its proximity. The amount of energy subtracted depends on the distance from the center of the explosion and the type/power of the projectile. +### How energy subtraction works (and earning money!). +After each round the amount of money gained/lost is calculated this is done on the basis of two variables accumulated by each tank during the round. These variables are: -### How energy subtraction works (and makes money!) +`gain` - energy "captured" from tanks hit (also if you hit yourself :) and here's the catch, if you have very little energy left it can be profitable to hit yourself with a powerful weapon! -After each round, the amount of money gained/lost is calculated. This is done on the basis of two variables accumulated by each tank during the round. These variables are: +`lose` - energy lost due to explosion/fall (and here it is important to count the total loss of energy even if the tank has less at the moment of hit). -`gain` - energy "captured" from hit tanks (also when you hit yourself :) and here's the catch, if you have very little energy left it may be profitable to hit yourself with a powerful weapon! - -`lose` - energy lost due to explosion/fall (important - the total potential loss of energy is taken into account even if the tank has less at the time of the hit). - -In addition, the tank that won the round has a `gain` parameter (captured energy from tanks hit) increased by the energy remaining at the end of the round (because it did not die and should have it - although the survival of the fittest is not guaranteed :) ) +In addition, the tank that won the round has a parameter gain (captured from hit tanks energy) increased by the remaining energy at the end of the round (because it did not die and should have it - although it also happens otherwise :) ) Specifically: ### After each round: -`money = money + (2 * (gain + energy))` +`money = money + (20 * (gain+energy))`. -`money = money - lose` +`money = money - (10 * lose)`. -`if money < 0 then money = 0` +`if money <0 then money=0`. -(at the start of each round `gain` and `lose` have a value of 0) +(at the start of each round `gain` and `lose` have a value of 0). During a round, if another tank is hit as a result of a shot fired by a tank, the tank firing the shot "gets the energy" taken away from the hit tank. +### tank taking a shot: +`gain = gain + EnergyDecrease`. +### tank hit: +`lose = lose + EnergyDecrease`. -### For tank firing a shot: +Where `EnergyDecrease` is the loss of energy due to the hit. -`gain = gain + EnergyDecrease` +Of course, at the same time the hit tank loses the amount of energy stored in `EnergyDecrease`, except that here the loss cannot exceed the energy you have. -### Tank being hit: +## How a hit works. -`lose = lose + EnergyDecrease` - -Where `EnergyDecrease` is the loss of energy due to a hit. - -Of course, at the same time, the hit tank loses the amount of energy stored in `EnergyDecrease`, except that here the loss can not exceed the energy held. - -Note that the screen representation of money has an extra 0 added at the end so you actually have 10 times more cash than the above calculation shows :) - -## How the hit works. - -Each weapon that results in an explosion has a radius of fire (`ExplosionRadius`). +Each weapon that results in an explosion has its own blast radius. After the explosion, every tank in its range loses energy. -The way it works is that the distance of the hit tank from the center of the explosion is calculated, the `ExplosionRadius` reduced by this distance is multiplied by 8 and the result is `EnergyDecrease`. +It works in such a way that if the hit is exactly on the center point of the tank `EnergyDecrease` receives the maximum value for the weapon, and for each pixel of distance from the center of the tank this value is reduced by 8. -That is, in the case of hitting a tank centrally: -`EnergyDecrease = ExplosionRadius * 8` -and with each pixel farther from the center, 8 fewer units are lost. +For example, if a hit with the Baby Missile weapon hits the center of the tank perfectly, it will lose exactly 88 units of energy (plus what it loses falling after the explosion). +If you hit with the same weapon at a distance of 10 pixels from the center of the tank, the loss will be only 8 units. -I don't know if it's understandable - I do understand it :) +And here are the values of maximum energy loss for individual weapons. If a weapon explodes several times, each explosion is calculated independently (additional values in the table): -For example, if a tank is hit centrally with a Baby Missile - it is subtracted 88 units of energy (11 * 8), which also means that when this missile hits at a distance of 12 pixels from the tank - it does not lose energy at all. - -And here are the `ExplosionRadius` values for each weapon: - -| Weapon | `ExplosionRadius` | +| Offensive weapons | maximum energy loss | | --- | --- | -| Baby Missile | 11 | -| Missile | 17 | -| Baby Nuke | 25 | -| Nuke | 30 | -| LeapFrog| 17 15 13 | -| Funky Bomb | 21 11 (* 5) | -| MIRV | 17 (* 5) | -| Death's Head | 30 (* 5) | -| Napalm | x 40 (this weapon is different and the distance from the center is not determined, simply any tank within range of the flames loses 40 units of energy - the ExplosionRadius variable is not used) | -| Hot Napalm | x 80 (the same principle as in Napalm) | -| Baby Roller | 11 | -| Roller | 21 | -| Heavy Roller | 30 | -| Riot Charge | 31 | -| Riot Blast | 0 (in reality - 61 but with these weapons it is not taken into account when counting energy loss only the width of the ground to fall) | -| Riot Bomb | 17 | -| Heavy Riot Bomb | 29 | -| Baby Digger | 0 (60 - as in Riot Blast) | -| Digger | 0 (60 - as above) | -| Heavy Digger | 0 (60 - as above) | -| Baby Sandhog | 0 (60 - as above) | -| Sandhog | 0 (60 - as above) | -| Heavy Sandhog | 0 (60 - as above) | -| Dirt Clod | 12 | -| Dirt Ball | 22 | -| Ton of Dirt | 31 | -| Liquid Dirt | 0 (maybe it's worth changing?) | -| Dirt Charge | 0 (61 - as above) | -| Laser | x 100 (but here it is also different - equally 100 only in the case of a direct hit, the `ExplosionRadius` variable is not used, so there is no multiplication by 8 - we simply subtract 100 units of energy - that is, the tank always dies).| +| Baby Missile | 88 | +| Missile | 136 | +| Baby Nuke | 200 | +| Nuke | 240 | +| LeapFrog| 136 120 104 | +| Funky Bomb | 168 88 (* 5) | +| MIRV | 136 (* 5) | +| Death's Head | 240 (* 5) | +| Napalm | 40 (this weapon is different and the distance from the center is not determined, simply any tank in range of the flames loses 40 units of energy) | +| Hot Napalm | 80 (the rule is the same as in Napalm) | +| Baby Roller | 88 | +| Roller | 168 | +| Heavy Roller | 240 | +| Riot Charge | 0 (no energy is subtracted, but a portion of the ground upward from the hit point in a 31-pixel radius is removed) | +| Riot Blast | 0 (as in Dirt Charge, but in a radius of 61 pixels) | +| Riot Bomb | 0 (no energy is subtracted, but the ground in a radius of 17 pixels from the hit point is destroyed - as in the case of Missile. The weapon is useful for digging out after being buried, or for undermining an opponent) | +| Heavy Riot Bomb | 0 (as in Riot Bomb, but the explosion radius is 29 pixels from the point of impact - as in the case of Nuke) | +| Baby Digger | 0 (no energy is subtracted, but a portion of the ground is undermined in a radius of 60 pixels from the point of impact) | +| Digger | 0 (as above - greater undermining) | +| Heavy Digger | 0 (as above - greatest undermining) | +| Baby Sandhog | (as above - another way of undermining) | +| Sandhog | 0 (as above - larger dig) | +| Heavy Sandhog | 0 (as above - largest dig) | +| Dirt Clod | 0 (no energy is subtracted, but a ground ball with a radius of 12 pixels from the hit point is created. The weapon is useful for burying the opponent) | +| Dirt Ball | 0 (as above, but the radius of the ball is 22 pixels) | +| Ton of Dirt | 0 (as above, but the radius of the ball is 31 pixels) | +| Liquid Dirt | 0 (floods the ground at the point of hit with liquid soil, filling in the depressions) | +| Laser | x 100 (but here it is also different - equally 100 only in the case of a direct hit simply subtract 100 units of energy - that is, the tank always dies) | -The big points received by the player are the number of tanks that died earlier than him. If any of the other tanks capitulated earlier (using **White Flag**), it is not counted and does not give big points. - -Only these big points determine the order in the summary. +Large points received by the player is the number of tanks that died earlier than him. If any of the other tanks capitulated earlier (**White Flag**) is not added to those that died and does not give points. +Only these points determine the order in the summary ## 6. And now for defensive weapons: diff --git a/MANUAL_PL.md b/MANUAL_PL.md index adff1fa..30ffe7f 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -66,12 +66,10 @@ Tutaj klawiszologia jest prosta, klawisze kursora lub joystick: lewo/prawo - zmi * [START] + [OPTION] - natychmiastowe wymuszenie zakończenia gry (Game Over), tak jak [O] ale bez potwierdzenia. * [ESC] - w czasie całej gry w dowolnym momencie (chyba że akurat gra komputer, wtedy czasem trzeba chwilę poczekać) można nacisnąć klawisz [ESC], który umożliwia przerwanie gry i powrót na początek (oczywiście jest zabezpieczenie przed przypadkowym naciśnięciem). -## 5. Zasady gry +## 5. Zasady gry - bronie ofensywne -A tutaj zręby opisu działania poszczególnych broni, zasad punktacji itp: - -### Najpierw co wiemy o energii czołgów -- Czołgi mają energię (a Ogry warstwy - jak cebula) - na starcie 99 jednostek +### Energia czołgów +- Na początku każdej rundy każdy czołg ma 99 jesnostek energii. - Energii czołgom ubywa na 3 sposoby: * jedna jednostka po oddaniu każdego strzału * w czasie spadania (jeden piksel w dół 2 jednostki) @@ -89,9 +87,9 @@ Dodatkowo czołg który wygrał rundę ma parametr gain (przechwyconej od trafio Konkretnie: ### Po każdej rundzie: -`money = money + (2 * (gain+energy))` +`money = money + (20 * (gain+energy))` -`money = money - lose` +`money = money - (10 * lose)` `if money <0 then money=0` @@ -107,58 +105,50 @@ gdzie `EnergyDecrease` to utrata energii w wyniku trafienia. Oczywiście jednocześnie trafiony czołg traci ilość energii zapisaną w `EnergyDecrease`, z tym że tutaj strata nie może przekroczyć posiadanej energii. -Uwaga! Ekranowa reprezentacja pieniędzy ma na końcu dopisane dodatkowe 0 więc faktyczne mamy 10 razy więcej kasy niż wynika z powyższych obliczeń :) - ## Jak działa trafienie. -Każda broń, która skutkuje eksplozją, ma swój promień rażenia (`ExplosionRadius`). +Każda broń, która skutkuje eksplozją, ma swój promień rażenia. Po eksplozji każdy czołg w jej zasięgu traci energię. -Działa to tak, że obliczana jest odległość trafianego czołgu od centrum eksplozji, zmniejszony o tę odległość ExplosionRadius jest mnożony przez 8 i w wyniku otrzymujemy `EnergyDecrease`. +Działa to tak, że jeśli trafienie jst dokładnie w centralny punkt czołgu `EnergyDecrease` otrzymuje maksymalną wartość dla danej broni, a za każdym pikselem odległości od centrum czołgu wartość ta jest zmniejszana o 8. -Czyli w przypadku trafienia centralnie w czołg: -`EnergyDecrease = ExplosionRadius * 8` +Przykładowo jeśli strał oddany za pomocą broni Baby Missile trafi idelanie w centum czołgu to straci on dokładnie 88 jednostek energii (plus to co straci spadając po eksplozji). +W przypadku tafienia tą samą bronią w odległości 10ciu pikseli od centrum czołgu strata ta będzie wynośiła już tyko 8 jednostek. -a z każdym pikselem dalej od centrum ubywa o 8 jednostek mniej. +A oto wartości maksymalnego ubytku energii dla poszczególnych broni. Jeśli broń eksploduje kilka razy, każda z eksplozji jest obliczana niezależnie (dodatkowe wartości w tabeli): -Nie wiem czy to zrozumiałe - ja rozumiem :) - -Przykładowo, jeśli czołg zostanie trafiony centralnie przy pomocy Baby Missile - odejmowane jest mu 88 jednostek energii (11 * 8), co także oznacza, że przy trafieniu tym pociskiem w odległości 12 pikseli od czołgu - nie traci on energii wcale. - -A oto wartości promienia rażenia (ExplosionRadius) dla poszczególnych broni: - -| Weapon | `ExplosionRadius` | +| Broń ofensywna | maksymalna wartość ubytku energii | | --- | --- | -| Baby Missile | 11 | -| Missile | 17 | -| Baby Nuke | 25 | -| Nuke | 30 | -| LeapFrog| 17 15 13 | -| Funky Bomb | 21 11 (* 5) | -| MIRV | 17 (* 5) | -| Death's Head | 30 (* 5) | -| Napalm | x 40 (ta broń jest inna i nie jest wyznaczana odległość od centrum, po prostu każdy czołg znajdujący się w zasięgu płomieni traci 40 jednostek energii - zmienna ExplosionRadius nie jest używana) | -| Hot Napalm | x 80 (zasada taka jak w Napalm) | -| Baby Roller | 11 | -| Roller | 21 | -| Heavy Roller | 30 | -| Riot Charge | 31 | -| Riot Blast | 0 (tak na prawdę - 61 ale przy tych broniach nie jest brana pod uwagę przy liczeniu ubytku energii tylko szerokości gruntu do opadnięcia) | -| Riot Bomb | 17 | -| Heavy Riot Bomb | 29 | -| Baby Digger | 0 (60 - jak w Riot Blast) | -| Digger | 0 (60 - jak wyżej) | -| Heavy Digger | 0 (60 - jak wyżej) | -| Baby Sandhog | 0 (60 - jak wyżej) | -| Sandhog | 0 (60 - jak wyżej) | -| Heavy Sandhog | 0 (60 - jak wyżej) | -| Dirt Clod | 12 | -| Dirt Ball | 22 | -| Ton of Dirt | 31 | -| Liquid Dirt | 0 (może warto to zmienić?) | -| Dirt Charge | 0 (61 - jak wyżej) | -| Laser | x 100 (ale tu także jest inaczej - równo 100 tylko w przypadku bezpośredniego trafienia, zmienna ExplosionRadius nie jest używana, więc nie ma mnożenia przez 8 - po prostu odejmujemy 100 jednostek energii - czyli czołg zawsze ginie).| +| Baby Missile | 88 | +| Missile | 136 | +| Baby Nuke | 200 | +| Nuke | 240 | +| LeapFrog| 136 120 104 | +| Funky Bomb | 168 88 (* 5) | +| MIRV | 136 (* 5) | +| Death's Head | 240 (* 5) | +| Napalm | 40 (ta broń jest inna i nie jest wyznaczana odległość od centrum, po prostu każdy czołg znajdujący się w zasięgu płomieni traci 40 jednostek energii) | +| Hot Napalm | 80 (zasada taka jak w Napalm) | +| Baby Roller | 88 | +| Roller | 168 | +| Heavy Roller | 240 | +| Riot Charge | 0 (nie jest odejmowana energia, ale usuwana jest część gruntu w górę od punktu trafienia w promieniu 31 pikseli) | +| Riot Blast | 0 (jak w Dirt Charge, tyle że w promieniu 61 pikseli) | +| Riot Bomb | 0 (nie jest odejmowana energia, ale niszczony jest grunt w promieniu 17 pikseli od punktu trafienia - tak jak w wypadku Missile. Broń przydatna do odkopywania się po zasypaniu, bądź podkopywania przeciwnika) | +| Heavy Riot Bomb | 0 (jak w Riot Bomb, ale promień eksplozji to 29 pikseli od punktu trafienia - tak jak w wypadku Nuke) | +| Baby Digger | 0 (nie jest odejmowana energia, ale podkopywana jest część gruntu promieniu 60 pikseli od punktu trafienia) | +| Digger | 0 (jak wyżej - większy podkop) | +| Heavy Digger | 0 (jak wyżej - największy podkop) | +| Baby Sandhog | 0 (jak wyżej - inny sposób podkopywania) | +| Sandhog | 0 (jak wyżej - większy podkop) | +| Heavy Sandhog | 0 (jak wyżej - największy podkop) | +| Dirt Clod | 0 (nie jest odejmowana energia, ale tworzona jest kula gruntu o promieniu 12 pikseli od punktu trafienia. Broń przydatna do zakopywania przeciwnika) | +| Dirt Ball | 0 (jak wyżej, ale promień kuli to 22 piksele) | +| Ton of Dirt | 0 (jak wyżej, ale promień kuli to 31 pikseli) | +| Liquid Dirt | 0 (zalewa grunt w punkcie trafienia płynną glebą wypełniając zagłębienia) | +| Dirt Charge | 0 (nie jest odejmowana energia, ale usypywany jest dodatkowy grunt w górę od punktu trafienia w promieniu 61 pikseli. Broń przydatna do zakopywania przeciwnika) | +| Laser | x 100 (ale tu także jest inaczej - równo 100 tylko w przypadku bezpośredniego trafienia po prostu odejmujemy 100 jednostek energii - czyli czołg zawsze ginie).| Duże punkty otrzymane przez gracza to ilość czołgów, które zginęły wcześniej niż on. Jeśli któryś z innych czołgów skapitulował wcześniej (Biała Flaga) nie jest doliczany do tych które zginęły i nie daje punktów. Tylko te punkty decydują o kolejności w podsumowaniu From 82b4337a1bff5e098e4b4db25d07dc75647f4e3e Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 5 Sep 2022 22:58:23 -0400 Subject: [PATCH 14/14] v1.14 --- README.md | 15 +++++++++++++++ scorch.asm | 2 +- scorch.xex | Bin 50274 -> 50274 bytes 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c285a7..b4ec733 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,21 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki ## Changes: +###### Version 1.14 +2022-09-05 + +Minor bugfixes and optimizations. +Just a small update to allow for more testing and having fun before the bigger release. + +Changes: +* Numerous optimizations that require a solid test. Please have fun and report issues! +* Small DrawTanks fix. +* Bouncy Castle bounces like it should. +* Tracer and Smoke Tracer are not causing defense weapons to trigger anymore. +* In rare cases direct hit was not accounted for correctly. +* Manuals updated. + + ###### Version 1.13 2022-08-30 diff --git a/scorch.asm b/scorch.asm index 451d42c..3a70a9f 100644 --- a/scorch.asm +++ b/scorch.asm @@ -36,7 +36,7 @@ ;we decided it must go in 'English' to let other people work on it .macro build - dta d"1.13" ; number of this build (3 bytes) + dta d"1.14" ; number of this build (3 bytes) .endm icl 'definitions.asm' diff --git a/scorch.xex b/scorch.xex index d54baeae4b517bdb5fd07991ba525ded000b9956..1f258535e3aa14d7176175fe37d99c3d994b05d6 100644 GIT binary patch delta 16 XcmaFV!ThL$c|(RDqsZn=zn`T5J~#(1 delta 16 XcmaFV!ThL$c|(RDqwwZTzn`T5J~9U_