From 2a5d3ce06c8ce798cc09a73d2240efbea46e88a5 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Tue, 2 Feb 2021 21:01:46 +0000
Subject: [PATCH] More consistent variable names and orders

---
 !TheEscape/!RunImage,ffb     | Bin 8925 -> 8929 bytes
 !TheEscape/!RunImage,ffb.bas |  74 ++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb
index 8c911b2799eee086d47113abbb14d7bbb04e95ba..daf3e1bd9b5de3c5c1a69d7786baef57a86fc69c 100644
GIT binary patch
literal 8929
zcmb_i4QO0d7EUJfKe^TI)>_?KuVYhZnio4WNz=46MVlWJX_L@IO+}5<nU~Jk$-MC1
zn<gV7B2wI?h`J)Kh`4T%MMOkJiin7c6tN;ABCeMDLnGblYKbD^y8E4b-+Os8nMqnO
zI8El>bIv{Y+;hHj?zyst@XFDiJ$-#cyN7%GTDsd)tYOs}IdWb9_)UYoV*@SS$<9QA
zHLSbD86W5yyl!9&6DgXAd09hh#T<Vo*4B}V^TVuR`zp@eVpCnLq5o2Q%q2M01^yBD
zj4gU=CuVN;9cK+$h%bi5c{j(%Y-lh3NV0}|F?u+Bc48`>FS3S5eJ5GNQy6--`Eza$
zzI-|7^Sq~|>uS;D`}Op6E}t>@zS88Rs<VdIS3seR-Xi541M`Pa<OClnq|2(lOUtCq
zyjE<9CF88&Glef2ACH66F^M$QCfM&(+hW?i6|~kKH+8ax?=QBAZ&V9fCU2Hoy0Oh)
z*4V?Nxx8A)8n87?-RNEKjGKBXW0v%EVX$bb`*p!7XjXVx;~MbWI~mBE`?T4XSbLl`
zMz65>?NL%Jp(K>fgwmB{jS84MFCpf>qB>Q!sS*ltU&DFju+7}jrEKY7jn{*D>>|#`
zcWVdL5moPj-CMdhv&P$C*gdMDn%K?s=roj7$?Vur4lMd=&UdG0X~Dc|i1WbAT^k)O
z?6WXhVs5%No>Xu+jfXZklv1{_zM2kH4_@U^$z2WhE)oZ_$Kwu}b0XE!#HvT2`SWYZ
z!}g?$S#65vO<tPjlbX(p+6-$v8s+>eX)YWoKU%RxsLmSS?1Vifg=>ex?k$S&u9sp}
z{sjf!yLAb!ntsMxdCVor_CAE_Mjn&Pfg~A+@Q>l=mP(E(B?TRIG+WY(+Ju2ajIzd)
z3$zQCs?<K2i1RiM2RPm8$X!G$bbcweISwU2I*+jY*0LLG{LRZeK@rEJIc;WBE}vC-
zR^3<H&$D@B8j;F8EC0ZGFAWWs;B5)!Sqq*Gm(ekfPOF&%F57l&rK9sC;G<v3NqICK
zTbXB@IE`u!@xA_OczU<c#_DicJ9Ey^vOF{x5}TC5nP(gd?*nSg^BW8`D_kgp(8(KW
zMk{6wKCS9}Qcq8*Jd-YD4CX0Z$T<a<2$qMK=O6^!^GDAA?M7YZ`3r_0Ns`<V&Bzm)
zaZ{Z&d8VWraMQF46oEYg?wIGv5a<8FL3sWN?iW`Qw{!)L_+_5g5Fdt!;EA-ZrYTyF
z6tr}9LJk_SD5#^@;yYmfAi(*L%=0NiS;#Rp9ec0<+00`@2pwKX8z!f3%=7i1h;kPO
zobAa!nCCmFQn~A&y{yS2MuGBL(bTnq!J3*cAiA^p;&jQx*VQ26ur{qfG}42Sjlf0_
zsDy9AmnWtGSFEW60b4nq(Fz4P+ywa<GDg!5IAU#z;&g^J4PdD~*Aod$X66e80D;Mk
z684<lr<JhBTpsBMLbc2RLqQ@k2{f{rYQVPY6gM?Kqv;0(el*>J%)t4vzwzks=)}&l
zsYaFLR@O8LD6Jk&b|^{KG!2(uG}Eq7iepW83Tall6TcAgtm!_%Gbi)l4&KfWFQmk#
z2WkmSSppx!W}k+uaQ-jW^c=ptf}o<E_Z1K3b*(rB_he0Ppb&t?42nZzBCDroSkt>8
z{s<0C#4^{irV~gxpp%A{ha!o;0rA;I2PWr!^)j!&Sqi#gka;fz5I{(-l$9%aF9pGR
zA$e{AA>gn{)F|Gok#z*UfD;@K{DpbD#FmaT?@sXU!k7Q@e=zTj_;S1N3+BB8f0!##
zVz_tYy&Iw^N@$aO6F1DXZZPltHBiR;Frzh3QOafBC;m)d4%LH?@wg&nx&TakZ&CKv
zodHiw8r8vBXw**FT2~hHK2sn?>Jq?Y_2=4nEM^63n=5iDxl}2#3F&}&Ux?FMaJedM
z7T;-Wd^=Cj0lg{!c^S1t?TUiZf>!2zyNkrv<*Jufz3<xx|A`x#y<gI)pTVjBq|9?F
zYq-D-PC1artQ;gzY&usq^1$af^EIr7hg9Q>FFZnCGB(^hyp0bR3uRt15ctyN`9Z7t
zv(XXLu}vv%XaEhh42&pVW%8-CnaN4_!YZqlD=>WP{!W$<DcR*i;=3?(_Y!mGajYqk
z<?DKZSkLiBtKh&nV+%1a^QH79loZERX9Jj9Ldn{zj?=2!v1-3aNpnjWU_0tlxS?-k
z7wNaO8LKlqqHS@(g_Uo%oU{Ipy4{TOP658G<($5vyEyXA!a04o2>A}j=lMV>%Ly0r
z#r-^HC1c^3$kK&2O0N*~=mqdh2Oxb<ts|H01sC7dbM2l{o=1hCP4j{}X)@olDWEBd
zv~qhaTF3y|qDqHSz2UZG7h>D@GIV(znP#3}Ynpl<2~Ooj)GY?{9gEno=lc+=p5a?I
zFP5@7!F-<q#ed+@(VUvcy(h|ir|Od9^62{>We>=mOAr`-L7J{DKbcH0zZWF~IBbuM
zGCyuie!4Na)jpUml%TgiYU#a&`4u5I*`BDWxW5xw;0Fuy>{}c2UsIn6>ie%p5IamY
zu5`>l2H!iwYpyD`a~te!OR)FU!u&b-hF{0V?z*fJjO?O@N*4d2<uJtmAQb^UvJf(E
z%9}Z=_=Nvrk;ftb2<|`v*r>R{e_BcBIdSD={^y5jZZ>JNEJh&&ajO((Up0m7g&Ue&
zDz3o2{6~ej@)F{ZJ<d%Wt^xix+ey0_N8B<Rq`>l?V9A{;3ogz6k71*eBIkX@hXLlg
z+)>Rdq5t%iq!O7^nB1U}eFjEHAj`zV{PUtrr3@+s@f~ilKrH`nw@M+fe5!`!T}sd`
zb7_0Ih{YKMf{yU=a>AEAj0)j6k-*CBw&pXA@H(eb!Hc5_taW&E=f#UN3T$wA=lBsT
zKw`5=g_rS}!6%2$Yzp7;nZYNA%d@N_14w?(Pj#HQlw^Tz;%*~p&p=vhE~S)HturYW
zkhe%V^#gw^Rw0LuC`ut^;8!bVt&m`WAyG^c+i?~c2T)mm?h~c>w{E{+fr2}A1P%fo
z0{3`X;4iI69k_)R?8-)LpB&GyJ+F*=OL0F7Ji==ui7a7Q;K}8{B!DYr;KllQ5qRx)
z#f!i@zbjq@J~(f@2z+|pcoFy-Hu?^2x>_J$Rf{a}Gg7k^-m=KHk+mfzLRt>mp#$s;
zdIX1v*=i0Er<EKC#$dC!{)s@WoJ6z*SBpszX_b=*ryv()&UuGYaHF`SQo5T>wj%7x
z$<|zw1v|uAcH`2?aR|T!3+_NRrypeWox{VsqbxWej7R1h?611^jSch-vEUwufRF4M
z92&EuYg%0MA>kHrkt7LyL%oCjEI4V^U%_d25C!i<5C!k^vfu+(eO`eZfDNb*&;Vut
zGJqHW3>JJ0x?1QW+n>Rw1t!dKfDJ->CK=~Dx(T%pv*2^quIDI!q8N=~7$l;>9(+Y~
zB52>>MM7)^LJ3|RFnHgvb|?ujPyCnyndE<01R+h+k4q<*`=blwDE)h!1y8s@Cism5
zGQqR9O@3wFwg49Lds*nh)mBZZQj0}gl?)cT^rFw*cOr3x53T=w??j=imxG{C*97gW
zqO28oimny9(&!vp=&Fd{c37eFEXPrY)SICOYG|k1K|;IWAR#mlLbux{kv=AD!a{dk
z3_z75uAWE8>=Dj8i3=hX^My^i)o}wNi|(gZDrQvb78z8mqlHw^v;#zHqE^V{$}Ds@
z>WDeJMYv;e@BJ_f-7iXwg@*ik#8cFzOq7KlM*HqK3q8?SWiS_$GE((g0{c`C3Bx=?
zrg#CScy$#5lbUlpM`?#LOXzI|Ls%WV(EISQjs4@igM~gpAc}XTWJ>sL=u5nR;BN1{
zB2+7_L+dkm4ygIuV09^4c`Cs|KkX%|YE_ZUyK4=igI@8dL7nqjO^-MWHwdGJ!{~4c
z)l;4HBo<z^jOK+X3$HsD&BL+t(i~UhbJaX0HQ#P)zPU?i-hVY&s=Aru*l7WesiPPk
zk>%;!BKjR1uTx}+n}xWV66yUaoDB<t<1Ad13eDOI$=Aj3z2~YBy|RQ4%jFg;B->2k
zM{&IrKhhT#wnOP9{FI~2vr?ItZDo>MgmqrG%D>7EBQ{!@dRX|F<o^(H5dO@|!lzaO
zCB;hykO!@N7XF?Zi|%e@_!nUB8T1M_!!8kTugG%a+n}v11Q&a695Z{j;h(pxE}#uy
z^o$v2krgo^qi3X_h^UyX<;5(r23=FSglBY{j(Wxr5cRT%vK+`pI-etpLO|b8-|oHJ
zNF57Sv1Zg-xh}wpf)|T8wXVI11r)|+swLS6H*Q09eUiNkBrI}`8?hsJ!i<dJbKA0e
z%zZ(7JoeXmEhIq6(pM|XB9u|;$v{p&HyKG=hF$Ur;qnW;bJ}aA&XEpPTtu%h%v~_b
zp|aTUVz+~qa?oC$_Eb$KHd9GPYFCbsf|Vnr%7X}+2$~I%BUe(;Amwl!9s7JyMGMeG
z9zoxIRKxSW$|BEGiz`bsu_9QHqNc?Esqj#1aodk*=0Ak%@>mOtyh#$@gT#+FpmU$o
zbdn;U-em90>7|X{G{_<+FDId{Rv2}))+@6uN|~bKGzwnprAF2f!_!fvy`wd?xl@ti
z<YSrQVpF<UWS+FZ6K8X<bDr<QD;gexL><B>^SF?;QGze1MXpUw@-)2*mZs1Wo>FJf
zMo?Mv$}3QIRy@90ixKzwIBQ;u$D-5d<`ws&Z=-N}u$!1R@gCH?A>nA;4`RG6wcDBs
zX1rG`__0`7a{|@qi3I_+%+`*!Bx~M=Nk{e-38V&#ueF0U_o6MfFxi30WG8DLLaJM2
fv8}>j4l!#U@2EkQOjMFp=*^n<t>|8m@W1~9Gd^bd

literal 8925
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

diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas
index 4418611..e8b2b75 100644
--- a/!TheEscape/!RunImage,ffb.bas
+++ b/!TheEscape/!RunImage,ffb.bas
@@ -8,6 +8,9 @@ IF INKEY(-42) THEN
   SCREENGFXHEIGHT%=960
 ENDIF
 
+X = 0
+Y = 1
+
 PROC_main
 END
 
@@ -16,8 +19,8 @@ DEF PROC_main
   Scr% = 1
 
   DIM PlayerLocation%(1)
-  PlayerLocation%(0) = SCREENGFXWIDTH%/2
-  PlayerLocation%(1) = SCREENGFXHEIGHT%/6
+  PlayerLocation%(X) = SCREENGFXWIDTH%/2
+  PlayerLocation%(Y) = SCREENGFXHEIGHT%/6
   PlayerVelocity%=0
   PlayerShields%=100
   PlayerStructuralIntegrity%=100
@@ -35,26 +38,25 @@ DEF PROC_main
   DIM EnemyLocations%(MaxEnemies% - 1,1)
   DIM EnemySprites$(MaxEnemies% - 1)
   DIM EnemyHitboxID%(MaxEnemies% - 1)
-  DIM EnemyVelocityX%(MaxEnemies% - 1)
-  DIM EnemyVelocityY%(MaxEnemies% - 1)
+  DIM EnemyVelocity%(MaxEnemies% - 1,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))
+    EnemyLocations%(Enemy%,X) = RND(SCREENGFXWIDTH%)
+    EnemyLocations%(Enemy%,Y) = SCREENGFXHEIGHT% + (RND(SCREENGFXHEIGHT%/2) * (Enemy% + 1))
     EnemySprites$(Enemy%) = "durno_ship"
-    EnemyVelocityX%(Enemy%) = RND(10) - 5
-    EnemyVelocityY%(Enemy%) = RND(5) + 5
+    EnemyVelocity%(Enemy%,X) = RND(10) - 5
+    EnemyVelocity%(Enemy%,Y) = RND(5) + 5
   NEXT Enemy%
 
   REM Show/hide debug display
   DebugOut%=0
 
-  DIM SpecLocations%(1,49)
-  FOR Spec%=0 TO 49
-    SpecLocations%(0,Spec%) = RND(SCREENGFXWIDTH%)
-    SpecLocations%(1,Spec%) = RND(SCREENGFXHEIGHT%)
-  NEXT Spec%
+  DIM SpeckLocations%(49,1)
+  FOR Speck%=0 TO 49
+    SpeckLocations%(Speck%,X) = RND(SCREENGFXWIDTH%)
+    SpeckLocations%(Speck%,Y) = RND(SCREENGFXHEIGHT%)
+  NEXT Speck%
 
   REM Used for centiseconds per frame calcs
   Cents% = TIME
@@ -91,7 +93,7 @@ DEF PROC_main
     CLS
 
     REM Environment
-    PROCspacedust_draw
+    PROCspecks_draw
 
     REM Player
     PROCplayer_ship_draw
@@ -109,30 +111,30 @@ DEF PROC_main
 
 ENDPROC
 
-DEF PROCspacedust_draw
-  REM Space dust / stars
-  FOR Spec%=0 TO 49
+DEF PROCspecks_draw
+  REM Specks / stars
+  FOR Speck%=0 TO 49
     GCOL 0,0
-    LINE SpecLocations%(0,Spec%),SpecLocations%(1,Spec%),SpecLocations%(0,Spec%),(PlayerVelocity% / 3) + SpecLocations%(1,Spec%)
-    SpecLocations%(1,Spec%) = SpecLocations%(1,Spec%) - ((Cents% - LastCents%) * PlayerVelocity%/10)
-    IF SpecLocations%(1,Spec%) < 0 THEN
-      SpecLocations%(1,Spec%) = SCREENGFXHEIGHT%
-      SpecLocations%(0,Spec%) = RND(SCREENGFXWIDTH%)
+    LINE SpeckLocations%(Speck%,X),SpeckLocations%(Speck%,Y),SpeckLocations%(Speck%,X),(PlayerVelocity% / 3) + SpeckLocations%(Speck%,Y)
+    SpeckLocations%(Speck%,Y) = SpeckLocations%(Speck%,Y) - ((Cents% - LastCents%) * PlayerVelocity%/10)
+    IF SpeckLocations%(Speck%,Y) < 0 THEN
+      SpeckLocations%(Speck%,Y) = SCREENGFXHEIGHT%
+      SpeckLocations%(Speck%,X) = RND(SCREENGFXWIDTH%)
     ENDIF
-  NEXT Spec%
+  NEXT Speck%
 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%,1) = EnemyLocations%(Enemy%,1) - ((Cents% - LastCents%) * PlayerVelocity%/20) - ((Cents% - LastCents%) * EnemyVelocityY%(Enemy%))
+    EnemyLocations%(Enemy%,Y) = EnemyLocations%(Enemy%,Y) - ((Cents% - LastCents%) * PlayerVelocity%/20) - ((Cents% - LastCents%) * EnemyVelocity%(Enemy%,Y))
 
-    EnemyLocations%(Enemy%,0) = EnemyLocations%(Enemy%,0) - ((Cents% - LastCents%) * EnemyVelocityX%(Enemy%))
+    EnemyLocations%(Enemy%,X) = EnemyLocations%(Enemy%,X) - ((Cents% - LastCents%) * EnemyVelocity%(Enemy%,X))
 
-    IF EnemyLocations%(Enemy%,1) <= 0 THEN
-      EnemyLocations%(Enemy%,1) = SCREENGFXHEIGHT% + RND(SCREENGFXHEIGHT%)
-      EnemyLocations%(Enemy%,0) = RND(SCREENGFXWIDTH%)
+    IF EnemyLocations%(Enemy%,Y) <= 0 THEN
+      EnemyLocations%(Enemy%,Y) = SCREENGFXHEIGHT% + RND(SCREENGFXHEIGHT%)
+      EnemyLocations%(Enemy%,X) = RND(SCREENGFXWIDTH%)
     ENDIF
   NEXT Enemy%
 ENDPROC
@@ -166,16 +168,16 @@ DEF PROCenemy_ship_collide_npc
    CollidesWith% = Enemy%
 
     REM This is our hitbox
-    x1 = EnemyLocations%(Enemy%,0) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0)
-    y1 = EnemyLocations%(Enemy%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
+    x1 = EnemyLocations%(Enemy%,X) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0)
+    y1 = EnemyLocations%(Enemy%,Y) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
     w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
     h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
 
     FOR OtherEnemy%=0 TO MaxEnemies% - 1
       REM Collision with an enemy
       IF Enemy% > OtherEnemy% THEN
-        x2 = EnemyLocations%(OtherEnemy%,0) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),0)
-        y2 = EnemyLocations%(OtherEnemy%,1) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),1)
+        x2 = EnemyLocations%(OtherEnemy%,X) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),0)
+        y2 = EnemyLocations%(OtherEnemy%,Y) + 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
@@ -193,14 +195,14 @@ DEF PROCenemy_ship_collide_player
   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)
+    x1 = EnemyLocations%(Enemy%,X) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0)
+    y1 = EnemyLocations%(Enemy%,Y) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
     w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
     h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
 
     REM Collision with a player
-    x2 = PlayerLocation%(0) + PlayerHitbox%(0)
-    y2 = PlayerLocation%(1) + PlayerHitbox%(1)
+    x2 = PlayerLocation%(X) + PlayerHitbox%(0)
+    y2 = PlayerLocation%(Y) + PlayerHitbox%(1)
     w2 = PlayerHitbox%(2)
     h2 = PlayerHitbox%(3)
     IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN