From f870a0738215dc77f49730529d842b5ec5993dd0 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Sun, 31 Jan 2021 22:20:11 +0000
Subject: [PATCH] Enemy/Enemy collision detection (expanded bbox for testint) -
 Hangs macine now?!

---
 !TheEscape/!Run,feb          |   2 +-
 !TheEscape/!RunImage,ffb     | Bin 7319 -> 7904 bytes
 !TheEscape/!RunImage,ffb.bas |  25 +++++++++++++++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/!TheEscape/!Run,feb b/!TheEscape/!Run,feb
index 5535146..b5bada1 100644
--- a/!TheEscape/!Run,feb
+++ b/!TheEscape/!Run,feb
@@ -1,5 +1,5 @@
 Set TheEscape$Dir <Obey$Dir>
 IconSprites <TheEscape$Dir>.!Sprites
-WimpSlot -min 320k -max 320k
+WimpSlot -min 512k -max 512k
 Dir <TheEscape$Dir>
 Run <TheEscape$Dir>.!RunImage
\ No newline at end of file
diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index 669123ee350939286abb64378e1662cdbff9c625..4943737f56cb6a4e59282071c0608e0bad8cd243 100644
GIT binary patch
delta 1795
zcmZWp4QN|c6t-!X_qUs-ZJOV@oW{J8G-=IC(^yASw05-{x^CL({98?J)<m;3G^tHw
zI29RE#%R4VWr&KDA^wcvWXO~`oX8L>BL3rwo#JG4)0Qea=FhqB<u#oK@_6^0@B8jO
z-#PC-d;RyZBd=9B8UZ$B61$3hsr=ArLH79}2BBams2n|2kr#~3fWLE8akvbfv7>iM
ze^wfsSZJB<s0P1DeT9Jyw+|5G?(!;6jC*C4`#}>A(~#X7G)}o$3}E9<Ei6M<DKEo5
zVm!D_O9K?bbgRkEh2>z#4*|Mp@>s&M9~Z<pvjQrvfRxoB1wn^9bft+f{l(-}*<nn)
zy^=_(2@{iT!^HcYj6u82(Z-KmIvHRA3QAx?2^N(=QX$4K)dJ{AvvZG92Eihn@~I}u
zco6VFGL^??K#$@c#CX2COqeCcWuh-}@wcQcW(mjFu-6N^ErhGBB3uJD2`z`4M$_q3
zE;X8g341D^gg9i=@nT|(a7|%`D1;$K=NwIygbUFxszaUJ`m0%d0^_hnh3aiaGq@f#
znf!ke4dFJ^8_iJ%x824B{%Zs`M5oLy3zx3dvWwv9?(e_VL%4_OduB&F_n7V>W|$qh
z(n%39SuXY&fzh$*7qG}zD5>!^yoqn`;vkhAkO}wUnt8%~is5hR)|#feA92eEm=D7V
znT;ypF4D;wXY3EP7@Sq?7<9(Khh_w@az9QMZzv5OOZ$onCXzTaT`?$zS$Zv<uW|3;
ztqoc=+H=(=3gO|3_VLZD+Q&y$D&o6J74dx}rV9}MwkpEkYh8w(vG@ce*w+TRWGb5@
z{LcC_OKM;+Ct+l87!ice(#hJ*2L2Ix*Z>CpNqV{VzFvO+YFGH@&=vk=)O}so)kZ-T
zCj2qm8CcRHgKVpk@Jae&U3bMt^lY8S@cA|L9m_h&L-;w4HG%(`UTf*Od5H;Mt|Efb
zvJ4wD+3`Fi<C)=fDl<X^GeOxD3+9O6#Il=vw?l*oUYy!<aLCu9gjK_ZR(jmxF$f)W
z&f+x)-Sk9#3svfy9l|Z@Ucw#b5+NLA4HE80yn9XBLxcx4N**b9I)z6y_)|K(y+egR
z-AW&~+UQqSGZz4b2+w=yMXPOX7bu|+lRJc;^0e9R!zB@ph-yP;iEvy~`#@KVXovko
zSF5l1nqIKFE6=WDbf;HXSfT!|QpKxus&XAWh$#B;GO%pJO`#_-G(OTlo@Z035YeI$
z)}fuEuZoD_TI@fAKz1yZLI1?gS~PQ*g+|BoXekkUajF*Z_HD;wi(BY1Tem^Hn_jXt
z8O33g$f)xm7HFS+*e*V?dLG1mm_LC3ml#G6U!7+)pQd<m+v!8501Y_~)V*~D;{>8l
z({CIF@iTVD?{N7Oy~pVZ{aUS_3$F`b#!tjccmoW`vFSi&{crFWOyiwBAQPzyNs_6G
zNOt;$)7vO{+>C|eJD9@)^9f%jzANDk7UW<NuRkeBmz+^aiZa#>$l65PToHpbKvOPv
zgS5j5a30c$%t$^d2O&O|h!1A-W4KL{&bV6L(inc-bLF@W4MbWLBJHM&E|*=}YlSkR
cF~ZsqCDIi2Hh2xvLAt4-%`{_*m9_u*7hqoH!~g&Q

delta 1324
zcmZWpYiL_#7&fQbxqR8zOYXOmev3^_ny#J`)2!BJLX2Gpx>Ols&PkUpv5mwuq^V0p
zRAh`HL!9qW5pNq(M2A)<A|gX%h=`RTq9V>t5hv1#mMC_3d(Sydjq^vs_r1^iJn!W^
z=bTSIaqYs(CO2d3#!~+7`dFblIa3RTBP_|3ex?7^8B<l_BM7q#aF+N?Bd2b+thR0J
z*CGwJGn38?!=4UiHdFpS_`IuI<PXI(tOknJ4r#xmjq;B|pH<=br(mzu$MG*f-Rf)O
zUm1ec&cxVTE-jm}WmZ$82h{$$8l6@t|DJ4w$BWr|zOpM{oY`Nf)<arXl>f+TfWNR{
zDwDZ6NcqovFy7^bt8E@H|D(k~7b)M6v?Ct=GE+f>Nn6-&#go6Cv5UsMAu9B4_=XA!
zhKFI^)@w_n`2Lw<v5?Cf<%AuuWb>MK!zG)K6DGlBmpP#b348Yg!aaVYmhs<0Q>pM^
z$G_Mj6&|L|D_)MR_b5EO)}!zuO*RFn@H+PMj<dnimFxkQ*PaZUoi3DTsqntz+=?EU
zn6+SJB8M4NI15Ym9h~qbyvi|7_zrGy+%YQr^q)C@$2mpLOvQ~&-Lk%1U6_ha*EzOg
zL?*OShOo$>;YgYKV2d-z#jk`;SHKda;#NUht2hP+o#}12YQlR__)dF+Z7-GQs%$!2
z$`uQxDJqsJ$`-WXEEVs?vHM1Mvp5wGcA=x#e0Z}Oi$&NGDn0@ot{^8q2^U>Gym;a^
z+!mP7LQ%H^4!Qa~;z^_Co1JUKSVHH$i@fd)MQrLrgZgO;^?Hx^wL$x#NgEu}X)9p&
zg!w2_srU!H=H8Uzn~&%JmQxjlN}WVcSfr9ySCo31igA4aX#f>B?;A2?F0jjGMwo(Q
zN~yqFoy&2}+0sqxMRplQ_BD&BTeP;NyWqIzsvD%Lf!>dsmkyh$^q3W`lAoNLV&zJq
zgsYaGw&LD%T4-jjirc5sJQ{ErU+O_^ngy_UQ=IfRWW2q+bOt3p)~zFb0nd1IZt2@r
z>qyIp|7ND-3O$DqxXyRpW^YX)0ffUa;IEMwHbqA8ItmN^pfcW}H-c6Rmm-wx!S{V<
zD0wtm8vd32$&RwEc%>w#kxEFa0Vnrx<RJ*lGDnWUHaTG-k89}jh`t1e<v2&)fYWj}
zM^3|%?B>V^uqqF5<P(Sle1qgG{BmR~`RqiwS_y4Z@QYE*m!_)Ip=g|v@13n+96>cf
g$<I&^V9iVLT;Lk7xjnf~r<QgzwYc#YG}FKT0mgA^E&u=k

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index a2cc607..4a0b811 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -20,7 +20,7 @@ DEF PROC_main
   PlayerHitbox%() = 0,0,60,81
 
   DIM EnemyHitbox%(0,3)
-  EnemyHitbox%() = 0,0,48,74
+  EnemyHitbox%() = 0,0,148,74
 
   XMovePerCent%=5
   ResetShipSprite% = 0
@@ -120,7 +120,7 @@ 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%,1) = EnemyLocations%(Enemy%,1) - ((Cents% - LastCents%) * PlayerVelocity%/20)
-    IF EnemyLocations%(Enemy%,1) < 0 THEN
+    IF EnemyLocations%(Enemy%,1) <= 0 THEN
       EnemyLocations%(Enemy%,1) = SCREENGFXHEIGHT% + RND(SCREENGFXHEIGHT%)
       EnemyLocations%(Enemy%,0) = RND(SCREENGFXWIDTH%)
     ENDIF
@@ -161,7 +161,23 @@ DEF PROCenemy_ship_collide
     w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
     h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
 
-    REM TODO: Collision with another enemy
+    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)
@@ -280,6 +296,3 @@ DEF FNload_sprites(sprite_file$)
   SYS "OS_SpriteOp",9+256,area_ptr%
   SYS "OS_SpriteOp",10+256,area_ptr%,sprite_file$
 =area_ptr%
-
-
-