From ffdb2c70639b6ad5b6c3f5f574a0b29c343acbab Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Sat, 19 Aug 2023 14:53:01 +0200
Subject: [PATCH] Exit from AI aiming bug fixed

---
 ai.asm     |  25 +++++++++++++++++--------
 scorch.bin | Bin 32768 -> 32768 bytes
 scorch.xex | Bin 56613 -> 56624 bytes
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ai.asm b/ai.asm
index 08a75da..dd05a84 100644
--- a/ai.asm
+++ b/ai.asm
@@ -81,7 +81,7 @@ AIRoutines
 .proc Moron
     jsr RandomizeAngle
     sta NewAngle
-    mwa #80 RandBoundaryLow
+    mwa #180 RandBoundaryLow
     mwa #800 RandBoundaryHigh
     jsr RandomizeForce
     ; choose the best weapon
@@ -603,6 +603,8 @@ RepeatAim
 AimingRight
     ; make test Shoot (Flight)
     jsr SetStartAndFlight
+    bit escFlag
+    bmi EndOfAim
     lda HitFlag
     beq NoHitInFirstLoopR    ; impossible :)
     bmi GroundHitInFirstLoopR
@@ -646,6 +648,8 @@ EndOfFirstLoopR
 SecondLoopR
     ; make test Shoot (Flight)
     jsr SetStartAndFlight
+    bit escFlag
+    bmi EndOfAim
     lda HitFlag
     beq NoHitInSecondLoopR    ; impossible :)
     bmi GroundHitInSecondLoopR
@@ -698,6 +702,8 @@ AimSecondTry
 AimingLeft
     ; make test Shoot (Flight)
     jsr SetStartAndFlight
+    bit escFlag
+    bmi EndOfAim
     lda HitFlag
     beq NoHitInFirstLoopL    ; impossible :)
     bmi GroundHitInFirstLoopL
@@ -741,6 +747,8 @@ EndOfFirstLoopL
 SecondLoopL
     ; make test Shoot (Flight)
     jsr SetStartAndFlight
+    bit escFlag
+    bmi EndOfAim
     lda HitFlag
     beq NoHitInSecondLoopL    ; impossible :)
     bmi GroundHitInSecondLoopL
@@ -795,8 +803,11 @@ SetStartAndFlight    ; set start point (virtual barrel end :) ) and make test fl
     and #%00000001 ; START KEY
     beq @speedup
     jsr MoveBarrelToNewPosition
+    bit escFlag
+    bmi exit
 @speedup
     jsr Flight
+exit
     ldx TankNr
     rts
 .endp
@@ -1077,16 +1088,14 @@ loop
 ; result in A
 ;----------------------------------------------
     ldy TargetTankNr
-    lda LowResDistances,x
-    cmp LowResDistances,y
-@    bcs YisLower
     sec
-    lda LowResDistances,y
-    sbc LowResDistances,x
-    rts
-YisLower
     lda LowResDistances,x
     sbc LowResDistances,y
+    bcs YisLower
+XisLower
+    eor #$ff
+    adc #1
+YisLower
     rts
 .endp
 
