From 475a293eb38db5c0b24f4359b7a03b0ceed283af Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Sun, 31 Jan 2021 17:30:51 +0000
Subject: [PATCH] Lightened up enemy sprite, enemy hitboxes and debug
 de-twitching

---
 !TheEscape/!RunImage,ffb     | Bin 5252 -> 5660 bytes
 !TheEscape/!RunImage,ffb.bas |  16 ++++++++++++++--
 !TheEscape/Spr,ff9           | Bin 43588 -> 43588 bytes
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index 7e46d0b5f1ea42b890c0ae85a2e1fcfd82dc6cf0..ac3162206674d5afd7b0ce99f504a53632058189 100644
GIT binary patch
delta 2377
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

delta 2066
zcmZWq3rtgI6z1OEM+N@!u$4!792mt`inO%_Vd8LruYfO%VK216m6nvYX)mBo#cak*
zXBPDsvlwIcFvgk1IkPNeF=jD~F^g=@EXHik=(fn>m{Wtx<~Fx;Zz-bQ<R<t3&-Z`l
z`_Jnha&C8=T*>9;0$hU?A^%1twm7JEMmE^&a~v$?4EAx5bKU~b-WnNDRw%JXC9K-&
zeJtftK0=12(8W@&3M}O&L0bJAn!`$8P>I{19=t5&4(9OoMJW$#8o6fL*cOciRV7|#
zpNg$?I~XSjj58GgjKeB_xI5AZK^6L=us#xlaAc5ixp;yv;Y#r$@8g}X;5WP#Gt+ai
z&S2-NvCB{~)L;VmE#bw+xTQq5x>%!Y3q%I10>N$tx|PoU9_S9nqjXQkbz}iFX<N(t
z=|(Qb1?WtSBwT~GsM6IE>GG?=NH}h@yPe)zlDOFn@RM#MI1GcgmT^10Ko8-uN~qxX
z_;8zCgqs9Q_Ccn}(TGUR5n?`p?+Q-ma3+8jLOn!#8F!W}7p4RJ3T=(6nwyukE^lh4
z1D9$0I{qb8m2kJF0sIa=#*Ne7!)*OZdK4k9sEjw_649QXEik@72Ds1oa@-<1JT9xI
ztHmEzC%q*;7+*&mkBQ)$==3tYBKo*?G)V>7owN>-TY&EwKR}CZI8U;c@0y`)JrMzZ
ze}=XTa1&fk7vm4(7O9s%){9%^5=@mBO*`dC*hg`#kY}6+F4)cZ)A*|F<@s~?v0M%O
z#k2%ugz?|$Y{|g!Ka=y@C>x7-{!g4~oFnoAGo<5MV-q(6j~L4YpxVL)Q&CnaGtAN@
zk1&ImK=bi$WB$-$o$g*R9PL-*%&>|KFXw5_#$kb~#)6&wssdqupF+m<l(FPB3{ff$
zfHA1?Io)obiy1aik^t^PX<I-EhPvbAZ~Ih?hcItZ6X=*FVO8m&N*~%tu(zkcT(tyy
zkLpN=tx-aeuAr)cJ|tzI=4<;?l@0hq{hGATC#BUe!<Tyg#=t$tHKFZW>Ryd7(Z6kh
zph5y|%y2FDF{mc-mogoSRh+ej8SYKB>)QU&qm!gc3bZjn5}1%VA+Rat9|Wz5lo-SV
z!6*~*abN1fX=Q|&P48U1k-AcNo?PKae6c}j3FCtFLh4r$H>E92T~ncH02l?lo0XI1
zc0i&kgmri)t(EVs!@Ft4*pZ%>u1*$)uoYiVUpM;=YM&`>F6<+3hjhuKk9wJgkDH22
zIEq=!Vmdid6~bqP{Q|wLJX828Riin7fC*P<^GEDug}g9^JDF7y{t%d$g2$PaOT}}n
zq}@#GBI5WL-e;nn79Q~i6X(&#Li0E*(JBi9G_pd$a1Rq#upb~<ZsLn1f7Zfw8iisv
z6~QPRwO6`59tVjN!}y%(8Eyj>X4tsbaHpv~cQ^I#2on#`6?LSiS_i&Ez+y2}%EaS3
z_!9zGVl-n`o_Hp4;(YRiZ?1mg5;kSpr3!E}@haZPfJX7Ac3tgBRLEpnwMe;KOuVDV
zL-YPXr<8;wrB_!gnTWD-NG~%@-IFwl{7I!n2`^9C>%qk&XVQsOop92SbmFejbW2NX
z6UU!Q<wR;<qB%{9UGV1Pxn|Pp1YrkdMxrS$#j?i}5THp(!<I>#vnen74<OR7Qp%XL
zgL-O=W|ofvAnn0tvl_XBIFvP0q+u<cpuY|9(lCx>b(^KLQ-3Ye1+rhpj_HGG(sj+@
zEn1J`_30&U>0yTMg*w9?b}-qP1F+gwzqcY>cc1EKFU+SUle6iRTp%#H96e?m=fZY#
z5m$$U=9<(d&9sb6?Ko`qah-VE3|t5^EP31jIxJP(HhjTi^~t*m0sJw=zc#AIY$Yy=
zN=OO!r~zArm&yBSPCqhwwIo+F`7nN9DdXj1__f7jl~0-KCm~EeO&-tDdr@Hj{SVY(
BEVBRr

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index a63fba4..71fe5d4 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -15,20 +15,27 @@ DEF PROC_main
   PlayerVelocity%=0
   PlayerShields%=100
   PlayerStructuralIntegrity%=100
+
   DIM PlayerHitbox%(3)
   PlayerHitbox%() = 0,0,60,81
+
+  DIM EnemyHitbox%(0,3)
+  EnemyHitbox%() = 0,0,48,74
+
   XMovePerCent%=5
   ResetShipSprite% = 0
 
   MaxEnemies% = 4
   DIM EnemyLocations%(MaxEnemies% - 1,1)
-  DIM EnemySprites$(MaxEnemies% -1)
+  DIM EnemySprites$(MaxEnemies% - 1)
+  DIM EnemyHitboxID%(MaxEnemies% - 1)
 
   REM Random it up for now
   FOR Enemy%=0 TO MaxEnemies% - 1
     EnemyLocations%(Enemy%,0) = RND(SCREENGFXWIDTH%)
     EnemyLocations%(Enemy%,1) = SCREENGFXHEIGHT% + (RND(SCREENGFXHEIGHT%/2) * (Enemy% + 1))
     EnemySprites$(Enemy%) = "durno_ship"
+    EnemyHitboxID%(Enemy%) = 0
   NEXT Enemy%
 
   REM Show/hide debug display
@@ -158,7 +165,7 @@ DEF PROCinputs
      ENDIF
   ENDIF
   IF INKEY(-17) THEN
-      IF DebugOut% = 1 THEN DebugOut% = 0 ELSE DebugOut% = 1
+      IF DebugOut% = 0 THEN DebugOut% = 1
   ENDIF
 ENDPROC
 
@@ -172,6 +179,11 @@ DEF PROCdebugoutput
     PRINT "ENEMY:" STR$(Enemy%) + " " + STR$(EnemyLocations%(Enemy%,0)) + "," + STR$(EnemyLocations%(Enemy%,1))
   NEXT Enemy%
 
+
+  FOR Enemy%=0 TO MaxEnemies% - 1
+    RECT EnemyLocations%(Enemy%,0) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0), EnemyLocations%(Enemy%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1), EnemyHitbox%(EnemyHitboxID%(Enemy%),2), EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
+  NEXT Enemy%
+
   RECT PlayerLocation%(0) + PlayerHitbox%(0), PlayerLocation%(1) + PlayerHitbox%(1), PlayerHitbox%(2), PlayerHitbox%(3)
 ENDPROC
 
diff --git a/!TheEscape/Spr,ff9 b/!TheEscape/Spr,ff9
index d39688f063a79237c764a3e18202537fe7968e25..3327ba83b2efb3463f91294403c8d9b1f67ad607 100644
GIT binary patch
delta 815
zcmbVK!41MN3@q&n`lS897)V)xB`Q7);1RL_hzB3WKw^cC&;=L-3EO9<Ek#tql@j|d
zcaEdBUEX&2{dQW=^|{;*)^*%v8bpM|Y81v5#tp#+ML`7;tEFi8lW<S36+Gygk$GN^
z=Q^542mvIop+@c=UNcp5$T?yUy_f^q5fD>oz<Qf39cL99IucpPpbnDG3xKhwUI`K1
zN1ueubJ~lSh{UZRbn+XA>6y`FtowuG_x~}ykYZX&jNI|w6HWjQxw!5uLt=oDJ;(2#
l{*@s~r8!^|Dy!5=%`K}GpXG2&E(KlH>sFcP^mtwNn>UKJe-Qux

delta 778
zcmbtS%MF4+5M|gC;owCMVjr|%30^j|LIWC2xLAgXEl>gtScr*lehXrP2Zv;L=e>FJ
z3&WTXV}8G#i27%-pPh9e@peZFlr1gBC{UmvxBKiwd~DFm?Y=mzoEdWV?YZtu-ZYKk
zIGak}E_WYP1>-n^Tyi@g#S{Xi{X%aIq;MWd`gNp(5TIce&wzIRohu=%ThvL&Z;o4I
z>-6$eDpbtRPfn)?Cy&25?0;o?Cb>?@rj-rReJ?oM_QVln+Nd?GITR8O`%k~goTSnw
hOgX{opC)_ZSo7t%%55cN(y1?CzquAfkJsf;zX4wt9Blvq