From 668fa9ffd424441ea868a7a9539a965c18ac48be Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Mon, 24 Feb 2025 20:16:18 -0500 Subject: [PATCH] Add fonts to assets.lua2p Include until-now missing Roobert 11 font Rename font-full-circle to fix casing --- src/announcer.lua | 2 +- src/assets.lua | 21 ++ src/assets.lua2p | 3 + ...5.png => Font-Full-Circle-table-12-15.png} | Bin ...t-full-circle.fnt => Font-Full-Circle.fnt} | 0 .../fonts/Roobert-11-Medium-table-22-22.png | Bin 0 -> 7642 bytes src/assets/fonts/Roobert-11-Medium.fnt | 242 ++++++++++++++++++ src/control-screen.lua | 4 +- src/draw/box-score.lua | 4 +- src/draw/overlay.lua | 2 +- src/graphics.lua | 2 +- src/main-menu.lua | 4 +- 12 files changed, 275 insertions(+), 9 deletions(-) rename src/assets/fonts/{font-full-circle-table-12-15.png => Font-Full-Circle-table-12-15.png} (100%) rename src/assets/fonts/{font-full-circle.fnt => Font-Full-Circle.fnt} (100%) create mode 100644 src/assets/fonts/Roobert-11-Medium-table-22-22.png create mode 100644 src/assets/fonts/Roobert-11-Medium.fnt diff --git a/src/announcer.lua b/src/announcer.lua index 3eeba4f..971848d 100644 --- a/src/announcer.lua +++ b/src/announcer.lua @@ -1,6 +1,6 @@ local gfx = playdate.graphics -local AnnouncementFont = playdate.graphics.font.new("assets/fonts/Roobert-20-Medium.pft") +local AnnouncementFont = Roobert20Medium local AnnouncementTransitionMs = 300 local AnnouncerMarginX = 26 diff --git a/src/assets.lua b/src/assets.lua index 6888438..542db41 100644 --- a/src/assets.lua +++ b/src/assets.lua @@ -132,6 +132,27 @@ MenuMusic = playdate.sound.sampleplayer.new("assets/music/MenuMusic.wav") TinnyBackground = playdate.sound.sampleplayer.new("assets/music/TinnyBackground.wav") +-- luacheck: ignore +---@type pd_font +AshevilleSans14Bold = playdate.graphics.font.new("assets/fonts/Asheville-Sans-14-Bold.fnt") + +-- luacheck: ignore +---@type pd_font +FontFullCircle = playdate.graphics.font.new("assets/fonts/Font-Full-Circle.fnt") + +-- luacheck: ignore +---@type pd_font +NanoSans = playdate.graphics.font.new("assets/fonts/Nano Sans.fnt") + +-- luacheck: ignore +---@type pd_font +Roobert11Medium = playdate.graphics.font.new("assets/fonts/Roobert-11-Medium.fnt") + +-- luacheck: ignore +---@type pd_font +Roobert20Medium = playdate.graphics.font.new("assets/fonts/Roobert-20-Medium.fnt") + + Logos = { { name = "Base", image = playdate.graphics.image.new("assets/images/game/logos/Base.png") }, diff --git a/src/assets.lua2p b/src/assets.lua2p index dfb11bf..9be9266 100644 --- a/src/assets.lua2p +++ b/src/assets.lua2p @@ -28,6 +28,9 @@ end)!!(generatedFileWarning()) !!(dirLookup('assets/images/game', 'png', 'playdate.graphics.image.new', 'pd_image')) !!(dirLookup('assets/sounds', 'wav', 'playdate.sound.sampleplayer.new', 'pd_sampleplayer')) !!(dirLookup('assets/music', 'wav', 'playdate.sound.sampleplayer.new', 'pd_sampleplayer')) +!!(dirLookup('assets/fonts', 'fnt', 'playdate.graphics.font.new', 'pd_font', nil, nil, function(varName, value) + return varName:gsub("[- ]", "") .. " = " .. value +end)) Logos = { { name = "Base", image = playdate.graphics.image.new("assets/images/game/logos/Base.png") }, diff --git a/src/assets/fonts/font-full-circle-table-12-15.png b/src/assets/fonts/Font-Full-Circle-table-12-15.png similarity index 100% rename from src/assets/fonts/font-full-circle-table-12-15.png rename to src/assets/fonts/Font-Full-Circle-table-12-15.png diff --git a/src/assets/fonts/font-full-circle.fnt b/src/assets/fonts/Font-Full-Circle.fnt similarity index 100% rename from src/assets/fonts/font-full-circle.fnt rename to src/assets/fonts/Font-Full-Circle.fnt diff --git a/src/assets/fonts/Roobert-11-Medium-table-22-22.png b/src/assets/fonts/Roobert-11-Medium-table-22-22.png new file mode 100644 index 0000000000000000000000000000000000000000..098808fbc3628945ed3e03f664a5ec37163b738f GIT binary patch literal 7642 zcmaiZcQl;s^S2TuY7*UQu?Z19qD2p}K|(~LvpTVawU549^s+=kbP|$~=$&A#wj|0T z*wt1ivHC_?7C+BLNnBw-uo}Pj-_65bIzg;eb_d+Nr zsNYjkP+w@uzn{IQ`p?_F_tgL0|Lqve{@a6sf?r2ZN9$Pt<)(Gw8$RV^qV>l4`Cje| zfSOx&kV)1LiDx>MH`Fz+yt!T4uXeH&Yx`7_;UT4%5Y0!_DFd19$q{z4keh4Nno5p3 zF_ALElSf|lC9Mc-S=oJXOjBx!L}HS1)RA|Q0rFLJ5qaRtusjaF`N_Ua4@{@)z!zmU zu~ZtF-p&cRJ6jSlm0g+m*!@T4oLfvHM>;@kPRA;le$GR#>0Jh5HqzC1Q@*P?MkCTy z)je~y7s4q>>R&oP6AI`QLi^=(;Y~7O!HcernI@)>(RXbvnr0kDKCkurx~%5s^v2HV zZi|mYdMIl-xE6p|crNP+J%)a6X^I#3>BwO7eC=x%y+jnaWvAlilJCvCuY~Nn5uR}n zR7mqx!QE(PS+L&Qw-UME_hw&|iHd5mHk1$4{@H0I2Sov43Ent#HBf%kVN*EeHFtcy zZu8{bQE94s#szq_p(${Mf1!Z9q5RyZUUtFqayLX8$$ZB^@0){szSLiC7F~lI{O0vR z+TCHa)NFw~IMfc#lv;hPpW94E5*skZx)iQ5eWytvwu6hLkE51&kwB z`2n%)9%@(K4!lXNBoOADhjS6Hu)2!`xWj)q6WmYpUpelLB&z>0E}`> zNZWqIIAELbVzyFK&v8RbWAyXGVBw61x;H@%MPvy8V*rO}Mb>z)VeWHeJvqCwxOkkL z&s!>suFhC{?plRoqYvnm48B@5PoeJ3Xm8_UXW>mNz$Iy)v5~8yLU-^;y03mJ7hH4b zQ?`PI7aa{WD=H>X7t>d+CRW*L=a;KVod|2lNC9?7rsD1>=SL=a(H^Mu#)%Rw7G^qE z?}-lh@6JZIXxBcffQz~}iMvWXrnYvXzI5G)_n@wjj{1XHB_#oN?bHSiX%cleUSgaZ zKwdu-TeJTRTKPZe63+gb>OZ;jUt{M6&BpYPUx0qmeQ#mxBOAGD!?CZ4KYyN2d@I$X z;s1oHP(<4_f#S`C9nTGEDR;bFKH-d8diM#&t(Nd8{z-T44Q;7u(|!AaYn%@Hp{rf6 zv)OZ<)+%WCh*O#PmeLZg7wa}1iGUkPz<_|L4+imIuQ&f~|wt~RHc)EwG1IJm3T`3z!a0`PB3Grv*c z0Evr%YNd0K%>E{$5MdCa(SwIhmAcCd+CANyR93sI>yCBkfW*d_V!g{_PMyXmXamlp zPWNB&6M*PEu1UoWEQtQf>%M#R;SESA%C2^Vuz=;W%9c}Djmzt(otab}8xM%2Qjy*p z@;j{i3=?Cbc@p7v?vq`}OR+Nabwlmq#i;N%H=_-CA;)imow$Sp1%wSD33 zH?)8#=DK^Tv0*lXfQU8SRm^A37T0^1Bq3XY`#{I?icV>sskM~+Et)JRNv`Tn=#2)u=ZZM zj4}4a%J;P^Ur5DdYkRb-a*$1><`1MQDZW+PhpqmG$Dm^8&CWxGcBusr)FqO?Xa$tf z7S+(!Jg5@$dmtI8$m;KOnxI zQSs}|oPSOW?-HuxSMR+XcLq!Ttp7AHc4U}`r`Ke!ZT&vqH~9jc{G|Dr>a0*++SC=A zVx_NbUHx*z_&!-P*rc0vY}v#TjR&1p;Q7%n?d2Vb?!D{B-w@RCPy00P}Cm!^7 z?pi}s7i#%RQ{2uSaTdn!NV|^k)affz@_h2ugLF%jLlToUx>ngyS3ZP{ z&1P#)(tFF9npbaTMRE96x#Gb52WWdW%;(%9M8+^i1Qpp3I(Tx8B%G7qSC+l{6eV`W zmX{0G?X$Ms7tpI*I6`?XWwJFQU-!P}+qLtVS^>u~kNK#hTc(2LA4Usg*}wO|M@I$o+4d<#HyD*1 z+wSq^S5_xj{5bS&QaCwVhpvGL*DNLriYZuF1V4{Rh0A7R0qtyIq7D0W@Chyj05G^D zk;ccH`>!}C7q)o8LB(&E7Kxr?a9Yoe-%rdt(=q9N#?Y!ssfyg>@3b{PxBVSf@IL%t z>vGE)!W3JBMWK>M=Up>lyarUBN(Ja&a&EiPrfQ7I^=4{Jt?QgcwRN#Ff569*0NgX?(cTk+7Wh9g- zn1*r2<4@CuRn~Ur3KDp>ld|42O2~nIaQ*08>viVubcy;3-6hD8oUR?lK~}VDF946; zEs~e3)`iS*V1h_z9r5yO0Y~x&;;7^5idp)R2U~{fLRI5`^=pjY7nyiCtKw*-)=2jE z3De(PG4MbfCo(iMBHhX4W5Uy3Q|K@ zEf9cJcxts?sELOsa?)UJcUWZI{`8>wW0(6}i#I3$k&ED*Gg9IDOpFU%K<+%yMLoYi z6=PXGDdIvLUK;_g8~Y(o~r`cv&;L_OMb0$tJ-R zwvAcZtc~ITza_1(Y{%`{)C9Hi;xJ*k5-+!Jadi6DfZ|f60$f;O+Vy7!b255pdzuZV zCHUhP$)bDSD^ZuO6hticLzJ#^PAi4h<@bU+c*{e~R1bfhC>o}2N>zA$A;=4^_viO1 z?J%)NWC{Xs2`ljVTErUATs@^aaBC@GHao*x!s}h>%7nLBwWP*L^eOGj?zvu}17^pu z?JcCaQR!R=o(v+)>hQGZ+z@S6mJuFVfQgy(KPnTWQoQ+Ld-fPVhJRw=CYyHms)z6U z!(r$Al27b^chmn*r2a3)6*1JgOZw@y(@~>L>2%~QV2&*|GyhwvR23y11OSo+GR-3# zu2!N{7+8gFW|2H*CtG=vjSb6@c@gQb zE8{2h(;QrZ#jjNq+PG>JD<;A=pJ4ZJ*#08LSr#Pq6WQc5M>gN(mge`BKXxZU7R#0= zyeoHj4n>ItBPC4JB4|605G#ebPwn@fkT{%A| zyVK#I;EH-wkkjIXJ95H*oNe;bGQv^Iz%Tj5;C6Rk$?UrH9%dqMP>!W9uQ}kI$q%_1 z4v(dSkxFstz32BcSo$BHa_aVLJQW8v^c1gP=64j5@)bFMCE$#iU%M(9nETr}y%z9n zmz5NBtZM2bDkOsj(t+5+nWWf8C^=oV`5iRD_GU19aJ}Rr=VZm|{_~VDP{q~$ zdlWHUzBS(My!x2|$paY+Mhj=`$bs6AUw#KCRLoOVaFdvX(9^mTW&M9`!&5;C1-$)* zW!_QmM^-x;Ulrsr8Ws~n7>w`**IaSRrZBPBU&C#F{d!u=c@?M3Fte|+r_2x+&mIs# zbsVts>M@h$Ej2{_T!guo%mpZehc!tWf8VNlf|)p=A(D0py~zlq1Z zjLLiRolRu5ywMZX89xueY^uy6OdRv;u=_~CN?EeKw~IH>9E*NqTF*xc6-V7GC<6xM z59|^iwQaKANAjw8zX=gy!m#9=IyuO3vJfMD60V6?5v?G6aijL({Lq0?1(52VGN(d! zRi%7m?v#-@_^g2{G_2~S>+Qme<2dmhKYZ4(%lE#DlG;y0n8mL>=5#ET)DYBGL+5QD zYBmuDD+j%3A;x>;Fv;oz@OzDWM--0gi56dJtck9U8Scmt7XA;{b#ZezSg9z1U!xrN zHSF*~!(wPx6|~CivcR%xx^#dRHu6TWD#uUGV;2QB8+_k{4I3Aa6G_HyXb|N>BLjMA zWW4;RyTRcJRwjbcO1u%vI)e}BN#~e{MV0i?&RK!fO@0+%Bu`r8Q5W?glgX)&b^-gg z%Ic^2@K4e!K^XpaGAe@ul~37MX}`@|dAueXhVp3BAshL}P;M}(#?d~qa$TeXFRk4U zCw9AfSTKhQ!zkG!1{v&MBKzjFX}Q&^MY~nwrJEeQ42O;Q9B4)lC~}NJaZ)P{ENKQahNt#j{*ldY~H@gQsgTf;7+U>e}Yv;k~L}1EH4&QEohE z$Zqdr8iKJq0x%2G2=$3dgFv$>(oR9&w!Y*uNIMlAUzQDKmBo>qx#H5Lq9-NMq587g zgEwd+gD>yhMGg?1Y_ishhpIIu!U(y(kUFBU|J$S2n)tf6bM%>Ou^xjfo_o%^yM44^ zm?}wA{=3Evp>N!xgfm*?ry^+0*3BWC1FXWtc-t%dd(A&+lXZi&wvS00|1h-u8?Wct zX*R4>;e^9?UVjX?=w_Dig|codd!18vKen5B6|~kat`-q|a=J z13qQcd}|;2Y>I4XJyx;X@`Fw) z^ch2VobY!=vg?X>x=6Fokl7q&A9BM z-nrfOUSn(4+xi^tIOpp%y7aSuDiCEdi3VbN^NgI>XsFZ{s#Fo%Y6pf!)`azm4Og(pNOSHS3(UbL}DoQ1? zNBQQ=bEGv8X1kbUp>5u-VX6%Qq$snJb&?-uN!A>`bQf!P!k{*L;uiH=^$+Nm^sVAE zCika`C?JUjZN+b%d_oz~Y`hK`)jFvQZRht16%K>B?YhyZ|EAIiDyr!_nMhNW-t>Z*P^r0k_i9dGFM)^zHJgNT{A>f&x@A$hmucX zz-`x&gFQo|S#`$RfnoEXOIHrX-Y1fgYR^G}CE+19DJjaTieh9lQd}b3g(%(K=pBOp z#p^49feCa_C9kz4^z%KTR;ZBw!Ec^aog*HANty?&Bp(cMqYyIg>gc%DPcv`SI^#S( zk&RCjJ#klxah}ZdfwBXVpCbtIVDKrtTD@aG`!+FmlwRWKl=mQ2wlmx_M$RX^ z!&(?{61>X8t>&vPN&C&=yew>BA!p=LGs5fq$zWIq|ujAMen1 ztXQ3N25B+$U@fz>S-bicFH7t=&wL3o3Kh2MlA!3`Rj5sAEhLvr+;X|>e`)P2F3%dcF^()e zoiuh$FW!@Wg2MCfvIJ^1S6=fUKNWueoyZZe$3`Npmr{$p{unOh^XB!dR4V`57ZF!{ z{8jQ_K}EsvD@X0tZpgB9o2fk2#O)#fn7Q`Me)K_oow_w;NZna*r1$RGK`tavcnvlV z7pg5j)9T}RT5y&|tzomMR{Y^(>2DUngK(ZPIOp1F=%D#5Of9wL)6@AvDnC1@8?fY^ z#*gOd)stO9|IzPwc-GkMKQc5sbv-NH$9)Qabku#UZ1otpD7hkYqL^hjR6>N@^93kk^?C79B+r5?P3BTGAZ>cW%iB)?qTok7kt9^ew#DZsQ?}YqC$% zn(bC3pA0isKuJXXcy?mwCYp`-0WP3}=b4H0qxh3AaA1hD zl?jDw_+cxy!8A~68b&0DJyT7U%!-biFrhiSA*+Bflks26MqLT?FXtiuBn|%gn5#!q z(fX{3-E1N^ZDpFqcBQ4%Yu+-Yl+V@I@;mjps1Nw}$w+g<3tSUOQF!m^`~?aW?Z=b5 zFDC5>7Mj0ORdk-l{p%_xVw2%lV$9~XQq*IHH00aBm8>vllkaq{*a%#7&dk};y#BXi zU0dG+gFzjKG>10L`h6+uvAblZ{1`6i1AYMzVYAcOu$1_Szr&eMq)ImQ=fPZ9yJQ%d zhyh#eXHaT}=~C1!T3f=hk_ne57{=g|tMxP4mC^m7^O=K(Jy10mdOd!-ypgdn*3pXz zwy{}C2WZO5wB|a}Ak(Z0<+L!`EE1z##RMFo%o}&D&nBi&%uSbA1Rwr6sA0??1RI79 zR+k5gah-xlpZJnD;}-&QQdZ4XeFCxEGy+d)T*Af#k95_?@^~U3%`b3d9a=GQCk@j}8rFQ!TA+-l zbzF=T9FCtVj!lr2jk-EoNcZl20)J>PYl zklJj~#=#=MNH&vUUgDC{K!|f4m<`_FxXtet5hP6BL; zyt*h@Jox;3bCvB`l0WU!8_kJUfn+SJRb;H>!E1+Hqy$=0I4N?}q`hG`##O`kkrUxd zqY7>AhX>Layb>ntE^BMJTy{$9R19#LYMd}XAR$1nm9cAx^pOAiRVOlKN1pPB0 zNX>s|IwJ5#sBLE#*oke-i!Uy1V<#oK-cqv6Z3zK(QY?ED@-f+7h6Q7#B;US^Hj*4V zLD8w|Vg;lvPt-u=xBMpFz53qHMchW^v!5vS_NsY$a!p440dSUEcoT{D)>S$Yi@1r% z#G?}AnrF2!pG>~0W#v(|x=bu>xo@feywJMn?lUc`*-M!w*sGH;JC*9N&IBjHdwAZAbf(15N4>+QF{c!m*$04_%`J0vLYlOx{1G4*p$AENe zKI6Ir(gzY{bVw4ZipReU8H1OrLz?Bmj2WjWS*z{>M+gl4r6&+vx+-Ojar7NjwNgWj zQN0xTT$#e#zHt`6Ayw70vAo#qX_LWA66q79{e-*vs>QpbW5<722jR9+&a*GL&@s_T zliy?ivbo-u@#kLcUw0*1{p_f6Kob$0q4=UmjI!V9SC==>@xDSeP^cDn<6o&7FWN0w z)p;w&=F=bVR@@x$=a1uWLM7I4=1g!ZbB%Q&nDEyHtxBQyz)+{+zTK<; E0qUdSivR!s literal 0 HcmV?d00001 diff --git a/src/assets/fonts/Roobert-11-Medium.fnt b/src/assets/fonts/Roobert-11-Medium.fnt new file mode 100644 index 0000000..2e9c59d --- /dev/null +++ b/src/assets/fonts/Roobert-11-Medium.fnt @@ -0,0 +1,242 @@ +--metrics={"baseline":0,"xHeight":0,"capHeight":0,"pairs":{"ac":[0,0],"ad":[0,0],"ae":[0,0],"af":[-1,0,0,0],"ag":[0,0],"ap":[0,0],"ar":[1,0,0,0],"at":[-1,0,0,0],"au":[0,0],"av":[-1,0,0,0],"aw":[-1,0,0,0],"ay":[-1,0,0,0],"b,":[-1,0,0,0],"b.":[-1,0,0,0],"bl":[0,0],"br":[0,0],"bu":[0,0],"by":[-1,0,0,0],"ca":[0,0],"ch":[0,0],"ck":[0,0],"d,":[-1,0,0,0],"d.":[0,0],"da":[0,0],"dc":[0,0],"de":[0,0],"dg":[0,0],"do":[0,0],"dt":[0,0],"du":[0,0],"dv":[0,0],"dw":[0,0],"dy":[0,0],"e,":[-1,0,0,0],"e.":[-1,0,0,0],"ea":[0,0],"ei":[0,0],"el":[0,0],"em":[0,0],"en":[0,0],"ep":[0,0],"er":[0,0],"et":[-1,0,0,0],"eu":[0,0],"ev":[-1,0,0,0],"ew":[-1,0,0,0],"ey":[-1,0,0,0],"f,":[-2,0,0,0],"f.":[-2,0,0,0],"fa":[-1,0,0,0],"fe":[-1,0,0,0],"ff":[-2,0,0,0],"fi":[0,0],"fl":[-1,0,0,0],"fo":[-2,0,0,0],"g,":[0,0],"g.":[0,0],"ga":[0,0],"ge":[0,0],"gg":[0,0],"gh":[0,0],"gl":[0,0],"go":[0,0],"hc":[0,0],"hd":[0,0],"he":[0,0],"hg":[0,0],"ho":[0,0],"hp":[0,0],"ht":[-1,0,0,0],"hu":[0,0],"hv":[-1,0,0,0],"hw":[-1,0,0,0],"hy":[-1,0,0,0],"ic":[-1,0,0,0],"id":[-1,0,0,0],"ie":[-1,0,0,0],"ig":[-1,0,0,0],"io":[-1,0,0,0],"ip":[-1,0,0,0],"it":[-2,0,0,0],"iu":[-1,0,0,0],"iv":[-1,0,0,0],"j,":[0,0],"j.":[0,0],"ja":[0,0],"je":[0,0],"jo":[0,0],"ju":[0,0],"ka":[-2,0,0,0],"kc":[-2,0,0,0],"kd":[-2,0,0,0],"ke":[-2,0,0,0],"kg":[-2,0,0,0],"ko":[-2,0,0,0],"la":[0,0],"lc":[0,0],"ld":[0,0],"le":[0,0],"lf":[0,0],"lg":[0,0],"lo":[0,0],"Lo":[-1,0,0,0],"lp":[0,0],"lq":[0,0],"lu":[0,0],"lv":[0,0],"lw":[0,0],"ly":[0,0],"ma":[0,0],"mc":[0,0],"md":[0,0],"me":[0,0],"mg":[0,0],"mn":[0,0],"mo":[0,0],"mp":[0,0],"mt":[-1,0,0,0],"mu":[0,0],"mv":[-1,0,0,0],"my":[-1,0,0,0],"nc":[0,0],"nd":[0,0],"ne":[0,0],"ng":[0,0],"no":[0,0],"np":[0,0],"nt":[-1,0,0,0],"nu":[0,0],"nv":[-1,0,0,0],"nw":[-1,0,0,0],"ny":[-1,0,0,0],"o,":[-2,0,0,0],"o.":[-1,0,0,0],"ob":[0,0],"of":[-2,0,0,0],"oh":[0,0],"oj":[-2,0,0,0],"ok":[0,0],"ol":[0,0],"om":[0,0],"on":[0,0],"op":[0,0],"or":[0,0],"ou":[0,0],"ov":[-1,0,0,0],"ow":[-1,0,0,0],"ox":[-1,0,0,0],"oy":[-1,0,0,0],"p,":[-1,0,0,0],"p.":[-1,0,0,0],"pa":[0,0],"ph":[0,0],"pi":[0,0],"pl":[0,0],"pp":[0,0],"pu":[0,0],"qu":[0,0],"r,":[-3,0,0,0],"r.":[-2,0,0,0],"ra":[-1,0,0,0],"rd":[-1,0,0,0],"re":[-1,0,0,0],"rg":[-1,0,0,0],"rk":[0,0],"rl":[0,0],"rm":[0,0],"rn":[0,0],"ro":[-2,0,0,0],"rq":[-1,0,0,0],"rr":[0,0],"rt":[-1,0,0,0],"rv":[0,0],"ry":[0,0],"s,":[-1,0,0,0],"s.":[-1,0,0,0],"sh":[0,0],"st":[-1,0,0,0],"su":[0,0],"t,":[0,0],"t.":[1,0,0,0],"ta":[1,0,0,0],"td":[0,0],"te":[0,0],"th":[0,0],"ti":[1,0,0,0],"tl":[1,0,0,0],"to":[0,0],"ua":[0,0],"uc":[0,0],"ud":[0,0],"ue":[0,0],"ug":[0,0],"uo":[0,0],"up":[1,0,0,0],"uq":[0,0],"ur":[1,0,0,0],"ut":[0,0],"uv":[0,0],"uw":[0,0],"uy":[0,0],"v,":[-2,0,0,0],"v.":[-2,0,0,0],"va":[0,0],"vb":[0,0],"vc":[-1,0,0,0],"vd":[-1,0,0,0],"ve":[-1,0,0,0],"vg":[-1,0,0,0],"vo":[-1,0,0,0],"vv":[0,0],"vy":[-1,0,0,0],"w,":[-2,0,0,0],"w.":[-1,0,0,0],"wa":[-1,0,0,0],"wd":[-1,0,0,0],"we":[-1,0,0,0],"wg":[-1,0,0,0],"wh":[0,0],"wo":[-1,0,0,0],"wx":[-1,0,0,0],"xa":[-1,0,0,0],"xe":[-1,0,0,0],"xo":[-1,0,0,0],"y,":[-3,0,0,0],"y.":[-2,0,0,0],"ya":[-1,0,0,0],"yc":[-1,0,0,0],"yd":[-1,0,0,0],"ye":[-1,0,0,0],"Yo":[-2,0,0,0],"yo":[-1,0,0,0],"LO":[-2,0,0,0],"AT":[-3,0,0,0],"AY":[-3,0,0,0],"//":[-4,0,0,0],"/d":[-2,0,0,0],"/p":[-1,0,0,0],"tp":[1,0,0,0],"t:":[1,0,0,0],"/w":[-1,0,0,0],"ot":[-1,0,0,0],"Wo":[-2,0,0,0],"Fo":[-2,0,0,0],"Fu":[-2,0,0,0],"Vu":[-1,0,0,0],"Tu":[-2,0,0,0],"To":[-3,0,0,0],"Vo":[-2,0,0,0],"Yu":[-1,0,0,0],"Zo":[-1,0,0,0],"ty":[-1,0,0,0],"is":[-1,0,0,0]},"left":[],"right":[]} +tracking=1 + +0 12 +1 5 +2 11 +3 12 +4 12 +5 11 +6 12 +7 11 +8 11 +9 12 +space 3 +! 2 +" 6 +# 14 +$ 11 +% 15 +& 13 +' 2 +( 5 +) 5 +* 8 ++ 10 +, 3 +- 8 +. 2 +/ 9 +: 2 +; 4 +< 9 += 11 +> 9 +? 9 +@ 18 +A 13 +B 11 +C 14 +D 12 +E 10 +F 10 +G 14 +H 12 +I 2 +J 5 +K 12 +L 9 +M 15 +N 11 +O 15 +P 10 +Q 15 +R 10 +S 11 +T 12 +U 12 +V 12 +W 18 +X 11 +Y 10 +Z 11 +[ 5 +\ 9 +] 5 +^ 7 +_ 11 +` 3 +a 9 +b 10 +c 10 +d 10 +e 10 +f 7 +g 10 +h 9 +i 3 +j 4 +k 10 +l 2 +m 16 +n 9 +o 11 +p 10 +q 10 +r 6 +s 8 +t 7 +u 9 +v 8 +w 14 +x 9 +y 10 +z 9 +{ 6 +| 2 +} 6 +~ 10 +¥ 10 +… 12 +™ 16 +‼ 6 +© 15 +® 15 +� 15 +Ⓐ 18 +Ⓑ 18 +🌐 18 +› 14 +▸ 12 +⊙ 18 +‘ 3 +’ 3 +“ 6 +” 6 + +af -1 +ar 1 +at -1 +av -1 +aw -1 +ay -1 +b, -1 +b. -1 +by -1 +d, -1 +e, -1 +e. -1 +et -1 +ev -1 +ew -1 +ey -1 +f, -2 +f. -2 +fa -1 +fe -1 +ff -2 +fl -1 +fo -2 +ht -1 +hv -1 +hw -1 +hy -1 +ic -1 +id -1 +ie -1 +ig -1 +io -1 +ip -1 +it -2 +iu -1 +iv -1 +ka -2 +kc -2 +kd -2 +ke -2 +kg -2 +ko -2 +Lo -1 +mt -1 +mv -1 +my -1 +nt -1 +nv -1 +nw -1 +ny -1 +o, -2 +o. -1 +of -2 +oj -2 +ov -1 +ow -1 +ox -1 +oy -1 +p, -1 +p. -1 +r, -3 +r. -2 +ra -1 +rd -1 +re -1 +rg -1 +ro -2 +rq -1 +rt -1 +s, -1 +s. -1 +st -1 +t. 1 +ta 1 +ti 1 +tl 1 +up 1 +ur 1 +v, -2 +v. -2 +vc -1 +vd -1 +ve -1 +vg -1 +vo -1 +vy -1 +w, -2 +w. -1 +wa -1 +wd -1 +we -1 +wg -1 +wo -1 +wx -1 +xa -1 +xe -1 +xo -1 +y, -3 +y. -2 +ya -1 +yc -1 +yd -1 +ye -1 +Yo -2 +yo -1 +LO -2 +AT -3 +AY -3 +// -4 +/d -2 +/p -1 +tp 1 +t: 1 +/w -1 +ot -1 +Wo -2 +Fo -2 +Fu -2 +Vu -1 +Tu -2 +To -3 +Vo -2 +Yu -1 +Zo -1 +ty -1 +is -1 diff --git a/src/control-screen.lua b/src/control-screen.lua index f677f05..9a224e3 100644 --- a/src/control-screen.lua +++ b/src/control-screen.lua @@ -1,7 +1,7 @@ local gfx = playdate.graphics -local HeaderFont = playdate.graphics.font.new("assets/fonts/Roobert-11-Medium.pft") -local DetailFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") +local HeaderFont = Roobert11Medium +local DetailFont = FontFullCircle ---@alias TextObject { text: string, font: pd_font } diff --git a/src/draw/box-score.lua b/src/draw/box-score.lua index 38d4bd6..2dc1391 100644 --- a/src/draw/box-score.lua +++ b/src/draw/box-score.lua @@ -1,7 +1,7 @@ local MarginY = 70 -local SmallFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") -local ScoreFont = playdate.graphics.font.new("assets/fonts/Asheville-Sans-14-Bold.pft") +local SmallFont = FontFullCircle +local ScoreFont = AshevilleSans14Bold local NumWidth = ScoreFont:getTextWidth("0") local NumHeight = ScoreFont:getHeight() local AwayWidth = ScoreFont:getTextWidth("AWAY") diff --git a/src/draw/overlay.lua b/src/draw/overlay.lua index 828aba6..a510e60 100644 --- a/src/draw/overlay.lua +++ b/src/draw/overlay.lua @@ -1,7 +1,7 @@ -- selene: allow(shadowing) local gfx = playdate.graphics -local ScoreFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") +local ScoreFont = FontFullCircle local MinimapSizeX, MinimapSizeY = Minimap:getSize() local MinimapPosX, MinimapPosY = C.Screen.W - MinimapSizeX, C.Screen.H - MinimapSizeY diff --git a/src/graphics.lua b/src/graphics.lua index e48ca06..1a158f4 100644 --- a/src/graphics.lua +++ b/src/graphics.lua @@ -1,6 +1,6 @@ local gfx = playdate.graphics -local ButtonFont = gfx.font.new("assets/fonts/font-full-circle.pft") +local ButtonFont = FontFullCircle --- Assumes that background image is of size: --- diff --git a/src/main-menu.lua b/src/main-menu.lua index 6cb1aae..f64e036 100644 --- a/src/main-menu.lua +++ b/src/main-menu.lua @@ -9,8 +9,8 @@ MainMenu = { } local gfx = playdate.graphics -local ScoreFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") -local TinyFont = gfx.font.new("assets/fonts/Nano Sans.pft") +local ScoreFont = FontFullCircle +local TinyFont = NanoSans --- Take control of playdate.update --- Will replace playdate.update when the menu is done.