diff --git a/scorch.bin b/scorch.bin
index e8df9f64b6ebd45e68a4b08c2c271ddf33e617ff..1d910e07a1e83ee488652c7ed2431b381f3939d1 100644
GIT binary patch
delta 534
zcmZo@U}|V!+Mq7a_;<60{Bm)|?9CU<l35vRHk;VEGBW<zTxEMig3)`jeV8a?=H}3_
zos5iICi6!~FuG0Fh-hGRnY=Q>7f61O*bF3BN9r?1O}-r|#kF&eg3COMrHft~P2LzO
zHCZx>UoUFjNwy8FD;ehY@Fpm5%v4C2xiUo|aaPYUUWJ`=7O*I|&0D%?ZXWN_#dAw|
z6{0qWMTs(Uvd>XypQCcsplotMw7OJq>lL5e*%nK$yku>?a_q`V*47e;wCQB~7+J0f
zoX4&lEBPScvu^U0XdO1N#ydcbvXkXwxTJOhHM7r=Sb8NBsQDR^=Gj2aYJwhfK(1wN
zU9^Ge*y3YXd|pj1i&5oZR|pCOTF*RrevH2^_gs&?Tys4VB<FU|-8A<$5c19An|FI|
z!iv^HFE6jwf}ISKOA0J!Mtq3#ahfb0n;mX2cO^?}*;=mGCmARFJjuV|tAfGYV`UfK
zB`nJV2`T~wwV;A4*$@h4krnP0=JkR|!Ie+G8!IjYGD!er5~c#_$pUebjM9^};^cWP
z_HN<*xrKKFi|7AL#?A3@)3`Tftz%~FnY=!C3P;V#)=x`+NY+mF&XZ)HuyXEviJeO~
JXXi~71ORDr=I{Uj

delta 553
zcmZo@U}|V!+Mq7a_;Ry`{Bm)|gv}Ssl35uGH=EeFGBSSLTxEMig3)2JeV8a?+~&}*
zos5hDlldbg7>y=tL^LoOOkNq`3nafsYzC66BlQ{GCf|;f;#xXK!C;=n(nT+gCU1<C
znk*T`uje-JB-;kol?-!xcoP&jW-27iT$!SfIIHIvufozf3s@A4<}F<`H;;Ge;<+Wf
z3T~UjqC^>4|Ibz^pEH>+Mpj{isKnAMnXD%lZ18Wr;*&euV(FEatgTm$U0KQ6S^`q!
zA0x{(f%DjvV<jI1d{#}q6RpDp)~YVH7pUR?Y_Rs$E6<QLs0rH40lAU2b<qZ<V~dYn
z@p&}4Ek>1vSs^HJ^5z(S-S2Ze_I{h=k-$2)eD1ut$ARz{5FVeKu%fll%gd{^U?+p*
zk^;+_5g+1w^d{@aW{1nnUCGi~wwCMlNyZ63Px5d0svtA>SlNYl3CprTf{H*vEvVp1
zHiSZ1WQBW$dA%S~aOIOf#)_MPOcDT@gsFfXECm$j;^Km6WdPcw05p|-vR$0K*xoI?
zH@EO^;IP=ah4=3k-UJ~3=N8`0S#i_2Ctt|q-jubDnXz&5`rIiTg)3V>E&U-`G}${(
TlD&21-1!naXKl{Tn<@wZ2@v)w

diff --git a/scorch.xex b/scorch.xex
index 79f83000c047cfb67576689c2df25256a72571b1..2ee3451134754c8339a03f1fd0a966498035a0c7 100644
GIT binary patch
delta 590
zcmZ3wi+KYOrKd1H-JFqPA;GA*d11{1amMMJo2I0)GOpPCVx}u2qsC^v+1Dk+%Ud_D
zT;95AWlHPyl?<&nR?4+DUJzM1b+gQtos3djdaHz1GW1pptyJi(5n9RITPvinHDH0f
zPtoM}TN@Y)CKqh;1(N%=Z3dD>+x6w!=AC5Qz`BxQZVzvQg40Ze?wKnY6nbX$9OG4Z
zI!B>k@`3I8jBS%YY?l&#I%ffkLeadXi{|F>E?qpggjb<$v+NF0MoyzS3Y+GrTs0`0
zd~&C($_7!1rB^apPcGOH+<L`l#%znFS6;HVUO9GUC2MO5M4{>AlAUUdHz&{Dslx`=
zc?YOdU1}##z0n-7?$#^Mkkrqf%(hESuy~He(nUa{7HwcUw)of;AJNISyVN+?6$Ar;
zb~8^--{r4sKG$Qf*<6nV*SXv0-kZxlkA0pM5VFrpSkYSO<>l2{u#-V@Nr9zb#D_Sa
zyvdJuWedm5UCGi~wwCMCNyZ63Px5d0st_|dakq$M%-myTE7=e-vLG3t*oDalcZ-2#
z1>Wry=H)_DF?sK9DR+0EI*2S6RGtB7wgS)uh)lu)*}c_atp$4<!&(bFHWqyNJp&Z_
zYmV_+?A^lqa|`bV7SI2gjGNW>9OGl$G5Ou8DH<zQwtiarLvrQHx!)!B9+&u_c#`pg
f)ZY0L61C?gB=($^sNA!1?tF=z7dNjuT`dRzv`G<%

delta 553
zcmZ9EOK1~O6ozw~2U-|yQ`1fcV{R3q1huG}h^_=7gw)oZNC~ru)E5#%C}>hp;chg6
z!0p1=xzn0B>RlA3&ZKdYjJTSTc3~nTRadTxg4AG<nuXw`2#Or|;e6-&k6g7&Rl7VH
z2OpKo@em6<%HzzZA&^z>&0KN<qI@o#1;D2qon2#xuA@cz485Rnv_@^{J>7@yHuuo`
z%3f6i+<5M`o7!?|H-)*3o7!{JZde|l_eW#+Tlo%{z=@?%D_<=sRwgSW{-oG&$xdn`
zS%!ya3h+UJ+F<rk)?i>ufD`z2WdtN~yTT2$gn0*yiBgf=V5AaBF)*q4UV4BtD8QnC
zPiY4S$B-F)I2)48FHU3{CUv4z_mt5B;2kb$hkLd?AIy8UorWi`TaBQ=O6C=-vHnlP
z$H_a_O(WIri%tq5sc3yH$~{KOFry3}tp*%+*nb|Ut7AtFkg&d=g!yBnL{`YAH32ao
zZW8`Ex*3T?P(rhLpCnG6yU>nBFXFB0wbNlj9cXHy_iY2@JB{7)4;UuKRC9xWdbJCO
zEg1X*sq3%k>oP3XIB!?)+t3G?-v6(y8V63`uQjiguDX9vSD6ngBku@lD)UQacx&&d
zjB>ng>;en8vodptQ1o5;=@lv2V)bRVJ=_3IPM>4h={GD}UuADCQZmPChEiTl_x}cX
CIsvZ$