From 2d9c206552663ade1cadca6792486786534cd0a2 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Tue, 11 Mar 2025 13:33:18 +0100 Subject: [PATCH 1/2] setup luacats --- flake.lock | 17 +++++++++++++++++ flake.nix | 8 +++++++- justfile | 3 +++ tools/gen-luarc.nu | 8 ++++++++ tools/luarc_sample.json | 19 +++++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 tools/gen-luarc.nu create mode 100644 tools/luarc_sample.json diff --git a/flake.lock b/flake.lock index 3af5933..d24df7d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "luacats": { + "flake": false, + "locked": { + "lastModified": 1740447442, + "narHash": "sha256-naorkTPkgJiEevBfpdRQtbCikN5YGiqWeIAWzCsEW4Q=", + "owner": "notpeter", + "repo": "playdate-luacats", + "rev": "7e56adacbbaceef923f24d898706aa3dec2225c1", + "type": "github" + }, + "original": { + "owner": "notpeter", + "repo": "playdate-luacats", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1740367490, @@ -38,6 +54,7 @@ }, "root": { "inputs": { + "luacats": "luacats", "nixpkgs": "nixpkgs", "playdate-sdk": "playdate-sdk" } diff --git a/flake.nix b/flake.nix index e3cc328..263a0d0 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,13 @@ url = "github:RegularTetragon/playdate-sdk-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + luacats = { + url = "github:notpeter/playdate-luacats"; + flake = false; + }; }; - outputs = { self, nixpkgs, playdate-sdk }: + outputs = { self, nixpkgs, playdate-sdk, luacats }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; playdate-sdk-pkg = playdate-sdk.packages.${system}.default; @@ -18,12 +22,14 @@ mkShell { env = { PLAYDATE_SDK_PATH = playdate-sdk-pkg; + LUACATS_PATH = luacats.outPath; }; nativeBuildInputs = [ just lua-language-server playdate-sdk-pkg + nushell tup ]; }; diff --git a/justfile b/justfile index f71d7ed..1ca5b64 100644 --- a/justfile +++ b/justfile @@ -11,3 +11,6 @@ simu: build cook-assets: @(which aseprite > /dev/null) || (echo "Missing aseprite program"; exit 1) tup + +setup: + tools/gen-luarc.nu diff --git a/tools/gen-luarc.nu b/tools/gen-luarc.nu new file mode 100644 index 0000000..d2d1b47 --- /dev/null +++ b/tools/gen-luarc.nu @@ -0,0 +1,8 @@ +#!/usr/bin/env nu + +def main [] { + const here = path self . + let sample = open ($here | path join luarc_sample.json) + mut updated = $sample | update "workspace.library" { $env.LUACATS_PATH} + $updated | save --force ($here | path join .. .luarc.json) +} diff --git a/tools/luarc_sample.json b/tools/luarc_sample.json new file mode 100644 index 0000000..0cf1799 --- /dev/null +++ b/tools/luarc_sample.json @@ -0,0 +1,19 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "diagnostics.globals": ["import"], + "diagnostics.severity": { + "duplicate-set-field": "Hint" + }, + "format.defaultConfig": { + "indent_style": "space", + "indent_size": "4" + }, + "runtime.builtin": { + "io": "disable", + "os": "disable", + "package": "disable" + }, + "runtime.nonstandardSymbol": ["+=", "-=", "*=", "/=", "//=", "%=", "<<=", ">>=", "&=", "|=", "^="], + "runtime.version": "Lua 5.4", + "workspace.library": [] +} From 4bbe47d1587517a277bbf39e5d99c322633095af Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Tue, 11 Mar 2025 13:33:18 +0100 Subject: [PATCH 2/2] scale to 2x graphics --- .gitignore | 1 + justfile | 2 +- src/img/Tupfile | 2 +- src/img/level_01.ase | Bin 1496 -> 1325 bytes src/img/player.ase | Bin 1040 -> 796 bytes src/img/player.png | Bin 1134 -> 0 bytes src/main.lua | 5 +++-- tools/gen-luarc.nu | 0 tools/luarc_sample.json | 0 9 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 src/img/player.png mode change 100644 => 100755 tools/gen-luarc.nu mode change 100644 => 100755 tools/luarc_sample.json diff --git a/.gitignore b/.gitignore index ac7cff2..eeb6598 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ src/img/*.png +.luarc.json diff --git a/justfile b/justfile index 1ca5b64..cde05dd 100644 --- a/justfile +++ b/justfile @@ -10,7 +10,7 @@ simu: build cook-assets: @(which aseprite > /dev/null) || (echo "Missing aseprite program"; exit 1) - tup + -tup setup: tools/gen-luarc.nu diff --git a/src/img/Tupfile b/src/img/Tupfile index 04c14dc..766965e 100644 --- a/src/img/Tupfile +++ b/src/img/Tupfile @@ -1,2 +1,2 @@ -: level_01.ase |> aseprite --batch --export-tileset %f --sheet %o |> %B-table-32-32.png +: level_01.ase |> aseprite --batch --export-tileset %f --sheet %o |> %B-table-16-16.png : player.ase |> aseprite --batch %f --save-as %o |> %B.png diff --git a/src/img/level_01.ase b/src/img/level_01.ase index ca8a6dd2dad2517341092472c3c0e27e8dc99525..b62a629928b852489cf571ce6a0d5abb62042099 100644 GIT binary patch delta 165 zcmcb?y_Snxmz9Cx!BR$s6ATp-xl5VWvTSV9V-}5PU|>*IU|?WiU}IolU}0cj5MU6P ze3V&PU73M_p<+&Qf&{Cw+@IsjA5ZrkI>@Klz5n73`FjN>b?z1{3}-feSDmcKQmzd$ zg%xZH1H*qNkZB-%f}w(;V$R!xhKvjh42Kr{TlqYbbHPMIJ;4WThF<5>Js21mSQS8W K0h4F5+5!OiAuNOd delta 202 zcmZ3>b%UGx1}g)@gQbiN6Bs{CAL&co8*LDgrDDW^le!suvB_pd;+uq(vqiVNFDz&%bPW$CoNHJJl`Z@Ld z`7dqvPX9cg%g?Z9g{6JJFu!+$1_Wgt9(@dL<$ ugNBR@3=D@B{9BpMR=;4Pq5nh&hlvi_f_BWg(`}D=fVF~DESUU(#TEbu=0Fet diff --git a/src/img/player.ase b/src/img/player.ase index 6454979141c0e51d25cdf6003d8826a418c9dab7..b1263b872fcfb4064eea0a992ba2f120327ea809 100644 GIT binary patch delta 508 zcmbQhF^7#?hM9rk!BR#B1qOwQ+@(x&m?k#uuD{R7z`&}&z`(%3&hVcJM1!ybgCs-6 zoU>E*dLMR>ICkGvu#h8ZY2J1&F{_jb?+*F8zIvwO=Nfz0s&v~0`-2xhzPPv6`Q@F5 z$NK(p-h5y>obBne|X-VG-q4Jf?uuGyw-7R!m6KcX7~7F`l&m5G5@3} zE6Mn0GevKNepuTcnIY7(hy6;FQ>Xcdz~8mk|IhCCfB93HuzC7R;mM72Zu#{$Rx@!O&1`&Ln;>VF;`j9A z@#b(zPwU;OKhMa_ju80ocYd*Wb)eF9?st=HyMOO~5%9xK@6qv+LU)mtl7f2+U%xYc zX!B#jUf~l*J(k-f^nacv`h7z2hOa@bngFQ*$}>lJ4>btM@4MG~ZiCGKCzE!xS>64fVcY%Z+>z%m zuLkD%{CRJaWiK6lb9V9EC`Sv0CkcBhWzBE5{xrG8f5iA}blt&Qa_#Szep-Z}Eu$xnl&E delta 754 zcmbQkHi3g%fQ5nK!BR#B2L^|U+@(wtm?t*vuD{I0z`&}&00#e=z!U=mNC`v5oVSrT zryf?|@zK;fzI4f)DNdGpt@i7eDj3DsU3+pMrb+ptEs|MuGKzbwf<*X4Y!m93qBVK@8U>kJFa`K#79-utR8viEw!tL^p0+}96Y zK<@k8SYVz2Dk zuQBfGT+-_HDaA!>i*VG{{s*?(7GL+?Cvdaj#5 z^9kJ1)%C4X3KQxSui5OI|NEZkS9KYA*ZSV@mA#>VTlcDeSx~?BpZ?PMpK5k|ezEni zY2Z2McakrRxz`8%?{VFIVSe+@c?QnUojdolUXYxSH1%&e&z~DFTjyubKKkQ?|NYrl z-|a1!ANX2mvgEua*C##yQzbe1UWL@<{j!DU4%;QfXs5rA{QJ@Fa{e6tftnN`<$Jp&-JK^{04a?b_>P25q-z@Q| zzwzJY|9&sye|N0m{gqnt?fAxjhAVjQo8RW;PuisSoO3SYVPkn!wVJxa*B5`j5!zj0 zcj?wi%YYm89}hln(tLWpdt;r_uTQ6D*T4I}@3Y32B-j5>Bwp7a|9+JFed7;-Cw{Bu zo9>$9{5RUR()DlgAKT7are4dxH;fnl^Ob+`YbVo}=Vy0qmP?E^^=WpS({C{MvR-iQ62ZooQcljpcigw#`oay0t0yHt=P=uzz!qaZZ=|^1Z@; zJ$sK=h9~}8_T~6@Gtp=Hp8th^%KZ=DI=}a=aQ2sV|Al|J#Oz=7*ZyN|Qm^)_`@7GX N2kLIKzmv?a3IIGmgk44ofy`glX=O&z@p*l z;uumf=j}}EP0hQ6T&L&XeZaHWnRlsko8yT95hI>f+bMjeJn4HJ*qGV=^VJ>Smlht_ zntEl+wqM!_$NOZh%ii4Bm<(Z5NV!jZx4!g8u*;7;CWaud`@T)`{r7ztYUDWo=jdKI zyG`t8<&ETn>^l!W)7y}IobN&LqXXBEH%u4$Aowz1a>@DtlciT`o1|raN&7A@Gh-=O zt`-z}HL>)W?1#r2x$W)uPx_b@v#Y_n#UYuow6?Q!kFZ#|d#rVXMrVS;G)4~J;-4FS zKUp4HIbmkdtGaC0^~d&iFMcP{cdTbl+afF9o(K^&lM0EvngaALV
dxcUA{_AH9F4kohS-Ik8gc zeLT0$@dnW!FV`psh^=Xu&(w6~($jCBlMdYF@~%C4yx4hLTHv+a*O_ilIV5B*_*wi$ zOT&U_kDt;uBFravZ_08e-uNmYYpgJpUwPF7-?kX0W4q-i**%*b#9!!e<UjUu~7Jl*b+Ul3;c7v5(AY@zE4cla=oVi#XB(5nVV^beQfK!lE#xs z#wt+-D~vqea!gp;DAO6_fBH#`Z+2UZj)U%F-@=7C+<%Ws{&kDdS(j=`Om#})3=}gZxG!>C3ZN_KXOjzDLkHOti)hlI&(5#vCZ)=AM+Er^Hyq1nC;}WZ6TZF z^w)CAJ9*7@ljk*~v%+c<+tuQ*iBBu<`EW91 z__8PcnswytyG;#CB@Di9js73MQAA_zqoBDjqSnbpF1^B2dwA+`BfVIT1%b;K?X#Ft zn7qO{FVXX-`|j;=ZkjEV95{|t9=DjiB}Be6bebW&6-=dP{4t+(0U zotDW@+gWWo8(Zcvq`dlGu&w21gv7*&8zQUMK5z0qP?zKMqf74f-IZ77wivLSTf2{Y zPS9n`-nF{>_P<}BkY4T~u~sYa@0_IKiAe|f%*F2ai*sjuPW(7!mHq+0joI4V8k?%h zUQ6+cZoSSDI%}Vvg!7CamHoH4JNI($xcQ^vpP(#1L(p#~&gWPD_B>dvzejx0Mro?b4#4QEfvj@(coudv~AD& z-&S+dO%HF6bU3);&V4iPJ$$!?3=Uo2c|ayw@WU(Rwdqgo@9^5q&HnFSu|r^2>rU1^ tZ`pgo6LSxKH~2d}