From 964f413d020c58bfa3c176ae6ff2fbfff0e351bd Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Sun, 31 Jan 2021 18:19:50 +0000
Subject: [PATCH] Collision detection (NPC-2-Player only, no effects)

---
 !TheEscape/!RunImage,ffb     | Bin 6217 -> 7319 bytes
 !TheEscape/!RunImage,ffb.bas |  40 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index e55ca67a10e0f6760e854f9c9ffdf4791e030a65..669123ee350939286abb64378e1662cdbff9c625 100644
GIT binary patch
delta 1663
zcmZ`)4`>@z7?)di_wHpcNw4|Su3P((HC@uABbRku9c|UNmMXeT8FPr*rOVmNNG~zD
znnc8kh=>*`zA=Z08&ZbIC__X=M5c(SI2Dm0VyE+8MXG2iB4c!Z?=C5=V#tGg-|zSP
z-uL~!cgaVI=dM48Tx?#TF)`#IVtgBg&k8-LXG;{m`Kcn+v*vidLd2dF$0{oAXQ#YF
zTZnk06{zySXSju}dLt0LbvI{~dGMMy>`F$7c+d*zJe2Z9j)?ccL3*6i;GooSY9AfS
z=W^LnHgC{!*3@a*$eX%Wq?(~kR*6^y{=-3=|8FKO<kD5GNW>?SoKQ)^A+x>?C}h?O
zRC(YHU&k~NpWn_IWeCs%mT1&!EF9rA&RL-TUvM{o^SxZTNav37Ix||NqQ+?zRvDHK
ztCEC0tTHS;8HE#6Izz-a16)Vx60Nw@7?7)KOjn8c-gfq`vUOVgM6vNdX=pH&x;;e1
zi!F9!kq&F)QxmBvGh9#hT@9kZ<})ePS_jpyPFr<>h$}LGgojlJkx-Ox{>S9PbTNNS
zJ8EWg8j%!WZ*x)l8@-u(9wt)9=F3D%KzQHIg$<2E-_Qwk4NXJO&@yyPq+#f#W)Ckp
zL8Sdw!HX2!qA{>4N(cJ+fM$qvn7cg<YmwilzJA~&IR~r*bi9q1%|9T9>lFi!Einue
z;GA_8>IA^K9w4CE`UkB`Y!fyVr4s2;cRfz`f=$v>q`rsE@iiZ%7i&IBFO&XyTSR&l
z{CJx+xV!=B1K+~3bw9^SdbTi@DW=Or`keK-_6yS2{Dl&vAKAR?-Vy2d4Zi*jz9PXv
z&=&s+9R^ixjFhJ#$RAjs%l4gKml#oYhx;Z0b+Y5`;3m|)gH3u`ogsn-BtC33$}YQy
zM$w%-_dSsNe(wss#VAafR8Je3T-KN%s6ZfdmIq4&Jp`S0jvS`l1U=rseLfTEQj?Z_
z=oyytgamYw&3f7e^b#vHbg>^ioz3X1ec0=snjqQ3$A!)Vzio34s`=QKd<l}fn$abj
z{!5*{r`Mt{vj>!j6r(CZS3~Ty62JpgO(Y<bEV6{sx<mG0YbF<nywyq}x7Sm2TNTQ?
zAVpk|d)X<ab(1{U%2cH}oFMXTYr;de@JL;#?&W98$JnZ}b4WIA^bxR2e$qkYXB8L)
zf8S`Km^Hv3`2_{c%J5Kr$^^@Zd<HJc5>3SSB;cTPOm7?%<hR(_#tu<_A5wg3ja>eU
zU1`iT$=|OZxx57UUk-w=vp5*DliqK=*t?#CTLF)-r+sB7PC{9@5B4LB_=64jfZM7C
zezGD)l;FGB4St^!XE@6MR)vlE+k^PAHqL_kG**HpOf6!hC$;u?B^<AYK{dnX{5?*5
zf~!u0>J|2rzgxhsv6euafZt(#fhGZe$PNW|_2Dnz?Yu<OMJ+v6FpFWD(~JpI568N@
zRD!<&a19D3;8kCP3I3U#4|oOq2fG+(7w{E!HIQs^I$Zs00^)Qzh_eY6{M%gn2jKn0
A)Bpeg

delta 979
zcmY*XT}V?=9EZz1=iKbrT63G5>EF34Q>SgV>;sfa3zH~FE1?ftcyp_D8{4%qA_^iR
zBC>x`^iU8HJ(NTb5)~mmL`6amQ4}Z%K_MA53?lkE=dP7qI1lH4e_!XE-}%K)!nasa
zv|yYQzm1cSYYJM^v3;N$`tE+n#1p9uCym9US!>WO2i-jaz{yfP;aH=Pb{tedA)WZ$
zv1KLMS_Ci&D<oOtBravsLiS)@HkFL^>uF1ulVk2t$mS-~g-_$<Im@cZ#Y%wp(4re=
zMuTQpr)PAtL)dqu(g{=7;3OwkEAgJQtkBQNAO#rV<POerwzQFl()XG0ed(NnRYt1M
zgm}#8NhXY5PTq3invg?rvWY@~nw4D;<z#BM^t%?Ui!?M;OZA_4*XdU%!!c(-p$>dd
zT!)e3ni5)Snb9iyA3{T;#M7|Amlq`coG!^xS_NgJm#)ddyYlb_i!Au|dOYHC<13e)
z)<T5Sq#r-I+%uaY5)Mnby#P31_XNe3)59}Bej}Wo$f=#pt3|D_^ip2UsnF{<=_<3)
z+htO~8=&|9k{{*B&-3KSLMzIfY8<vZ*9%){)wlQcuI)25Xp*7c<p`g|h0?D!&J>5}
zhlGH51@SVR&2)(C?2)5AeWtin&RiVeBZNZ>L~sT;<X*0@8vN$2A}lH-nytdHHf;0s
zc-Xq>g<+e;{~cnbBt~Ti#^s?OBSuO*xT~lZ!zJgO?C5`#Qv!YgUzhAFWLHE=c0=rk
zaFe$p!iHyA(M08fMm1+o-2k0h(?G4U<O}?O0a2<>jk6b$H6~ae@TNCV!LsF&B`V&X
zv6>b%V!QP~XulTf*M!P<%z7IORU%lb-Nscf&i6$XHGm0Ud8u0O1(<-OZuFXQEd;T&
z9_vn-X^pFk@T#xATwOjFVC>&K53P;XMYy^eKl^+hb%P83Au6KsB^tT94FjbCMcs+*
Wr42sSENYr2en<p4F4h?v|MeS&NFA8~

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index 7220699..a2cc607 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -153,8 +153,48 @@ ENDPROC
 
 REM Handle enemy collisions with anything
 DEF PROCenemy_ship_collide
+  FOR Enemy%=0 TO MaxEnemies% - 1
+
+    REM This is our hitbox
+    x1 = EnemyLocations%(Enemy%,0) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0)
+    y1 = EnemyLocations%(Enemy%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
+    w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
+    h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
+
+    REM TODO: Collision with another enemy
+
+    REM Collision with a player
+    x2 = PlayerLocation%(0) + PlayerHitbox%(0)
+    y2 = PlayerLocation%(1) + PlayerHitbox%(1)
+    w2 = PlayerHitbox%(2)
+    h2 = PlayerHitbox%(3)
+    IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN
+      MOVE x1+w1,y1+h1
+      PlayerVelocity% = 0
+      PRINT "BOOM"
+      IF DebugOut% = 1 THEN
+       PRINT " hits player"
+      ENDIF
+    ENDIF
+
+    REM TODO: Collision with projectile
+
+  NEXT Enemy%
 ENDPROC
 
+DEF FNcollide(x1,y1,w1,h1,x2,y2,w2,h2)
+  collide% = 0
+    IF (x1 + w1) >= x2 THEN
+      IF x1 <= (x2 + w2) THEN
+        IF (y1 + h1) >= y2 THEN
+          IF y1 <= (y2 + h2) THEN
+            collide% = 1
+          ENDIF
+        ENDIF
+      ENDIF
+    ENDIF
+=collide%
+
 REM Draw enemy ships
 DEFPROCenemy_ship_draw
   REM TODO: Only uses player velocity currently (/2 so they don't match stars)