From 99be22ac3b67513f11f09b84be639ef5808195e0 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Fri, 25 Aug 2023 14:56:24 +0200
Subject: [PATCH] Long Shlong is even more beautiful :)

And other AI optimizations.
---
 ai.asm     |  41 ++++++++++++++++++-----------------------
 scorch.asm |   2 +-
 scorch.bin | Bin 32768 -> 32768 bytes
 scorch.xex | Bin 56579 -> 56563 bytes
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ai.asm b/ai.asm
index e88a2b0..5a22671 100644
--- a/ai.asm
+++ b/ai.asm
@@ -359,13 +359,8 @@ NotNegativeEnergy
     adw Force #100 RandBoundaryHigh
     jsr RandomizeForce
     ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
-    jsr GetDistance
-    cmp #6 ; 24/4
-    bcs HighForce
-    lda #ind_Baby_Missile
-    sta ActiveWeapon,x
-HighForce
-    rts
+    jmp GetDistance
+    ;rts
 .endp
 ;----------------------------------------------
 .proc Spoiler
@@ -391,13 +386,8 @@ NotNegativeEnergy
     adw Force #50 RandBoundaryHigh
     jsr RandomizeForce
     ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
-    jsr GetDistance
-    cmp #6    ; 24/4
-    bcs HighForce
-    lda #ind_Baby_Missile
-    sta ActiveWeapon,x
-HighForce
-    rts
+    jmp GetDistance
+    ;rts
 .endp
 ;----------------------------------------------
 .proc Cyborg
@@ -419,14 +409,9 @@ HighForce
     sta ForceTableL,x
     lda Force+1
     sta ForceTableH,x
-    ; if target distance lower than 32 - set weapon to Baby Missile (for security :)
-    jsr GetDistance
-    cmp #8    ;32/4
-    bcs HighForce
-    lda #ind_Baby_Missile
-    sta ActiveWeapon,x
-HighForce
-    rts
+    ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
+    jmp GetDistance
+    ;rts
 .endp
 
 ;----------------------------------------------
@@ -1079,7 +1064,7 @@ loop
 ; This procedure must be called immediately after targeting.
 ; xdraw value should remain unchanged from the end of the Flight procedure.
 ;
-; result in A
+; if target distance lower than 24 - set weapon to Baby Missile
 ;----------------------------------------------
     ;xdraw/4
     lda xdraw+1
@@ -1095,6 +1080,16 @@ YisLower
     eor #$ff
     adc #1
 XisLower
+    ;rts
+    cpx TargetTankNr    ; If tank is aiming at itself don't change weapon,
+    beq NoChangeToBM    ; he is the only one without a Long Shlong :)
+    ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
+    cmp #6    ; 24/4
+    bcs HighDistance
+    lda #ind_Baby_Missile
+    sta ActiveWeapon,x
+HighDistance
+NoChangeToBM
     rts
 .endp
 
diff --git a/scorch.asm b/scorch.asm
index 3c431e2..eb9f0b6 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -26,7 +26,7 @@
 
 ;---------------------------------------------------
 .macro build
-    dta d"1.36" ; number of this build (4 bytes)
+    dta d"1.37" ; number of this build (4 bytes)
 .endm
 
 .macro RMTSong
