From 50c3e41f0c4c245d2d81f4ee7dbaf1a9116e5b5c Mon Sep 17 00:00:00 2001 From: Travis Shears Date: Mon, 13 Apr 2026 16:03:33 +0200 Subject: [PATCH 1/4] scale up window and add battery indicator to hud --- two_player_cleaning_game/assets/ui.aseprite | Bin 0 -> 607 bytes two_player_cleaning_game/assets/ui.png | Bin 0 -> 574 bytes two_player_cleaning_game/main.fnl | 126 +++++++++++++++----- 3 files changed, 93 insertions(+), 33 deletions(-) create mode 100644 two_player_cleaning_game/assets/ui.aseprite create mode 100644 two_player_cleaning_game/assets/ui.png diff --git a/two_player_cleaning_game/assets/ui.aseprite b/two_player_cleaning_game/assets/ui.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..99fa7e8c996de4b2dd90d800f127a075e2fe4c6e GIT binary patch literal 607 zcma!NVqkc%l#yWqV+w-;10w?iLkbWh06POCNRUAQ2x$TC15N++kp*lk3(x{FAZAwp zTZv?y3y>|Tzz!8*Lz00p-JIh7Gcf$mEC!OI6+J+bVdp-O$cDur^4*#L@<1UL1!kBA zAPrK)&ft?+nOdY^7zVVHRRJRV9~dYQ01B3hId5-m6g*@g;BxUEM-1E9iw)ch#iAy# zKlhtqcq?-6gQxa8tW~Avf0ux10@E?K>usL z+aKmJmY1?V_hT=)pkH-uQhwjIdFzZWTKi6Y5$V0p{8rVjQ!ejKLKmg${=Ap*`lXie z-pe7K^R_;zUc7esYM(ED!Ky$_?|acTah?5l`J~md|F2Vc8OudcTtj!x13va+^%3j< DI>>tq literal 0 HcmV?d00001 diff --git a/two_player_cleaning_game/assets/ui.png b/two_player_cleaning_game/assets/ui.png new file mode 100644 index 0000000000000000000000000000000000000000..0abe1e2b41272704dbd430be9be5c93ffb929535 GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCr*NsAPCdE% z_4VhaObxB`-1r$DNf2r)7$2%=Fp8vZ^ssXDZ$|MUyi&pFX)Pkot~n&0v-fBC0Q z#`f{P{?jIV_w~dT&d)vl=fJY(q4U2bnAM7Yir7}M_TG(aIhD7)SW=EHTkj-y>R-XF zdt0kEANBrqY}?bYdrw8h7&;pmCU9`TsFUaTmp=R1GyQ&%-M-#=2kJL`nx4qSFVdQ&MBb@0I;0AjsO4v literal 0 HcmV?d00001 diff --git a/two_player_cleaning_game/main.fnl b/two_player_cleaning_game/main.fnl index 586c65f..b8341b5 100644 --- a/two_player_cleaning_game/main.fnl +++ b/two_player_cleaning_game/main.fnl @@ -2,20 +2,50 @@ (local levels (. (require "levels.fnl") :levels)) (local bump (require "bump")) +;; colors +(lambda color [full-r full-g full-b] + (let [(r g b) (love.math.colorFromBytes full-r full-g full-b)] + [r g b] +)) +(local color-pallet { + :cream (color 255 238 204) + :dark-purple (color 70 66 94) + :dark-pink (color 255 105 115) + :dark-blue (color 21 120 140) + :light-blue (color 0 185 190) + :light-pink (color 255 176 163) + :black [0 0 0] + :black-half-tone [0 0 0 0.25] +}) + +(fn reset-color [] + "reset color to white (no tinting)" + (love.graphics.setColor 1 1 1)) + +(lambda set-color [color] + "set color to the given color from the color pallet" + (love.graphics.setColor (unpack (. color-pallet color)))) + ;; global vars (var player-art nil) ; 25x50 pixels each player is 25x25 (var dust-sprite nil) ; 35x35 pixels +(var ui-bg nil) (var walls-sprite nil) (var walls-batch nil) (var wall-quads nil) +(local screen + (let [scale 2 canvas-w 800 canvas-h 450] + { :screen-w (* canvas-w scale) + :screen-h (* canvas-h scale) + :canvas-w canvas-w + :canvas-h canvas-h + :scale scale + :canvas nil})) (local camera {:x 0 :y 0}) -(local debug true) +(local debug false) (local collider-debug-boxes []) (local bump-world (bump.newWorld 25)) -(local player { :x 50 :y 50 :w 25 :h 25 :speed 80 }) -;; Screen Size -(local screen-width 800) -(local screen-height 600) +(local player { :x 50 :y 50 :w 25 :h 25 :speed 80 :battery 100 }) ; 16:9 (Modern Widescreen - Recommended)** ; - **640x360** ← Best middle ground ; - 800x450 @@ -28,18 +58,20 @@ ; - 1024x768 (fn love.load [] - (love.window.setMode screen-width screen-height) + (love.window.setMode screen.screen-w screen.screen-h) + (tset screen :canvas (love.graphics.newCanvas screen.canvas-w screen.canvas-h)) (bump-world:add player player.x player.y player.w player.h) ;; load world images (set walls-sprite (love.graphics.newImage "assets/walls.png")) (set walls-batch (love.graphics.newSpriteBatch walls-sprite 2500)) + (set ui-bg (love.graphics.newImage "assets/ui.png")) ;; load wall quads (set wall-quads []) - (let [(h w) (: walls-sprite :getDimensions)] + (let [(w h) (: walls-sprite :getDimensions)] (for [i 0 19 1] - (table.insert wall-quads (love.graphics.newQuad (* i 25) 0 25 25 h w)))) + (table.insert wall-quads (love.graphics.newQuad (* i 25) 0 25 25 w h)))) ;; load tiles (each [_ row (pairs (. levels :level01 :tiles))] (each [_ tile (pairs row)] @@ -75,19 +107,15 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) (print (if ok (fennel.view val) val)))) ;; drawing -(lambda color [full-r full-g full-b] - (let [(r g b) (love.math.colorFromBytes full-r full-g full-b)] - [r g b] -)) - -(local off-white (color 237 230 200)) -(local black [0 0 0]) -(local black-half-tone [0 0 0 0.25]) (fn draw-world [] - (love.graphics.setColor 1 1 1) ; reset color to white (no tinting) + (reset-color) (love.graphics.draw walls-batch) -) + ;; draw collider debug boxes + (when debug + (set-color :black) + (each [_ collider (pairs collider-debug-boxes)] + (love.graphics.rectangle "line" collider.x collider.y collider.width collider.height)))) (fn love.update [dt] (let [deltas { :dx 0 :dy 0}] @@ -106,32 +134,64 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) (tset player :y y)))) ;; Update camera to follow player (keep player centered on screen) - (tset camera :x (- player.x (/ screen-width 2))) - (tset camera :y (- player.y (/ screen-height 2))) + (tset camera :x (- player.x (/ screen.canvas-w 2))) + (tset camera :y (- player.y (/ screen.canvas-h 2))) ) +(fn draw-ui [] + (love.graphics.push) + (love.graphics.translate 0 400) + (let [font (love.graphics.newFont 10) font-small (love.graphics.newFont 6)] + (set-color :cream) + (love.graphics.rectangle "fill" 0 0 screen.canvas-w 100) + (reset-color) + (love.graphics.draw ui-bg 0 0) + (set-color :dark-purple) + (love.graphics.setFont font) + (love.graphics.print "Battery:" 20 6) + (set-color :light-blue) + (love.graphics.rectangle "fill" 72 12 (* 152 (/ player.battery 100)) 4) + (love.graphics.setFont font-small) + (set-color :dark-purple) + (love.graphics.print "100%" 229 2) + (set-color :light-pink) + (love.graphics.print "125%" 267 2) + (love.graphics.print "125%" 306 2) + (love.graphics.print "150%" 345 2) + (love.graphics.print "200%" 382 2) + (set-color :dark-purple) + (love.graphics.line 0 0 screen.canvas-w 0) + ) + (love.graphics.pop) +) -(fn love.draw [] - (love.graphics.clear) - (love.graphics.translate (* -1 camera.x) (* -1 camera.y)) - (draw-world) - ;; draw player +(fn draw-player [] + "draw player sprite and hitbox" + (reset-color) (love.graphics.draw (. player-art :player-sprite) (. player-art :player1-quad) player.x player.y) ;; draw player hitbox (when debug - (love.graphics.setColor (unpack black)) ; reset color to white (no tinting) - (love.graphics.rectangle "line" player.x player.y player.w player.h)) + (set-color :black) + (love.graphics.rectangle "line" player.x player.y player.w player.h))) - ;; draw collider debug boxes - (when debug - (love.graphics.setColor (unpack black)) ; reset color to white (no tinting) - (each [_ collider (pairs collider-debug-boxes)] - (love.graphics.rectangle "line" collider.x collider.y collider.width collider.height))) -) +(fn love.draw [] + (love.graphics.setCanvas screen.canvas) + (love.graphics.clear) + (set-color :cream) + (love.graphics.rectangle "fill" 0 0 screen.canvas-w screen.canvas-h) + (love.graphics.push) ; stores the default coordinate system + (love.graphics.translate (* -1 camera.x) (* -1 camera.y)) + (draw-world) + (draw-player) + (love.graphics.pop) + (draw-ui) + (love.graphics.setCanvas) + (reset-color) + (love.graphics.draw screen.canvas 0 0 0 screen.scale screen.scale)) ; (love.graphics.print "Hello from Fennel!\nPress any key to quit" 10 10)) (fn love.keypressed [key] nil ) From 0d29988a6602717b00fbb6afd93211e6727dca99 Mon Sep 17 00:00:00 2001 From: Travis Shears Date: Tue, 14 Apr 2026 09:27:11 +0200 Subject: [PATCH 2/4] add player art for all directions --- .DS_Store | Bin 10244 -> 0 bytes two_player_cleaning_game/.DS_Store | Bin 8196 -> 0 bytes .../assets/player.aseprite | Bin 666 -> 1996 bytes two_player_cleaning_game/assets/player.png | Bin 355 -> 436 bytes two_player_cleaning_game/main.fnl | 29 +++++++++++++----- 5 files changed, 22 insertions(+), 7 deletions(-) delete mode 100644 .DS_Store delete mode 100644 two_player_cleaning_game/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 21a713d751de0ae074965220b3f2a87672eb6b92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMU2GIp6uxI#V3u~+DL-0R7gm;^21{rwAXt93?V?n`BHN#BL6+H_p&gl>sXMc~ zg@#y-MuI=lXw>*3YJ4$@#soD{B0K?NG$Jvg#up#ZM0_w9--zelJ6m@90~R&WbS9a5 z=G-~w-gCdX-`#ue5<;LktJV_|B7}%|Qz=(sF~&vT(|gnxXuerdl{eu7~>hTYXDuVq&nR|vZ#)x=?^ISJB_ zktt+9#+bnbaEn=IO1tm#E9O|)d*?swHVR@PK)<{RTL zM4#wO$kl^`tLsVpS;;+*h`#vO@$M%uIv(}Cg7gZnc= zB(4vaPvFyp$6flpcCWvoHtbvr$F3||!0x*OcE0HqmC}qrM`vYMyj$u~2HLd&C#E0J z60+Y$5L;80xjm!h5WKFGWn|N)osg?iijm41ila3d1~tYyzn#ihhOynUbw{_%?u0y( zI<@sv&F<7PHp;kD)Ov}1yvMdOP7CWHu4AV>203eMJ2dP`&uLNY&kjeHaYTJb{nf#R zOKz)Mb?1hbySKERm#b#ZnmtF7dhpYkj=opdG97tcb^5v$JEfVbZuWNNbX!jvTDz&F zwJNCf`Iy(-d4WJYo75l7>dt;SEQ+jl{(^wCOT|97St@N!m5+(sKD;0h*h$~CWHc;Q z*I{W*Kx(%U4OwvwYnMw>`#zjovh8+N-yj7#3?-=2i1pNIld3yb z;pJ8wMK^7(NmbbxW>w9U1NQ}DqI^zF$g*zcbmS9$HBKurT$svqWiP%Ud_v%Qgje8Icnw~Mx8NAO z44;SGl_!)i^%7rPyRKYLI73K*6VUe&{SSr*Ajlw!%lh7$71XW1$ z;DrK@cNPy7_oXK46X&s=bJs87_&6L4Zf>o-XUo?A6$dZ)IqPn^x%yU0#kCunhi5IH z=7pJE%oj$I5^6D$u*oxGf}clj-V&TIg$mRiN$Cz`mo^|$GRxDrby!*~BD>@%T&T^?NH6J_8^qqN?K%$3WzI$vt?`DDVBU^IA_ zi0qTaf1VaUkc;FJ`5gdhF$=082(_>Z)qp(nv zLgi^50v-Y$0+SMfGCt}MJ^$Y{{{R1z5*u&O9s-jE0Vt2gqRlwk@%Bh`!x_SR58m{m zc0*h;7cAJG6eT;3M};28*WgWU-9(c;N8Gw0E}1*pFn5&vH2+`!Gr-ILH81}keST?7 HqWu3){E~a% diff --git a/two_player_cleaning_game/.DS_Store b/two_player_cleaning_game/.DS_Store deleted file mode 100644 index cb0c768eb85069f6b5bc5c5852e75f2cb1318849..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMZ)_Ar6rZ;(?Jlr(${#5#2ZzT$Ymv4Bg5}S(y#^4P67Jew3wrL|F73*8_qf@+ z76`E_#y@DH(fGj+iW)zuXpBY-F@iDCKs5fTCPG3?{9u%5Vxk|6UwpH(M`&wfVu%sl zX=dKcoA>tZd;5MfH&a3gv=xmeLh1-1GFDFM3~c_S@OfS*6)E8GNkDx?G-s5k?@4Kp25A0$~Kg2>cr&fO|GC@)Y~Nm<`)70$~LHml5FWLli5g@qmsB>MtGG z_(uSwmB{uB_VFCx>qG+@59p|%zA8RboE{)hh2V$*LLKL$TpVdUpre8cbpk@2Kwuey z6AJj&Q7`I?6Nn2MwqXRq2uzLuhfNjH3Bx~g!ukDVHg8+ZYi#@qq>9RERn>B}JVU-C zIp_{2J>4s^HodTik5aB{XUly(+hdu-89Jxkbv)g2%!03A877MC?X?`k9d2`rj=_B0 zq?nKuS;^44!-v;3t!;=luU~VdA$oX2b7Mnv%`NMW98u)CvDGcRGyCl!$9+V&0l`v0 z)Cq1Ko9L50(3H%%LwO;$(wQ{RO6}s#qGDUw=L=<@mFY8Ps@G{fy))B&{c68Hk}^lU zq;<&5&>Du$Z_l~Tu7X)Yr+ag*T^w>)hSuhEJ6E)I&uq1AE{wbymMgfny~|~mXSq&a zhR)(jU3orYJ!XL+O?y{7eVlx{pScCE-M5go(5QF^T4d&K6D?UKGlBM4EM71CR8G{? zMQ&JrQ{&p(wj{Rg+%-mPXU$gUs`GkF7PGRp**$C--e8~3a;9Tg&OkqY3dghdS!O|@ zr<9bV51C`LYiH5<3p6cV%vuMEmUocGWZCB~TCAyi4K&&58eGYsZ^?>36I-lld-zOy z!Nk@G6jrR%)D**DP(2WASf#3|{g@JzDMGcWS=G92J!{(3P=uXzx2jriNrZ>)2$(G! zRV|I*bO_&=)j~tSj<;&so!s(Hoq1h()4{j;C@|lFbNy^kFPL4!n3Vx{J97OmiF~fq zVOXA9p6o7v2Mb{5& zEZ!(a3hsN0Nj=#}5+qITCijqs$TQ?6a)O*8XUREoo_tF#k)O%$PzBYXz;vjAI#>cR zSPIMFW@v#;uoV5_zb>)G58WL!uRk4T!LSuDydqMrCLdo7D^FmxwJyMQL2|VNt>muQd-ib zeUd9)Un*m8Z{TM@B#yOl>x#`v!M&h#W(tf&w%k3a*g#Z+&HPDo;^_d*)_Ar~aO1qEPG z^b`JGxDSrP1Mna`4o|?7@DwKfbAHml2(Q4a@EW`hZ@?*d7v6)@a0br8IrtbpflmPiI1rVR z1;=)s0pyo~$7TLz;cj55pD4U!MAn1&N`d7b3N=& zVv~HyonIlCEhknRahcVylB3%);#KXO z#$`?9k!Sf%{|+bdF{~5g(L{Bnf?dPxR$u-incyV3U6xN~wXc!CTjO=tO+%-H(>Ug3 z(+r!IqcUq=PMvW3!j(s7-H*(2&H1PH#9rqa14G$Y9?ipGw^hU3W-E90tkUtCClC;%0}!G9o&oxvxu zGPOv-5F*VCmtr)`;7zMaxFoutp^ivJT0*%`{d^7a7$jLs}A diff --git a/two_player_cleaning_game/assets/player.png b/two_player_cleaning_game/assets/player.png index 973060bb28bb1db6abd1cab7f10c3ee06958fc3e..ca62b724fcc4aef30725ddefffb576b0beeab9ea 100644 GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^CxBRzgAGWQSS5-8DaPU;cPEB*=VV?2*?FEWjv*Cu z-p)Eb@vs7q!_jkMQ}lvP&kJrpzwT)44&@@xG?_X#uEgHY_b#% zLC=E@p_K3q#p~51f(7=<^qW8VP*}4$IdZmTT%2}3>&Dc`&82r2$|nA_$da+x6wSC+ zc{lq{uPB=%QaajqUgRXdGd$lbqjI8NU|oss#&vVn9_M(u^@oYty(Rm9AISRk_{SXO zH3zryc^CCqg^T`u%(5}B$i;A{h286lZx^lBoHYCt^VVY0@jYr2%Zj}FE`1H_lSwb^ z*t90Ia7Ex_i$^h{GA~&!cC9hh=96JBcX3ZU`FPVT`7N3Izn@pSyO1BG7hn~oHHexg%4=hFBCH=HoME cKtY!9i0^hs`FEqWAFV-LPgg&ebxsLQ0PTFdn*aa+ literal 355 zcmV-p0i6DcP)X1^@s6b5wmq00001b5ch_0Itp) z=>Px$9Z5t%R9J=Wmcb2!Fbn{lsw-p<#0I>Wg*QAHfd{;qg%=wj_F#zgLlA_-wH;Nh zs@#txc5*0|1CU505{WOMuu0wahMH*W8Z=i3Q`O`>)Hnq92u|p>H(QaD52WXXEn}+M zK$+14rZp(z9pp+JaSR!@ge4$z8<0vI@dO#MgvBFs`G}P`@*pzN5*A115ufol_+Jq{ zFHs3e@zWZ$hcEsnvK6^lM$Ze7YOKuUGSdpa8uMN)i40l7B9RG509GR$8McIlBZEi) zrH@c#-1Y1}LXmOSyM5$&J5<*w4ObcLZ=Xe}on4KCGT_Kyz2z(#= Date: Tue, 14 Apr 2026 11:43:03 +0200 Subject: [PATCH 3/4] update player movment to use player rot --- two_player_cleaning_game/main.fnl | 57 +++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/two_player_cleaning_game/main.fnl b/two_player_cleaning_game/main.fnl index 064b34f..9e0033c 100644 --- a/two_player_cleaning_game/main.fnl +++ b/two_player_cleaning_game/main.fnl @@ -45,7 +45,7 @@ (local debug false) (local collider-debug-boxes []) (local bump-world (bump.newWorld 25)) -(local player { :x 50 :y 50 :w 25 :h 25 :speed 80 :battery 100 }) +(local player { :x 50 :y 50 :w 25 :h 25 :speed 80 :battery 100 :rot 0 }) ; 16:9 (Modern Widescreen - Recommended)** ; - **640x360** ← Best middle ground ; - 800x450 @@ -133,20 +133,20 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) (love.graphics.rectangle "line" collider.x collider.y collider.width collider.height)))) (fn love.update [dt] - (let [deltas { :dx 0 :dy 0}] - (if (love.keyboard.isDown :right) - (tset deltas :dx (* player.speed dt)) - (if (love.keyboard.isDown :left) - (tset deltas :dx (* (* -1 player.speed) dt)))) - (if (love.keyboard.isDown :down) - (tset deltas :dy (* player.speed dt)) - (if (love.keyboard.isDown :up) - (tset deltas :dy (* (* -1 player.speed) dt)))) - (if (or (not= 0 deltas.dx) (not= 0 deltas.dy)) - (let [(x y) (bump-world:move player (+ player.x deltas.dx) (+ player.y deltas.dy))] - ; (print (fennel.view { :msg "Moving player" :x x :y y})) - (tset player :x x) - (tset player :y y)))) + ; rotate player + (if (and (love.keyboard.isDown :d) (not (love.keyboard.isDown :a))) + (tset player :rot (+ player.rot (* dt 2)))) + + (if (and (love.keyboard.isDown :a) (not (love.keyboard.isDown :d))) + (tset player :rot (- player.rot (* dt 2)))) + + (if (or (love.keyboard.isDown :a) (love.keyboard.isDown :d)) + (let [ + new-x (+ player.x (* player.speed dt (math.cos player.rot))) + new-y (+ player.y (* player.speed dt (math.sin player.rot))) + (x y) (bump-world:move player new-x new-y)] + (tset player :x x) + (tset player :y y))) ;; Update camera to follow player (keep player centered on screen) (tset camera :x (- player.x (/ screen.canvas-w 2))) @@ -180,17 +180,38 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) (love.graphics.pop) ) + +(lambda angle-to-direction [angle] + "Convert angle (radians) to compass direction keyword" + (local tau (* 2 math.pi)) + ; Normalize angle to 0-2π range + (local normalized (% (+ angle tau) tau)) + ; Offset by 22.5° (π/8) so section boundaries align with directions + (local offset (+ normalized (/ math.pi 8))) + ; Find which 45° section (π/4) it falls into + (local section (math.floor (/ offset (/ math.pi 4)))) + ; Map to compass directions + (local directions [:e :se :s :sw :w :nw :n :ne]) + (. directions (+ (% section 8) 1))) + (fn draw-player [] "draw player sprite and hitbox" (reset-color) (love.graphics.draw player-art.player-sprite - player-art.player1.quads.n + (. player-art.player1.quads (angle-to-direction player.rot)) player.x player.y) - ;; draw player hitbox + ;; draw player hitbox and direction line (when debug (set-color :black) - (love.graphics.rectangle "line" player.x player.y player.w player.h))) + (love.graphics.rectangle "line" player.x player.y player.w player.h) + (love.graphics.push) + (let [ox (+ player.x (/ 25 2)) oy (+ player.y (/ 25 2))] + (love.graphics.translate ox oy) + (love.graphics.rotate player.rot) + (love.graphics.line 0 0 35 0)) + (love.graphics.pop) + )) (fn love.draw [] From 8d4745832d2793cc2137a5150430c27c38cb7c7c Mon Sep 17 00:00:00 2001 From: Travis Shears Date: Tue, 14 Apr 2026 12:49:41 +0200 Subject: [PATCH 4/4] add reverse tire movment --- two_player_cleaning_game/main.fnl | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/two_player_cleaning_game/main.fnl b/two_player_cleaning_game/main.fnl index 9e0033c..007bb31 100644 --- a/two_player_cleaning_game/main.fnl +++ b/two_player_cleaning_game/main.fnl @@ -133,20 +133,28 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) (love.graphics.rectangle "line" collider.x collider.y collider.width collider.height)))) (fn love.update [dt] - ; rotate player - (if (and (love.keyboard.isDown :d) (not (love.keyboard.isDown :a))) - (tset player :rot (+ player.rot (* dt 2)))) + ; move / rotate player + (let [ + d (love.keyboard.isDown :d) + a (love.keyboard.isDown :a) + e (love.keyboard.isDown :e) + q (love.keyboard.isDown :q)] - (if (and (love.keyboard.isDown :a) (not (love.keyboard.isDown :d))) - (tset player :rot (- player.rot (* dt 2)))) + (case [d a e q] + [true false false false] (tset player :rot (+ player.rot (* dt 2))) + [false true false false] (tset player :rot (- player.rot (* dt 2))) + [false false true false] (tset player :rot (- player.rot (* dt 2))) + [false false false true] (tset player :rot (+ player.rot (* dt 2))) + ) - (if (or (love.keyboard.isDown :a) (love.keyboard.isDown :d)) + (if (or d a e q) (let [ - new-x (+ player.x (* player.speed dt (math.cos player.rot))) - new-y (+ player.y (* player.speed dt (math.sin player.rot))) + dir-fn (if (or d a) #(+ $1 $2) #(- $1 $2)) + new-x (dir-fn player.x (* player.speed dt (math.cos player.rot))) + new-y (dir-fn player.y (* player.speed dt (math.sin player.rot))) (x y) (bump-world:move player new-x new-y)] (tset player :x x) - (tset player :y y))) + (tset player :y y)))) ;; Update camera to follow player (keep player centered on screen) (tset camera :x (- player.x (/ screen.canvas-w 2)))