diff --git a/desktop/resources/ego/button-font.fnt b/desktop/resources/ego/button-font.fnt index d9cdd113..96d5e447 100644 --- a/desktop/resources/ego/button-font.fnt +++ b/desktop/resources/ego/button-font.fnt @@ -1,99 +1,101 @@ -info face="04b03" size=24 bold=1 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=5,5,5,5 spacing=-10,-10 -common lineHeight=24 base=18 scaleW=512 scaleH=512 pages=1 packed=0 +info face="OpenDyslexic Bold" size=19 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,2 spacing=0,-8 +common lineHeight=12 base=15 scaleW=512 scaleH=512 pages=1 packed=0 page id=0 file="button-font.png" -chars count=94 -char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=18 xadvance=12 page=0 chnl=0 -char id=106 x=0 y=0 width=17 height=32 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=36 x=17 y=0 width=23 height=29 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=121 x=40 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=113 x=63 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=112 x=86 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=103 x=109 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=81 x=132 y=0 width=23 height=29 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=38 x=155 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=35 x=181 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=37 x=207 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=92 x=233 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=64 x=259 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=47 x=285 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=124 x=311 y=0 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=62 x=325 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=60 x=345 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=125 x=365 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=123 x=385 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=93 x=405 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=91 x=422 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=41 x=439 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=40 x=456 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=63 x=473 y=0 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=48 x=0 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=57 x=23 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=56 x=46 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=55 x=69 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=54 x=92 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=53 x=115 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=52 x=138 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=51 x=161 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=50 x=184 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=49 x=207 y=32 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=116 x=224 y=32 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=108 x=244 y=32 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=107 x=258 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=105 x=281 y=32 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=104 x=295 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=102 x=318 y=32 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=100 x=338 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=98 x=361 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=33 x=384 y=32 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=90 x=398 y=32 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=89 x=418 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=88 x=441 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=87 x=464 y=32 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=86 x=0 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=85 x=23 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=84 x=46 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=83 x=66 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=82 x=89 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=80 x=112 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=79 x=135 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=78 x=158 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=77 x=181 y=58 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=76 x=207 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=75 x=227 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=74 x=250 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=73 x=273 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=72 x=293 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=71 x=316 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=70 x=339 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=69 x=359 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=68 x=379 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=67 x=402 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=66 x=422 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=65 x=445 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=59 x=468 y=58 width=14 height=23 xoffset=-5 yoffset=1 xadvance=6 page=0 chnl=0 -char id=122 x=482 y=58 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=120 x=0 y=84 width=20 height=23 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=119 x=20 y=84 width=26 height=23 xoffset=-5 yoffset=1 xadvance=18 page=0 chnl=0 -char id=118 x=46 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=117 x=69 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=115 x=92 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=114 x=115 y=84 width=20 height=23 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=111 x=135 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=110 x=158 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=109 x=181 y=84 width=26 height=23 xoffset=-5 yoffset=1 xadvance=18 page=0 chnl=0 -char id=101 x=207 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=99 x=230 y=84 width=20 height=23 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=97 x=250 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=42 x=273 y=84 width=20 height=20 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=61 x=293 y=84 width=20 height=20 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=43 x=313 y=84 width=20 height=20 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=58 x=333 y=84 width=14 height=20 xoffset=-5 yoffset=1 xadvance=6 page=0 chnl=0 -char id=126 x=347 y=84 width=23 height=17 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=94 x=370 y=84 width=20 height=17 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=44 x=390 y=84 width=17 height=17 xoffset=-5 yoffset=10 xadvance=9 page=0 chnl=0 -char id=39 x=407 y=84 width=14 height=17 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=96 x=421 y=84 width=17 height=17 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=34 x=438 y=84 width=20 height=17 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=95 x=458 y=84 width=23 height=14 xoffset=-5 yoffset=10 xadvance=15 page=0 chnl=0 -char id=45 x=481 y=84 width=20 height=14 xoffset=-5 yoffset=4 xadvance=12 page=0 chnl=0 -char id=46 x=0 y=107 width=14 height=14 xoffset=-5 yoffset=10 xadvance=6 page=0 chnl=0 +chars count=96 +char id=10 x=0 y=0 width=0 height=0 xoffset=0 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=24 xadvance=9 page=0 chnl=0 +char id=33 x=153 y=19 width=5 height=14 xoffset=1 yoffset=10 xadvance=7 page=0 chnl=0 +char id=34 x=442 y=19 width=9 height=6 xoffset=1 yoffset=10 xadvance=11 page=0 chnl=0 +char id=35 x=185 y=19 width=15 height=14 xoffset=1 yoffset=10 xadvance=17 page=0 chnl=0 +char id=36 x=82 y=0 width=11 height=17 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=0 +char id=37 x=167 y=19 width=18 height=14 xoffset=1 yoffset=10 xadvance=20 page=0 chnl=0 +char id=38 x=200 y=19 width=15 height=14 xoffset=1 yoffset=10 xadvance=18 page=0 chnl=0 +char id=39 x=451 y=19 width=4 height=6 xoffset=1 yoffset=10 xadvance=7 page=0 chnl=0 +char id=40 x=27 y=0 width=8 height=17 xoffset=1 yoffset=9 xadvance=10 page=0 chnl=0 +char id=41 x=35 y=0 width=7 height=17 xoffset=2 yoffset=9 xadvance=11 page=0 chnl=0 +char id=42 x=431 y=19 width=11 height=9 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=43 x=229 y=19 width=14 height=12 xoffset=1 yoffset=12 xadvance=16 page=0 chnl=0 +char id=44 x=498 y=19 width=5 height=5 xoffset=1 yoffset=22 xadvance=8 page=0 chnl=0 +char id=45 x=5 y=33 width=7 height=2 xoffset=1 yoffset=18 xadvance=9 page=0 chnl=0 +char id=46 x=0 y=33 width=5 height=4 xoffset=1 yoffset=20 xadvance=7 page=0 chnl=0 +char id=47 x=243 y=0 width=10 height=15 xoffset=1 yoffset=10 xadvance=12 page=0 chnl=0 +char id=48 x=142 y=19 width=11 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=49 x=43 y=19 width=10 height=14 xoffset=1 yoffset=10 xadvance=12 page=0 chnl=0 +char id=50 x=53 y=19 width=11 height=14 xoffset=1 yoffset=10 xadvance=13 page=0 chnl=0 +char id=51 x=64 y=19 width=11 height=14 xoffset=2 yoffset=10 xadvance=14 page=0 chnl=0 +char id=52 x=75 y=19 width=12 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=53 x=87 y=19 width=10 height=14 xoffset=2 yoffset=10 xadvance=14 page=0 chnl=0 +char id=54 x=97 y=19 width=11 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=55 x=108 y=19 width=11 height=14 xoffset=1 yoffset=10 xadvance=13 page=0 chnl=0 +char id=56 x=119 y=19 width=12 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=57 x=131 y=19 width=11 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=58 x=397 y=19 width=4 height=11 xoffset=1 yoffset=13 xadvance=7 page=0 chnl=0 +char id=59 x=224 y=19 width=5 height=13 xoffset=1 yoffset=13 xadvance=8 page=0 chnl=0 +char id=60 x=401 y=19 width=15 height=11 xoffset=1 yoffset=13 xadvance=17 page=0 chnl=0 +char id=61 x=470 y=19 width=14 height=6 xoffset=1 yoffset=15 xadvance=16 page=0 chnl=0 +char id=62 x=416 y=19 width=15 height=11 xoffset=1 yoffset=12 xadvance=17 page=0 chnl=0 +char id=63 x=158 y=19 width=9 height=14 xoffset=2 yoffset=10 xadvance=12 page=0 chnl=0 +char id=64 x=64 y=0 width=18 height=17 xoffset=1 yoffset=10 xadvance=21 page=0 chnl=0 +char id=65 x=253 y=0 width=15 height=14 xoffset=1 yoffset=10 xadvance=18 page=0 chnl=0 +char id=66 x=268 y=0 width=12 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=67 x=118 y=0 width=14 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=0 +char id=68 x=280 y=0 width=14 height=14 xoffset=1 yoffset=10 xadvance=16 page=0 chnl=0 +char id=69 x=294 y=0 width=11 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=70 x=305 y=0 width=10 height=14 xoffset=2 yoffset=10 xadvance=13 page=0 chnl=0 +char id=71 x=315 y=0 width=14 height=14 xoffset=1 yoffset=10 xadvance=16 page=0 chnl=0 +char id=72 x=329 y=0 width=12 height=14 xoffset=1 yoffset=10 xadvance=15 page=0 chnl=0 +char id=73 x=341 y=0 width=4 height=14 xoffset=2 yoffset=10 xadvance=8 page=0 chnl=0 +char id=74 x=11 y=0 width=7 height=18 xoffset=2 yoffset=10 xadvance=11 page=0 chnl=0 +char id=75 x=345 y=0 width=13 height=14 xoffset=2 yoffset=10 xadvance=17 page=0 chnl=0 +char id=76 x=358 y=0 width=11 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=77 x=369 y=0 width=15 height=14 xoffset=2 yoffset=10 xadvance=19 page=0 chnl=0 +char id=78 x=384 y=0 width=12 height=14 xoffset=2 yoffset=10 xadvance=16 page=0 chnl=0 +char id=79 x=396 y=0 width=15 height=14 xoffset=1 yoffset=10 xadvance=17 page=0 chnl=0 +char id=80 x=411 y=0 width=11 height=14 xoffset=2 yoffset=10 xadvance=15 page=0 chnl=0 +char id=81 x=93 y=0 width=16 height=16 xoffset=1 yoffset=10 xadvance=18 page=0 chnl=0 +char id=82 x=422 y=0 width=13 height=14 xoffset=1 yoffset=10 xadvance=16 page=0 chnl=0 +char id=83 x=435 y=0 width=12 height=14 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 +char id=84 x=447 y=0 width=14 height=14 xoffset=2 yoffset=10 xadvance=17 page=0 chnl=0 +char id=85 x=461 y=0 width=13 height=14 xoffset=1 yoffset=10 xadvance=15 page=0 chnl=0 +char id=86 x=474 y=0 width=15 height=14 xoffset=1 yoffset=10 xadvance=18 page=0 chnl=0 +char id=87 x=489 y=0 width=20 height=14 xoffset=1 yoffset=10 xadvance=22 page=0 chnl=0 +char id=88 x=0 y=19 width=15 height=14 xoffset=1 yoffset=10 xadvance=17 page=0 chnl=0 +char id=89 x=15 y=19 width=15 height=14 xoffset=1 yoffset=10 xadvance=17 page=0 chnl=0 +char id=90 x=30 y=19 width=13 height=14 xoffset=2 yoffset=10 xadvance=17 page=0 chnl=0 +char id=91 x=42 y=0 width=7 height=17 xoffset=1 yoffset=9 xadvance=9 page=0 chnl=0 +char id=92 x=109 y=0 width=9 height=16 xoffset=1 yoffset=10 xadvance=11 page=0 chnl=0 +char id=93 x=49 y=0 width=6 height=17 xoffset=1 yoffset=9 xadvance=9 page=0 chnl=0 +char id=94 x=455 y=19 width=15 height=6 xoffset=1 yoffset=10 xadvance=18 page=0 chnl=0 +char id=95 x=12 y=33 width=12 height=2 xoffset=1 yoffset=26 xadvance=14 page=0 chnl=0 +char id=96 x=503 y=19 width=8 height=4 xoffset=1 yoffset=9 xadvance=10 page=0 chnl=0 +char id=97 x=243 y=19 width=10 height=11 xoffset=2 yoffset=13 xadvance=14 page=0 chnl=0 +char id=98 x=132 y=0 width=11 height=15 xoffset=2 yoffset=9 xadvance=14 page=0 chnl=0 +char id=99 x=253 y=19 width=11 height=11 xoffset=1 yoffset=13 xadvance=13 page=0 chnl=0 +char id=100 x=143 y=0 width=11 height=15 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=0 +char id=101 x=264 y=19 width=12 height=11 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=0 +char id=102 x=154 y=0 width=8 height=15 xoffset=1 yoffset=9 xadvance=10 page=0 chnl=0 +char id=103 x=162 y=0 width=11 height=15 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=0 +char id=104 x=173 y=0 width=11 height=15 xoffset=2 yoffset=9 xadvance=14 page=0 chnl=0 +char id=105 x=184 y=0 width=4 height=15 xoffset=1 yoffset=9 xadvance=7 page=0 chnl=0 +char id=106 x=0 y=0 width=7 height=19 xoffset=2 yoffset=9 xadvance=10 page=0 chnl=0 +char id=107 x=188 y=0 width=12 height=15 xoffset=2 yoffset=9 xadvance=15 page=0 chnl=0 +char id=108 x=200 y=0 width=5 height=15 xoffset=1 yoffset=9 xadvance=8 page=0 chnl=0 +char id=109 x=276 y=19 width=17 height=11 xoffset=2 yoffset=13 xadvance=20 page=0 chnl=0 +char id=110 x=293 y=19 width=11 height=11 xoffset=2 yoffset=13 xadvance=15 page=0 chnl=0 +char id=111 x=304 y=19 width=11 height=11 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=0 +char id=112 x=205 y=0 width=12 height=15 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=0 +char id=113 x=217 y=0 width=13 height=15 xoffset=1 yoffset=13 xadvance=16 page=0 chnl=0 +char id=114 x=315 y=19 width=8 height=11 xoffset=2 yoffset=13 xadvance=11 page=0 chnl=0 +char id=115 x=323 y=19 width=10 height=11 xoffset=1 yoffset=13 xadvance=12 page=0 chnl=0 +char id=116 x=215 y=19 width=9 height=13 xoffset=1 yoffset=11 xadvance=11 page=0 chnl=0 +char id=117 x=333 y=19 width=11 height=11 xoffset=1 yoffset=13 xadvance=13 page=0 chnl=0 +char id=118 x=344 y=19 width=13 height=11 xoffset=1 yoffset=13 xadvance=15 page=0 chnl=0 +char id=119 x=357 y=19 width=16 height=11 xoffset=1 yoffset=13 xadvance=19 page=0 chnl=0 +char id=120 x=373 y=19 width=14 height=11 xoffset=1 yoffset=13 xadvance=16 page=0 chnl=0 +char id=121 x=230 y=0 width=13 height=15 xoffset=1 yoffset=13 xadvance=15 page=0 chnl=0 +char id=122 x=387 y=19 width=10 height=11 xoffset=1 yoffset=13 xadvance=12 page=0 chnl=0 +char id=123 x=55 y=0 width=9 height=17 xoffset=2 yoffset=9 xadvance=12 page=0 chnl=0 +char id=124 x=7 y=0 width=4 height=19 xoffset=2 yoffset=9 xadvance=8 page=0 chnl=0 +char id=125 x=18 y=0 width=9 height=18 xoffset=2 yoffset=10 xadvance=12 page=0 chnl=0 +char id=126 x=484 y=19 width=14 height=6 xoffset=1 yoffset=15 xadvance=16 page=0 chnl=0 +kernings count=0 diff --git a/desktop/resources/ego/button-font.hiero b/desktop/resources/ego/button-font.hiero new file mode 100644 index 00000000..32a563ad Binary files /dev/null and b/desktop/resources/ego/button-font.hiero differ diff --git a/desktop/resources/ego/button-font.png b/desktop/resources/ego/button-font.png index 0f3cd9aa..626e3ffc 100644 Binary files a/desktop/resources/ego/button-font.png and b/desktop/resources/ego/button-font.png differ diff --git a/desktop/resources/ego/font.fnt b/desktop/resources/ego/font.fnt index cd481775..59a0b8bb 100644 --- a/desktop/resources/ego/font.fnt +++ b/desktop/resources/ego/font.fnt @@ -1,99 +1,337 @@ -info face="04b03" size=24 bold=1 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=5,5,5,5 spacing=-10,-10 -common lineHeight=24 base=18 scaleW=512 scaleH=512 pages=1 packed=0 +info face="OpenDyslexic" size=30 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=2,2,2,2 spacing=-4,-4 +common lineHeight=31 base=26 scaleW=512 scaleH=512 pages=1 packed=0 page id=0 file="font.png" -chars count=94 -char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=18 xadvance=12 page=0 chnl=0 -char id=106 x=0 y=0 width=17 height=32 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=36 x=17 y=0 width=23 height=29 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=121 x=40 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=113 x=63 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=112 x=86 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=103 x=109 y=0 width=23 height=29 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=81 x=132 y=0 width=23 height=29 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=38 x=155 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=35 x=181 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=37 x=207 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=92 x=233 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=64 x=259 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=47 x=285 y=0 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=124 x=311 y=0 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=62 x=325 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=60 x=345 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=125 x=365 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=123 x=385 y=0 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=93 x=405 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=91 x=422 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=41 x=439 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=40 x=456 y=0 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=63 x=473 y=0 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=33 x=496 y=0 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=48 x=0 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=57 x=23 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=56 x=46 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=55 x=69 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=54 x=92 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=53 x=115 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=52 x=138 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=51 x=161 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=50 x=184 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=49 x=207 y=32 width=17 height=26 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=116 x=224 y=32 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=108 x=244 y=32 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=107 x=258 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=105 x=281 y=32 width=14 height=26 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=104 x=295 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=102 x=318 y=32 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=100 x=338 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=98 x=361 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=90 x=384 y=32 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=89 x=404 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=88 x=427 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=87 x=450 y=32 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=86 x=476 y=32 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=85 x=0 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=84 x=23 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=83 x=43 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=82 x=66 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=80 x=89 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=79 x=112 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=78 x=135 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=77 x=158 y=58 width=26 height=26 xoffset=-5 yoffset=-2 xadvance=18 page=0 chnl=0 -char id=76 x=184 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=75 x=204 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=74 x=227 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=73 x=250 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=72 x=270 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=71 x=293 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=70 x=316 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=69 x=336 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=68 x=356 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=67 x=379 y=58 width=20 height=26 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=66 x=399 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=65 x=422 y=58 width=23 height=26 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=59 x=445 y=58 width=14 height=23 xoffset=-5 yoffset=1 xadvance=6 page=0 chnl=0 -char id=122 x=459 y=58 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=120 x=482 y=58 width=20 height=23 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=119 x=0 y=84 width=26 height=23 xoffset=-5 yoffset=1 xadvance=18 page=0 chnl=0 -char id=118 x=26 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=117 x=49 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=115 x=72 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=114 x=95 y=84 width=20 height=23 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=111 x=115 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=110 x=138 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=109 x=161 y=84 width=26 height=23 xoffset=-5 yoffset=1 xadvance=18 page=0 chnl=0 -char id=101 x=187 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=99 x=210 y=84 width=20 height=23 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=97 x=230 y=84 width=23 height=23 xoffset=-5 yoffset=1 xadvance=15 page=0 chnl=0 -char id=42 x=253 y=84 width=20 height=20 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=61 x=273 y=84 width=20 height=20 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=43 x=293 y=84 width=20 height=20 xoffset=-5 yoffset=1 xadvance=12 page=0 chnl=0 -char id=58 x=313 y=84 width=14 height=20 xoffset=-5 yoffset=1 xadvance=6 page=0 chnl=0 -char id=126 x=327 y=84 width=23 height=17 xoffset=-5 yoffset=-2 xadvance=15 page=0 chnl=0 -char id=94 x=350 y=84 width=20 height=17 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=44 x=370 y=84 width=17 height=17 xoffset=-5 yoffset=10 xadvance=9 page=0 chnl=0 -char id=39 x=387 y=84 width=14 height=17 xoffset=-5 yoffset=-2 xadvance=6 page=0 chnl=0 -char id=96 x=401 y=84 width=17 height=17 xoffset=-5 yoffset=-2 xadvance=9 page=0 chnl=0 -char id=34 x=418 y=84 width=20 height=17 xoffset=-5 yoffset=-2 xadvance=12 page=0 chnl=0 -char id=95 x=438 y=84 width=23 height=14 xoffset=-5 yoffset=10 xadvance=15 page=0 chnl=0 -char id=45 x=461 y=84 width=20 height=14 xoffset=-5 yoffset=4 xadvance=12 page=0 chnl=0 -char id=46 x=481 y=84 width=14 height=14 xoffset=-5 yoffset=10 xadvance=6 page=0 chnl=0 +chars count=96 +char id=10 x=0 y=0 width=0 height=0 xoffset=0 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-2 yoffset=36 xadvance=12 page=0 chnl=0 +char id=33 x=504 y=34 width=7 height=26 xoffset=0 yoffset=14 xadvance=8 page=0 chnl=0 +char id=34 x=42 y=86 width=13 height=13 xoffset=0 yoffset=14 xadvance=13 page=0 chnl=0 +char id=35 x=121 y=60 width=25 height=26 xoffset=0 yoffset=14 xadvance=25 page=0 chnl=0 +char id=36 x=137 y=0 width=18 height=31 xoffset=1 yoffset=13 xadvance=19 page=0 chnl=0 +char id=37 x=91 y=60 width=30 height=26 xoffset=0 yoffset=14 xadvance=30 page=0 chnl=0 +char id=38 x=146 y=60 width=25 height=26 xoffset=0 yoffset=14 xadvance=25 page=0 chnl=0 +char id=39 x=502 y=60 width=7 height=12 xoffset=0 yoffset=14 xadvance=7 page=0 chnl=0 +char id=40 x=63 y=0 width=12 height=31 xoffset=0 yoffset=13 xadvance=10 page=0 chnl=0 +char id=41 x=75 y=0 width=12 height=31 xoffset=-1 yoffset=13 xadvance=11 page=0 chnl=0 +char id=42 x=24 y=86 width=18 height=18 xoffset=0 yoffset=13 xadvance=18 page=0 chnl=0 +char id=43 x=195 y=60 width=23 height=23 xoffset=0 yoffset=17 xadvance=23 page=0 chnl=0 +char id=44 x=78 y=86 width=9 height=12 xoffset=1 yoffset=32 xadvance=10 page=0 chnl=0 +char id=45 x=172 y=86 width=12 height=6 xoffset=0 yoffset=27 xadvance=12 page=0 chnl=0 +char id=46 x=121 y=86 width=8 height=9 xoffset=0 yoffset=31 xadvance=8 page=0 chnl=0 +char id=47 x=212 y=0 width=15 height=28 xoffset=0 yoffset=14 xadvance=15 page=0 chnl=0 +char id=48 x=56 y=60 width=19 height=26 xoffset=0 yoffset=14 xadvance=19 page=0 chnl=0 +char id=49 x=394 y=34 width=17 height=26 xoffset=1 yoffset=14 xadvance=18 page=0 chnl=0 +char id=50 x=411 y=34 width=18 height=26 xoffset=0 yoffset=14 xadvance=18 page=0 chnl=0 +char id=51 x=429 y=34 width=18 height=26 xoffset=0 yoffset=14 xadvance=18 page=0 chnl=0 +char id=52 x=447 y=34 width=20 height=26 xoffset=0 yoffset=14 xadvance=20 page=0 chnl=0 +char id=53 x=467 y=34 width=18 height=26 xoffset=0 yoffset=14 xadvance=18 page=0 chnl=0 +char id=54 x=485 y=34 width=19 height=26 xoffset=0 yoffset=14 xadvance=19 page=0 chnl=0 +char id=55 x=0 y=60 width=18 height=26 xoffset=0 yoffset=14 xadvance=18 page=0 chnl=0 +char id=56 x=18 y=60 width=19 height=26 xoffset=0 yoffset=14 xadvance=19 page=0 chnl=0 +char id=57 x=37 y=60 width=19 height=26 xoffset=0 yoffset=14 xadvance=19 page=0 chnl=0 +char id=58 x=470 y=60 width=8 height=21 xoffset=0 yoffset=19 xadvance=8 page=0 chnl=0 +char id=59 x=186 y=60 width=9 height=25 xoffset=0 yoffset=19 xadvance=9 page=0 chnl=0 +char id=60 x=478 y=60 width=24 height=21 xoffset=0 yoffset=19 xadvance=24 page=0 chnl=0 +char id=61 x=87 y=86 width=23 height=12 xoffset=0 yoffset=23 xadvance=23 page=0 chnl=0 +char id=62 x=0 y=86 width=24 height=21 xoffset=0 yoffset=17 xadvance=24 page=0 chnl=0 +char id=63 x=75 y=60 width=16 height=26 xoffset=0 yoffset=14 xadvance=16 page=0 chnl=0 +char id=64 x=107 y=0 width=30 height=31 xoffset=0 yoffset=14 xadvance=30 page=0 chnl=0 +char id=65 x=383 y=0 width=24 height=26 xoffset=0 yoffset=14 xadvance=24 page=0 chnl=0 +char id=66 x=407 y=0 width=20 height=26 xoffset=0 yoffset=14 xadvance=20 page=0 chnl=0 +char id=67 x=427 y=0 width=22 height=26 xoffset=0 yoffset=14 xadvance=22 page=0 chnl=0 +char id=68 x=449 y=0 width=22 height=26 xoffset=0 yoffset=14 xadvance=22 page=0 chnl=0 +char id=69 x=471 y=0 width=18 height=26 xoffset=0 yoffset=14 xadvance=18 page=0 chnl=0 +char id=70 x=489 y=0 width=17 height=26 xoffset=0 yoffset=14 xadvance=17 page=0 chnl=0 +char id=71 x=0 y=34 width=23 height=26 xoffset=0 yoffset=14 xadvance=23 page=0 chnl=0 +char id=72 x=23 y=34 width=21 height=26 xoffset=0 yoffset=14 xadvance=21 page=0 chnl=0 +char id=73 x=44 y=34 width=7 height=26 xoffset=0 yoffset=14 xadvance=7 page=0 chnl=0 +char id=74 x=19 y=0 width=12 height=32 xoffset=1 yoffset=14 xadvance=13 page=0 chnl=0 +char id=75 x=51 y=34 width=21 height=26 xoffset=0 yoffset=14 xadvance=21 page=0 chnl=0 +char id=76 x=72 y=34 width=18 height=26 xoffset=0 yoffset=14 xadvance=18 page=0 chnl=0 +char id=77 x=90 y=34 width=24 height=26 xoffset=0 yoffset=14 xadvance=24 page=0 chnl=0 +char id=78 x=114 y=34 width=21 height=26 xoffset=0 yoffset=14 xadvance=21 page=0 chnl=0 +char id=79 x=135 y=34 width=24 height=26 xoffset=0 yoffset=14 xadvance=24 page=0 chnl=0 +char id=80 x=159 y=34 width=19 height=26 xoffset=1 yoffset=14 xadvance=20 page=0 chnl=0 +char id=81 x=155 y=0 width=25 height=29 xoffset=0 yoffset=14 xadvance=25 page=0 chnl=0 +char id=82 x=178 y=34 width=21 height=26 xoffset=0 yoffset=14 xadvance=22 page=0 chnl=0 +char id=83 x=199 y=34 width=19 height=26 xoffset=0 yoffset=14 xadvance=19 page=0 chnl=0 +char id=84 x=218 y=34 width=22 height=26 xoffset=1 yoffset=14 xadvance=23 page=0 chnl=0 +char id=85 x=240 y=34 width=21 height=26 xoffset=0 yoffset=14 xadvance=21 page=0 chnl=0 +char id=86 x=261 y=34 width=24 height=26 xoffset=0 yoffset=14 xadvance=24 page=0 chnl=0 +char id=87 x=285 y=34 width=32 height=26 xoffset=0 yoffset=14 xadvance=32 page=0 chnl=0 +char id=88 x=317 y=34 width=23 height=26 xoffset=0 yoffset=14 xadvance=23 page=0 chnl=0 +char id=89 x=340 y=34 width=22 height=26 xoffset=0 yoffset=14 xadvance=22 page=0 chnl=0 +char id=90 x=362 y=34 width=22 height=26 xoffset=0 yoffset=14 xadvance=22 page=0 chnl=0 +char id=91 x=87 y=0 width=10 height=31 xoffset=0 yoffset=13 xadvance=9 page=0 chnl=0 +char id=92 x=199 y=0 width=13 height=29 xoffset=0 yoffset=14 xadvance=14 page=0 chnl=0 +char id=93 x=97 y=0 width=10 height=31 xoffset=0 yoffset=13 xadvance=10 page=0 chnl=0 +char id=94 x=55 y=86 width=23 height=13 xoffset=0 yoffset=13 xadvance=23 page=0 chnl=0 +char id=95 x=152 y=86 width=20 height=7 xoffset=0 yoffset=40 xadvance=20 page=0 chnl=0 +char id=96 x=110 y=86 width=11 height=10 xoffset=0 yoffset=10 xadvance=11 page=0 chnl=0 +char id=97 x=218 y=60 width=18 height=21 xoffset=0 yoffset=19 xadvance=18 page=0 chnl=0 +char id=98 x=227 y=0 width=18 height=27 xoffset=1 yoffset=13 xadvance=19 page=0 chnl=0 +char id=99 x=236 y=60 width=17 height=21 xoffset=0 yoffset=19 xadvance=17 page=0 chnl=0 +char id=100 x=245 y=0 width=19 height=27 xoffset=0 yoffset=13 xadvance=19 page=0 chnl=0 +char id=101 x=253 y=60 width=19 height=21 xoffset=0 yoffset=19 xadvance=19 page=0 chnl=0 +char id=102 x=264 y=0 width=14 height=27 xoffset=0 yoffset=13 xadvance=14 page=0 chnl=0 +char id=103 x=180 y=0 width=19 height=29 xoffset=0 yoffset=19 xadvance=20 page=0 chnl=0 +char id=104 x=278 y=0 width=18 height=27 xoffset=0 yoffset=13 xadvance=18 page=0 chnl=0 +char id=105 x=296 y=0 width=7 height=27 xoffset=1 yoffset=13 xadvance=9 page=0 chnl=0 +char id=106 x=7 y=0 width=12 height=33 xoffset=-1 yoffset=13 xadvance=11 page=0 chnl=0 +char id=107 x=303 y=0 width=19 height=27 xoffset=0 yoffset=13 xadvance=19 page=0 chnl=0 +char id=108 x=384 y=34 width=10 height=26 xoffset=1 yoffset=14 xadvance=11 page=0 chnl=0 +char id=109 x=272 y=60 width=28 height=21 xoffset=1 yoffset=19 xadvance=29 page=0 chnl=0 +char id=110 x=300 y=60 width=18 height=21 xoffset=0 yoffset=19 xadvance=19 page=0 chnl=0 +char id=111 x=318 y=60 width=19 height=21 xoffset=0 yoffset=19 xadvance=19 page=0 chnl=0 +char id=112 x=322 y=0 width=19 height=27 xoffset=1 yoffset=19 xadvance=20 page=0 chnl=0 +char id=113 x=341 y=0 width=22 height=27 xoffset=0 yoffset=19 xadvance=22 page=0 chnl=0 +char id=114 x=337 y=60 width=14 height=21 xoffset=0 yoffset=19 xadvance=14 page=0 chnl=0 +char id=115 x=351 y=60 width=17 height=21 xoffset=0 yoffset=19 xadvance=17 page=0 chnl=0 +char id=116 x=171 y=60 width=15 height=25 xoffset=0 yoffset=15 xadvance=15 page=0 chnl=0 +char id=117 x=368 y=60 width=18 height=21 xoffset=0 yoffset=19 xadvance=18 page=0 chnl=0 +char id=118 x=386 y=60 width=20 height=21 xoffset=0 yoffset=19 xadvance=20 page=0 chnl=0 +char id=119 x=406 y=60 width=26 height=21 xoffset=0 yoffset=19 xadvance=26 page=0 chnl=0 +char id=120 x=432 y=60 width=21 height=21 xoffset=0 yoffset=19 xadvance=21 page=0 chnl=0 +char id=121 x=363 y=0 width=20 height=27 xoffset=0 yoffset=19 xadvance=20 page=0 chnl=0 +char id=122 x=453 y=60 width=17 height=21 xoffset=0 yoffset=19 xadvance=17 page=0 chnl=0 +char id=123 x=31 y=0 width=16 height=32 xoffset=1 yoffset=13 xadvance=16 page=0 chnl=0 +char id=124 x=0 y=0 width=7 height=34 xoffset=1 yoffset=13 xadvance=8 page=0 chnl=0 +char id=125 x=47 y=0 width=16 height=32 xoffset=0 yoffset=13 xadvance=14 page=0 chnl=0 +char id=126 x=129 y=86 width=23 height=9 xoffset=0 yoffset=24 xadvance=23 page=0 chnl=0 +kernings count=236 +kerning first=102 second=44 amount=-2 +kerning first=89 second=58 amount=-3 +kerning first=39 second=34 amount=-3 +kerning first=76 second=39 amount=-5 +kerning first=84 second=117 amount=-3 +kerning first=103 second=44 amount=-1 +kerning first=86 second=46 amount=-5 +kerning first=53 second=48 amount=1 +kerning first=86 second=101 amount=-3 +kerning first=82 second=84 amount=-1 +kerning first=116 second=97 amount=1 +kerning first=87 second=58 amount=-3 +kerning first=84 second=59 amount=-2 +kerning first=114 second=46 amount=-3 +kerning first=84 second=65 amount=-3 +kerning first=65 second=67 amount=-1 +kerning first=110 second=68 amount=-1 +kerning first=86 second=71 amount=-2 +kerning first=89 second=97 amount=-1 +kerning first=75 second=79 amount=-2 +kerning first=65 second=81 amount=-1 +kerning first=89 second=83 amount=-1 +kerning first=65 second=84 amount=-3 +kerning first=75 second=101 amount=-2 +kerning first=82 second=87 amount=-3 +kerning first=79 second=88 amount=-2 +kerning first=79 second=89 amount=-2 +kerning first=111 second=97 amount=-1 +kerning first=99 second=99 amount=-1 +kerning first=99 second=100 amount=-1 +kerning first=111 second=101 amount=-1 +kerning first=119 second=101 amount=-1 +kerning first=114 second=103 amount=1 +kerning first=102 second=107 amount=1 +kerning first=102 second=110 amount=1 +kerning first=114 second=111 amount=-2 +kerning first=110 second=112 amount=-1 +kerning first=98 second=113 amount=-1 +kerning first=84 second=114 amount=-3 +kerning first=89 second=115 amount=-2 +kerning first=86 second=117 amount=-2 +kerning first=101 second=118 amount=-1 +kerning first=87 second=117 amount=-3 +kerning first=89 second=120 amount=-1 +kerning first=68 second=121 amount=-2 +kerning first=87 second=97 amount=-3 +kerning first=103 second=46 amount=-3 +kerning first=99 second=113 amount=-1 +kerning first=76 second=89 amount=-3 +kerning first=118 second=111 amount=-1 +kerning first=34 second=65 amount=-5 +kerning first=110 second=116 amount=-1 +kerning first=107 second=111 amount=-1 +kerning first=75 second=121 amount=-3 +kerning first=109 second=102 amount=-1 +kerning first=115 second=119 amount=-1 +kerning first=115 second=104 amount=-1 +kerning first=99 second=111 amount=-1 +kerning first=119 second=120 amount=-1 +kerning first=86 second=59 amount=-1 +kerning first=65 second=89 amount=-3 +kerning first=65 second=119 amount=-2 +kerning first=114 second=121 amount=-2 +kerning first=80 second=46 amount=-5 +kerning first=74 second=111 amount=-1 +kerning first=39 second=108 amount=-3 +kerning first=89 second=79 amount=-2 +kerning first=86 second=45 amount=-4 +kerning first=118 second=44 amount=-3 +kerning first=86 second=58 amount=-2 +kerning first=118 second=120 amount=-1 +kerning first=65 second=71 amount=-1 +kerning first=104 second=97 amount=1 +kerning first=120 second=101 amount=-2 +kerning first=112 second=99 amount=-1 +kerning first=68 second=65 amount=-2 +kerning first=74 second=101 amount=-1 +kerning first=111 second=120 amount=-1 +kerning first=119 second=44 amount=-3 +kerning first=71 second=44 amount=-1 +kerning first=79 second=86 amount=-2 +kerning first=65 second=39 amount=-5 +kerning first=65 second=99 amount=-1 +kerning first=119 second=100 amount=-1 +kerning first=65 second=111 amount=-1 +kerning first=99 second=101 amount=-1 +kerning first=84 second=119 amount=-2 +kerning first=86 second=79 amount=-2 +kerning first=89 second=59 amount=-1 +kerning first=83 second=46 amount=-2 +kerning first=108 second=116 amount=1 +kerning first=105 second=108 amount=1 +kerning first=39 second=116 amount=-1 +kerning first=89 second=113 amount=-1 +kerning first=80 second=44 amount=-6 +kerning first=114 second=120 amount=-2 +kerning first=118 second=99 amount=-1 +kerning first=118 second=97 amount=-1 +kerning first=99 second=46 amount=-1 +kerning first=121 second=44 amount=-3 +kerning first=111 second=111 amount=-1 +kerning first=84 second=121 amount=-2 +kerning first=110 second=97 amount=-1 +kerning first=112 second=120 amount=-1 +kerning first=118 second=113 amount=-1 +kerning first=79 second=65 amount=-2 +kerning first=65 second=34 amount=-5 +kerning first=111 second=113 amount=-1 +kerning first=84 second=44 amount=-4 +kerning first=102 second=46 amount=-3 +kerning first=112 second=97 amount=-1 +kerning first=112 second=65 amount=-2 +kerning first=89 second=117 amount=-2 +kerning first=39 second=114 amount=-3 +kerning first=118 second=101 amount=-1 +kerning first=86 second=44 amount=-4 +kerning first=39 second=115 amount=-3 +kerning first=76 second=34 amount=-5 +kerning first=114 second=97 amount=-2 +kerning first=98 second=121 amount=-1 +kerning first=115 second=44 amount=-1 +kerning first=107 second=101 amount=-1 +kerning first=87 second=121 amount=-2 +kerning first=102 second=111 amount=-1 +kerning first=119 second=111 amount=-1 +kerning first=84 second=79 amount=-1 +kerning first=72 second=111 amount=-1 +kerning first=98 second=100 amount=-1 +kerning first=74 second=44 amount=-1 +kerning first=84 second=58 amount=-3 +kerning first=79 second=87 amount=-2 +kerning first=111 second=99 amount=-1 +kerning first=87 second=65 amount=-3 +kerning first=101 second=121 amount=-2 +kerning first=101 second=103 amount=-1 +kerning first=119 second=97 amount=-1 +kerning first=65 second=101 amount=-1 +kerning first=109 second=121 amount=-2 +kerning first=99 second=120 amount=-1 +kerning first=112 second=100 amount=-1 +kerning first=121 second=115 amount=-1 +kerning first=87 second=45 amount=-4 +kerning first=121 second=46 amount=-4 +kerning first=114 second=99 amount=-2 +kerning first=39 second=118 amount=-1 +kerning first=113 second=117 amount=-2 +kerning first=114 second=113 amount=-2 +kerning first=87 second=59 amount=-2 +kerning first=98 second=120 amount=-1 +kerning first=81 second=85 amount=-1 +kerning first=68 second=87 amount=-2 +kerning first=75 second=111 amount=-2 +kerning first=87 second=101 amount=-3 +kerning first=87 second=104 amount=-2 +kerning first=66 second=44 amount=-1 +kerning first=89 second=111 amount=-1 +kerning first=68 second=86 amount=-2 +kerning first=112 second=101 amount=-1 +kerning first=65 second=86 amount=-3 +kerning first=101 second=119 amount=-2 +kerning first=68 second=46 amount=-3 +kerning first=98 second=99 amount=-1 +kerning first=65 second=87 amount=-3 +kerning first=79 second=44 amount=-2 +kerning first=39 second=100 amount=-1 +kerning first=76 second=86 amount=-1 +kerning first=116 second=116 amount=-1 +kerning first=98 second=97 amount=-1 +kerning first=89 second=45 amount=-4 +kerning first=65 second=117 amount=-2 +kerning first=101 second=120 amount=-1 +kerning first=84 second=115 amount=-2 +kerning first=99 second=97 amount=-1 +kerning first=118 second=46 amount=-4 +kerning first=68 second=44 amount=-2 +kerning first=76 second=87 amount=-2 +kerning first=101 second=44 amount=-1 +kerning first=98 second=101 amount=-1 +kerning first=98 second=46 amount=-1 +kerning first=110 second=118 amount=-1 +kerning first=65 second=85 amount=-2 +kerning first=89 second=100 amount=-1 +kerning first=87 second=46 amount=-5 +kerning first=82 second=86 amount=-2 +kerning first=89 second=65 amount=-3 +kerning first=68 second=89 amount=-2 +kerning first=78 second=65 amount=-1 +kerning first=84 second=101 amount=-3 +kerning first=114 second=100 amount=-2 +kerning first=82 second=79 amount=-2 +kerning first=86 second=65 amount=-3 +kerning first=82 second=121 amount=-1 +kerning first=112 second=113 amount=-1 +kerning first=73 second=74 amount=-1 +kerning first=89 second=44 amount=-4 +kerning first=80 second=65 amount=-1 +kerning first=118 second=100 amount=-1 +kerning first=114 second=45 amount=-2 +kerning first=112 second=46 amount=-1 +kerning first=75 second=117 amount=-3 +kerning first=119 second=99 amount=-1 +kerning first=76 second=84 amount=-3 +kerning first=65 second=118 amount=-2 +kerning first=78 second=44 amount=-2 +kerning first=101 second=46 amount=-1 +kerning first=84 second=111 amount=-3 +kerning first=114 second=101 amount=-2 +kerning first=82 second=85 amount=-2 +kerning first=101 second=110 amount=-1 +kerning first=81 second=46 amount=-2 +kerning first=67 second=44 amount=-1 +kerning first=65 second=79 amount=-1 +kerning first=98 second=111 amount=-1 +kerning first=119 second=113 amount=-1 +kerning first=86 second=97 amount=-2 +kerning first=79 second=84 amount=-2 +kerning first=83 second=44 amount=-1 +kerning first=89 second=99 amount=-1 +kerning first=111 second=100 amount=-1 +kerning first=75 second=67 amount=-2 +kerning first=70 second=44 amount=-5 +kerning first=84 second=46 amount=-5 +kerning first=87 second=111 amount=-3 +kerning first=39 second=39 amount=-4 +kerning first=99 second=121 amount=-1 +kerning first=84 second=97 amount=-3 +kerning first=84 second=45 amount=-4 +kerning first=87 second=79 amount=-2 +kerning first=114 second=44 amount=-2 +kerning first=112 second=111 amount=-1 +kerning first=87 second=44 amount=-4 +kerning first=100 second=118 amount=-1 +kerning first=89 second=101 amount=-1 +kerning first=110 second=119 amount=-1 +kerning first=86 second=111 amount=-3 +kerning first=89 second=46 amount=-5 diff --git a/desktop/resources/ego/font.png b/desktop/resources/ego/font.png index dbfc0e5a..8527c779 100644 Binary files a/desktop/resources/ego/font.png and b/desktop/resources/ego/font.png differ diff --git a/desktop/resources/ego/font1.png b/desktop/resources/ego/font1.png new file mode 100644 index 00000000..4eaeaaa7 Binary files /dev/null and b/desktop/resources/ego/font1.png differ diff --git a/desktop/resources/ego/font2.png b/desktop/resources/ego/font2.png new file mode 100644 index 00000000..05fbaf52 Binary files /dev/null and b/desktop/resources/ego/font2.png differ diff --git a/desktop/resources/ui/ui.json b/desktop/resources/ui/ui.json index aa84e573..5a15e816 100644 --- a/desktop/resources/ui/ui.json +++ b/desktop/resources/ui/ui.json @@ -22,7 +22,7 @@ com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: { com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: { - default: { font: button-font, disabled: button.disabled, down: button.pressed, over: button.hover, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray} + default: { font: button-font, disabled: button.disabled, down: button.pressed, over: button.hover, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -3, downFontColor: pressed, disabledFontColor: gray} } diff --git a/desktop/src-common/advent/screens/credits.clj b/desktop/src-common/advent/screens/credits.clj index e58830b7..8bdc8319 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -75,7 +75,7 @@ (if next-role (-> entities (assoc :role (center (assoc (label next-role (get-role-style entities 0.0) :set-alignment Align/center) :x 640 :y 480 ))) - (assoc :person (center (assoc (label next-person (get-person-style entities 0.0) :set-alignment Align/center) :x 640 :y 440 ))) + (assoc :person (center (assoc (label next-person (get-person-style entities 0.0) :set-alignment Align/center) :x 640 :y 430 ))) (assoc-in [:tweens [:fade :role :in]] (chain-tweens screen entities :role)) (assoc-in [:tweens [:fade :person :in]] (chain-tweens screen entities :person)) (assoc :remaining-messages remaining-messages)) diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 12a1bfe3..6b35be27 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -67,7 +67,7 @@ [x y] (scene-world->talk-world scene-viewport [source-x source-y]) - talk (assoc (label text style :set-font-scale scale :set-alignment Align/center) + talk (assoc (label text style :set-font-scale scale :set-alignment Align/bottom) :source-x source-x :source-y source-y ) x (- x (/ (label! talk :get-width) 2)) @@ -98,7 +98,7 @@ :on-resize (fn [{:keys [viewport width height]} entities] (.update viewport width height))) -(def choice-height 30) +(def choice-height 40) @@ -146,8 +146,8 @@ font (get-in entities [:state :font])] (-> entities (into (for [[[text] i] (map vector choices (range)) - :let [e (label text (style :label font (color 0.6 1.0 1.0 1.0))) - e (assoc e :height 30 :x 30 :y (+ 30 (* choice-height (- choice-count i 1))) :index i) + :let [e (label text (style :label font (color 0.6 1.0 1.0 1.0)) :set-alignment Align/bottom) + e (assoc e :height choice-height :x 30 :y (+ 25 (* choice-height (- choice-count i 1))) :index i) e (style-label e font (get-in entities [:state :last-pos]))]] [i (doto e (label! :set-x (:x e)) @@ -155,7 +155,7 @@ (label! :set-height (:height e)))])) (assoc-in [:state :choices] choices) (assoc-in [:state :callback] callback) - (assoc-in [:state :np :height] (* 30 (inc choice-count)))))) + (assoc-in [:state :np :height] (* choice-height (inc choice-count)))))) :on-touch-up (fn [screen [entities]] (let [[x y] (utils/unproject screen)] diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index c41bd947..42a96bdf 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -562,7 +562,7 @@ (walk-to-player entities) (actions/talk entities :game-player "Don't touch my books!"))) :game-player (assoc (utils/get-texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 - :talk-color (color 1.0 0.3 0.2 1.0) + :talk-color (color 1.0 0.3 0.4 1.0) :script (actions/get-script entities (do-game-player-dialogue entities)) :writing-sound (utils/load-sound "inside-castle/writing.ogg") :facing :left diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 04c2f877..999023ac 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -141,6 +141,7 @@ ([msg & rest] (let [button (merge (text-button msg (button-style)) (apply hash-map rest))] + (doto button save-object )))) (defn make-label @@ -150,9 +151,9 @@ (let [font (utils/get-font "ego/font.fnt")] (-> msg (label (style :label font (or col (color 1.0 0.3 0.3 1.0)))) - (assoc :x 0 :y 0 :height 32 :origin-x 0 :origin-y 0 :z 8) + (assoc :x 0 :y 0 :height 40 :origin-x 0 :origin-y 0 :z 8) center - (doto (label! :set-alignment Align/center)))))) + (doto (label! :set-alignment Align/bottom)))))) (defn make-slider [initial-value & rest] (let [ui-skin (skin "ui/ui.json") @@ -167,7 +168,7 @@ save-object))) (defn stack-y [label base index] - (assoc label :y (- base (* 32 index)))) + (assoc label :y (- base (* 50 index)))) (defn make-table [children] (-> children @@ -221,13 +222,13 @@ (defn settings-menu [] (let [fullscreen-button (make-button "Fullscreen" :key :toggle-fullscreen)] - (assoc (make-table [[(make-label "Settings" label-color) :height 32 :pad-bottom 4] + (assoc (make-table [[(make-label "Settings" label-color) :height 40 :pad-bottom 4] :row - [(make-label "Music" label-color) :height 32 :pad-bottom 4] + [(make-label "Music" label-color) :height 40 :pad-bottom 4] :row [(make-slider (:music-volume @utils/settings) :key :music-volume-slider) :width 240 :pad-bottom 4] :row - [(make-label "FX" label-color) :height 32 :width 200 :pad-bottom 4] + [(make-label "FX" label-color) :height 40 :width 200 :pad-bottom 4] :row [(make-slider (:sound-volume @utils/settings) :key :sound-volume-slider) :width 240 :pad-bottom 4] :row @@ -275,7 +276,7 @@ (scroll-pane! :set-fade-scroll-bars false))] (.setScrollFocus stage (:object scroll-pane)) [scroll-pane - :colspan 3 :height 212 :pad-bottom 4 :width 472])) + :colspan 3 :height 190 :pad-bottom 4 :width 472])) (defn saves-menu [entities stage] (let [save-label (make-label "" label-color) @@ -283,7 +284,7 @@ (text-button! :set-disabled true)) delete-button (doto (make-button "Delete" :key :delete) (text-button! :set-disabled true))] - (assoc (make-table [[save-label :colspan 3 :height 32] + (assoc (make-table [[save-label :colspan 3 :height 55] :row (saves-table entities stage) :row