From 8c5d719832a27f812bca11d77ca41fe2aa787195 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 24 Feb 2016 13:52:36 -0800 Subject: [PATCH] more font fixes. --- desktop/resources/ego/button-font.fnt | 194 +++++++++--------- desktop/resources/ego/button-font.png | Bin 3151 -> 5712 bytes .../src-common/advent/screens/dialogue.clj | 10 +- desktop/src-common/advent/screens/title.clj | 1 + 4 files changed, 104 insertions(+), 101 deletions(-) diff --git a/desktop/resources/ego/button-font.fnt b/desktop/resources/ego/button-font.fnt index 96d5e447..33cd96d4 100644 --- a/desktop/resources/ego/button-font.fnt +++ b/desktop/resources/ego/button-font.fnt @@ -1,101 +1,101 @@ -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 +info face="OpenDyslexic Bold" size=38 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,2,0,0 spacing=0,-8 +common lineHeight=31 base=29 scaleW=512 scaleH=512 pages=1 packed=0 page id=0 file="button-font.png" 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 +char id=32 x=0 y=0 width=0 height=0 xoffset=-2 yoffset=48 xadvance=17 page=0 chnl=0 +char id=33 x=206 y=63 width=7 height=27 xoffset=1 yoffset=21 xadvance=13 page=0 chnl=0 +char id=34 x=228 y=90 width=16 height=11 xoffset=0 yoffset=21 xadvance=20 page=0 chnl=0 +char id=35 x=264 y=63 width=28 height=27 xoffset=1 yoffset=21 xadvance=34 page=0 chnl=0 +char id=36 x=105 y=0 width=20 height=33 xoffset=1 yoffset=20 xadvance=26 page=0 chnl=0 +char id=37 x=230 y=63 width=34 height=27 xoffset=1 yoffset=21 xadvance=40 page=0 chnl=0 +char id=38 x=292 y=63 width=29 height=27 xoffset=1 yoffset=21 xadvance=35 page=0 chnl=0 +char id=39 x=244 y=90 width=7 height=11 xoffset=1 yoffset=21 xadvance=13 page=0 chnl=0 +char id=40 x=67 y=0 width=13 height=33 xoffset=1 yoffset=20 xadvance=19 page=0 chnl=0 +char id=41 x=80 y=0 width=14 height=33 xoffset=0 yoffset=19 xadvance=19 page=0 chnl=0 +char id=42 x=209 y=90 width=19 height=17 xoffset=1 yoffset=21 xadvance=25 page=0 chnl=0 +char id=43 x=347 y=63 width=26 height=23 xoffset=1 yoffset=25 xadvance=32 page=0 chnl=0 +char id=44 x=304 y=90 width=10 height=10 xoffset=1 yoffset=43 xadvance=16 page=0 chnl=0 +char id=45 x=362 y=90 width=13 height=4 xoffset=1 yoffset=36 xadvance=19 page=0 chnl=0 +char id=46 x=353 y=90 width=9 height=7 xoffset=0 yoffset=41 xadvance=14 page=0 chnl=0 +char id=47 x=236 y=0 width=16 height=30 xoffset=1 yoffset=21 xadvance=22 page=0 chnl=0 +char id=48 x=185 y=63 width=21 height=27 xoffset=1 yoffset=21 xadvance=27 page=0 chnl=0 +char id=49 x=0 y=63 width=18 height=27 xoffset=1 yoffset=21 xadvance=24 page=0 chnl=0 +char id=50 x=18 y=63 width=20 height=27 xoffset=1 yoffset=21 xadvance=26 page=0 chnl=0 +char id=51 x=38 y=63 width=21 height=27 xoffset=1 yoffset=21 xadvance=27 page=0 chnl=0 +char id=52 x=59 y=63 width=22 height=27 xoffset=1 yoffset=21 xadvance=28 page=0 chnl=0 +char id=53 x=81 y=63 width=20 height=27 xoffset=1 yoffset=21 xadvance=26 page=0 chnl=0 +char id=54 x=101 y=63 width=21 height=27 xoffset=1 yoffset=21 xadvance=27 page=0 chnl=0 +char id=55 x=122 y=63 width=20 height=27 xoffset=1 yoffset=21 xadvance=26 page=0 chnl=0 +char id=56 x=142 y=63 width=22 height=27 xoffset=1 yoffset=21 xadvance=28 page=0 chnl=0 +char id=57 x=164 y=63 width=21 height=27 xoffset=1 yoffset=21 xadvance=27 page=0 chnl=0 +char id=58 x=201 y=90 width=8 height=21 xoffset=1 yoffset=27 xadvance=14 page=0 chnl=0 +char id=59 x=337 y=63 width=10 height=26 xoffset=0 yoffset=27 xadvance=15 page=0 chnl=0 +char id=60 x=373 y=63 width=26 height=22 xoffset=1 yoffset=26 xadvance=32 page=0 chnl=0 +char id=61 x=278 y=90 width=26 height=11 xoffset=1 yoffset=31 xadvance=32 page=0 chnl=0 +char id=62 x=399 y=63 width=26 height=22 xoffset=1 yoffset=24 xadvance=32 page=0 chnl=0 +char id=63 x=213 y=63 width=17 height=27 xoffset=1 yoffset=21 xadvance=23 page=0 chnl=0 +char id=64 x=136 y=0 width=34 height=32 xoffset=1 yoffset=22 xadvance=40 page=0 chnl=0 +char id=65 x=461 y=0 width=28 height=27 xoffset=1 yoffset=21 xadvance=34 page=0 chnl=0 +char id=66 x=0 y=36 width=23 height=27 xoffset=1 yoffset=21 xadvance=29 page=0 chnl=0 +char id=67 x=252 y=0 width=25 height=28 xoffset=1 yoffset=20 xadvance=30 page=0 chnl=0 +char id=68 x=23 y=36 width=26 height=27 xoffset=1 yoffset=21 xadvance=32 page=0 chnl=0 +char id=69 x=489 y=0 width=21 height=27 xoffset=1 yoffset=21 xadvance=26 page=0 chnl=0 +char id=70 x=49 y=36 width=19 height=27 xoffset=1 yoffset=21 xadvance=24 page=0 chnl=0 +char id=71 x=68 y=36 width=26 height=27 xoffset=1 yoffset=21 xadvance=32 page=0 chnl=0 +char id=72 x=94 y=36 width=23 height=27 xoffset=1 yoffset=21 xadvance=29 page=0 chnl=0 +char id=73 x=117 y=36 width=7 height=27 xoffset=1 yoffset=21 xadvance=13 page=0 chnl=0 +char id=74 x=20 y=0 width=13 height=34 xoffset=1 yoffset=21 xadvance=19 page=0 chnl=0 +char id=75 x=124 y=36 width=25 height=27 xoffset=1 yoffset=21 xadvance=31 page=0 chnl=0 +char id=76 x=149 y=36 width=20 height=27 xoffset=1 yoffset=21 xadvance=26 page=0 chnl=0 +char id=77 x=169 y=36 width=28 height=27 xoffset=1 yoffset=21 xadvance=34 page=0 chnl=0 +char id=78 x=197 y=36 width=23 height=27 xoffset=1 yoffset=21 xadvance=29 page=0 chnl=0 +char id=79 x=220 y=36 width=28 height=27 xoffset=1 yoffset=21 xadvance=34 page=0 chnl=0 +char id=80 x=248 y=36 width=21 height=27 xoffset=1 yoffset=21 xadvance=27 page=0 chnl=0 +char id=81 x=170 y=0 width=30 height=31 xoffset=1 yoffset=21 xadvance=36 page=0 chnl=0 +char id=82 x=269 y=36 width=24 height=27 xoffset=1 yoffset=21 xadvance=30 page=0 chnl=0 +char id=83 x=293 y=36 width=22 height=27 xoffset=1 yoffset=21 xadvance=28 page=0 chnl=0 +char id=84 x=315 y=36 width=26 height=27 xoffset=1 yoffset=21 xadvance=31 page=0 chnl=0 +char id=85 x=341 y=36 width=24 height=27 xoffset=1 yoffset=21 xadvance=30 page=0 chnl=0 +char id=86 x=365 y=36 width=28 height=27 xoffset=1 yoffset=21 xadvance=34 page=0 chnl=0 +char id=87 x=393 y=36 width=37 height=27 xoffset=1 yoffset=21 xadvance=43 page=0 chnl=0 +char id=88 x=430 y=36 width=27 height=27 xoffset=1 yoffset=21 xadvance=33 page=0 chnl=0 +char id=89 x=457 y=36 width=26 height=27 xoffset=1 yoffset=21 xadvance=32 page=0 chnl=0 +char id=90 x=483 y=36 width=25 height=27 xoffset=1 yoffset=21 xadvance=31 page=0 chnl=0 +char id=91 x=125 y=0 width=11 height=32 xoffset=1 yoffset=20 xadvance=16 page=0 chnl=0 +char id=92 x=200 y=0 width=15 height=31 xoffset=1 yoffset=21 xadvance=20 page=0 chnl=0 +char id=93 x=94 y=0 width=11 height=33 xoffset=1 yoffset=20 xadvance=17 page=0 chnl=0 +char id=94 x=251 y=90 width=27 height=11 xoffset=1 yoffset=21 xadvance=33 page=0 chnl=0 +char id=95 x=375 y=90 width=22 height=4 xoffset=1 yoffset=52 xadvance=28 page=0 chnl=0 +char id=96 x=340 y=90 width=13 height=8 xoffset=1 yoffset=18 xadvance=18 page=0 chnl=0 +char id=97 x=425 y=63 width=20 height=21 xoffset=1 yoffset=27 xadvance=26 page=0 chnl=0 +char id=98 x=277 y=0 width=20 height=28 xoffset=1 yoffset=20 xadvance=26 page=0 chnl=0 +char id=99 x=445 y=63 width=19 height=21 xoffset=1 yoffset=27 xadvance=24 page=0 chnl=0 +char id=100 x=297 y=0 width=21 height=28 xoffset=1 yoffset=20 xadvance=27 page=0 chnl=0 +char id=101 x=464 y=63 width=21 height=21 xoffset=1 yoffset=27 xadvance=27 page=0 chnl=0 +char id=102 x=318 y=0 width=15 height=28 xoffset=1 yoffset=20 xadvance=21 page=0 chnl=0 +char id=103 x=215 y=0 width=21 height=30 xoffset=1 yoffset=27 xadvance=27 page=0 chnl=0 +char id=104 x=333 y=0 width=20 height=28 xoffset=1 yoffset=20 xadvance=26 page=0 chnl=0 +char id=105 x=353 y=0 width=7 height=28 xoffset=1 yoffset=20 xadvance=13 page=0 chnl=0 +char id=106 x=7 y=0 width=13 height=35 xoffset=1 yoffset=20 xadvance=19 page=0 chnl=0 +char id=107 x=360 y=0 width=22 height=28 xoffset=1 yoffset=20 xadvance=27 page=0 chnl=0 +char id=108 x=382 y=0 width=9 height=28 xoffset=1 yoffset=20 xadvance=14 page=0 chnl=0 +char id=109 x=0 y=90 width=32 height=21 xoffset=1 yoffset=27 xadvance=38 page=0 chnl=0 +char id=110 x=485 y=63 width=20 height=21 xoffset=1 yoffset=27 xadvance=26 page=0 chnl=0 +char id=111 x=32 y=90 width=21 height=21 xoffset=1 yoffset=27 xadvance=27 page=0 chnl=0 +char id=112 x=391 y=0 width=21 height=28 xoffset=0 yoffset=27 xadvance=26 page=0 chnl=0 +char id=113 x=412 y=0 width=26 height=28 xoffset=1 yoffset=27 xadvance=31 page=0 chnl=0 +char id=114 x=53 y=90 width=14 height=21 xoffset=1 yoffset=27 xadvance=20 page=0 chnl=0 +char id=115 x=67 y=90 width=18 height=21 xoffset=1 yoffset=27 xadvance=24 page=0 chnl=0 +char id=116 x=321 y=63 width=16 height=26 xoffset=1 yoffset=22 xadvance=21 page=0 chnl=0 +char id=117 x=85 y=90 width=20 height=21 xoffset=1 yoffset=27 xadvance=26 page=0 chnl=0 +char id=118 x=105 y=90 width=23 height=21 xoffset=1 yoffset=27 xadvance=28 page=0 chnl=0 +char id=119 x=128 y=90 width=30 height=21 xoffset=1 yoffset=27 xadvance=35 page=0 chnl=0 +char id=120 x=158 y=90 width=24 height=21 xoffset=1 yoffset=27 xadvance=30 page=0 chnl=0 +char id=121 x=438 y=0 width=23 height=28 xoffset=1 yoffset=27 xadvance=29 page=0 chnl=0 +char id=122 x=182 y=90 width=19 height=21 xoffset=1 yoffset=27 xadvance=25 page=0 chnl=0 +char id=123 x=33 y=0 width=17 height=34 xoffset=1 yoffset=20 xadvance=23 page=0 chnl=0 +char id=124 x=0 y=0 width=7 height=36 xoffset=1 yoffset=20 xadvance=13 page=0 chnl=0 +char id=125 x=50 y=0 width=17 height=34 xoffset=1 yoffset=21 xadvance=23 page=0 chnl=0 +char id=126 x=314 y=90 width=26 height=9 xoffset=1 yoffset=32 xadvance=32 page=0 chnl=0 kernings count=0 diff --git a/desktop/resources/ego/button-font.png b/desktop/resources/ego/button-font.png index 626e3ffc6fad6bacc4be25d89f0d62476c3b03a9..01100d97e91d39a83d0474aa3e39d7c112322eb0 100644 GIT binary patch literal 5712 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 label-right maximum-x) (assoc talk :x (- maximum-x label-width)) - (< (:x talk) minimum-x) (assoc talk :x minimum-x) - :else talk)] + y (min (- 900 (label! talk :get-height)) (:y talk)) + talk (assoc (cond (> label-right maximum-x) (assoc talk :x (- maximum-x label-width)) + (< (:x talk) minimum-x) (assoc talk :x minimum-x) + :else talk) + :y y)] (doto talk (label! :set-x (:x talk)) (label! :set-y (:y talk))))) @@ -72,7 +74,7 @@ (assoc :source-x source-x :source-y source-y) (doto (label! :set-wrap true) - (#(label! % :set-width (min 700 (+ 50 (* scale (label! % :get-width)))))) + (#(label! % :set-width (min 700 (+ 50 (label! % :get-width))))) )) x (- x (/ (label! talk :get-width) 2)) talk (assoc talk :x x :y y :id id) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 95eb93c4..d08d8a37 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -131,6 +131,7 @@ (defn button-style [] (let [style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle) tx (-> style .font .getRegion .getTexture)] + (-> style .font (.setScale 0.5 0.5)) (call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) style))