diff --git a/scorch.bin b/scorch.bin
index 7f891c18cdfe8c12c29a208a4eea93f74459f801..12b187f8ad57b1c4a8af7c1351de82552bf61782 100644
GIT binary patch
delta 522
zcmZo@U}|V!+VGT(QGD|=wh{@(E1RR`r-?J_ZT@7I%*trLIn2hDk#Ya#Ikrq<vhA}J
zwoP8i@PR|Y0?cY?ow|~tH723w7_Y*$&AWq}nHc#d+lPrV>TC`TOJ)?kFjHjK=jnIn
z_|GkxI~@p*0paw?XTt-Te$Ab%5K+(dW3B?<Oa+gb3hk3uMz}Ejm^=A>#By$nSzrTa
zDFFEkBXz}n_~wC>h0a{b0JIn+H(?G)?tP@L8c6Q{43Jz3Ty6o2!mqhY7tPJ%UAlN~
z2`^B|=CCL(MwWZC72+nRL>maY%(hs1<t1zDm19>{vbL50MVCfvGqz5?7_G^|22%77
zsOa8oiKSOEfr_5N6xqjU3(C*2Sh@(Pb<qZ<V~dYn@i{oTI>v<Y+T;x}ri`~IKa0^~
zWScA)n`!=K&PtZnvb9{VPx5W}naQZ|WzMm(3m+1eWr2h^fkKL4p_Ob9MKVxDlQ+hS
zOMui0eAp|@%Y`QSAXZ%RK3tLuDy;z2%b;+7vOt_J-<xB+A2?64ZD3u=Ft>+yvu)gA
v?#T->1vX`^V`lW9ygqjdhyBXdPfLGDI!yM?lVlHGId{Iq&Wz33c~b=eZ-?a|

delta 570
zcmZo@U}|V!+VGT(QEc-wwh{@(Pn)CVr-?J#ZT@7I%*yD$In2hDk@5WIIkrq<vP)+v
zY@582;RA<47?{=2I&~#OYfM7VF<yl)n|B8{Gcn3dwht3!wAmaQmdq%6Yo^Am&(nX;
z$(=i4?p7dt0)$&9pA8RWl9)GHA)=m3Y@Pz&Oa+gb3QH%ijBsHRn>YD=#B%PiSzrTa
zDFFEkBXt!ObmpC8+rYY#VQvp^0!TyX%#{p4CxBF~n*&nyG*Z_JRn`9)AXO=FRSQ@Y
zB<3w$G&hfT>EgL1ydcFKFe5ixL~${){F$v#GubWLKrm^x#nLM;SzE6hyRwqCwFD^I
z9<9x|c=G0GO%@f9q6a`le`ZT8y^;x3^bDp*F-BX^c8<l;ML?~KHZUDqeC&$P{mHR0
zCX8PuPl_>R{5knVj25HH<j*mg^+I!3vb2`1<$8URZ^O?_Mg^g{$I32zNLZEy65<33
zDT0MovOyHdpeouc%<Bb_KqwXX02JjyS1tfD6J7b=IpW94AnLiGIuw8wFev<;{3%v<
vvu@mB?oC<im>J_Iug{&r;lHx=)6yT30h7J+B-xW!&Ydr@vto00-c&&VPfzve

diff --git a/scorch.xex b/scorch.xex
index 2036e25d1ac5ce0c565492b3632a46802d2fce80..d8b51890e64540443b77f342323c0e6c5c3f0e8b 100644
GIT binary patch
delta 618
zcmZ9GZ%7ki9LMj`-RLHFxS8&nn>@mhQi`>V%s0KL-pC+*7tsshHf%Xtf5s@LxQdGe
zeG$(B_vdD8UHQBy=B{ZsHwc7_W#EvD45F6{$rr<3RP?61DM9gl^W*#Z@a1>E*!*2?
z&W(9H7x5`yfD2Ceh)|F?!3A$}SBNk}n3*=Kbk94&0zy(JH>}{2^fcxp!MJ2foCn~W
zG@P__IPwYj1!1Co0CJ5h%0I>ge|dCPp&^i_mmV}(2l*xZoX=w~|4~C*xQoAAJ%}$#
z_E#Ke{~bS*=$fa5h>#Z6wCrkGL$SgL=s~qY)Z|RV({Xq!4)f^x@;Tr{h2=#PmuSo<
zp%aa*9J6}{8&Wim3GE9Vl~T}|9uPCzZZxrC>vzvhTEwiMn47Y|&0$^djYCcM{?(rt
zU{6}i2-j#aD}-oGksPm0z(A$o4C<3z=3sI_RJTc9Ra8v!A*~I_eISSC<s;PbB%Db(
zKe#?4m+U}aWu}8lv7+kN?ApGq<0QHvJ34bzO;tkmR?kpMe~{!exh5s6sGgl9I$P`q
z0NpO01V;3-*bCg~Q_+6`3fRDhUzj#4OzxK-Kqx5TYJK$CRlTCLs=HBP<DO*yS1PyB
zLwjIfMUPh7ZTd#5zVSb9L2p*ApapHM9%XhEx=vM$IT91XEG>~Gg#i)t{$1?wIOcc7
opN9fi_`#Onvi0r?sM^X4EIYNqvZZzQ&NLPlSUDy=T#uOl0GpH$#Q*>R

delta 635
zcmeyoleu{p^M>>k=^ZQ0Q*)B@b5j{g@)?Yi^NW%*7|Qq<1o?!;HaDdNN-)Z8zEX2u
zoH1+jk}0XIjMbaDX1Ovl{@xrgTS!dy!YqY*lUFi);817;vl?2bu4HJ9N$5Got02F*
zeq$SxxL51OmCIW<txRdX4wSmFQm(b}g2>8@%`#h(8AVxV1<#V3p+0x!+&yz20-?Y>
zfq4%nPuUvC=rZ}))&?%8c?y;@6^dsnT$o(2&4tlv^44uD1R7_7ji0UHG|yt`qL(R?
zH*S}j+`gSpK_Oz^Nwy8FD;ehY@FsvXHq2bf0CX8h`K>t$PLo$}*Rw)Zqy<)#0#~$v
zMZsm>(nWLgc$Y4oTfz%c%mFiT^Z)H!j4bMN6qZls-Dx1$JKJLEm6xooSB_m-$=X^1
z6!qJw&3JBd)lN+o|Jgw9a-bshITA~+WC9gEgDHBkQ(Guw4#?rGt&27=9b0_tiVxSE
z$*Q|d809BN?J{LlnLJ^a7GuEV-McdD?dGmzX)RmJb?GGEhM$>?3U+gkm0kFduq+EC
z#0eBq1PiTXgD8?gRkT-_*9#(nP%7{ND9VMdTmWPyx^m6A;>XG$>bamg6o3{mC}>XJ
zwOe=d*WJhX7`rF$IW<M2dS&aUr9UKVR?ht{vG=&d2gQ?&7o_&imyoDEFCnq#v_xh9
Q%DM9;b}rdmak^R%04R(ZzyJUM