From 53aa6d698d87933e7558d6bf538e6b994e07686b Mon Sep 17 00:00:00 2001 From: Simon Kellet Date: Sun, 21 Jul 2024 13:47:33 +0100 Subject: [PATCH] changes --- .gitignore | 3 ++- Game/GameKeyPressed.lua | 6 +++++- bullet.lua | 0 game.love | Bin 9410463 -> 9406659 bytes 4 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 bullet.lua diff --git a/.gitignore b/.gitignore index f7323a8..3dfe424 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store -game.love +*.love +*.exe diff --git a/Game/GameKeyPressed.lua b/Game/GameKeyPressed.lua index 4af69a6..bc633df 100644 --- a/Game/GameKeyPressed.lua +++ b/Game/GameKeyPressed.lua @@ -13,7 +13,11 @@ function GameKeyPressed(key) DebugFlag = not DebugFlag end - --[[ + --TODO: Move player movement code into here! + + + --[[ + -- TODO: Better restart if key == "r" and not _G.PAUSED then love.load() end diff --git a/bullet.lua b/bullet.lua old mode 100644 new mode 100755 diff --git a/game.love b/game.love index c544369329d39bf7d62290aca9ef51bf53db44b4..3f38fce18deb75082093a64923e3d39cda1a4f92 100644 GIT binary patch delta 5135 zcmZYC2RxPE{{Zmky0&ER8KSbTkyVH&Q8FUgdt|Ru#i18)vAPF`BDIg7GC=}1lbMmw&tI6G*R+B3WJ0YKmjNMC7=ulKn17*HJ}c* z0}Y@Fv?w*X+Nt8SnpK*#(^Q&tzz(nz=mI^U4|V|qU;tC24D1I7 zfH^n_EPy4j0@mOVumQH5+<-gq0G_}Lcmp5c3;e)Q;12>o zAP54%AOwVhFc1zRKqNQ@qQG$w4Prnnhy(Eym8OKZGqm2}EhDD!mL-BDkPJ?M6mSxx zf;5m0GC(HC0@)yk!dphF9A)YAU$$HNHTqSPe2_ti=)PX=t%+24M;>QGaP-SK1fl0e z5M;KbKkMl(-k!0DU(#+|VIgN?*^aZn9J(8{=-RMc!z3T`vanR$OS9P9@afClTb6Fl zxNJJUpg*ABLF_yiwOASA?rc`t=3o?YFTRox_cS^ZMf3DQNMIm;jNDJyRa`^%VK&nU+zbBz0Wo%+8lj)=>7Ma2LEZXr^Wt9hl4cK zpZRJ|gdfql8u@GVX{Uei=dWMerXSTJK_A?&-|zX5vb&!@(lh!*RNYEioTw*j)2p7F zFYa{b5^wgnjE$_X{V*8pc{RmT?zDDF^LNI4=sNF{lFM`&MsJgu%pY6vM>k$_j@B$; zAKZT4ZOvP=VSMXdZT?xF`Y0!3&pl@!I0|}qtuMW}qo4i0D732fdac~MnV5^UwGB7+ zD6M6QEw(#x_}#JVwQH3Qjrj5bPiooD;gi;rYFXUu`6=e~wyb^1l0muA(cKCepz>aWW&kL#xv#{PB|uw_bS$iHmMH}$LqaZKRs zP$ddJF+dDfV^-HB@h-Cd67e8+Yr8!<>_dF6#%a?g}-mX z*8Z^RVDUX>d-aDMnJd*PLTTkf(k;9xY|ihBg&!Zid*9gY@af6a@YGy!oQ0-|y2JL< z8gh|0bvK#R<8elIEJl(!lEmaIjC4=U1U1ORBevq_OFy!4iA1?%akHv*rX2soK5<2; zfWLO($Cq)LqVlQJ2h6VNdMsMk+2n1WFx@7$fw9W8nyuu`CDN74vChM}{y~I{;g2Gu zDCd(OCTF)~pUvxua5r!JJvZ`b&&x_5;@4uS^YIPLF;>03ZVFpRLxXp55PiaP&8~d9 zZd}S|74}9NFQM#`RBu$&%Yd;w7#>;wp4n;l&QpFHAGW(PsV!h6@=mLJ_?}14Un$D( z-#Yo+!Bu%+@QuNgCzFiWEL~Oq!MOM=71f>5>}Hi>6XL`14x;Qun;)?=JcuqgeJvgH zHUDPDZCiWU$-bUPg!l3kwzHdvM))|<61x4BK5j2WZu8ukRc3fG!=@*1rOG@O>KfUZ zA(rmySm<5qp;F>u{KN3`u4jR~KUxA!2}KsRW^M%Xd3QsFVCse8F9qa zC{jKxBscJ6KUQr!HY(E9!<-ZTZdH70P_TNdcKhD%cbYXb4l!xkx*l~rC|5bx#5K+Q ztTdr?)jVEnXSaiF`@1jFF{QRgh|T3^-VpBHJkh7W@nIS-VOPq>DDRXomv);si{1{U zibpaFw8@MkT75NdF^&wGtv7B|t#RDtOk6`2P8^+&X`F?fNoDWAO zca-+T5@GNAEr!Q>m2O3gnJis&P2uXWUJ*-<8sRjJiY>P+_SqV9BT2`%E61OBb&<21 zKB7$|@FsiT!F>$;(S#zpY@0K0j&LW1o$F<@l`*um8m=|$IfSLZ=e*D^<@jlD`s=Ub zOQXZDgj#LCM1Alf`7w1>*w`hEG7|27HBG?3WtFE>U((K~et4YV8)o5kllMv3Z$6QW zP7^Xuv7^T4jEU)OKAYJ}pA*VZUt&AwlvMSD{4El>Um9*ST+>^Oob!)KG}CupkK}Vc z5Oh9jh5V~lWIgD7r9|Cg(}=u=RUP({A;8_k4d(k0*WY3)Ln4pg%LbaocDZ(fRd@ zlQ|FElmp{`23W7WJzWyPUdWX5blb0Q%{{wk^`czoMTS{pb=_yZ=DJJQJ?FctocPx( zzXk2H(YKk;JOA;sz~}YRx{`$hB}MIzUOi?1a^Fd_d3Ig9hG5Cl7_(YLl(@z}bY6^Y zxF+Ssb91M+Y43eCi5y*=+iW!Z@cN1js1CNqMh<0Hqi!j%#aL9Bs2;FvXWYK`aWs7V zF~E$7A|Am(-bw+HZZ?Nl5WEa*64d^?Q8CURzlm87aJpnBcbOq+5uT zxqIPj?yDicQ*)-w=HsWdHCg2z=K30#v?TMV?2I3*lIS<>x^$nE&`8-c|4H@ynj|S~ zD8t@0aey+*AW-Gl_GK^eo~b<^|8nJSWuNYd+0dzkp2!{YHYeZi@XtN>1CMFg;I>m= zfD&Yblfq$!_P9t|_PRap5{~Dx-?AOvTrM03Tbeo`fQVw|`S7OjE|I^=z2m|E+w{ce z>Ia`7aNhIzW$n1L6PbR(uob_xz|=;#YCy^IkaoyEi=3R^YusbEWtUL9>3dNz^CQ0_ zd@lGO%}F&p_C4FfFI4ani(beEZJ$}8IEI<+%%VqMokOml{j~5~N3(5t5BJvnj8#O< zbB<}9PFK|np0Km&-mXk-U6E3H5_r4m$u_3;v-@3Et}Pe_I~+(VKACo5X|r+*eNfmH z?suXU4wcd~xoSgw+}~w(O*6J_`W`+uDfDRJgA!`$92cj$`b|IlY|U%08}wH`@tipv zX2e#}v}1_=vLENpGfDFHj*DgMA&FBbv?*c+QWA?VWc>U(z1H7ZB^cLd2PB8cy7hSQ zF4q2}!;+kETGU=_<*4w+VUIm<1lkzEdE$~<)wpzM2bIQa(dz+TCMXgJQHq ztL<+tYJxnbCD8iNmtF{KjYbt|m&!Iy;>eGaXy=F4)ubgM@H!d%ai5L7BsG>>PJK@;rdt2C-|#Gt#>HZ-MSaP zDc|qR)Je-1@?I|28V57RBO|p$SDSw-;)^!MPuCPQcYR5@81u}mrb%^+8GB~;!Sppl z`2n`tjx~`96=J8^>b+3;&cil2dwpW}+GkC@IL;l&ZguQ^m++2El2wSrEp`8ZIc|Yp zX|s2%xgG>nPxrfA{lxk5V{>)q&DM?k`?xY)jws6BKWxdW!RV{Obvv~8(=GS>y&k1& zDetsoS@iklT6es@9x?D%CAfO#Witzz(4}>${eESpP;FMkcEftLY`Xk)rH*6w$hH0~ zJYI5BOrD2t2Br-C7%bz#bj$C|*B9@Ut9Th{J*^d8;v&y>teM5VuSBvm=G%SosslFb z2>EkaI5nVT_wraw$^}QuP>Nk}d9*=BQE}0xnIoe$c^}~2s6=y9wg3uVOmGf{CmaXdDk ziK=3HC@PMZVMH(&6ji_oMW_s3niatg7oq#`9*_`^Lq)OnB6Js?X9I#gjz{@1K@4(3 z8xagmLD=pceSD&|1gxsQoshNWxlBRIw-px-}yYN(_`qSX~}!f=`6RavrL+>A!3H z-wk-Ekf34a2nP3=o7brNP@fGR*+GI+-ABup*^nlXk% zSPE*1_thX_-6_zq%^D+I?;sppANWw@fLBl?OjW2s zRI%Vss1(T13)1{3c7Ti?Vrdrq=O(Nn7Zt!d$*3-Vi!fAGfT~if!ov!HX&0d)+_}Q& zzf<qfUF;$UKn_^$oyJs?y;xxI|EFF&(;#TO7qqGN30nN}$-O4Cn?mS(Ln3%ZIUL zLU?jW@T)|{)MKy+_Tm`G=S)p7qQ$$`Elf~R3d}%R$*0fMRosd|X+xj^e-l=Hm@9vn-I!k6& zljeNbH%0a0j-1v;XH}RB8B#SR{(eAgf*?lXeoewKZZQnQUKLvsw=BdiKdjcS?<<N}Zz&N$|C8BNUq!-5?*E;zu2Ngoc9ZLu=c4i;lL&GVzxnzcxI2S{5x zD3o?STr0wDDbgl>(dA}CExk?T9=m0{L4IXwJkth`Kpd?>Q&%`Wjbxid$iJjja* zH^+9jG3rf6iN%r4=F1(-R!S;G>>Zow5`4JtP2NRoCE2&1ZpeK4eXx1I{j$X8*}oSx zw5!An`KTTkDS2R^S=Z;>Q#sk(u=M1lN1fM+s1qLL-LbEpzA}AV{`vv;MW-`%`_7dL z3|e*dBt9sRna5?_kUxxHINm3hLp!{_t1Y{t=R)>D9){yNM#A{i$i>&P@c|AoaT6&I z;;d;3t*$l!ca*pXGoxRZ(f;t|ySw)jDyx~Sdm61?zN+xmft18ZrA2x3@b=Hhj>QNz z3Z`1Sh4uS;KQxqitr>p5F6wi4{5wYZsd`$QhI8zh#Kn&0kEqvt8%_0%@|LQWjHK^5 zqv@;79eBNm)y>1JKXMqZN#2j*!>9Y(0(3g z%E$N8xq3}N%4PQm<&2ushIeXClWv~#nU+6IAqg9={w66v$v|R zow>0*pKrK|a(ScTxW>*iqQ)DQn!BEJSs1j6tN9#x9cVZ?AT1{tT%2GK@lSnRgq#V$;og zx~@N7xO!TRv?XZtmI5;*|JXr;lJhF32R$mXY8Zp<4BolxuJU$|4CDwWURf}zkRhB` z8>0GwQd7KT8Oz;Yqd@FTMv-(^P+Lw#wU$%D#btapM2m$nW3SY?Ad66k7YX!LyG^)g zY1Mnu(xhv0PA%QN+w0b3v1p8EVv+QIvTw-qa}uhBaa?mIw57X34FZ*2pHB_9+g5TL zTkhK{5Pxat*zIRZc3r1#sYwYr{YsHEWYOfpg5RELR5Wf~C3;dR|5T zWfeWq(DU@9K5T|D^)h_EPg~weaZAUm#Vhl~FPVSEi53h&5e(+hL1-`QlWq-7M)7*aMc*}6BQ{s9-A#C#x} zyVz7=B2ZExHC1%PGbdmCYB2TVOOv;Q)1i@u)V(WMQYw=sd+Qn2<4;wS79>~gqO|NI z5KYa!Ua&%OC-1n4ey2jp{v)2@?;I*4&Wp8HlG`e6ZYm^PPB++Q5x1S&&aFg-)b1-R zJ}g*kP#JdU3JUeinBcD4U@KT0!?fkPn$dIe(p5C_|tWT z-QK;*Ba2$bs5ka9Zlo105$ctD+9Ms*P<{8Zcj0#TQ+vWJ|NN}lvd7e4(y8LeArTt$ z;kfL~e8(;G^OB$GES;8cAKY|9Rz#7fJkGSpGQnM<3_T~r)T4jbZj3CU zT_7(KrFh51o2m}WQ-*S^aFtE`Ir3q)J)?FL6Ydj{p2_z`-qvM1?r7e~pIme(QjBEk zi~7z8D|~R%&ERj*NMU4mG>2WG#M4Wiivlzfn$wpDw(bgUoY=i<{i{sftl@;w6T zlO4;2bk}bS3)sQku}hzvkZ-fgHu9L@0-sH*n5&CE=SCDSA_aBt9HJkpGZ-xu9lO$< zvz4#4tj8(!0dMt{DM~7Cu}vJ4{!rRR2~d(UTvn~`MH$X|FR-hZQ59YIT%?fkw z{yKLahv40v){UF5#N+y|wX#@4c0kicOuBNh0?yRy4WNN%pK@>9r}; zrrs9M;rl!4i*DcD|AJP@FxwXRi87J){%NE9<>ZVlVSM7@%gC=rS}#4RMh#{u4aeyb zH|(3XU(39-_1Bb{yF&-#$`{<7;bpaY5mb6{bInupzGl6xsQs^FXFXkd9ee4Aw=SFE znK{o2QcHF{Iy@Hj=CGxF-N9cT<@@Tv$;-oQNL>AX5-kgZkVFgX{U3wquce$RkB^L9j|7O z`pqYgwQp*5ci3Ge^SNlKE)-}G*zV8EYtyQ^@Obg_g{l^jb_TwW_H>9I;As$`DDFt? zYj0vUnY~w~Y&@Q*u@Phc454ZUAt58kwl9Ph9lh1(tBKBQ)cnCAR__t!GZLf5y@bkb zb1xwbyr}}%>dDS8(J9I=I@-_o>!h+oEw+04Q6SmPh3M=trWWVH$T8;hLNp^rgtMQbP;r8;&sKW; zn8(pkYVhWPNf!`*lUx`k1c6u+MT`GVL`rKH`YUM{vc~n9{v>o;nuukuio(?hC03XW z(T8(3p)4Yl_&6+wX3qS-gESy?GVvS!Zn9j7{*81WB; zUZ=&_=eOCKM}+-rq3-gu)!}j%B+e!7jPa74P+a^l-xCk7yC56!F=XJ#?%F_=;9XY& zZLDRS3gZ{8(y&}|TDxFueA%_Z|{41Bs=j}K8FR)^i`r=@^ zRTOww1BgN_A(I$>|K@Jhs}%a52Yzt&>)ncgGV%IsP58R9YWd8WNPOZPqXZ%m=!$0wvcln>ls=6^UvuX7uM%C!EM+Y<(XB*ldT3frpdW8G_ zPVN3m(WhCSnzt64s;?5kX>?JWlE$cSEKwp4nW2b{I0#3o_^FgWTzyt6Cd;mW%2M_=R0U=;6APlhQiU9KgQD6Ze28aU^fFvLVECi$h z89)}01LT24fC8WhC;`f>#(65ETDW;lN%nD56+jhG0~Q17fCiumXaU;558!b+r@o4Em|ifuD?45yqJrPK;x7!Y3@`|?($7Np+cgv6 z9S%B3Cl=tKgb^*7SdNqDV`zUeVS|T3<9RaSjOUADXk`lFg7-tiDU}dM$5Mz@xcY)G zJyI%RkFOW!^fu!~CSQgxrxJE}ko%XOCWBaqM+IUii9xJDLTQ9N-jqhR!5P3VS zTMLck?ZkS#?jVMGwiB-S$qEcFw}XsD%w z5n0bLl)`RwL*wieQx=V<6Bf9~7>2ArFy)X_2J~z{V5lI2pyKytFf^J0mWq)`$SRZ2 z;{?v&XMH;xoY`dc;U|5ob|EsLc2RmPM5ZwttUJn2LVaxayH=BsUJhZx_EjD?b|xW_ zIJhV5_@mS$7&3Arq4Fd+F7}ZA&sz7}Bgu0oVWD3|2y6;sg0rd8&kFL}d7;0MFjPh- zBymuWoC#__OSW$(Xi-TRTeZw4F=#fO9bo)mveesWzZnq#*^UOAo*s|D<%&88-Xubp?Hk(LLcI5Gt4J2enCrlK-(*fP?r=TjjXpp&)bKDa<@TVat>898RlJsA-m+i&-oQpNIcb-goG2|x`*vnMLr3T zxbJ>nhEB6b?w2r-a3W#AE;;h}@k9ds0X1gUj8$=jyvPMQfjP0O@T}*(1v3RBO$t$