From 2fb04cabffe71db10101e409ff6113abc9616801 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 23 May 2022 08:59:45 +0200 Subject: [PATCH 01/23] Description of the EndOfTheBarrel arrays. Description only. No code changes. --- .gitignore | 2 ++ constants.asm | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b9bd87 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +*.bak diff --git a/constants.asm b/constants.asm index 752fecf..4e395c6 100644 --- a/constants.asm +++ b/constants.asm @@ -483,6 +483,7 @@ WhereToSlideTable .BY %000 ; 11111111 EndOfTheBarrelX + ; right angles from 0 (vertically up) to 90 (horizontally to the right) .by 4,4,4,4,4,4,4,4,4,4,4 .by 5,5,5,5,5,5,5,5,5,5 .by 6,6,6,6,6,6,6,6,6 @@ -492,15 +493,16 @@ EndOfTheBarrelX .by 7,7,7,7,7,7,7,7,7,7,7,7,7 .by 7,7,7,7,7,7,7,7,7,7,7,7,7,7 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0 + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0 ; not used + ; left angles from 90 (horizontally to the left) to 1 (vertically up) .by 0,0,0,0,0,0,0,0,0,0,0,0,0,0 .by 0,0,0,0,0,0,0,0,0,0,0,0,0 .by 0,0,0,0,0,0,0,0,0,0 @@ -511,6 +513,7 @@ EndOfTheBarrelX .by 3,3,3,3,3,3,3,3,3,3,3 EndOfTheBarrelY + ; right angles from 0 (vertically up) to 90 (horizontally to the right) .by 7,7,7,7,7,7,7,7,7,7,7 .by 7,7,7,7,7,7,7,7,7,7 .by 7,7,7,7,7,7,7,7,7 @@ -520,15 +523,16 @@ EndOfTheBarrelY .by 4,4,4,4,4,4,4,4,4,4,4,4,4 .by 3,3,3,3,3,3,3,3,3,3,3,3,3,3 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0,0,0,0,0,0,0 - .by 0,0,0,0 + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0,0,0,0,0,0,0 ; not used + .by 0,0,0,0 ; not used + ; left angles from 90 (horizontally to the left) to 1 (vertically up) .by 3,3,3,3,3,3,3,3,3,3,3,3,3,3 .by 4,4,4,4,4,4,4,4,4,4,4,4,4 .by 5,5,5,5,5,5,5,5,5,5 From 17b57d1ed2a397f2ebdceeab24d9d4832683a7ef Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 25 May 2022 12:05:24 +0200 Subject: [PATCH 02/23] Better (and faster!) 4x4 char handling. New PutChar4x4FULL proc. --- grafproc.asm | 176 +++++++++++++++++++++++++++++++++++---------------- scorch.xex | Bin 37810 -> 37940 bytes 2 files changed, 123 insertions(+), 53 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index ed75e20..f65bbb8 100755 --- a/grafproc.asm +++ b/grafproc.asm @@ -1198,7 +1198,7 @@ IntoDraw adw xbyte #screenBytes .endp ; ; ------------------------------------------ -TypeChar .proc +.proc TypeChar ; puts char on the graphics screen ; in: CharCode ; in: left LOWER corner of the char coordinates (xdraw, ydraw) @@ -1336,7 +1336,8 @@ CharLoopi rts .endp ; ------------------------------------------ -PutChar4x4 .proc ;puts 4x4 pixels char on the graphics screen +.proc PutChar4x4 +; puts 4x4 pixels char on the graphics screen ; in: xdraw, ydraw (upper left corner of the char) ; in: CharCode4x4 (.sbyte) ;-------------------------------------------------- @@ -1399,66 +1400,135 @@ Loop4x4Continued rts .endp -; ------------------------------------------ -PutChar4x4FULL .proc; -;this routine works just like PutChar4x4, -;but this time all pixels are being drawn -;(empty and not empty) ;-------------------------------------------------- - -; calculating address of the first byte - mva #4 LoopCounter4x4 +.proc PutChar4x4FULL +; puts 4x4 pixels char on the graphics screen +; in: xdraw, ydraw (upper left corner of the char) +; in: CharCode4x4 (.sbyte) +; this routine works just like PutChar4x4, +; but this time all pixels are being drawn +; (empty and not empty) +;-------------------------------------------------- + cpw ydraw #(screenheight-4) + jcs EndPut4x4 + cpw xdraw #(screenwidth-4) + jcs EndPut4x4 ;nearest RTS + ; char to the table lda CharCode4x4 and #1 + beq Upper4bits + lda #$ff ; better option to check (nibbler4x4 = $00 or $ff) +Upper4bits sta nibbler4x4 lda CharCode4x4 - ror - ; in carry there is which nibble of the byte is to be taken clc - clc - adc #(3*32) - sta y4x4 -nextline4x4FULL - mva #4 Xcounter4x4 - ldy y4x4 - lda font4x4,y + lsr + sta fontind + lda #$00 + sta fontind+1 + + adw fontind #font4x4 - ldx nibbler4x4 - beq uppernibbleFULL + ; and 4 bytes to the table + ldy #0 + ldx #3 +CopyChar + lda (fontind),y ; Y must be 0 !!!! + bit nibbler4x4 + bmi GetLower4bits + ror + ror + ror + ror +GetLower4bits + ora #$f0 + sta char1,x + lda #$ff + sta char2,x + ; and 4 bytes as a mask + lda #$0f + sta mask1,x + lda #$00 + sta mask2,x + adw fontind #32 ; next byte of 4x4 font + dex + bpl CopyChar - asl - asl - asl - asl -uppernibbleFULL - rol - sta StoreA4x4 - bcs EmptyPixelFULL - lda plot4x4color ;these lines are not necessary - sta color ;if a plots are one color only - jsr plot - jmp Loop4x4ContinuedFULL -EmptyPixelFULL - lda #1 ;reverse color (color==1-color) + ; calculating coordinates from xdraw and ydraw + mwa xdraw xbyte + + lda xbyte + and #$7 + sta ybit + + lsrw xbyte ; div 8 + rorw xbyte + rorw xbyte + +;--- + ldy xbyte + lda ydraw ; y = y - 7 because left lower. shouldn't it be 8? sec - sbc plot4x4color - sta color - jsr plot - ;this is turned on now - ;of course it is slower - -Loop4x4ContinuedFULL - inw xdraw - lda StoreA4x4 - dec Xcounter4x4 - ldx Xcounter4x4 - bne uppernibbleFULL - ; here we have on screen one line of the char - inw ydraw - sbw xdraw #4 - sbw y4x4 #32 ; why? possibly because of width of the 4x4 font - dec:lda LoopCounter4x4 - bne nextline4x4FULL + sbc #7 + tax + lda linetableL,x + sta xbyte + lda linetableH,x + sta xbyte+1 + ; mask preparation and character shifting + ldx ybit + beq MaskOK01 +MakeMask01 + lsr mask1 + ror mask2 + lsr mask1+1 + ror mask2+1 + lsr mask1+2 + ror mask2+2 + lsr mask1+3 + ror mask2+3 + sec + ror char1 + ror char2 + sec + ror char1+1 + ror char2+1 + sec + ror char1+2 + ror char2+2 + sec + ror char1+3 + ror char2+3 + dex + bne MakeMask01 +MaskOK01 + ; here x=0 +; lda Erase +; beq CharLoopi ; it works, because x=0 +; lda #$ff +; ldx #3 +;EmptyChar +; sta char1,x +; sta char2,x +; dex +; bpl EmptyChar + ldx #0 +CharLoopi4x4 + lda (xbyte),y + ora mask1,x + and char1,x + sta (xbyte),y + iny + lda (xbyte),y + ora mask2,x + and char2,x + sta (xbyte),y + dey + adw xbyte #screenBytes + inx + cpx #4 + bne CharLoopi4x4 +EndPut4x4 rts .endp diff --git a/scorch.xex b/scorch.xex index 7335a42dfb09efd5d76e0d6fcaaaee47007454cf..8fc802ddfd248ef60b7af0efa4676316f85a2769 100644 GIT binary patch delta 11709 zcmb_?4SZD9weQU2I|3OL!uWv5m5HcYr=ER9wZK`wYQ$QxKiN{KK*D4gbO-!oEowiUx3cUY5Gf6Hik@^EUe3Q613DjMKz8Xq#Q-e4wwd2hcZrcW`{B9$3nfTkIHHUe zDns{M5JUo>?55&--G;c(~2{^}D8^MW5jNq85({I@C`^%eD_i|A(SO z6~y)@M2{JWf~Z^vNvzjAX)m5%Um5a>ysI(vj;O`it@9P5aGFAY+9Dh>F+HVOTVJq- zvaA=K){z_SugtT$7g)td`UTP2u^OHAoa^{IqV?fN)f9>>1MNkU@StR^TTtghqe`}Z zmDgk>EwSFU+kZ|BxcL2`udhj9KhHoWkouq$iL(mN>VpQ}W&PsOZdbt7?h&<93}}eb z0BUUlgoTa-6V-6Ziox=9fr&hE7H4X?c8a}2Wh#Dqps1rd57M z>zWFSkp!l{^fvR~?03x@n1N!nzP-TyyLng!cdiVL4QaCfQ&C9-x|;g?@ZFx#XTzI= zr-jvWQ?3m8^cmMaIAB+-Gp2^-T-g#zC1*Te7&4R7z!%v<>C_v~7ek;DVIm2WD5^bW zj&Ku!*3ASK8RNpEf?qeZwwFSnr~w_FSNWb8dQ-IIzsHOw6cn8XSPpd3{+{Sb=zC8z zn_z_xz9UvFsCQXHjUoeV6hn0kuugoc(E-Bki4;5|#1rI8pb_yjMxOlH3@>RRN-fpjE>aGe@ zg=H;1;0^nuItcyk9ZF=#*i?2PP#`IAyAhSIqw35`KOI zDgB9IQZD)r_}-tEx$gKD;a!vZ$1TGDGN~uF2=AHH&$kHgo79tA7_vc#KZ1>Ago(77 zzo|7;!2WwqBx+~C2wO2CWd9PZE5%wvO;9md4SQ-#wOLA{b=9973wAH4d!zNwTbeHT zmQSBNvQo?(k=jse094u@hU4>2ALaCj!N2>x%m6ZyU{b-qmwD^FpLoScU%B~A4@Sx` z?SPkA+ow#`;WvV3p^%&|uOrkW^4?HCbc250$4JESqWTN@pr|FN+vJ13V7FQrZE>=1 z#Ek2?&%}U;o$s*9&(ym@r$mc0hxe-Au;)Q<#Og`Aa7xrpDw%w_^}sXsP}cENqWNQG z%0Sb>=I_<#|8=b)1ZU7G_I$-Q7qkDes#-&tFVra>J1R!Td&WVyqYNV8^&b_PWALVi zszl(UqssT%j9YGWiCVh4#gvg2PKzWqw0>TyC8?z*?IUGat;JpG`+COB*Tk$B>!4dT zq(0}HGV>9xQtW?FQmzuRBy09+``g({0v3UFjU4KVk9A%9-L7#%UEe~qzMVbfB?7Jm zSm#UpzVIxz|5Ln+%T}qNiB!8Jyh1QDc)(YeGr#qSlEz5ivsxDj#J-or_faq_!!MzL zsW~t$hfYqdAweT`FA3a7r0yf(_oUX5@G-H8kB(yfEBP;*4`u?wAF^F@gn0;|iM^`q zby3DRk7?mWHa&yzOA=~H)kvrz^&=AY(xd9{N!Ul~$0XDZ&L1nmRFFI{^^Olos|WTG zVpC9JI>&Z}w%*RR1qyp_;tPYOLq$Mjy}l*0M;j}BPtMN3uXpx!SY*KIj>@4^V9Ray zE*_X|?3K}ty$&q?vpURJrV&`jvx}8c;0Z|{(=|0*xRXuu4zhPVc!iO;ff4RINJ-J5 zK%wv>3KR)bC{Qf?m;xn2CNiC# zi_?^v8kG%L6&Xftlr3}@{5Q};)2Y`03ikW$77m@xSSP&gblrz<&$MPFS+>n1a0opJ z=MN^Kc@#eENl-pOpS{SQk;Hp#=W5ogA9;)^iO7lQy_Qn3IMKGoP} zKG|_6LA=a3yT#75&f%noQ%STq@6LaW`0_we*a**C7@ijV+dqG&n%y~K4 z4=&LiU;{fxx8`r-OQQ!V&koYF`M==HaFTM{F}oa6@`cB-w!%XamONX+k}sC9b=!JP zy1KW+5GQSXs!@G{v}@J1)Xrr|!I5f~Wb0cCBx7o7Y6C>6(B6!?1SOR%>5yFA#SrdL z@t|zlmk!-FFr7<8j|!+o1$0;|A67lsWQgV_Kh z@lK&Q=lSOQ&$$sAw<(lY%oMsxiY_>*W1?h2Y(+b^* z86zo`D+#97w350D!K|oU`{Gb>pg4Rna&!L*!hh-t5>`_7O0q#ceJi6H>P4vAktJz+ zzojw<7%nAsDWI^TS6a+y-?&Rwm@mfku#)!-tR!aT;~x0236J0dHyS&AA3iW>%F4 z^ew)uEC=^_sr|wuEX;|sFMibi`$y_s7d}I}bm1gBpen`7iFxAe;v<*RLlX=?L&TN} z>Ym>L&Hm6*9kbqb{4)_l;fvbv<0nNkvKfd0DB#2ZY@yFMu~)}rgaMWLDH}C{G0;zm zhzWt76bt#nb(kWCbC4$vfgwf&7=WT-V)*eWP#^|0MyGY*oESPMhBIL?24rh^w|=oY za?KY+bW2l`5T+nV(S~8N zcnzHt(ZWzOL9R;z7Uf!|&r}w*z`J96!r2JiJ_cGxO|Osz@f3VN3u^Y_AO(O8K^43| zi)`v}4zqpy>T*bN8b;3C1Tdc_VIv8fNcjnyP+b2ef^@0uR5i0xHJy1XLxR8 zdKcUtdr#C7qVJn1#RM7jzDOKo(orH~^gX82)Y2f2mdYUFu|7Xrt|yGih{^SYk!4Zr zEcb@zM1f2?5T=S?SAHf+?)rL{GL>jIN=JBNj&|FC-W%&hKw|!3Y}Ad|d3NKns7&EFZL%)nKNE~&l3{iJusV87)EJ`X zbCqU1Tq)^cv!aL1jfC|V>h*YfKOqo|omH6H8zlUSgf~e@!NT%Id@)}#qKT%c)cgv$ z?UH%4t)e#&O~V?Q!7&%iEFF&!=lr?w8mTbRS4mY#2r_$Xq1xnv*T{2&MSYd>LH-R= zgOm>@zaq7T^18+;+MtpOHzAdP*7K|NRAMjX%WPlT3s%@L+&3`XH!$3%4>SBEHHowz zMH29cOtPrEC_i3T&~D04&~;SJc5pSRGRIzIvL6P`UDP)K);9nKNf{WESSGce9W49V z(W|gCwGr_!K^cg+;^PeX{L1~aM*#urLOS*%@fwFhnXKC`+qF2jmKj7^VvfBH?!^If03YS z|4XFqCO=n1YBl-Gn2!A}n33Ous;E_m@@ZQUQ$}brZ7XB?;6g9bHW$;0efHxvjGrGEKd+Bt_`E*+ zU9%3o#LOCc3>7i6_7_p83`&A7LoW7ok-ZuuUt(4rg@RQ_q2N+=s9wWpfWf>nQ(gTiZ_mSHIHDQ@!{k|H&2V`ZTvxSt`Qp+N>kSJ* z{W3{d+X!2!jb|E8K*>2X4$=j_6-o{Y4|p*9RvrFwckRXVJdoWVj!%p$+eFi{?&98SO~aMmD>}<2hm| zM>PM(g&Z9!NxKG}XrL3DaX*F`@-Q3{dvfvClp`KKTeze-+x8eds z*KL2(DzPFeA^LKc&dkUW zQ&YF)hz+#~E#8zuuNM~^f42m@&RcmeYB5#azJL$&II6mR2bMm`;ff;BI%kXhz#41E znt^+RFC5B5Vfa+#9$~~(C`!M~KoT@V!dz!c4FMO@(#FtavAS?>&*68IwNpwo0LF!m zFjvA&k8q!aqa~=!)f&x6~xI1iht)-%Z!P{%VG#jZ$YyT8etFButm=#oGk8_g zy;8MN>c1DmP1B_645@#bceorJvj<{z-uoX9Pv!#f!P4C62{F6EUyXRoUK5>2j z97&xcg;VtNagJoYIS-v3dMDN{8L~vX0EFTVn&A{r3L3WFluO5Ky==_PMl8;uk$M+8 z{OiP;*@gGPp=uD|`4Si_vL0LivM@Q~H&fqc%A-fi1>uSd5yKujW9*Is96 zMRMeAMG9Eeyjl*~cKV*p89(2)Gd0zc=jDBhA+L(Z-HV=c`EUr20!V5q%CyStE-w-Z zV^M9u=^BLdB53LPj{bQbssA@n`+3$A%mX)nSiL4X?4FZ?RYK1Ipm#rUdz>5Xc0Ok5YP>Tib`-vUer)^i_ z_z6+W$wz;M&TBuS!vhpl9kD*Q;NLQ?2_4CpKDM~+<3IGo_9XF(r}Vgrlw>hEWF zwVBr|oG=?7d@R1`Eo7Y)*H}UuW#kcm0vIj1B0D8NE~^y?~XOs zCdI=|sR`s;vS#!QaDRFTV4=js$sO!~j~EJWl48LPtM#rW;R*89u32PTgpb*jdg9Be3%_0%#2o0N8Nw z9-`p;uCkfwpaU z36RyP_?o5vBB>Xt+D!dGF-Yvj{$Q0A9dqEq8{YxAP_gTF)w}es18~jE z(hqz|#A?z8&3@Cf%%F!y&6wG+{k>;k!VRs=egQdHX+#DF-S`%*zd2Faid&;*-%r=y zc2y^gbQj+Oe|Xy0xPA&s^`ET2ed0}Q*=|OfX+d(ta!xc@#;G^c`TeX}?VFr8i<^XE zU7)aiB6(UPZvprR;PDOM_G_fHE&IbC1bRoyfGWz98_kP@TG;|ko?7|~Z)IKDJ64|f*8isB+KBtq4U2y5St_|xHP7a>2I2|yW zb4=IY=y&yJ^sAIOsGY5(Q8=$Z(;9nvdffjY>*LQv?>vI~rB+LzxW?cOs^=*(!D&;! zp*}1a=$xazvjnPm31d@m}Xm%p@n`AbYOCCXu2 zSF!LlGZuS41lI|%H11Zu)MJY8<~zRjJ@eEJ>67^#feNRGuc%3C*|G3qbr-Jqs{4F< zpGvoM!UU?1QMvgqm-F|1_*6Q_lrHeM{E2J@T~yGAM>iGpYU2|jD6Erab`cUzydI;OeRwS&oNhPYgE-(1 z4z)_g{y_*=DXU%?rtD$Qr(yAezyivha+4spHtuZp$dP!25vh{}w;W_gLDURYx7@K) zZr&+tzW;KL;shDNumFG#^n+xjti9q0l%OOVj~m7Vo;drzzc6UIGxVm;Hey1&p|f7Z z@4#YJSOPnojrv0D#6lQq<63sy?vXR&pT=KG1oOm4WPPNh`Pq{Aj}e2n^65KJTc~I= zfBdhO=brCdo`1FsZCdyT=`|jDtw|V4OCG4&;C+C@PrzG!1B|EJk=oeS7W&|Y1))PP zEO2zbaQcO+7l;1go+&p=_(oJ77Phg7_!qKbW#8Jx;afZFrYz>p*T`e@oqtiF_b6c<}vh~j4Md{#uu4K$JLV&b;yllxNk)Jqc28}ALlEK$@(iY z!G~%1wiShKf1Zq>$p4%?l%3aD%UisWbL>k{hxO$bl#9Ht-qqw0%MZ9B^IGu{=B&^S z^vMkr9BXU6fzIDR_!{mu-d8FvTC`{*KA>?X3q`X1ix+JGJFAb5h>d0>Elk2#x%o}z zcnzMj;gsO%rXtz0HFFD-^>!w!ktyUIrVtYp0%dK=f<^{w2Sd{NteeJg*;^Kb9@?_N zv1-dJTMk_E&(YAjx-gQ3+5>V&R3EBPm*9P#9Pj zVu(%a*h0&5-tan)i4`auN<5D%IVQCcQl|w^TXVM@BCUV4LrK1LWSlRXybE^N+pnGMf&bxNJ?u_{Av*SO|YGcJ26Mj9ij+o2VNE!jp#+l}`Pc$cx zHvd^MnA&Fi*1c66HDd_ZrgU2GpKg9&78@HmhTM}%O#b0y;~3%^PW;JaV=8eavzJrp zq{ghoVC>X*Qj=`K%lG5MK;Ne`AnVrYk_K3KZ8QEwP9j0Qb^o-UeH0RC4oOLZfmn}C zlQfO4Q;rK~exZEpj+B0-ae)(ffK)n>mb)eq*EHhFB+>=fN+Ri9PZ4Q}Yax-eE*mi~ z$#ks+?KTj6OnhqMJsg|QG!oSAZ!>=Lj?QaRCpe8L5tyJ&evFtl&LOTj#3m0Q?PtUq zBM=7=X(%Ky4|>8{I-|bIpGf%1M*k$D=&j}%l2$07{@)Y|dv#1tiROvx%>GRCm0a_{ z)z&}VYp$MUCi8j*5Oc?3bk=i~rza8fL-Xa$B=|6B@25h5ns?0FQHh4pY5pRoi6cr> zedRV+5%E;=J3(Jv6VFbbfz%N>K!bX-@U%Lp;VaGO=XX|mD%%r?@)ZN>r__t;j)bt# zkx)$PxEM)edNRM5)aXsQh6?2?_70WF_+1G_9aee320E)eRg7kYq~WWiWXxaHR3-^V zGW{jD8UM?A=e@l%khJDqv#jsmi)E-j>43)iHQDnRk)nVu8$Jw7s7bmMSnK^-IN@kI z>41FdjNK3P+7;^ztD*U%!{o0Zxe66atkAFB4%0329H7Ds0DU z3vR|DEhRA6`%Q!IfpQ2GGN8lvR!t@T@x+ujl^Kmc9n@es&`JALQWM!dl^Auf!Urai zEwkz?P5v>20gfU5R0fzzRyEo{xV@ZszZFUeKe4w zmA%y^Zgm~p>KgQ78cXaaNLSc_iUQ#H$tCN=&3h(J;TOmW%2oZ;{v9vIeHsg10%@)}I zg)>pgw_t>=7!ykSE9N)(J(3RKQ`HS*pDTWV0VS_+Y1=kglT*1%-T*c zRR{j!y#$3UJZHE0R}$Xte+s%mKQA)<>Ukpn%h5`dNco?RR?*ujUk9xdoP)hG@+SvRP z)%kzp*7)HJvdM)n*ydvPzp2)(*(Cb2$*K7yII1QE!p&z89=mHkVUEFW@EZy6(P0!{ zx%-xpu|!Fh3w3FUfy7``gKufM5-peOlmk+n+f;23zq$LSL1F8~I;d6+sf)z)$@4e^ z=?PG2fY3_KS&OZ^vZP2X0_z&s-xU$=y79+dDg9kPKs4{l>h}_!%2`sdvnwN?U8CzPk-gY$I)fo38?d&d zX_dhie+&FK(EUErr2z%&Osk1QXKuI?-qxpjiOm`2v}n`DJp>&50p^7R#J`6G_SZy8 z`_N}Cv8F}yb_@E>*+VcO$OL&2%s>%mhL7+i80SktfG^uJ3lgqsY%_k+;Uy3+LvJ-% znbtX+^l&OsrrZg69}&L7Qxed^^A-mtdCyv}6i7EP{lr{PsXrd+RqBsNB11Z5iy9YR zusQ1TC3Dv_d$(+8aB_IeG8a2OwDWrbGWxrEq0lvq342*M$jsmnv9``t9bf}HM~g20 zjxP@#q&z!FFJ0WoZ^B8+ZN}`55-CqOhP4&`MzQ4YQ!IHq#gcbWPr2{`_3(m1J)49B z)U#RmkmB5d)!w`sTnecCH_8{w?^C`+Zl`>y+(G#=`2)(A%L?Ur`2giN$sbaFa~~2r zy!w&2pNaMVfmJ^zb9Mn_-%QM>ALrO^j;vc@{?$wy_RCqqj@Bpgdd?F3FP|mtt+eJ# zx2C#)UZ_4xLL=eszXQI2`RB0u!jWWf8q{sd)vM|@A#mZLZcCR=Rrh8X;?1j9HOgm* za-;k)Y3Ew0cc9!#E!`gjNoz0|8X(FR<+YGYkPK`|`{n8^g$R2~`(#rt+Em-XbgmLT zB%l%!&}OcBNJ;=1wn4LbEO73N{MI^63l$oPET+!5W9Buzd}%PJy^#cUHA^gj=+g3~ zRhyY@jAXWv!fay{vyD^=^+9{eM03SjSt8=L8RNN6n9KN-xs12C)w) zHxkd*z>C{!k_E1H)ck5o-LLoG#XuJqySd4T%lEB-h;)y|XC-6GK1Xw^ChzS^@ zVWSe_3Y8J-h?TUayt`P)#Ui!>YMnk;8WdWP0t$^>Gh3~2n5c1V(_z(#X@jvaK>ca~4tuSAT>0u=&_O2vmC35%OuEWE7-$-q?_`!Wc?uW&%E|3o*pXoS6 zIt~)~5D91yULC{(30d1*8~n&qXYK%L#G*bDFe{0wrAg5UQxK#mahNP#{WgLYhHj;h>#Bf7 zx{>L#f?#*TyJLI8*$CVy2AWEn(x?gX6nsAmYEo#f1^^ZWRq*~SvPq>~3=Cl%q$ofD z#@qxjFA$-N2%i(_E;b>3&*xAac&M2ePF2D@74oncVG%Xg7Xn#xCj9B*5?+;AbpMN!3e1+Ah=E<#vqAg6NDx+;ju%2gfewg9~= z+>3yu`scBcyI3Vb`*296fL#4>j)^)=$b1GU+Wl37)v);%HEbS3 zvHrqMYCJufA`lFpRhZf@scdu{3=gZBC=rZPb`#+0x|+rD2WC z;Ft?$mX3#?J6|MZP#GqA8~7p%J%43aW1Cb5aiH?at9G>gz~VQ1nsZN?50#&TB(n(#_RvSBQg0cMm;yH*HVHh?vW3a`xoxMyJO z7j$8a=rBfH2xGsX4`alHG2*FO?cyM&n|W%rVBo$|J&5)UqVgabh*Y=eAlf{LD!=+a zST+nBOYBd;Qd^524_USUBH4I_KpFlZ*%-m}!TG-?8)KPHtWy?QF#dh-`1k5KhQC*b ze{9zN?+DBqdh}l*Fl*Np;*Wrmpi6%&d&W|$10=sAu<8&LtU3e*m#RW_X_5d2^U5&5 z&|rRg>$1neQcQVh$f_U-Ol4KuzSwiiT5ID%04w7mKC_Ll*)a*-sqsJb1bbE{nJ|dx z*p5+z$F+4DP(EPyrlK3i-q*}%`)u00Wo`2y@edCT;Rew<4a4MFWX*7S7JAjT*!j}( zGV}2JLH!y@SX&EQaYrx>N227Mp@(#yAB2*9!UG=6eh>)umu|T07Kl+BhIwozsAS=E zYEPkv+A2uYMBZFXkIH7b|MML+e?K8A~z5m!IAP#5|~nBkfvY=3>t{V zQ``+e4*J0ckx#mv=P5NK2R2{)(*uBd-+lulV06%h#U`gHfv8|YbG-QM zygRu#V!pV9U1-GOV!#$iRBq^rBXS%GL@S-BUB?mYT}uK9N_ z>7%0msA$}M`KZXCqLo4DL<61Jj5{&Ry5n$2{9y^+nvRP5_g5v5remU8%MYKW zv=A2{s&0Flj*Gs{g+d8wIwAV13WajgbW-%$3x$uxrc9m7p;P{&T%^9B{GA2!GPX!~2#s~6s)KofU8Y|&w0*Tcg^nj_AQ`v3Xr9~X<3+r=f z7zYdUE#ht*#_^Qx1UuUawWbz((Mz1&9#~O>s|mZk>P;$6ePnDR= zMUSNG@Q@xEp?iyp`yWXe@fHn6xIe0!P#rtI$}k>Ea*K6SEL{ULV%q@`@#us!)r!n# zmdn^w>{hSW*v{E-vj{6YD+;?&RKeOUe{|H01~C}x7(Z1tufI#hc&+l&zAfn;AB4HKsY)2xt`;WkYMe{9m;#CD^=;7O**Hnae|80$+3Geol@;jtN{$#3mV8eqSs^F=?Zn(u}L7!D*dxloJz?qn&*- z!C{RX+N-7`@1yM>i^1`5xsb?KqZ2#P7}dQe=56F4T3e(jy? z)$#REu98j1W^(ao0;}utL(1Isr;WlbNVC#zb*xirK%G+Lw>HN**OtAiLer*PKx_Y*80Eik-pyf$BovM_G6QOXiNy&6inQ~9K$UXtC$PQOj z8*-Q}%LZB0qWlSj(1_Ae7C(i{I2NP-IGK2XufdG~JeY=e;YIw{vbiYK!vXe{<83D7 z7&$MfT?oHejXnpCLpaCk*A}$Sp{2flLe7Q2x&X%HJjYV`>;jd*j%x_Ka18;pdIfID?c6Ci!=C z<7XQH>8QZhEIk{kypcMpNe@t-r|ibQ)vaNeDW;8}&0sE96SYK_h?ZA>x|$VE(=MZd z*c)Hn9JHxdI2EL|Sh*2tQfrBF18zA9K{fWbOqg|4SdTpalnoc&_zs{F6}!&L`bzcd z09-S(^aEcKv6{3-vHs#|X3+5=GiEkyeRmB^xWUKl7m$6GMr2^njW~P7O;NWL;nwI@ z@!1vQ24urXU*uch4-3S`73nC|A6s$j=mKuX)PGqBHld({MlI9mHo2v=XAn3*K(q5#84Z(Hna z%wDB-sYS@pmn)q+ansSzSiS0 z2BRrrx-L}j>esQ~G(FVLo?2mp`b=!RaN$DrZ>f3Fn$VqxSH1FR@s!qS>|S{T4W{N= zgZGFTt8P$dD}k7cq7z;x=+P8Z*O zVl1Tal;6icIeT_Pn6b(>%rvH@T;*tMDOZ`X5U3n}hxe4HMGHTP3g|-{79ZNc6jLVc zx11{#o@2&h?SbGbA(qCC;md1u5uJR;bK;s+!;>5M-+Q*?zQAv(i*EV-{Z|~zamD9Y zEpA_xY|4fSI2Iw^{eRc;7e82)%rRy4${bvsl}+;((X9D2|8bi2FwI{~vlh_&B{b_1 zn!l80JxcR!H0v>%zl>%rr1`(0mi*;3e>EN}X#P`pclkvi)zV$AyFf59`_IB(0@emGL?(4|JAd zKbN6wgAef7=PX=_MZS&*TWxib{aM0&wJYuHpU3WSk_uy|&CuA^=AXH4mVd^&S+?wT z1?!CK`~SnO&yq}`kVp>+|779+zZ{a8efg%xmv82$GMRHd{B}NgYiHkETW6AC0jJ<7>`U68bs&UgAv8*aORJbgY5^8{|=dU=z_|B8lFw%_rCIHBqIcsg=s{hz>q*G%`pSR%goM+Y*Jzrk8ul>-m&m-fL z#@#d1x^fe#-*@<1O+-xGz`HURasTn^-XouCqQ}kK;P9T&-8wUS?Yf#jzE+MuxZcp; th|puxReziN{wl36^J2`a$14^N_;1ggXt)3X From 381495fb5a5fd703bf12a0c50de1c8fcee54d54a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 25 May 2022 19:31:09 +0200 Subject: [PATCH 03/23] Sepuku error :) 4x4 texts were drawn 4 pixels too high --- grafproc.asm | 4 ++-- scorch.xex | Bin 37940 -> 37940 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index f65bbb8..4c00c73 100755 --- a/grafproc.asm +++ b/grafproc.asm @@ -1466,9 +1466,9 @@ GetLower4bits ;--- ldy xbyte - lda ydraw ; y = y - 7 because left lower. shouldn't it be 8? + lda ydraw ; y = y - 3 because left lower. sec - sbc #7 + sbc #3 tax lda linetableL,x diff --git a/scorch.xex b/scorch.xex index 8fc802ddfd248ef60b7af0efa4676316f85a2769..9b7199000893990b61e26e7f2cf15af360de9499 100644 GIT binary patch delta 16 Ycmdn8f@#YNrVaD67@0RO$eN-F06xqH^Z)<= delta 16 Ycmdn8f@#YNrVaD67}+;3$eN-F06ydf_y7O^ From e399754e0c9f71cf5a32767b00745f8d82a083e7 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 25 May 2022 20:36:15 +0200 Subject: [PATCH 04/23] One unified procedure for 4x4 fonts --- grafproc.asm | 96 +++++++++------------------------------------------ scorch.xex | Bin 37940 -> 37844 bytes textproc.asm | 3 +- 3 files changed, 18 insertions(+), 81 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 4c00c73..8173ae5 100755 --- a/grafproc.asm +++ b/grafproc.asm @@ -1333,86 +1333,26 @@ CharLoopi inx cpx #8 bne CharLoopi +EndPutChar rts .endp ; ------------------------------------------ -.proc PutChar4x4 +.proc PutChar4x4 ; puts 4x4 pixels char on the graphics screen ; in: xdraw, ydraw (upper left corner of the char) ; in: CharCode4x4 (.sbyte) -;-------------------------------------------------- - lda plot4x4color - sta color - - -; calculating address of the first byte - mva #4 LoopCounter4x4 - lda CharCode4x4 - and #1 - sta nibbler4x4 - lda CharCode4x4 - ror - ; in carry there is which nibble of the byte is to be taken - clc - adc #(3*32) - sta y4x4 -nextline4x4 - mva #4 Xcounter4x4 - ldy y4x4 - lda font4x4,y ;there was a problem with OMC here, but it works now - - ldx nibbler4x4 - beq uppernibble - - asl - asl - asl - asl -uppernibble - rol - sta StoreA4x4 - bcs EmptyPixel ; the font I drawn is in inverse ... - ;lda plot4x4color ;these lines are not necessary - ;sta color ;if a plots are one color only - jsr plot - ;jmp Loop4x4Continued -EmptyPixel - ;lda #1 ;reverse color (color==1-color) - ;sec - ;sbc plot4x4color - ;sta color - ;jsr plot - ;this is turned off for speed - ;anyway we assume the text is being drawn - ;over an empty space -Loop4x4Continued - inw xdraw - lda StoreA4x4 - dec Xcounter4x4 - ldx Xcounter4x4 - bne uppernibble - ; here we have on screen one line of the char - inw ydraw - sbw xdraw #4 - sbw y4x4 #32 - dec:lda LoopCounter4x4 - bne nextline4x4 - - rts -.endp -;-------------------------------------------------- -.proc PutChar4x4FULL -; puts 4x4 pixels char on the graphics screen -; in: xdraw, ydraw (upper left corner of the char) -; in: CharCode4x4 (.sbyte) -; this routine works just like PutChar4x4, -; but this time all pixels are being drawn +; all pixels are being drawn ; (empty and not empty) ;-------------------------------------------------- cpw ydraw #(screenheight-4) - jcs EndPut4x4 + jcs TypeChar.EndPutChar ;nearest RTS cpw xdraw #(screenwidth-4) - jcs EndPut4x4 ;nearest RTS + jcs TypeChar.EndPutChar ;nearest RTS + lda plot4x4color + beq FontColor0 + lda #$ff ; better option to check (plot4x4color = $00 or $ff) + sta plot4x4color +FontColor0 ; char to the table lda CharCode4x4 and #1 @@ -1502,26 +1442,22 @@ MakeMask01 dex bne MakeMask01 MaskOK01 - ; here x=0 -; lda Erase -; beq CharLoopi ; it works, because x=0 -; lda #$ff -; ldx #3 -;EmptyChar -; sta char1,x -; sta char2,x -; dex -; bpl EmptyChar ldx #0 CharLoopi4x4 lda (xbyte),y ora mask1,x + bit plot4x4color + bpl PutInColor0_1 ; only mask - no char and char1,x +PutInColor0_1 sta (xbyte),y iny lda (xbyte),y ora mask2,x + bit plot4x4color + bpl PutInColor0_2 ; only mask - no char and char2,x +PutInColor0_2 sta (xbyte),y dey adw xbyte #screenBytes diff --git a/scorch.xex b/scorch.xex index 9b7199000893990b61e26e7f2cf15af360de9499..768db8604f9da98df2ca18123fa7e770a4e768ee 100644 GIT binary patch delta 12060 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 Date: Wed, 25 May 2022 20:47:09 -0400 Subject: [PATCH 05/23] blinking seppuku --- scorch.xex | Bin 37844 -> 37847 bytes textproc.asm | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/scorch.xex b/scorch.xex index 768db8604f9da98df2ca18123fa7e770a4e768ee..94d562635fba3076959183057e99e2dfa4f3992d 100644 GIT binary patch delta 11923 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 S=enYeiDbgjU*@m6?f(Mef4hB&nEA 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 d&zpbwED!#){m)zf%q Date: Thu, 26 May 2022 09:43:12 +0200 Subject: [PATCH 06/23] Correct x position of 4x4 characters --- grafproc.asm | 43 ++++++++++++++++++++----------------------- scorch.xex | Bin 37847 -> 37847 bytes 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 8173ae5..82b7e95 100755 --- a/grafproc.asm +++ b/grafproc.asm @@ -672,7 +672,7 @@ DoNotDrawTankNr rts ;-------------------------------------------------- -drawmountains .proc +.proc drawmountains ;-------------------------------------------------- mwa #0 xdraw @@ -691,7 +691,6 @@ NoMountain inw xdraw cpw xdraw #screenwidth bne drawmountainsloop - rts ;-------------------------------------------------- drawmountainspixel @@ -713,7 +712,7 @@ drawmountainspixelloop rts .endp ;-------------------------------------------------- -SoilDown2 .proc +.proc SoilDown2 ;-------------------------------------------------- ; how it is supposed to work: @@ -842,7 +841,7 @@ ColumnIsReady rts .endp ;-------------------------------------------------- -calculatemountains .proc +.proc calculatemountains ;-------------------------------------------------- mwa #0 xdraw @@ -944,7 +943,7 @@ EndDrawing .endp ; **************************************************** ;-------------------------------------------------- -calculatemountains0 .proc +.proc calculatemountains0 ; Only for testing - makes ground flat (0 pixels) ; and places tanks on it ; remember to remove in final compilation :) @@ -969,7 +968,7 @@ SetYofNextTank .endp ; **************************************************** ; ----------------------------------------- -unPlot .proc +.proc unPlot ; plots a point and saves the plotted byte, reverts the previous plot. ; ----------------------------------------- ldx #0 ; only one pixel @@ -1073,7 +1072,7 @@ EndOfUnPlot rts .endp ; ----------------------------------------- -plot .proc ;plot (xdraw, ydraw, color) +.proc plot ;plot (xdraw, ydraw, color) ; color == 1 --> put pixel ; color == 0 --> erase pixel ; this is one of the most important routines in the whole @@ -1133,12 +1132,11 @@ ClearPlot rts .endp ; ----------------------------------------- -point .proc +.proc point ; ----------------------------------------- ; checks state of the pixel (coordinates in xdraw and ydraw) ; result is in A (zero or appropriate bit is set) - ; let's calculate coordinates from xdraw and ydraw mwa xdraw xbyte @@ -1170,9 +1168,8 @@ point .proc eor bittable,x rts .endp - ;-------------------------------------------------- -DrawLine .proc +.proc DrawLine ;-------------------------------------------------- mva #0 ydraw+1 lda #screenheight @@ -1184,14 +1181,13 @@ DrawLine .proc jmp IntoDraw ; jumps inside Draw routine ; because one pixel is already plotted - loopdraw lda (xbyte),y and bittable2,x sta (xbyte),y -IntoDraw adw xbyte #screenBytes - +IntoDraw + adw xbyte #screenBytes dec tempbyte01 bne loopdraw rts @@ -1339,8 +1335,9 @@ EndPutChar ; ------------------------------------------ .proc PutChar4x4 ; puts 4x4 pixels char on the graphics screen -; in: xdraw, ydraw (upper left corner of the char) +; in: xdraw, ydraw (LOWER left corner of the char) ; in: CharCode4x4 (.sbyte) +; in: plot4x4color (0/1) ; all pixels are being drawn ; (empty and not empty) ;-------------------------------------------------- @@ -1374,18 +1371,18 @@ Upper4bits CopyChar lda (fontind),y ; Y must be 0 !!!! bit nibbler4x4 - bmi GetLower4bits - ror - ror - ror - ror -GetLower4bits - ora #$f0 + bpl GetUpper4bits + rol + rol + rol + rol +GetUpper4bits + ora #$0f sta char1,x lda #$ff sta char2,x ; and 4 bytes as a mask - lda #$0f + lda #$f0 sta mask1,x lda #$00 sta mask2,x diff --git a/scorch.xex b/scorch.xex index 94d562635fba3076959183057e99e2dfa4f3992d..305d24e6c02956986ab961ae2ad25bdef1b2a34f 100644 GIT binary patch delta 33 ocmcb|L0Day7I$j#;j|a0Pph-$p8QV delta 33 ocmcbWU$|IeK;btV61#;j|a01qq==>Px# From 762b56567bd68025f084a3290e184fb31b65ae58 Mon Sep 17 00:00:00 2001 From: pkali Date: Fri, 27 May 2022 21:10:35 -0400 Subject: [PATCH 07/23] chmod fix --- LICENSE | 0 README.md | 0 ai.asm | 0 display.asm | 0 grafproc.asm | 0 textproc.asm | 0 variables.asm | 0 weapons.asm | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 LICENSE mode change 100755 => 100644 README.md mode change 100755 => 100644 ai.asm mode change 100755 => 100644 display.asm mode change 100755 => 100644 grafproc.asm mode change 100755 => 100644 textproc.asm mode change 100755 => 100644 variables.asm mode change 100755 => 100644 weapons.asm diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/ai.asm b/ai.asm old mode 100755 new mode 100644 diff --git a/display.asm b/display.asm old mode 100755 new mode 100644 diff --git a/grafproc.asm b/grafproc.asm old mode 100755 new mode 100644 diff --git a/textproc.asm b/textproc.asm old mode 100755 new mode 100644 diff --git a/variables.asm b/variables.asm old mode 100755 new mode 100644 diff --git a/weapons.asm b/weapons.asm old mode 100755 new mode 100644 From a721b82944bbc032f892d6ff42419bb3cbd6fc44 Mon Sep 17 00:00:00 2001 From: pkali Date: Fri, 27 May 2022 21:12:46 -0400 Subject: [PATCH 08/23] chmod fix --- artwork/TALK1.txt | 0 artwork/TALK2.txt | 0 artwork/font4x4s.bmp | Bin artwork/talk.asm | 0 artwork/tanks.fnt | Bin artwork/textconv.py | 0 artwork/weapons.fnt | Bin 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 artwork/TALK1.txt mode change 100755 => 100644 artwork/TALK2.txt mode change 100755 => 100644 artwork/font4x4s.bmp mode change 100755 => 100644 artwork/talk.asm mode change 100755 => 100644 artwork/tanks.fnt mode change 100755 => 100644 artwork/textconv.py mode change 100755 => 100644 artwork/weapons.fnt diff --git a/artwork/TALK1.txt b/artwork/TALK1.txt old mode 100755 new mode 100644 diff --git a/artwork/TALK2.txt b/artwork/TALK2.txt old mode 100755 new mode 100644 diff --git a/artwork/font4x4s.bmp b/artwork/font4x4s.bmp old mode 100755 new mode 100644 diff --git a/artwork/talk.asm b/artwork/talk.asm old mode 100755 new mode 100644 diff --git a/artwork/tanks.fnt b/artwork/tanks.fnt old mode 100755 new mode 100644 diff --git a/artwork/textconv.py b/artwork/textconv.py old mode 100755 new mode 100644 diff --git a/artwork/weapons.fnt b/artwork/weapons.fnt old mode 100755 new mode 100644 From a425500d4e2805f7f617ba26372dc972af1863da Mon Sep 17 00:00:00 2001 From: pkali Date: Fri, 27 May 2022 21:26:18 -0400 Subject: [PATCH 09/23] seppuku turbo mode --- scorch.xex | Bin 37847 -> 37851 bytes textproc.asm | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scorch.xex b/scorch.xex index 305d24e6c02956986ab961ae2ad25bdef1b2a34f..7475534e38ae5d365e68419e5970e6447ab42557 100644 GIT binary patch delta 11879 zcmb_i3w#tsnxDyJ@*;2!RYP@{m`6*(ivhC@`)B43Nml3Q@v#9@7v= zI%LvSKn6yKfevX*$BFJOmtFhTT?Lt}!3J0N&{HwH2?>%o$D-l`xPSFb9;oc?-S2oz zch&c(ufF=~tMB`&|8h9$qr*{wXVZ-FuWd}zjK=ZetVur`9wfG1&&UP=&m*&K9c${+ zNu!!TLL(b3m;JlNTW1a78nsr(ya#LxG8k<5LNav$v8uDl)`i47o2b*s)&;~njlF!l zlvLQXIKVz$PAUf5@p5H(1nJ6BhUD1&fNTI2UK=gHR;H4W$#G&vXNW=q!=L3r!UWl#PVtm-n=PWaLz>Qh8BIc&3Jqp+WyQ@(j*K7Imf(+sWnVtuFoKDPntQu@WGmN5K2PsBn?m z4rLrFMPstZb|I^_hG;R>rF*@8B9-!o!Czl2=`hbwf<(DULnd3*1|4YNOKs;Cx0Xt! zP3c6t#E^P8MM$}4{ANfC?FlmR#mNTi+FY4bn5@|eCE6wS4qYnv-31MPppOB4wU$X` zjAyiL;LGH}n7^*64J2e%p})b6mcKhD%jQy!! zCV)|>6K}b1B=f6{ZqlJgJe#^KO~& zm3!UpR<{<_S}9cqJzBKn4&JAI4%|CDa3yuK-i)oA@d~+J%RWQzJP478D8{7`RB?pwkQ7P z%-EZ8=+_PIyjn?I^0T}8PavuN5^DSgU?siCXhiqVlAlf|fv>!FeQ{!8QGu_vxevL| z*h#3P#B#X}kZqW@ zZtqsY+=4qnolHQFj>+PyQ|=r-o@j%Wyr`6r1K(``v{%Xmbu*VyG+@PHDF!+d%B_{T|p@FAkWR6Vr0)?3B4w*i4lSDsXvJnNNl1sj`3yFHkn|L1C)@N&f5RgPDNwCW_82 z6!s%L%w89>*ZCbq;K~9qtFaW*d2Bd?T-2i@!m~8OAgM>)7z1oQyFc$yMD%`U+>5oA?jnIJw{_ zAf_$|_ama%Fi0v8{!FAo;e8?%2_F!tSojO6`wt=&ct1q9w;A2u^XT?ogwJTV{l;OH z3Ye>|h-xiV&S1AiB_xDp1J%wHqn2z}KZN%Nx!O$H4dCFI?XYs_%#L)z*EZ`;VtcAB zCDyw2Ji!R+MdpJq67@U@o~SU(Z==sq=tzm>-FEb~xWhPL$OPGg!N3tGMl<0H0q2Xr zfG^&e0STWz(r9Tud4@o|RFlK%U|Q#J&cmm~ShFYPTqS&oR2VeE@fHN{3w-A2^GkUE z(@)$_DfP#YE~Wk$Vh-z+Eox$9!G5kU-(c>#X4jSt1MiQ(>JG4moubbtZ{=O#W0Ysd=r_r~;_b2<|!{wWExsgqWG;Ww1;r)}j45lE!_BJlT9c}SP~x&q4?P`5SPq^sMC zu!V=Z?d?&zy0^m+$FF<(h!Rh=p-LQW;yP)dztTzV9dXo}ZA?f=sDUUuwcmtYf}FsX zv`4PiA_#Z9s9QGebEj?_m`*Rz!vbny0iCw8hva@>!!~F>j|I-&!|(PP>Z$M^QN)q6 z?wxgAFJBbOYI=`^qAFI{fzfW{i^>An_wb9bjSOZR^OwPXPf1^ z*&2mwL=R$XujxL_7>X}5P*_^6fwmT4u)-4U-0>o*D0nS&d*?NRf66r?7-*(}+M%8f zLs&!Yh;vVNQtiMGROZBh-xB3p_%VD6hYD&HfOIeCSg{GKRRNYH@L>U%tpq%|&d!iiAw@ebr92*y4xCV@n> z5n-W)>?@q-AlSm>t>WCdPOik|xVnhNI3~w~iyfyIRhM2Z2K%c!m|L1au4h(Za*##6 z`Jssci?M?ez`f!fkU4(-uuh50sh9v1yr%X2WCyVzk%1V%0!;+Lt`>8oU8iJ>ftC6Z zgBmd~$oCNhgdmTN#CyR*m?FT-kURFEAwUEgkis!y@bNH`6hRuI^SbIMs-FZ?VJ`+G zYIwJuTOMk*m2(;3gt7d@VwT7CfG!{r1VoQ-Ck4Ji0)!YWlK-%fj|6R6l5S^mEMgQy zC|V*Wi&u3AK?|TqDCFuDt;j=}KI;j#CR{uACOnP6&1a|!Xze0uMKA@&&mx)(nr#4r z9T62=KMQLX&~}D~m=03xNA$&f1StDcVE`2dQh6eqkg0PZg>?1oNIgn$q^ejMxCESu zE^2#qW5{F=7_DRTBQ}20MW4{x>+-3ZoG)0YHb|$%>2Gp8w?qMJ3+)_0m4OspH~EZ; z1uvog)ur%x>^(*^hu;U%_$bJr_k~Q5Nhb*n(RY~6Q%iz8S^~p}#`-+BM9&rD5RmJ+ zBFmuILGBJt4~5|umDBhV-9N`6Qs|zg4JSX#w5v-qEwmy&JZY~= zSgSv$k7V@L6MZP}(QvmN0lZGcTlAf8pnPFr7(dTh~E_sXb1GC#bNT;t*tBnlIvu`#ns@ zE~a&hX!+l%WsrSmyA)2rjxd8`4wzXw9x7*fL3oTRFwrGcSxkkc%-$ZQ{DVQ7>{2@RQQD}zrvPUvRe&&!Du7OBTxPJJF4^Q| z_KrpLi2B3fxc~Eb59s5~)W@5}xXi|em`6Ki>Y@L9+A&KH_!rQQ*(~O_D>G@w5h8$K z7TYYds4^Q*4rG?Zu+C$!c;7vyKsh6<${d}3XZoB+?Mw4)2H zqgE_%By-Bo**TKQPTGgq5xS7YV{=(Nmcin&`79n=fOrgHNN?)^K z*DTx7#)CpX6y{SFgQI1+m+>rMJPR4mBF3{=*+MzZgyY_EeyI}8;ARGo0UVvz2L#uH zYwxF_*b-Q;W7lI?7i3e=?+u;bex_w)YuIr@Z`TLUht2U%yFTA4*!33b`1d9LXsnJm znXR06DBCaI;S{>{-p2Ir9nF;Q9Rt-%XTvxqz;33| z_Eo}N3<9$m#~^s7!5@R*pQrVn*E-8!DB z#4+u0JHS`Ez*oA!S9CC==dQP7^)_b5(4#t<*)de9j)9h-Om#eaj;D?)@Vt$gaTu$k z3kyC}$HH?wb7!duFf^E-$?@b9kSJ&j4XC)Ymrd<{)^TK+$_=H#>8xhk9enEjpx4qc zA!aVa*^Y!d_4psEV-|j&6+lGCZa@(pSNaSX?36n&65TlYhF@pqw%yNy3@SUa4F9eh zs*amNeFnyiXTdgO$Fq35vfj-Xxr%MK%md~16lfb^QT}MQ3})1zQyF9F2jOM+d_a%! ze-Iq@RCBnWtQezM3{wvf6t{3@HDyr5a`mKXE)7h#X2;d&=NRiXy)&0qjKOi&G@n+C zYLCVvFkGj^&Jd#YlfZ}3e zqdfjq^|L(wwfa|`$_OnO6Y5ttN&Mxa3EV_t`+Nnv`WTO!0%tHu8_+qCC=*FAR%=Bq zdm?d6ToLT2^*uR}Sl-8s!yPeN|GJ6f6C+WL#PaV~jXGAWHV~a?pc7m6Fu;sBQ8PJS zT!FV*BRO%RES=Owp}^Wuori0ZhV+;7a8;t~wzJkm8UlI35mFmX8vZp;P)MzrH2gMC zh$FQzq~Z5@!X#1~OB&wF6XM0?4^K@ol7xhBnaDU_y8y4U3Kw5z>+U>GRuIwRvK;p9vd_C~N z*>*Uq+RgfJ?(TQ7esvay5iyeF&cG@QZQ`wu+&McJNR`+)#8=2RA{CS}BWK)Iguwv$U#)cAf>e_A^?g(az6A;gMStn`u)E4VZ)$ zs+<*n`^aSDXZXEEv@Ds+{f&nDo@}O;VNea&{o9kQ!9t~Gs`QYdAA^Plb%uLCqgpBk zC@Iq^BApmD76PzNr3KZ1q^4#Xh_{1FdlE(tvzTYZ0%(1^mq+|yN&iQiX*V2#H`9h1 z9HhTsFB+ovn$UE1CHIYsgK1%HzL~|rxEfsC&{-T$*(PwaO;BmAcR&9Y=XM8IRp6e& z?JoPPIBn_O{UCO#d<+XXh3D&<#k{5CjLl-r(&5Gy@$IFyTUux++W)?9Qh9t@Swb3= z>KA>}?Ct$ip#}eM-SrVz+)>HrC?A%_B@Efe7bNU1<}4@#x5zr^HZv zRoZmjs4mI{cr9zC-TTl#>f^nxu#+67s;)Yg#iva30$(n`@7cJ}pUYdtw;#QoYo#G$ zquwbSyc4H;CrvMJrH)anI?qw%91X_nC+9h8yFCk?C-qJ&S{x(^cL51C95jRR74c}; z+v9t~?ClI@VGwI}52U&j9o_`un`+p}c8HQTJ%tM;HL!>Glo+0sQ%&w}T+;8=oc=g9 z$X4MrR>2p4;hb3W*hsF8j%}xR1rsXF?FpT2h?zT%sAsdP&eIahr^4!9O`dwUz1=3*J&MVL5p%9q@ddIW=UNq_OoIne=Dp8#nmoE(pUZW5M}*)J@Ppr#UtklcX{LjkV5h?9_3z-FxF!` zwHhy0a0J$PhV}dnvA77@SO0*SY~rQxkgRwh&-lk2!wip0+Nt9QvHM1^kq+@i(gD6e z^7DmG*}`)E0%05zIMpL_v#y(pGR}j!D5;+A$uK2dHzOrPo8m|)4L(@D2mYSG-yhDB zZ(~vs%=5-9LMdS^rj0Hv?#Clx#Hpl5f#$C1c9Hy;LPw5b6G{Fjk@clvoH>1M{vm5r za>1I_ddtUqhSK2KnZa__53$E{3LARc!Olw2y#MwCQ?>O!@u`?11 z#}PR+qB0zjHwi-tC!2&}1PASKf~EN%RoFcoim4I1y0Pph$9qx}K@pySV|=#UZDrj= z=|5U%#80pLNkdwJFkl9JwO-|7(kDmGcAUrTy3)5IdF?NGw|?4I`eJ-Z_3o-6GvIV^ z$Ij4Gd!r+-!-J_He_%s~Es1?8?bTGQ~a&+{ePV0*iy zx0Z>+R}P(rbU6{o>lt$Pj8KC7D?ISNeunZgJd{!k4>hN9wY&F!I35VIwp$ojFG7Wa zm4gQ&l!=XmGOXAeM-fZOD;EqgQM**svW>5iid(kxvZIFGdYGu#$9dCW6Dv|Ngn||q zFG+Us<#~0fA=d|uaQF_0$|Ck?TvVF%6 zz&kv=UScF5kig!#-bfuQH+IG$FX)V?PGt9ek*1qa(`G5t15&XzHF5)faP0n;Z(S(P~D zDjG;BIHJAh)Gw>*$*}@$D6+p}h1vkz=c)vy=Yvd`m#E-Fk>g`0uJ-Z8Ln+FWt)N;anrCmPiTt zLMswNW^ib*EL(4?{9)GI%h$k$idc=hkIx_#xevSDj?Xu=vMZPqT3hd~!`KNm;SX=Z zS2a>$Qxk52q=Ke*NJT^FC`Rc$;NlyPXcShmDI5;I9T-=(l3nS!59>l`Hhp@yYylX> zfO&t?tgdPbE)hn1DAHr)4Lbi&Aepk4>CW3hvAfy>rxCydX}7VLoj zX~RqGH^qdtV^5=SNPi|BX=`gMKS*tBoRefIolyrex9`gB?oq)W8`#W?5!~Sjpc{Ly48aR9;8~S;}8D=2g;+U ztdAxBW%aGM;;_WMJu~>rs6doEsk)l-g8C%o%he6EMqMWkT{Dtfu@PRx1uw!&u9R58 zOXu*bU8^Ji54q}`bgy>wIw}eHG)gMRr&0dsS|`2Wq@m#u*T)j&l(OK`(2V+rU?+M(16xdg`EWfga>8V&gVQ(oC zUSzj$j&C8j&WL5Wqj^_F6xYh1e35GHPN{_70rZ_QJMP$dN94a%+L3*V-y!YH-o@|q z#n$hbcde=n_oP(>DZ+m-XdJ%-8GjcnABIxpVz3{`dA*{gB71x65nanF$CQlOhSp`~ z(_9zL+)8tKn)xf5yNzaYGET*}o)Sg>La|s>-&82vh z)7;&7?4r4Q@Tj1>70nnRT!zM_<``D49hH&ZWxAHtVdP<1}N zzlX$u3$AurR7*CocSy=BS|4Ug%=6wybQI?`{T4slNQh!MevwD(N*SWLY{4!4Q; z;#w=tfJhS66`n}$sy9iArPY~mq_I)W-ISr`Y|3!vZ`!|U^5&kuxE)(DS2#fAhlJZ% z%s$G4YaM(YXu{Wlw)JzFUykt%OY{u0dO{=dYRxvM#s!xlpRd;7B#4^m!F{P};a@+=Bwypj>e5;+os_&)8k*UF4@sx0Z;~@_lE5%~!<*#Fn*^Wq z-OYRUe-I{Jv~s(JJl@73S_vGMeW&F3vv+vrsL^bCC^zTBLlUfP`D zH03SITi5Hav!)@sAT$?M6f7j_D3z$N@FJ=!Ed4!J2~~>6+!c4)B@v$}%|>5KC5kRx zdWq&M8{QIsvwp-)=Dg!n>vYO-JSsJ8B1TMPMBq!CS^Q%C6EWXU$$$O(DX%TexoHsB z+_(RTdnPQ|vVHHNmtTGB{m(BA8hP*IPdz94U-|tfotG2G&0ey0d-WgAT(M4E;M}_X z=!p*vNhvdyZsGWH&rANpN-*@*m8gMZCrw?vCil5ruc+^auHBk4=H7|-t=QnIIrg7l z7!p%b7jHTA$20MFKa!ij@1=$lpSs{-yZ?yii*6T_if!W9;(p@&#c{9ADxPFES;)Pw KZ7o^W=f44%0u!l2j(ebY#ByCgbao_ePe^kW4v>?{gs{nm~|bT15d_^8UBFvw$+=o8QOM zRrj9do_p@O=bm$JeOzhy?@B{p(*%9&fz1Y(7iAB6UGwT zhcjhewb$S|bMj90qCZxCQ0K)+7z3=968TB*8sc3?yg5WZ<1Hq#(d#Di<6e%)dM{5b zk7s&!gLgd`zMxHM^9IYu8!Ud&F?j@c&okO&`JHy3PMhdD64oEBH(fYr2$-WCY7Ay> zS6(3I?VE^q6R|7lq#>5LOyHPK;VqR~{pIxytIDzoR)xkAHHQFq*WxY^FgD*LR z!v?0n6w9hDmSCnO{%OmAU)p{<%Th9zvydh2>BQ2w8od?8O>2l{@xw|D2|ohfZB%Hd zmVI;g6{9iHV>y>qvyZ586~$%VJwz(zE5Tn|EUA)bD2IsBPQykEeMST7_+rcHhg*uJ z;)d}=JMQ^V1t7;xd}ElZw>y>>avP@LLQGexQv3eYNbA zb~2tZvX0*=_s9G-P34eqY!LeEUvK)xHhxy;3}n6Kt+}>iv#>rTdJi<#t;zObFAzBn z^h(m-Lz7&WLYo5L3OY}X-UIox8T)_UX>hDFs)qe~k2$E2>=@n|JV3H_e4aH}M_Oa} zdX1<1z=f*1X9^)u#Iin^wKIzZA0y`6EM`r?rQimW zf=U{)h%2@&i4Wz=%$LD>MClaqxb202|g zZ}7*+ChrpzKdZ5?ym2{H?(nV`|1u^0$vlT}(4gcyg#R=s1rFiA3`(Ix_=`c|9gJ8f z#JrCUr-y;mo4)t!cEJ44oQzX1VjyhMu(0rT3_X_kb-sYCv*`Bt4E{_x&a&zY``og* z`+i?1IBMPymrWhrXDmtYomA!50V`z>qY>Rx`#v?E1itf5&=w~i78UsJMfX1UhZ9J+ zt;lro3?MIJ+LD_Y+s91Pq2C8CK_M%e-S%KH;oU(ubc23gWa>5YL>cNiMATTt;yEM+ zT9i8@tzlxXX@fY9z>s-jxA-?!6bE+`bM^|}t$5kbr8X-&`_QyfAI}&!V=A zWzcLIQtuJdrZ3^flJ<5g-y)o)mW8WrZ!MH#u?DQGPj^>Lv}?c*yM}ak-9Tu0YhkyK zkc#JGnR^@ulsU_%_+oD1V!B}wRsKPRg%nl>|M$CP%xf)?QyA;Xt2KeZ?4~Sk#=#`_ z>cIh1vtwFzjh!-!3Y)1in+n{os4|BN&rv0l3R@_fc)tkMzmosD`CuksyosW7D~0_C zi`eU8_Buaxh|4gqgH2B-JV1p9sj`_0v#9bbD$J%2E6-734pp{LA+u}#SP7{e*&t%X*}*?K4M3>XgQfsplz56$SOA1kh(k&0jUjDc8W;Aw8k zu5nWY<*pwE_POO5B7cVvnS<#PxvA!FQkX#b%v${KC{LDO1_opC*jAG z`a?*kQhx}Ejp&puYI1bJ7HG@YpS!Nvxn(23=~0;VA?*0b&hJD>@9yfvLf7p~*lWT? zW(Jpt?a)J-1FT}F=r+@KzA$o(^6VJBWO{*r5$7oPl57&L5;<46hP4&K6ifaU#gczb zvE<)SsZcmiC0_WJN-qlEQRyY&0>!Zdt4;eQMk%98nDS2LE6V37UsFC``G)cZ%6ZBc zD&JC`SH7eCi^>Jcztly<&aQ4E?k7_He;BHJB+JUpkiCXjnpSaaH^=(cTJC$$j{Oox z*~z*ww>^&HpAttK&QjMu{JN4ddZr{U3W;`q4g4}H|EyDeoq^>{sN0-v)YNT8*uq2I z)>eb2?w4SQX}^4`T8X9V040VtaA#?tk8+k;+hV9WTc4DaR0UCXsDFsK1UZQj|I-&&F}K*YN_xyqKLz0kDGm6 zFP|UIYWN!o8(fcDfzhhx^LN%T+nB{{V>YvmIm|XPDbxq;sgo_PO-iGGViJCm5__vvJeFGD7?M6;X_a936yzpIuR({yS| zP*%`Hy|4nY3?d(J{u_~Yg?3|)(vTzEU!tnv@UFwOmO^Gu)ddj7un6hLSc0xhqx)mn z(gL~`3<4?;^-&s$DIO-;h^Rsvh;<~&dUNgy7I3k6t&G|pcnGVltw$M!Lav*wUbsxO zAhzbR=EL;i#GO|NEUo4WX>nq(ydw4V;e07S)Da%uewpB(a+wHM$igec3iY&If!BhD zS`p_qo~7y=H>k{x0ly>4cfi7e{@7YZ`tInlz98jvC}VrXRqNs1!frt!MAhXnVKP&({IheQqUmeZ@l zrz|DhTyVlzdx$Ak9@`B%heQw%Exw%;xP$}2+36Kr_ti{H`<9&HrHQI}4x`_GQ zqUw+CyibdnZCcE{fMWfHd0H?%pUQ(e4=PM;ITaqI!ebPNAoJ3EK3~v#5lvf6_b;R+ z|DdLR)*Y=LD=cr&!|G8mVc*booWwi#OJKZmwuXaRpFZJWtreycKrwp9=T1Q~3zWKd-$ zo*c+b$q}8$Veu|Mra(DE%*q2acPd350j=jw)AESfGJu^I-16I@HDDS=h(}1YC8&^Q)pW!T3aU?BxPt! z;^|bG#}3~4?BKPr6LkR#&t|dkY&Hwe=CJTA6X6-6lAgu_fY4<`TdA6$l(CxA1(y79 z>b)S*4v9IG#pGz2#xbT&#x##H&1Xyt6i^y*`rFPfS9A=lXJ7-s=)68YxE@?{9}UMB z!I*8YJSJ<&71Z773%MUS!!o9IWN+AkLQhxtzw?B?wJ`Io)b{6P{unHl*Tfdm+mCG@ z??4Jwdxx;)@N&c1Vt7-Tj=gCxBky=xZ)!9Hmc3RO5nZX#42*>u3p1KZTh|JAF#y)& z?!##uIs4y~0aZi+DT!iANFe*whCQ5NH)e2o4#5}@0wN@?gca&IZyOkTYg9{F%+tZj%Y%^9`0l(S_ zzpB9jzN&$LXx70Y%&eiu;BaQv-r+Qu3ME08!8G5Q+`BiiJy3$DQcHFo(KEw8r2OxI^X`DYk~7 z(@qw>cH$Vc6URvHTCJ?w-d&RIG*qpSg%~yWEESFsDKGa+Dl`zKf#95uRgRI+3|Epo z10aajK&+Cp4T$wXYy;w7iSk!1;6o3`T1QC3UlEZihe<;{aV0DD1SMeLuo`fPG&C^S zQPOY>(JFXjt6(71i&-#>NbRH5!ah_8Pp>|x3&&bp_3k(ARe=1rgMTx4!oeS?ebcTC zQA2Uz-uv$*$}R6V-12_-a=rSkUA|997x^W_xN*et<>TyXBn>wS_E3s?Yx_8&j3c3V zwFR~Aal|(9@lbEISK~NhIt~>?I^xtm`^S-{t77n~X!`TDt0KdSSAT|1G|-7HTnRAi zPF9V!J&)t9=Bjw~=+5z^=9=i&)%hK`MyZ=z>A+Qrrt9{a4zaGrAykkW9jU8z2r{YB zle#}Rgcwp|Aa!p!gnLPik<=Y@2(jYorT3>^6_b*-UlptTv9<0*r`wH-knhZrJ9`xG zM)jt&MU+Gc^?@=@d}rx;4p$m+me04^-dSU5T+?~aaM~`95PD6JCkwqNKyljT2lA#* z*+x1^tE6Hivem%`vD`WH%+Z4h>UlX5HREPT_=4ifNNA=q ziS{S7KA=8tgU_06B|AgjgL+qr5TUqgIy#i(ifv75{{k^}TXpbcR(T68GJUGF(1w#) z>M-TYETM%er?pmJ);djQ-wa!qVv95)>1GtE>`}BUK)V;sBj%m1y>8U7Fjj)B@ z<raYwsx6 zeJ4Vo|=&!WrPP@?((ps85No|#$%KRA#17!w4*)9c#*4f9&j)NkR2n8 z^0N6CMTNB&$G;gKD}T^`v9GDw~3 zQO0+oU*H(;ePtZn}kYYEW4{wK_2BQHgU)CQmauQ`qp=dK!rO9)7IHq zzBw93oI<)4rSF{9%_%fw1DlBHCm?fOYw*)pqnZoWtlnFa=8+pvy%hOf`_nw^0foM?aqhcHi%gf;rhSHYYX@wpFV2@z>n^`-Cj1Pp-5GUyH}z^Qxx*=q zLKhS=zbh^P-`ynrc9|1q;NuWs+Dz00uA&6?1+A*9-NqNG{jIH%)>?*^`~t(!G2H20 z%#~_!+M0pODkKK%P5HZC*uzv?ZA&Vh6n+thK%4_EN3fpmUhW*a8 zP0j#;Y7+RxWWO4jdq z1$g3D_I{i%M|zbPrPttD_dw&Xo-{n5LEN$`_yDG#v(bLpCOXz7)d z|E}9L04A*6H0anhf}UL?7}!k%vWlMhPbB?$g?Hha1I`wASYGx96N~dnK7MbU&n)f5 z{mWj-d&n1(D;1&@`R zH4gi( z3&7VB#VBpI6ju~$-%#K(o~2;xh{}rhI@NafGi-V7KkUrzpNd~MS-ke(``!t zwp<%2RZE>Wy&3AKEYd_OiM2U`8n+p*%sA0txw_V@<11OSjIV;h<+H-~E$|EZ?n<}Y zcKVqXcCT|(J=3$RQZR9SktgLfbc-Q}E0vYls-_D*H_}VrAJ=FZi@)O7)pDXG&hDmM1qNvxm+C z+U;Vkl<(8I1B#D^hh<>w%3QI2 zJuvwE8y75`(D*u4i*3PY;fI;n+Th~H>xK@+nT$^a*#5YP>PE>b8hnECLU1+ZOM*GH zD!5)8ynYzBVl(_uA^Z?86{f}u<#Z0eu5exS|GvWgt7w@whgReV*Z-O?1bO=NJkOWx zFQ+Jjs=aCpg=gvDOV7ItZG$#zjp_Q|xEYo5EcLFZl7O$Uq!N6E<&UXZMbE9G;X5G4 zhfh$oKP35ZwTY^|As_4Mlu+c#iY74ay?X`v4 zU@YM5If0vy0{hbQt1msz^i&`pwKnGq9(Lhp`woI@j99WfiZ65-Vp{k{kNEskgSZC% zWobwDEBp>$eC^BgI?9W1_gd~kTJe=xdKqr?WtX9)6Xt-4lsg&h27#{EsFZJQjjz_! z**UB5FBdxK1}9y(jc&-J3x7>FxP%<1~(o%=!Q}} zis=SXOv@geTCY;&5I(n*JN)t9BI)X!p79=2%xL^cOaXg*N$0|sa9%cFuTxBZ zdJxv@hjTREFvrO^nIk50)7c@D3q|K~&qR;O*kdx0whNOhGIN~^*TSDU8KbIpUu<{k z)fwSP?((-uk*UR=R9#;me0s~=VD^@|cE^^oEfcqP|HYl#piEjgLYV;ek!6Fh_adcwo-YR-;LPvAl;PzI<_;UP#c!GmkqU|$dJV{N^+GOx|< z;gHFd;+}xr!ubNdBd1JuEbwg?wnSUMWy7xh(P0%Y!Pmej`+E~Shzz}bJ>8`UpQVVa zb%!srZ)EM38C&EIUaTmt8BdDdDGtx7!{@2@2j3;z%B$F^gu6ZnGu&g|_TE+|>pe_XJyet< z{|D2N0Xl;Iax$T$u1X2S>yqxxKmAwz-#9>3IgT;{561qa^w;L0r{rZ3(4eBO>-ukP6^A3FE- zrE4jp@13&v$)}$!{%ze~&s`ooB6ZBTNh@-k`~LI)eR(Be#663*`u==8cH~1(J9fYN pf8P1H5WchPkJz3+Tz3PCSwld6|K1Ce*pAwP<{Xa diff --git a/textproc.asm b/textproc.asm index 1fb6165..00cb52d 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1376,9 +1376,10 @@ EndOfTypeLine4x4 mva #20 fs ; temp, how many times blink the billboard seppuku_loop - lda fs - and #$01 - sta plot4x4color + lda CONSOL ; turbo mode + cmp #6 ; START + sne:mva #1 fs ; finish it + mva #4 ResultY ; where seppuku text starts Y-wise on the screen ;top frame @@ -1419,6 +1420,7 @@ seppuku_loop dec fs jne seppuku_loop +quit_seppuku ;restore vars mva yc Ydraw mwa xk Xdraw From be5652074a043c5bcf315c2c614902b8005f99cd Mon Sep 17 00:00:00 2001 From: pkali Date: Fri, 27 May 2022 21:40:15 -0400 Subject: [PATCH 10/23] font4x4 xy check removed --- grafproc.asm | 9 +++++---- scorch.xex | Bin 37851 -> 37827 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 82b7e95..ded2450 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1341,10 +1341,11 @@ EndPutChar ; all pixels are being drawn ; (empty and not empty) ;-------------------------------------------------- - cpw ydraw #(screenheight-4) - jcs TypeChar.EndPutChar ;nearest RTS - cpw xdraw #(screenwidth-4) - jcs TypeChar.EndPutChar ;nearest RTS + ; cpw ydraw #(screenheight-4) + ; jcs TypeChar.EndPutChar ;nearest RTS + ; cpw xdraw #(screenwidth-4) + ; jcs TypeChar.EndPutChar ;nearest RTS + ; checks ommited. lda plot4x4color beq FontColor0 lda #$ff ; better option to check (plot4x4color = $00 or $ff) diff --git a/scorch.xex b/scorch.xex index 7475534e38ae5d365e68419e5970e6447ab42557..37ede01318b8d82c73d15f23212fb7af50eb98b6 100644 GIT binary patch delta 11532 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 delta 11539 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 Q(qhdPHtyBT!WBLK2NmRGUjP6A From 3c1b0a02aacde3b683987d032b0df2422caa5075 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 28 May 2022 01:50:59 -0400 Subject: [PATCH 11/23] cosmetic edits --- constants.asm | 2 +- scorch.xex | Bin 37827 -> 37832 bytes weapons.asm | 62 +++++++++++++++++++++++--------------------------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/constants.asm b/constants.asm index 4e395c6..138cfeb 100644 --- a/constants.asm +++ b/constants.asm @@ -18,7 +18,7 @@ CashOptionL ;(one zero less than on the screen) CashOptionH .by 0,>200,>500,>800,>1000 GravityTable .by 10,20,25,30,40 -MaxWindTable .by 5,20,40,60,80 +MaxWindTable .by 5,20,40,70,99 RoundsTable .by 10,20,30,40,50 flyDelayTable .by 255,150,75,35,1 seppukuTable .by 255, 45,25,15,9 diff --git a/scorch.xex b/scorch.xex index 37ede01318b8d82c73d15f23212fb7af50eb98b6..dae88597fc70b3ed60f3dffadaf8de6a07358b68 100644 GIT binary patch delta 12293 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 z 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 sta temp+1 - ; adw mountaintable --- it does not work!!!!!!!! and should! (OMC bug?) #temp + ldy #0 lda ytraj+1 cmp (temp),y @@ -2290,9 +2286,9 @@ CalculateExplosionRange0 lda #0 sta RangeRight sta RangeRight+1 - mva #11 ExplosionRadius + mva #11 ExplosionRadius ; what is this magic value? ;-------------------------------------------------- -CalculateExplosionRange .proc +.proc CalculateExplosionRange ;-------------------------------------------------- ;calculates total horizontal range of explosion by ;"summing up" ranges of all separate explosions From 636e121bf743cf2fcbb8ae5eb6e1879890475c18 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 28 May 2022 08:38:46 -0400 Subject: [PATCH 12/23] funkybomb traces deleted #5 --- scorch.xex | Bin 37832 -> 37847 bytes weapons.asm | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scorch.xex b/scorch.xex index dae88597fc70b3ed60f3dffadaf8de6a07358b68..e27f4974d0eca214ca9f6c5b934d34f5cb975940 100644 GIT binary patch delta 12253 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 delta 12208 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 H-0gn=@>uG3 diff --git a/weapons.asm b/weapons.asm index f5e031f..00ace49 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1821,15 +1821,15 @@ Hit jsr unPlot EndOfFlight -; mwa xdraw xcircle ; we must store for a little while -; mva ydraw ycircle ; xdraw and ydraw .... but this values are in YHit and XHit !!! + mwa xdraw xcircle ; we must store for a little while + mva ydraw ycircle ; xdraw and ydraw .... but this values are in YHit and XHit !!! mwa #0 xdraw mva #screenheight-1 ydraw jsr unPlot -; mwa xcircle xdraw -; mva ycircle ydraw - mwa XHit xdraw - mva YHit ydraw + mwa xcircle xdraw + mva ycircle ydraw +; mwa XHit xdraw +; mva YHit ydraw ldy SmokeTracerFlag beq EndOfFlight2 From 2c640c370a7fcb6d0b35f8e1c73e7dd944f87dff Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 28 May 2022 09:42:38 -0400 Subject: [PATCH 13/23] Shooter shooting too strong #70 --- ai.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/ai.asm b/ai.asm index 1ce7645..838f4b0 100644 --- a/ai.asm +++ b/ai.asm @@ -123,6 +123,7 @@ tankIsOnTheRight forceNow mwa #100 RandBoundaryLow mwa #800 RandBoundaryHigh + ldx TankNr jsr RandomizeForce endo From aa74cf133ba12967865b9348745a1f164ab31111 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 28 May 2022 13:42:42 -0400 Subject: [PATCH 14/23] draw jmp(indirect) ellimination --- ai.asm | 4 ++-- grafproc.asm | 61 +++++++++++++++++++++++--------------------------- scorch.xex | Bin 37847 -> 37845 bytes variables.asm | 3 ++- weapons.asm | 6 ++--- 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/ai.asm b/ai.asm index 838f4b0..4486f9d 100644 --- a/ai.asm +++ b/ai.asm @@ -123,11 +123,11 @@ tankIsOnTheRight forceNow mwa #100 RandBoundaryLow mwa #800 RandBoundaryHigh - ldx TankNr + ldx TankNr ;this is possibly not necessary jsr RandomizeForce endo - ;ldx TankNr ;this is possibly not necessary + ldx TankNr ;this is possibly not necessary lda NewAngle sta PreviousAngle,x lda EnergyTableL,x diff --git a/grafproc.asm b/grafproc.asm index ded2450..50f841d 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -214,37 +214,20 @@ LineGoesLeft ; line goes left - we are reversing X sbw xtempDRAW temp xdraw ; XI PutPixelinDraw - jsr DrawJumpPad -; end of the special PLOT for DRAW - - ; XI=XI+1 - ; UNTIL XI=XK - inw XI - cpw XI XK - jne DrawLoop - -EndOfDraw - mwa xtempDRAW xdraw - mva ytempDRAW ydraw - rts -.endp - -;-------------JumpPad------------- -DrawJumpPad - jmp (DrawJumpAddr) -Drawplot - jmp plot -DrawLen - inw LineLength - rts -;-------------JumpPad------------- -DrawCheck .proc - lda tracerflag - ora SmokeTracerFlag + ; 0 - plot, %10000000 - LineLength (N), %01000000 - DrawCheck (V) + bit drawFunction + bpl @+ + inw LineLength + bne ContinueDraw ; ==jmp +@ + bvc @+ +DrawCheck + lda tracerflag + ora SmokeTracerFlag yestrace - beq notrace - jsr plot + beq notrace + jsr plot notrace ;aftertrace lda HitFlag @@ -267,14 +250,26 @@ CheckCollisionDraw cmp (temp),y bcc StopHitChecking - mva #1 HitFlag mwa xdraw XHit mwa ydraw YHit - - + mva #1 HitFlag StopHitChecking + jmp ContinueDraw +@ + jsr plot + +ContinueDraw + ; XI=XI+1 + ; UNTIL XI=XK + inw XI + cpw XI XK + jne DrawLoop + +EndOfDraw + mwa xtempDRAW xdraw + mva ytempDRAW ydraw rts -.endp +.endp ;-------------------------------------------------- circle .proc ;fxxxing good circle drawing :) diff --git a/scorch.xex b/scorch.xex index e27f4974d0eca214ca9f6c5b934d34f5cb975940..da88c9205993eadd28ed48bf9e56380534448276 100644 GIT binary patch delta 12282 zcmbVS3w#ts(%(nkK(Z*pBCiDmj9^$1WI-N5kmnc>P!SJUHBllY_(I}&Ve%S`BolTs z-H}~cjgbi%%y1jTyUXV-pQjgOqsfgY-W?(wsEI^PTs=8J9{K(~y9os4{C>w{XS%zp zy1J^mx~h8qzRUFSE|dSsiAM7qPfctx4jr&sy_smIY`Y$|CC{t;zG|-WcB#QsW;BV3 zhitD&t8W`V^v}fR+n^XkJa^w|JN@XM38XO)MM5JQEoZ7Kq`%xbfN#`VxdnIF7R_g4 zLpd^IF0lquNiIixsU$F!mSWiL>-3yFK2keV6|LN9@L?v*0a8ne^003; z@nsO-I-;EPZ6%7?=OW5#-)5p1eMQ8!dY-QWv>QP%S6`BlZEMfA?UQmQkK$)Mt}j+7 zbygbmg=UbD@nECn^xG!CHPWF)VdYLWmsoS3AigJvQyov5%*15@#qmVB9xU2MJjxZ! zsV)uNN`#W#fz?DabGA8(QKU2=maDIm&^@626&1gxww?2LmY^}gYx{Rb?Q2AfsV>>>^AWj3*aiB! zvgBO?1Nk#izosFxZP(-apg}0HeYU){L@sHXK(rqi&?QO{RDMHMG`NNI#GRxvPBB;? z%ic*`W@~0bvGxOdhb&e6ZiNK@rq2O+wU)}IjAoQ#5K5K)Sidf*btDuWfc*M5TK>h| zI=gEHiqZDgeC~tU&`;S#4XAYan+(O zgJYc$G3>eMu?A{MW|WW@*h?}ELcSyL2htWL6o8>Z@jW6QBw^_(sbT}nKs>-^NFEmK z=RaLjpIroo!j|>7*`?_uu!2~#(wQ{{mVz2g3LvGh#IXf4fLxHA(roU&eq@RHVUENARbpZ&HPCV}r3XM}+?T7IlDY=!xsJRYN+!9>`i zAu;V0Or1ii43&PxU^Bd2X{ws1#MplIg>(M)`8)U3m*mvGBHerYO?^{{Ju#uC$^fXO zml=-azP;bt3B>tfGVqsDKe{XT`bRWKzgxZTOXHH^d3zjXrnXw&Vk`C_kpM^kH zwz!>vtweAKT#ya=1&N8*ED&|5w}EKU>JV>(6-4_?u?xkvV;i`@ykix_@{y9#)pWAu->NVFbd@0hSFnkk z{Dy5UX8l{rs|;JDz$S7uhlGZ^hJm*n1|hqBIfS_dcS2wy0X{k=N_(e`845q#U(GQk zCk2y2F*WrCMOv&{WYRuVdRJM?Ql!(be5a_Ey>@A0d~_hng=t4t6nTxmGCQ)9#|#996%e z;vxzwga6xoFY{VUl_W-b)+(JL5W6agt5L8heJ-Pbr8%)Ir%p~yrQ+jMokd0d398Pf z;*(UJL&c{kTljThtY6~4$9k|55Z*x1`80+7h#Y&pi@h#P9_BJF=w!2p2UQ=Z zVk%XipyDjbt4~sKHdUXZ;+*dFLlaB{eRN*Kx_K+Dc>~p61&OCATZa-6Jhm)E_Ewrh z&TAVfKQIdR&+5k2M?AzF%twU#Xpyq& zr$gq*&`(EV!y|H@_!lDQiyDyDyFDE^h~`H0AQzK_xEJBn^!3%Y&n(i5rI@`tc9 zO$iBMZUDD6*{Jn%1U`nR2SVT|X)^$aTgX|_ml^4UTRy7$ljrTWF2VK$1d+6h~aLKWP+kw6ocNhlr+TrJ3#9W}r<8(PngnR%91)v}lZk=y?i(9+9 z(ehdIA)+24b~87G3(J|gpBQWAZCPiDP%P&MjZjBkaH{_VH}GlY8YacKpOfNGN4kV~ zjR+0*M2Zeek*TqFL`Cy;h4t^z>e}7mvFVYqTknQ*2s?=`fU%dlx}eZCh%tLnJWY5g z{tV&XzFT*eHSENFHZfNy3Lm)wJ95t^ZWgxS%zYl97m43d zSrEUc@)q%5RDNFkf#Pt2@lIO@BudqGD&(mhRLEDqr9y!kqC%ni9TkdH{(CA2>c6P4 zMg4(diY_d6#9bZhDoFo%s-H#T*TL9-ekxnmQ(*peVmtXOw&$ZO(`{4kbOPK=+4-BF z)nTUirku?X@6h!OX_GhQfsC$At9j#Tx`{T7q&p(#_TiVx7 z-6F7%%eW5nrZL`zQtGrlzeGs{9p;lZ3Q%t5i$X=Ep^l2pQuCcwY5JT&e2;#iAe7P6 zOhP8tYKPcN+KfU$>FdlgQkiAUVwN$RS;ib1mYp`)R`sOXM1sZ;=Fs2?59G;t$N_2= z%lY~vbX_a@Tl2d&Rcd%NPmE$Dqj^R%27X$|6Y`b!gaSq|iWyZjGpZOE6?3lapkv2L zr9lD13YKA&X+|E_RFRP{RMausn@TNl>U}icDBgzv3E>ndHxs!c_#$>Q4Q>qemnm4R zI6&(t7O5Hh2#umy*tJo5;LgGKy&1B#0-zPt!oz*BGD|Ehw+S(cPLXxQD@JS9eJosK z(H^DT^t+X7!^)x*q6)7ovMi(cBP2bL|50~p#!!6eIRf*mJx9V~Db~I`Pyo;08M>k4 zM}mLqk3>92(#{bFq|knj=z?fNjNJSs&Y~+M8MEcHWLg5 zJGDN?iiic77uEwP;6wl%7;e)M8DRj~kFY@_CI)r|K>!Qv*hqXD+!MXB9}XWDfz6_s28=rp0pj>!Vb~nn#=sDR>el2`c;>Qznn1-~ zRP0TaNo+ypj@}gP)xy>>1-H9t$Jf!PGF2Ne99j5t8rQpidnd zR9&J>6pHm@A`W3n_v&njJ6K7ex+E>0y5hr&_5FdcR$olSlT4$pmgrOY_J+G1KyQom zA{N^F|C>hbMIn^)%fmbc&Du>mi@(4aPoR}AR)x>1N`r1U!Csp2VCijoaKAtg?iW%h zUYx5({qrcY`Eg9IH?yDRRJ@0Z_fj0g%<~HcLSZ6DQ|_XB7SXbAsO37x);2kuEAD27 z#+*8{a6AGDzZUtWRE23Srs`c(T*3_PZdw(Wy_C8JTh+xh3*?tmbqUSFB==DDZkmOu z?xiV(TGM%b3*mDNuExp4sXWlS+ zr3&E;v#K*`mV+YUfz-36=n2m(nl+W>JY41q2Zr0bhTFS_+x20FAFC=vyEzn%M`*NF zolLW;2@{ZmX6+(OMpM|oW%mf*(^Yug8&i1(dEX10kPYNo~BxyN?CEtxEc|gHbLd*Q2msdO<6_& z0+w4C(L6>ppAju!L{Pp|Pozu<$U3nh#sA(TR;I)1pQc>>y;V`rov#nmtM3}Nn|%BL3eo!pGxhj} zGu`+`GtKzM!m50B+GuIEVkk3R91&66n6To+aj+@}ZA%wNvH_^*MmB)w&2ZDeI4Ir_ z!AOo^q=YdJilZVJH&K<>QO2`9eMOa{sNi-O(@7PIn&m^i%`R@!J8V}f^ zd9LtRVIvRpp}E5;4`~Fhp}C`(Kmr43?pW#@K)D4EI52);I1?6zFLVuG(1(9&<$=M> z$|1(UaAxI@WMDL`8?p?HWzVscdkrK9Gb0Z}!N?gDKN=zngW)-rc{_Uo><-pw=GOfR z93hsv#x>@$xOV50+`g4yDwxVj&)wm!-VJnZBF31t3}E{eMyBT{kQ_7ksa6akgm+^U zF?@L?Z@^?9y8R>2j{|W)539HBd=hw&*}j$d*JCd9R~i^Gfn@}YoWPQT@;bLrP*i9e zyZ``KBA|X~r&Uo*4bdp2+ZkQ{s+$J{F#i>S>g83bpDBE!<_%MSouEdC6Rl|$MW|Ry zno_Ah)tVVsqn~oD*Ze^$b={1^u!)~dU8CBfnr2h~P#qOpL%cw+HN=Yqq7gd@WGWh{ zQ?K#ucK*~*^&$@<+pI6C_&$;Ivrba+1EPL_WCr2u`y@Eim7vVT5a@qE9CBVe0D}N* z2O!@_)J8q3LDKXA8+(s5y^rV@v{4YmM5uE! zH-doei&f%lsBC_>>TN?P+R89SzNW)YR69Xz+={xqop3W(2NShE&30n>7#0=oh|&7)v6Exx zq`*1Jvj5^ai9y9`*P;^*bYk1?!Z7RZts#|Ljknr!(!qnJ6G-iOsmf4anS(2z`pI$* zu6=a*cGO;w>UZaeGO4{N)&Dj}tRc0XQvJRh(L`zuq`p2!yoJ;nN&WsD(JVc&Y(~sE zDIp>Eob=|h5k|Z8k7bYYxM7L0o!G=Rud)4OP1m)@mriAr*k__LSxlS=dFXdBNW?y6 z`{O9BkxP&^?+&~#dGcnRJot8;_Cq8l#zmEQg5m~C{ERA8@GG-~I@|pj$|#{onJfs% z=nvDfPiWZ@8raWcjpHBWcb3%S!fOVv#nj`vYcua>y<6Os{gpU(QKe0Z$L~NT$z60% ziNfnJ#o{gsq~ukiVU>$A2MB&y$TSFbAc(1Lbs5!e)<3Abe>3Y3%;3QiSdrcHp>Fi7 z6?C|CV;7)~ial6fX^wG^E-$v6waV_ywHPkX%oFM=W9s~1;_d$0>2E%zT0iwD)#BB| zR6IhtUJt6Du$QgJ?fzc1hpFdP+Hn}ewVzN=kam0`y?W2kB!^QyLYt0Jzgav+)x%Qr zJyVRI;CHZe!@WcJ6A!_l^mOX}hoF9#Rbr?gO59WROiOqOmSX0FhqS+8-cXLOVh)n*jX`^16<2?*UpAsD>mp9ijes2gtM~ zfypq91xBb`>vPEbTvdpHkEfa9QSdbFtFu`)r9= zk6meiDNPfEJx8R{`^FoONPoOA?1^>O8GW$_bB6DC46RZ`_lM_XTe zeA6*$z>3MdZpOB+9>!g6h+UUUT z>Tw#3*U$Om6ik9xv)&0)h{H0%T>wI149#G?E1pNo(H4LCprefqTH-Nc&Ac>HU4jl@ z6sa_9WgA_cn3~LolIq#R_r4TfwKI^|-S|Pj&2(191>R-q{2&LLDE^z{RO?mej?Z(u zi!G<^@paPs_g~AOpedixn}P|h=(dE86UYbJcL%=8@O(~-E&o(Mr%hjFXd~298RF+u z{X%c`W34Z!+M>5&SgVCrn(IHOZa;3joRvnVpTrYAh=#g}eik9BBYsY!DvkA@OAoH> zmxz?lU5|vee9r|>;ILGSg&WeEw^47VUDhKzCn*Is%eDIsv^7hq#3dn+?r+{liM zE#*SF>=sXZM4osfV>sEX%wcr9SEAnN#ZuH{ zZ}(dCIWJ$3+D4m9gbz)G^H)Y=gA;v&D?=Dt1nayyjZktJit&DRD9kv8T#{dBmt=Zi zK>iSP59Um4C5a6BKhysu(pOSO1ss%Fk-TiIS9u@hTS=(k_l)(jd)1O|YPeiB`x5YF z1S^Ht(d3yY(K>iMPWu;*<|o*B4uRu1zcwN=9Ou`I*W!B-aR5O~U?nJ-|DpuDXXAka zXl8vqwba2sXJtnTiBOSlw;#YUnqRv0%@(Iow8&7yhd5jz*OY!PbY!j|U+h1<(+ zj#%fGmI8D>-%=vTaI1m&DnP1)YK9dBELo1Oj;@JT5T!gV?Q|~Yi`HA^+KfFyt*mDJR!{+#9Hm_= zzXVb5fbV=+kmOec!tGg)E(u)(U2b%hGf1OmvC2{ge4$J-yh0)O*YytB(;}hm#l2!7 zgE27}cgBnG59Jx#g?#ScfO!$_IZxi+QqBwc>Q==w>`np;=|`TuW{c;K>#hCzyMGP!}X*fU3h2% z%Ce|?qE6aq`2kk;G8JE8UZax2`>;FS*qRUUnacO|sNS~Y(A7>_)t6~*>~8?+sl|s= z9j{RJ73$ebI)GA1+2XkyF18 ztR)S3+CXHk4f)zNxETKfK{0&?V`e)QJ*dwdb>iy^d~{NR!fR_ub&38d3chJz8DR#| zSgdEzxap6xE!`))k=ZWhKHY##TvNXs`x%hk1!E+|kdJYov@U&Q%))1J2f0`x>0_-M zu~T0Z>R=@lnSY%>crX+Vz;C6$rw>nx46=SETq!nVDBr-!WCu_tvm%#eCWr>B5a`X{ z3AC3}C6oygAsB^P1cd33grI)B9 z41}49+(%xfj^#|kpXRMh{*yBq~gL2Vm1ptt}5`t`fFI=P_I;P$IN8XDnHy|f)>05UJpb`J$nyaet3 zF;#}U%6yc&>q#p>vbsRBxW3M^&!)4&=kh=G+Px4xh!5E0GJL>R6;*pb{pNle8VWWJuc2ChaB_I1g=&f5=5Qvf{iIV*y7bwj zH}Mtt0%5N3*usT1k%{$bBa_C}73niN>x%Tr;M{sF;3}wqKK z><*KQdpbght0yU=|K?F=@F$rt?h5! z2#fIKB5(Mv=ls&QYx^%{!s_BVv@UHU&CaE1&(Q46G;I^j=4o0E&Ca7~&(iFCn)Yj& zT|m>GquGTt?Kd>Lh&r+bnl0k7g=UxG@jT7mCOID)BCW}c#aFyk{WCsGRXVF;eFF7~ za4Pt+4MN#SrwbG{0=(wZ=^|c>yO-1|oJ2_ViBp~64Y51z310OUFYdlfc(=3ng~AIE z%vP)XLgu3GMH{NjbuWywdo58n;ZJ-L=1askh$6lr^s)8(a;3P(218vvjYcj&Vz*nj zm~J6VzM2qzZn0Q%G0k=%Jqt!wHg1B~V!mv7;dXe9(rb@hixVJ{Pt7fV#LfQ8ZqI&F zY-x2S>~3rfq(3u1@bEM9olibf{>-hLF8#%A-|Bhd4x%g(hp@aTClXY+|07-2@`UD923& zy9ccFCx%aw%xEBR-#rs)z0Rgh|LL?~Y5hE;z&i*&p2lT^FWQTc&)3)6Rjfc@U@NY3 zht9Dtik-G8&nTS&FIAV+P9Vj9E(y)9$Je|w0{h9~{lq`SQNN#D*iZ0XsqsI&TDV)x*JSd0~0eg`gt27KHb?>|*L+-rUI!%d9eag1MlW#U!- z$i!rVm~?)52r5!b>B-*S|9PkJub+JOmBnhi(e6l{uWRGmP4fdCo8~(&Y~pe?T7p=!gj;f8XEQ)+O##yDgNAAhByucaKt95!(rtKtad_4}pY ztsge1bJGE;bvTtc0Tm#&5F-{c%zw((xk(DGe<0@6q>XQ$n)JrqS=V33e;V6s;OLu| zY|JlzS+3pxmzIvC!DH`PwL#pW)c@n;_c6&cm!#)czV*@RYsTNXa#McYJBNOZA9?%T z8=vKiiD$>FyWagObozWBEG_N9wHsbgejohm?4Xfj#*Ux3;<3$D|NFPLA7e(|l(zBZ mKYnB$wRr6_)bqwWhl}7ryZ^lLRe>wooIu9Dkz2g7*Z%=G4f=)v delta 12177 zcmbVS4_s7L_MboePhl*z(NdnKC1!|;Hkl@*iP>Z+_RrL2RWwShbjxvDdjs-}ghw;H zdlja}CiEeXc>adm-|n*QZ2o?`7{dzt+OqxiE2%6NQx23FOyx$C znEW26N-L(18Qw&=-A^h85zo3iIpbsdrjnLmoJ6Om@pv1354k;uScBPQ%RR)GO@g

