diff --git a/desktop/resources/ego/font.fnt b/desktop/resources/ego/font.fnt index 6a1748d4..09228187 100644 --- a/desktop/resources/ego/font.fnt +++ b/desktop/resources/ego/font.fnt @@ -1,99 +1,99 @@ -info face="04b03" size=24 bold=1 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=10,20,10,20 spacing=-40,-20 -common lineHeight=24 base=18 scaleW=512 scaleH=512 pages=1 packed=0 +info face="04b03" size=24 bold=1 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=3,5,3,5 spacing=-10,-3 +common lineHeight=27 base=18 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=47 height=42 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=36 x=47 y=0 width=53 height=39 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=121 x=100 y=0 width=53 height=39 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=113 x=153 y=0 width=53 height=39 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=112 x=206 y=0 width=53 height=39 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=103 x=259 y=0 width=53 height=39 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=81 x=312 y=0 width=53 height=39 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=38 x=365 y=0 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=35 x=421 y=0 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=37 x=0 y=42 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=92 x=56 y=42 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=64 x=112 y=42 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=47 x=168 y=42 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=124 x=224 y=42 width=44 height=36 xoffset=-20 yoffset=-7 xadvance=6 page=0 chnl=0 -char id=62 x=268 y=42 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=60 x=318 y=42 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=125 x=368 y=42 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=123 x=418 y=42 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=93 x=0 y=78 width=47 height=36 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=91 x=47 y=78 width=47 height=36 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=41 x=94 y=78 width=47 height=36 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=40 x=141 y=78 width=47 height=36 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=63 x=188 y=78 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=48 x=241 y=78 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=57 x=294 y=78 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=56 x=347 y=78 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=55 x=400 y=78 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=54 x=453 y=78 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=53 x=0 y=114 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=52 x=53 y=114 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=51 x=106 y=114 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=50 x=159 y=114 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=49 x=212 y=114 width=47 height=36 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=116 x=259 y=114 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=108 x=309 y=114 width=44 height=36 xoffset=-20 yoffset=-7 xadvance=6 page=0 chnl=0 -char id=107 x=353 y=114 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=105 x=406 y=114 width=44 height=36 xoffset=-20 yoffset=-7 xadvance=6 page=0 chnl=0 -char id=104 x=450 y=114 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=102 x=0 y=150 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=100 x=50 y=150 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=98 x=103 y=150 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=33 x=156 y=150 width=44 height=36 xoffset=-20 yoffset=-7 xadvance=6 page=0 chnl=0 -char id=90 x=200 y=150 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=89 x=250 y=150 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=88 x=303 y=150 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=87 x=356 y=150 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=86 x=412 y=150 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=85 x=0 y=186 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=84 x=53 y=186 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=83 x=103 y=186 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=82 x=156 y=186 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=80 x=209 y=186 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=79 x=262 y=186 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=78 x=315 y=186 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=77 x=368 y=186 width=56 height=36 xoffset=-20 yoffset=-7 xadvance=18 page=0 chnl=0 -char id=76 x=424 y=186 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=75 x=0 y=222 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=74 x=53 y=222 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=73 x=106 y=222 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=72 x=156 y=222 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=71 x=209 y=222 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=70 x=262 y=222 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=69 x=312 y=222 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=68 x=362 y=222 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=67 x=415 y=222 width=50 height=36 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=66 x=0 y=258 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=65 x=53 y=258 width=53 height=36 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=59 x=106 y=258 width=44 height=33 xoffset=-20 yoffset=-4 xadvance=6 page=0 chnl=0 -char id=122 x=150 y=258 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=120 x=203 y=258 width=50 height=33 xoffset=-20 yoffset=-4 xadvance=12 page=0 chnl=0 -char id=119 x=253 y=258 width=56 height=33 xoffset=-20 yoffset=-4 xadvance=18 page=0 chnl=0 -char id=118 x=309 y=258 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=117 x=362 y=258 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=115 x=415 y=258 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=114 x=0 y=294 width=50 height=33 xoffset=-20 yoffset=-4 xadvance=12 page=0 chnl=0 -char id=111 x=50 y=294 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=110 x=103 y=294 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=109 x=156 y=294 width=56 height=33 xoffset=-20 yoffset=-4 xadvance=18 page=0 chnl=0 -char id=101 x=212 y=294 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=99 x=265 y=294 width=50 height=33 xoffset=-20 yoffset=-4 xadvance=12 page=0 chnl=0 -char id=97 x=315 y=294 width=53 height=33 xoffset=-20 yoffset=-4 xadvance=15 page=0 chnl=0 -char id=42 x=368 y=294 width=50 height=30 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=61 x=418 y=294 width=50 height=30 xoffset=-20 yoffset=-4 xadvance=12 page=0 chnl=0 -char id=43 x=0 y=327 width=50 height=30 xoffset=-20 yoffset=-4 xadvance=12 page=0 chnl=0 -char id=58 x=50 y=327 width=44 height=30 xoffset=-20 yoffset=-4 xadvance=6 page=0 chnl=0 -char id=126 x=94 y=327 width=53 height=27 xoffset=-20 yoffset=-7 xadvance=15 page=0 chnl=0 -char id=94 x=147 y=327 width=50 height=27 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=44 x=197 y=327 width=47 height=27 xoffset=-20 yoffset=5 xadvance=9 page=0 chnl=0 -char id=39 x=244 y=327 width=44 height=27 xoffset=-20 yoffset=-7 xadvance=6 page=0 chnl=0 -char id=96 x=288 y=327 width=47 height=27 xoffset=-20 yoffset=-7 xadvance=9 page=0 chnl=0 -char id=34 x=335 y=327 width=50 height=27 xoffset=-20 yoffset=-7 xadvance=12 page=0 chnl=0 -char id=95 x=385 y=327 width=53 height=24 xoffset=-20 yoffset=5 xadvance=15 page=0 chnl=0 -char id=45 x=438 y=327 width=50 height=24 xoffset=-20 yoffset=-1 xadvance=12 page=0 chnl=0 -char id=46 x=0 y=357 width=44 height=24 xoffset=-20 yoffset=5 xadvance=6 page=0 chnl=0 +char id=106 x=0 y=0 width=17 height=28 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=36 x=17 y=0 width=23 height=25 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=121 x=40 y=0 width=23 height=25 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=113 x=63 y=0 width=23 height=25 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=112 x=86 y=0 width=23 height=25 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=103 x=109 y=0 width=23 height=25 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=81 x=132 y=0 width=23 height=25 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=38 x=155 y=0 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=35 x=181 y=0 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=37 x=207 y=0 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=92 x=233 y=0 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=64 x=259 y=0 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=47 x=285 y=0 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=124 x=311 y=0 width=14 height=22 xoffset=-5 yoffset=0 xadvance=6 page=0 chnl=0 +char id=62 x=325 y=0 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=60 x=345 y=0 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=125 x=365 y=0 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=123 x=385 y=0 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=93 x=405 y=0 width=17 height=22 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=91 x=422 y=0 width=17 height=22 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=41 x=439 y=0 width=17 height=22 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=40 x=456 y=0 width=17 height=22 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=63 x=473 y=0 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=48 x=0 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=57 x=23 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=56 x=46 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=55 x=69 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=54 x=92 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=53 x=115 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=52 x=138 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=51 x=161 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=50 x=184 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=49 x=207 y=28 width=17 height=22 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=116 x=224 y=28 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=108 x=244 y=28 width=14 height=22 xoffset=-5 yoffset=0 xadvance=6 page=0 chnl=0 +char id=107 x=258 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=105 x=281 y=28 width=14 height=22 xoffset=-5 yoffset=0 xadvance=6 page=0 chnl=0 +char id=104 x=295 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=102 x=318 y=28 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=100 x=338 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=98 x=361 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=33 x=384 y=28 width=14 height=22 xoffset=-5 yoffset=0 xadvance=6 page=0 chnl=0 +char id=90 x=398 y=28 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=89 x=418 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=88 x=441 y=28 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=87 x=464 y=28 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=86 x=0 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=85 x=23 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=84 x=46 y=50 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=83 x=66 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=82 x=89 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=80 x=112 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=79 x=135 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=78 x=158 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=77 x=181 y=50 width=26 height=22 xoffset=-5 yoffset=0 xadvance=18 page=0 chnl=0 +char id=76 x=207 y=50 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=75 x=227 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=74 x=250 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=73 x=273 y=50 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=72 x=293 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=71 x=316 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=70 x=339 y=50 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=69 x=359 y=50 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=68 x=379 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=67 x=402 y=50 width=20 height=22 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=66 x=422 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=65 x=445 y=50 width=23 height=22 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=59 x=468 y=50 width=14 height=19 xoffset=-5 yoffset=3 xadvance=6 page=0 chnl=0 +char id=122 x=482 y=50 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=120 x=0 y=72 width=20 height=19 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=0 +char id=119 x=20 y=72 width=26 height=19 xoffset=-5 yoffset=3 xadvance=18 page=0 chnl=0 +char id=118 x=46 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=117 x=69 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=115 x=92 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=114 x=115 y=72 width=20 height=19 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=0 +char id=111 x=135 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=110 x=158 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=109 x=181 y=72 width=26 height=19 xoffset=-5 yoffset=3 xadvance=18 page=0 chnl=0 +char id=101 x=207 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=99 x=230 y=72 width=20 height=19 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=0 +char id=97 x=250 y=72 width=23 height=19 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=42 x=273 y=72 width=20 height=16 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=61 x=293 y=72 width=20 height=16 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=0 +char id=43 x=313 y=72 width=20 height=16 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=0 +char id=58 x=333 y=72 width=14 height=16 xoffset=-5 yoffset=3 xadvance=6 page=0 chnl=0 +char id=126 x=347 y=72 width=23 height=13 xoffset=-5 yoffset=0 xadvance=15 page=0 chnl=0 +char id=94 x=370 y=72 width=20 height=13 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=44 x=390 y=72 width=17 height=13 xoffset=-5 yoffset=12 xadvance=9 page=0 chnl=0 +char id=39 x=407 y=72 width=14 height=13 xoffset=-5 yoffset=0 xadvance=6 page=0 chnl=0 +char id=96 x=421 y=72 width=17 height=13 xoffset=-5 yoffset=0 xadvance=9 page=0 chnl=0 +char id=34 x=438 y=72 width=20 height=13 xoffset=-5 yoffset=0 xadvance=12 page=0 chnl=0 +char id=95 x=458 y=72 width=23 height=10 xoffset=-5 yoffset=12 xadvance=15 page=0 chnl=0 +char id=45 x=481 y=72 width=20 height=10 xoffset=-5 yoffset=6 xadvance=12 page=0 chnl=0 +char id=46 x=0 y=91 width=14 height=10 xoffset=-5 yoffset=12 xadvance=6 page=0 chnl=0 diff --git a/desktop/resources/ego/font.png b/desktop/resources/ego/font.png index 4fd8e26c..9606c912 100644 Binary files a/desktop/resources/ego/font.png and b/desktop/resources/ego/font.png differ diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index fe799094..160b6b74 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -38,13 +38,14 @@ (utils/setup-viewport screen 1280 960) (utils/load-settings!) (let [font (utils/get-font "ego/font.fnt") - start-playing (assoc (label "Embark on thy adventure" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 100) + start-playing (assoc (label "Embark on thy adventure" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 100 :height 32 :origin-x 0 :origin-y 0) start-playing (center start-playing) - quit (assoc (label "Quit thy adventure" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 50) + quit (assoc (label "Quit thy adventure" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 65 :height 32 :origin-x 0 :origin-y 0) quit (center quit) music (utils/make-music "intro.ogg") ui-skin (skin "ui/ui.json")] (label! start-playing :set-alignment Align/center) + (label! quit :set-alignment Align/center) {:overlay (assoc (texture "title-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) :fade (assoc (texture "black.png") @@ -54,13 +55,13 @@ :origin-x 0 :origin-y 0) :music-volume-slider (assoc (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings)) - :x ( - (/ (game :width) 2) + :x ( - (/ 1280 2) 150) :width 300 :y 200) :sound-volume-slider (assoc (slider {:min 0 :max 100 :step 1 } ui-skin :set-value (:sound-volume @utils/settings)) :width 300 - :x ( - (/ (game :width) 2) + :x ( - (/ 1280 2) 150) :y 150) @@ -93,7 +94,6 @@ entities)) :on-ui-changed (fn [screen [entities]] - (println "HER") (swap! utils/settings assoc :music-volume (slider! (:music-volume-slider entities) :get-value) @@ -102,30 +102,31 @@ entities) :on-touch-up (fn [screen [entities]] - (let [[x y] (utils/unproject screen)] - (cond - (utils/intersects? (:start-playing entities) [x y]) - (-> entities - (assoc-in [:tweens :fade-out] - (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish (fn [entities] - (utils/stop-sound (:music entities)) - (set-screen! @(resolve 'advent.core/advent) scene/scene scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen) - entities) - :ease tween/ease-in-cubic)) - (assoc-in [:tweens :fade-out-music] - (tween/tween :fade-out-music screen [:volume] 1.0 0.0 1.0))) - (utils/intersects? (:quit entities) [x y]) - (-> entities - (assoc-in [:tweens :fade-out] - (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish (fn [entities] - (System/exit 0) - entities) - :ease tween/ease-in-cubic))) + (when-not (get-in entities [:tweens :fade-out]) + (let [[x y] (utils/unproject screen)] + (cond + (utils/intersects? (:start-playing entities) [x y]) + (-> entities + (assoc-in [:tweens :fade-out] + (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 + :finish (fn [entities] + (utils/stop-sound (:music entities)) + (set-screen! @(resolve 'advent.core/advent) scene/scene scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen) + entities) + :ease tween/ease-in-cubic)) + (assoc-in [:tweens :fade-out-music] + (tween/tween :fade-out-music screen [:volume] 1.0 0.0 1.0))) + (utils/intersects? (:quit entities) [x y]) + (-> entities + (assoc-in [:tweens :fade-out] + (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 + :finish (fn [entities] + (System/exit 0) + entities) + :ease tween/ease-in-cubic))) - :else - nil))) + :else + nil)))) :on-resize (fn [{:keys [viewport width height]} [entities]] (.update viewport width height)