From 9661bfefe03fc07f9c2854f0c356a97d37e84ae2 Mon Sep 17 00:00:00 2001
From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com>
Date: Thu, 1 Jun 2023 00:07:28 -0500
Subject: [PATCH] Proper support for Tiled-based tiling

Before, all tiles were 'a'; now, the right
character gets selected for each!
---
 flora-sercha-sauna.lisp |  23 +++++++++++++++++++----
 res/font.png            | Bin 0 -> 7593 bytes
 res/font.tsx            |   4 ++++
 res/font.txt            |  18 ++++++++++++++++++
 res/map font.png        | Bin 1026 -> 0 bytes
 res/map font.tsx        |   4 ----
 res/map font.txt        |   5 -----
 res/map.tmx             |  28 ++++++++++++++++++++++++++++
 res/mom.tmx             |  28 ----------------------------
 9 files changed, 69 insertions(+), 41 deletions(-)
 create mode 100644 res/font.png
 create mode 100644 res/font.tsx
 create mode 100644 res/font.txt
 delete mode 100644 res/map font.png
 delete mode 100644 res/map font.tsx
 delete mode 100644 res/map font.txt
 create mode 100644 res/map.tmx
 delete mode 100644 res/mom.tmx

diff --git a/flora-sercha-sauna.lisp b/flora-sercha-sauna.lisp
index be088f2..7c59165 100644
--- a/flora-sercha-sauna.lisp
+++ b/flora-sercha-sauna.lisp
@@ -21,9 +21,10 @@
 
 (ql:quickload :cl-tiled)
 
