diff --git a/desktop/resources/ego/font.fnt b/desktop/resources/ego/font.fnt index 0c71f427..2a61b7b2 100644 --- a/desktop/resources/ego/font.fnt +++ b/desktop/resources/ego/font.fnt @@ -1,262 +1,99 @@ -info face="Arial Black" size=22 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=6,6,6,6 spacing=-12,-12 +info face="Arial-Black" size=22 bold=1 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=6,6,6,6 spacing=-12,-12 common lineHeight=32 base=25 scaleW=512 scaleH=512 pages=1 packed=0 page id=0 file="font.png" -chars count=95 +chars count=94 char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=25 xadvance=7 page=0 chnl=0 -char id=124 x=0 y=0 width=17 height=34 xoffset=-4 yoffset=2 xadvance=6 page=0 chnl=0 -char id=125 x=17 y=0 width=22 height=34 xoffset=-5 yoffset=2 xadvance=9 page=0 chnl=0 -char id=123 x=39 y=0 width=22 height=34 xoffset=-6 yoffset=2 xadvance=9 page=0 chnl=0 -char id=93 x=61 y=0 width=22 height=34 xoffset=-5 yoffset=2 xadvance=9 page=0 chnl=0 -char id=91 x=83 y=0 width=22 height=34 xoffset=-6 yoffset=2 xadvance=9 page=0 chnl=0 -char id=41 x=105 y=0 width=21 height=34 xoffset=-5 yoffset=2 xadvance=9 page=0 chnl=0 -char id=40 x=126 y=0 width=20 height=34 xoffset=-5 yoffset=2 xadvance=9 page=0 chnl=0 -char id=106 x=146 y=0 width=23 height=34 xoffset=-8 yoffset=2 xadvance=7 page=0 chnl=0 -char id=36 x=169 y=0 width=28 height=33 xoffset=-6 yoffset=1 xadvance=15 page=0 chnl=0 -char id=64 x=197 y=0 width=30 height=33 xoffset=-6 yoffset=2 xadvance=16 page=0 chnl=0 -char id=81 x=227 y=0 width=30 height=32 xoffset=-5 yoffset=2 xadvance=18 page=0 chnl=0 -char id=38 x=257 y=0 width=32 height=30 xoffset=-5 yoffset=2 xadvance=20 page=0 chnl=0 -char id=35 x=289 y=0 width=28 height=30 xoffset=-6 yoffset=2 xadvance=15 page=0 chnl=0 -char id=37 x=317 y=0 width=33 height=30 xoffset=-5 yoffset=2 xadvance=22 page=0 chnl=0 -char id=92 x=350 y=0 width=19 height=30 xoffset=-6 yoffset=2 xadvance=6 page=0 chnl=0 -char id=47 x=369 y=0 width=19 height=30 xoffset=-6 yoffset=2 xadvance=6 page=0 chnl=0 -char id=59 x=388 y=0 width=19 height=30 xoffset=-5 yoffset=6 xadvance=7 page=0 chnl=0 -char id=63 x=407 y=0 width=26 height=30 xoffset=-5 yoffset=2 xadvance=13 page=0 chnl=0 -char id=33 x=433 y=0 width=19 height=30 xoffset=-5 yoffset=2 xadvance=7 page=0 chnl=0 -char id=48 x=452 y=0 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=57 x=479 y=0 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=56 x=0 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=55 x=27 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=54 x=54 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=53 x=81 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=52 x=108 y=34 width=29 height=30 xoffset=-6 yoffset=2 xadvance=15 page=0 chnl=0 -char id=51 x=137 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=50 x=164 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=49 x=191 y=34 width=24 height=30 xoffset=-4 yoffset=2 xadvance=15 page=0 chnl=0 -char id=121 x=215 y=34 width=26 height=30 xoffset=-6 yoffset=6 xadvance=13 page=0 chnl=0 -char id=113 x=241 y=34 width=27 height=30 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=112 x=268 y=34 width=27 height=30 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=108 x=295 y=34 width=19 height=30 xoffset=-5 yoffset=2 xadvance=7 page=0 chnl=0 -char id=107 x=314 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=105 x=341 y=34 width=19 height=30 xoffset=-5 yoffset=2 xadvance=7 page=0 chnl=0 -char id=104 x=360 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=103 x=387 y=34 width=27 height=30 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=102 x=414 y=34 width=23 height=30 xoffset=-6 yoffset=2 xadvance=9 page=0 chnl=0 -char id=100 x=437 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=98 x=464 y=34 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=90 x=0 y=64 width=28 height=30 xoffset=-5 yoffset=2 xadvance=16 page=0 chnl=0 -char id=89 x=28 y=64 width=30 height=30 xoffset=-6 yoffset=2 xadvance=17 page=0 chnl=0 -char id=88 x=58 y=64 width=30 height=30 xoffset=-6 yoffset=2 xadvance=17 page=0 chnl=0 -char id=87 x=88 y=64 width=36 height=30 xoffset=-6 yoffset=2 xadvance=22 page=0 chnl=0 -char id=86 x=124 y=64 width=30 height=30 xoffset=-6 yoffset=2 xadvance=17 page=0 chnl=0 -char id=85 x=154 y=64 width=28 height=30 xoffset=-4 yoffset=2 xadvance=18 page=0 chnl=0 -char id=84 x=182 y=64 width=29 height=30 xoffset=-6 yoffset=2 xadvance=16 page=0 chnl=0 -char id=83 x=211 y=64 width=27 height=30 xoffset=-5 yoffset=2 xadvance=16 page=0 chnl=0 -char id=82 x=238 y=64 width=28 height=30 xoffset=-4 yoffset=2 xadvance=17 page=0 chnl=0 -char id=80 x=266 y=64 width=27 height=30 xoffset=-4 yoffset=2 xadvance=16 page=0 chnl=0 -char id=79 x=293 y=64 width=30 height=30 xoffset=-5 yoffset=2 xadvance=18 page=0 chnl=0 -char id=78 x=323 y=64 width=28 height=30 xoffset=-4 yoffset=2 xadvance=18 page=0 chnl=0 -char id=77 x=351 y=64 width=31 height=30 xoffset=-4 yoffset=2 xadvance=21 page=0 chnl=0 -char id=76 x=382 y=64 width=26 height=30 xoffset=-4 yoffset=2 xadvance=15 page=0 chnl=0 -char id=75 x=408 y=64 width=29 height=30 xoffset=-4 yoffset=2 xadvance=18 page=0 chnl=0 -char id=74 x=437 y=64 width=27 height=30 xoffset=-6 yoffset=2 xadvance=15 page=0 chnl=0 -char id=73 x=464 y=64 width=19 height=30 xoffset=-4 yoffset=2 xadvance=9 page=0 chnl=0 -char id=72 x=483 y=64 width=28 height=30 xoffset=-4 yoffset=2 xadvance=18 page=0 chnl=0 -char id=71 x=0 y=94 width=30 height=30 xoffset=-5 yoffset=2 xadvance=18 page=0 chnl=0 -char id=70 x=30 y=94 width=26 height=30 xoffset=-4 yoffset=2 xadvance=15 page=0 chnl=0 -char id=69 x=56 y=94 width=27 height=30 xoffset=-4 yoffset=2 xadvance=16 page=0 chnl=0 -char id=68 x=83 y=94 width=28 height=30 xoffset=-4 yoffset=2 xadvance=17 page=0 chnl=0 -char id=67 x=111 y=94 width=28 height=30 xoffset=-5 yoffset=2 xadvance=17 page=0 chnl=0 -char id=66 x=139 y=94 width=28 height=30 xoffset=-4 yoffset=2 xadvance=17 page=0 chnl=0 -char id=65 x=167 y=94 width=30 height=30 xoffset=-6 yoffset=2 xadvance=17 page=0 chnl=0 -char id=116 x=197 y=94 width=23 height=29 xoffset=-7 yoffset=3 xadvance=10 page=0 chnl=0 -char id=127 x=220 y=94 width=25 height=27 xoffset=-6 yoffset=5 xadvance=17 page=0 chnl=0 -char id=62 x=245 y=94 width=26 height=26 xoffset=-4 yoffset=5 xadvance=15 page=0 chnl=0 -char id=60 x=271 y=94 width=26 height=26 xoffset=-5 yoffset=5 xadvance=15 page=0 chnl=0 -char id=58 x=297 y=94 width=19 height=26 xoffset=-5 yoffset=6 xadvance=7 page=0 chnl=0 -char id=122 x=316 y=94 width=24 height=26 xoffset=-5 yoffset=6 xadvance=12 page=0 chnl=0 -char id=120 x=340 y=94 width=28 height=26 xoffset=-6 yoffset=6 xadvance=15 page=0 chnl=0 -char id=119 x=368 y=94 width=34 height=26 xoffset=-6 yoffset=6 xadvance=21 page=0 chnl=0 -char id=118 x=402 y=94 width=26 height=26 xoffset=-6 yoffset=6 xadvance=13 page=0 chnl=0 -char id=117 x=428 y=94 width=27 height=26 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=115 x=455 y=94 width=24 height=26 xoffset=-5 yoffset=6 xadvance=13 page=0 chnl=0 -char id=114 x=479 y=94 width=23 height=26 xoffset=-5 yoffset=6 xadvance=10 page=0 chnl=0 -char id=111 x=0 y=124 width=27 height=26 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=110 x=27 y=124 width=27 height=26 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=109 x=54 y=124 width=33 height=26 xoffset=-5 yoffset=6 xadvance=22 page=0 chnl=0 -char id=101 x=87 y=124 width=27 height=26 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=99 x=114 y=124 width=26 height=26 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=97 x=140 y=124 width=27 height=26 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=43 x=167 y=124 width=25 height=25 xoffset=-4 yoffset=5 xadvance=15 page=0 chnl=0 -char id=94 x=192 y=124 width=25 height=23 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 -char id=44 x=217 y=124 width=19 height=23 xoffset=-5 yoffset=13 xadvance=7 page=0 chnl=0 -char id=42 x=236 y=124 width=21 height=22 xoffset=-4 yoffset=2 xadvance=12 page=0 chnl=0 -char id=61 x=257 y=124 width=26 height=22 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 -char id=39 x=283 y=124 width=19 height=20 xoffset=-5 yoffset=2 xadvance=6 page=0 chnl=0 -char id=34 x=302 y=124 width=25 height=20 xoffset=-6 yoffset=2 xadvance=11 page=0 chnl=0 -char id=46 x=327 y=124 width=19 height=19 xoffset=-5 yoffset=13 xadvance=7 page=0 chnl=0 -char id=126 x=346 y=124 width=26 height=18 xoffset=-5 yoffset=9 xadvance=15 page=0 chnl=0 -char id=45 x=372 y=124 width=21 height=17 xoffset=-6 yoffset=11 xadvance=7 page=0 chnl=0 -char id=96 x=393 y=124 width=19 height=17 xoffset=-7 yoffset=2 xadvance=7 page=0 chnl=0 -char id=95 x=412 y=124 width=25 height=15 xoffset=-6 yoffset=20 xadvance=11 page=0 chnl=0 -kernings count=234 -kerning first=81 second=44 amount=1 -kerning first=81 second=86 amount=-1 -kerning first=81 second=89 amount=-1 -kerning first=121 second=44 amount=-2 -kerning first=121 second=46 amount=-2 -kerning first=112 second=119 amount=-1 -kerning first=107 second=101 amount=-1 -kerning first=107 second=111 amount=-1 -kerning first=102 second=33 amount=2 -kerning first=102 second=44 amount=-1 -kerning first=102 second=46 amount=-1 -kerning first=102 second=63 amount=2 -kerning first=102 second=102 amount=1 -kerning first=98 second=118 amount=-1 -kerning first=89 second=44 amount=-4 -kerning first=89 second=45 amount=-2 -kerning first=89 second=46 amount=-4 -kerning first=89 second=58 amount=-1 -kerning first=89 second=59 amount=-1 -kerning first=89 second=65 amount=-2 -kerning first=89 second=67 amount=-1 -kerning first=89 second=71 amount=-1 -kerning first=89 second=79 amount=-1 -kerning first=89 second=83 amount=-1 -kerning first=89 second=97 amount=-2 -kerning first=89 second=100 amount=-2 -kerning first=89 second=101 amount=-2 -kerning first=89 second=111 amount=-2 -kerning first=89 second=112 amount=-1 -kerning first=89 second=113 amount=-2 -kerning first=89 second=117 amount=-1 -kerning first=89 second=118 amount=-1 -kerning first=88 second=67 amount=-1 -kerning first=88 second=71 amount=-1 -kerning first=88 second=79 amount=-1 -kerning first=87 second=44 amount=-1 -kerning first=87 second=46 amount=-1 -kerning first=87 second=100 amount=-1 -kerning first=87 second=101 amount=-1 -kerning first=87 second=104 amount=1 -kerning first=87 second=105 amount=1 -kerning first=87 second=111 amount=-1 -kerning first=86 second=44 amount=-3 -kerning first=86 second=45 amount=-1 -kerning first=86 second=46 amount=-3 -kerning first=86 second=58 amount=-1 -kerning first=86 second=59 amount=-1 -kerning first=86 second=65 amount=-1 -kerning first=86 second=67 amount=-1 -kerning first=86 second=71 amount=-1 -kerning first=86 second=79 amount=-1 -kerning first=86 second=81 amount=-1 -kerning first=86 second=97 amount=-1 -kerning first=86 second=101 amount=-1 -kerning first=86 second=111 amount=-1 -kerning first=86 second=114 amount=-1 -kerning first=86 second=117 amount=-1 -kerning first=85 second=44 amount=-1 -kerning first=85 second=46 amount=-1 -kerning first=85 second=65 amount=-1 -kerning first=84 second=44 amount=-3 -kerning first=84 second=45 amount=-1 -kerning first=84 second=46 amount=-3 -kerning first=84 second=58 amount=-1 -kerning first=84 second=59 amount=-1 -kerning first=84 second=65 amount=-1 -kerning first=84 second=67 amount=-1 -kerning first=84 second=71 amount=-1 -kerning first=84 second=79 amount=-1 -kerning first=84 second=81 amount=-1 -kerning first=84 second=97 amount=-1 -kerning first=84 second=99 amount=-1 -kerning first=84 second=101 amount=-1 -kerning first=84 second=104 amount=1 -kerning first=84 second=109 amount=-1 -kerning first=84 second=111 amount=-1 -kerning first=84 second=114 amount=-1 -kerning first=84 second=115 amount=-1 -kerning first=84 second=117 amount=-1 -kerning first=84 second=122 amount=-1 -kerning first=82 second=89 amount=-1 -kerning first=82 second=101 amount=-1 -kerning first=82 second=111 amount=-1 -kerning first=80 second=44 amount=-4 -kerning first=80 second=46 amount=-4 -kerning first=80 second=65 amount=-2 -kerning first=80 second=101 amount=-1 -kerning first=80 second=111 amount=-1 -kerning first=79 second=46 amount=-1 -kerning first=79 second=65 amount=-1 -kerning first=79 second=84 amount=-1 -kerning first=79 second=86 amount=-1 -kerning first=79 second=88 amount=-1 -kerning first=79 second=89 amount=-1 -kerning first=76 second=84 amount=-1 -kerning first=76 second=85 amount=-1 -kerning first=76 second=86 amount=-1 -kerning first=76 second=89 amount=-2 -kerning first=75 second=67 amount=-1 -kerning first=75 second=71 amount=-1 -kerning first=75 second=79 amount=-1 -kerning first=75 second=101 amount=-1 -kerning first=75 second=111 amount=-1 -kerning first=75 second=117 amount=-1 -kerning first=74 second=46 amount=-1 -kerning first=74 second=65 amount=-1 -kerning first=74 second=101 amount=-1 -kerning first=74 second=111 amount=-1 -kerning first=74 second=117 amount=-1 -kerning first=70 second=44 amount=-3 -kerning first=70 second=46 amount=-3 -kerning first=70 second=65 amount=-2 -kerning first=70 second=97 amount=-1 -kerning first=70 second=101 amount=-1 -kerning first=70 second=111 amount=-1 -kerning first=70 second=114 amount=-1 -kerning first=68 second=65 amount=-1 -kerning first=68 second=86 amount=-1 -kerning first=68 second=89 amount=-1 -kerning first=67 second=44 amount=1 -kerning first=66 second=44 amount=1 -kerning first=66 second=85 amount=-1 -kerning first=65 second=84 amount=-2 -kerning first=65 second=85 amount=-1 -kerning first=65 second=86 amount=-1 -kerning first=65 second=89 amount=-2 -kerning first=119 second=44 amount=-2 -kerning first=119 second=46 amount=-2 -kerning first=118 second=44 amount=-2 -kerning first=118 second=46 amount=-2 -kerning first=118 second=99 amount=-1 -kerning first=118 second=101 amount=-1 -kerning first=118 second=111 amount=-1 -kerning first=118 second=113 amount=-1 -kerning first=115 second=119 amount=-1 -kerning first=114 second=44 amount=-1 -kerning first=114 second=46 amount=-2 -kerning first=114 second=58 amount=1 -kerning first=114 second=59 amount=1 -kerning first=114 second=100 amount=1 -kerning first=114 second=103 amount=1 -kerning first=114 second=106 amount=1 -kerning first=114 second=107 amount=1 -kerning first=114 second=108 amount=1 -kerning first=114 second=109 amount=1 -kerning first=114 second=110 amount=1 -kerning first=114 second=112 amount=1 -kerning first=114 second=113 amount=1 -kerning first=114 second=114 amount=1 -kerning first=114 second=115 amount=1 -kerning first=114 second=116 amount=1 -kerning first=114 second=117 amount=1 -kerning first=114 second=118 amount=1 -kerning first=114 second=121 amount=1 -kerning first=111 second=118 amount=-1 -kerning first=111 second=120 amount=-1 -kerning first=110 second=118 amount=-1 -kerning first=101 second=103 amount=1 -kerning first=101 second=118 amount=-1 -kerning first=101 second=120 amount=-1 -kerning first=99 second=108 amount=-1 +char id=125 x=0 y=0 width=22 height=35 xoffset=-6 yoffset=2 xadvance=9 page=0 chnl=0 +char id=123 x=22 y=0 width=22 height=35 xoffset=-6 yoffset=2 xadvance=9 page=0 chnl=0 +char id=41 x=44 y=0 width=21 height=35 xoffset=-5 yoffset=2 xadvance=9 page=0 chnl=0 +char id=40 x=65 y=0 width=20 height=35 xoffset=-5 yoffset=2 xadvance=9 page=0 chnl=0 +char id=124 x=85 y=0 width=17 height=34 xoffset=-4 yoffset=3 xadvance=6 page=0 chnl=0 +char id=93 x=102 y=0 width=21 height=34 xoffset=-5 yoffset=3 xadvance=9 page=0 chnl=0 +char id=91 x=123 y=0 width=21 height=34 xoffset=-5 yoffset=3 xadvance=9 page=0 chnl=0 +char id=106 x=144 y=0 width=22 height=34 xoffset=-7 yoffset=3 xadvance=7 page=0 chnl=0 +char id=36 x=166 y=0 width=27 height=33 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=64 x=193 y=0 width=31 height=33 xoffset=-6 yoffset=2 xadvance=16 page=0 chnl=0 +char id=81 x=224 y=0 width=31 height=32 xoffset=-5 yoffset=2 xadvance=18 page=0 chnl=0 +char id=38 x=255 y=0 width=31 height=31 xoffset=-4 yoffset=2 xadvance=20 page=0 chnl=0 +char id=35 x=286 y=0 width=27 height=31 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=37 x=313 y=0 width=33 height=31 xoffset=-5 yoffset=2 xadvance=22 page=0 chnl=0 +char id=92 x=346 y=0 width=21 height=31 xoffset=-6 yoffset=2 xadvance=6 page=0 chnl=0 +char id=47 x=367 y=0 width=20 height=31 xoffset=-6 yoffset=2 xadvance=6 page=0 chnl=0 +char id=48 x=387 y=0 width=27 height=31 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=57 x=414 y=0 width=27 height=31 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=56 x=441 y=0 width=27 height=31 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=54 x=468 y=0 width=27 height=31 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=51 x=0 y=35 width=27 height=31 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=83 x=27 y=35 width=29 height=31 xoffset=-5 yoffset=2 xadvance=16 page=0 chnl=0 +char id=79 x=56 y=35 width=31 height=31 xoffset=-5 yoffset=2 xadvance=18 page=0 chnl=0 +char id=71 x=87 y=35 width=30 height=31 xoffset=-5 yoffset=2 xadvance=18 page=0 chnl=0 +char id=67 x=117 y=35 width=29 height=31 xoffset=-5 yoffset=2 xadvance=17 page=0 chnl=0 +char id=59 x=146 y=35 width=19 height=30 xoffset=-5 yoffset=7 xadvance=7 page=0 chnl=0 +char id=63 x=165 y=35 width=26 height=30 xoffset=-5 yoffset=2 xadvance=13 page=0 chnl=0 +char id=53 x=191 y=35 width=27 height=30 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=52 x=218 y=35 width=28 height=30 xoffset=-6 yoffset=2 xadvance=15 page=0 chnl=0 +char id=50 x=246 y=35 width=27 height=30 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=49 x=273 y=35 width=23 height=30 xoffset=-4 yoffset=2 xadvance=15 page=0 chnl=0 +char id=121 x=296 y=35 width=27 height=30 xoffset=-6 yoffset=7 xadvance=13 page=0 chnl=0 +char id=116 x=323 y=35 width=23 height=30 xoffset=-5 yoffset=3 xadvance=10 page=0 chnl=0 +char id=113 x=346 y=35 width=27 height=30 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=112 x=373 y=35 width=26 height=30 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=103 x=399 y=35 width=27 height=30 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=102 x=426 y=35 width=23 height=30 xoffset=-6 yoffset=2 xadvance=9 page=0 chnl=0 +char id=100 x=449 y=35 width=27 height=30 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=98 x=476 y=35 width=26 height=30 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=85 x=0 y=66 width=29 height=30 xoffset=-4 yoffset=3 xadvance=18 page=0 chnl=0 +char id=74 x=29 y=66 width=27 height=30 xoffset=-6 yoffset=3 xadvance=15 page=0 chnl=0 +char id=33 x=56 y=66 width=19 height=29 xoffset=-5 yoffset=3 xadvance=7 page=0 chnl=0 +char id=55 x=75 y=66 width=27 height=29 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=108 x=102 y=66 width=18 height=29 xoffset=-5 yoffset=3 xadvance=7 page=0 chnl=0 +char id=107 x=120 y=66 width=27 height=29 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=105 x=147 y=66 width=18 height=29 xoffset=-5 yoffset=3 xadvance=7 page=0 chnl=0 +char id=104 x=165 y=66 width=26 height=29 xoffset=-5 yoffset=3 xadvance=15 page=0 chnl=0 +char id=90 x=191 y=66 width=29 height=29 xoffset=-6 yoffset=3 xadvance=16 page=0 chnl=0 +char id=89 x=220 y=66 width=31 height=29 xoffset=-6 yoffset=3 xadvance=17 page=0 chnl=0 +char id=88 x=251 y=66 width=31 height=29 xoffset=-6 yoffset=3 xadvance=17 page=0 chnl=0 +char id=87 x=282 y=66 width=37 height=29 xoffset=-6 yoffset=3 xadvance=22 page=0 chnl=0 +char id=86 x=319 y=66 width=31 height=29 xoffset=-6 yoffset=3 xadvance=17 page=0 chnl=0 +char id=84 x=350 y=66 width=29 height=29 xoffset=-5 yoffset=3 xadvance=16 page=0 chnl=0 +char id=82 x=379 y=66 width=30 height=29 xoffset=-4 yoffset=3 xadvance=17 page=0 chnl=0 +char id=80 x=409 y=66 width=27 height=29 xoffset=-4 yoffset=3 xadvance=16 page=0 chnl=0 +char id=78 x=436 y=66 width=29 height=29 xoffset=-4 yoffset=3 xadvance=18 page=0 chnl=0 +char id=77 x=465 y=66 width=32 height=29 xoffset=-4 yoffset=3 xadvance=21 page=0 chnl=0 +char id=76 x=0 y=96 width=27 height=29 xoffset=-4 yoffset=3 xadvance=15 page=0 chnl=0 +char id=75 x=27 y=96 width=31 height=29 xoffset=-4 yoffset=3 xadvance=18 page=0 chnl=0 +char id=73 x=58 y=96 width=19 height=29 xoffset=-4 yoffset=3 xadvance=9 page=0 chnl=0 +char id=72 x=77 y=96 width=29 height=29 xoffset=-4 yoffset=3 xadvance=18 page=0 chnl=0 +char id=70 x=106 y=96 width=26 height=29 xoffset=-4 yoffset=3 xadvance=15 page=0 chnl=0 +char id=69 x=132 y=96 width=27 height=29 xoffset=-4 yoffset=3 xadvance=16 page=0 chnl=0 +char id=68 x=159 y=96 width=29 height=29 xoffset=-4 yoffset=3 xadvance=17 page=0 chnl=0 +char id=66 x=188 y=96 width=29 height=29 xoffset=-4 yoffset=3 xadvance=17 page=0 chnl=0 +char id=65 x=217 y=96 width=31 height=29 xoffset=-6 yoffset=3 xadvance=17 page=0 chnl=0 +char id=62 x=248 y=96 width=26 height=27 xoffset=-5 yoffset=4 xadvance=15 page=0 chnl=0 +char id=60 x=274 y=96 width=26 height=27 xoffset=-5 yoffset=4 xadvance=15 page=0 chnl=0 +char id=117 x=300 y=96 width=26 height=26 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=115 x=326 y=96 width=26 height=26 xoffset=-5 yoffset=7 xadvance=13 page=0 chnl=0 +char id=111 x=352 y=96 width=27 height=26 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=101 x=379 y=96 width=27 height=26 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=99 x=406 y=96 width=27 height=26 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=97 x=433 y=96 width=27 height=26 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=43 x=460 y=96 width=26 height=25 xoffset=-5 yoffset=5 xadvance=15 page=0 chnl=0 +char id=58 x=486 y=96 width=19 height=25 xoffset=-5 yoffset=7 xadvance=7 page=0 chnl=0 +char id=122 x=0 y=125 width=25 height=25 xoffset=-6 yoffset=7 xadvance=12 page=0 chnl=0 +char id=120 x=25 y=125 width=28 height=25 xoffset=-6 yoffset=7 xadvance=15 page=0 chnl=0 +char id=119 x=53 y=125 width=34 height=25 xoffset=-6 yoffset=7 xadvance=21 page=0 chnl=0 +char id=118 x=87 y=125 width=27 height=25 xoffset=-6 yoffset=7 xadvance=13 page=0 chnl=0 +char id=114 x=114 y=125 width=23 height=25 xoffset=-5 yoffset=7 xadvance=10 page=0 chnl=0 +char id=110 x=137 y=125 width=26 height=25 xoffset=-5 yoffset=7 xadvance=15 page=0 chnl=0 +char id=109 x=163 y=125 width=33 height=25 xoffset=-5 yoffset=7 xadvance=22 page=0 chnl=0 +char id=61 x=196 y=125 width=26 height=23 xoffset=-5 yoffset=6 xadvance=15 page=0 chnl=0 +char id=94 x=222 y=125 width=26 height=23 xoffset=-5 yoffset=2 xadvance=15 page=0 chnl=0 +char id=44 x=248 y=125 width=19 height=23 xoffset=-5 yoffset=14 xadvance=7 page=0 chnl=0 +char id=42 x=267 y=125 width=23 height=22 xoffset=-4 yoffset=2 xadvance=12 page=0 chnl=0 +char id=39 x=290 y=125 width=19 height=20 xoffset=-5 yoffset=3 xadvance=6 page=0 chnl=0 +char id=34 x=309 y=125 width=24 height=20 xoffset=-5 yoffset=3 xadvance=11 page=0 chnl=0 +char id=126 x=333 y=125 width=26 height=19 xoffset=-5 yoffset=8 xadvance=15 page=0 chnl=0 +char id=46 x=359 y=125 width=19 height=18 xoffset=-5 yoffset=14 xadvance=7 page=0 chnl=0 +char id=96 x=378 y=125 width=19 height=18 xoffset=-6 yoffset=2 xadvance=7 page=0 chnl=0 +char id=45 x=397 y=125 width=20 height=17 xoffset=-6 yoffset=11 xadvance=7 page=0 chnl=0 +char id=95 x=417 y=125 width=26 height=15 xoffset=-6 yoffset=20 xadvance=11 page=0 chnl=0 diff --git a/desktop/resources/ego/font.png b/desktop/resources/ego/font.png index b5881930..e63bbb49 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/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index e6a4ddb8..d4394161 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -84,7 +84,7 @@ choice-count (count choices)] (-> entities (into (for [[[text] i] (map vector choices (range))] - [i (assoc (label text (style :label font (color :white))) :height 30 :x 30 :y (+ 30 (* choice-height (- choice-count i 1))) :index i)])) + [i (assoc (label text (style :label font (color 0.6 1.0 1.0 1.0))) :height 30 :x 30 :y (+ 30 (* choice-height (- choice-count i 1))) :index i)])) (assoc :state {:object nil :callback callback :choices choices :font font})))) :on-touch-up (fn [screen [entities]] @@ -102,7 +102,7 @@ :when (:object e)] (if (intersects? e [x y]) (label! e :set-style (style :label (get-in entities [:state :font]) (color :yellow))) - (label! e :set-style (style :label (get-in entities [:state :font]) (color :white)))))))) + (label! e :set-style (style :label (get-in entities [:state :font]) (color 0.6 1.0 1.0 1.0)))))))) :on-resize (fn [screen entities] (size! screen 1280 960))) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index ddc09ab6..3cebc013 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -189,6 +189,8 @@ :stand grandma-stand :squat-1 grandma-squat-1 :squat-2 grandma-squat-2 + + :talk-color (color 1.0 0.4 0.9 1.0) :origin-x 12 :origin-y 0 :scale-x 1.45 diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index a62f7294..f9001e1e 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -168,6 +168,7 @@ :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)] :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 137 :y 128 :baseline 112 :stand shopkeep-stand + :talk-color (color 0.2 1.0 0.2 1.0) :talk shopkeep-talk :script (actions/get-script entities (do-antique-dialogue entities)) :scripts {:teddy (actions/get-script entities diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 4017e5a4..e699f8a7 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -121,7 +121,7 @@ {:choices actions/something-else}]} "Why aren't you sitting and eating?" {:run #(do (actions/respond entities % :ladder-guard "I'm on duty, young sire.") - (when (not (actions/has-obtained? :ladder)) + (when (not (actions/has-obtained? entities :ladder)) (actions/do-dialogue entities :ladder-guard "Dost thou seeth this ladder?" :ladder-guard "Tis my duty to guardeth it." @@ -167,7 +167,7 @@ :right {:stand warriors-stand :talk warriors-stand} :facing :right - :talk-color (color 1.0 0.4 0.3 1.0) + :talk-color (color 1.0 0.2 0.3 1.0) :script (actions/get-script entities (do-warrior-dialogue entities) )) @@ -175,6 +175,7 @@ :ladder-guard (actions/start-animation screen (assoc (animation->texture screen ladder-guard-stand) :x 202 :y 85 :baseline 155 :stand ladder-guard-stand :talk ladder-guard-talk + :talk-color (color 0.2 0.6 1.0 1.0) :script (actions/get-script entities (do-ladder-guard-dialogue entities))) :stand) :ladder (assoc (texture "inside-cafeteria/ladder.png") :x 250 :y 85 :baseline 155 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index ed9e66e6..23efa8cc 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -206,6 +206,7 @@ (actions/do-dialogue entities :ego "Can't you give me your trophy of wisdom?" :game-player "If you want my trophy, you'll have to help me with my riddles.")))) :game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 + `:talk-color (color 1.0 0.3 0.2 1.0) :script (actions/get-script entities (do-game-player-dialogue entities)) :scripts {:wool (actions/get-script entities (walk-to-player entities) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index c6952e73..ef2f0917 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -135,7 +135,7 @@ :right {:talk wizard-talk :stand wizard-stand :disappear wizard-disappear} - :talk-color (color 0.75 0.1 1.0 1.0) + :talk-color (color 0.95 0.3 1.0 1.0) :facing :left :script (actions/get-script entities (do-wizard-dialogue entities))) :stand) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index ef3bbf1a..e000516e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -169,7 +169,9 @@ :layers [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)] :entities {:peddler (actions/start-animation screen (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil - :talk peddler-talk :stand peddler-stand) + :talk peddler-talk :stand peddler-stand + :talk-color (color 1.0 0.9 0.4 1.0)) + :stand) :steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80 :stand steer-stand @@ -184,7 +186,8 @@ (actions/play-animation entities :ego :reach) (actions/remove-item entities :grass) (actions/talk entities :ego "Eww! He slobbered on my hand.") - (actions/give entities :slobber))}) + (actions/give entities :slobber))} + ) :stand) :balloons (actions/start-animation screen (assoc (animation->texture screen balloon-stand) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index f5e9e41f..a776d551 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -164,7 +164,7 @@ :step-sound (sound "ego/step.ogg") :scale-x start-scale :scale-y start-scale - :talk-color (color 0.5 0.9 1.0 1.0) + :talk-color (color 0.6 1.0 1.0 1.0) :mouse-in? (fn [entities x y] (let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego])