From 3c3d3d35fd1f756259a2d9b3343e1d49598ae308 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Sun, 31 Jan 2021 23:08:18 +0000
Subject: [PATCH] Tried re-arranging and removing any of the 'breaker' REMs or
 the PRINT 1s makes it work. Some kind of limitation somewhere

---
 !TheEscape/!RunImage,ffb     | Bin 7904 -> 7869 bytes
 !TheEscape/!RunImage,ffb.bas |  45 ++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index 4943737f56cb6a4e59282071c0608e0bad8cd243..caebb677700ce76aa06abc8fe49f1688de0ca319 100644
GIT binary patch
delta 1695
zcmZWp3us$q6!vE6eZ{}Y@@U%T(Z8u_lP248v-Cl?jFG0@DzmAh)ak~$tc^`HrXfjf
zBf}0EWyp}tBO=2$qln0?A|j$wL`1}jh^UCQ^??=X#FhBi(CNANHZ|=6ft>H0?>px|
z=j1Gf-ww|W>fy_+4Lq9*Qv6Ioz-Wf3-Li$SC!p0B(6BRb#Aws7XQ61cZDG%M!c{~2
z^aZONP3a1ql6;erzbN^V5@9boRCpjAFD7zBiS+nLs!(*(Fbxp)4WsJ3LS2zq>^2u+
z-)mHn67B1y(ZunIvDidGj+W@){+@oqe!Lz)2M+f24^kIRrV4pFlvNU-#1~u35<UIV
zzFxvE2{JHG*k81SEjeYQdpw;^jVAJUqzXw{y(g2nujnT1buHm|uN?6MjTMrK9GtAT
zHFL%$8KShL67#9?44p(Ojb~^=rV`G67#8$4Q6VX6a9!WD>wnYj^#{C!Yd)+h6@%rh
z2gXO@1r*G?Jr&V@2^a&lRUlr!g#194%AX9vmFfo527eI!U0v{wp=Be!6Y*#l{AuWz
z=K5Py{*5iDkRse6of<YzxZ@W2=Vi4WYklI<*r)rIK9^`Dmx$k+$Pw=3X5e9rdQ1VA
zaeg?%ZhD4rPZL=XM=rSt_d=!d>e`^Vw~+WjwVbt_@YAaA2=_I@Kf<i3+4L(e&WJig
zb(OfkV9`{k;Wcp0WM^&$tJ%raK)abvQ@fn5{HY*Ggm2ZCad|)ZkW!2cp|NMZ1^oWC
zy7+@6Toxew5iQ~Gt|`%IE<UMl0nH~<**xL1mW5SiEr#<+F_j%2#R$Sb0E^}ra|(7?
z8ktAncFWP8Cn}%FKaWr3UqaE>%cAN^E2@Nl*SbJgRRm?%RX>7~CBl3T9W^e^w@qNM
zI(06>|I8_GScOwH(S3iTu)u1GU@+s~DwCZk&}2L_noecLh)_>ZHYJ03BHV&+ZtXop
zLqyn)b6cjfo^4Vv=*6)KouIciF%h_Ibypp@6MF;<-UVN+1!k<i+94&OaLlmA3brex
zdyv#nm39%Kpb#IdAnvU_t&$!sliE5J(vx7W^RPZD5n&cyscnqRm8W#$5s?A`BD^Uo
z0rNz7Use31tQb;j{|Xhi9s6FDS*Dw1cGH0T!WHE-V9;j2e5-^%%1OkVlq8~9P9k;4
zWs7EbuFey2s!k8~TnuW7xZ8*uBHuBZ&80HfWU<$X9UqmU@reTVornXtcPljDZ^Ork
zcY&_Hn;C^zeM?ma1*YI-4b_Mb!Bh1K>zT@p5g$kQv-o{c4S5ZA*_KR~HiUeL?$2Pm
zeM<aBuIMK;e}g%@D{xJ(RDnm+lkpOr7O(f9JABTU>H3}iL(kDYXcApDl619NqH}@9
z;b#2caX6WF*yrdF_sXtY(KQIC9c|1}xa6Qr5*8hGOb)I(b}%Qv>$Hbv@czf~LJVgM
vId@|KuRuDH8N;jV3lZJfno4I#J`wFicOHsPH**1=aqg_XSRGzxlYjpM6BXLL

delta 1684
zcmZ8h4QN|s6!q0M?<f1xHf{6MCe2;i*CtCk^RoUin>xF8ZlY_^I*Q1;w0&zb)1;)S
zZAaOL$k0(`?#hrUB2uP^XcZCB`h$uLu`)%5ik+Q`8`8;Iiin7Mzn7$~2J(2{J?Gqa
z@45HA_aaM?x!z)-4sR>9x1=&LJq>zNADLpNv<2w52EASP_A=A-#wo*0CsmI91YMjO
zK2v3@HJ$eG5Wv2}*{BNbIaq}mW;%Bt03Ir>!V?umLKq*k__l;qe=y`{rdbZXyACat
z)?i6-Q8|Y-f?sXTCI*-Y<BFx$(1i(jn*i*w)^oNI+(E&Q+9-I++EQ!!yeh8)ScXY0
zFrfvfv_MQ_rc1e6v0bzsH!W!!L|B23eMVQR9|GWoSUf}5Kt4)EG1ITb8-fL9T4VVm
z9sV|F4+~6`O8M>eybDaU7BbPbl?T^gcPf#HkHu3-++Qk|!Du2nrKg!#7v}I}7$R8W
zs=JwqA$+koR3PreZ;Puy>~wQDMlkdkioNm7Kx$I;QS0LVR-CamJNxXM^Z%a30XN?6
zth9>>YZhJsZ%23c-Cia>L`E4-h$r%v5y(3q%hg4sQyYCfCG!l_;B(Z^OMZT!E$Qy;
z-nr2gOvE!W7)_^+=!2PfLTBO|M4qQ5%K4!(@zbI!OuR_p@9Gy}b})sHl|k9hRNf%>
zW=L15%McTP!}&7jaq$nMb%3ihN@$CKk4y^CO89BJq=MW)IqaL#2#9HZXpg{Dn8RBP
z(|MtsKseVEM6|5l=E{QE>!#;xOaeabNDg0M(zZ?GmKxV>k=k>%NPAf%pMgpD6f)@n
ze6qa4cDQ13)p)h~$71o({-Jbqf=Qz|U*0Vo#n%d;KzanXR~+nmVzWuo(`1tL0wsCH
zwg#P~$&Cbf5+=Q6Uxd}{@@!7~A%0oWA$*4AHgCb#HF(`tZT2$hvdG6KUBjrY^Nv-X
z_^(1Ho66T<UvhLj1F>jwC=pK%Gr5FO+Bgr6F}ad@+_t9=8kt;6D}5Et`x>;cVVt}j
zmu)pdE0)+*p#yK&8*tDbaNK1)NIp=KV~3mhl;lH1_7o+&Og>@=G9>789Ltg)&6As2
z4e}XWarndlXiR?Ai{P{??VyE1JkNQYb9lUSiZPP~Ccl%-@JT*HW45+0C_{tr4SJlO
zf*-5#b%#?8F?o4i_PZfdZpzEF7XDyG!DCKeM|l>kCYKanAydLuvR@w<AEu>_C&?D2
z%}O2(@la|!LryVe4{gRWgn~_>5L0^ansc{sKL#u7i-ssc(wMO_iAO7S`@@@OtjrL6
zmj2IkimbeRg*SEq@uK3u5la9Es?L_Z`5(pm#J+%L*QD|lFYtRh{(_IYyd^h^jiTt=
z;7j_M@+W@avMGhcF<T0m*?~W}RPcH@hgPY7jC#rFzGQSnuMJMB!72K>nS)sCZc&=K
zW*2GhMBUva^x`va5DwzJ+bP8GlKYlh)AT-GhG<%k_K#-LDkSvea3-b(8XGibo+fY|
j+8UzQXB}qdlenw8LO6{Fs#W0}PFL@+%vvJrZ1&H;$1ut4

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index 4a0b811..ff67603 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -161,24 +161,6 @@ DEF PROCenemy_ship_collide
     w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
     h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
 
-    REM Collision with another enemy
-    REM TEST
-    REM TESt
-    FOR Enemy2%=0 TO MaxEnemies% - 1
-      If Enemy% > Enemy2% THEN
-        x2 = EnemyLocations%(Enemy2%,0) + EnemyHitbox%(EnemyHitboxID%(Enemy2%),0)
-        y2 = EnemyLocations%(Enemy2%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy2%),1)
-        w2 = EnemyHitbox%(EnemyHitboxID%(Enemy2%),2)
-        h2 = EnemyHitbox%(EnemyHitboxID%(Enemy2%),3)
-        IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN
-          MOVE x1+w1,y1+h1
-          IF DebugOut% = 1 THEN
-           PRINT STR$(Enemy%) + " hit " + STR$(Enemy2%)
-          ENDIF
-        ENDIF
-      ENDIF
-    NEXT Enemy2%
-
     REM Collision with a player
     x2 = PlayerLocation%(0) + PlayerHitbox%(0)
     y2 = PlayerLocation%(1) + PlayerHitbox%(1)
@@ -188,12 +170,31 @@ DEF PROCenemy_ship_collide
       MOVE x1+w1,y1+h1
       PlayerVelocity% = 0
       PRINT "BOOM"
-      IF DebugOut% = 1 THEN
-       PRINT " hits player"
-      ENDIF
+      REM IF DebugOut% = 1 THEN
+      REM  PRINT " hits player"
+      REM ENDIF
     ENDIF
 
-    REM TODO: Collision with projectile
+    CollidesWith% = Enemy%
+
+    FOR OtherEnemy%=0 TO MaxEnemies% - 1
+      REM Collision with an enemy
+      x2 = EnemyLocations%(OtherEnemy%,0) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),0)
+      y2 = EnemyLocations%(OtherEnemy%,1) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),1)
+      w2 = EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),2)
+      h2 = EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),3)
+      IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN
+        CollidesWith% = OtherEnemy%
+      ENDIF
+    NEXT OtherEnemy%
+
+    REM Breaker
+    REM Breaker
+
+    IF 1 = 1 THEN
+    PRINT "1"
+    PRINT "1"
+    ENDIF
 
   NEXT Enemy%
 ENDPROC