From e580ee375b47f8697b7f63d26ce57a07d73bba35 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 5 Oct 2023 19:44:28 +0200 Subject: [PATCH] Opty... --- Atari/textproc.asm | 2 +- ai.asm | 29 +++++------------------------ artwork/talk.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 56646 -> 56648 bytes scorchC64.asm | 2 +- scorchC64.prg | Bin 39905 -> 39903 bytes scorch_cart.xex | Bin 69693 -> 69695 bytes weapons.asm | 11 +++++------ 9 files changed, 13 insertions(+), 33 deletions(-) diff --git a/Atari/textproc.asm b/Atari/textproc.asm index b162e4d..1c88cc7 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -253,7 +253,7 @@ invertme ldx TankNr lda SkillTable,x beq ManualPurchase - jsr PurchaseAI ; remember to make ActivateAI :) !!! + jsr PurchaseAI ; skill of the TankNr in A, TankNr in X jmp AfterManualPurchase ManualPurchase lda JoyNumber,x diff --git a/ai.asm b/ai.asm index 191dca9..5a281e8 100644 --- a/ai.asm +++ b/ai.asm @@ -130,7 +130,7 @@ firstShoot ; compare the x position with the middle of the screen lda LowResDistances,x cmp #(screenwidth/8) ; screenwidth/2 but LowResDistances are already /4 -@ bcc tankIsOnTheRight + bcc tankIsOnTheRight ; enemy tank is on the left ;randomize 95 125 @@ -202,13 +202,11 @@ AngleIsSet adc AngleTable,y sta NewAngle -forceNow mwa #300 RandBoundaryLow mwa #700 RandBoundaryHigh ; ldx TankNr ; looks like not necessary jsr RandomizeForce -endo ; choose the best weapon jmp ChooseBestOffensive @@ -846,15 +844,15 @@ TankHit ;---------------------------------------------- .proc PurchaseAI ; -; A - skill of the TankNr +; A - skill of the TankNr, TankNr in X ; makes purchase for AI opponents ; results of this routine are not visible on the screen ;---------------------------------------------- asl - tax - lda PurchaseAIRoutines-1,x ; -1 and -2 because AI players are numbered from 1 not from 0 (Human) + tay + lda PurchaseAIRoutines-1,y ; -1 and -2 because AI players are numbered from 1 not from 0 (Human) pha - lda PurchaseAIRoutines-2,x + lda PurchaseAIRoutines-2,y pha ; rts ; MoronPurchase has rts :) .endp @@ -944,17 +942,10 @@ SorryNoPurchase ;---------------------------------------------- .proc ShooterPurchase ; first try to buy defensives -; mva #2 tempXroller; number of offensive purchases to perform - ldx TankNr -@ randomize ind_Battery ind_StrongParachute jsr TryToPurchaseOnePiece -; dec tempXroller -; bne @- - ; and now offensives mva #4 tempXroller; number of offensive purchases to perform - ;ldx TankNr @ randomize ind_Missile ind_Heavy_Roller jsr TryToPurchaseOnePiece @@ -966,13 +957,9 @@ SorryNoPurchase ;---------------------------------------------- .proc PoolsharkPurchase ; first try to buy defensives -; mva #2 tempXroller; number of offensive purchases to perform - ldx TankNr -@ randomize ind_Battery ind_Bouncy_Castle jsr TryToPurchaseOnePiece dec tempXroller -; bpl @- ; and now offensives mva #6 tempXroller; number of purchases to perform @@ -987,14 +974,11 @@ SorryNoPurchase .endp ;---------------------------------------------- .proc TosserPurchase - ; what is my money level - ldx TankNr lda MoneyH,x ; money / 256 lsr ; /2 sta tempXroller ; perform this many purchase attempts ; first try to buy defensives -; mva #1 tempXroller; number of defensive purchases to perform @ randomize ind_Battery ind_Bouncy_Castle jsr TryToPurchaseOnePiece @@ -1015,14 +999,11 @@ SorryNoPurchase .endp ;---------------------------------------------- .proc CyborgPurchase - ; what is my money level - ldx TankNr lda MoneyH,x ; money / 256 lsr ; /2 sta tempXroller ; perform this many purchase attempts ; first try to buy defensives -; mva #1 tempXroller; number of defensive purchases to perform @ randomize ind_Battery ind_Bouncy_Castle jsr TryToPurchaseOnePiece2 diff --git a/artwork/talk.asm b/artwork/talk.asm index 4c773f7..f60d805 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -78,7 +78,7 @@ dta d"OH MAN!"^ dta d"DOOUGH!"^ dta d"NEW DAY, NEW BOMB."^ - dta d"THIS IS THE END."^ + dta d"THIS IS THE END, MY ONLY FRIEND."^ dta d"VERY FUNNY."^ dta d"THE FAT LADY SANG."^ dta d"WHY DOES HAPPEN TO ME?"^ diff --git a/scorch.bin b/scorch.bin index b1b87e2a287efe390b7a44d00878456b2c79872d..8064bfc3e150bc7a9db6c41d5bb860cac02c4dd9 100644 GIT binary patch delta 1139 zcmZ9Le@t6d6vun}i`wo%+ik9l4K7ILCJYuq2QC=2$ZGfEHr5I4U~86QY#We>XflRt zmR;Q+;3$`t*B`Gdc|6J;Gt|5|?Xo5&Y7=5eI_)y`5C2${r14i{Og8@+-U7yHZgSo| z=Y78CoO|AVKA+s@lP7;t1EaL6&a1&WoMmh~z6`Q6ufVZsBI83$?H&Ec&fgwqU?VDP3~`;q76HNVFRA=b5j0^<1d_Bv{RZ-28&m=SLjbVP*$M28Y^`+J#% z>=hzI_ry>^0S(yqLJSDF>cwBE-C`c5)@Pol_Q{U@<-!bGbD0>Zv;XNn?YOqc zo$2y}k^l#@A+`kHKhd@45;xyp+kHR_nt3owKBR@OX~}i1<#=LGUbQ>=vyMgEvF) z&k$_FXY6}-M?xq^>L<<_378l)l3Nq!jYK{%W`u3WSpm=4t3eiL?46(lGmeI8ssv&7 zM5veogo%vKwm8p=5h%o3#7N$Sf+~xx5PHGC6t&2WhmUw+^)6q27JURD`-b zh5S*Im~&HT^&jYm-a5nA(PCdJ6iLc6(M*ng3-9b}1{d+szGvz`h+JP`#2b3WW&Mhi z4$Msl_Bv;AE+DVfYDJ!utbESXI$$rHW>YxX*LUGV?a#}~V&Jh&ATvbN8_2Flku+qi8{vOJeSt=`|A+Mj=YQdfYB)vfY|z?G9@6A8I3+Ee zo>MVfWcyoXjScm!vOQ1lla9HPD(Rs+si1%2(!jI^6ZD7ppnMu187wbJ5dNwubxZON H1`K}#an|1- delta 1085 zcmZ9KZERCj7{`11M%Qvji*#(1vBNAnyU3P^K`_-hHmq=`GVflxt=ixq*=?8$g!qAM zHs~RIm~QjX^|rUSo8sL#!%Fd5=8W~rNRzQFHn9t4@CoCR1%r)#5WWo0ZI}3xlRW1< z=lT8r=QSAA27}t$@Da{3-1Z;G+3@Rd@DkBT5yrV}P5B>`G4KF>v2-1{ zl!IGtTEUp|xazVNaLVQCQ4{U<)gm3(qkOmbo(bGnr2Rt%5K?x!n*p#Z$6p!)@)lx1A!0$((0(CvB|Abi z=$;(O>!1S%Ux|YRu4?>^#?6P$&=@>4MdQ;=&sHSDZ1qKAqtYrgoi!CkZfcTHPBq0q z=^oYEFxdoKR|@MZ+AN1z+Gd24`-hrAAu!cp&Tu!6t$9tJk7>)Pv} zj3vtYA}VZ&5)Hj3^=gJin8IvVoqe%j^RG&aL@T3RbxvAI6*RpYnigqN4`<`DD4k{G zm~@U|7nNVSwgSBvqkrR3cfAe7UXXKZ29(R>=qKu@vj=->K_fod^GwOS2py7hx&AI* z@2+%?+6&}@eRK}xSTR;E=lZB_bwj6uB7V82a!0acHJ9nnTiLtRTcqA%Qk#ioa_kVc z`u2fg-0XYaE{I<)G4c(o?xJRH5}R97qVF}hlj zH*Y8)T|fh4iuCpu2IW|9!tgc!m5x5=wNsZ&A%gypA6AUxqx}_|2$3er=YCKE{UO`m DxTesb diff --git a/scorch.xex b/scorch.xex index fd2aa9ef4e7fec390daa1a492ca002b4b33e2998..414b890eb5c63f1e7b575039141fb628225c2e5f 100644 GIT binary patch delta 1019 zcmZ9JZA?>V6vzAY1xn|IVq_F~@o^9ok(bSx*$*W9Fk@|QGO}sNVm3R|&Cn9l$YdHu zMlzr12Nz}z#oOE7zBn%9!GV>FEiF`F(K=EI9V^2u`>?p!#DovszRV@!_7wSGmM8h& zbI$*F&VBB=$++gnxF&qsuHK+Zr+vNvjle$Var7tjJIl}s7;-*GyyEWq!-%Go3w>0L zdX(D!J9_qbbor779Z?)t9_vwo((dlpp?T#e@i0PfE9E{nGPMc(@VSI!AdbYRuMp=g z$I*YUI&7GSyHXTAfG_-wOh^4^(K1v9s!xdc*;J* zbkmUMYQtAi;evpldH4e`bL;*3urTsTT}P_{pY&oFq^g`A8#kkVGC)J0IpUxt zeK$GcG|7%mEpdFK&N|`aDO|NML=g$$quuO9A>4IL_AGACX)rI~jUkYxs&+14qXT4& zen)OlJ6U7YLs~<6(>v%m{5%yzJbZQ=^rwZdWzL3spd?bg_ZQ)B;k@UBXctGtbulF* zq!xd>znh&PJKcW6Xp9J!*hM%Nv7i-@B5$Enuo|%#(te!vU@YR3uqV0~-G}yQB}zkA zbhrAM2L_^t(E(VEHdivJN#wuutsbkLC zW{-WV$0Y@|c*QS!rE{F@lX^KmtK6R6js}IZi_b} zI~^(jk{Lb-kKzZ>1ej(H?vH!FU*hD5QFGb2WMhkRvqcRG7TYLsTCG;%h^Z=u9p>5( zav$+oxG?kK@o~e-qBi_b=Wd*lsFt|$c`?fo%ag8j&Xz9}Z2?IaEqH-cy^JI&kpOjZK@`-s-=0qSylf=gHrLsS30d~Y;H{P-9M{g gf374osGq0gFZpT30^CSd6lSOtFvXrIsZ?+2f2!onuK)l5 delta 1127 zcmZ8fZA@EL81Cr@l$wjsY*LtvgOFvg4Ka~G6PKvjLTNgMsjZ4GO>Ad+OAtqh5k}H! zPMmQ#$Qk4I~JAo6QcmD;f(rDL@CE$wm?jTVD zk5uEiqNUr$=?_$(Lt@YTqy+}4ebl1?OVV}UVE~?$$^xUn(8^iH`($2+So!!v$UVch z{XN3kp%q`_=fN#}QrJgvLO21|@vdMcXvM~$K;yOGeTrX)dMO&i5sG)h2PhU_Cjv%I#C=A-Nq1e)HYrmU*M_nsAD)C|#!n z-NeFK&b06`HqV*BU5w|NK^IQXnRFWh%z9zH54v#W{NAUpdr^k$AL`c=Ff^biiJ_Bv zq8u93!#~?C8$#zB?%sj-Kf>kJbx#$13vBzs^ z<%ew}N8YHP52@i@LG<%|j2Pet7|WJ)DW(VNV~a+ z?ajs}9FAA&hKrJ!WOug2(v2J9b?RUIRMHu5EL{#5#Egqd?&T#o5Z_m-<#P>dkUy$S z29g=eBwmX*ffz1cY}$X#|LF=N&XuT6m#o-zlX8$V$pUAxPawD1Y)0&YqI{e+*1VEE zX365W7GLj-IHz?x-kFN%oL}2c$>;OOhdD zeo)9$adl#6Mb4un=kfn?3O|=911afvVq7CtEO|7NuzW%VZs5}NIqecbzlvMsU*V~A SdEqU>2Mr59ODpMt(tiNZ<^W~@ diff --git a/scorchC64.asm b/scorchC64.asm index 45ebfa3..a12c6ac 100644 --- a/scorchC64.asm +++ b/scorchC64.asm @@ -24,7 +24,7 @@ ;--------------------------------------------------- .macro build - dta d"1.41" ; number of this build (4 bytes) + dta d"1.42" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorchC64.prg b/scorchC64.prg index c92b41e7eb06cb14e54eee15858a069f0284c846..9b2d53f860371fb93642ddc1384b4b05174ce8b1 100644 GIT binary patch delta 1186 zcmZ9Ke@t6d6vumCTVQ2ut!@To!0jZ<_>C{9fEumswkPQX5oe}>Jsd1+a9di2EK3TG z?IHtS*Y>uh33L`854ohI$V;XPw$k0BD5uQrY`jNdPx ze$$c$9>ceq-T*u0n&vAEn38oZ`xwxT4<0svZh7QzO&T~VU$IY zoaw3al)3YVUBk1(ar!ZS#vdQnOh)dwxX4d<#{dT^aofPN;7c4B;54iszJlRd3@_vR z1G{sJFp85B;TlJPkl@HAVU;6{aGis#Z<|?MIj9GR@PWa-z=s2aWqMla#OCkasTNL5 z6m+qvW$L_;^;b#a-Bw&N^aM^D+Pa-v8}kse?1L;W8Y(ZKe`?mMTQ{ngeL)qh^h;vk zTcb1{NEpo=wht|Aj*3)PTL)DXS;YGUP6d7RonfIu*XOO0;&;_39*xrn*-5i2LNQo$ zI|@~tmqw+I3LW%iOK}TjZvVp^cNFVdd?}e~B+f9=@o3zv#8Zw+pu;yDPnYC+L&YX( zL96W7e#6uKJ)ryh)y46X$W~ihi>#66x^Zjur+l)R3Vi88Q_pnH%93j4H;W!VGfc0s zD-~~{F`#j@E0*L_iA@_ow2P#zBRd{O=DUrx>*;?%ZIWg+|A)0n{=aaJ9_s0wby~B* zL)u&c_413(adp;aMQOF7ysV^Jv5PH~Z+c%G^zEXi4^V5A1bO#AV%k&}M| DL{9}1 delta 1135 zcmZ9KdrVt(6vz9!Ew4^Ui|aC18NWF)85M?RDq@$c_6{5EGRCF`3`=#e*wtuSRxu1`v?59qye*Kol>@$Cc1PGO-QUWF+QU4*OtUbe#yys ze7@(Locz9Br0y?LvCiWtC7wGzPN7HPj}xcS8E9_SpcOdR{1=kM&XbMuhIuahu~Ay! z!WWI-KbTAW7&RCqiDSNtzGRS=IaWbOjRxsD$C?aL+8}+!u^$+t#|+XP@y_Y16cr4L zJ#SbG5rzltuc0cj@yt4f7DV-1FH@)wTF)9#pBOsZScrPWb?apXA)N2kA~Y>>@2?;< z3-8+NkOU$7>!=4F+AZh>IOWh0+v{*t>b?AOW`|I~goPcmgCujF7G{mLwt`N)fk>U`J= z<_Nf%mID>O8Cz9*y%OIT$G@|JEK`hKIj@fikcHbVBRU$Vd;?FQe%L=i6Z_6Ujau@~ z*vNX}rEA93oryv`3EaRJMdv+c|0wa_{^UwE(F#HXV;7nj$8O&4Dxw)X?{JmUxzMU$ z>>g^<5s^Wq8>2cn>fWW0y!bq{xhwYQy~5AT=R$-Lg%0K}>2y!n%k(F93Tp7WBjo7M z3_|gmmzC2NoQ9i&71c&xhi}8T0=Gdk-a6jkJ2(-VSe{6eS3X%jnVwKylOB3a(oax6 zWI|2w=Fs!#7Qm26Nl)TafLXvdU}LBn9fq=DEux`jcpoAs8g4=nfZ;kVVS-@Z@@3&5 z2r_b`>|L~eOhan;kftry=3kXmfK>3vp(;`#4ykl(Yf^!T0yj(w5A1E2h%fJw%a%>~mbb)x^|7rm`3ALf8OM~1~+O>L$Z(*ppAlO0|{sxYR B_dNgr diff --git a/scorch_cart.xex b/scorch_cart.xex index 278c559e11865c5e53f09af2846cc4dcb168be5c..969147ae4d291daffc4d7d1c31bda8f4956caf09 100644 GIT binary patch delta 1238 zcmZ8fZA=_R7~Z)LJ`NX-OKBG>Fj&$Q`Ai#9_(AlC4HVZ(S}j(zY!x&dMlU6x6-k@e zsr}JQA;WQ>dmIUOFxZc)t2J0wKockyye%F@j4`pu)q{ekiD@+jodb;3O!Cb8zVkfq zJNxX&9?h^v<3DOutr9F)Ibe`ZSo>mt4`;cb-}Y-4fA|3ObrMFjv)MEHPlT1NEUdw1 z_Zr}(bKUcL@Udj_6BTHY(xlJh=r(ul12rg@jtwuwff%X$`YA0Kk*-he1K>$1F<=2) znT_vlmPH*h%C9A$#w*7Ce{~oI$m46ur(hB{-OQ!fee-x`!0NpkNg!HeAql7t?mjct zubd|gy6v?`)UXT}O}jw=2d3{*9Qvk-Vo}gXaW)vHVH`S zGcJ%=9&N4l)WMu*1zH=wwH?qq&(FRMKtQUQt5CxhTV!6@OSU14jM)iBi6xmLW)<}h zn56~SB7OP&K@BLwTYtPyok+T^i#AA`?*Or*Hu%8K@4+AabZDpF=Bv-HF4DnTC&bjn zNF3C!N2gHqOR9x)Q!F&$+=a(L3O=y#6h*x7crs6A^x_t|lAYM1#K2tq^}Y8PK% zp>ap3JHx}A?%~LHZG=TelGJvYMU9--*q}kic2%emzi<_B8wI1z$ZU6PAizlrOUl45}d-)W-*`95p78rbhHcozIwT;8nw%Zt5L_5cHx%op6wlbjib)d z@3`x@VUxu|ca^(|E)QKzZe9N%vQ-S8#!rVUz%=d*?**^m$#8{Eal?=uLIBp z$L%Oc^33lV2r#!A$dLIx15ugV3~;rISMaNgS*izid}eVU*n=k*3$my*-@%`>M|%OKG@xDJdniKIb8hNrVbMvQ(H&PiEKEb(?CF=+VGwx7R5) zvtF0j%JL!U!jb{R%Pv?ZX3rG0;A6|_nf?^c8*I={c>IS@kl*1d@dm?M6dViEXZ$98 zv+CtsP=^bbb2JN1n!dDLlq|c}B`6sBha@iNCa+PclS-X_)tGB6$b0bIaxu7slU9oJ zK674}V!c=O>a+SOftqNcCU)8?gnramSy_pUgG_3#v2@3g$WcCoO)D>-yr`R=(D?so z$bvzU{$o=#Poz1Z`It$G2+>0PCSlA(Vm2s`K1`7zTe(sGm#B}>s_y?}eMI;#d3zQd zrgJvfx=lW$%^5f>z4c44mVJcDFJ%e~@=BSVyK^M{@9%3h%)sz~g#SFQ1`3W@>)bU$ r&~M)RsiQ=^$I0VdBx?dFX>vEmwFNkC=mvKpNW^Y#Ff4ts)|&h`7rZ@z delta 1138 zcmZ9Ke@t6d6vumMOH0XPtpWB{hFla48`;*F5au7mXk5VM1u~6YjLvikETI_0EsGgQ z>`b1{Wpj|T+MlnjW)F68%j#a7;CREZrCmdi2NtkqSsXtHbgVH^nHu!ACGkgYa^5}X ze7@g%-^m>gY2=V5{H7~sxF2jT7MY|IuD)CphVsCxTmSf!vo_$~^F$?hn2IUmSGKic z1~otjf>$X4Dd0~1pzI#MP8 zqp0r!Lkrj;-MsU%2Gv3Fy>&W?EwhHSfqAY6=|I(gTyfB1z%4!u zbc!iGHfMGYKK&;LZD+<9+yPY!PoOerSa^{}SlDT@QW?FtQ{K2xk` zx0CLB7K4>k{2BR?x05Y=D=XT&2*caO)~+i|CT-F1_U@d;){qJsmM|KHx0i~wRyWqU z;PldVbHYV>_!1K%XXdX^4*PypxWVzlj8^9?K z-s#0HP`FZwCZKku1kJ*0E9E)4UU+Y1AF73smE9#2s_}9kd(w1`m#FBN(xVyh;aSLE z-BYxl@%dM$L!h0;)jbuob1$Q5+SGIiAq}1nh(6&sBl?9-hFh0DUwsT|qJH{l29g%j zF8^LJzO3crkvM%_ZM6C*S%uo*sRujq9{O;dP%&k>19GyoqPr+V#)`TJ`8XH#vtqo3 z>J~S3Y0w87$x?GTZ!sQeOBp%6uvhd^Z(lek;*Z3+ei(mHjRruwR$X++ zjAJ%KzZ`Ve%K>OyD@G|evUceG-sa1O$(SbmsHGg=6^Mp!Pv-?RM>LPLD=AwR$=gIC z?Ibq~ZT~MMV`hK0@egWD(W>G9xH0XS#h*-{mgQsgv@CDfRA7353df{F4=-pX(=QIK z$_;Q{^$FnB^eLc8#;_&?tLing~I5a8mountaintable adc XtankstableH,x sta temp+1 adw temp #4 ; center of the tank - ldy #0 + ;ldy #0 lda (temp),y tay dey ; 1 pixel up!