From ffcf44cabb143b6a4645a60e903999ce2078c6ad Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 12 Dec 2022 14:11:09 +0100 Subject: [PATCH 01/19] Better Soildown after Hovercraft. --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49340 -> 49335 bytes weapons.asm | 37 ++++++++++++++++++------------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/scorch.bin b/scorch.bin index 8ffb1ecc7d876316af1f57d17290061914d64b32..24d5a73b78a8457ca224e895fd2f058adeec5616 100644 GIT binary patch delta 1249 zcmZuw3rtg2815-8&y_0=r|qmgbZk(iJd_SZhKXOhvnlfgmHJfnMDM zwz1O}lrnVOhKpfT@8ZH-Wk!eTWJ{M(H$zym1Z9uJk+~AKWMijAF)Coe+u6Uvp^Pt;#fbJMw#MTP{^3X zCpl5s4)T&~(m^sm`)#W$n~6!_adB8&5*-96=2nU$9H^M)EI9z*F_-slW`l7wyYFkT z0}bXRVS6*@6p*5vToJIL!?`mtQZvmWoyuH29Y&7Ok)#t!nT)(R5Fs@y?;2>KpFs8b zr-77N$Om9Arav>#Py6Wr5^bP;>nQ&W9fdPJeW`=v( zG_JExku9!L9@%=a<-l5hiv~(8u*V8-qk^&~AV$uz#())|G*w~@95*|3xU>;hI^mA> zh<~N?(2;Th>QOx})wqL~pLMf5K}xkz`3|D^62eU^hm1{qQl+F3C3xh(q03$9j%rtk zC)+;q;bxg#bG*5u`|S?~&qoWyJ9lNhSPXm68|tbMti5ejMx!6q z;^+XTS#Wxw_c{R!2cZl_SEYy)c6YFoOS9~6;ToTy(Nv`*KS9&5k!OShGwjr;y@{YG z`>O<0Fs>>t;3#bH8k(t2BCZT(Qr=&AowR2>+iq zz~eO7RlM$cl#GM6*YN>|$*kjrbsg0;>-&tK&M&QUBBJAEit^U({wvqL57>k#r$l|? zJ?ipTOTlq_>e@{gzF1h=l9*a?w97K_t#^KL*|+*nkf>0pQfm#p#&Oq;TX(se#PYJ1 zPQBsHzKip}$E3bg-PC5ZP2VG=1xlUOd3E8Zzr$d*ed8M*MmHK$+2_uomBuvu$0Z*7 rfsLHnuuI234#KZx@}x0TMU#I}tNe1L(D6f#(e`1%R43DVcjE(EUQjkfaCB zb8?MFj?u{R92Wus>J~PEuh{FtF9~p$weMy)V4f|5KLBo=6^0|2A_{_8l$W9b)vP(C zof}=|rp|dkb5rbZLEGsqV`I~VJe-y+VM4(K`)!t605ojJ!BPNzVb2#l!T~J0Qg{^{ zKqE2ZLlzmCaB7T+q&!f{<`yS|2&skqwU5~yBv4C9 zH;}UPB>)s)`a&NQ7o^uw(l#pGKqYT6(YVqke{jQFk0EjCwa5vx>+=9_>RICmJ5;fZ=V> zCnwbi2Lh!iMj;Vb4Kbm3_7CU=(LV+24<#Uj!VG96s5=^^G&6uY1G@}(_h(?A9OcQA zIc`02)}6wmO6n2+n#E)%v~V8H)EDt&*7B)B6rs#WZL#)QMK-@})kY4F43pNgg5Q1I z_wM;3JlvQXr$@2^;*-hQE}kVSiGajq)=RQ@4l#rXCS< z(bOwqIHnUKw;mSMLK$jqhy{bFvq8njSvPHDq79vGNRC-|m=HKSJoq&Mt4FXhT$Qy) zLHoiyJSK!5!0rB5L+81iw{sAoNQCY;gJ8ctRd>0`0J*|6VbkcV#0JHO(^!;P!f4Z@-cyASi?M$z((=>OO%rrZF z_4}nraVDvLjT$hWwp>_P*_B_@VldLq*}L)5Lv>y6PtDxA6B?6IMsJ4Smu+#Mdy?AFdT~BYI9R-th`Uk0wk}Y^&ZJ{Wnr5 BBP9R; diff --git a/scorch.xex b/scorch.xex index d98b310200cc12ed32a9e9df8c74092775db386f..34efa544855d110c90bd769dc44f5a9546c6bf2f 100644 GIT binary patch delta 1338 zcmZuv3rv$&6z(l8kBa>AQtWu#G8hAy47LOrY+1pKhd*oy(+x4C1Ezos0s{pm1H>PY zH{8D4zch?ue}qx^_bQ=`#01l!t{TZ6xW$pp3E2qKpop37wlG{4&rR+<=R4my_uO;t zWP{U}4Nj(;$=rJkyO8{eGdPBtG9)07{XOGX0+8&boKY@_V^6*J9q|890gtNTcy57_ z)a6=Vu=y~NlwO$vF&>Ia^NxUF_EMgV=h;6a&&v^IB84hJ4we^e} zrDr@S6YOP~1`*iSD<=~vCcqA$xzp94mwmGlfOrh=qL`g_*r5e&X|HZ*x+caGXWGOS z8Ty;-dI~Sy~ft{TIaM+P9 zSAgH}MYkBFqP6aem_6My4}v%f*l|)~X?CY7EN^Y6D#t2PANN#9V3z_eDq#YeK*gX1 zbxMUuEF~RUqBkTIgC)2$z2#-X>SGIDVg}JosW>Xv>ar4Q71^9fi!R`rfRL&G1Gkf(x2ky5o6SkXmQfUky@6qVPUZtYd~ zdkKU0#JrN21{cu-RhBE}CaB0NC5l#yyc`C@fuZX53j`ciLk;RsM+J@1R%a8R;m~Js zkx${wtE2Wlg_FOPN6&*aZ5W`B69xlaM!+$4pN0>3V;UHS#M($gq}gYfTjW!744Arl&C2lKG$HI0B(fC3)odj$RYV>Exa~2OLkJY8v~4@?y1Pxy2Zy=Hjt&6C+)$?< zz%yLv$^eJaYS$E2f7(3{qQn$zKdE%LZXv7PIRRwNN7aY^?XFfr9R-(l@Bnh5QqYY$ zG~p;iL#!c1kgW{&WpO_(@knQ47FY+mrpb_(dwiE-J<&4);&TnLfQD-M@e+?@$=5!r zK2C@=LoNIb7YVaw)Xr5^jVYOZ$*on<(QntN>5nN53R}Sb$5-Y8`yO z7Lh&0L1S7LkOT0mYP|XZ_6Us5fgsfqf z2a^oy2?-oAKr3o7B*(gFkB?Kt^62+*kB@5TG{$;Uj?Njv_sH8%Ng1Yu*IqA$zrP6o zC$MlcxkU(VG-IXTk}wQiA%QL~*(d@+mk~aN(oBhx1Y;UAcT+^pu_Ce-b5*7|@CGuP z;)TB$@bgP7aT&KVb0rTX0y-{u1&3L2nAORjWG3eb8l}@a!U{~8?tD|Gvcj}z3Zc{S zDZ?inou*}=4^edaF|~;ml6Bq<1H560a|NnRlXWwC2DRjA7>16ACBIY8Vnd*$cbcLh&oxNS8p`aH% zXHS*(TQ`i^FdL_}pX75vgOvjOsm^|=@f&B!WoA`2fubBT-|tx396q|pJ?p3q{tteS BOez2X diff --git a/weapons.asm b/weapons.asm index c1289c5..26e438e 100644 --- a/weapons.asm +++ b/weapons.asm @@ -2615,6 +2615,7 @@ ReachSky sta RangeRight+1 ; hide tanks and ... jsr SoilDown2 + jsr ClearScreenSoilRange ldx TankNr ; check keyboard/joy and move tank left/right - code copied from BeforeFire @@ -2713,11 +2714,7 @@ RightScreenEdge mva #sfx_dunno sfx_effect NoREdge mva #18 AngleTable,x - ; then draw tank on new position - jsr DrawTankNr - jsr DisplayStatus - jsr WaitOneFrame - jmp KeyboardAndJoyCheck + bne DrawFloatingTank ; then draw tank on new position pressedLeft lda ShieldEnergy,x @@ -2744,9 +2741,11 @@ LeftScreenEdge NoLEdge mva #162 AngleTable,x ; then draw tank on new position +DrawFloatingTank jsr DrawTankNr jsr DisplayStatus jsr WaitOneFrame + jsr CalculateSoildown jmp KeyboardAndJoyCheck pressedSpace @@ -2892,24 +2891,24 @@ OnGround jsr WaitForKeyRelease ; and Soildown at the end (for correct mountaintable) ; calculate range - sec - lda XtankstableL,x - sbc #2 - sta RangeLeft - lda XtankstableH,x - sbc #0 - sta RangeLeft+1 - clc - lda XtankstableL,x - adc #10 - sta RangeRight - lda XtankstableH,x - adc #0 - sta RangeRight+1 + jsr CalculateSoildown ; hide tanks and ... jsr SoilDown2 ldx TankNr rts + +CalculateSoildown + ldx TankNr + clc + lda XtankstableL,x + adc #4 + sta xdraw + lda XtankstableH,x + adc #0 + sta xdraw+1 + mva #$04 ExplosionRadius + jsr CalculateExplosionRange + rts .endp ; ------------------------------------------------- From 2b8851716748ced523d6c31d81e9fd9dd436944c Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 12 Dec 2022 20:42:17 +0100 Subject: [PATCH 02/19] New tanks shapes by Adam. But we maust correct start point of barrel --- artwork/tanksv4.fnt | Bin 0 -> 1024 bytes scorch.asm | 4 ++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49335 -> 49335 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 artwork/tanksv4.fnt diff --git a/artwork/tanksv4.fnt b/artwork/tanksv4.fnt new file mode 100644 index 0000000000000000000000000000000000000000..2efa6898ef880a91ac55a4eeb7880e8700c2a632 GIT binary patch literal 1024 zcmZQzKnD_a|D9AM{y%R7N;DpZ$*z4Ry*_32?Nu;-SnnC*<33k+!}!tKU%C@cn{I>i zUtid+Iw|`ujQ_WK_wmQt) z;!LmEYCV5`80;Vh28pb-Wp`2#dyrtqw!tv)BJ` v1nU0*kz`mPWMn}=U85G%{05k!QF=541|kFi!7qQV literal 0 HcmV?d00001 diff --git a/scorch.asm b/scorch.asm index 68b3235..c01a24c 100644 --- a/scorch.asm +++ b/scorch.asm @@ -15,7 +15,7 @@ ;--------------------------------------------------- .macro build - dta d"1.21" ; number of this build (4 bytes) + dta d"1.22" ; number of this build (4 bytes) .endm .macro RMTSong @@ -1977,7 +1977,7 @@ noingame icl 'artwork/talk.asm' ;---------------------------------------------- TankFont - ins 'artwork/tanksv3.fnt',+0,384 ; 48 characters only + ins 'artwork/tanksv4.fnt',+0,384 ; 48 characters only ;---------------------------------------------- font4x4 ins 'artwork/font4x4s.bmp',+62 diff --git a/scorch.bin b/scorch.bin index 24d5a73b78a8457ca224e895fd2f058adeec5616..253e9f1610d6b8139e6f788f07e636a1f1c2d291 100644 GIT binary patch delta 82 zcmZo@U}|V!+VGT(QE2lswt_?{KB2nRq5uDXY-nHrg94AbtE>M1?`LG3T#(@=%g0sM a7y^}M1S%*9sB6>$OEWMuY`&bKD-HlG$RA+< delta 82 zcmZo@U}|V!+VGT(QE>A!wt_?{2AR75tN#N*BLf6j)cwB-=1(rjaFYc}AJjsXZVrL* KH($=s6$b#+ha?aH diff --git a/scorch.xex b/scorch.xex index 34efa544855d110c90bd769dc44f5a9546c6bf2f..63de6f1c1bf48e94901591cb6dca03724edc56e3 100644 GIT binary patch delta 82 zcmdnq$h^IgdBZPvMxo8W-LEA|@d?$f4*mcCV?zT27!-KaU0wD6e?KGRYU;Q5l8W|wKqVE4yFn{vvm2R>?>4RFR(#;_- K{${^bnPLE5g(gS< From 588040d9e63810a2b0c74d99bf4ecce256aa00f2 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 13 Dec 2022 09:15:39 +0100 Subject: [PATCH 03/19] Soildown after Hovercraft optimization. --- scorch.asm | 10 ++++++---- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49335 -> 49328 bytes variables.asm | 2 +- weapons.asm | 14 ++++++++++---- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/scorch.asm b/scorch.asm index c01a24c..47c3954 100644 --- a/scorch.asm +++ b/scorch.asm @@ -26,7 +26,7 @@ ;--------------------------------------------------- icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $60 +FirstZpageVariable = $5E .zpvar DliColorBack .byte = FirstZpageVariable .zpvar Gradient .byte .zpvar JoystickNumber .byte @@ -71,10 +71,12 @@ FirstZpageVariable = $60 .zpvar pressTimer .byte .zpvar NTSCcounter .byte .zpvar IsEndOfTheFallFlag .byte ; for small speedup ground falling - .zpvar sfx_effect .byte - .zpvar RMT_blocked .byte - .zpvar ScrollFlag .byte + .zpvar sfx_effect .byte + .zpvar RMT_blocked .byte + .zpvar ScrollFlag .byte .zpvar SkStatSimulator .byte + .zpvar FloatingAlt .byte ; floating tank altitude + .zpvar OverTankDir .byte ; (0 go right, $ff go left) direction of bypassing tanks on screen ; --------------OPTIMIZATION VARIABLES-------------- .zpvar Force .word diff --git a/scorch.bin b/scorch.bin index 253e9f1610d6b8139e6f788f07e636a1f1c2d291..f115fa0b3839f4f5ed66a4c4d371f7ea7f921ef8 100644 GIT binary patch delta 15741 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 Jzg&~T{~vPNAHM(q delta 15755 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 diff --git a/scorch.xex b/scorch.xex index 63de6f1c1bf48e94901591cb6dca03724edc56e3..4bcfd749f935ab478b40d7c3469758414693c23d 100644 GIT binary patch delta 15482 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 delta 15495 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 Date: Tue, 13 Dec 2022 09:30:11 +0100 Subject: [PATCH 04/19] Barrel start point correction --- grafproc.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49328 -> 49328 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/grafproc.asm b/grafproc.asm index 154aac6..dc7b807 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -2088,7 +2088,7 @@ X lda XtanksTableL,x sbc #90 tax ; barrel start offset over 90deg - adw xdraw #5 xdraw + adw xdraw #4 xdraw mva #1 goleft bpl @+ ; jmp @+ diff --git a/scorch.bin b/scorch.bin index f115fa0b3839f4f5ed66a4c4d371f7ea7f921ef8..cc674f0097335117c45d3c797ae1c5435ef50d80 100644 GIT binary patch delta 16 XcmZo@U}|V!+Hli`k!ABO8#QMDH0%Ze delta 16 XcmZo@U}|V!+Hli`k#+Me8#QMDH1Y-l diff --git a/scorch.xex b/scorch.xex index 4bcfd749f935ab478b40d7c3469758414693c23d..d3522115da2f58c3f7d864bd0fa80c15174b5061 100644 GIT binary patch delta 16 Wcmdnc$h-lF-0B!vHoMnlIspJSbOr?g delta 16 Wcmdnc$h-lF-0B!vH@nwmIspJSdIkmn From b7a5e7c9b58b5529c30c55845ed37cd43373366f Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 13 Dec 2022 17:47:42 +0100 Subject: [PATCH 05/19] Self-destruction of shielded tank at angle 0-4. fixed! - again! --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49328 -> 49328 bytes weapons.asm | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scorch.bin b/scorch.bin index cc674f0097335117c45d3c797ae1c5435ef50d80..e6cff532b469b71f3b0a28dca0bd2bcc74cac084 100644 GIT binary patch delta 16 XcmZo@U}|V!+OQ#%k$LmRP=74|G#v%- delta 16 XcmZo@U}|V!+OQ#%k!AD7P=74|G$RG^ diff --git a/scorch.xex b/scorch.xex index d3522115da2f58c3f7d864bd0fa80c15174b5061..acac69449b43dbb50c9a99e9402179f3f98d745a 100644 GIT binary patch delta 16 Wcmdnc$h-lFw5BsMZ`PjPstEu#GzI|x delta 16 Wcmdnc$h-lFw5Bt%Y}TIMstEu#ItBs& diff --git a/weapons.asm b/weapons.asm index bdb1dde..0e36ab0 100644 --- a/weapons.asm +++ b/weapons.asm @@ -2936,7 +2936,7 @@ CheckCollisionWithTankLoop lda ytankstable,x cmp ydraw ; check range bcc BelowTheTank ;(ytankstable,ytankstable+3) - sbc #4 ; we must rewrite EndOfTheBarrelY table or remove Y correction completely to "bold" tank !!! + sbc #3 ; hitbox height cmp ydraw bcs OverTheTank ; with or without shield ? From 54a4dcf7d80dd8e2f8563f1bb18d382d873f0feb Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 14 Dec 2022 13:11:40 +0100 Subject: [PATCH 06/19] Options screen is now separate from setting the game's initial variables. For easier porting to the C64 or others. --- scorch.asm | 1 + scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49328 -> 49329 bytes textproc.asm | 120 ++++++++++++++++++++++++++------------------------- 4 files changed, 63 insertions(+), 58 deletions(-) diff --git a/scorch.asm b/scorch.asm index 47c3954..3d1b1eb 100644 --- a/scorch.asm +++ b/scorch.asm @@ -316,6 +316,7 @@ START RMTSong song_main_menu jsr Options ;startup screen + jsr SetVariablesFromOptions jsr MakeDarkScreen bit escFlag bmi START diff --git a/scorch.bin b/scorch.bin index e6cff532b469b71f3b0a28dca0bd2bcc74cac084..3cb45e95938b91ce33d95f6bc1e71c38c0830457 100644 GIT binary patch delta 7667 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 Xd79glBtrzWFATzi@a#{U-Q@oVE9}uI delta 7735 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 Date: Fri, 16 Dec 2022 12:39:52 +0100 Subject: [PATCH 07/19] Magic of the "." key :) --- ai.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49329 -> 49343 bytes weapons.asm | 55 ++++++++++++++++++++++++++++++++++------------------ 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ai.asm b/ai.asm index 27f2671..c607b48 100644 --- a/ai.asm +++ b/ai.asm @@ -617,7 +617,7 @@ RepeatAim lda #ind_Baby_Missile___ sta ActiveWeapon,x ; now we have initial valuses - mva #$ff TestFlightFlag + mva #%11000000 TestFlightFlag ; check targeting direction lda tempor2 jne AimingLeft diff --git a/scorch.bin b/scorch.bin index 3cb45e95938b91ce33d95f6bc1e71c38c0830457..95b04863e8b145a269f71f0de007d27cc32a5072 100644 GIT binary patch delta 1914 zcmZux4Nz3q73S^_i~PL>kt{^;E@E+Yk<~#YB(S1Y*!7`=p8!G9t+6E7HKvPIY)eGL z(`6eGIk3C3KTRDT-Dg9xac8u2T#Hs2A8JEv(Q(F-j!h~yGrCPRYSU`ZF4lCKzBhBf zbHDSwbI-l+oZHbM>FAL7*CddYur^`2MCO3@gjL^~KEy6qPlJ)s+bcwQdYJ4h%2Cs8 z!qAg;8f%`)V`zQgvxMUexfyV02oiENu$EpWbCnKC2I!$pulv~cO=9juilF7Z&T@+U z8F(&hBPk2mv$o2TiifykLH`gJm=2Gv!QwzlPJ$exWN8H{@dYmC4aJh0Kx@%zLjDjq z@%$VK8HP*6XX5YJ_*0=oA(8XbTyT|WNiLi(sU&wGO`lD4P@>NyUTD&f&DPn4D9+E8 zbO^IJZ$z&P6s%N}IGvsSv{T5y06N%Ix{K%n*Gma`9_f)zAvH`#ta(qZ;u&k@J|PJs zJ>j35nMHh{TK&63Uq2=$e|IyLY%oz>;O^=gg8MM6X_73?b||HEn~k6A)5t@)PK_*7 z?9@mmr0nIcVdiu3FcJlUeY`ih3-`g7p>T5p=F!f#b>bd$F4J8%k&0vq zeBq+;L8NFRjtkYf5_uo|qxyxptNR2gw#yMueG1LD;GKcV(u4i%D}a%zYThFNk856g zc3r7UhF@w67c1Tp9B2i%N_UWMPjq?Z>u z%12g!qE3_DebSSH@Xs@kz;7D?M*5YMFtBiCX{Gh%;f#PdU zb`E@8pOqZ3g(!OF@H=N2S~frnK;DqIfc1#cemUNjHcaxH8c!iVcxxHNHKZ3WJMiNa zo^Odd@RJl;QbqsIhnt@Ue^*8eJ^UcH9M5|!3}wOJ@KyXM=iuMM!eL!_uby~W%bXl2 z*xk*9J?Lh8}mvhK{NN?20b`IdQtWnFbE)_r7^0j1dV@}e3S2!yIiSk^6e>SFJ^Q3Ov_Clsxka2C{ zGbecFjQ<|ZbdR-7+%^rF!=xI?MNdc}`fFikn1jCiZ{45gx;!%Q)lu zPcXR~luas$+#Oid6hCWs^S0JK-TlA1KK)Q0KYKv|Tf5`!-jipq+?6V+enZ37o}m*L zrWIL5uk5nFcY11CrCD0n+~Iux@|EkK{q4(#k7Ts0qNZUBccA~5r_NpcOLWrwZ&&}Y zeGk{wee8NDWodb%xvk$ldQ-V%O~tmuAO2?Q##gcGV$ajZ>xJXZ&%njzXJNW|Zb16l qmy%;!-j|Zi@WIx;m>Plmf`5=!3+vuUQ@k#Cyy+wDf$zW3pY(4tw=2g0 delta 1999 zcmZux4Ny~87Ut%Me|SN&8d$(f1R*vwuv)5E{-mLhJ}~7+KyZj?t#nh}4LcUJ3S;{q z1VQ9z5(#0e!^`s8TB8}YtQ)3oE#pINQ@7N0w&Oy_oyA&d>gu>|ZP=S&>+a6JH*>#x z&iU?l|IR(_?Sl4pfm0oYRzp$LGlCz?uqSHmvgw0#N*O*AXf6F*kiCye{zCGhZWdAa zv>Au%Z>T6-?fP5P8469g1`{{|^0oQaq4zZM=^iPkWQMH8nE21Z zYI!}%cbVm{iDI%G%qchLU|ci)w%MKKlBPz9iHcmw3DHs4WtAfwmAaa<3lX~FI=kj) z0_1=zIe(0tF|lLbXfB#@;$>jVRib5ZF;|ObAT}=6>qH2}D2vjRmbp;rg-wp*6%k`WCmy?+)~q{M5^t@8x%JF+}OH zfAzc-h=Hu|ljx&|$-=~MZ^43fI;?QrE38ChA0_IIf@C&+L?QO3TNNU2j#VM>2;g@(=s~pS_?&!Qgu#xvj9D3&uf}Wcgp<&I-Dvlix=ee>U<)0*kwNhJde2 zk;eV5y0ZCXi*K9i42fg5oJ}#0Z%| zG^ycHk{$>MJqsEjWO5}lPLN&x{~$x=VOId7dPNzEtXCW>F;2_dOw zqP#+%i6Rc{F?*-yPk>wOm-mx`2x$o+d4xBfkYIr(71SDu@KL7@>NS}W(PRnCu-iZ} zEDUPoGR86@V=p%Si7~KzQw-D0Ui!@748=3>xkiuFQ1IeS1wN=69#l}Ct|x6*&_W-G0xcd0Toy_Zk%`i&E%E0F+hme!E0%_%EI51_m3 zS<-$~wvQxy(Yk`LDYIK9A>8ZGw{8zvWwbUePJO^VM=_h+A_>#TUSc-0mzgbOwlRDZ zwAyTu`T(tlUTp(XyJoc^Xkl9a#DwG_zFcvvW%y&RiW$dg5L%v;WijLI*L7}VBx7*D z6vZ^3G?dI8H0W@O1-Du8RjbaS@4Y}B3+m8+bAj^8-73nPfV-ig{3+B8-Q}q$9$e)c zB0eD%g5hxAZ@74nRjgg$Fgx_*nGCs~p?Ik$>1!?<^c5vbwTI|8;c@PTjQI2JCN zdLFh{EfP7**a*g|1X2kcRYr1xs`U_h-rO@t>97YT*5`>cEybf55M8ZEUT=Bb5@Nk* z{mzCP9C#8s|EyQ7|IOJ@t9ttX zaJKxU^R@_Q+Sy_9WLeg3ps*Uw)_xy3$5`0CB%#zcQj*6uD5=u}tJuj~VzLo2vy=E9 zZb(I5NUBqael$U|#@X>nlFaAplGemMSSbw^O)|HFXq z>*L~mwjZP6kK;i^6%z%Y&6T+^GOVp(n|@bk@5#yOyFPJbqDo!1u>Kq_#rmGsI+|Z-j3ekvtu9s zbuK(Uhu*$(*WP`d?@r!|T3%53@~?Xjk4}Z9<`!-1f9Hd1f4L`&%d$WDhTz;*8GODq z4(@DCa7DawUjWXgkW;U|FGL&R#A}B_OF8B)`_I@icyW7d$R^G{6gRrl^~>#tWBv^i CdRxf= diff --git a/scorch.xex b/scorch.xex index d17166d33a698bec3b1b1ff8129564a1170bcfe3..604f17a5dba2c68e592d6c4732c70c339752a49f 100644 GIT binary patch delta 2011 zcmZux4Nz3q73S_Pe~a=KBnCERxgZ3I2ODu* z=&W>gUoJu$C0wghpai<%z~F+C2H{K~T8t)M?4S!xnaDwNOj}S1Z7`)Go_b9>g_@&& z(?^T=b}@u_S*J;iB<@)UUh*7FMp1k_yOD^A5P_$EsjES}RQP*@9s_tW5f=yHSuN?V zwth}?9TsCC(mdWix0|(5%b|B|&2wfs48%8PIUEFUmXksBTI5U+ITkq$gvla54uV?b6cBG&Sap4GwIYL& znLv~WzV(ZK+w<((^}UA@6kzYQh%>|q9Koqkfz>G|c(W+BWEJ}iO#Cjj%fQ$_oi;LT zviUz4I$*j-4GeJP8UMmjBcq9cb}=$QhjRq2YryvPth*8rV5}GgNvAFM(?QF9^onH( z=$SOLA$^_C!pKSfa0p;w0?KI%0|3tD0@vrNBHmBjK}rZvl7Qk@j^3kC+K|3P;POp` zn`grbi4$)v65uFyC0kanhjci4pYzLEaTZ zs)X~O8NCs>gyuFHP#^U+-awhOt?4CbvD;1QsE8(7S0X!o%DN=2GF-UkSK|FO?6Zx+ z04WvDlCs_jhLrc-Vn{_QR~fX?<~@t(^kH4fah)a*Uf-zGu(zy`&$VD{u$)ym19!k# zgE}3vW=8N3sU#-bf`()K8s_nD+W*AcHQ)x(sz0QP2hSA zFi&pZ!;Bo~PaYHBp;ucAl0Ix@C+Ls88tw`9X>4onp_5oS-rE_|p8h%FryVIspf@`nMK9Bb z93|>57rx$sqaFBF+Th4Sm*{Cn;(c8%{jZI`t+TXr9*NbaEL)ZHL;;?l-#VTT2ks^Z zTSwW>l-OBa48hr*jprEL*NMBRsWUsN-zA56LuV&IAB?@p@!y<_o!MFchf{Gk&YLPM zxP)$)KS6*w#Qk)cb85i=;e`FrBK=PI4X@%enGEL|VdU#jG9reO-vG9oPe&EBjn7cs z=!EScQ2L$m!pN?BlskNS%q?*12DfgnVn`SoVR`znEBUdKh8}}neQbExSH|c0O8Go} zB|pZ;xN_j#4R4N1?;%wM1qH;|kpcJlbaA(FZO*fSGWIRn?0Rio123vbb+F9=I{yC9-|j3*T~qwJ?dbV`C=;@t zEGF&lbC>eDbNCd#%S@!N)!K&=sCUTIk85`#fs3@Z-}X**xEcqR(jU yJFQF4isYv7uY^I-^}W_Nqzxp?$glOewehtVwejx{YimYCms{IECapbD9rJHKK#j2g delta 1964 zcmZux4OCO-8RkpEk3_g2l%H7O3u2KO0k_g39ILikes;%nXr*?}2(&9(dbFWu#r358 z%&R29o4}XklHXd)jk!Z=^maS4Hm+NR^8-UL^-oqhM5 z?|FZo?|t9<-uJt|@0B0vm4`0Wp{V$A-OeQBB0p++2(=Mo)7l3f9ij`HaBh6RIV2=_ ztyIaGjJLF3APTEE{FLr|1%;1^SDQYf(BtB%pB$E zR3wTsFFl6P_e5+clp!Tq)&0l$4QBp$G+jt%LfA~wdNjyPYI@eA24e0hK`aUN6w1DF zkVwx&7V8iam=Nvm5#}+z_yJZ7_NtMRbPgpKq>-KM1KAriCD~~S+RFw+<0R%55-&M^i%y>@{xJDG95}{ z{9!%C@FahrIFI3idHg#ae_`~z)RD<_@+beS52fG+vSC1n0_6C>B~(Zb?Ar#@BWFv| zI!s=dyQ;NCO2433d>51qcKHec@S>bc1ufaKHsp=sD-3hABKIkwGU?dZR?tO z>$q@U29Rq=+Mof7G7m0M1uWq^6tg|7$Y5IelS~``F4GR_j^iY9YOqETu+Rab9NH!e zSjgb>S)_aDYL;2zTwWG zUW?5fzC4Vpo!WqoJwc5m?9p90K}Czh6;!kUUm-JODY`;ZY)hai%WYefl?3t&_|gkP zOwT8WZDk9TTtEjG!xyfir0j_Lb74RE+}2q18ykI@{Cf(MgRu!z*ybiM?rOF#gP!!- zSKj}sO_0Og8u7Mdu%WO*RQB~BHBt5 z@``symcb(^n66mE5j30%UB?EZ_GRZAJd<5Q(mhXM%mcOv>GkEry%}GGl~n5gFo?mY zTG$S}IdAG+e*(nD5TRW>>Pwr~J#qTI3$xd9YwKFtf3DwcAANoL;#Uh7RW-Nn==QyK z?AC@TF+8=gW5B~1t2iI;DJ-%a~|Iq0h8HFp?Z0YFnc;m|#U*wTs0of9) z$nxJ?{M{vbgR_a~ZDM}SwnP+|zwraB$ Nry8FT>kfBi{tM8#Z`uF= diff --git a/weapons.asm b/weapons.asm index 0e36ab0..d216af9 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1124,8 +1124,10 @@ ContinueToCheckMaxForce2 jsr WaitOneFrame ; best after drawing a tank - - + bit TestFlightFlag + bpl @+ + jsr Shoot.AfterOffensiveText +@ ;keyboard reading ; KBCODE keeps code of last keybi ; SKSTAT $ff - nothing pressed @@ -1204,6 +1206,7 @@ NoSpyHard jsr WaitForKeyRelease jmp BeforeFire @ + ldx TankNr ; for optimize cmp #$80|@kbcode._up jeq CTRLPressedUp cmp #$80|@kbcode._down @@ -1229,6 +1232,10 @@ jumpFromStick jeq pressedM cmp #@kbcode._S ; $3e ; S jeq pressedS + .IF TARGET = 800 + cmp #34 ; dot key :) + jeq pressedDot + .ENDIF jmp notpressed checkJoy ;------------JOY------------- @@ -1258,7 +1265,7 @@ pressedUp ;force increaseeee! - ldx TankNr + ;ldx TankNr ; optimized inc ForceTableL,x bne CheckingMaxForce inc ForceTableH,x @@ -1282,7 +1289,7 @@ FurtherCheckMaxForce jmp BeforeFire CTRLPressedUp - ldx TankNr + ;ldx TankNr ; optimized lda ForceTableL,x clc adc #10 @@ -1300,7 +1307,7 @@ pressedDown mva #sfx_set_power_1 sfx_effect - ldx TankNr + ;ldx TankNr ; optimized dec ForceTableL,x lda ForceTableL,x cmp #$ff @@ -1317,7 +1324,7 @@ ForceGoesZero CTRLPressedDown mva #sfx_set_power_1 sfx_effect - ldx TankNr + ;ldx TankNr ; optimized sec lda ForceTableL,x sbc #10 @@ -1328,7 +1335,7 @@ CTRLPressedDown jmp BeforeFire pressedRight - ldx TankNr + ;ldx TankNr ; optimized lda pressTimer spl:mva #0 pressTimer ; if >128 then reset to 0 cmp #25 ; 1/2s @@ -1345,7 +1352,7 @@ pressedRight jmp BeforeFire CTRLPressedRight - ldx TankNr + ;ldx TankNr ; optimized mva #sfx_set_power_2 sfx_effect mva #1 Erase jsr DrawTankNr.BarrelChange @@ -1361,7 +1368,7 @@ CTRLPressedRight pressedLeft - ldx TankNr + ;ldx TankNr ; optimized lda pressTimer spl:mva #0 pressTimer ; if >128 then reset to 0 cmp #25 ; 1/2s @@ -1379,7 +1386,7 @@ pressedLeft jmp BeforeFire CTRLPressedLeft - ldx TankNr + ;ldx TankNr ; optimized mva #sfx_set_power_2 sfx_effect mva #1 Erase jsr DrawTankNr.BarrelChange @@ -1395,7 +1402,7 @@ CTRLPressedLeft pressedTAB mva #sfx_purchase sfx_effect - ldx TankNr + ;ldx TankNr ; optimized lda ActiveWeapon,x cmp #last_offensive_____ ; the last possible offensive weapon bne ?notlasttofirst @@ -1413,7 +1420,7 @@ pressedTAB CTRLpressedTAB mva #sfx_purchase sfx_effect - ldx TankNr + ;ldx TankNr ; optimized lda ActiveWeapon,x cmp #first_offensive____ ; #0 bne ?notfirsttolast @@ -1444,6 +1451,12 @@ pressedS jsr WaitForKeyRelease jmp BeforeFire +pressedDot + lda TestFlightFlag + eor #%10000000 + sta TestFlightFlag + jsr WaitForKeyRelease + jmp BeforeFire pressedSpace ;================================= @@ -1469,6 +1482,8 @@ fire ;with much more separate blocks, but you know - ;- do not touch it if it works... + mva #0 TestFlightFlag + ;the latest addition to this routine is ;displaying offensive texts! @@ -1481,7 +1496,8 @@ RandomizeOffensiveText ldy TankNr mva #$ff plot4x4color jsr DisplayOffensiveTextNr - + +AfterOffensiveText mva #0 LaserFlag ; $ff - Laser ldx TankNr lda ActiveWeapon,x @@ -1499,6 +1515,8 @@ NotStrongShoot sta Force lda ForceTableH,x sta Force+1 + bit TestFlightFlag + bmi AfterStrongShoot mva #sfx_shoot sfx_effect AfterStrongShoot lda AngleTable,x @@ -1517,7 +1535,6 @@ AfterStrongShoot sta ytraj+2 sta xtraj sta ytraj - sta TestFlightFlag ; checking if the shot is underground (no Flight but Hit :) ) tay ; A=0 ! @@ -1538,7 +1555,9 @@ ShotUnderGround ;-------------------------------------------------- .proc Flight ; Force(byte.byte), Wind(0.word) ; Angle(byte) 128=0, 255=maxright, 0=maxleft -; if TestFlightFlag is set ($ff) ne real flight - hit test only (for AI) +; if 7bit and 6bit of TestFlightFlag is set no real flight - hit test only (for AI) +; 7bit - fast, test flight +; 6bit - invisible bullet ;-------------------------------------------------- ;g=-0.1 ;vx=Force*cos(Angle) @@ -1553,8 +1572,6 @@ ShotUnderGround ;goto begin- - - ; smoke tracer :) ldy #0 ldx TankNr @@ -1820,7 +1837,7 @@ SkipCollisionCheck mwa ytraj+1 ydraw bit TestFlightFlag - bmi NoUnPlot + bvs NoUnPlot lda tracerflag bne NoUnPlot @@ -1834,7 +1851,7 @@ Hit mwa XHit xdraw mwa YHit ydraw bit TestFlightFlag - bmi EndOfFlight + bvs EndOfFlight jsr unPlot EndOfFlight mwa xdraw xcircle ; we must store for a little while From 87f7e7eafa998a61ee67c399377174c4fd2679e8 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 16 Dec 2022 13:41:52 +0100 Subject: [PATCH 08/19] Dot does not fire MIRV :) --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49343 -> 49342 bytes weapons.asm | 15 ++++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scorch.bin b/scorch.bin index 95b04863e8b145a269f71f0de007d27cc32a5072..49f2d6db7738f223c6e10e91154635bbf0cce057 100644 GIT binary patch delta 1506 zcmZuw3rv$&6z=Tin)%+cv0HSQEZ&=(ob#RUoO{o` z=NJrpgMn|)5Q9{dDUJgIR4Y!GO*WHZdGPFvq+3`X-9&_rOU`Sj00GZ%H^k=%Fu_@6 zEFX+>neay-B+QV9>ZEi4zUTUuy}<{^(3RvXAPRM)L}7U;WgAeUl+*=)Mir@p0ZJ3gqwHjg zf%T#~SzpQymE6)aIq*@M$UAkc%nhK*6+3~FyRia*Wf*qUvGd&Uj21GhCBM+p>RCUW z=_Q`{!kY1+!1SxWJ#9?COLSyCdA00fliQ%ahbQt z&jOo_xU^qF%@P3_Yh?N{GuG(V(eBkzo(aaGFqhltUA+W|(Vf*AKy%4?p1}W@scYIO zlbn!A?%fuR^1FCORK6zCYr^CVl;DV4sAIF*D;2Ak2^{7BG@KF<#a z3dH4?`uu=9i(+BZR#t%m)hlr!HXZ(lPG=l3BpsFi%BCTmI(uPJE4d#rK@r3d;hJ;Q z(N{wDASM{U&Wr<-U3-yVffPMZ2LNG9LGoKGTUi1A(Jopeg-i6%TZb!v#x}A7&14Kh z`T_)6kVoN0kb|lU=LwIQpb<3`%5bCE3L9_(DvOZkx28rbp@rjUxF}T=Z_aWoMZU!m zq2=a1X0hd}<*6m(Fgl!JKJNY7kg)0bkgxr5#6L$JFNkHu3J{MzEsh6I(W&BM?>HK6 zv%n)3JS6iq(XksW)EFDpxKql4#$8hOY~yYz%Wtfe+H^1_AI8zzkM+Cu9cXFq@()%- zzL&Hz2U4g;Q{stpT(gi;3$knE{xb&4gBK1T93Wt3JB&kfOOzqG^pJ;Lgh%!OzWi%A zr6tPf*KpR)<~bsS@ify->j;LS^#si2`bq>qnA?E|yT3GwIMbfMjNKRE3PjX)j6E+6 z2Tzc^EJC=w9h-S&QABP>ATze<6=i=}xL#U*h4-Ml9H#<9b!%mPkP7`D{9)l zI)8I={-T(o4SUVUzZ<)L$MyKx--3`#Qmxrkcd+$K=fLH=B8ehBe`~FwuA%Yd_1^7PMwadjcGPm4tJ?hj1=Zhw7XSbN delta 1524 zcmZuw4NOy46z=U0zm`|9Dxk&NB0&TxI7GzoCyIa%VL*ifYR3rMv}#uT0Vflu4;`@u zxwI5$8%KCepBq|v*^rE)Gf1q$#+D&5A#O1`aC4+v)WMd>ZqZ?~?cL<$obP=1+;iXg zZe1O>u8wQpDg>!0L%1IB(Q#qAWa>N_wgWomt)-dan45@IcSYA#(|~~e?1bH`Yds>E~vzGr(kE#ZQ0G?Fv|)}oH&C~R*f9|kcfIVA*G(5{rB#W4nkL)ppX zI>wu_Fn*LB#<20JQs5h7ARnG)ByIqer`3QMb|MXcO&IPw%`A1p^WMq@FX^S1TF?07 zO0V#ZFQfS!3QYgn&!(pbT!IS~kejQ*M?Fn11i0<2t@pSfn+?sp1;99Zk|o18BC?+Y zsWgG^ee?s>OJ9A=p{~+>*!GDQS=EjP!s#)}BL~qMau0|@4P-c&L_K6ISdAW%rvlIE z@U$(|4%1>0zn@ zA3OkUC^s*WPd1Vy(&p^}B>QWgCs-_RzI|IX3x^9jtGjM83Tg<-k!QX%-eQ1>M^%oq ziztobO(9ivMUypmUZa9ht+3t*?-^BAwQi8;;nj|9!AAwL|1 zqMrN`-!UvLih)gsm{7E=U~@pX!K%iCusGHePVuPpXC@8pE69=*wU7;n4vHY0gv-;` z*Q+FLhz`cTXg=|6!CD|da|KB&(pwlFo@A%FSPbJd&_|6MhmCr2H<~XLgx)Vi03m_m zo#os044^K;>O;7Ji||YV-RTT)@nE+BHli~M3054fIE$4Sy%TxeGH6YN3XUV^&J;mH zYi8dDBrJ+pwX5~RRzKr6#u;NqTT5F;Yq!rYPJYv@)6f1a;)Sj6C9$MP1`<$h(FQPs zJ})Zri8sR|M)-*lzm}!N(Qi~5sWB!>TO($G_L!LI*M1;oxZ2}ls~RTf!+5i5ujbfC z4bAPH0l~7!b%~p^VLduptn|V)?itA?Ms&GY8ZaL)9C)Mc+#mtBwZnMitCWY4W~YZ8 z>%rWBoBuDzoIrOyUWfdZ!Kg+_ME?)FVxi&%K1?vvU1l{w(`F3;N%jjR5Aewj{MH>M zQAB@x0zLLvfbSxpj$mx2Bpm#KU}*&ZXgdybN}~v}Baj|@?=|IYX}JHH4tEa%s>{wD zqKC$?zOR=?#y;!FbUf|IRPju;rY_S6UK}&WJYrJWsH*JjY)WH{z#^zobZIu0?{t-u zacD)^!PF2F!>6j^;; zU`noXf0MQM&XlJtad(a3v#;(?1xCacRn{3VeRp@_(QnUZU-03!oI>SZN~`~L;O6j8 z9{!c?mzg;N19|__$(Io%gQahp1qfN jpaNaq-{MusP`}eNK?=0}K#=FVjM)<0SIh1@p!fe9*Pn)3 diff --git a/scorch.xex b/scorch.xex index 604f17a5dba2c68e592d6c4732c70c339752a49f..26c0d2bb1c0a9511eadfab65264a9265d8431c39 100644 GIT binary patch delta 1499 zcmZuw3rv$&6z=TwB4;d}%mlm1!cxN5yD_ZMs`9nk?R%oSgHW@0@$j zJ?EaT=k?U{oY!)}zwGtgiV$!F739wY73g68d(sbE6mj`5X+nk|hC??INf$-E%DaGo z$?Qn}5CIC={!fo{K@M9}{2Q3Di-Ma?kS*EJsW@EXo8^yT(nza84l$mNDoR%amhCTX zf#Q`DurOq2|)-xQ^sW8_uLek1iBc0I9cGf3=aI;?VF3CuP0J^Yy zJ212PdjME~;aHN14Z;&z{Bv#Lq(<*!B5|f?xPH=_@FDfy^V6dBj-G&^tqlI1uf#`v zMiv2l?Nj?MbHNFgI`}I9IcQ@;BCe>h;SrcQGt+VM=2h~f!!^tyT@E*vZjmU7nlrVd z+@mIZA%31>4r)KN78k|SB!dDZ(_{c0TBF$`eyqWz4JA<`p2Dng^kAl06V%aTO*sbH`-7TC8lgoHB!+rsp!@Z630(uspDs|44>HpqfvizHs7UHxKMb@TCPirnk%DGZOemb zeM?`TXbiR&+N$m6nB}Aw>Jf<&<_RgN`9kSAFqKq!mPL?NCsgl0ZB{9vfr6t3xYVfZ zDA$}NY@B`Nx6cxRM9*v@AcbS-3X*{_6sk)BT9lz%6}}J;8_B>MpEE&wIy$aP#RYYg z<9=8@Zxg;4f5HgUg+_FF@!#nbqo}Kzn@aeIz?4q6cBLXx*R_|6-)X{C*g6YObA9W= z8OL-C54Y4tuZV&BRq&H?e0@0Hs_-J5>W|hh!4tG!zaD&z?&)LsVhWBUAtl8PNv00q z>2p#j^eyU;g;2sA^nqcqz)s2C?WoC+n&hKKs2zp{#xi5Kkz?wny21v0{H8JAH0Q(A zC!Ov|;-7{@U~e(b2W2SJ_;HwxhC>DzVT7BJ(U=Yf(2qvxD>hoWNws6Qy2WIRk|fIB z%+AS!qiEc?ath`yH7e@SDpO+AgwAkax~cIj0a+8YA&qHvyo>gQI0g8Vs__+H!ntCa zo&FL|+4DSYd}yZ~cDkH!IA|3CU2K+_2ly^C{=17UX+(-S(=j+KAO{%%xea4GEy=@kmf)Y+AM?Sz|b{uARa=i}kAfDAFv@E08BKIgQa^)7wuth{? z;a!e*7Om_gtMc;lNR=TKH*?u?yDBUDqdf*y{}`yoDtWCE^CrDv&-@&m8{!O=Y_~N+SUYg} z>YZ_rBrjT5SzX&~bDbHw_atRbj&jSc#-pdsUHT{L_4!3rnvTAkT=A^DqP?y3_XD^2 zl0`Z4Wot^-ZK`Nw-M!~7-X8<6zLAkxpsLY2PhTItbN}IZoP2d1{nZb@-vFU$g}Y2A z+?NGXSziA7ZHE{-xU7?lUDT-v0e;kQOqbHjkfV;r)6X#UBZ@^bfEijvTJ1-}N2@Jb2)3dY4eFwT zB)|)75_VGyEM%=fbm?fUp=xPt@Q1b3TA8W!)2Xy&GNMkER{8>t&UAcl=FYw6oOj>e zd*61I3BN8AIGv;RG9ZJ=;Y7k z)rrCmw2+70%2ty9-EWKC2l(Q(GBM7wXZ;sKAme8iwMxKAzJF^f0P}fR8Z7{FG;jMk zU_}!Q8f;Sx9|IaW4beb?E*Lx!bUhb9I<*Z3E`+pmp`;ViyrWD7#?kfK`6Q?G1L%hx zn*q&d?gZc^3`de&q#qvjCO`4!j(JQu7lt!E#_PwTQ4Uq?Iv*;lXS;mj{rPY>Q-`lw zLoNgOv%f08DgcLhYVSn=Qqj7~7+lf5%KJd2N@kDT`h`5g9=#nv9%WtFx}@V<3fvWh zH?UWz)u7g@Rk)xa;}npE5{*fq8s!*wM%^{yvaZKcQlXYIvRzn78T~%`$EXRWjovt) zKbUTsi3hgYv>ZtIE>kdgUQRWR7?sjNrL;{c^@@ANTtJml+KzszP6)}O+)+||EDepX zDFqr-Q4_D|G`U9zGRG~FlDX^|GLJn==HrXIpbVX@NfC9Lw4F#&yGqb$LN!GZXj|=2 z1XbJ9BYgmyvKmX8zvZ$?52Vm8q?#q6pmCGVy=OeBcQ2Vh79Y~5kJRXO&`QA}3tVW` zwG?m+%EST&5M;aC6%(0dCePh2_5OsHRSa z3hE+opA2<#Cv})PA)am{vs?yu>)|^ExDYs8r#+2u(kpcb!3Zj^e;*t{gY}UjIR%GN zFr~!vd4bx4A7TfEf@e}yG@*m3D8urqn5EKO&B$a?$M#TvP+Ki8TUT3oE3olYo8)`1 zsQQ67)Ok<+$l)3j_FG~Ai$*N7!D=+y`j(`Lfj2BL)CxBsi**{fgic$P&owc+5A<7h zRMgrU!xb?JGg200z#;U&x*`~B7h1JDEGWsQ3Lg!)0GMdo*G<4q8*D;Vw#3OU#vACw zV`nPxM?OPy)s{Hz8JhejdG?DS%dpK%0l~72o`5bsxj_g-t_J)g&!aVjx*?hEyDcXB zI5GJN#=!@Z0_S2yTUcVFYG7@`wxOLs6qe$ diff --git a/weapons.asm b/weapons.asm index d216af9..cf201d4 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1751,10 +1751,13 @@ Loopi bpl StillUp ; where we know that the bullet starts to fall down ; we check if it is MIRV and if so, jump to MIRV routine + bit TestFlightFlag + bmi NoTestForMIRV ldx TankNr lda ActiveWeapon,x cmp #ind_MIRV___________ ; MIRV jeq MIRVdownLoop +NoTestForMIRV NoGravity StillUp @@ -2102,11 +2105,13 @@ MIRVcopyParameters ldx #$FF ; it will turn 0 in a moment anyway stx MirvMissileCounter mrLoopi - inc:lda MirvMissileCounter - cmp #5 - sne:mva #0 MirvMissileCounter - - ldx MirvMissileCounter + ldx MirvMissileCounter + inx + cpx #5 + bne @+ + ldx #0 +@ stx MirvMissileCounter + ; Y changes only for bullet number 0 ; because rest of the bullets have the same Y (height) From cf61f5075f84b41f868a5a743265efcf413d9c2a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 16 Dec 2022 15:20:10 +0100 Subject: [PATCH 09/19] New Lazy Darwin (with problems on 5200) --- MANUAL_EN.md | 2 +- MANUAL_PL.md | 2 +- definitions.asm | 2 +- scorch.asm | 2 ++ scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49342 -> 49335 bytes textproc.asm | 4 ++++ weapons.asm | 11 ----------- 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index eb13bf7..31654cb 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -178,7 +178,7 @@ Only these points determine the order in the summary * **Nuclear Winter** - adds nothing, takes nothing away :) - in fact, it is not so much a defensive weapon as a double-edged one. It floods the area with "radioactive" fallout, which is ordinary soil. If you do not have at hand any weapon that digs up the terrain, and for that a shield (preferably disposable), then after such "fallout" you will have to shoot yourself - because being underground is otherwise impossible. Alternatively, **White Flag** always remains. * **Long Schlong** - a special weapon :) - Costs a lot, doesn't really help with anything (except possibly digging yourself out but only when slightly buried but it has a cool name and looks cool :) - It can be activated independently of other defensive weapons and remains active until the end of the round (it cannot be deactivated). * **Lazy Boy** - it is not actually a defensive weapon. It is an aiming aid. When it is activated, the tank tries to aim at the nearest enemy and automatically adjusts the power of the shot and angle. If it has too little energy, it can sometimes aim wrong (it uses a method like **Cyborg** to aim). Like **Battery**, it does not deactivate other defensive weapons when used. Note: There is no point in activating this weapon before the round, targeting will not take place because there is nothing to target yet. -* **Lazy Darwin** - works exactly like **Lazy Boy** but targets the weakest opponent. +* **Lazy Darwin** - works just like **Lazy Boy** but targets the weakest opponent. In this weapon, after automatic targeting, "visual targeting" remains active, so you can easily change the target and independently select another opponent by seeing if you hit him. * **Auto Defense** - activates the mode of automatic activation of defensive weapons. After its activation, the tank automatically activates the strongest shield it has (consuming it, of course) at any time when there is no shield (also between shots of other players). At the same time, if the tank's energy level drops below 30 units, it automatically activates **Battery** if it has it. This weapon remains active until the end of the round and is indicated by the "computer" symbol before the name of the active defensive weapon in the status line. It is the second defensive weapon that does not deactivate other defensive weapons when used. * **Spy Hard** - Help for the forgetful :) . When activated, it shows a preview of information about the next opponents one by one. Left/Right - changes the "spied" tank. Fire/Space/Return/Esc - ends the "spying". This is the last defensive weapon, which does not deactivate other defensive weapons when used. diff --git a/MANUAL_PL.md b/MANUAL_PL.md index a5fc4db..26793f5 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -178,7 +178,7 @@ Tylko te punkty decydują o kolejności w podsumowaniu * **Nuclear Winter** - nic nie dodaje, nic nie zabiera :) - w zasadzie to broń nie tyle defensywna co obosieczna. Zasypuje teren opadem "radioaktywnym", który jest zwyczajną glebą. Jeśli nie mamy pod ręką żadnej broni odkopującej teren i do tego osłony (najlepiej jednorazowej), to po takim "opadzie" będzie trzeba strzelić do siebie - bo będąc pod ziemią inaczej się nie da. Ewentualnie pozostaje zawsze White Flag. * **Long Schlong** - broń specjalna :) - kosztuje dużo, nie bardzo w czymkolwiek pomaga (poza ewentualnym odkopaniem się ale tylko przy niewielkim przysypaniu ale fajnie się nazywa i wygląda :) - Można ją aktywować niezależnie od innych broni defensywnych i pozostaje aktywna do końca rundy (nie da się jej dezaktywować). * **Lazy Boy** - nie jest to właściwie broń defensywna. Jest to wspomaganie celowania. Po jej aktywacji czołg stara się wycelować w najbliższego przeciwnika i automatycznie ustawia siłę strzału oraz kąt. W przypadku posiadania zbyt małej ilości energii może czasem wycelować źle (do celowania stosuje metodę taką jak **Cyborg**). Tak jak **Battery** nie dezaktywuje innych broni defensywnych w przypadku jej użycia. Uwaga! Nie ma sensu aktywacja tej broni przed rundą, celowanie nie odbędzie się bo nie ma jeszcze do czego celować. -* **Lazy Darwin** - działa dokładnie jak **Lazy Boy** ale celuje w najsłabszego przeciwnika. +* **Lazy Darwin** - działa tak jak **Lazy Boy** ale celuje w najsłabszego przeciwnika. W tej broni po automatycznym celowaniu pozostaje aktywne "celowanie wizualne" można więc łątwo zmienić cel i samodzielnie wybrać innego przeciwnika widząc czy w niego trafimy. * **Auto Defense** - włącza tryb automatycznej aktywacji broni defensywnych. Po jej aktywowaniu czołg automatycznie aktywuje najmocniejszą posiadaną osłonę (zużywając ją oczywiście) w każdej chwili, kiedy nie ma żadnej osłony (także pomiędzy strzałami innych graczy). Jednocześnie jeżeli poziom energii czołgu spadnie poniżej 30 jednostek, automatycznie aktywuje **Battery** jeżeli ją posiada. Ta broń pozostaje aktywna do końca rundy i jest sygnalizowana symbolem "komputera" przed nazwą aktywnej broni defensywnej w linii statusowej. Jest to druga broń defensywna, która nie dezaktywuje innych broni defensywnych w przypadku jej użycia. * **Spy Hard** - Pomoc dla zapominalskich :) . Po aktywacji pokazuje kolejno podgląd informacji o kolejnych przeciwnikach. Lewo/Prawo - zmienia "szpiegowany" czołg. Fire/Space/Return/Esc - kończy "szpiegowanie". Jest to ostatnia broń defensywna, która nie dezaktywuje innych broni defensywnych w przypadku jej użycia. diff --git a/definitions.asm b/definitions.asm index a8bf33c..3bc3872 100644 --- a/definitions.asm +++ b/definitions.asm @@ -86,7 +86,7 @@ price_Bouncy_Castle__ = 512 ;_41 price_Long_Barrel____ = 2100 ;_42 price_Nuclear_Winter_ = 1000 ;_43 price_Lazy_Boy_______ = 500 ;_44 -price_Lazy_Darwin____ = 500 ;_45 +price_Lazy_Darwin____ = 730 ;_45 price_Auto_Defense___ = 250 ;_46 price_Spy_Hard_______ = 83 ;_47 ;Weapon indexes (numbers) diff --git a/scorch.asm b/scorch.asm index 3d1b1eb..9617217 100644 --- a/scorch.asm +++ b/scorch.asm @@ -678,6 +678,8 @@ ManualShooting lda JoyNumber,x sta JoystickNumber ; set joystick port for player jsr WaitForKeyRelease + lda #%00000000 + sta TestFlightFlag ; set "Test Fight" off jsr BeforeFire lda escFlag seq:rts ; keys Esc or O diff --git a/scorch.bin b/scorch.bin index 49f2d6db7738f223c6e10e91154635bbf0cce057..b6289c6d4b940ca8a5658bd2d4775254f2afad61 100644 GIT binary patch delta 6359 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 ZzBhhntaEglE*y$pomkuqJlyHb`~&LHK<@wm diff --git a/scorch.xex b/scorch.xex index 26c0d2bb1c0a9511eadfab65264a9265d8431c39..e7ea8fb8a413b901a8180af09fdc4f1a081d646d 100644 GIT binary patch delta 7807 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 diff --git a/textproc.asm b/textproc.asm index 9759a89..e47fb83 100644 --- a/textproc.asm +++ b/textproc.asm @@ -890,6 +890,8 @@ NoAutoDefense jsr FindBestTarget2 ; find nearest tank neighbour jsr LazyAim ply + lda #%00000000 + sta TestFlightFlag ; set "visual aiming" off jmp DecreaseDefensive ; bypass activation NoLazyBoy cmp #ind_Lazy_Darwin____ @@ -901,6 +903,8 @@ NoLazyBoy jsr FindBestTarget3 ; find target with lowest energy jsr LazyAim ply + lda #%10000000 + sta TestFlightFlag ; set "visual aiming" on jmp DecreaseDefensive ; bypass activation NoLazyDarwin cmp #ind_Spy_Hard_______ diff --git a/weapons.asm b/weapons.asm index cf201d4..f179725 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1232,10 +1232,6 @@ jumpFromStick jeq pressedM cmp #@kbcode._S ; $3e ; S jeq pressedS - .IF TARGET = 800 - cmp #34 ; dot key :) - jeq pressedDot - .ENDIF jmp notpressed checkJoy ;------------JOY------------- @@ -1451,13 +1447,6 @@ pressedS jsr WaitForKeyRelease jmp BeforeFire -pressedDot - lda TestFlightFlag - eor #%10000000 - sta TestFlightFlag - jsr WaitForKeyRelease - jmp BeforeFire - pressedSpace ;================================= ;we shoot here!!! From 6ec02ab3fcf3dd83bce28d5a65aee37facfc1b59 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 16 Dec 2022 18:11:35 +0100 Subject: [PATCH 10/19] Lazy Boy works well with joystick (more testing needed) --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49335 -> 49335 bytes weapons.asm | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scorch.bin b/scorch.bin index b6289c6d4b940ca8a5658bd2d4775254f2afad61..3e46082f2eb7eb31ca17096390f6af5803882999 100644 GIT binary patch delta 63 zcmV-F0Kor%fC7Mk0s}7sCJm delta 63 zcmV-F0Kor%fC7Mk0+X7smhq diff --git a/scorch.xex b/scorch.xex index e7ea8fb8a413b901a8180af09fdc4f1a081d646d..20ff477a7be623b8bd417d4ed89cf68386deb5b7 100644 GIT binary patch delta 63 zcmV-F0KosZfdjXJ1F$QJ0;X(}D~UB8$f-bu)?mpT&ojT-8@~Vm delta 63 zcmV-F0KosZfdjXJ1F$QJlP!rg9?Gdeh1Oun9MA|L=w~F>5V~N=KhOyva&jQzT}*hB VfQdB%rfjpdi53C@ZnMmb>ojzW8^Ztq diff --git a/weapons.asm b/weapons.asm index f179725..a4045f1 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1136,6 +1136,7 @@ ContinueToCheckMaxForce2 ; $f3 - shift+key notpressed + ldx TankNr ; for optimize ; Select and Option lda CONSOL tay @@ -1206,7 +1207,6 @@ NoSpyHard jsr WaitForKeyRelease jmp BeforeFire @ - ldx TankNr ; for optimize cmp #$80|@kbcode._up jeq CTRLPressedUp cmp #$80|@kbcode._down From d420ce06ca67fa7a2ba25a7767dc36b8c7f1a09a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 17 Dec 2022 20:05:33 +0100 Subject: [PATCH 11/19] Smoke Tracer does not smoke when targeting by Lazy Darwin --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49335 -> 49339 bytes weapons.asm | 5 ++++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scorch.bin b/scorch.bin index 3e46082f2eb7eb31ca17096390f6af5803882999..3e6c8e9b46e491689c11c3e7db1c4b7256049221 100644 GIT binary patch delta 1529 zcmZuw2~ZSQ5asUy3uGOxAfT8JqKK{_;01^RUa$@<;aaZfN-PYDnyf~_qg)flAPNEv zy94YJr5I$SqAL?qMRdhPKv#_+so)i>j5(?hqO~!x#G^ES(O^}QnX3NXuix+A-M_z1 zC(`Le=B0A97?#QBASc)_y zBq$e6LWiMfQJ-g|o*ZhXl{(&;Y39cY2Ok-}g+LNNsH zE#tlI@Tm6Im=^m|qxbUeB+@H<=}T+W2SJOkjO(c9&e)`f)?i1K21j--$v`CQ%%wky zP_hu7*oV+f7)c5wa)R=zB*-w!1^!T~P%6Z)7(|z0I=u?bg9|o75klk}MMKhw7BM z_T@s#9?~nNYJu~R-s0m%*uTI*)h=`%yfe51 zRH@ODjDvIrRHm*%8N$6(C*&DXd-0;%W89zKQqtPXXEJ>_0-VwU<{sALW!p5C@;4Z* zNY%@$Ws9EzlB1+5B-mtW2AM>Y*Yn7)^!F zv|QKgWUd$<8@KRNVSIXmhgsiNOj_P-nL}B<`U8geC9pm{$v?M_t_03EgtAgLr}nN> zIdlhbexx&_j_=ZEA{o3$kDa)zju(?VYcXYe;W#b!E+&cN+Io65j0WADhL7KUC zLP|Z4n4`FC3rXN8-k;93SUqfFY}Vsi_$1Sx%odkfPWl*{1+q)}N+YGgH^G{Kzh|GaNezaEB*SMe!&XW4W9vBc!;t6gT`!5b>Od3&yVUd0Q#h$s zyF{6ADT`ZKECKKA(8wZ|8Q>L_rCvO$-0sDnuH50piz;_|wH4!pG#q8ptkZ7)sG_#9 z#ltUfMnrUi67Pd;**P*2;}%Q%uy8y(z+=?l9dK{MfgTDg8*vo4=7ddAnXHaxDS5aR zB>DexO!K+cyAj}?;|HZVROtV(*NjCxB*8HzuGLgbahyp@VU_Sjju=T)P2^Quaurl} z<9u%5u9VawWwsJ*BsUm60h|{i+1^OZ*%+4+Pxaq{ejoX8NJ${CqCM#3b`5Vfs*<)W_`1Y=| z*VN@%CAzZm12rda|2cm4ij|vou%DhA@(fQ*)fzwl`p$39yC-hS~$L;PNwFW2i%BnHmum_>$ILXHT!kxg!LQi-Twwk#fp9a delta 1450 zcmZuw4NOy46z**wAdvc6`~yto(y$<-P>~`2pa=>=c|b=g6oJ{{-%!L1#jy<|I-XId zRXEUAXbE9F;B7iPU!q}HoDtbjbS$&Xg_!+h1GX9L=9su_x?41uEWVqZd+v9>bMC$0 zJGZ7rTvH=9g@ZSD2E$bO0r8H|-i z$R&OZv&bY&tcmL#@=P8d-pf?YT5cM6$?aKO%zOn&;a;Y}+ivEiYzxS<=E0_{Sn=ay z(2%vvGYw`PBzk3KC-{zesmS&+Qq@zlg=kJ`?`~ou_fFMb~87~ZXp}@ z;!eum9t<`qy@89 ze8+0+C^PlZZKA_v_xfnJ(y6B13S0*zIgzLiOgZ652@7>W@MTVt|83GuERSt_c@LHx zaK_wGMucv0#?b?FheChl*TQaHx+1TEISO1*1U*2zeY(1P3Ybpdf{7^80hcZcQ6R}( zjglcLcdn1Aktv4h%pj=D1ym2d`t3*qZ|dh$XUy0H@9Pz$V|e`$qRi4fnDx2&gpD@h zVYr!>=oN2C>s|)({D`n3%YKX0ddvFInsORWr&!MV{Wd_IdNeTGF&Xi=tNSVOwR|Ot zhlBa?=pl6H=ljLkaitZvTCoU%4bf;Tq#G3T;_Sv974IB6R^QYX5Uh+`x-waVS$Nk_ z;6u1~tjt^(F(?D3eO`pGoIc)1gX46w#?LN zrEt8RYqyut9A~efafa||fdo+*&Ez3o*{Gs>nwE2}U%Xfs@5SyT*gqS?(O(c&7(wl8 zBFk3`RdhykAm=K5PB~r}EWhc1{*T=j=R}@z@e)QShu?35l&XNrqcfQroe0h|P zTF;bQ9ldvd_}dpJ*k`_$7P!1E2JUZ@wQZMxqm(+o<6{Zh4Ci(=%+m4fAKX+>E@YGk R`E2LyEy3N@!p`zW`F}QTWgY+k diff --git a/scorch.xex b/scorch.xex index 20ff477a7be623b8bd417d4ed89cf68386deb5b7..7556885e563d826b1e69f75a3599e79cae533e25 100644 GIT binary patch delta 1450 zcmZuweN0nV6zBE>5hJf442lA`1Of>76-A;WIGlrM1(_N@GNpoyAeJBD2 zdRpFV=_}aL(uX2-Z`F}mW*nk5aeiz#mwl-G;m|m2%n+R!?zR|R;_gk(JLh+P=bU@b zJNImr_?s%R<8C(kTez3K+aGnnhq-BJC)DQVL@Bk(*j%jeNipz#ToV;{OLk5*f+!p( zjN}ecXq9kdbB_pR3RPQvLXt8D?|_dABfLs7loqOxL-@H+FA28U=r3LJPFfiD$~`Wd zQ1Nl7l!WPao)9CMu;i1@K;#mJ4=hC}Lr5u)7NIa$QE?UNL0*|cgySJHfx7l6CfWr!6v9ztj_fn#a@9WU(D zVqR+*6B=K`2a`;%aLa_{^Fhnu?}KD5);^E4eH(t6t0JXJ=rxEO`%=wsB6Lcy)?P*^ z6N>9%iEOUBC5dC^1VT}L9y$$Y>xWS)v^NwWR;x)sd61}?i<)7hCKauQqnfo5qZ)FP zp*Th+RCTx?z>aW*QQAl4R$oQ*J66Ajhc;c1|~az*wW zcdoXSc3kAw(gPTv92BHR8-z#e8T^>VSq7C&t?8#Mel_Yx{gfxxHJkE8;ivE;B%`NV zT_UOnjZO|(y7#6mB11y+*t3`SVp$6PCBNp(|y z61{+mmZIr`o=0>SzP*=}@4{(_o@hI1`q# zOQgq{oZfag$|l7PFn=(gvFU~_h91K|h90In@TObR^xPff7)=_t_f8N8*;sTOp0Nwj z7MNpL7ud$(J1h<~kg0Dr%tF`Tydf&AjZ^I?*CypwbLJEY{T9V3T)o5Q7BJ08q~dShh9yoLjz zR_k`ZhJ&H_uYCMJf!kguZD-VlE-rL&7>pScgM2U>z7FbGn#I4&Q9b zacwf?sMMzWrm0*S+1trZgK|!eIAFM4>yDUs30>-KF(NId9HaP%X`uA_2$?i5s373X zS0L~Ih8X={qH7AZe8Tmb4x7y3GrXB(-b`;3ilNCYN5w*ydFtefYqx)WI5w_WmcO-l z-$6~Av+vHM7xAf?o782s_OCD8dQRc_`Mc}BxHR-KY-Vtu?~O~7R+TZQ&fFG7CT6eL zw&$3Q^DVP)L7F`gS)jna0NDh+{ZA>n3WrYV0$e=(#QIF$2QfYJNjG@T9NBwc$m}T% F{ugrWjEn#P delta 1528 zcmZuw4Nz276z1*^%8x!4H(ho_?;-~1VoCm^1~C%^3y!HNrnrcuAZel~XpA5}MTCXr zJb3%}klEP<9zVM4bEXiM{)}2pLq|+A8>7iVErv9Iu+r`>jy7ZO&YXA7cfND(Ip^Nn zSt9@8#S%D-=Er+ruQvIa zwrE7-5AZUQ=_zgHfomevBG?aoL$-h| zhr@`}AHD>eE0&;k=&Tq(QDCcFM=F=-B2Wsbbu&>VWay&N5~$FvQ2e1IUG#^uL1GP~ zvv>D;ejXi$b?VVZoqOt#$B3?)g|@)@s#T=-&Z<vc2n|5hkWr1{_Yv~wzyEE^tC;B`s*0cDw0WXHnVLZA6mti`Q5+)Lr zK{T^EU=EO0cs#U&_t+uO%0var*v4Ek(R$Zx$}R6z-QpYJ29rFwlhNFU_5x89<)(&4 zHFrR|#-C~5FCy)GT}x`C$ptK`T{N+Y;l<=otlTO&hCIA6msE@I)@nWllIl`z8+rhx zbsOg&tK|{hf-mnNCA8q>%j{Nn@Q@hGSi;5ZuEtz#W3Iy0KxIqlOjje7?L)8UCEgn{ zg)Ji^Y-3@xnys`@S{w_BhBzt5CUsb#!Vney1^WxT-7w3z*4SzsHny_u{ukVm>S6a- z$Gxb>%^f4eD~2${!QY0tXf4b#uJku^_^JW>8p&g*HO_eLjDhas)s=;E9#!s^^IesD zLV}k^9oZZId zQg%C+M`5Qh+bl*Brziys$5)_Y{dKnWLuj9})r zt}L~XGb-@R8 Date: Fri, 23 Dec 2022 14:07:22 +0100 Subject: [PATCH 12/19] Two sets of "gradient" selectable. --- ai.asm | 57 -------------------------------------------------- constants.asm | 5 +++++ scorch.asm | 11 ++++++++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49339 -> 49341 bytes textproc.asm | 17 ++++++++++++++- weapons.asm | 48 ++++++++++++++++++------------------------ 7 files changed, 50 insertions(+), 88 deletions(-) diff --git a/ai.asm b/ai.asm index c607b48..430bf31 100644 --- a/ai.asm +++ b/ai.asm @@ -514,64 +514,7 @@ skipThisPlayer lda tempor2 rts .endp -/* -;---------------------------------------------- -.proc FindBestTarget1 -; find farthest tank neighbour -; X - shooting tank number -; returns target tank number in Y and -; direcion of shoot in A (0 - left, >0 - right) -;---------------------------------------------- - jsr MakeLowResDistances - lda #$00 - sta temp2 ; max possible distance - sta tempor2 ; direction of shoot - ;ldx TankNr - ldy NumberOfPlayers - dey - -loop01 - cpy TankNr - beq skipThisPlayer - lda eXistenZ,y - beq skipThisPlayer - - lda LowResDistances,x - cmp LowResDistances,y - bcs EnemyOnTheLeft - ;enemy on the right - sec - lda LowResDistances,y - sbc LowResDistances,x - cmp temp2 ; bigest - bcc bigestIsBigger - sta temp2 - sty temp2+1 ; number of the farthest tank - inc tempor2 ; set direction to right - bne bigestIsBigger -EnemyOnTheLeft - sec - lda LowResDistances,x - sbc LowResDistances,y - cmp temp2 ; lowest - bcc bigestIsBigger - sta temp2 - sty temp2+1 ; number of the farthest tank - -bigestIsBigger -skipThisPlayer - dey - bpl loop01 - ; now we have number of the farthest tank in temp2+1 - ; and direction (0 - left, >0 - right) in tempor2 - ; let's move them to registers - ; in temp2 we have x distance divided by 8 - ldy temp2+1 - lda tempor2 - rts -.endp -*/ ;---------------------------------------------- .proc TakeAim ; targeting the tank number TargetTankNr (and Y) diff --git a/constants.asm b/constants.asm index d438c99..d1f0fca 100644 --- a/constants.asm +++ b/constants.asm @@ -63,6 +63,11 @@ TankColoursTable .BYTE $58,$2a,$96,$ca,$7a,$ed ;TankStatusColoursTable .BYTE $54,$24,$92,$c4,$74,$e4 ; standard order TankStatusColoursTable .BYTE $74,$c4,$24,$e4,$54,$94 ; Adam's order ;----------- +GradientAddrL + .by dliColorsFore, >dliColorsFore, >(Sintable+40) + pmtableL ; addressess of the P/M memory for 6 tanks .by <(pmgraph+$400) .by <(pmgraph+$500) diff --git a/scorch.asm b/scorch.asm index 9617217..75f7af5 100644 --- a/scorch.asm +++ b/scorch.asm @@ -26,9 +26,11 @@ ;--------------------------------------------------- icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $5E +FirstZpageVariable = $5B .zpvar DliColorBack .byte = FirstZpageVariable .zpvar Gradient .byte + .zpvar GradientNr .byte + .zpvar GradientColors .word .zpvar JoystickNumber .byte .zpvar xdraw .word ;= $64 ;variable X for plot .zpvar ydraw .word ;variable Y for plot (like in Atari Basic - Y=0 in upper right corner of the screen) @@ -250,6 +252,11 @@ FirstSTART dey bpl @- + ; initialize one Variable in zero page :) + lda #dliColorsFore + sta GradientColors+1 ; generate linetables mwa #display temp @@ -1196,7 +1203,7 @@ GoGradient ; nop .ENDIF sta COLPF1 - lda dliColorsFore,y ; mountains colors array + lda (GradientColors),y ; mountains colors array ; lda dliColorsFore ; one mauntain color sta COLPF2 inc dliCounter diff --git a/scorch.bin b/scorch.bin index 3e6c8e9b46e491689c11c3e7db1c4b7256049221..08e597f361882a9156827986289399a6045ce1db 100644 GIT binary patch delta 7783 zcmZ`e2|yE9+LD{uG#e?{#P!NM7sLqIwf&Z8}f^VTx63vF{m-xV^6%f8{1oEL6k zwl3ow1?GEXquau`1u2G=s(xiZdV4o2--?E|BjZ-IdncEUb=+cH%+=s+oB}`3QFuF? zcn6x0hAg|#hr5w#2TCG$-JU6*wt*>1Y-{hgMA9}VO9O3_p{MKnl{S>5YujXz(^z`~ zP`r$px`KO%KS65?Kp5AiwTwx}3Up%=nydiX%N5moOK!7vttWr3tR+B)8*vLc&{HJtZB_YT2Y=zqlLv3gKQ9UXi{ zc~}R0f;I?n|82TTn0y})>`HW=h#l%6~1n<1tteL zfng4f&XZ}15b8f9Q=#^YEjX2-0)}l>TJ&l$yA5k$ZkI?-DW*GgWg_P?@}}@@D5>#bpMFfw>9u)hcHNX6C_!=fiZr!A;RhnhFR=mff&itKRq zedCw-pNySaYs4opg;)s%#uPGj2>%$w5mMQ&zYntr1j=ZM<{>-)|0z_Q>Ipkc%O8O&${ zZU+TOY4mdzDo+3pQc@bL6F>SJDQ%Y0R%iZ8&I!;=QI=K8yI+>l$}1wh0Fd(@?Na*2 zIycKYH)Z$GIyV96$a?}1CIGZL@W%lyfPdvdt^*$woE7EBW-Zx+vs%~m^~iWfu-i5K zw^eJp{L`KB+Afri*D*!pgR$PeNo#tX`5(MlU7-us)kz16jS}|x>+9UWH-^UUix!XB zB_2})8qnffV69;6j_B(n%$I9Kvj+Gr6u4GA6|#}H{DY`z=OQ;&Q?g z>ed{n_^PkRiT|Nh)8(^DAFklW;1(eEpz$e-D~-)u417uje9G|koJS?j=TvyTNpj#- z{oJhT%h85I`7!!L0@;z=nz2fkMj$U z%fP3Qc72=9o6Rru!Q0vOg%Z5O;tpWT^>l28^BW<$AIfL85D(<7-k*k>x(=q{=2qS5 zCPA>q=*3A6<@fa<{sF5)|7^gg1W^zr?V?2CmJ*VUo}!MCooEVmmAsDTP!@6<&6lgQ z%|`Mq@+I+se&JiQHNm%{wnmtgQBJMhU7MARF&o|om2KMNYWOq{+%pUwG<=>1*GWy_ zmr<+RRG7dFa^XlYW?x7}8FO_QrLGGfUHm#wShEF3(JKm+3)El^&oYq2{!c7c^WaDrt#iXwB3|JI%KvJ z_LSg~XZMBuZwzQz?S*#!OAVO1=s5Vc#fN+y6dp#chxyy|alwrD23pS9NBaU%LB8EA z!IOW559OXu76eZ(pP$#J9eSGvj!>E5ZQAw>Ge2+OHhUXlhaA?v4bxtjD&?G$IAL#l z7s@c8>qfD+)q~E%K=mL1l>qWCw1YtEIT}{C%6JFJGv{a!1oDoszPuZI#OhP`6RON- z=98a-XHy)B4hg3U$l8#ns3G!v$g`@U%;tlEFC9}dmH8$o%Z@axv+NTrQuFAb_07FUqxMopfxK6k!}yZ zBC6zykZoo75GPPW+J^BNC<+9Q-b4I74G{hVPI^sbuc@De%6}LB<&(lk1U)9?e(!$% zEe-m9lPG@?J}t@`5o6|*mo~WBCg4-t^AMHXAS!9sb6Sw?hC3f$zQ7j9WeOD$cg?=^ z6KIaoyU@c&7Z>?VRD=|c_Wplmc#M|(d(vDgoXiM~Ew3qf3{!ZyTovWQo>mWnC`JuJ z@m21P$0af~1>9?Y1X=z70)-D(VDE24-5Z72zYwDPQi$#ku~EpVTy(HdC*0dD+$N%2h^5d$|e(dNWS znuFZ>_#aFT5MJicV%^oR{2q#1P66M>{tHcVRC?touaJ^I^4xtrHDwwCk1TV z2;~b@a=Z++Z|hffA#*B!1~y`ZiWqg1gz(9uUP&_;Y0D9^D|~`q7}OxEpa!u)4HAW) zhqPO4UCql`o%I`H31^}|-N@PWFDSSu{Vs*Zp6;3zZQ8T7bXQ4+{)oa-ON&vPGYn@u zEtwtR15TPAF-Lk$OBO_U!sPV`L}^K1L^wQuh)9{FT@O|X2Km`u^_o`CZ#AP1voIR>TUd`l?#YxLHsmy4OYVsyC}&D%CSs1gQT z04@YGQ^R3%f!9a@H&s)`!Nq6mG#{@LjqiMTwRM%_7bNYHOK|JI>M-UHJ4new%X(9)v`+!9spB~_3 zUlqRX<>?C@<4aHH$JLWDGbVe$1y+KyaSqPKdBR>x$pk1cS_fx1q=Rn?xlSELC6Q$H5^1oG992)3 z`jwE6)HA48iQCL_xice3H*JfIrmIP{ezcC0JBt37Y51O3L<@>B}0+u9jUXJ5(OE zXThG-vedG~ij0ai74Cce_U2VQSFy7~Uty{^R@qhg*UCGU-&Q`T4Bac+n^rc9gw73# zl2maHQ1*G?4*q+{^DUeYj0VL~0E|BS4T~gIs12^iq++hG=lxo^E-T=Y(1D^G1PVq* z+UJJ2L^mK=6VR3)nn15AGOpHrLwMF^nZc z^PY-<1=*bth)Qq{yBz}54xFdqoZ+Ct?qeHZA00OOQ2>QI$kO@cR2}J`A55(w-_B2p zRwVW--w-+{8V=6DxM3KJFW9*-1NDI{=DRA+e|SW;E>JDzC&A^Z1ukvh(VV;f63xl< zAJ9;LKMouP!1fPlHrsHSW^)WzXg1eygJ$y#19ZP~5Y-TV!5IJ81|X>gw^XSum+3({ z&|0q0gAyQTyoo%129-wU#8306soZd)UwQNLCE9$6hO~T_?1@Kkme=CF%Ku!!jfU+w zJ+>X@4^Ri#j{tSEALU{d_teN}+{h@-K3Y)?hi~DA;m_D-!#J4v0d7bS3a0e;Wi;~+ zQ7>euNP-tGg(tsoe7N})unq@f9)uc=@Hr@a5}bS8mVuK4C)tx1I_kcM%)otBeG;uB z{)_ymvt;HX1iY&jO-)oJGH0ts;!>g|mgfCHfRIjvWCHO8x<1edDblrRH(;&M4U4I= ze?=GA*T_<0um<^`EDH1xRuJQ^KAR zQXE*;n?mZtd7>{!s)*%jJ(WS0Ee@csrnX)%yWEBNJF2P|0`ktq>CzrdJf2pOTZ?PP z#Fv_F5HK&_r!U)R7`oqwo)dGPR6Y|@4s9^#j6px=YHDz!QiitHwrSb1$3q=#lbb^2 zwz#HHDTLb3_nYav)`u{vud)6tzF7azZivWk&^&`%R6jQ#U(rA_&B;E0M`InuJ462v z+14=rHE{ij5}Jt*#SVl}Xu-PB-n&|!3T>B&UK&`ZAeSHLR~IV4taleH~%mB^?Q2fz|sgWwb#@TXxb0Ee*SXs>{33 z1;%xM9n#UvMe=Jxs9*Iy5YnOs+@Oe(0pSfD9d(1LCi9j&HM6c5`d>m_@z5rqxHk>Z z4ud!J&IH?mmKh+`;9x)^uX}`Km>YU%0{5F8B1-b#xZ!#waCbaPLas0Ib^d3A?Uty( z`lY^UBa?mH!{x|LkDv<%C9++?019-|2f7WE(xN(aNY(H{2qBJCF zxu18#0a)awV4cj&1K=6LOBj>A%OjlT9$>M1qgQ$N+6-o%^{|w zpor2kpm-7^aB-BuTWOLDt2*>6{~ZNF$o-@s5cy;n80jiQzMPu;^5R#EMbi>aFI1Y) zcY(W+A)bctBy>HKboQVG!5Lb07fd@_FQAzE{(j{HaD8D0m+oE^LtIk=<;NP(77~@B z3ZB}CUTi`)nlx?N1LtX>eE#}8Z5t0wYMVc5tcP|qN+26jLP8tsAp!N$nn!x=8l*0< z2Gq$1-FPXa1QQg1E!-sHm+B)$FOk2cc+P;LZoAc?PH60Ls8_5TZ=9kBwnI1)5iVj( z6LHKZuz;OP5HS|Y8FlJ-FQ@{9iUl%53j}7XiVyr3x0q~B^>uuy0IJW)Ua#_DJb62nB+%gjMC91%tx7ovfgKraP;{}2!$%T_K{qmQW6(ndq$!ogystuY<0 zLq>?GLv1wU@-md;E!=2uMt+XKxcCW15|rjYHo;D10xBWcLiB^C_sg#^xkTKr4>X6+ z0aB9YM@=TLq%ER~$R}yxsv;fJ^m4yaIH6)VaugAt^aU{>!d~$XouUPKVpYr}y&`UR zxE8KYWlh%6HW_FLRsthAknT&x5-z<4Y&$xGjJwpJKT2!ha%yviqT502nQ5SVH{3`g zw=*U=#5E>#%^@Doj!TB_noj5j7He`E_cnSqebn@yre)2|&CA3HA+LL2RdoCqI&{2C zWNA#$Kw}+$%q8hd;I|5Wsft7T7gSK2>{6j6DaLV39I1GA2K>U&_3Zq>B`Iik3j47k zTLlr-P@sZKuAx}P%r>AGnowI4awNVhr%c<}1o9#Td6XdUtRPPc^58>*fY}C3k*>6| zw*IhbwD0)v=vnbg(Tn7Tl@qA*#I!P8A@&G0g1{S1j4%0grJv8EAkhECX0cs(7|kYh zX2f`qnQX8+b_o5pTF{fo`8e5{%!sM~oh)xeno*A83~VbT5SE3!f|AKQndhh_q-511 zdGZl-k-WDmf`0F?n*Dgt0nX=uw*%~dS52h;mjth#Flu)SvkMxdBzbiNoqWWb{kZUV zs+U$z^myrrnr#KnR=C))y&p3%tudbXwHZ+ zbj4+OZ`E0$HipKq4#I?xE&{U5cE+z6aw^}rZD%z( zZ298ekc)?R*zDw0FVr-?XZ`enlUK;1w6(fdPM+oOxlNpxTXy7h@2z|OQ>JHa#D>nR zpMLSLpMD*ZIfpPQnQJ$LeRce$|8I9)pPIB}Wocz~?E&)E7eD$;U#{7@`|xWQzV@27 zG-X@MpU>a=QbJFNH;nvgX(8R~bE&q@pn^}OXNuZoR3Uj|)5}ho9R7~|x6dlF>^YxN zn>a&@Z&zjK#^=Mg5tKkluOivw0E>+YcQ`&KfIueg+H*gX|KWT$o(4IJyMWY{RAio$dqmyX#egY?9bPUC4k*}U}7G$p8 zgw7=bM>BrSIgU_ZJD2FNO-2xPZAGjnNgzi zTadfXyvD^k0ofmG*1-hf1lHT)#LG}aE_=gDXzA9K<_je3@dfw}%rR84Uj)Ng5LN<` zYDkN}Rb@d|Crc>rf$r79TBuiio;nPBuOS0&P#3k|5+v%WgC%ZGBT;H~lTH-joXcLa z`k;@B(4yy99a9WjsnnSxg?-Sw2B-(k#g)3YlO(Tb*3}!U$x*IGJJ^;nQbwYSc)l`_ z_yMOYHD1oSZ7C`cv$H~ncIC4>86C`R>)`Xs*>-Jf(C0H9fv;7~k97*ke%l4!*RhWm8lPxX1Y3 z_E&lWHsTMd3?dEBaa&3>b``t%5wmjgVbxYJbpwjhqitJY)Qb2-WP`KUKTB0vl{Jdt zR2AKja8rDuDE#4=UBnAGcI-srO}uriH;i8#JKy0^qLyBm2&%k4c7_~e@LdYkc%p0K zxGM@G8C$(Pvwf4eLB@_-&M3I27<&ZDOX1^kMce@63VKkcw;SWpQ%UTZnD(3`!?P~! zo0ANiT{s1EM)0u_2ipx!1=dF+?)M{j&?e>#Y*I?1tLxE1ylsN#qz&sWQr`8Nl%#Hm z7#aX_-tCN(yt&cEywQc~8Q$nZZ@?WB+`|C%Gf!wOcD#b!xV)6v2*e!4=sCm)*4YXF zceOO{{1391W-D(+ym?Ay&z$3@enNcq7FoH|Q4EU*hhia5NmO^DGj8Y11tV@x{N}-bhid{XLXVn~AEb z=%HtAgo$I@%OexEr*E)B$_&zNX#yoV*u(Z*HBr3UB&q1Zt9-}E=WnFjaF*}18GHt) z0(785kMI)rsfK;Bx4>py8NZ<__2%#tSpNgu@9S5>C-aJKH}W${N(X?nCN)RaW}AFC zsy18AX6Lyx1#C{9gn15lm^Kuh)2tW39;09hfX#d|(~gK76U5%yYeNxA?3F3)g#fuA? zbtxv03p>j<$rSpa{3`09n$_pk;YKu-XvZI*NCIP}UlgIlaekW6W$D_0Tj4vx8mVxH zrk?I?6kU)G??Y6xu0>;ZBOgjqjBcdanS99ObAD5%3u>7KwbY&Ud%{y{>n&L|axSyB zUbJOunjpwk6x6JP;6uNFDSwZ(7vnay&<8RsQ+XFIlxg5j8S6-49>%M=Fs7kC28}(2 z_1U||IEyros@7Sr86s-y!Mk33 zmqf8$SNzpPgw1b3IHaFeTPXi`rtLHwI6J6gb$w^}ueETv#iPUAHoIW=fY6YSvSEIK zZ0UAcYuM*!zGNHi_d^S^ZH^45^=J4zx3ci&fZ5aBvzm3o7f9d;mKiUQ)@8JN*5GaS zw#AW`!`ioD+7DAo&N&DZ%m=6<-Lu%+njsl;o3dwbtMeR1DiCvtgyk$U-VPGNB@#G6 zzzNoqcVSOhJZk=nQnNt-3Y<@z#Onh?)eExQUZEO;x)1pUmsn7Z!lLbvI!1kVAHN*9 zT6KTT@k4$uzCzKd*^Lh7?MaN@yazi4&Gm3zd%TINqP{dq8YSIL)W0RXYp>kuc-0xN z4+?S}!QO6fq5yIzsA+so?wMqjIjWgCXYOidy6yR22D|xNj-!lPe*%GhN2;Pz zo6*tDLS$bAxi1!S-($ukB2wTdUvHa#`4nj2?r( z3-N|BkyAq9)@X-fHxE#c8tp(<8);eC;VLHlC>$0#*(Y{0)BsQ=@iJ7gbAakb&58Uu zP|O5{B07rop;PP+CK*kn`3PAqNWajkO==6Gf(1@ut@i_y1zty5Qd0o{C!v`Jbk7l zxJBoH6M_GH{;ODAHpLxmQ9orNP<%4Qn;4IOno>tRhYwASAe!;pQzuIQwH1FoHJAv% zZqwq3B{+RrAh8wihi5HrpXN`T$NV%;HMu=LhW*mjhl2V}QpjH7=dfAfGtg-)4Uh03 zw*zdjjF%3Uv*mqNyqqoT+i#W8K6qs~J?r)DgWJ{YzB~tJAA7*+67Hn=YTuBYIY7U> zy}w$+Rt`BZmFxi#sLrkg_@?dXb$l&6VydK2!=C@Dn#p8e8gR^J!g7GtXX@6FKX1|`l4{_#6&|o@zgA7328=)NqJQ$%I1m?l4QSdi5 zx-Eq^IB-7DvLK{Cqd#54W)3+qnXs~8`CnJHv5KD}eaO|O7|d*7n-rLeYRhd{L5{Oc z4pgq7E;h~dkzW84;CqDW;jD=hxdQemA1ToD zb|xuO#0i(60I1Fg6dl(q0U-+PIon&YyTD}MeFQI3l-ByhM0vL}j(vxfYgir`*9&0eHX7j|YZVDQ2@Qz*EH zN|EmK0i@O%gVC(r0@XdMN`1QE~%A#Z_ z{@&WtnQeHQ0!{ABEp!w>T2Zgf^Zbb-d~lv8vATDcxA!#5~pOwq1`!|acp-VV_VqS#|-k@RsK4i!I9S+eI^j$SvnU!#} z=|JIif?S%w*PjY>3a>*%1u!CCEPr|#@g1h04#=2M2gJ_e>dwG0yzg2R#lHx~{gQ12 zH$7FSg^SaqrXqF|JQSO4V#8P-X&U z7Mle(A32+8xePh+Nohjk17ZZTo6TVMu$fTzXED!dF^cl^no$S(beicH8)X7O$8sA;$MYv-{^c*4qKNUSAt+ISm>j3rTwW}nMK}j)GChnsh!juB4 zr!C);Odgv7)uo(Gx6JGKlFljQ#(=xBj$ zL|1~L8n_Yo65DJ92Qx3g4I8Y2t?rZb1w3yNP1xc6i(>8Vw)R)^eH=cuXgvOIkzMHN zqu_3KrYs1FTH9AU4Z&sB_QBJGr`gke9W@UiFLHM(Por7bcd-}o2A;ndfvok5r^hMc z=r<}x<7b?C7Rh^wQBW6C38@r98?=(3jS{7A)@@>RLN_g_tp6q_hGY)OcNpe`SZX5+LaF&?w`u;+vX&t$OYg~ZQfiHB== zAMROVAd>LPr9LE|*wiO{Ai`>2(GQ8EaA`7e3G+*h?vvN7Bn(~eLl297 z8&@m~EP=KfblRX1#3u$Eqhx4Xb+eA0&=PECol+kxw=Sp;mO?hTd7z!VXL$^xnkvhW z;*0eT?h#S|G~?iQH^4BC3e%d0nCR-d}@=KN2 z%{X*G>|8`0fYU6amsE?Lj++N8t}qLzwkY8>r<(5G&w2!t7Sif0Tzuu-Z?2(Jt5{EG zkp=WRL3iVGF(G~x`_09qQBRt8lSUm0T9|ckPMly|^Zu}&r2Fvy#sqs+><1wY8o&*S zC>apm)RW;i=?c7Xx%=Fld}y2r1=VA#fa1;@p^pY{Xu1h*1HCptYKG(hw#aLqAQ|C? z=9|EMzC%Pw{)!upp}^hoBnkd}xo62Ib=F%p19Ib;2B^5fF7})+Gzoaw&1%wCmyeP> zUWr@`2pVoelUFo5_jskBi^0!jWCq4!PM|}H;$>JyyHyFDuVdh7mf0N-4aq8KdkW24 z=Uj+ezR=CUyJI&%fWHyDT^auZkbb4%*4nb4d4(6=wqhmWkIgIe#1$M)uXeQC8s14VGavF$QA6w_CtnSVYM zZBV@1SH0*%(MJx#(q9T5P0u+92T6DdW6Z1!bBH`>3A756?v*nMH~j6&Y08l!4DAi! z6ywlUUjC=*paKv-7nIDuopOQXJ!U{8+q5c-km94O=D_pns&b+O$HzrF-mNpM;SxdL z!bjtZi1+Z=_&~X451oV~yYfW`6!t3=;zprU zO&X&~h+jg(HAruZS`fCOo!8g6yQvRF93B{;9zuW+W?VAUk0P*Zf?wpRI<)jTt+~nt znjFu#GWnhQ<&SIiS~Tq#I#7>3t%t(s;Jc)7+4#@9q}5;e8NeGIJq+D%=-57+5Ey*) zF!)SAsePj1uSLo|7M~jVkP9z`jM4~&Z37pCy%RlXl#$ykH0BGS2J36AnK7~tw!mUn zBXl`AbW*I2Z?=(x1rX6hgp(K%MI8N4Sk6Wz2%G?w*t|slaZr>9g%u>21_OfI~;*KN&`0r4lW-lP%M3t!Y|2h!crSWBTxuI8KNX~)ej$~)3K1P`}#j|kI3zn{6z#T)j(?<9so6^9JZt2miquL?ycn0)E^ zMsvE#J6GkMufm4aQ;47Oo2#Szq7zU-0(;$ccNJj`8#ljhGi5iw@wT)F9#_Zb}VRiY-sA!24-Et;V0F zdU-qvg3r-+T}gHCfiEG?N_7H?mET zcUTtE5sJeX*Ia@I$Mb6!%i~UDN0>n6EXpU|*Pz}W<4JKKMqj==rv{MLO3$zSW#Ixt}V=|qhA z#}hGH#mUl>ub$-LugoYj@+Y+|Onz)^ETgXv2A?lVZqm=qNwH?ob58ylp-r(aZ_4k6 zX1uwCBB#e^iW}7@e?wJLcZFcF!qrLHgd~XW#weo>$n+ zwR!tabYB1X^E?0Z@E5{d(A&`TZeBRnW4O-K7;(FV?>H`GfH@SEOxw zzW(KR?v9-v6R$sc{_QWm8g>ncGLHUfXuxmfWD;ywVD7)9UBh`DG9nkB-EzcXHOG9< z{^XI0S8VmL-^>{sJiAM~HgDAs3Y$GKw{7C2H2Cqay|E|E>0Y>$O@m+m;FrKC)1}6< U@FS8b0vazS@mAaQV4ExTf2T17-T(jq diff --git a/scorch.xex b/scorch.xex index 7556885e563d826b1e69f75a3599e79cae533e25..d690d2695af49cdbc7e428286ae06d89b44d7b38 100644 GIT binary patch delta 8117 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 ZK!48gCVXMj&xB5nUZ{;bF16X{{{hGEHg*62 diff --git a/textproc.asm b/textproc.asm index e47fb83..d8866b8 100644 --- a/textproc.asm +++ b/textproc.asm @@ -114,9 +114,24 @@ OptionsNoRight OptionsNoReturn cmp #@kbcode._tab ; Tab key bne OptionsNoTab + bit Gradient + bmi NextGradientNr lda Gradient - eor #$80 +@ eor #$80 sta Gradient +NextGradientNr + ldy GradientNr + iny + cpy #$03 + bne NoGradientLoop + mva #$ff GradientNr + bne @- +NoGradientLoop + sty GradientNr + lda GradientAddrL,y + sta GradientColors + lda GradientAddrH,y + sta GradientColors+1 OptionsNoTab jmp OptionsMainLoop .endp diff --git a/weapons.asm b/weapons.asm index 6382e6c..f925c5e 100644 --- a/weapons.asm +++ b/weapons.asm @@ -76,25 +76,29 @@ CheckNextTankBFG .proc babymissile mva #sfx_baby_missile sfx_effect mva #11 ExplosionRadius +GoXmissile jmp xmissile .endp ; ------------------------ .proc missile ; mva #sfx_baby_missile sfx_effect mva #17 ExplosionRadius - jmp xmissile + bne babymissile.GoXmissile +; jmp xmissile .endp ; ------------------------ .proc babynuke mva #sfx_nuke sfx_effect mva #25 ExplosionRadius - jmp xmissile + bne babymissile.GoXmissile +; jmp xmissile .endp ; ------------------------ .proc nuke mva #sfx_nuke sfx_effect mva #30 ExplosionRadius - jmp xmissile + bne babymissile.GoXmissile +; jmp xmissile .endp ; ------------------------ .proc leapfrog @@ -221,19 +225,13 @@ NoWallsInFunky .proc deathshead mva #30 ExplosionRadius mva #sfx_nuke sfx_effect - SaveDrawXY - jsr xmissile - UnSaveDrawXY + jsr GoXmissileWithSaveXYdraw sbw xdraw #34 mva #sfx_nuke sfx_effect - SaveDrawXY - jsr xmissile - UnSaveDrawXY + jsr GoXmissileWithSaveXYdraw adw xdraw #68 mva #sfx_nuke sfx_effect - SaveDrawXY - jsr xmissile - UnSaveDrawXY + jsr GoXmissileWithSaveXYdraw sbw xdraw #34 ; sbw ydraw #34 @@ -241,28 +239,22 @@ NoWallsInFunky cpw ydraw #screenHeight bcs NoUpperCircle mva #sfx_nuke sfx_effect - SaveDrawXY - jsr xmissile - UnSaveDrawXY + jsr GoXmissileWithSaveXYdraw NoUpperCircle adw ydraw #68 ;jsr CalculateExplosionRange cpw ydraw #screenHeight bcs NoLowerCircle mva #sfx_nuke sfx_effect - SaveDrawXY - jsr xmissile - UnSaveDrawXY + jsr GoXmissileWithSaveXYdraw NoLowerCircle mva #sfx_silencer sfx_effect rts -.endp -.proc SaveDrawXY + +GoXmissileWithSaveXYdraw mwa xdraw tempXROLLER mwa ydraw modify - rts -.endp -.proc UnSaveDrawXY + jsr xmissile mwa tempXROLLER xdraw mwa modify ydraw rts @@ -273,7 +265,7 @@ NoLowerCircle 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 + beq xnapalm .endp ; ------------------------ .proc hotnapalm @@ -281,7 +273,7 @@ NoLowerCircle 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 +; jmp xnapalm .endp ; ------------------------ .proc xnapalm @@ -420,7 +412,7 @@ EndNurnedCheckLoop mva #0 sandhogflag mva #13 DigLong mva #1 diggery ; how many branches (-1) - jmp xdigger + bne xdigger .endp ; ------------------------ .proc digger ; @@ -428,7 +420,7 @@ EndNurnedCheckLoop mva #0 sandhogflag mva #13 DigLong mva #3 diggery ; how many branches (-1) - jmp xdigger + bne xdigger .endp ; ------------------------ .proc heavydigger @@ -436,7 +428,7 @@ EndNurnedCheckLoop mva #0 sandhogflag mva #13 DigLong mva #7 diggery ; how many branches (-1) - jmp xdigger +; jmp xdigger .endp ; ------------------------ .proc xdigger From 3fdc8600c64ba1f3241bd033c944e97311de0710 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 23 Dec 2022 14:38:36 +0100 Subject: [PATCH 13/19] Better second set of colors --- constants.asm | 10 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49341 -> 49338 bytes weapons.asm | 272 ++++++++++++++++++++++---------------------------- 4 files changed, 129 insertions(+), 153 deletions(-) diff --git a/constants.asm b/constants.asm index d1f0fca..2198118 100644 --- a/constants.asm +++ b/constants.asm @@ -64,10 +64,14 @@ TankColoursTable .BYTE $58,$2a,$96,$ca,$7a,$ed TankStatusColoursTable .BYTE $74,$c4,$24,$e4,$54,$94 ; Adam's order ;----------- GradientAddrL - .by dliColorsFore, >dliColorsFore, >(Sintable+40) - + .by >dliColorsFore, >dliColorsFore, >dliColorsFore2 +dliColorsFore2 + .by $0a ; one mountains color + .by $8e,$7c,$7c,$7c,$7c,$6a,$6a,$6a,$6a,$58 + .by $58,$58,$58,$36,$36,$36,$36,$26,$26,$14 +;----------- pmtableL ; addressess of the P/M memory for 6 tanks .by <(pmgraph+$400) .by <(pmgraph+$500) diff --git a/scorch.bin b/scorch.bin index 08e597f361882a9156827986289399a6045ce1db..dbc3340c3c6061ec853bf4eb21afca463dc744c2 100644 GIT binary patch delta 6859 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 Rfo*B^=+Sqt-}u(Z{{n}uX=VTb diff --git a/scorch.xex b/scorch.xex index d690d2695af49cdbc7e428286ae06d89b44d7b38..817e0333187c911a7253200b6c438c7d29e5f320 100644 GIT binary patch delta 7033 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 CKuG@p delta 6778 zcmaJl30M?Iy3;em=|H!NI-p2_C~_#M*~liIF}tF+F+wmwqYU@qL}3sFlo_t((%~v) zxP}m*39Uc|@xslBIb?0JW+&!JvdP9x1bLFpy5o^VVxGRgXF!v(2(}tNVlj#>W-Qp;22Gc~xZsKeO)JA-8^Gi;Y8eK_6q5IL@RP+h{Y_q%L z)EwlmMv41TD}J~+#4RV0j@i=QJ!lLh&GyC`(kwyk)q|87(2AF4YB~})g5lbg#(%$} z9T20yJ*Y})jF6e#(OzA<5(bD4?Q*!n&oN2Rv_y8uOepB%n~i5lMuB#OaUw>ChKns= z=zoDa5 z%G#6`5t;<{ym>C#rAF`VXO)Z^bT3jGR|tv^rVmng+to$N&PLK?+petDmywfPc-5Aq z*_wpTZ7#sHuTY8Zq_O)LC5)|7@%vkzl~zTdc>MF0Qrjgt9D(9{54|iV95$*sPwieY zqIzq#nh4k7G+;OeyV8V=D)j9e&^v~@!_Y9+gv}<5xFM{WXvQmE$swrTbFYLF(!l=y z@ZR~`9PNlJIA~{pAWtmpr9Y0_xnLU@Xu>*~U=&yky1P~Xn#&;dBWhJ8GTod=D<;wO zo#>}f*cC#-lcs66#AKJ4X?t~Xkf-i-OBVQ2Tj= &T&bP=kl32&V`9@ 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 Date: Fri, 23 Dec 2022 19:46:20 +0100 Subject: [PATCH 14/19] Even better (other) colors :) --- constants.asm | 4 ++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49338 -> 49338 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/constants.asm b/constants.asm index 2198118..9a1aeba 100644 --- a/constants.asm +++ b/constants.asm @@ -69,8 +69,8 @@ GradientAddrH .by >dliColorsFore, >dliColorsFore, >dliColorsFore2 dliColorsFore2 .by $0a ; one mountains color - .by $8e,$7c,$7c,$7c,$7c,$6a,$6a,$6a,$6a,$58 - .by $58,$58,$58,$36,$36,$36,$36,$26,$26,$14 + .by $8e,$7c,$7c,$7a,$7a,$6a,$6a,$68,$68,$58 + .by $58,$56,$56,$46,$46,$36,$36,$26,$26,$16 ;----------- pmtableL ; addressess of the P/M memory for 6 tanks .by <(pmgraph+$400) diff --git a/scorch.bin b/scorch.bin index dbc3340c3c6061ec853bf4eb21afca463dc744c2..b008d33535ba220fac21bb1fe718e402a71b3a1e 100644 GIT binary patch delta 32 ncmZo@U}|V!+Mq5fSXGskm5~t<5f Date: Sat, 24 Dec 2022 10:55:59 +0100 Subject: [PATCH 15/19] Best colors by Adam --- constants.asm | 4 ++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49338 -> 49338 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/constants.asm b/constants.asm index 9a1aeba..8058f2e 100644 --- a/constants.asm +++ b/constants.asm @@ -69,8 +69,8 @@ GradientAddrH .by >dliColorsFore, >dliColorsFore, >dliColorsFore2 dliColorsFore2 .by $0a ; one mountains color - .by $8e,$7c,$7c,$7a,$7a,$6a,$6a,$68,$68,$58 - .by $58,$56,$56,$46,$46,$36,$36,$26,$26,$16 + .by $7e,$7a,$7c,$6a,$6c,$58,$5a,$48,$4a,$38 + .by $3a,$26,$18,$f6,$e8,$d4,$c6,$b4,$a6,$a6 ;----------- pmtableL ; addressess of the P/M memory for 6 tanks .by <(pmgraph+$400) diff --git a/scorch.bin b/scorch.bin index b008d33535ba220fac21bb1fe718e402a71b3a1e..f9c192369ab1b18e7fe3414727ea37dd926d9cb4 100644 GIT binary patch delta 35 rcmZo@U}|V!+MpsTQdd=zl@k%=;bmc^Ch_gXm1A3$E!%7%dLjz|?zj%> delta 35 qcmZo@U}|V!+MpsT(pOVcRh5;Mkr5FQ7Ut$=W~Qblw%J1TL>2(unhXd4 diff --git a/scorch.xex b/scorch.xex index b120496cc831f8caa9d968ddd1ee2638d7cb0390..b9b459aebdd17822e64633641605e5f4afc43462 100644 GIT binary patch delta 35 rcmdnh$h@nOd4ph>NL^J;R!&5ehnIzwn#8vkSB`C2wrsO%*wicl15FQ$ delta 35 qcmdnh$h@nOd4ph>NMB7&RaI72Mn*(LSeToenVFiJ*k;wRsaXK>APlJh From 4a9d8da441856b29a4d994ab6e9cc697e385944e Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 24 Dec 2022 12:40:11 +0100 Subject: [PATCH 16/19] New best colors by Adam :) --- constants.asm | 3 ++- scorch.asm | 6 ++++++ scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49338 -> 49338 bytes 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/constants.asm b/constants.asm index 8058f2e..e9546d0 100644 --- a/constants.asm +++ b/constants.asm @@ -70,7 +70,8 @@ GradientAddrH dliColorsFore2 .by $0a ; one mountains color .by $7e,$7a,$7c,$6a,$6c,$58,$5a,$48,$4a,$38 - .by $3a,$26,$18,$f6,$e8,$d4,$c6,$b4,$a6,$a6 + .by $3a,$16,$18,$e6,$e8,$d4,$d6,$b4,$b6,$b6 + ;----------- pmtableL ; addressess of the P/M memory for 6 tanks .by <(pmgraph+$400) diff --git a/scorch.asm b/scorch.asm index 75f7af5..1d9656e 100644 --- a/scorch.asm +++ b/scorch.asm @@ -290,6 +290,12 @@ FirstSTART mva #$10 MODUL-6+$a69 ; $12 > $10 mva #$04 MODUL-6+$bf8 ; $05 > $04 mva #$08 MODUL-6+$e3d ; $0a > $08 + ; and colors - sorry no memory! +; mva #$c4 dliColorsFore2+16 +; mva #$c6 dliColorsFore2+17 +; mva #$a4 dliColorsFore2+18 +; mva #$a6 dliColorsFore2+19 +; sta dliColorsFore2+20 NoRMT_PALchange .ELSE mva #$7f SkStatSimulator diff --git a/scorch.bin b/scorch.bin index f9c192369ab1b18e7fe3414727ea37dd926d9cb4..205e22f4556d2c8fc149b9d762f29c3a0725b268 100644 GIT binary patch delta 24 gcmZo@U}|V!+MqAWDJJpk#g%JYwr$&NA$lSU0D3SA`Tzg` delta 24 gcmZo@U}|V!+MqAWsV4F5#g$`QmMzHq)$ diff --git a/scorch.xex b/scorch.xex index b9b459aebdd17822e64633641605e5f4afc43462..b2056fc7e53f097b47112b4b951dd91c01380f70 100644 GIT binary patch delta 24 gcmdnh$h@nOd4o(Cr Date: Sat, 24 Dec 2022 13:12:57 +0100 Subject: [PATCH 17/19] Manuals update --- MANUAL_EN.md | 2 +- MANUAL_PL.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index 31654cb..98d2207 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -24,7 +24,7 @@ On the first screen, you can configure gameplay options: Select options with cursor keys or a joystick. -The [TAB] or [SELECT] key, and on the Atari 5200 console the [5] controller key change the color of the mountains. +The [TAB] or [SELECT] key, and on the Atari 5200 console the [5] controller key change the color of the mountains (3 versions to choose). The [RETURN] key or a joystick button moves to the next screen. diff --git a/MANUAL_PL.md b/MANUAL_PL.md index 26793f5..9a7398b 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -23,7 +23,7 @@ Na pierwszym ekranie możemy skonfigurować opcje rozgrywki: Wybór opcji klawiszami kursora lub joystickiem. -Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór. +Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór (3 wersje do wyboru). Klawisz [RETURN] lub przycisk Joysticka przechodzi do następnego ekranu. From 82f26310dafbce9af965832adc98032216b48616 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 24 Dec 2022 10:29:51 -0500 Subject: [PATCH 18/19] README updt --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index cdfe005..6853665 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,21 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki ## Changelog: +###### Version 1.22 +2022-12-24 + +Christmas colors edition! Can you carve a quarter of a page of memory from two decades old code? Sure @Pecusx can! So finally we have the most requested feature - C0L0RS on the game screen, adjusted with Adam's help. +Other (dubious) improvements: +- New Lazy Darwin, it is spectacular, check it out!!! +- Smoke Tracer does not smoke when targeting with Lazy Darwin +- Lazy Boy works well with joystick +- Another fix for self-destructing tanks shooting low angles (0-4 degrees) +- New, better tank shapes by Adam +- Barrel start point correction fixes very rare aiming issues +- Soil slide after Hovercraft usage optimized + + + ###### Version 1.21 2022-12-10 From ffd5e558ff75171346b9f896126b06c16faee9dc Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 24 Dec 2022 10:31:04 -0500 Subject: [PATCH 19/19] README updt --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6853665..2a03807 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki 2022-12-24 Christmas colors edition! Can you carve a quarter of a page of memory from two decades old code? Sure @Pecusx can! So finally we have the most requested feature - C0L0RS on the game screen, adjusted with Adam's help. +Press [TAB] twice in the main menu to switch to a screen with colors. Other (dubious) improvements: - New Lazy Darwin, it is spectacular, check it out!!! - Smoke Tracer does not smoke when targeting with Lazy Darwin