From 213c8bfda5701e2fe84a4f0d20f86ed7beb1c237 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Wed, 3 Feb 2021 21:56:26 +0000
Subject: [PATCH] Neaten some stuff up.

---
 !TheEscape/!RunImage,ffb     | Bin 11105 -> 10954 bytes
 !TheEscape/!RunImage,ffb.bas |  26 ++++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index 5e768dcd67501f0df9c9bf66072b894d9e858986..8f6922e7be043fe951d5ad8f5fd1517c0c83e94e 100644
GIT binary patch
delta 2391
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
DToj@J

delta 2499
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
DMGD2k

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index cb8ca6e..84bdb91 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -144,7 +144,6 @@ ENDPROC
 
 REM Move enemy ship (display and physical)
 DEF PROCenemy_ship_move
-  REM TODO: Only uses player velocity currently (/2 so they don't match stars)
   FOR Enemy%=0 TO MaxEnemies% - 1
     EnemyLocations%(Enemy%,Y) = EnemyLocations%(Enemy%,Y) - ((Cents% - LastCents%) * PlayerVelocity%/20) - ((Cents% - LastCents%) * EnemyVelocity%(Enemy%,Y))
 
@@ -267,32 +266,31 @@ ENDPROC
 
 REM Calculate player ship's phaser arc
 DEF PROCplayer_arc_calculatetarget
-GCOL 0,0
-NoseX% = PlayerLocation%(X) + PlayerHitbox%(0) + (PlayerHitbox%(2)/2)
-NoseY% = (PlayerLocation%(Y) + PlayerHitbox%(1) + PlayerHitbox%(3))
-REM LINE NoseX%, NoseY%, NoseX% + 200,NoseY% + 1000
-REM LINE NoseX%, NoseY%, NoseX%,NoseY% + 1000
-REM LINE NoseX%, NoseY%, NoseX% - 200,NoseY% + 1000
+  NoseX% = PlayerLocation%(X) + PlayerHitbox%(0) + (PlayerHitbox%(2)/2)
+  NoseY% = (PlayerLocation%(Y) + PlayerHitbox%(1) + PlayerHitbox%(3))
 
-LeftDistance% = 1000
-LeftID% = -1
-RightDistance% = 1000
-RightID% = -1
 
-FOR Enemy%=0 TO MaxEnemies% - 1
+  LeftDistance% = 1000
+  LeftID% = -1
+  RightDistance% = 1000
+  RightID% = -1
+
+  FOR Enemy%=0 TO MaxEnemies% - 1
     LeftCornerX% = EnemyLocations%(Enemy%,X) + EnemyHitbox%(EnemyHitboxID%(Enemy%),X)
     LeftCornerY% = EnemyLocations%(Enemy%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
     RightCornerX% = LeftCornerX% + EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
     IF LeftCornerY% > NoseY% THEN
       DistanceY% = LeftCornerY% - NoseY%
       DistanceX% = ABS(NoseX% - ((LeftCornerX% + RightCornerX%) / 2))
+
       IF (DistanceY%/5) > DistanceX% THEN
         IF (NoseX% - ((LeftCornerX% + RightCornerX%) / 2)) > 0 THEN
           IF DistanceY% < LeftDistance% THEN
             LeftDistance% = DistanceY%
             LeftID% = Enemy%
           ENDIF
-        ELSE
+        ENDIF
+        IF (NoseX% - ((LeftCornerX% + RightCornerX%) / 2)) < 0 THEN
           IF DistanceY% < RightDistance% THEN
             RightDistance% = DistanceY%
             RightID% = Enemy%
@@ -300,7 +298,7 @@ FOR Enemy%=0 TO MaxEnemies% - 1
         ENDIF
       ENDIF
     ENDIF
-NEXT Enemy%
+  NEXT Enemy%
 
 ENDPROC