+
 (defun main ()
   (clear-screen)
-  (draw-map "/home/jaidyn/.local/src/games/flower/res/mom.tmx"))
+  (draw-map "/home/jaidyn/.local/src/games/flower/res/map.tmx"))
 
 
 (defun move-cursor (row column &key (stream *standard-output*))
@@ -40,19 +41,33 @@ Borrowed from https://github.com/gorozhin/chlorophyll/
 
 
 (defun draw-map (map-path)
+  "Draw a Tiled-format tilemap to the screen."
   (mapcar #'draw-tile-layer
        (cl-tiled:map-layers (cl-tiled:load-map map-path))))
 
 
 (defun draw-tile-layer (tile-layer)
+  "Draw a Tiled tile-layer to the screen."
   (mapcar #'draw-cell
        (cl-tiled:layer-cells tile-layer)))
 
 
 (defun draw-cell (cell)
-  (move-cursor (cl-tiled:cell-row cell)
-               (cl-tiled:cell-column cell))
-  (write-char #\A))
+  "Draw a specific cell of a tile-layer to the screen."
+  (move-cursor (+ (cl-tiled:cell-row cell) 1)
+               (+ (cl-tiled:cell-column cell) 1))
+  (write-char (tile-character
+               (cl-tiled:cell-tile cell))))
+
+
+(defun tile-character (tile)
+  "Given a tileset's tile, return it's corresponding text character,
+assuming that the tileset is a bitmap font starting with char-code 32
+with 15 characters-per-line."
+  (code-char
+   (+ (* (cl-tiled:tile-row tile) 15)
+      (cl-tiled:tile-column tile)
+      32)))
 
 
 (main)
diff --git a/res/font.png b/res/font.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a7430363b8db82f18d446d5346557d1ff7b1286
GIT binary patch
literal 7593
zcmV;a9aiFrP)<h;3K|Lk000e1NJLTq00961004jp1ONa4PP~7C0013uNkl<Zc%1E>
zcYKu9(#O9^Hh?rkuNtK*!2*aVdIdpIEP#lD*Mb5T1VjNl7g4-o0~N9G;<Zo|1g}>`
zKu{1=EGPm>Rce3$OGqb;{N6vZY&O|*p51H`K(oK|QJy?AXP()8W>1?ra}XzFS*Tve
zU5ES<sY&W;p*7ST#T<7HOH?8W!wC_*#RaUgQ1_C;S5!Zy8kI6i-vCA<8nJ`_hAg20
zV>ydExrs_aa7Tpv95@3p(2?U|I@6tG3sv07US^d*gX50k8$c7pl@9bIAem&6tQ;<~
zXbim1C<C<-zj7I=9Aqdfa2Yu2u#`-G=5zpNaGimt3U9KXG``_N2VIjr|Jl%#aoq06
zk;gzf(cgjN1V`}=AREYWpeK<>x}yO!C7pPnHERvjn~9_|+n7fu`jTtln7|=U<0mEq
zchiE;3_K6gg-$f&X=*y?8pr^K^E=BN=l}`KW~3uWG~$u~QjQynZvZ)9d@V<Dh!o^t
z0Mpn=4TNaJB8K|WQ>o<XRmFCr1Q)67Cyi*%W-K?7ZQ$8QC0wMiz-S&vkxnit4)pHK
zbD$o@T-s8{fu6$=vK%Fd_CY+SY*6fRV@*k&N-*w>)M(9;OR+kvXhrzZt7?t5YrFbc
zCB$mIGPO$=YLog{xkf8XDRRp#w^oFx=@AF{1*L)Y8>yys8m~4=R}YQQN_DnKklL5v
z8!b^O{T3h)@@UQ`a%svR<RCwK8s{^as=UW^%kOFjt!Y3kLs?|~h2FskuA>!ktY-?n
zLejJvk)#H}mjaw@q=;8(&9_wMV|wvFwuYofnIbd;a2f*yMoTt(|8GJjFS3f~X~zP~
z7+)M>FfB-DCtuUZk6wX^Jj{IdkU%!691Ka%bf8KQd{sTX{z&6Zdh;0v+00c;V5c94
z8#iuX32xl93rSBH?vdlh&CFufEq0?3CF!h?o18egm8)dAm9E2DY2{m}Ub<M)xfc3a
z+N+1PLveapOZ=!!BsKS3FVU!wwcV}zg5c^P>2xdg0l9Ume$X5vwZ7`BzNGG|ulkA(
zQO_zKIrUY)xC>LoZvl=FVH~{&hmEu)lJkk<YsPSmfupMTSAQ7WEWavq7)lMk<2ODs
z44@LpBQ|6m3$TpNL2z|pC)+HviVWgTcJfayq?Li5KmrNCK@vy^xn)iF$Vni<VfNLP
z9~t6zx7gO!Ny!=#qNO6#R2f3(XZ0}B=W2m2)mIv=rCOs%BhO4t7P?t~s)3%?HwKQ`
z`dzJ5Lw%K`n?u(1BIT$_0G<l^Lk~OB3;$~>fd_$ol%nTC{v7$`GfD2EcZ)Bkqz2GM
zn}v|u(vj5B>q?N6qFJhE<mjwbsvs1hDaz3AYG&Z6qSv)g*;=PtO7x}8(h@~Ea*WqT
zom8S{1XIRI`niNMZd0lz6}?;5iicX9ok5k4nI6^kvtD<g-=YIL^BCxHzN81sLh^~~
z3_3!d12yBA>5;<aoJ~&)wGrd!#`<HRM`u!avn&Kh_)o;cD1r*cwZ_1-(!>|6VRTst
z4jVu@hph{^hziG4k1&oC%m&bq#k4ubnuKv&VD17Y(aO>1AI9GXrWT+McQW3{{SSU7
zlRp{cDDy^kIe5`q@-azdu-xhbZNVH8Im}8fvr4JM27?cv0F8ZSI)jZIRhi6QQdneh
z<iHa?GFBKl`ml<_?Bp4ut(x4+X0q5oUk7bV6Lw9^Fw6~~(Ng1_@l>U0g6gQRq^m6R
z$`)FxEn2Q+7J7uf(^%D29ZglDW!?G_jnpZssWHmY85TLuYq{h6wy~sGx#W_|;BrQ2
zu@<V8s;i?_Mx>{{OUw0?fquC%)koEIo_6S2i;TfaR5#VoAmv#78l_hnYK~?Uua5t%
z7$sYxV4wD^;SJY8eQ6QcQV*ztUa%Sf-gUKFlCE)7E<%UZ-$<#ebZew;erYVJu><`|
zC8}DGUs4BUs=nd=1aF+d1ncKrr)NA@3-q@23AZXuFFEQEm?Kidl&sGKE?pNX{$0R*
z{LYug#^M6L0Z!%)#&W*JO|yxK0cOTWJpa}N5*_%W8Ad#djI;;&#iFAxUScb23^7Ll
z*YE{{*}zs_<fH&{9%L2?hWkI$nsb4QTw;w&Xu=;}Zu_vh0aZBFQHMYr?f8+07)TFG
z%t1dNhw-FBlp+>URR=9j8nj*$gr3&`^^_ccKTa*c(K23}99G#UD_a{ajb=TitDDe2
zjc%a)QcVx3hnni2$~49nEz*9ysg}A>8}z25o=ugjI16ora<ojpYlOA-4zHtVoOU`q
zrEvg{gEPl{%F;wtb*O!kkHfgSFQq8sLk=#7^?FvP>3c=$>Jl437p3U}2YL-P(NHDo
zd;@Kwz7;|v91NhKOxJwF-R1h9=jv9aJJx?qi!78gv{sMkO3hTVZm{q?r>#0o`QE&Z
zL1-IVd0QKFc4&1A|9O)3={hU(SNcD_uWmxOE6p;r$}fQo;Cv;jZxHIu*ZYRMJCz}~
z+)7uD+&U$IjOVr5aQ9<xk9>usO4izSl%ehx+An&+b2U&Is$t|gNi&qIbj{Jb`Yeb~
z99pTWNy^lV4sAd`PjsYP?!q3y!ff~HH-{JdwDx*F#9P)uV198nfJ?ML$c<l1^seD<
z9ZysCynayqfKBITnrFB>M!$KkMkwB)_BgGx($X~Cb9J7i)>ghssw|gwXqdxu8U^?q
z{gfIY9-ysOX{Ysj4XO*Mpk2Dj;SsS)(|FZTe`V=vE0;?yy{NC{vV5f8+O11G(<@WB
zM<souVQQq>8lh}m=%CNP9J+u<G()XbLw6}h|1i)SD_xJMw$4|)L&#WVxpjw?I$fL8
zK~)r|<yzzT0;BYXwmSSiM@vRCEhrNt{p84jqBKIOnjC<uNb&vSE^Q8AhnMIVWoerR
zTRB>(0GURPZ9W`hjT~LHM5#*GiU3o+F%AY$TmO+;hxL<n#o`kEpbYKQXoog$s1j7s
zN<B%>XuGntSJNz^D+sxCwZ7LzwQ%?(fhT#Lq@ZFO8>>waTt3BD(XG0@c$NS5rB*2{
z-fY%t-R&3<7EF0eNrjv4(kcbMfQsD8J0%SG4#OWc9alSo#aH~mBc&k658-%#a*h)<
zBrJ?$gs=gWbA%0`oFi-i<s6ZPuA>5SKfngE*u~Qp-p+hT0$FV1IjULZ+=G~Ip^Zm~
zbbjXvhv0_F{F^_?W<PHmHi0cf<Py&kYZyk1&rHa+t!ujvk1al`C38q5lV2>M;|rPQ
zxf(>8kz=UOQ)XD60>3$M6iDvQVXijTcU!!og$!UIKXIN_1%Mv(X9#t;g?o6wK!2Kf
ztmFb}aswUt%$mQa9}DPZb;GV9np)h>0H#<tDzTi4xQUuv$`L9XIQ~N=&SNHT@tF0~
zbSIi<qG@L3c*w&M%>pC64L`D*b7;gkE;6RG35+R3Qyb_>G`Cv0&L)~@K5>-Pp1BNl
zOo(BE&!Rw8y{Ifr(aAw9AbhXa40qf3?2<iMiI#=sM#@%W?bG!}>UjO?xq8*;#zE+D
z?R0d0F4Q#7)t$;R26Mzn>K5QLZV$Nj_FaGlTwhHFDb30iBRMRt7nF~U@jm&In`)oN
zSZlg9)J*Yh0n!-Bd7R5e`Z?N61t!si$p*?gpXM}~MaJ|^a3jlzXHJ0BN{#4d&A-*3
z4=fF8QOu<R-GbsQK2GHV-Yz5A#YJ5f@exlIzhcor;95E{me-hTtx<`^bfhgCjMVll
zW+%(J5?D!FBTqkO0yF7h870Kw<`6rX&qRw31#vckkVqO0Ewp)_2$?u*?QzB!nxkk2
zYz5Bsa9wKTy4g`iY2gFXxHpuF{<8q_F)JK$RrH}f-HA8SYOsVa=*kxU2^^xffu|{P
z{1^D1J(koh8;PSeo$0_L>nI}l1<Xh*?;zrcBaV&Mx-WP*#u}+n<mXCROC0T}W!XwI
z&rwEc;U(Hw+S>pqY5)=3#YUp(VyzL+v)0U7y>atATRa^>x-r2@KPs_@G}4H*bON~~
zu!j}gPggn^IkwT%s$XH$qcS@zv_qbh3igagsU8mV=Zyy%14l?;pH;?TM;XO~%c|=q
zJi$AhU3`&+4d5JB@&xzL!;+v4;A@_=(qaousa(eJ(0<(S`AziZGHN;KmI;<$)g1a6
z$Nv7fjSQ9q#aVo8VwW+;Nm(J1Gx^g>9nS(jaZFcd5n6!${K&7gVzy(A3GAndg_c4^
z;Amo(XhV*z)||;KwzHk>%;yl-8|ApD$QeAx@BCn-KSvUu(w@r1@^53)7lDgL4Cg5x
zwtC|tad}E;$m3y#GKvP&v3!nT5P^#*k2dCIx&HK|CJmTG1KzR95d%nKo^|b{9<4m(
zq$2garG~>MiGngg`>nC(mn&VTsJ>Qcw$M=h;>R&w-}(IYo?#2hcu7*Wc4&&~Shc9C
zXZ5GDbU<?q!B`6=<taf+bgiX+jC@hs$P;)Ph<fQKWhz6f^{8>1OW<kXP#-<an>w!1
zQY9)w-&*nv7Dzr#2Q<~l<Mw$<q0KgdK49@mq&`rN_NkketFq>3N~uZ@mog}!Hh*U1
z(T}R6BN}iJcThRD!Z@xdyMT}?WDt%vIpGnG2rB0YyMxO)!Uj-Y(8{wU{a)eQr8@`=
z<HUuFS~Mkt%)+;QTYyZCPy>Js$hfSy5OFO4S6jVtefgCPw(+>Jb?Jx@x$I)DWtkVQ
zW3__>7=aL3?BWB?waBQzc(#(wK4x*Ifj+3nZ0K1(j(A3Rt}a3}Hpm!Bvd>E8Y(6SN
z|C5J({%VN~r<YV=8?Sq=Zz6?L{5WnR+Z(YE!B2)5iGGDXiBpc`{f1n^-kKF9?N?8s
zI!e=FU1FFuF4SJnuE47;%No6vqH9$}ZMDfiEvZmPNwKP+W_m^0#$>U*m87d2B%l#W
zkV_TSL^G7Enns>iwN0H=O>vr_R}J(Cx#UtkNnI^jMB=@hzAv&Qn`o#b-i@Obl;U@|
z!~(r3)KMEXLg*UpGirL7a@AI-ns!@K@P6x!I=DrNs%7~sF1a*QORf8y;v`cHMZslV
zN$+ct&~^Gk$;LIbg?d>>)LM1}*x*f;(n~pN=tuA9{W2q!sBs1foAjjTs;5yxz5(Q4
zb&xEZ%-8D`%NOBWYD?BrJOUd4`qG<5wuh4Z_87mU#X|QgO&<z9VBIkLj=ocbCTh9m
z<+axlbrPzqUAC|eA=FpNI@L<G7(hWIdor+yOMr{{iY#J`jmSP0Fx=Y2#L~(eJhc#)
z#Y29y>B%$rwwls{&pp=*h;o#0GIz3vbw=7U`g47;6DAcGGr88|_vppEqP;7dIUR^&
zA!h(BED;p&08Mz7!3@GYCtt<8yhsG2N%nRZ{%FV>3^N=_5dZ}S5CeQp8)CSarKDSO
zXI0=8ZuX26{1FT6^;~C?Wa!b3q6&|3GXHawkWHdRLS5V(VlUOX#4;ASk2jdg0j4`-
z8Y?;GQH%3{NUk-U)UlaUi6V}9G{;4As{thPIHQ?nJwXK?;Y{vlG$XtTc8Vf`|FE>^
z2tOG3wg4IIXDwIJgr7;av;a{oW+#IjQaQ_TRTyhYB#EoJ%5d;RM4@`Nr?`pZ8L}B}
zjSR|R4E5<pF7v%{xuuU}=F<zfkRyh~c$<i(F|GNM44TlwA*pmvw$O*FR{B21^CF8K
z9NR-Vo4bmm`ce2AKq~MB53`b74p|H!0`V&MS}ZXhsPDP1NDX!wxw_Jl%5>xl18q0Z
zz;j)JS{4a;BruU(0m7`ZS;*}SV4y?XuN`^bXru`2rZ|&cKrcQpaKw|rMTq@updF2@
zEx`43<U*1hBl@O+L;PVYCNMCxlaYK4AO-k>IF<s3tmzZsU20g|JX_i7jiB#NE?*hB
z4sgJ_3waZJxXLRbkHuCkav4rPF1ON;Vk3lfy6-OUgesOy_FK5-(|{KAG9J|=ws0-$
zf%RNV8oP}Ws`E0B;$}F*EHRXjZ-6!<jAlCTc}Gsgg?Bu7zg7vkbdIVEy`{N^k>o;+
z_l$3MSY`n?DqZ~*qjR-E6Ako^))Dp5GEnL2=aKL)BS*n3V2=JU=J%<mH5#ghs;Ue0
zlh#_(UO3GHZdHnUsG8bqlU{bvcbcYagM~In$(kxOQc3#3!t<(Dc`~KU(JHH^PJ!d&
z^@mROP6cgx2Al>yp|5-hFBs0^DlmX%%Cknf_t#n-)^?3CCV&ZS0BEo_DOb`rmPt*4
z0i2?Ak48mHA1zj*vb9TZsIK)%P6mMP)COf~r=D~?&8v%KjmLjV(g>j|CB0+h=%8Hh
zMD`S=TTdx-GJw54!5(?m<7+GiaH4txqiDjD^rCOEce;dOMjY#?=09gTQ4Ihff>qQb
z);jeGqd16T9S4EW3vWO>kqrRi$YIm*R^o30muHtoW?^r@iERL3lsSC;ZC$MUaEgN%
z#yV`a3Krowg=2(*FS;@x2C>ayh$pPzHY>+OhBKptaRx5F=aCY~h%h)_OM;l=95-Rl
zv`}Ic7(fOuIqaoBig$=34!3o0e^>g_k&}3^L|PqTJXi5Er-fMm0lq8I^NZpIJ`A~T
z1Y_7m7Jr7kOZfqQ3WBQzN!%WQ=QIv+ci~&UP3>e_23%RoaNJE-nW>Cr3wJYymH{L=
zL43kR-0iUA&KafAm6evnfehnXYH~e4hbSSq?l6^&0l%*_e;(haEtyw&+_*v?ES@5T
zmw~0sW*YyXWFyR#C8~X*pd;V18d&YfRf#5C&O(Qs%7L(#jsbbxTu}5@Ve6ViTmBKU
z3NVs$J+t-!TwKD}?}Vl-;UF2TrMH!52=S!yUx(2^P2OT3seEtU*>^WPIK&6mEv)TW
zMmk&hm%|vr<+zUF;wg4;gu{GFABQtRda{lTRv1Im3Njwqa}2?+9-g8mR%B`Ld41uq
z?0K~Orn`gSD!WoqSE#nCYpAkynt?t_Ihv|EI!D`#J`IGTwOZdOPPKHs1{pbeD^~+_
zvaVF3J~q%}m882Aqt;q&IY54#+{#pz+;UqJ;>4?is_F{uwI-Y&r3}qgb2Zj_Yf9<-
zfH0>6qoU-JOAi)3wxTFoJ!Pmvz!z}54d7^rP^R&Ki&5I@39lNaY|B~WH|U6B9i=bv
zzV>NG19(B7dainDt5HHV)z@r&s`{#LNf*7s8?m_B;?+Q-w9DfpnyOD6^qmpJiD9FP
z8bHwj#y;NSafgQF#6U$J<U4k9fQpt30@>tuK<kONL=~M!yft-1KH9Lxk=~AOo=NdL
z#2VA)rINs5vPdAoa+KEBT+S&#ds<q8+W^u%-AG>PuaEfmUC*(Fvjcqe<Biwo&b_SV
zutUOxd_;kz4~_`vV~BJ-!X6^{)F(bNG>^qt&gW0E5ibYG%TPw}H-KGC=P_<L4!Q)7
zD|y`$PZ(&Rc@}AwK*=@SM?J@h(-!ZJ0&{TbYI<;>gs!S4Tu2?FN+qRyNH8@i&(M=r
z$6S-*U?W|rPd%nk(UPsCIm4;W#f;=FOXE9_ZOot*F<ikdMvm$9q!-m0XvsG^nTAZE
zA&nRj@*>YEL{pcP60cmia1r6nHe!cgyJs?ht<2`p5-L=-xC^nBANiBpEU8hyrU{$*
zA0JuQBs1vD0lr};|FW3K8$8dO?52}3Cn9X6GtJq=FLVz17yLDISwjxl{1#eJCjiaJ
zA%~l|iJSnDfw6x1-Hc<!R?2cbg7ie01^o3(tY>ymQGKK`KV7)Fl5}g~d*)H)M((i0
z+vhujPV5fiuY_-Tlp0hZhK3v=y$qk!lE?X;X?}YLifKcYJ!j9^BF_Sq^L-95bj$5M
zd9S>d&iY0v%F#Y8&=qC)oO`uRZ|XdM%CQazi7v9Nnp&n-AI4EcV0qEuh@f(gf-yi1
zE;^2SgmIiuU;sV&H~?>LPqz^c)czZxIBUypqKRf|nd$P^#JAjdyj3U(iWlpaOK}pl
zmk+eGhR6LS;NJpN<9oghF$}RIzcGeXX4990tfj7jXB6}3%UXx<hAa7nOm;EWvOqeD
zkGO|jr1G&fQvuw;b~2dF1Y_4W0C9*)Oyv;vygGNWo=grfi!+S$?-8|l8zJghbUhk?
zG0mt)1lxJYbKRaiLrBQXLQbOFjCtHgkV0c1l9iTIR<<(6bJc-7-|xMs0aRrHxm;n$
z^Bo*okwiOg;3`^E(Xve2mHzahIgJ=)pmyLB-k>1^7-l=^ipyw6Te{G}x<R}f|Hn8Q
z@NUr{NDtoSG-8;+K`sQp#7X)12d{G<wYY#a#*+`A6VV)GAkjpJ7{4fHcn|2gk!1$Q
z)vq)M+K|aJKr^G$_+@@%GBAY33^6|EeXl>`dcO8u4lZl}RrnlA@cJQ_$!rGRAc4J>
z-)Aa)*}`tVF*<Tau$-wR@+DKa-|`eUgE_z|UZba_mAH##yiGEnTMoYwM}R0EVK+-G
zhdI;%l1S$do@JGh;|RGx9=Q&OP6Wbq&Y>j`L0@Brk2N#{IuK6>pt&KbMt-XJ&J1Nd
zw^@vNCT%=nx_t_7WiM<1@6wDbf;^5X7?@wq(eQ>0;}G;LuZ{o4X;d;w$nuOtHV|XU
zV{oQJctrtT1yZ=oGOqcAX{=xsV>mqsS)pPRKXN0`kvhyX(0`>G_2|HRw8ho}Ks+Ov
z%p6Nb23XG;`U2<DxbRP+@GE$ZYK$!QM<`w7_`HsY0M5-wY=Ib20fIU5;oNNJa3^(n
zmUG$UO<GYFm`*?7M*eGTdH0h*b2_k)ESl2H*a84t!7eUy7`x4+FK|8c3%3!44d6$v
z<57k=s$15xfc3QYT(x0qfQ8~S*<<Ohws{>^flfnpMhYKt9jmy*%5lVTDxDXEr~iGL
zagL<}0Qi-&XvJFAaRrqusibb>V%l+tR~(+whUWAsI!G+4{9<ll5;r@jyN%W~C&rr#
zsI)PWOSzpGx-!H%#B0h>YI89|ta)?hav9fCojWWCQ{}fUQI6&@l*edJ6}r&Un%@Uj
zb1k)~%UMS1ADlv6peuc>5)QI}m%*9>Y7IBAg-q6RBO8pPjnkRTJse;lH(SpRi)T6G
zXyCVu=k*H>klS;0k8*U4)vr`pvz4kuJ!YVFRHhJ;Itnc_9=TEwm->c2Gd`iO)+<}v
zyonn9C2Z4V?Ng#&vF7fG(DQODRqtq)F`{>XC!@x14j#0#^@$GYur}x!RkU)Qu0=}K
zeoZz~BQ;ICwN_I!-l#`@=_BbmE482U^p4PN%F}xWdX&D^2cGL^<W>WVoWYX*Q}pg%
z(HS&~LB)tjm_}{O`Gn;SHQ7n$qVt*XHth0(x_rPw|LN>s(E#$SN!v_Fv_$-sFI>t_
zb}_)8@K@{t!YDo}5XE5=p)6W}$IEPn5JsrTHoyMR44^+>I<B)h8^F7)<k1q&&ci4@
zI81}grLpofM5jA&Wa=CTYCT=0gX&xC=Y~s}l;Y>Ui6(+~OAyMrkNNEJoG~26aYymH
zfOzs8&!q_lrv})U8^$q%uK~pPv<&vt<T)HDp#fB*x+M*K7{?sG29QKF(L~dmY+ke0
zh@(b{XVy9Na2N(Q;X5|d1Av=3uY}JE!x?_Vf<|&{q-Dqur!+~gSWl+PFV2HNg!<`_
zay8gUi_{w3r*1l+t~yl*)aG~(lm6bN=#40St<SA5*rlerQ#k=%a3BMypgnp|=a`b0
z3&na8t6!`GO4nV-`wRNJm!dbG)E?CdP$@yZ9qEA#pso}kJ5PS85b_Sha0$8;o(6W|
zVY+i5K(A2+cZqtPLnx@I<M0~(F@WzNunseMffcxLIZO|$Q<Xg>dS(u88kI;w7^Mc^
z7kvW_c!V5s$g$+a0H_BgGyvG^JsB*F;|yN|m_mfN+-t3ofgI2C42+i4w*+E`am-Qt
zrQqF+U@8?o=TDem4&^?IkLk=TJ}vfh!zdGk8V_)i&Ak{9mHf`w4dXZ>91v2@@mCB9
z3!@YfHh^-DumO~FgbkpaBWwWW9AN_}=Lj1>IY-z4$~nRYP|orHKHDDOQnxsp00000
LNkvXXu0mjf0L@Ot

literal 0
HcmV?d00001

diff --git a/res/font.tsx b/res/font.tsx
new file mode 100644
index 0000000..845ea58
--- /dev/null
+++ b/res/font.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.1" name="font" tilewidth="17" tileheight="17" tilecount="105" columns="15">
+ <image source="font.png" width="256" height="128"/>
+</tileset>
diff --git a/res/font.txt b/res/font.txt
new file mode 100644
index 0000000..054b129
--- /dev/null
+++ b/res/font.txt
@@ -0,0 +1,18 @@
+A Tiled tileset generated from Fira Code Regular⁽¹⁾ printable ASCII characters.
+This is (ofc) not used in the game, but is very handy for visualizing the map in Tiled!
+
+Generated thanks to the beautiful program ttf2png⁽²⁾, like so:
+	$ ttf2png -r 32,126 -s 15 -l 15 -e -t -o font.png FiraCode-Regular.ttf
+
+Note `-l 15`, which sets the row-length to 15. This is very important!
+Flora's engine parses the tiles' character values by calculating the tile's
+[15(row - 1) + column].
+Could we avoid this, and automatically figure out the row-length? Yeaaa.
+Could I be bothered? Nooo.
+
+
+[1] https://github.com/tonsky/FiraCode
+Fira Code © 2014 Fira Coda Authors, SIL OFL 1.1
+
+[2] https://www.tdb.fi/ttf2png.shtml
+TTF2PNG © 2021 tdb, GNU GPLv1
diff --git a/res/map font.png b/res/map font.png
deleted file mode 100644
index 017a3e70a229c89093f7f1bb5f6452937e05077f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1026
zcmV+d1pWJoP)<h;3K|Lk000e1NJLTq004jh002M;0ssI2U9{*Z00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vn6c7&swrmWN0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbQd`Uz>RCwC$T-j~|Aq)%=|NqPBL!}kP2jc^>O*{`(gkTqp
zuQ6;NkHVetdcD||shw?PyU{*Z`*OJQ*c-|XT+ws)<|#tIezewFYxrZQ&aE{?A&%`9
zUC}f#&#RF!ufNc3f<9L7iO+|%Hr%QbUBxJbr9cua;8!2VzoS;NA{bTpw<m4^adAjS
zsjHO9DA{G^!~oND=^p4oW%;^I77#HD_7#)jZ+C#Kps5HH+YEZ4U<`1}W%;z|2AG6m
zN@M75x%VKbR;J<j4B0i}Zmm%G4z$U##$e4hUhP-oWKgu-(NlT*VFtRKlD<r6MN*su
z({^82(_dtbV<2ZXv3>VEO)Kh>im{DZ347!@?%7KAXCfjg@pF7v*X1&K8%nr+9*hz(
zRw%i9tcZBpgK=GS6jEUD_)nbUASSPSFfeP5xDkb#NrVyP781|G8%K0S_umrz65W@i
z*Wd&3#>f(yH91lI512EsPm5$hn{-8T$dZq`ew(wPLgBlK7;7@DUovqn-8S`SO2e1V
zP#GR1P0OB+6`{PtQT+2&1RaS4Tjf8-q)g>;_IL7;WO{f(0xZj<{!7KNr_@7skVeV@
zO&gE%TgQr6!st`Jo<jOrkxAjiWK6-L1@dZ~AFxhbr_D<|-|l~O83k(+5tq2*uv%ln
zNPJ()NT2Q$yRLJ5pIftv27l4jbGZljeB#ckQ211AN|2S(BYxY(om}O1bBqF)x$A0T
z8=%KVX_m?v3z*xykqY4VExRu<nDQ{%h%+fuvN7Giv!+0ilimk>_A;H?E{ho(Pi1#B
z=6c;tC%yQ&Q@2(E6lHf*5e_HajvdV+{0o;T-7Q3lT<(gSsepCcT*I*|j0La?NQshr
z!Qgo(5}fs=f`rjg;bDhQjUW##B339Q`s>39%pD?gBA)IXpd4A|1}OL0C6ev<{EGb!
zK(APsdeRTFd_7Oz4fSv?sq6z1t7#ARRifM}V-^uZXj)IPqxk8S)n6}fk<t^ZlNEWI
z)=Tqz`qm$*e+5seXpu{)`bonbiNpBa=kfvoTQp?n*}){odU_R9w;kFlF{bhSYiU)|
zH@57xAKG5|OQ8_wDaXG5FWjPb|JmpdOF_}PdB@Vz&(wEov72QgWf_OOO$j<$3o0-1
wPTg1jk3?lbg+ifFC=?2XLZMJ76bhe$A6SOzztlY;D*ylh07*qoM6N<$g0J7(VgLXD

diff --git a/res/map font.tsx b/res/map font.tsx
deleted file mode 100644
index f6406b4..0000000
--- a/res/map font.tsx	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.10.1" name="map font" tilewidth="7" tileheight="9" tilecount="126" columns="18">
- <image source="map font.png" trans="000000" width="128" height="64"/>
-</tileset>
diff --git a/res/map font.txt b/res/map font.txt
deleted file mode 100644
index 2064fa7..0000000
--- a/res/map font.txt	
+++ /dev/null
@@ -1,5 +0,0 @@
-License: CC0
-Author: domsson
-URL: https://opengameart.org/content/ascii-bitmap-font-oldschool
-
-Used as a tilemap in Tiled — just to help visualize the maps!
diff --git a/res/map.tmx b/res/map.tmx
new file mode 100644
index 0000000..e5fb81e
--- /dev/null
+++ b/res/map.tmx
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="left-down" width="72" height="20" tilewidth="17" tileheight="17" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" source="font.tsx"/>
+ <layer id="1" name="Tile Layer 1" width="72" height="20">
+  <data encoding="csv">
+2,0,18,18,18,19,20,21,22,23,24,0,0,0,48,48,33,33,33,33,33,18,19,20,21,22,23,24,0,18,33,33,48,63,63,63,64,65,66,67,63,18,19,20,21,22,23,24,0,0,0,0,0,0,0,0,33,48,63,64,65,66,67,68,69,0,0,0,0,0,0,0,
+0,0,33,33,18,19,20,21,22,23,24,0,0,18,63,63,48,48,48,48,48,18,19,20,21,22,23,24,18,33,48,48,63,64,65,66,67,68,69,0,0,18,19,20,21,22,23,24,0,0,0,0,0,0,0,18,48,63,64,65,66,67,68,69,0,0,0,0,0,0,0,0,
+0,0,48,48,18,19,20,21,22,23,24,0,0,33,63,64,63,63,63,63,63,18,19,20,21,22,23,18,33,48,63,63,64,65,66,67,68,69,0,0,0,18,19,20,21,22,23,24,0,0,0,0,0,0,18,33,63,64,65,66,67,68,69,0,0,0,0,0,0,0,0,0,
+0,18,63,63,33,18,19,20,21,22,23,24,0,48,63,64,65,66,67,68,69,18,19,20,21,22,23,33,48,63,64,65,66,67,68,69,0,0,0,0,0,18,19,20,21,22,23,24,0,0,0,0,0,0,33,48,63,64,65,66,67,68,69,0,0,0,0,0,0,0,0,0,
+0,33,63,64,48,18,19,20,21,22,23,24,0,63,63,64,65,66,67,68,69,18,19,20,21,22,18,48,63,64,65,66,67,68,69,0,0,0,0,0,0,18,19,20,21,22,23,24,0,0,0,0,0,18,48,63,64,65,66,67,68,69,0,0,0,0,0,0,0,0,0,0,
+0,48,63,64,63,18,19,20,21,22,23,24,0,63,64,65,66,67,68,69,0,18,18,18,18,18,33,63,64,65,66,67,68,69,18,19,20,21,22,23,18,19,20,21,22,23,24,39,0,0,0,0,0,33,63,64,65,66,67,68,69,0,0,0,0,0,0,0,0,0,0,0,
+0,63,64,65,66,18,19,20,21,22,23,24,0,63,64,65,66,67,68,69,18,18,33,33,33,33,48,63,64,65,66,67,68,69,33,18,18,18,19,20,18,19,20,21,22,23,24,54,0,0,0,0,18,48,63,64,65,66,67,68,69,0,0,0,0,0,0,0,0,0,0,0,
+0,63,64,65,66,33,18,19,20,21,22,23,24,63,64,65,66,18,18,18,33,33,48,48,48,48,63,64,65,66,67,68,69,48,48,33,33,18,18,18,19,20,21,22,23,24,39,69,0,0,0,0,33,63,64,65,66,67,68,69,18,19,20,21,22,23,24,24,24,24,24,0,
+18,63,64,65,66,48,33,18,19,20,21,22,23,63,64,65,66,33,33,33,48,48,63,63,63,63,64,65,66,67,68,69,63,63,63,48,48,33,18,18,19,20,21,22,23,24,54,0,0,0,0,18,48,63,64,65,66,67,68,69,19,20,21,22,23,24,39,39,39,39,39,24,
+33,63,64,65,66,63,48,18,19,20,21,22,23,63,64,65,66,48,48,48,63,63,64,65,66,63,64,65,66,67,68,69,0,0,0,63,63,48,18,18,19,20,21,22,23,24,69,0,0,0,0,33,63,64,65,66,67,68,69,19,20,21,22,23,24,39,54,54,54,54,54,39,
+48,63,64,65,66,67,63,33,18,19,20,21,22,63,64,65,66,63,63,63,64,65,66,67,68,63,64,65,66,67,68,69,0,0,0,0,0,63,18,19,20,21,22,23,24,39,0,0,0,0,18,48,63,64,65,66,67,68,69,20,21,22,23,24,39,54,69,69,69,69,69,54,
+63,63,64,65,66,67,68,48,33,18,19,20,21,63,64,65,66,63,64,65,66,67,68,69,69,63,64,65,66,67,68,69,24,0,0,0,0,18,19,20,21,22,23,24,39,54,0,0,0,0,33,63,64,65,66,67,68,69,20,21,22,23,24,24,54,69,65,66,67,68,69,69,
+63,64,65,66,67,68,69,63,48,18,19,20,21,63,64,65,66,67,68,69,39,0,0,0,0,63,64,65,66,67,68,69,39,24,19,20,21,18,19,20,21,22,23,24,54,69,0,0,0,0,48,63,64,65,66,67,68,69,20,21,22,23,24,39,69,0,0,63,64,65,66,67,
+63,64,65,66,67,68,69,0,63,33,18,19,20,63,64,65,66,67,68,69,54,0,0,0,0,63,64,65,66,67,68,69,54,39,24,24,18,19,20,21,22,23,24,39,69,0,0,0,0,0,63,64,65,66,67,68,69,20,21,22,23,24,39,54,0,0,0,0,0,63,64,65,
+63,64,65,66,67,68,69,0,0,48,33,18,19,20,63,64,65,66,67,68,69,24,0,0,0,0,63,64,65,66,67,68,69,54,39,18,19,20,21,22,23,24,24,54,69,0,0,0,0,0,63,64,65,66,67,68,69,21,22,23,24,39,54,69,0,0,0,0,0,0,0,18,
+63,64,65,66,67,68,69,0,0,63,48,33,18,19,63,64,65,66,67,68,69,39,0,0,0,0,63,64,65,66,67,68,69,69,54,18,19,20,21,22,23,24,39,69,0,0,0,0,0,18,63,64,65,66,67,68,69,22,23,24,24,54,69,0,0,0,0,18,18,18,18,33,
+63,64,65,66,67,68,69,0,0,0,63,48,33,18,63,64,65,66,67,68,69,54,24,0,0,0,0,0,63,64,65,66,67,68,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,33,63,64,65,66,67,68,69,22,23,24,39,69,18,18,18,18,18,33,33,33,33,48,
+63,64,65,66,67,68,69,0,0,0,0,63,48,33,18,63,64,65,66,67,68,69,39,0,0,0,0,0,0,0,0,0,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,48,63,64,65,66,67,68,69,23,24,39,54,33,33,33,33,33,33,48,48,48,48,63,
+0,0,0,0,0,0,0,0,0,0,0,0,63,48,33,63,64,65,66,67,68,69,54,24,0,0,0,0,0,0,0,0,0,0,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,63,64,65,66,67,68,69,22,23,24,54,69,48,48,48,48,48,48,63,63,63,63,64,
+0,0,0,0,0,0,0,0,0,0,0,0,0,63,48,33,63,64,65,66,67,68,69,39,0,0,0,0,0,0,0,0,0,0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,64,65,66,67,68,69,22,23,24,69,63,63,63,63,63,63,63,64,65,66,67,68
+</data>
+ </layer>
+</map>
diff --git a/res/mom.tmx b/res/mom.tmx
deleted file mode 100644
index 7b82f77..0000000
--- a/res/mom.tmx
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="left-down" width="72" height="20" tilewidth="9" tileheight="9" infinite="0" nextlayerid="5" nextobjectid="4">
- <tileset firstgid="1" source="map font.tsx"/>
- <layer id="4" name="Foreground" width="72" height="20">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,23,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,0,0,0,23,23,23,23,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>