diff --git a/buildtools/appimage/love-prepared/bin/love b/buildtools/appimage/love-prepared/bin/love index 8b28f73..468ebfe 100755 Binary files a/buildtools/appimage/love-prepared/bin/love and b/buildtools/appimage/love-prepared/bin/love differ 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)) ) }