From ed9a764cdea4525a139903ae74e5b96cac49ff80 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Fri, 5 Feb 2021 20:17:34 +0000
Subject: [PATCH] Allow dual-targetting of enemies directly in front

---
 !TheEscape/!RunImage,ffb     | Bin 12710 -> 12847 bytes
 !TheEscape/!RunImage,ffb.bas |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index 81aee6511153f3409fdbfb3e6ba914cf70bcb1ac..962c50dce625d0343dbb13b924891779e2cc6c3d 100644
GIT binary patch
delta 1355
zcmZWp4QN|c6!z9Mb;-LgZS9)SrFkc5-um*}mzcI$Y3ta!+DR>=lo4f2(>7}&F)e92
zR)43=Au^oX86rbU(Na{V8#+WpR8&UMbqtXqvdJv6jX7r>^=~@$y!R5aVIavp=ljlg
z?m73|J3n%C^w_#awhL899S$@$@HoK0_+%>4pW0E7(dqD2Th8_ueS?{?wC+^uApl#l
z$>~(SFH;yE-z6(iAGch<bYtJhvWZ)+Hvnh~J(<ZuGB=Wvp$j6as&cET)<8D*XueQ{
zTg5d1y7K?YjysD`ne8!gYY?{wp~BjR>s$%89uLy*z4)W6pABJL0=6CRmjWz}&q}?O
zd7?j#rzOR{w-1V+i=gNw>Pc}{@~whyP+=dpzKER=V23dczQMT?UH{jLF*dO&mwIGc
z=GM1uWx^u2zRyc08K2%$GD^9$cq3J(k?JJYxP$BrcDw!TJZ9YR)a6?RS8f*k$7%>J
za^a3u+L9KvBEU~j+>YQhaba!c_gqkE(NVVon{yLW1xP1zquESuj0-*d99+w2&Pgr|
zke<Ic0WmHlY5*?6ykZGOqER1pK^Vr99;q_#;X)RdJu=&g+dK)!?kYX&^VJ4D6m8SV
zhlt$7W_04~L=54^rhwxegZyEM+#1)(C(!Oy%mIjS;WQp^a<gyoOq1mK!J=13HC;90
z{wT%8^d0dEiVHCTH+iM?^)90o#rfNs%8rj@3e(y&shmSeiu-jb9xF*j+O;k4Zk+Qf
zHGKv+NDbrLOq}n)b6y9Vz~xZg?flW#@KkdQ+rrr@zK6gU{=%n&cKlLaGQUjbtA7^F
zc4W<O2uBR5_Xzm}kA_!Q@Go$&dCvSbIljB0Q}_GgctSa1zC^BThS+}J(uTkFNYPB2
z5UWjGY^Ys<p49Nv7)<0dIXWiMTT5p)s=3Ce3UqQ@4AWFx0X5i4cS(%nyZ()A1OD!B
zX8kAy9BeDb15WQl62LFu(dWAZJakt-Q*?tS*vG|(DOZ86kefY;hXZffpSyXG#Dj#s
zLf?6vaSV3{&pST2h4DF|r=|fG5M7S7I1{?B@*8q3QTJ9?U7692XD=a6RKkx5zv)HV
zZZmP4h1yeJRX1BETnax?<1z>eb-@-TRwwRk@u<Bvy>fbDl$?*-w%7rN<gNpOT*t3)
z0}jxI9g?~20WD~hf^xXfBGW5&wZ+ArL9Vu2_G!>d1kK`r+REO<Ju0j@PS4V1$fj~*
zg|r-mWImOAaH5bWrH}AqwS_I<&#IGsg+jz>KU)uFf;*-?U~SxX0q>5;Y#CFLyTt2a
JS6SiT{{V4_g(Ls~

delta 1259
zcmZXU4{Q^46vzEF?FQ}ruA{K6D_i^8_2AlT*SpybB-=DFmSGk)&|qVTqpYQ?*0U)$
z8O8`P#u!4>>={B(fhbwjpb}#Y8Y7}ci4io$_=f-yW5Ad}kSs<Citp}PfpE#?e!utq
zy!U?Z_j|v4J2yRc=#Dl_`5SR{TL5R;1`DU0+<lJTO96nP{3fHnxY@|+V|fXBK~q(g
zyRZ0cWmUgvOKRNXTnMnXSQx(*_K5SV(skPJ<emt!1UNhid_S0B-RKKt*j@NgXo%g7
zheN>b#h*e7djMT9;2I~qf+HXckFS90a~?1NskzVxD(vK*r|~E#?0LKZF}4Sr!y);A
zw}t{7=bpECZAz2Fw}k1j!+e5!!U^^jei4pu`#xOrFuzuDb_FZ-{KH!%?)mxV48Px)
zVb)_iQ?h^On#1E<m?HvQfU39Pb8?~8b(RZ@XrL~bg;jca!hrFto+}mg0#}4({4`uH
zn%2!+=%;}3fefU%uzDWAd6<@yT4!gBiWf5YVx*mI#3K=jm2h8s5`FE8|IvCY>-L5!
z-PvuyI|vTBN)ax+U^(n1hm8L<8-Aw-cP+Kx4{?7~u2(?g!sikEI@;{+Gh4t+`VEdo
zLy?nit4^x!S3APRT7<N{w!bJsk~#21G~^J1xFOmishl^}+&EZnJYI9tmY9io8k3S7
z@3X~0+9tl%$@%&g+L3Z8yER`KHL{gL-WbhQvRgRcgxjP>NBLE}Pfp{Jj#3?ejPR$X
z;(mnG99+NXWZko5*!?%Mcyra1!X1lW7hbVb93=HUyi;ysALBatK;4%#|Lz~6hjBP|
z&~=8UzfHxjEWd2yS7}9Jos)|VzFFwcZ=5JVxl+{Wpu~WW)|fL*k4zYJc3g~7W6Xe>
z=%TA5c3_XPf-S}E%HqKC7Jxq>a?e<08AL#VPh}cPF)j|_QKglw!!t_IwSlrcNOvX7
z3~W!l+5E(fT_iq3>J+^%nS^8dtX1ELSdXWDF<g_}J^#>6_y>f3hF6o53s2DK$0oBi
z%qwm-c3-b`2gG0SxsI2G8LLq7Pbc@@M*Gs}@Vaq0wQt@6%kB-*26$x>JMmg7($M3z
zil&p1^%(aKpr$stM@;5^Vsf}fm6(oO)F7M0UFs6|lcuzjq+R%f+Qs%G*MPl&9a;-}
z7YDTz`v@ns*7UJ9fNUk79W5IbDXh}Jrj*wU#<--Ux%XRI{dF;I{+znG_Y@w}Bz6uj
OYPXA*#NPh_e(gWfb6}wW

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index 22d92ec..5457eff 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -273,10 +273,11 @@ ENDPROC
 
 REM Calculate player ship's phaser arc
 DEF PROCplayer_arc_calculatetarget
-  NoseX% = PlayerLocation%(X) + PlayerHitbox%(0) + (PlayerHitbox%(2)/2)
+  NoseX% = PlayerLocation%(x) + PlayerHitbox%(0) + (PlayerHitbox%(2)/2)
+  NoseXLeft% = PlayerLocation%(X) + PlayerHitbox%(0)
+  NoseXRight% = PlayerLocation%(X) + PlayerHitbox%(0) + PlayerHitbox%(2)
   NoseY% = (PlayerLocation%(Y) + PlayerHitbox%(1) + PlayerHitbox%(3))
 
-
   LeftDistance% = 1000
   LeftID% = -1
   RightDistance% = 1000
@@ -291,13 +292,13 @@ DEF PROCplayer_arc_calculatetarget
       DistanceX% = ABS(NoseX% - ((LeftCornerX% + RightCornerX%) / 2))
 
       IF (DistanceY%/5) > DistanceX% THEN
-        IF (NoseX% - ((LeftCornerX% + RightCornerX%) / 2)) > 0 THEN
+        IF (NoseXRight% - ((LeftCornerX% + RightCornerX%) / 2)) > 0 THEN
           IF DistanceY% < LeftDistance% THEN
             LeftDistance% = DistanceY%
             LeftID% = Enemy%
           ENDIF
         ENDIF
-        IF (NoseX% - ((LeftCornerX% + RightCornerX%) / 2)) < 0 THEN
+        IF (NoseXLeft% - ((LeftCornerX% + RightCornerX%) / 2)) < 0 THEN
           IF DistanceY% < RightDistance% THEN
             RightDistance% = DistanceY%
             RightID% = Enemy%