iF>#WFXtYP5}nIsMD`tbCI@P#+ncj{j#G?h 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 Date: Sat, 28 May 2022 21:43:55 -0400 Subject: [PATCH 15/23] LimitForce added #70 --- ai.asm | 25 ++++++++----------- scorch.asm | 59 +++++++++++++++++++++++--------------------- scorch.xex | Bin 37845 -> 37844 bytes textproc.asm | 4 +-- variables.asm | 9 ++++--- weapons.asm | 66 +++++++++++++++++++++++++------------------------- 6 files changed, 82 insertions(+), 81 deletions(-) diff --git a/ai.asm b/ai.asm index 4486f9d..b6389ca 100644 --- a/ai.asm +++ b/ai.asm @@ -33,7 +33,7 @@ loop ArtificialIntelligence .proc ; ; A - skill of the TankNr ; returns shoot energy and angle in -; EnergyTable/L/H and AngleTable +; ForceTable/L/H and AngleTable ;---------------------------------------------- asl tax @@ -77,24 +77,19 @@ Shooter .proc lda PreviousAngle,x clc adc #5 - bmi leftQuadrant + bmi @+ cmp #90 - bcc continue + bcc @+ lda #(-90) - bne continue -leftQuadrant - - - -continue +@ sta NewAngle lda PreviousEnergyL,x - sta EnergyTableL,x + sta ForceTableL,x lda PreviousEnergyH,x - sta EnergyTableH,x - + sta ForceTableH,x jmp endo + firstShoot ; compare the x position with the middle of the screen lda xTanksTableL,x @@ -108,7 +103,6 @@ firstShoot and #$1F clc adc #5 - ;lda #45 sta NewAngle jmp forceNow @@ -128,11 +122,12 @@ forceNow endo ldx TankNr ;this is possibly not necessary + jsr RandomizeForce.LimitForce lda NewAngle sta PreviousAngle,x - lda EnergyTableL,x + lda ForceTableL,x sta PreviousEnergyL,x - lda EnergyTableH,x + lda ForceTableH,x sta PreviousEnergyH,x ; choose the best weapon diff --git a/scorch.asm b/scorch.asm index 371e832..ab3b9eb 100644 --- a/scorch.asm +++ b/scorch.asm @@ -252,9 +252,9 @@ skipzeroing lda #0 tax @ - sta previousAngle,x + sta singleRoundVars,x inx - cpx #(singleRoundVarsEnd-PreviousAngle) + cpx #(singleRoundVarsEnd-singleRoundVars) bne @- ldx #5 @@ -271,13 +271,13 @@ SettingEnergies ; anything in eXistenZ table means that this tank exist ; in the given round lda #<1000 - sta MaxEnergyTableL,x + sta MaxForceTableL,x lda #>1000 - sta MaxEnergyTableH,x + sta MaxForceTableH,x lda #<350 - sta EnergyTableL,x + sta ForceTableL,x lda #>350 - sta EnergyTableH,x + sta ForceTableH,x ;lda #(255-45) ;it does not look good when all tanks have @@ -505,9 +505,9 @@ B0 DEY BNE LP0 ror ROR L1 - STA MaxEnergyTableH,x + STA MaxForceTableH,x lda L1 - sta MaxEnergyTableL,x + sta MaxForceTableL,x dex bpl SeteXistenZ @@ -982,7 +982,7 @@ RandomizeAngle .proc ; .endp ;---------------------------------------------- RandomizeForce .proc -; routine returns in EnergyTable/L/H +; routine returns in ForceTable/L/H ; valid force of shooting for TankNr ; in X must be TankNr ; low and high randomize boundary passed as word value @@ -990,36 +990,41 @@ RandomizeForce .proc ; RandBoundaryHigh ;---------------------------------------------- - lda MaxEnergyTableL,x - sta temp - lda MaxEnergyTableH,x - sta temp+1 -GetRandomAgain lda RANDOM - ; gets values in range(256,765) sta temp2 - lda RANDOM ; :) + lda RANDOM and #%00000011 ;(0..1023) sta temp2+1 cpw RandBoundaryLow temp2 - bcs GetRandomAgain + bcs RandomizeForce cpw RandBoundaryHigh temp2 - bcc GetRandomAgain + bcc RandomizeForce - cpw temp temp2 - bcs EnergyInRange - - mwa temp temp2 - -EnergyInRange lda temp2 - sta EnergyTableL,x + sta ForceTableL,x lda temp2+1 - sta EnergyTableH,x - + sta ForceTableH,x + +;--------- +LimitForce +; in X must be TankNr +; cuts force to MaxForceTable + lda MaxForceTableH,x + cmp ForceTableH,x + bne @+ + lda MaxForceTableL,x + cmp ForceTableL,x +@ bcs @+ + + lda MaxForceTableL,x + sta ForceTableL,x + lda MaxForceTableH,x + sta ForceTableH,x +@ rts + .endp ;---------------------------------------------- diff --git a/scorch.xex b/scorch.xex index da88c9205993eadd28ed48bf9e56380534448276..4759a233f7ea5a576cdddd7101b2b25e12399d4d 100644 GIT binary patch delta 12338 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 delta 12340 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 Date: Sun, 29 May 2022 00:25:19 -0400 Subject: [PATCH 16/23] cosmetics --- ai.asm | 7 +++++-- scorch.asm | 12 ++++++------ scorch.xex | Bin 37844 -> 37849 bytes 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ai.asm b/ai.asm index b6389ca..74db4ea 100644 --- a/ai.asm +++ b/ai.asm @@ -83,10 +83,13 @@ Shooter .proc lda #(-90) @ sta NewAngle - + + sec lda PreviousEnergyL,x + sbc #5 sta ForceTableL,x - lda PreviousEnergyH,x + lda PreviousEnergyH,x + sbc #0 sta ForceTableH,x jmp endo diff --git a/scorch.asm b/scorch.asm index ab3b9eb..f40d68b 100644 --- a/scorch.asm +++ b/scorch.asm @@ -808,20 +808,20 @@ SetunPlots sta gtictls jsr PMoutofScreen lda TankColoursTable ; temporary colours of sprites under tanks - sta $2c0 + sta COLPM0S lda TankColoursTable+1 - sta $2c1 + sta COLPM1S lda TankColoursTable+2 - sta $2c2 + sta COLPM2S lda TankColoursTable+3 - sta $2c3 + sta COLPM3S LDA TankColoursTable+4 STA COLPF3S ; joined missiles (5th tank) mva #0 hscrol ;let the tanks be visible! - ldx #5 + ldx #(maxPlayers-1) lda #1 ; tank is visible MakeTanksVisible sta eXistenZ,x @@ -909,7 +909,7 @@ lab2 jmp SYSVBV .endp ;---------------------------------------------- -RandomizeSequence .proc +.proc RandomizeSequence ; in: NumberOfPlayers ; out: TankSequence ; how: get random number lower than NumberOfPlayers diff --git a/scorch.xex b/scorch.xex index 4759a233f7ea5a576cdddd7101b2b25e12399d4d..e81372145c61e8c92fdbf5496d69819a59481817 100644 GIT binary patch delta 11558 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 delta 11505 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 Date: Sun, 29 May 2022 08:00:23 -0400 Subject: [PATCH 17/23] WIP: hunting for #47 --- scorch.asm | 26 ++++++++++++++++++-------- scorch.xex | Bin 37849 -> 37861 bytes 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/scorch.asm b/scorch.asm index f40d68b..0f19242 100644 --- a/scorch.asm +++ b/scorch.asm @@ -124,7 +124,7 @@ START bne START jsr EnterPlayerNames - jsr RandomizeSequence + jsr RandomizeSequence0 ; for the round #1 shooting sequence is random MainGameLoop @@ -257,7 +257,7 @@ skipzeroing cpx #(singleRoundVarsEnd-singleRoundVars) bne @- - ldx #5 + ldx #(MaxPlayers-1) SettingEnergies lda #$00 sta gainL,x @@ -480,7 +480,7 @@ NextPlayerShoots ;before it shoots, the eXistenZ table must be ;updated accordingly to actual energy (was forgotten, sorry to ourselves) - ldx #5 + ldx #(MaxPlayers-1) SeteXistenZ lda Energy,x sta eXistenZ,x @@ -500,7 +500,7 @@ LP0 ROR L1 BCC B0 CLC - ADC #10 ; multiplication by 10 (L2) + ADC #10 ; (L2) multiplication by 10 B0 DEY BNE LP0 ror @@ -567,7 +567,7 @@ NoPlayerNoDeath jmp MainRoundLoop.continueMainRoundLoopAfterSeppuku .endp ;--------------------------------- -PlayerXdeath +.proc PlayerXdeath ; this tank should not explode anymore: ; there is 0 in A, and Tank Number in X, so... @@ -591,7 +591,6 @@ PlayerXdeath sta ResultsTable,x inc CurrentResult - mva #sfx_death_begin sfx_effect ;RandomizeDeffensiveText randomize talk.NumberOfOffensiveTexts (talk.NumberOfDeffensiveTexts+talk.NumberOfOffensiveTexts-1) @@ -607,8 +606,6 @@ PlayerXdeath mva #0 plot4x4color jsr DisplayOffensiveTextNr - - ; calculate position of the explosion (the post-death one) ldx TankTempY clc @@ -656,6 +653,7 @@ MetodOfDeath jmp MainRoundLoop.AfterExplode +.endp ;-------------------------------------------------- .proc DecreaseEnergyX @@ -909,6 +907,18 @@ lab2 jmp SYSVBV .endp ;---------------------------------------------- +.proc RandomizeSequence0 + ldx #0 +@ txa + sta TankSequence,x + inx + cpx #MaxPlayers + bne @- + rts +.endp + + + .proc RandomizeSequence ; in: NumberOfPlayers ; out: TankSequence diff --git a/scorch.xex b/scorch.xex index e81372145c61e8c92fdbf5496d69819a59481817..43221207f32c0ab57a4b4645c4aef3f405ffcefa 100644 GIT binary patch delta 12441 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 Date: Mon, 30 May 2022 05:54:00 -0400 Subject: [PATCH 18/23] work in progress... --- grafproc.asm | 133 ++++++++++++++++----------------------------------- scorch.asm | 14 +++--- scorch.xex | Bin 37861 -> 37845 bytes weapons.asm | 4 +- 4 files changed, 50 insertions(+), 101 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 50f841d..e5dc298 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -555,11 +555,10 @@ UnequalTanks bpl CheckNextTank rts .endp -;------------------------------------------------- -drawtanks -;------------------------------------------------- - +;------------------------------------------------- +.proc drawtanks +;------------------------------------------------- lda tanknr pha ldx #$00 @@ -576,8 +575,9 @@ DrawNextTank sta tankNr rts +.endp ;--------- -drawtanknr +.proc DrawTankNr ldx tanknr ; let's check the energy lda eXistenZ,x @@ -665,11 +665,11 @@ ZeroesToGo NoPlayerMissile DoNotDrawTankNr rts +.endp ;-------------------------------------------------- .proc drawmountains ;-------------------------------------------------- - mwa #0 xdraw mwa #mountaintable modify mva #1 color @@ -835,6 +835,7 @@ ColumnIsReady mva #sfx_silencer sfx_effect rts .endp + ;-------------------------------------------------- .proc calculatemountains ;-------------------------------------------------- @@ -962,6 +963,7 @@ SetYofNextTank rts .endp ; **************************************************** + ; ----------------------------------------- .proc unPlot ; plots a point and saves the plotted byte, reverts the previous plot. @@ -1066,6 +1068,7 @@ SkipThisPlot EndOfUnPlot rts .endp + ; ----------------------------------------- .proc plot ;plot (xdraw, ydraw, color) ; color == 1 --> put pixel @@ -1100,11 +1103,7 @@ MakePlot lsr lsr tay ;save -;--- - - - - + ;--- ldx ydraw lda linetableL,x sta xbyte @@ -1126,6 +1125,7 @@ ClearPlot sta (xbyte),y rts .endp + ; ----------------------------------------- .proc point ; ----------------------------------------- @@ -1135,7 +1135,6 @@ ClearPlot ; let's calculate coordinates from xdraw and ydraw mwa xdraw xbyte - lda xbyte and #$7 sta ybit @@ -1147,9 +1146,7 @@ ClearPlot lsr lsr tay ;save - -;--- - + ;--- ldx ydraw lda linetableL,x sta xbyte @@ -1163,6 +1160,7 @@ ClearPlot eor bittable,x rts .endp + ;-------------------------------------------------- .proc DrawLine ;-------------------------------------------------- @@ -1174,20 +1172,19 @@ ClearPlot jsr plot.MakePlot ;rts jmp IntoDraw ; jumps inside Draw routine - ; because one pixel is already plotted + ; because one pixel is already plotted -loopdraw - - lda (xbyte),y - and bittable2,x - sta (xbyte),y +@ + lda (xbyte),y + and bittable2,x + sta (xbyte),y IntoDraw - adw xbyte #screenBytes - dec tempbyte01 - bne loopdraw + adw xbyte #screenBytes + dec tempbyte01 + bne @- rts .endp -; + ; ------------------------------------------ .proc TypeChar ; puts char on the graphics screen @@ -1238,7 +1235,6 @@ CopyMask lsrw xbyte ; div 8 rorw xbyte rorw xbyte - ;--- ldy xbyte @@ -1255,46 +1251,15 @@ CopyMask ldx ybit beq MaskOK00 MakeMask00 - lsr mask1 - ror mask2 - lsr mask1+1 - ror mask2+1 - lsr mask1+2 - ror mask2+2 - lsr mask1+3 - ror mask2+3 - lsr mask1+4 - ror mask2+4 - lsr mask1+5 - ror mask2+5 - lsr mask1+6 - ror mask2+6 - lsr mask1+7 - ror mask2+7 - sec - ror char1 - ror char2 - sec - ror char1+1 - ror char2+1 - sec - ror char1+2 - ror char2+2 - sec - ror char1+3 - ror char2+3 - sec - ror char1+4 - ror char2+4 - sec - ror char1+5 - ror char2+5 - sec - ror char1+6 - ror char2+6 - sec - ror char1+7 - ror char2+7 + .rept 8 + lsr mask1+# + ror mask2+# + .endr + .rept 8 + sec + ror char1+# + ror char2+# + .endr dex bne MakeMask00 MaskOK00 @@ -1327,6 +1292,7 @@ CharLoopi EndPutChar rts .endp + ; ------------------------------------------ .proc PutChar4x4 ; puts 4x4 pixels char on the graphics screen @@ -1368,10 +1334,7 @@ CopyChar lda (fontind),y ; Y must be 0 !!!! bit nibbler4x4 bpl GetUpper4bits - rol - rol - rol - rol + :4 rol GetUpper4bits ora #$0f sta char1,x @@ -1396,7 +1359,6 @@ GetUpper4bits lsrw xbyte ; div 8 rorw xbyte rorw xbyte - ;--- ldy xbyte lda ydraw ; y = y - 3 because left lower. @@ -1412,26 +1374,15 @@ GetUpper4bits ldx ybit beq MaskOK01 MakeMask01 - lsr mask1 - ror mask2 - lsr mask1+1 - ror mask2+1 - lsr mask1+2 - ror mask2+2 - lsr mask1+3 - ror mask2+3 - sec - ror char1 - ror char2 - sec - ror char1+1 - ror char2+1 - sec - ror char1+2 - ror char2+2 - sec - ror char1+3 - ror char2+3 + .rept 4 + lsr mask1+# + ror mask2+# + .endr + .rept 4 + sec + ror char1+# + ror char2+# + .endr dex bne MakeMask01 MaskOK01 diff --git a/scorch.asm b/scorch.asm index 0f19242..93258bd 100644 --- a/scorch.asm +++ b/scorch.asm @@ -474,8 +474,8 @@ missed jsr DisplayOffensiveTextNr NextPlayerShoots - mva #1 Erase - jsr drawtanks + ;mva #1 Erase + ;jsr drawtanks ;before it shoots, the eXistenZ table must be ;updated accordingly to actual energy (was forgotten, sorry to ourselves) @@ -514,11 +514,9 @@ B0 DEY ;was setup of maximum energy for players - mva #0 Erase - jsr drawtanks + ;mva #0 Erase + ;jsr drawtanks - ;inc TankNr - ;lda TankNr inc:lda TankSequencePointer cmp NumberOfPlayers bne PlayersAgain @@ -1056,14 +1054,14 @@ rotateRight;older is lower bne MoveBarrelToNewPosition mva #$30 CharCode ; if angle goes through 0 we clear the barrel - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX jmp MoveBarrelToNewPosition rotateLeft dec angleTable,x bpl MoveBarrelToNewPosition mva #$2e CharCode - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX jmp MoveBarrelToNewPosition diff --git a/scorch.xex b/scorch.xex index 43221207f32c0ab57a4b4645c4aef3f405ffcefa..4e71576955ee9eb9e4192bbb2aa6c5f5895c5df8 100644 GIT binary patch delta 12682 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 diff --git a/weapons.asm b/weapons.asm index 57d9c23..278c945 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1129,7 +1129,7 @@ pressedLeft cmp #$ff ; if angle goes through 0 we clear the barrel bne NotThrough90DegreesLeft mva #$2e CharCode - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX NotThrough90DegreesLeft cmp #(255-91) jne BeforeFire @@ -1144,7 +1144,7 @@ pressedRight lda AngleTable,x bne NotThrough90DegreesRight mva #$30 CharCode ; if angle goes through 0 we clear the barrel - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX NotThrough90DegreesRight cmp #91 jne BeforeFire From a556e50e538e4fb43fc3c5f6c5f5025adbcacd6a Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 30 May 2022 07:12:10 -0400 Subject: [PATCH 19/23] seppuku fix --- grafproc.asm | 2 +- scorch.asm | 9 +++++++++ scorch.xex | Bin 37845 -> 37864 bytes variables.asm | 4 ++-- weapons.asm | 6 ++---- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index e5dc298..9e67029 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -272,7 +272,7 @@ EndOfDraw .endp ;-------------------------------------------------- -circle .proc ;fxxxing good circle drawing :) +.proc circle ;fxxxing good circle drawing :) ;-------------------------------------------------- ;Turbo Basic source ; R=30 diff --git a/scorch.asm b/scorch.asm index 93258bd..606f8dd 100644 --- a/scorch.asm +++ b/scorch.asm @@ -560,6 +560,15 @@ NoPlayerNoDeath lda #0 sta FallDown1 sta FallDown2 + sta ydraw+1 + ; get position of the tank + ldx TankNr + lda xtankstableL,x + sta xdraw + lda xtankstableH,x + sta xdraw+1 + lda yTanksTable,x + sta ydraw lda #1 ; Missile jsr ExplosionDirect jmp MainRoundLoop.continueMainRoundLoopAfterSeppuku diff --git a/scorch.xex b/scorch.xex index 4e71576955ee9eb9e4192bbb2aa6c5f5895c5df8..728c1007e5faafad44c265f7379112369fbdfe2f 100644 GIT binary patch delta 12696 zcmbVS3t$vQww+J@Kr$eN0l_pV?1oi{yAg(e0tOOjq8J24fe{E2AyIIjM1}4A8Ujhj znM_rH(Q(H}hcu>PBEH>?>wx-RFcS^0any)%QmX}Ow4v~ReVR&h7a^?p-3M|riHm?l-d)gIK|tG8LorSHkUk7({rg8C=BL{TZay zKa>PVw_48C*0>I53>8|n4nAuZcTXn6-LQhpxR+S{Ib_QU;>jWY1!T*;#Iu0C9M2^V zPKyEV_&VZ9wBhCax-ilCTt>v#%u)>Kh1XWgODa!-X1*o8=Lf2bsSJ_Q3I9R5V%X;y zVq!W> z;8s1xwa(>6Kg6Z3<6oG~J)J3V&)n5Bi*W7B0IjPyv4L>+EK(1V;N9STo=O)e*O?RSD9nV zNRNXkQDCXYy&ah7_%5)~_l;z6Hw<)RcKW1i=l7Z&1BNxRf1ulnLGmK>Ve$-Ou?-`2 zMPMw0SSo!;q>o5Q93@S9AI2bkz(z<;3Jmt0t#2wWgFqqsdT(~+CgNX5tofUmP5E<4 zo&kmh^|Wmwj>zs!#A1Sx&f7qCWY$$!{VNC~TtWQzGQxYw+I@B~Zu>Lwos*gfmKsmYPEY2}R;YKC_JyV0t}msujY>R`(n!5B zQ*5Qp1La}%@QvBp&cX^^VQ{|#(lk4D=TLd*jtuB;aHL0#b={1u|3Z>UgDlL@$ z%cRy6vi=4s;vMWfBlcOV<@;L04s3$XlTq3^jD@`#l(K)1(bGw-!Ru2DoZ(q-WbIrf zio5@Fd*-gpJufvqTiEbo;otxMcWJ0rY1KMjT3f$1EmMkn2QpeU*NUkFm!^}H__+F7 z1G*RIP=6C@{TeOD`?3p%g-mc*_@5`ocVdJ2J>rlg4F+&>=XTj!ooh~+QJ_}(Vuh3rB| z_*#P>2gnZ6d5UdFwuiP>*BZ9E{5#0;3KAUUND`g?3PvG2Jr#rsA%XG9UZzU~X8&&%7G=O?956RKrW%^F znnR^hsxG2Z8C4fkNu=r$Ds81q7ehjwIN@jH$JV-Z7h@)nvxEY;jl$%m73|f{Ugsqz zIZRm>+58OBT~xZ8s-;xQp=ueG7Ex8C(qgJ^rP7kV`C}!Zf_s7k^r?pyrzQJn3Duqh zi*1z6LkTM$Cku4el5LZVx^5JUe5NDC=-vyp%0+o|#3F~O<1(l#Z{}D*?i*3(2;>Lm)enjoM(FzY|vy`ul^V%K#Sq65a|}UKob^ zBdDKX+fumXXzP}91S9wj6mSFepCf@5N2KxwV7!Y@juxFZz}lT58t`L+?1YHmh+8no zF57dsY{5VfOLt^K#I^fcEuS6zfH46yK-( z*xxFHm{MbYOsUsmdUbjYMu2JQE5TN^e|W|2*4HobidOIb4&kPUacK*cfe_;|JLGMb zK)qA|UC)HQAjL7;???Hzh58X)Zx!GgJU(iRSOymazJbVmgYQQDPTUITU>j&>Vp%0a z4OZJ&gVi?GV71LPa+wrSBa2dGjl5Ngs*$%z(KWcCV9QzS(5arPh8nR*HP(p5s;NdS zQOz}CsTxrumZ_07qNqmIh+Ea@8jK+H_F{MO|G8Ihr~lVby`8QYNw`cv?ukbs{2{`9 zb3Z%zBE74*X&H8Gl|;%Mg{u6XM2dfEB5nJgI=-wmRMpeYs>CoR4E_rA^;9W>=6b#4 zbm-WcXV!IWWlDyQZCxf^$HF$4U)H*{`_v&+8>S9stbGI3@2RbOFtz3x>RmMi3c0DEfdN`Di`PN6l=VO zMk;;kI+S5`-E#Z&!WD3_B$(UwDG8b!%Wcx9q{}FlR32iMk%P`SJYgA&DJ)|N4e3ss z#2whEo+JTd5QAtq3y&1ZMF?5`^A5RKe*}kg0NzpDx2e)X*dl2tV`&u_&tb4uu}Cad z-VjR|!=V&LWu-8xVH6M?uk5O07mC-QKwt&au*x*I2y?2*Ef#AUL8dOCmKgOR8f%mu zf+q*R51c2NPuq5o?anMv6&l1|J-_Nai1wyXI$%xTht^b%3A)+(PJq zn3*LS_I?tclFpFQ-R@yP1-W z!Pv@p3j1q_ry;$RYhN5G!A)>6cvH^+iht?=D#g?6cxr`Zj3Qy`?VfCcz(K#u?Ns?m4I`$9A6<)RQnqI+~ zDLZIlQajn5iyc$_s2WE#^U;3vXdG4hQQU5kfCLO!>$ex$aRgoMN9rDA$eRoWf1K&H zhgneLnmTv5usJ92lxF6AIe`W|rZ0jg7avRyB%twBP9O@8wwypT9%pg_qwrX=C~z|# z!xr%$-qq{qMKec_kIGTu=rIbQ>MAZc5r$sa$?nMXtDIYhnSbW4kY_7|1VbB=JF%tX z;Pg7)LO=fQ9K9>zQn6rUUndsANV3qMEqTyG;tJ3;oHhA^# zBxnKk0EJwad05IYrqII#2L&z|oD?|va8!VD32j(Tt?>VF`!FYL5$;+v6EgQCQHXbW7>#oi(QS<6pj_LdL9@+gw2m(i zZ>*yZs&(xzr~Xl!r4dvcqIZQ0V&=CjR>64$?YV)fNfe;rUZXk!FTsIz6*z;{Bs8M5 z$Z&(knjixshzgn^lbYoEGAl_qOtb_{Rf}Vo2&~JN#d`Q1g8)UpVp&ki{0L_tEktC} zi7-cav9CR>4;{R|u0lx_%k_&Q298SK?6|SNg$Di#Tge_l9kC$5WIb;Z)*6U`1cK&a zq7UV14uNgx-W7(z8EXE&4Wr(Gt;@&W9g-*CP%P1CJx>tAnmr~>%X0mlnV?Pg4X)TrVDDGi)^ou28Y5WR0-cI)~r&SlJ zWr%G@my9rfX}fbDGcQ44%+=EBB8^bY?s_g z)rIW2kP4RmA)T|+aL`f}%1N@SchUU$6fqC9p3mzs&mx+?fQ3E$WB1sA?(Ri*_oBOX zH0vL&zCyHHf{}Ox$6D2SG{1>31!bh)trA@v#2Hmb#_^(>PY zzZ@=`_G?vG61rs;Qx+0{f#p`lw1_b+W=u;M(^3^Z&2TCBua>A5h91b!gMbE5zUs36 z7d}Ws77a$1S7uSZ?p}q3gaW(Oe)3GLXN!Qq6B|@namX8A4j*$pq_D*Uwoep`17eu zSwNrfMW5Hv*IK!M0<&_c(Vxn!9Gdh`hIK=i{u%5!gYrJGoWP7cLmpQhL8~N9kLa0C*%aix{yE+)%wN&7kwTxr?6-K59 zD9{`;_$gK(;oLcag%e-x6$}{cnA0~JaD=+!uCRKpaU=RcXRj^AzbnQ9+-qRWMCL0p zb|Q-ksvDhRNm(hEoCSibJ0Q(Do7P6KWr#%HKZWrXesc4G0mi?|QN27d^&?q&BJz zv!$gngES-{%iVOa5Jjt|KNX^Gr7OIr!9tq+h0>o$!$8vXdZF}Z(lCfLy-_F)Ar04& zrnd^E+eyP<(sZm)N_0JtGb1{l#KmoiC$74jQO4P>mYjLW!b8LqlaeakYSIgI@Wdt{ z_bygIHK-m%ac4I1AFbfpSM-*2zOXA}qyeeQBq=@>Glfkd=gF6L=@Gle~6SpQ;c4opn09h;QgvMS%y(^Sb?KMX^ z$5xkHzO%~CyeEOK&MOidy-|%m2=Qv7cJ|blR2!@YsTQlAqEZj#tq-W(>}AKv6korF zQ*`%BwC5Di4c&D2$JEr*?Q-6ILqdjK?V)X_sn0B(rs^rzp}Qv=yYV~1HF)tzp=TxR zO%K1;tb}#I>f(`sPY6!YBeUw2dYo3hQhN^r2L~MOp_Y+Y3=IB153mOF=z8d70|3q_ zhxCM?-Be3~IOUakk1!B2MnhZ%6x7p5pCq*PP+zPKY`PL4WQa$W5o@juxMUIhwv|dV zGmmL74}IJ|TFkkJHob)FeIxc+4k7X@)6H6UF^KuFXp(7<*g| zOKvcpcD=cT8*!QjBWmCEPOOSet&B^>+SIzdGi_Z1Q)1gryQ1&8QMj^Z%{IWkkZp5k zSE05YWF_L>EzoX9nOff;($~mZouNuH>^Tkgd?=Tjnp?|4)zmZ;twNi@Yru90#_mo{ z(>KIdN)cWwzoLDINbQ*8f?O6l_(%F%%l3bT97*y_@aR;E@Ov^Q_)gVVl%KX*KN})) z12+e62}B2zaac`(9b~~C9tfmr2hcHSY}NZfgxk_Q6VpQddcLOW*EA5T`wCxE2nl9K zbs)?mM*3O^!$5`f8m1M9b;P1!>xxAqM6Wj)&cZO(yi1t63IIGqiPx}$?S3^iEm;UA zG_i;0gex>_yMI()Oit9Op zD586x|7`B=Z)v&Z6ZKo#b~aZVt(w+I-%|Cg-WtqWXQ_HlZ$+`zIqEexeM_A_l;!MR zBU_R9GgmMT_A&h|%vA6AEsgLRo4$1|Tsk-&fuges)#U2^7PtSD>(Qm7Z$DKP7iZ0N ziY~>FTP>o1r-z>|xEq8042NvFGPB)@n9A5*Emq4;Db6idOa0Iv*m`zql)FAynk4jh z`(vu40dD^jRZ={wFDJOw0dCaz;@x6(LxQ`}Y3t&o+udq{8zbh&xy2&Ikl)V@&$_=G zo;Cj;Jqd1IuBx^KxAtGi+Eq?+H%xM?w=pgg!KKlOjMsR^!-n4KWY%{I`r@k180rQG zD-d}RlFjWf_e^&8Omg$xuB!VuVY*v6Bi-g!3Z;o|BwuYzyvc5Lx?7s!<~rBl#fomA zn#rgh|2Zo2zo1ggqKxVcc(LS&lFdkkpW}E$){Y%{9y@a8gYq6!dY%)D_>eb8@J)nOm`U>GpY$l_Al=@m?U7bJ9`f6fi&cT`G)~jZ? zl@rMNy2Kh`{|q-P0$212iUPUWGZG(vunc-5O`h3_R?Ep4?Q7i7W$apq!f~sQ4XX^7 z`fzD1zKW5?5x54wBFf00*I?gh0;)k_yShRzR|tP}hC8J{x`bxHXXRnApX~%k@D(3v zN-vTIrQ`V4lXy({!C`L%4g#P8w*57CeX;1&@A_(QlsBQ#xqE0jP8NKv!Mdkh-W~BO zJPPFSppSWB#2Us|At~1@f;1B!7D?06k@h$blR87|n_hohEY}ikU9#SK@bO_{x$-+k zf{IbPGQE$v`id)U#qg*mh^M~nvad*-im@NMg#LjtVV3s+a3oxE#-hW{7|W**rqU2s zzuZSAF^A{RG{tWwup=CG;>EK$b@irULW zSuSoD#X3Idnr**v{4dta_2P4~BG$?>`qrW6b0Db|>sYS{^pfSsy2$!S1+HDOi`efF zoa?P}L+*aDK~{4Qh$`rkBed(}r=jX+aCSZ`y5!%Bg#Yt;fLs6(fSdqTGfJaovC6L8 z-Pr#m*DaRvpRBjZyW3r8yW0t}5}+|L8fWfKoDbExyToGNoNtqN;&?8ScePgwV)4y0 zi6yRQFoK>Ql#G_%c{g$y1CWL=qkO=4(@fdz>Mx#XDB zF$|%ag%w){vZBNwR=>H9<XK9@$9@RPQxq`z}S8zb9mqUmw%puIcb$aE)Nbe$lihOIUJug!AMY_A0^q|W@%D!%C z4t=MSWZeSZjOIc!(KEIQX!*=1npyrl`2rdUpai1*#je*C50mC1Z5Sfp=3;FS3hr+b zB;^knKua(Z zgg?06Ts;cKMIFiDOt-FouD+gqL-jsVy9kWMVk=&mU82E~4SF*m?q$tgVm)lAgeCC% zF@tsPh1(ppp@S90TC~o~L3?4R^`Q^GdW(u}AE7iS7qxvz98JMLUOphc=J^*R8l`n? z7JCD4_$E}YV+B~}UR?-{(`Sg17SPCvG&&j1S*cgK^lW!nfRHfZ+U8|qD8aqzI&9kh z{4Y1?tXL-(w;0QtV;&qWJpL$-pE4XjqFk07Eh%)4xTb7P`2U`={p;y2&t_Uz;xBwcEJOG7Cq+@L z+OJTgbhQDEWl}L68MoP4#!r1zZ%iMA270N*)U%1o5Y&4G$XASf-C?Z!FUX z!vS~21b(6`sN*&-i`&ffRI0St+DoK;toq3h`E8gH3*mn$mN`s9hj?@!Do}R0T-*-w z9Z}oI?id^XZ4w`X14y$dz#-Co2Irx`Xz-0m=S^y124IlCPU zca@x1Dq1eFbw%&fwd@y|k}=!hy6kdV;Go&tX@Qew@1Ooq6L&@ zSJ8qRn*9_l*hy^#yJ&$IkKMH3IXv97pcap(X~FY&JVOii;NhVKG9J&;f;v2YPYd=U z7NY83@ky_8u{PSXOQ0Sv4yUuV2B^B6PTxh5guttVPWR%qyiZXbVkexn5AAA(JIIRc z8E*AXZ;}eNUM9~P43_ryjt@jQ=){xQin;YLpPh>>h6j}ecFGMyNi{o`Qe+` zkgRM@i_7PP}nbxb*@XdG)m;L#ij|;zymU9w7K29R(4O)eQ&J zbCVkh5<$<9zz^Zd8=b*_vTwBQ+?>ahi=wNpq9KEn|93@jb`w6Ap5Z@6J~&2vBW+E` z$oXRgpQQdubd`~L^XB0ru)G*4)y+S>$p)(LbYy%VGAkOma?2keXuyC^rDJ{HG^Dz% zkAJ=iA`8mROlBj~)+}qy8eqobc_(UxS!1iin zkS>kfbWE^ra0XUkk&rgBD-j~nPHZMd%p}404L7Lp2-SM*O3dYmBpu=ES$|)@n9TB) zn9Lgd*?DkL{*WQUm&0$kd2-sSaw0eW>F}}7&KXBfn6dVe67PXm-ulNsBZp19Yt<%l z@MuTem|6Ga?;!vE?iT|_Ow3+gURnM0-i8A&z5L#Jb6f&9b@u!Re*0v}Gq1FMe7^tq ziBo3Gn!9d`^FQD2`eDGZiPIk_Z~UK*MBBsO`L UgR@E}Mw&;G83&&%U)t|~0m>`0&j0`b delta 12459 zcmbVS3w#ts(%;SI4TR;rD#!qWhG#?`3koFiN??cz$Rl^)s)-UcK~W^0hDkyO1Iff} zraO?8#Sod0!Awl>IL&>xoOdUfjf5MYze5B;O-$6p^}+Eb-@j)!A;78McRY5ctE#K3 zs;jH3tEXj8(8qg%YSv9MTi$qjQiIv?@m#LYYHb|RPjkB-=5Cl@_C@(T_3Z*vP@y?U ziu#CiKcJc<(?{Bbpy-Rzgdi?;E?0XucgJkiB<6G9&sWXTJA~V|7DRZu=5jwgT0N08 zc!G&$SCFECcD!6#5g@v>m=Wciv+(tC?XA=hQyn0UC;ZVk)wI{$ zQQC5HgnqU>M2$DOF%rfAtHnfp*u9##Q;7R`xl{iUp1`lc8%0@tNxztY_X1s<8zCdN7oCXqm*8 z`4n+KMI71$(r6(?Rxq7F)EglsH~3M0-JFU7&mBa}-|JaTbPLbTfjueph#AtMAZEkf z+`Z3oZ_ej>KgJDvoPTXLmlrQ^TNbxZAlwJ50IkSBv6^smmujyO-~HhI4VAv7+|Kyj z`DjdZalVwQSBV~4k-y#TCQ81zr*poPJt8A{hiKnYpM~4?q=95}`q|Rvd?mkeBGG?l zL{~VKhd@Yoia?~@q%2%D*&a*ZO^PhG)W|&jXZ8*=YWUp><9*UxpcF73!SIs;bs+RL zEb}<=g?M1EfeqH5c;-ZYiB&VVKb}848>vxfB+#dG?W1lbCJyyhU1r#T*EYiNUUSHzgU*bMp;-0*%0k(Wt|JvH*Fy>8qhDy_jG>%lNW978zw!wGk-vTkzr3Oo! zOYM+8qf#T&i&AdCyleUZ>jPA^x|6U@+^JOUa3{-$rjL8XHCGcdq_=~#tPJUIL0Wc( z^!FewCqw#2khUp9dKa2W!5?7>nXzCRtmn&3Tj9+uCqwnKV2wrRlM-LSVB<--sjNmd zai*PRKO%sHa=-t|5x+ft_aE!>Gpb&ZSKc`~X*`LEimWU*fvWdTqYr1-ZlIK zUopma7>v(2%1z7=VQ`vDvxXdGrqAYs<5qZ2@Mpv)QRQ8z;)g?;I-J>^eyF z5N(L-pj^|easJj&w2Jj~o5T32%_(oFG6HlN31CPZ*@jE?}2$Vs45^0uOzADx~P-MNq!R5(E z?y?O>Xdb9#1V#7u_V$HV*5%~tVOnmG{=V9?+*UXqQs>FxGdLmO!Cw77Q2v=ai0kRve z2MxUf>SWf(590PGUWqhHemuOZ+rF}kh1@k_e&QmU&Qt9>DlMdHPmIIuUdBS-VpZtP z_}sb5kO<8F-z=aY$)#gy?Y07Ldz~6}zenbAN z^noUjb1en%84CB7c=o!8y)K9zS`?Jf!Spjpv#4}8)t;nMEY+T(QXJLRQE4{So~F{A zF8whRFu@96FGF?zqZ? z6V9g?G((vE;7cj@sQn=uBtB>OSTE@#7Q8+reB(k@xE^H*psvS+`7uhC^iQH>OFB_< zr1y!kN&0|Pe@K)p_s0Ocj|1#(0@&S#xYo+;=b84{EtvM&M_Btok&%Acsy`IS)@ZZd z-|qPsI|%xFj+0gsSnzXr8(^sc7{dK=BU-%}!$pVLGMflS@U*dQppAH%h_}8dM12=9 zK8ueI6PfNL2u!Dh8*V8-q? z=5OFtt1V12 zVF+%@rhUYSo*gP!y}+bH>v%y>3-Q9 zT=ueskW?2fO;$!py!PCYzJ( zqgVyP)7lxFr;eN@N6rxKEWwTy0*Kdy>HF(_4uq9!^FSj5^k;+q!xoZ3!^;xq-zcOm z@xG*6c=r--6&|CPM$hs_`Qp62(Rg8rHx!RQFY$)qacYTo7#?$$ddK1sx|Dx+acAll z#!@%_r^PIHV-!GD?X)Py)p1a6Hc9Y=e}L#`vON-&|oY# zv4*GRoG}Q#W9f=*b6qa4hfe*77v3r@} zOb%6GaR^-_snml?J*hgGDP(EyNg-Yp+pPByY}RjKW)O0)+h$Vk&rka-_8PNo{CetN zJx4OB-deq$dZJ#CBB(yV=!&eu!auf51Lp|Z-h*mADL^-tnY9SK`1(}jBdlt-pb@Hv z_!~WGL=a?P1ff0)WHS2rSU4Oc7)LVBy z7|OlR54NLwYXFKoXW##A7_A3|asIv3FO%1zk2Xa7HNgZX8D{6iD*rxIW-|Q8+e0_k z7fdm7_XHz%UqImi(mW%lpHJ0T?1Rv19Q#>HrTeM0jADyrL0!xdH%0Mu{32StkQRPN ztpn^^TNTl%CN(+tGKXU!oOwDP9wG7%(qgK?Mem{7A}Za>9PU0^9-h9K77ey(_s}%3 zUrM!mX&MH(pKABfGz_(jj=zVFzn6}`k2dHZYM_})H4xaT2JAG(Wjg!mlub>tw=JZ5 zJ=YE={MX~%X^eN5G2RTuWhPd{-L&m4;{-CBw#_gO9&>2hOm_CLYj@E$g-GZygRPbs zRGW#XfNs{Few(wX*s)TBafaHoSv1W~ah!qG)2126nK+s@otA#PRWy$dRXDI*1vhrZeox2yCS9f2k z331dth{E*l!EAcm!`R%oM=_JT$H1%HF|@&Y#0FGqvNSv}aknxw=4~vz%1&F8r4bB) zDY`8%RpSt@(W73vCD0=}&||#6N4+#M&_fs<=rVz=>1!$?O^1a zL|-z{*L%5VF!OSl(KC#BIV|ZJ1tYhVpK(9L${DPX#A;3kDfNtU-q77#8hf zBH?%NMhl-g#<$n1?}<>{_W)&QfsJ_$JHErZy4RRd=aSPl-a zPqzVyOwI{x>NY_vE;C`U_nkGv0msHT=qj)0cCJG|*sMAU|E?Mf@G=u)CbGnku@hOs zUtH@Hb8>Hj-^H8Ji=R~aW*X)*&2*T&CNzvEDh-r!Sa_b z6PQNoAh4-qq7I`%xYu#LqZ%a~B*ST6Q|UdTWT&-I=`hg_4EHW+d=JG? z@J8_v1EDs~!Uz(#6RV_GQDXdd)!Qath`rV9+~=qS=Hm=;pXXSH_(ttMhc;CAhWeta zZzq~8E#`zDuDU;hzr+yk`_=63XB_TH9LSpcw#N`Hh9F~ZMrl8W@Y7a%qx4=!VuQqt0(f%kc{FD|Rqn-l-Oc4Fx?)*C3 zq0JQZ&^p|pZ4_z%ls{fN?6L7#Wx>u|o06M4NUTxBRFhbXK48zimQvwl@SD2e8yVa) zQ^2s?k`%=mkLd?wjcCxBJL!y`(7U+I66zdPoM$~}Q=F-5WXJveSA9nH{@QV>M`%Z> zbd2&L4{D#Xm#rsbYI;;1rKP)Q`%$2)KBc8z+WskJ65J-{qWC7ZoQ%=K)q~LSE>S$m z4%`zR+A-RAg4S516I44YzkmNU^QZV7EZ@3ph;Zy7_?B_rTJjJ)0Uj3R>yKLbbmJ%{ zJOrn)@WMm-ClJWj>&P)`9RkBcsJ}eO8Z31?M!O9FIHMfU?uUL#^%#hmS77uA03mxA z)L=kCJAo2N@5W=aCc+Ljt-T?npGSfj^Q-r|GW+~952**4E8GQFFvjhog)NTJx?R}E zA7U?F94#t+vF!fy+(rRj3^zD8Q-CAaZ4_>pDTtJwNBj;BFDFdviuy8LGI3HiiwZtw}}3oie-Y)WCo zq=Lvvn6q-ZY?i&XPfSGP3HinqBZRB(gqgGN_4_gR)x)?u#vIkhb-H_#1J}UDT98hn z@^p%-(eT|^`0i^d+-)i4>})zI7I#U0$1gL%^?ebglVT0$|544tYr*HVD`1q5JT4UH z`Xl@h&zrf`pQH2z)$p@7I2kYA2~T!bl2EQV0oVM+_j`BV0O(!=M2J6-s1K%NtP? zfrh;`0*x-5y_Mmt3}Z{Zf~m*{z#S|LD+i2uPxfo+@I(pjK;viQdel)K?)e9s(!&{8 zQW4*sl>fSNxNwS&|ALP8Mizy%Mz){A>7Z?|=c|;`FKM3jbL~so_*IHNT>Cyn`jTp2 z8Lj@T^%d2cj8-UXHPJFl-Ivr^gIhC4nVC&M)TyhO`ns5Y5nyU`{F06;Gk5j0_UYTN z|A2vmY&YC!s>6BES%*_^arLEA&rx}E(s1)pSxvg>wxflSk*I8|vznYZB$=Cv#bU)N zohem{rL&*}wvvU3_40Q~Lxpptp3{%;=-Ciu!&X?lu?Lw(oTy?Ru)@g6$ zq}yHE#nQ+~TiTgYF-tY2oh?PGe6AF!^0f8s7fTHZ3L7t$>i6|{)h#YlH zxLE#xdewNwW26gd_9z$n-s-|B9R-F#E^x2`ks2(GbQM|JN4eT>aq*wZyMD(Bqh0DL zX}C+xkVd#rC>`m7c%xj}XqR-Wi~INyyx7nURAU*{bH7F9`xRcQMO1K;0$!}@q29?z zh2P?MNYURv^eR@~*hiJ!xRu!@W+~-jwnMeDVnvp88xuI%rOsh|yEM^mb3qj?+SR3t zF=ls#v{u>}L4`3W4frXkxQ_qLPRQ*3;wE+Dv!uRp2-8M&jtSpCkYOMp0CWHr_;s6m zx~#7rAgnfYjp(7aK z`apZDVzic`rEX*txb%!uXLRvqNB^E+@C3u8#`z-EjSf7~cp^@#fQ;H61fhAwk2t&k zN5p|bk6q!?N*Q2v7XX3cO4=0`NV`~(+)Sk)`JD$A&cBGnI;Ux~SgCAkdQnvQDt2YW zfSa3g0DQ4&lc*}$2Ss+*b}+Zdrd=dR1Q|hAQ?95e*-fHY!5^2GIYyZK%YSg(*bfB3 zAW)Q$ijc|>6-i0DyvK2mu<;3-Qk7CIRw-J_>!Jom(ZPB@;S>_G6`Day(#BH=5a z07wRi0OSOym{FQ_t4)zp5DXQP;u1IUho7)3rA;#0E?gdNVl+XF#+kAW0irl%yO_=U zK(h_;IZN5zRD741J$5XyMz))AjA_UHPSU;iqdL(Gg#`<$|Ll-=x3Wo}8Mrc;qGVz8 zY$P2<6t8`-pKu9B4;*fk9Gq=%yJBKBvDXN{G7a6EU&b}X4rRx|av196gS!x~mOr5| zQ6Pu{vDvl2Rre4k@g=bcS3%-#xSyN7l!fB2QYO9{T4qyT#TC`7iu+($%_Qz(TJuZL ze)dECgyytEyX{I@Yq(gZylQW9w+7o%(1U+H4OG{h`5ZO?QeMJt5Q3vL_JdHGf(R;w zQ3z~Ds|hXRHJCQ}$y!0ij1h+V4W0&r-Q5^WVEnpsK&z93pYCc7a`3}zg(`wlC`zXd z)}P^9JE`;viy&nbk%(RChE*QM2QWWktJT}E)#@!aZ70nPdjXWCRrv0z{S~UcLQD6N zc62GD?0b`g{x4^S+A_hL(Olj~jN)r=v}!CT_OX(9^kp<~91@8Bp~JZSt0D)p^c!%P zJ(#Wc#kKfb1a;FWc3b%V02hK!;y%wz5+uS*^gy5KonIo>0`oIJ+19_w?PSPS=| zCu z!k2PbO}+;fevWew662qqY-X2P^?FNp&>pyJWwR5%#ho{QjrF)wQ?eT0B}H|tr}*fpKre3fFQ+%0S`DsH$&| zwgQWjAMljXF>uFfRBG(((j>g*tS!|6|9hFunalX1WIOwfwqW|$(=54-XYai&EiHvR zD7SVk3Jfq;jd877tK^iKoHd%8`i9#z7j4^4A7Xr7rfsDZT=C+Ksks#gPB-P}ud{(9 z4X$BOq;*kjFA6C)gF?*dG@WtJkmZf_g&)~L^?cs@6k;qZFd2i(|9)iHFzmYcB!Vr1 zvna9@uB4s^s3>`os95MprIns!+5YHo;gP2ic5)GRL?t&mOe&%C#7A-;3H;xkTfLHQ z$46}yIi8e1h`H!K{&`Up3#&^ginDsJ+FU7}4mtC@Gnc>ZX`?Zt0}b@j(y2R{Dw6vF zsubeexbontmGrxn)ORz)IQjt92SSpgNmi;yL7Jnftp1ZsOOxf+M@I`K_`+bG_}GF4 zm4ShcVFQDP*X9}{I%;!`!4T)JQs5W5g8Iz!tIj;n?6gU(w>RZT+t_s`AM{LsQP)XX zXcmub!<~{t$rHDLd~4{IQCmj^{@au-sqcwfl&z^RiCfFUYPTeGlp?X|D3x$>_<>== z#Vt5(cjDH=b4oKA?ix9-HnfssZw=dPSlJ^mBSTx?nr zl0vxtsY9FS^0CYDi7xGS7jD;r@E*h77x?YRtg^7nW~OpW?Uu1IE^F{;{E6u8X6D0) zs?W`g<<69QKQ-1ez`OuHQ{69h?>(?!(6uK-rvAP z9?L{FGt2yiStbaU35fikrQ7%Czc+mF=@;KvZCvtgG4|MaV*m$A&{xZ+EESB1%Y14>R-_T63D~*dUwJe%Isl?bjPke|MX~eB#CQMrK*v9g|e$skAbj0Yy z^*jIap=IPfYo4X0Z~XmeE`oE{ANhRFWO>{st2}Gdz&Dm{njB(@BxBwv%uDL=zpUsj AmH+?% diff --git a/variables.asm b/variables.asm index a90b4ec..4247ef3 100644 --- a/variables.asm +++ b/variables.asm @@ -128,11 +128,11 @@ xtankstableH .DS [MaxPlayers] ytankstable ;Y positions of tanks (lower left point) .DS [MaxPlayers] -LowResDistances ; coarse stank positions divided by 4 (to be in just one byte) +LowResDistances ; coarse tank positions divided by 4 (to be in just one byte) .DS [MaxPlayers] ;----------------------------------- Erase .DS 1 ; if 1 only mask of the character is printed - ; on the graphics screen. if 0 character is printed normally + ; on the graphics screen. if 0 character is printed normally ;----------------------------------- RangeLeft .DS 2 ;range of the soil to be fallen down diff --git a/weapons.asm b/weapons.asm index 278c945..abbee02 100644 --- a/weapons.asm +++ b/weapons.asm @@ -13,7 +13,7 @@ ldx TankNr lda ActiveWeapon,x .endp -ExplosionDirect .proc +.proc ExplosionDirect asl tax lda ExplosionRoutines+1,x @@ -657,9 +657,7 @@ DistanceCheckLoop ;multiply difference by 8 clc adc #1 - asl - asl - asl + :3 asl tay jsr DecreaseEnergyX From 7cd31450c7a55894050436cc51d0e534f6c86027 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 30 May 2022 14:17:46 +0200 Subject: [PATCH 20/23] Better ground hit handling and small bugfix But.... no effect in #66 :( --- grafproc.asm | 5 ++++- scorch.xex | Bin 37864 -> 37859 bytes weapons.asm | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 9e67029..d795ffd 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -251,7 +251,10 @@ CheckCollisionDraw bcc StopHitChecking mwa xdraw XHit - mwa ydraw YHit + lda (temp),y + sta YHit + mva #0 YHit+1 + ;mwa ydraw YHit mva #1 HitFlag StopHitChecking jmp ContinueDraw diff --git a/scorch.xex b/scorch.xex index 728c1007e5faafad44c265f7379112369fbdfe2f..bbee55879c7acf217d33603751e705632d26de80 100644 GIT binary patch delta 12118 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 delta 12101 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 Date: Mon, 30 May 2022 14:34:58 +0200 Subject: [PATCH 21/23] Hit one pixel over ground --- grafproc.asm | 2 ++ scorch.xex | Bin 37859 -> 37874 bytes weapons.asm | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index d795ffd..6144171 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -252,6 +252,8 @@ CheckCollisionDraw mwa xdraw XHit lda (temp),y + sec + sbc #1 sta YHit mva #0 YHit+1 ;mwa ydraw YHit diff --git a/scorch.xex b/scorch.xex index bbee55879c7acf217d33603751e705632d26de80..49c52f45463250f9c94af1cf8d0da7ebadf91977 100644 GIT binary patch delta 12118 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 delta 12045 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 a)Z%0*qj=a6NAbN;CM%hKWM664fd3D(u6KX{ diff --git a/weapons.asm b/weapons.asm index 83ec862..fa3bcbd 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1815,7 +1815,7 @@ NoUnPlot Hit mwa XHit xdraw - mva YHit ydraw ; one byte now + mwa YHit ydraw jsr unPlot EndOfFlight @@ -2163,7 +2163,7 @@ mrHit ; we have to make unPlot over the screen (to initialise it) ; before actual explosion mwa #0 xdraw - mva #screenheight-1 ydraw + mwa #screenheight-1 ydraw jsr unPlot.unPlotAfterX ldx MirvMissileCounter ldy #0 @@ -2178,6 +2178,8 @@ mrHit adc #>mountaintable sta temp+1 lda (temp),y + sec + sbc #1 sta ydraw sty ydraw+1 ;we know that y=0 jsr missile ; explode .... From f13d7ac80120f329d58632d3dfdbeca149eef0f2 Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 30 May 2022 08:36:30 -0400 Subject: [PATCH 22/23] death weapons fix --- constants.asm | 3 ++- scorch.asm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/constants.asm b/constants.asm index 138cfeb..859ceb6 100644 --- a/constants.asm +++ b/constants.asm @@ -888,7 +888,8 @@ NamesOfWeapons ;the comment is an index in the tables dta d"Contact Trigger " ; 62 dta d"White Flag " ; 63 weaponsOfDeath - dta 0,1,2,3,7,8,9,15,16,17,18,19,20,21,22,23,24,25,26,27 + dta 1,2,3,7,15,16,17,18,19,20,21,22,23,24,25,26,27 +weaponsOfDeathEnd joyToKeyTable ; .by 00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15 .by $ff,$ff,$ff,$ff,$ff,$ff,$ff,$07,$ff,$ff,$ff,$06,$ff,$0f,$0e,$ff diff --git a/scorch.asm b/scorch.asm index 606f8dd..16a75a3 100644 --- a/scorch.asm +++ b/scorch.asm @@ -645,7 +645,7 @@ NoPlayerNoDeath MetodOfDeath lda random and #%00011111 ; range 0-31 - cmp #20 ; we have 20 weapons in table (from 0 to 19) + cmp #(weaponsOfDeathEnd-weaponsOfDeath) ; we have 20 weapons in table (from 0 to 19) bcs MetodOfDeath tay lda weaponsOfDeath,y From eae8cb08d893823e3f393c1d91b7b223d9db1c16 Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 30 May 2022 09:04:09 -0400 Subject: [PATCH 23/23] build 142 --- README.md | 9 +++++++++ scorch.asm | 4 ++-- scorch.xex | Bin 37874 -> 37871 bytes 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fb7e927..2806055 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,15 @@ With the advent of fujinet (https://fujinet.online/) we are thinking about makin ## Changes: +###### Build 142 +2022-05-30 +Late build. The bugs we tried to squelch turned out to be more difficult than usual. Some progress has been made though even if it is not yet visible. +- 4x4 font rewritten by @Pecusx as a prep for Y standarization. It makes the messages to appear faster. This is a good change. +- https://github.com/pkali/scorch_src/issues/5 and #80 fixed (again) - no funkybomb traces staying on the screen +- https://github.com/pkali/scorch_src/issues/70 too strong Shooters fixed +- https://github.com/pkali/scorch_src/issues/63 - tank say goodbye when (mostly) visible +- several other small changes and improvements that will pay off in the following releases. + ###### Build 141 2022-05-22 Debug build. Thanks to all testers for finding numerous bugs. We tried to fix some of them and we have introduced some new for your enjoyment. diff --git a/scorch.asm b/scorch.asm index 16a75a3..d35a891 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"141" ; number of this build (3 bytes) + dta d"142" ; number of this build (3 bytes) .endm icl 'definitions.asm' @@ -124,7 +124,7 @@ START bne START jsr EnterPlayerNames - jsr RandomizeSequence0 + jsr RandomizeSequence ; for the round #1 shooting sequence is random MainGameLoop diff --git a/scorch.xex b/scorch.xex index 49c52f45463250f9c94af1cf8d0da7ebadf91977..a17276374e84f18de1544591fdd579a686dfaa29 100644 GIT binary patch delta 10972 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 AT>t<8 delta 10922 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