From d778b863ac25d9b8070006aa17d7996fb6468edd Mon Sep 17 00:00:00 2001 From: Bill Niblock Date: Sun, 3 Nov 2024 19:30:50 -0500 Subject: [PATCH] Done for now --- buildtools/appimage/love-prepared/bin/love | Bin 406461 -> 406463 bytes makefile | 9 +++++++-- mode-intro.fnl | 4 ++-- mode-play.fnl | 14 +++++++------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/buildtools/appimage/love-prepared/bin/love b/buildtools/appimage/love-prepared/bin/love index 8b28f7311fe137f74bf8176fbad3a5f1d858175b..468ebfe2e7a1187b648678e190649cbe5cad3e27 100755 GIT binary patch delta 821 zcmV-51Iqlp=NP}|7=VNUgaU*Ev;^530u#N5+ZzP8+ZzR#?F|#YV_ApS;7-d2003FH zfC&bS2T-ON5}z`z$+I>Yo{wJI%`XpZs3?Tv&!2w%r(`52~e+_^_``= zkK-3wDr@utAe+^z>s67S32C=R!{}?blv)Vu$dcElf3Ln{`yl#;$T}S=>)0h)PhP`i z-3#Dr$vSpLg(ty2S@&*#G+8gc$gb^+>IYc158|8Hw*5F|uyy+f9!=)*%kA4p?I9NK zKzutJci%A#wes-8hlk6&9C<}uk)^Ty>S^zl;=1u4tMs5A6>IZCefVK=hm!xHc@Lnw zoN%l3f7YWAsI@JJx#wU2xP>@s@j*Ym@_8{Unj1Ul=f}Ly7{rm?>v;0OcXH){@8fHT zE_V;trNi5yM?%wZ9rgkAkUgI6JajF+^>A>%&icW2@nLnP@6x(BSB-ue4Yc2??_nhx z!fYBumgY<6;7w}t1+>?-q_N-~c5m(XeEu2Te`9kcqxzV61?H5hvXKlg_pD|qSWkV` zT_o;VJe^FZGg?H}$*$Q@@6aWGM2mtB1 zm)SA~61R9E215w~FTS_EDh8hg0u#NrUN8pA0SyzrV_ApS;7-d2003E+H8KWC0d$vt zG6o$VYrA7v*)viILJI%@FfafB4FCWD000000RR91q=5&QyD|nk0d$x4G6pyS{g*E@ z1~wW4?*#yKWpi{cW^QayO928N0~7!P00;mtzL$S91{?v)mz*;O8wQ*71poj5#Xo~E delta 814 zcmV+}1JV4y=NP@`7=VNUgaU*Ev;^530{yy&+ZzP8+ZzR#?F|kGV_AJzTP?{40039F zfC&bS2TneTUu=sQNt_DLMepq9R|hsw6u|N4Prv^0afU$*M2{1Wdhk3yd&Fd%AFMv% zYC1N*4hm#``1m)H7+Kh%;6sUsPCx%p$k&<6>GSA+w_FhhodgXtx?@@8TSt~c3jhEz zw+0plW(j}4`!zP-#Z2rMGp#qQxEEje>Ngtdm9KfcOwHRt<+Q7vYy=|spg{0e8pN2G4nMmx2}=mpoO2-p&!UO4MpOLr&7 zFSS(O=mkJFtC!cSB0Uq*ZjFY~*KR7c5Y~|;uT6hneaH4e^bL`9I#kxNOSPW7hReDa zz}J#>?8*vHf_<{?-Tr8@UVM>V+gH^Ouxua1H?eK|dCFkx_76Oo%;lHcw~^XIEZl+k zb~f(5WEg7Y;inG|mw7qz%DN&;WBc9H-Ydp+>pxcMK|Lzg=7sw7!{iPn|3mX8K=(P} zUg>|WMPp|Hb$PB@{WKbAzg1tvN;HJo zG>9zCx6Z-4)aDy#uWw0X!8`2V+AsS2GrE7v=1NBOIr9q4DOF`78D8#L%~G(Q`l`D~ z+_QK(nNDZ4h^&)cv!TWfFI*YfW0Q|)k&kSTcUj}3+v1~JVguFO6A-L@w0a_z0O4d^ zaw&}^km2RWs{=3NePpBCk^P9CZ+Tu#Za1PbU&WFi1^kbL{{v7<0|XQR0ssgA>AAOP zAqG_m0;0ONzbXcw1p@uLw_q>^$^i`y2V+@%SX(X02LJ$9mp3v7Nda<~fieaiA2YgR zS>; sbY*jNE@p0QP)h*<9s?8r0ssgAqPmxXGX@+1$(Nop1{(&M^aTI_0O7iMUjP6A diff --git a/makefile b/makefile index 096293d..5510e5b 100644 --- a/makefile +++ b/makefile @@ -47,11 +47,14 @@ releases/$(NAME)-$(VERSION)-win.zip: $(LOVEFILE) releases/$(NAME)-$(VERSION)-web.zip: $(LOVEFILE) buildtools/love-js/love-js.sh releases/$(NAME)-$(VERSION).love $(NAME) -v=$(VERSION) -a=$(AUTHOR) -o=releases +releases/$(NAME)-$(VERSION)-source.zip: + zip -r releases/$(NAME)-$(VERSION)-source.zip $(PWD) -x "$(PWD)/.git/*" -x "$(PWD)/releases/*" + linux: releases/$(NAME)-$(VERSION)-x86_64.AppImage mac: releases/$(NAME)-$(VERSION)-macos.zip windows: releases/$(NAME)-$(VERSION)-win.zip web: releases/$(NAME)-$(VERSION)-web.zip - +source: releases/$(NAME)-$(VERSION)-source.zip runweb: $(LOVEFILE) buildtools/love-js/love-js.sh $(LOVEFILE) $(NAME) -v=$(VERSION) -a=$(AUTHOR) -o=releases -r -n -d @@ -66,7 +69,9 @@ uploadwindows: releases/$(NAME)-$(VERSION)-win.zip butler push $^ $(ITCH_ACCOUNT)/$(NAME):windows --userversion $(VERSION) uploadweb: releases/$(NAME)-$(VERSION)-web.zip butler push $^ $(ITCH_ACCOUNT)/$(NAME):web --userversion $(VERSION) +uploadsource: releases/$(NAME)-$(VERSION)-source.zip + butler push $^ $(ITCH_ACCOUNT)/$(NAME):source --userversion $(VERSION) -upload: uploadlinux uploadwindows uploadmac uploadweb +upload: uploadlinux uploadwindows uploadmac uploadweb uploadsource release: linux mac windows web upload clean diff --git a/mode-intro.fnl b/mode-intro.fnl index a85b196..446cd42 100644 --- a/mode-intro.fnl +++ b/mode-intro.fnl @@ -75,7 +75,7 @@ (love.graphics.printf "Press P to Play" 0 (+ (/ screen-height 2) 100) screen-width :center) - (love.graphics.printf "Press Q to Quit" + (love.graphics.printf "Press X to Quit" 0 (+ (/ screen-height 2) 150) screen-width :center) (love.graphics.printf @@ -100,7 +100,7 @@ (var newseed (+ (love.timer.getTime) mx my)) (state.setSeed newseed) (set-mode :mode-play)) - (when (= key "q") + (when (= key "x") (love.event.quit))) :mousemoved (fn mousemoved [x y] diff --git a/mode-play.fnl b/mode-play.fnl index 35fcf1b..0d32725 100644 --- a/mode-play.fnl +++ b/mode-play.fnl @@ -219,7 +219,7 @@ (var mvspeed (* dt 3.0)) (var rtspeed (* dt 1.0)) - (when (love.keyboard.isDown "e") + (when (love.keyboard.isDown "w") (when (= 0 (. map (math.floor (+ (* mvspeed dirx) posx)) (math.floor posy))) (set posx (+ (* mvspeed dirx) posx)) (state.modDis mvspeed)) @@ -228,7 +228,7 @@ (state.modDis mvspeed)) ) - (when (love.keyboard.isDown "d") + (when (love.keyboard.isDown "s") (when (= 0 (. map (math.floor (- posx (* mvspeed dirx))) (math.floor posy))) (set posx (- posx (* mvspeed dirx))) (state.modDis mvspeed)) @@ -237,7 +237,7 @@ (state.modDis mvspeed)) ) - (when (love.keyboard.isDown "f") + (when (love.keyboard.isDown "d") (when (= 0 (. map (math.floor (+ (* mvspeed planex) posx)) (math.floor posy))) (set posx (+ (* mvspeed planex) posx)) (state.modDis mvspeed)) @@ -246,7 +246,7 @@ (state.modDis mvspeed)) ) - (when (love.keyboard.isDown "s") + (when (love.keyboard.isDown "a") (when (= 0 (. map (math.floor (- posx (* mvspeed planex))) (math.floor posy))) (set posx (- posx (* mvspeed planex))) (state.modDis mvspeed)) @@ -255,7 +255,7 @@ (state.modDis mvspeed)) ) - (when (love.keyboard.isDown "r") + (when (love.keyboard.isDown "e") (var old-dirx dirx) (set dirx (- (* dirx (math.cos (- rtspeed))) (* diry (math.sin (- rtspeed))))) (set diry (+ (* old-dirx (math.sin (- rtspeed))) (* diry (math.cos (- rtspeed))))) @@ -264,7 +264,7 @@ (set planey (+ (* old-planex (math.sin (- rtspeed))) (* planey (math.cos (- rtspeed))))) ) - (when (love.keyboard.isDown "w") + (when (love.keyboard.isDown "q") (var old-dirx dirx) (set dirx (- (* dirx (math.cos rtspeed)) (* diry (math.sin rtspeed)))) (set diry (+ (* old-dirx (math.sin rtspeed)) (* diry (math.cos rtspeed)))) @@ -295,6 +295,6 @@ ) :keypressed (fn keypressed [k] - (when (= k "q") (love.event.quit)) + (when (= k "x") (love.event.quit)) ) }