diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 36b7606..c27f16e 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -227,20 +227,17 @@ {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestatlas.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"water.dat","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestbattle.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"water.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapriver.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsatlas.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestbattle.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsbattle.dat","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsbattle.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"readme.txt","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"credits.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.3.574", diff --git a/eastern flames/fonts/ft_chiaro/ft_chiaro.old.png b/eastern flames/fonts/ft_chiaro/ft_chiaro.old.png index 76cdb0d..6a17eee 100644 Binary files a/eastern flames/fonts/ft_chiaro/ft_chiaro.old.png and b/eastern flames/fonts/ft_chiaro/ft_chiaro.old.png differ diff --git a/eastern flames/fonts/ft_chiaro/ft_chiaro.old.yy b/eastern flames/fonts/ft_chiaro/ft_chiaro.old.yy index cca9bae..5e35219 100644 --- a/eastern flames/fonts/ft_chiaro/ft_chiaro.old.yy +++ b/eastern flames/fonts/ft_chiaro/ft_chiaro.old.yy @@ -22,106 +22,156 @@ "ascenderOffset": 0, "glyphs": { "32": {"x":2,"y":2,"w":5,"h":32,"character":32,"shift":5,"offset":0,}, - "33": {"x":195,"y":70,"w":5,"h":32,"character":33,"shift":6,"offset":1,}, - "34": {"x":188,"y":70,"w":5,"h":32,"character":34,"shift":6,"offset":1,}, - "35": {"x":177,"y":70,"w":9,"h":32,"character":35,"shift":10,"offset":1,}, - "36": {"x":165,"y":70,"w":10,"h":32,"character":36,"shift":10,"offset":0,}, - "37": {"x":149,"y":70,"w":14,"h":32,"character":37,"shift":16,"offset":1,}, - "38": {"x":134,"y":70,"w":13,"h":32,"character":38,"shift":13,"offset":0,}, - "39": {"x":129,"y":70,"w":3,"h":32,"character":39,"shift":5,"offset":1,}, - "40": {"x":122,"y":70,"w":5,"h":32,"character":40,"shift":6,"offset":1,}, - "41": {"x":115,"y":70,"w":5,"h":32,"character":41,"shift":6,"offset":0,}, - "42": {"x":202,"y":70,"w":6,"h":32,"character":42,"shift":8,"offset":1,}, - "43": {"x":105,"y":70,"w":8,"h":32,"character":43,"shift":10,"offset":1,}, - "44": {"x":89,"y":70,"w":3,"h":32,"character":44,"shift":5,"offset":1,}, - "45": {"x":81,"y":70,"w":6,"h":32,"character":45,"shift":6,"offset":0,}, - "46": {"x":76,"y":70,"w":3,"h":32,"character":46,"shift":5,"offset":1,}, - "47": {"x":68,"y":70,"w":6,"h":32,"character":47,"shift":6,"offset":0,}, - "48": {"x":56,"y":70,"w":10,"h":32,"character":48,"shift":10,"offset":0,}, - "49": {"x":49,"y":70,"w":5,"h":32,"character":49,"shift":10,"offset":2,}, - "50": {"x":38,"y":70,"w":9,"h":32,"character":50,"shift":10,"offset":1,}, - "51": {"x":26,"y":70,"w":10,"h":32,"character":51,"shift":10,"offset":0,}, - "52": {"x":14,"y":70,"w":10,"h":32,"character":52,"shift":10,"offset":0,}, - "53": {"x":94,"y":70,"w":9,"h":32,"character":53,"shift":10,"offset":0,}, - "54": {"x":210,"y":70,"w":10,"h":32,"character":54,"shift":10,"offset":0,}, - "55": {"x":222,"y":70,"w":10,"h":32,"character":55,"shift":10,"offset":0,}, - "56": {"x":234,"y":70,"w":10,"h":32,"character":56,"shift":10,"offset":0,}, - "57": {"x":216,"y":104,"w":10,"h":32,"character":57,"shift":10,"offset":0,}, - "58": {"x":211,"y":104,"w":3,"h":32,"character":58,"shift":5,"offset":1,}, - "59": {"x":206,"y":104,"w":3,"h":32,"character":59,"shift":5,"offset":1,}, - "60": {"x":198,"y":104,"w":6,"h":32,"character":60,"shift":10,"offset":2,}, - "61": {"x":188,"y":104,"w":8,"h":32,"character":61,"shift":10,"offset":1,}, - "62": {"x":180,"y":104,"w":6,"h":32,"character":62,"shift":10,"offset":2,}, - "63": {"x":168,"y":104,"w":10,"h":32,"character":63,"shift":10,"offset":0,}, - "64": {"x":152,"y":104,"w":14,"h":32,"character":64,"shift":14,"offset":0,}, - "65": {"x":137,"y":104,"w":13,"h":32,"character":65,"shift":11,"offset":-1,}, - "66": {"x":126,"y":104,"w":9,"h":32,"character":66,"shift":10,"offset":1,}, - "67": {"x":112,"y":104,"w":12,"h":32,"character":67,"shift":12,"offset":0,}, - "68": {"x":99,"y":104,"w":11,"h":32,"character":68,"shift":13,"offset":1,}, - "69": {"x":89,"y":104,"w":8,"h":32,"character":69,"shift":9,"offset":1,}, - "70": {"x":79,"y":104,"w":8,"h":32,"character":70,"shift":9,"offset":1,}, - "71": {"x":65,"y":104,"w":12,"h":32,"character":71,"shift":13,"offset":0,}, - "72": {"x":53,"y":104,"w":10,"h":32,"character":72,"shift":12,"offset":1,}, - "73": {"x":48,"y":104,"w":3,"h":32,"character":73,"shift":5,"offset":1,}, - "74": {"x":39,"y":104,"w":7,"h":32,"character":74,"shift":6,"offset":-2,}, - "75": {"x":27,"y":104,"w":10,"h":32,"character":75,"shift":11,"offset":1,}, - "76": {"x":17,"y":104,"w":8,"h":32,"character":76,"shift":9,"offset":1,}, - "77": {"x":2,"y":104,"w":13,"h":32,"character":77,"shift":15,"offset":1,}, - "78": {"x":2,"y":70,"w":10,"h":32,"character":78,"shift":12,"offset":1,}, - "79": {"x":231,"y":36,"w":14,"h":32,"character":79,"shift":14,"offset":0,}, - "80": {"x":220,"y":36,"w":9,"h":32,"character":80,"shift":10,"offset":1,}, - "81": {"x":238,"y":2,"w":14,"h":32,"character":81,"shift":14,"offset":0,}, - "82": {"x":219,"y":2,"w":11,"h":32,"character":82,"shift":11,"offset":1,}, - "83": {"x":207,"y":2,"w":10,"h":32,"character":83,"shift":10,"offset":0,}, - "84": {"x":195,"y":2,"w":10,"h":32,"character":84,"shift":10,"offset":0,}, - "85": {"x":183,"y":2,"w":10,"h":32,"character":85,"shift":12,"offset":1,}, - "86": {"x":169,"y":2,"w":12,"h":32,"character":86,"shift":10,"offset":-1,}, - "87": {"x":151,"y":2,"w":16,"h":32,"character":87,"shift":15,"offset":-1,}, - "88": {"x":138,"y":2,"w":11,"h":32,"character":88,"shift":10,"offset":-1,}, - "89": {"x":125,"y":2,"w":11,"h":32,"character":89,"shift":9,"offset":-1,}, - "90": {"x":113,"y":2,"w":10,"h":32,"character":90,"shift":10,"offset":0,}, - "91": {"x":232,"y":2,"w":4,"h":32,"character":91,"shift":6,"offset":2,}, - "92": {"x":105,"y":2,"w":6,"h":32,"character":92,"shift":6,"offset":0,}, - "93": {"x":89,"y":2,"w":4,"h":32,"character":93,"shift":6,"offset":0,}, - "94": {"x":79,"y":2,"w":8,"h":32,"character":94,"shift":10,"offset":1,}, - "95": {"x":69,"y":2,"w":8,"h":32,"character":95,"shift":8,"offset":0,}, - "96": {"x":63,"y":2,"w":4,"h":32,"character":96,"shift":6,"offset":1,}, - "97": {"x":52,"y":2,"w":9,"h":32,"character":97,"shift":9,"offset":0,}, - "98": {"x":42,"y":2,"w":8,"h":32,"character":98,"shift":10,"offset":1,}, - "99": {"x":31,"y":2,"w":9,"h":32,"character":99,"shift":9,"offset":0,}, - "100": {"x":20,"y":2,"w":9,"h":32,"character":100,"shift":10,"offset":0,}, - "101": {"x":9,"y":2,"w":9,"h":32,"character":101,"shift":9,"offset":0,}, - "102": {"x":95,"y":2,"w":8,"h":32,"character":102,"shift":6,"offset":0,}, - "103": {"x":2,"y":36,"w":9,"h":32,"character":103,"shift":10,"offset":0,}, - "104": {"x":105,"y":36,"w":8,"h":32,"character":104,"shift":9,"offset":1,}, - "105": {"x":13,"y":36,"w":4,"h":32,"character":105,"shift":4,"offset":0,}, - "106": {"x":202,"y":36,"w":6,"h":32,"character":106,"shift":4,"offset":-2,}, - "107": {"x":192,"y":36,"w":8,"h":32,"character":107,"shift":8,"offset":1,}, - "108": {"x":187,"y":36,"w":3,"h":32,"character":108,"shift":4,"offset":1,}, - "109": {"x":173,"y":36,"w":12,"h":32,"character":109,"shift":13,"offset":1,}, - "110": {"x":163,"y":36,"w":8,"h":32,"character":110,"shift":9,"offset":1,}, - "111": {"x":152,"y":36,"w":9,"h":32,"character":111,"shift":10,"offset":0,}, - "112": {"x":142,"y":36,"w":8,"h":32,"character":112,"shift":10,"offset":1,}, - "113": {"x":131,"y":36,"w":9,"h":32,"character":113,"shift":10,"offset":0,}, - "114": {"x":123,"y":36,"w":6,"h":32,"character":114,"shift":7,"offset":1,}, - "115": {"x":210,"y":36,"w":8,"h":32,"character":115,"shift":8,"offset":0,}, - "116": {"x":115,"y":36,"w":6,"h":32,"character":116,"shift":6,"offset":0,}, - "117": {"x":95,"y":36,"w":8,"h":32,"character":117,"shift":9,"offset":1,}, - "118": {"x":84,"y":36,"w":9,"h":32,"character":118,"shift":7,"offset":-1,}, - "119": {"x":70,"y":36,"w":12,"h":32,"character":119,"shift":11,"offset":0,}, - "120": {"x":59,"y":36,"w":9,"h":32,"character":120,"shift":7,"offset":-1,}, - "121": {"x":48,"y":36,"w":9,"h":32,"character":121,"shift":8,"offset":-1,}, - "122": {"x":38,"y":36,"w":8,"h":32,"character":122,"shift":8,"offset":0,}, - "123": {"x":31,"y":36,"w":5,"h":32,"character":123,"shift":6,"offset":1,}, - "124": {"x":26,"y":36,"w":3,"h":32,"character":124,"shift":5,"offset":1,}, - "125": {"x":19,"y":36,"w":5,"h":32,"character":125,"shift":6,"offset":0,}, - "126": {"x":228,"y":104,"w":6,"h":32,"character":126,"shift":8,"offset":1,}, - "9647": {"x":236,"y":104,"w":10,"h":32,"character":9647,"shift":16,"offset":3,}, + "33": {"x":48,"y":104,"w":5,"h":32,"character":33,"shift":6,"offset":1,}, + "34": {"x":41,"y":104,"w":5,"h":32,"character":34,"shift":6,"offset":1,}, + "35": {"x":30,"y":104,"w":9,"h":32,"character":35,"shift":10,"offset":1,}, + "36": {"x":18,"y":104,"w":10,"h":32,"character":36,"shift":10,"offset":0,}, + "37": {"x":2,"y":104,"w":14,"h":32,"character":37,"shift":16,"offset":1,}, + "38": {"x":238,"y":70,"w":13,"h":32,"character":38,"shift":13,"offset":0,}, + "39": {"x":233,"y":70,"w":3,"h":32,"character":39,"shift":5,"offset":1,}, + "40": {"x":226,"y":70,"w":5,"h":32,"character":40,"shift":6,"offset":1,}, + "41": {"x":219,"y":70,"w":5,"h":32,"character":41,"shift":6,"offset":0,}, + "42": {"x":211,"y":70,"w":6,"h":32,"character":42,"shift":8,"offset":1,}, + "43": {"x":55,"y":104,"w":8,"h":32,"character":43,"shift":10,"offset":1,}, + "44": {"x":206,"y":70,"w":3,"h":32,"character":44,"shift":5,"offset":1,}, + "45": {"x":186,"y":70,"w":6,"h":32,"character":45,"shift":6,"offset":0,}, + "46": {"x":181,"y":70,"w":3,"h":32,"character":46,"shift":5,"offset":1,}, + "47": {"x":173,"y":70,"w":6,"h":32,"character":47,"shift":6,"offset":0,}, + "48": {"x":161,"y":70,"w":10,"h":32,"character":48,"shift":10,"offset":0,}, + "49": {"x":154,"y":70,"w":5,"h":32,"character":49,"shift":10,"offset":2,}, + "50": {"x":143,"y":70,"w":9,"h":32,"character":50,"shift":10,"offset":1,}, + "51": {"x":131,"y":70,"w":10,"h":32,"character":51,"shift":10,"offset":0,}, + "52": {"x":119,"y":70,"w":10,"h":32,"character":52,"shift":10,"offset":0,}, + "53": {"x":108,"y":70,"w":9,"h":32,"character":53,"shift":10,"offset":0,}, + "54": {"x":96,"y":70,"w":10,"h":32,"character":54,"shift":10,"offset":0,}, + "55": {"x":194,"y":70,"w":10,"h":32,"character":55,"shift":10,"offset":0,}, + "56": {"x":65,"y":104,"w":10,"h":32,"character":56,"shift":10,"offset":0,}, + "57": {"x":77,"y":104,"w":10,"h":32,"character":57,"shift":10,"offset":0,}, + "58": {"x":89,"y":104,"w":3,"h":32,"character":58,"shift":5,"offset":1,}, + "59": {"x":109,"y":138,"w":3,"h":32,"character":59,"shift":5,"offset":1,}, + "60": {"x":101,"y":138,"w":6,"h":32,"character":60,"shift":10,"offset":2,}, + "61": {"x":91,"y":138,"w":8,"h":32,"character":61,"shift":10,"offset":1,}, + "62": {"x":83,"y":138,"w":6,"h":32,"character":62,"shift":10,"offset":2,}, + "63": {"x":71,"y":138,"w":10,"h":32,"character":63,"shift":10,"offset":0,}, + "64": {"x":55,"y":138,"w":14,"h":32,"character":64,"shift":14,"offset":0,}, + "65": {"x":40,"y":138,"w":13,"h":32,"character":65,"shift":11,"offset":-1,}, + "66": {"x":29,"y":138,"w":9,"h":32,"character":66,"shift":10,"offset":1,}, + "67": {"x":15,"y":138,"w":12,"h":32,"character":67,"shift":12,"offset":0,}, + "68": {"x":2,"y":138,"w":11,"h":32,"character":68,"shift":13,"offset":1,}, + "69": {"x":236,"y":104,"w":8,"h":32,"character":69,"shift":9,"offset":1,}, + "70": {"x":226,"y":104,"w":8,"h":32,"character":70,"shift":9,"offset":1,}, + "71": {"x":212,"y":104,"w":12,"h":32,"character":71,"shift":13,"offset":0,}, + "72": {"x":200,"y":104,"w":10,"h":32,"character":72,"shift":12,"offset":1,}, + "73": {"x":195,"y":104,"w":3,"h":32,"character":73,"shift":5,"offset":1,}, + "74": {"x":186,"y":104,"w":7,"h":32,"character":74,"shift":6,"offset":-2,}, + "75": {"x":174,"y":104,"w":10,"h":32,"character":75,"shift":11,"offset":1,}, + "76": {"x":164,"y":104,"w":8,"h":32,"character":76,"shift":9,"offset":1,}, + "77": {"x":149,"y":104,"w":13,"h":32,"character":77,"shift":15,"offset":1,}, + "78": {"x":137,"y":104,"w":10,"h":32,"character":78,"shift":12,"offset":1,}, + "79": {"x":121,"y":104,"w":14,"h":32,"character":79,"shift":14,"offset":0,}, + "80": {"x":110,"y":104,"w":9,"h":32,"character":80,"shift":10,"offset":1,}, + "81": {"x":94,"y":104,"w":14,"h":32,"character":81,"shift":14,"offset":0,}, + "82": {"x":83,"y":70,"w":11,"h":32,"character":82,"shift":11,"offset":1,}, + "83": {"x":114,"y":138,"w":10,"h":32,"character":83,"shift":10,"offset":0,}, + "84": {"x":71,"y":70,"w":10,"h":32,"character":84,"shift":10,"offset":0,}, + "85": {"x":41,"y":70,"w":10,"h":32,"character":85,"shift":12,"offset":1,}, + "86": {"x":219,"y":2,"w":12,"h":32,"character":86,"shift":10,"offset":-1,}, + "87": {"x":201,"y":2,"w":16,"h":32,"character":87,"shift":15,"offset":-1,}, + "88": {"x":188,"y":2,"w":11,"h":32,"character":88,"shift":10,"offset":-1,}, + "89": {"x":175,"y":2,"w":11,"h":32,"character":89,"shift":9,"offset":-1,}, + "90": {"x":163,"y":2,"w":10,"h":32,"character":90,"shift":10,"offset":0,}, + "91": {"x":157,"y":2,"w":4,"h":32,"character":91,"shift":6,"offset":2,}, + "92": {"x":149,"y":2,"w":6,"h":32,"character":92,"shift":6,"offset":0,}, + "93": {"x":143,"y":2,"w":4,"h":32,"character":93,"shift":6,"offset":0,}, + "94": {"x":133,"y":2,"w":8,"h":32,"character":94,"shift":10,"offset":1,}, + "95": {"x":123,"y":2,"w":8,"h":32,"character":95,"shift":8,"offset":0,}, + "96": {"x":233,"y":2,"w":4,"h":32,"character":96,"shift":6,"offset":1,}, + "97": {"x":112,"y":2,"w":9,"h":32,"character":97,"shift":9,"offset":0,}, + "98": {"x":97,"y":2,"w":8,"h":32,"character":98,"shift":10,"offset":1,}, + "99": {"x":86,"y":2,"w":9,"h":32,"character":99,"shift":9,"offset":0,}, + "100": {"x":75,"y":2,"w":9,"h":32,"character":100,"shift":10,"offset":0,}, + "101": {"x":64,"y":2,"w":9,"h":32,"character":101,"shift":9,"offset":0,}, + "102": {"x":54,"y":2,"w":8,"h":32,"character":102,"shift":6,"offset":0,}, + "103": {"x":43,"y":2,"w":9,"h":32,"character":103,"shift":10,"offset":0,}, + "104": {"x":33,"y":2,"w":8,"h":32,"character":104,"shift":9,"offset":1,}, + "105": {"x":27,"y":2,"w":4,"h":32,"character":105,"shift":4,"offset":0,}, + "106": {"x":19,"y":2,"w":6,"h":32,"character":106,"shift":4,"offset":-2,}, + "107": {"x":9,"y":2,"w":8,"h":32,"character":107,"shift":8,"offset":1,}, + "108": {"x":107,"y":2,"w":3,"h":32,"character":108,"shift":4,"offset":1,}, + "109": {"x":239,"y":2,"w":12,"h":32,"character":109,"shift":13,"offset":1,}, + "110": {"x":2,"y":36,"w":8,"h":32,"character":110,"shift":9,"offset":1,}, + "111": {"x":12,"y":36,"w":9,"h":32,"character":111,"shift":10,"offset":0,}, + "112": {"x":31,"y":70,"w":8,"h":32,"character":112,"shift":10,"offset":1,}, + "113": {"x":20,"y":70,"w":9,"h":32,"character":113,"shift":10,"offset":0,}, + "114": {"x":12,"y":70,"w":6,"h":32,"character":114,"shift":7,"offset":1,}, + "115": {"x":2,"y":70,"w":8,"h":32,"character":115,"shift":8,"offset":0,}, + "116": {"x":240,"y":36,"w":6,"h":32,"character":116,"shift":6,"offset":0,}, + "117": {"x":230,"y":36,"w":8,"h":32,"character":117,"shift":9,"offset":1,}, + "118": {"x":219,"y":36,"w":9,"h":32,"character":118,"shift":7,"offset":-1,}, + "119": {"x":205,"y":36,"w":12,"h":32,"character":119,"shift":11,"offset":0,}, + "120": {"x":194,"y":36,"w":9,"h":32,"character":120,"shift":7,"offset":-1,}, + "121": {"x":183,"y":36,"w":9,"h":32,"character":121,"shift":8,"offset":-1,}, + "122": {"x":173,"y":36,"w":8,"h":32,"character":122,"shift":8,"offset":0,}, + "123": {"x":166,"y":36,"w":5,"h":32,"character":123,"shift":6,"offset":1,}, + "124": {"x":161,"y":36,"w":3,"h":32,"character":124,"shift":5,"offset":1,}, + "125": {"x":154,"y":36,"w":5,"h":32,"character":125,"shift":6,"offset":0,}, + "126": {"x":146,"y":36,"w":6,"h":32,"character":126,"shift":8,"offset":1,}, + "9647": {"x":134,"y":36,"w":10,"h":32,"character":9647,"shift":16,"offset":3,}, + "12414": {"x":120,"y":36,"w":12,"h":32,"character":12414,"shift":16,"offset":2,}, + "12427": {"x":106,"y":36,"w":12,"h":32,"character":12427,"shift":16,"offset":2,}, + "12431": {"x":90,"y":36,"w":14,"h":32,"character":12431,"shift":16,"offset":1,}, + "22987": {"x":73,"y":36,"w":15,"h":32,"character":22987,"shift":16,"offset":1,}, + "26085": {"x":59,"y":36,"w":12,"h":32,"character":26085,"shift":16,"offset":2,}, + "26412": {"x":41,"y":36,"w":16,"h":32,"character":26412,"shift":16,"offset":0,}, + "32066": {"x":23,"y":36,"w":16,"h":32,"character":32066,"shift":16,"offset":0,}, + "33521": {"x":53,"y":70,"w":16,"h":32,"character":33521,"shift":16,"offset":0,}, + "35486": {"x":126,"y":138,"w":16,"h":32,"character":35486,"shift":16,"offset":0,}, }, "kerningPairs": [], "ranges": [ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, + {"lower":10240,"upper":10241,}, + {"lower":10243,"upper":10243,}, + {"lower":10247,"upper":10249,}, + {"lower":10251,"upper":10251,}, + {"lower":10255,"upper":10255,}, + {"lower":10264,"upper":10265,}, + {"lower":10267,"upper":10267,}, + {"lower":10294,"upper":10294,}, + {"lower":10296,"upper":10297,}, + {"lower":10299,"upper":10299,}, + {"lower":10303,"upper":10304,}, + {"lower":10308,"upper":10308,}, + {"lower":10310,"upper":10311,}, + {"lower":10319,"upper":10319,}, + {"lower":10335,"upper":10335,}, + {"lower":10367,"upper":10368,}, + {"lower":10400,"upper":10400,}, + {"lower":10416,"upper":10416,}, + {"lower":10424,"upper":10425,}, + {"lower":10427,"upper":10427,}, + {"lower":10431,"upper":10432,}, + {"lower":10436,"upper":10436,}, + {"lower":10438,"upper":10439,}, + {"lower":10464,"upper":10464,}, + {"lower":10468,"upper":10468,}, + {"lower":10470,"upper":10471,}, + {"lower":10479,"upper":10480,}, + {"lower":10484,"upper":10484,}, + {"lower":10486,"upper":10489,}, + {"lower":10492,"upper":10495,}, + {"lower":12414,"upper":12414,}, + {"lower":12427,"upper":12427,}, + {"lower":12431,"upper":12431,}, + {"lower":22987,"upper":22987,}, + {"lower":26085,"upper":26085,}, + {"lower":26412,"upper":26412,}, + {"lower":32066,"upper":32066,}, + {"lower":33521,"upper":33521,}, + {"lower":35486,"upper":35486,}, + {"lower":55357,"upper":55357,}, + {"lower":56628,"upper":56628,}, ], "regenerateBitmap": false, "canGenerateBitmap": true, diff --git a/eastern flames/fonts/ft_chiaro/ft_chiaro.png b/eastern flames/fonts/ft_chiaro/ft_chiaro.png index 6a17eee..2ee5bd5 100644 Binary files a/eastern flames/fonts/ft_chiaro/ft_chiaro.png and b/eastern flames/fonts/ft_chiaro/ft_chiaro.png differ diff --git a/eastern flames/fonts/ft_chiaro/ft_chiaro.yy b/eastern flames/fonts/ft_chiaro/ft_chiaro.yy index 5e35219..612a3b1 100644 --- a/eastern flames/fonts/ft_chiaro/ft_chiaro.yy +++ b/eastern flames/fonts/ft_chiaro/ft_chiaro.yy @@ -22,114 +22,303 @@ "ascenderOffset": 0, "glyphs": { "32": {"x":2,"y":2,"w":5,"h":32,"character":32,"shift":5,"offset":0,}, - "33": {"x":48,"y":104,"w":5,"h":32,"character":33,"shift":6,"offset":1,}, - "34": {"x":41,"y":104,"w":5,"h":32,"character":34,"shift":6,"offset":1,}, - "35": {"x":30,"y":104,"w":9,"h":32,"character":35,"shift":10,"offset":1,}, - "36": {"x":18,"y":104,"w":10,"h":32,"character":36,"shift":10,"offset":0,}, - "37": {"x":2,"y":104,"w":14,"h":32,"character":37,"shift":16,"offset":1,}, - "38": {"x":238,"y":70,"w":13,"h":32,"character":38,"shift":13,"offset":0,}, - "39": {"x":233,"y":70,"w":3,"h":32,"character":39,"shift":5,"offset":1,}, - "40": {"x":226,"y":70,"w":5,"h":32,"character":40,"shift":6,"offset":1,}, - "41": {"x":219,"y":70,"w":5,"h":32,"character":41,"shift":6,"offset":0,}, - "42": {"x":211,"y":70,"w":6,"h":32,"character":42,"shift":8,"offset":1,}, - "43": {"x":55,"y":104,"w":8,"h":32,"character":43,"shift":10,"offset":1,}, - "44": {"x":206,"y":70,"w":3,"h":32,"character":44,"shift":5,"offset":1,}, - "45": {"x":186,"y":70,"w":6,"h":32,"character":45,"shift":6,"offset":0,}, - "46": {"x":181,"y":70,"w":3,"h":32,"character":46,"shift":5,"offset":1,}, - "47": {"x":173,"y":70,"w":6,"h":32,"character":47,"shift":6,"offset":0,}, - "48": {"x":161,"y":70,"w":10,"h":32,"character":48,"shift":10,"offset":0,}, - "49": {"x":154,"y":70,"w":5,"h":32,"character":49,"shift":10,"offset":2,}, - "50": {"x":143,"y":70,"w":9,"h":32,"character":50,"shift":10,"offset":1,}, - "51": {"x":131,"y":70,"w":10,"h":32,"character":51,"shift":10,"offset":0,}, - "52": {"x":119,"y":70,"w":10,"h":32,"character":52,"shift":10,"offset":0,}, - "53": {"x":108,"y":70,"w":9,"h":32,"character":53,"shift":10,"offset":0,}, - "54": {"x":96,"y":70,"w":10,"h":32,"character":54,"shift":10,"offset":0,}, - "55": {"x":194,"y":70,"w":10,"h":32,"character":55,"shift":10,"offset":0,}, - "56": {"x":65,"y":104,"w":10,"h":32,"character":56,"shift":10,"offset":0,}, - "57": {"x":77,"y":104,"w":10,"h":32,"character":57,"shift":10,"offset":0,}, - "58": {"x":89,"y":104,"w":3,"h":32,"character":58,"shift":5,"offset":1,}, - "59": {"x":109,"y":138,"w":3,"h":32,"character":59,"shift":5,"offset":1,}, - "60": {"x":101,"y":138,"w":6,"h":32,"character":60,"shift":10,"offset":2,}, - "61": {"x":91,"y":138,"w":8,"h":32,"character":61,"shift":10,"offset":1,}, - "62": {"x":83,"y":138,"w":6,"h":32,"character":62,"shift":10,"offset":2,}, - "63": {"x":71,"y":138,"w":10,"h":32,"character":63,"shift":10,"offset":0,}, - "64": {"x":55,"y":138,"w":14,"h":32,"character":64,"shift":14,"offset":0,}, - "65": {"x":40,"y":138,"w":13,"h":32,"character":65,"shift":11,"offset":-1,}, - "66": {"x":29,"y":138,"w":9,"h":32,"character":66,"shift":10,"offset":1,}, - "67": {"x":15,"y":138,"w":12,"h":32,"character":67,"shift":12,"offset":0,}, - "68": {"x":2,"y":138,"w":11,"h":32,"character":68,"shift":13,"offset":1,}, - "69": {"x":236,"y":104,"w":8,"h":32,"character":69,"shift":9,"offset":1,}, - "70": {"x":226,"y":104,"w":8,"h":32,"character":70,"shift":9,"offset":1,}, - "71": {"x":212,"y":104,"w":12,"h":32,"character":71,"shift":13,"offset":0,}, - "72": {"x":200,"y":104,"w":10,"h":32,"character":72,"shift":12,"offset":1,}, - "73": {"x":195,"y":104,"w":3,"h":32,"character":73,"shift":5,"offset":1,}, - "74": {"x":186,"y":104,"w":7,"h":32,"character":74,"shift":6,"offset":-2,}, - "75": {"x":174,"y":104,"w":10,"h":32,"character":75,"shift":11,"offset":1,}, - "76": {"x":164,"y":104,"w":8,"h":32,"character":76,"shift":9,"offset":1,}, - "77": {"x":149,"y":104,"w":13,"h":32,"character":77,"shift":15,"offset":1,}, - "78": {"x":137,"y":104,"w":10,"h":32,"character":78,"shift":12,"offset":1,}, - "79": {"x":121,"y":104,"w":14,"h":32,"character":79,"shift":14,"offset":0,}, - "80": {"x":110,"y":104,"w":9,"h":32,"character":80,"shift":10,"offset":1,}, - "81": {"x":94,"y":104,"w":14,"h":32,"character":81,"shift":14,"offset":0,}, - "82": {"x":83,"y":70,"w":11,"h":32,"character":82,"shift":11,"offset":1,}, - "83": {"x":114,"y":138,"w":10,"h":32,"character":83,"shift":10,"offset":0,}, - "84": {"x":71,"y":70,"w":10,"h":32,"character":84,"shift":10,"offset":0,}, - "85": {"x":41,"y":70,"w":10,"h":32,"character":85,"shift":12,"offset":1,}, - "86": {"x":219,"y":2,"w":12,"h":32,"character":86,"shift":10,"offset":-1,}, - "87": {"x":201,"y":2,"w":16,"h":32,"character":87,"shift":15,"offset":-1,}, - "88": {"x":188,"y":2,"w":11,"h":32,"character":88,"shift":10,"offset":-1,}, - "89": {"x":175,"y":2,"w":11,"h":32,"character":89,"shift":9,"offset":-1,}, - "90": {"x":163,"y":2,"w":10,"h":32,"character":90,"shift":10,"offset":0,}, - "91": {"x":157,"y":2,"w":4,"h":32,"character":91,"shift":6,"offset":2,}, - "92": {"x":149,"y":2,"w":6,"h":32,"character":92,"shift":6,"offset":0,}, - "93": {"x":143,"y":2,"w":4,"h":32,"character":93,"shift":6,"offset":0,}, - "94": {"x":133,"y":2,"w":8,"h":32,"character":94,"shift":10,"offset":1,}, - "95": {"x":123,"y":2,"w":8,"h":32,"character":95,"shift":8,"offset":0,}, - "96": {"x":233,"y":2,"w":4,"h":32,"character":96,"shift":6,"offset":1,}, - "97": {"x":112,"y":2,"w":9,"h":32,"character":97,"shift":9,"offset":0,}, - "98": {"x":97,"y":2,"w":8,"h":32,"character":98,"shift":10,"offset":1,}, - "99": {"x":86,"y":2,"w":9,"h":32,"character":99,"shift":9,"offset":0,}, - "100": {"x":75,"y":2,"w":9,"h":32,"character":100,"shift":10,"offset":0,}, - "101": {"x":64,"y":2,"w":9,"h":32,"character":101,"shift":9,"offset":0,}, - "102": {"x":54,"y":2,"w":8,"h":32,"character":102,"shift":6,"offset":0,}, - "103": {"x":43,"y":2,"w":9,"h":32,"character":103,"shift":10,"offset":0,}, - "104": {"x":33,"y":2,"w":8,"h":32,"character":104,"shift":9,"offset":1,}, - "105": {"x":27,"y":2,"w":4,"h":32,"character":105,"shift":4,"offset":0,}, - "106": {"x":19,"y":2,"w":6,"h":32,"character":106,"shift":4,"offset":-2,}, - "107": {"x":9,"y":2,"w":8,"h":32,"character":107,"shift":8,"offset":1,}, - "108": {"x":107,"y":2,"w":3,"h":32,"character":108,"shift":4,"offset":1,}, - "109": {"x":239,"y":2,"w":12,"h":32,"character":109,"shift":13,"offset":1,}, - "110": {"x":2,"y":36,"w":8,"h":32,"character":110,"shift":9,"offset":1,}, - "111": {"x":12,"y":36,"w":9,"h":32,"character":111,"shift":10,"offset":0,}, - "112": {"x":31,"y":70,"w":8,"h":32,"character":112,"shift":10,"offset":1,}, - "113": {"x":20,"y":70,"w":9,"h":32,"character":113,"shift":10,"offset":0,}, - "114": {"x":12,"y":70,"w":6,"h":32,"character":114,"shift":7,"offset":1,}, - "115": {"x":2,"y":70,"w":8,"h":32,"character":115,"shift":8,"offset":0,}, - "116": {"x":240,"y":36,"w":6,"h":32,"character":116,"shift":6,"offset":0,}, - "117": {"x":230,"y":36,"w":8,"h":32,"character":117,"shift":9,"offset":1,}, - "118": {"x":219,"y":36,"w":9,"h":32,"character":118,"shift":7,"offset":-1,}, - "119": {"x":205,"y":36,"w":12,"h":32,"character":119,"shift":11,"offset":0,}, - "120": {"x":194,"y":36,"w":9,"h":32,"character":120,"shift":7,"offset":-1,}, - "121": {"x":183,"y":36,"w":9,"h":32,"character":121,"shift":8,"offset":-1,}, - "122": {"x":173,"y":36,"w":8,"h":32,"character":122,"shift":8,"offset":0,}, - "123": {"x":166,"y":36,"w":5,"h":32,"character":123,"shift":6,"offset":1,}, - "124": {"x":161,"y":36,"w":3,"h":32,"character":124,"shift":5,"offset":1,}, - "125": {"x":154,"y":36,"w":5,"h":32,"character":125,"shift":6,"offset":0,}, - "126": {"x":146,"y":36,"w":6,"h":32,"character":126,"shift":8,"offset":1,}, - "9647": {"x":134,"y":36,"w":10,"h":32,"character":9647,"shift":16,"offset":3,}, - "12414": {"x":120,"y":36,"w":12,"h":32,"character":12414,"shift":16,"offset":2,}, - "12427": {"x":106,"y":36,"w":12,"h":32,"character":12427,"shift":16,"offset":2,}, - "12431": {"x":90,"y":36,"w":14,"h":32,"character":12431,"shift":16,"offset":1,}, - "22987": {"x":73,"y":36,"w":15,"h":32,"character":22987,"shift":16,"offset":1,}, - "26085": {"x":59,"y":36,"w":12,"h":32,"character":26085,"shift":16,"offset":2,}, - "26412": {"x":41,"y":36,"w":16,"h":32,"character":26412,"shift":16,"offset":0,}, - "32066": {"x":23,"y":36,"w":16,"h":32,"character":32066,"shift":16,"offset":0,}, - "33521": {"x":53,"y":70,"w":16,"h":32,"character":33521,"shift":16,"offset":0,}, - "35486": {"x":126,"y":138,"w":16,"h":32,"character":35486,"shift":16,"offset":0,}, + "33": {"x":9,"y":206,"w":5,"h":32,"character":33,"shift":6,"offset":1,}, + "34": {"x":2,"y":206,"w":5,"h":32,"character":34,"shift":6,"offset":1,}, + "35": {"x":500,"y":172,"w":9,"h":32,"character":35,"shift":10,"offset":1,}, + "36": {"x":488,"y":172,"w":10,"h":32,"character":36,"shift":10,"offset":0,}, + "37": {"x":472,"y":172,"w":14,"h":32,"character":37,"shift":16,"offset":1,}, + "38": {"x":457,"y":172,"w":13,"h":32,"character":38,"shift":13,"offset":0,}, + "39": {"x":16,"y":206,"w":3,"h":32,"character":39,"shift":5,"offset":1,}, + "40": {"x":450,"y":172,"w":5,"h":32,"character":40,"shift":6,"offset":1,}, + "41": {"x":435,"y":172,"w":5,"h":32,"character":41,"shift":6,"offset":0,}, + "42": {"x":427,"y":172,"w":6,"h":32,"character":42,"shift":8,"offset":1,}, + "43": {"x":417,"y":172,"w":8,"h":32,"character":43,"shift":10,"offset":1,}, + "44": {"x":412,"y":172,"w":3,"h":32,"character":44,"shift":5,"offset":1,}, + "45": {"x":404,"y":172,"w":6,"h":32,"character":45,"shift":6,"offset":0,}, + "46": {"x":399,"y":172,"w":3,"h":32,"character":46,"shift":5,"offset":1,}, + "47": {"x":442,"y":172,"w":6,"h":32,"character":47,"shift":6,"offset":0,}, + "48": {"x":21,"y":206,"w":10,"h":32,"character":48,"shift":10,"offset":0,}, + "49": {"x":33,"y":206,"w":5,"h":32,"character":49,"shift":10,"offset":2,}, + "50": {"x":40,"y":206,"w":9,"h":32,"character":50,"shift":10,"offset":1,}, + "51": {"x":201,"y":206,"w":10,"h":32,"character":51,"shift":10,"offset":0,}, + "52": {"x":189,"y":206,"w":10,"h":32,"character":52,"shift":10,"offset":0,}, + "53": {"x":178,"y":206,"w":9,"h":32,"character":53,"shift":10,"offset":0,}, + "54": {"x":166,"y":206,"w":10,"h":32,"character":54,"shift":10,"offset":0,}, + "55": {"x":154,"y":206,"w":10,"h":32,"character":55,"shift":10,"offset":0,}, + "56": {"x":142,"y":206,"w":10,"h":32,"character":56,"shift":10,"offset":0,}, + "57": {"x":130,"y":206,"w":10,"h":32,"character":57,"shift":10,"offset":0,}, + "58": {"x":125,"y":206,"w":3,"h":32,"character":58,"shift":5,"offset":1,}, + "59": {"x":120,"y":206,"w":3,"h":32,"character":59,"shift":5,"offset":1,}, + "60": {"x":112,"y":206,"w":6,"h":32,"character":60,"shift":10,"offset":2,}, + "61": {"x":102,"y":206,"w":8,"h":32,"character":61,"shift":10,"offset":1,}, + "62": {"x":94,"y":206,"w":6,"h":32,"character":62,"shift":10,"offset":2,}, + "63": {"x":82,"y":206,"w":10,"h":32,"character":63,"shift":10,"offset":0,}, + "64": {"x":66,"y":206,"w":14,"h":32,"character":64,"shift":14,"offset":0,}, + "65": {"x":51,"y":206,"w":13,"h":32,"character":65,"shift":11,"offset":-1,}, + "66": {"x":388,"y":172,"w":9,"h":32,"character":66,"shift":10,"offset":1,}, + "67": {"x":374,"y":172,"w":12,"h":32,"character":67,"shift":12,"offset":0,}, + "68": {"x":361,"y":172,"w":11,"h":32,"character":68,"shift":13,"offset":1,}, + "69": {"x":169,"y":172,"w":8,"h":32,"character":69,"shift":9,"offset":1,}, + "70": {"x":149,"y":172,"w":8,"h":32,"character":70,"shift":9,"offset":1,}, + "71": {"x":135,"y":172,"w":12,"h":32,"character":71,"shift":13,"offset":0,}, + "72": {"x":123,"y":172,"w":10,"h":32,"character":72,"shift":12,"offset":1,}, + "73": {"x":118,"y":172,"w":3,"h":32,"character":73,"shift":5,"offset":1,}, + "74": {"x":109,"y":172,"w":7,"h":32,"character":74,"shift":6,"offset":-2,}, + "75": {"x":97,"y":172,"w":10,"h":32,"character":75,"shift":11,"offset":1,}, + "76": {"x":159,"y":172,"w":8,"h":32,"character":76,"shift":9,"offset":1,}, + "77": {"x":82,"y":172,"w":13,"h":32,"character":77,"shift":15,"offset":1,}, + "78": {"x":58,"y":172,"w":10,"h":32,"character":78,"shift":12,"offset":1,}, + "79": {"x":42,"y":172,"w":14,"h":32,"character":79,"shift":14,"offset":0,}, + "80": {"x":31,"y":172,"w":9,"h":32,"character":80,"shift":10,"offset":1,}, + "81": {"x":15,"y":172,"w":14,"h":32,"character":81,"shift":14,"offset":0,}, + "82": {"x":2,"y":172,"w":11,"h":32,"character":82,"shift":11,"offset":1,}, + "83": {"x":487,"y":138,"w":10,"h":32,"character":83,"shift":10,"offset":0,}, + "84": {"x":70,"y":172,"w":10,"h":32,"character":84,"shift":10,"offset":0,}, + "85": {"x":179,"y":172,"w":10,"h":32,"character":85,"shift":12,"offset":1,}, + "86": {"x":269,"y":172,"w":12,"h":32,"character":86,"shift":10,"offset":-1,}, + "87": {"x":191,"y":172,"w":16,"h":32,"character":87,"shift":15,"offset":-1,}, + "88": {"x":338,"y":172,"w":11,"h":32,"character":88,"shift":10,"offset":-1,}, + "89": {"x":325,"y":172,"w":11,"h":32,"character":89,"shift":9,"offset":-1,}, + "90": {"x":313,"y":172,"w":10,"h":32,"character":90,"shift":10,"offset":0,}, + "91": {"x":307,"y":172,"w":4,"h":32,"character":91,"shift":6,"offset":2,}, + "92": {"x":299,"y":172,"w":6,"h":32,"character":92,"shift":6,"offset":0,}, + "93": {"x":293,"y":172,"w":4,"h":32,"character":93,"shift":6,"offset":0,}, + "94": {"x":351,"y":172,"w":8,"h":32,"character":94,"shift":10,"offset":1,}, + "95": {"x":283,"y":172,"w":8,"h":32,"character":95,"shift":8,"offset":0,}, + "96": {"x":263,"y":172,"w":4,"h":32,"character":96,"shift":6,"offset":1,}, + "97": {"x":252,"y":172,"w":9,"h":32,"character":97,"shift":9,"offset":0,}, + "98": {"x":242,"y":172,"w":8,"h":32,"character":98,"shift":10,"offset":1,}, + "99": {"x":231,"y":172,"w":9,"h":32,"character":99,"shift":9,"offset":0,}, + "100": {"x":220,"y":172,"w":9,"h":32,"character":100,"shift":10,"offset":0,}, + "101": {"x":209,"y":172,"w":9,"h":32,"character":101,"shift":9,"offset":0,}, + "102": {"x":213,"y":206,"w":8,"h":32,"character":102,"shift":6,"offset":0,}, + "103": {"x":223,"y":206,"w":9,"h":32,"character":103,"shift":10,"offset":0,}, + "104": {"x":234,"y":206,"w":8,"h":32,"character":104,"shift":9,"offset":1,}, + "105": {"x":244,"y":206,"w":4,"h":32,"character":105,"shift":4,"offset":0,}, + "106": {"x":443,"y":240,"w":6,"h":32,"character":106,"shift":4,"offset":-2,}, + "107": {"x":433,"y":240,"w":8,"h":32,"character":107,"shift":8,"offset":1,}, + "108": {"x":428,"y":240,"w":3,"h":32,"character":108,"shift":4,"offset":1,}, + "109": {"x":414,"y":240,"w":12,"h":32,"character":109,"shift":13,"offset":1,}, + "110": {"x":404,"y":240,"w":8,"h":32,"character":110,"shift":9,"offset":1,}, + "111": {"x":393,"y":240,"w":9,"h":32,"character":111,"shift":10,"offset":0,}, + "112": {"x":451,"y":240,"w":8,"h":32,"character":112,"shift":10,"offset":1,}, + "113": {"x":382,"y":240,"w":9,"h":32,"character":113,"shift":10,"offset":0,}, + "114": {"x":363,"y":240,"w":6,"h":32,"character":114,"shift":7,"offset":1,}, + "115": {"x":353,"y":240,"w":8,"h":32,"character":115,"shift":8,"offset":0,}, + "116": {"x":345,"y":240,"w":6,"h":32,"character":116,"shift":6,"offset":0,}, + "117": {"x":335,"y":240,"w":8,"h":32,"character":117,"shift":9,"offset":1,}, + "118": {"x":324,"y":240,"w":9,"h":32,"character":118,"shift":7,"offset":-1,}, + "119": {"x":310,"y":240,"w":12,"h":32,"character":119,"shift":11,"offset":0,}, + "120": {"x":371,"y":240,"w":9,"h":32,"character":120,"shift":7,"offset":-1,}, + "121": {"x":461,"y":240,"w":9,"h":32,"character":121,"shift":8,"offset":-1,}, + "122": {"x":472,"y":240,"w":8,"h":32,"character":122,"shift":8,"offset":0,}, + "123": {"x":482,"y":240,"w":5,"h":32,"character":123,"shift":6,"offset":1,}, + "124": {"x":139,"y":274,"w":3,"h":32,"character":124,"shift":5,"offset":1,}, + "125": {"x":132,"y":274,"w":5,"h":32,"character":125,"shift":6,"offset":0,}, + "126": {"x":124,"y":274,"w":6,"h":32,"character":126,"shift":8,"offset":1,}, + "8217": {"x":119,"y":274,"w":3,"h":32,"character":8217,"shift":16,"offset":1,}, + "8230": {"x":103,"y":274,"w":14,"h":32,"character":8230,"shift":16,"offset":1,}, + "9647": {"x":91,"y":274,"w":10,"h":32,"character":9647,"shift":16,"offset":3,}, + "12288": {"x":89,"y":274,"w":0,"h":32,"character":12288,"shift":16,"offset":0,}, + "12289": {"x":81,"y":274,"w":6,"h":32,"character":12289,"shift":16,"offset":1,}, + "12290": {"x":74,"y":274,"w":5,"h":32,"character":12290,"shift":16,"offset":1,}, + "12353": {"x":62,"y":274,"w":10,"h":32,"character":12353,"shift":16,"offset":3,}, + "12354": {"x":46,"y":274,"w":14,"h":32,"character":12354,"shift":16,"offset":1,}, + "12356": {"x":31,"y":274,"w":13,"h":32,"character":12356,"shift":16,"offset":2,}, + "12358": {"x":18,"y":274,"w":11,"h":32,"character":12358,"shift":16,"offset":3,}, + "12360": {"x":2,"y":274,"w":14,"h":32,"character":12360,"shift":16,"offset":1,}, + "12362": {"x":489,"y":240,"w":14,"h":32,"character":12362,"shift":16,"offset":1,}, + "12363": {"x":293,"y":240,"w":15,"h":32,"character":12363,"shift":16,"offset":1,}, + "12364": {"x":144,"y":274,"w":15,"h":32,"character":12364,"shift":16,"offset":1,}, + "12365": {"x":278,"y":240,"w":13,"h":32,"character":12365,"shift":16,"offset":2,}, + "12366": {"x":253,"y":240,"w":13,"h":32,"character":12366,"shift":16,"offset":2,}, + "12367": {"x":448,"y":206,"w":9,"h":32,"character":12367,"shift":16,"offset":3,}, + "12368": {"x":436,"y":206,"w":10,"h":32,"character":12368,"shift":16,"offset":3,}, + "12369": {"x":420,"y":206,"w":14,"h":32,"character":12369,"shift":16,"offset":2,}, + "12371": {"x":406,"y":206,"w":12,"h":32,"character":12371,"shift":16,"offset":2,}, + "12373": {"x":391,"y":206,"w":13,"h":32,"character":12373,"shift":16,"offset":2,}, + "12375": {"x":379,"y":206,"w":10,"h":32,"character":12375,"shift":16,"offset":4,}, + "12376": {"x":459,"y":206,"w":10,"h":32,"character":12376,"shift":16,"offset":4,}, + "12377": {"x":363,"y":206,"w":14,"h":32,"character":12377,"shift":16,"offset":1,}, + "12379": {"x":331,"y":206,"w":14,"h":32,"character":12379,"shift":16,"offset":1,}, + "12380": {"x":314,"y":206,"w":15,"h":32,"character":12380,"shift":16,"offset":1,}, + "12381": {"x":298,"y":206,"w":14,"h":32,"character":12381,"shift":16,"offset":1,}, + "12382": {"x":282,"y":206,"w":14,"h":32,"character":12382,"shift":16,"offset":1,}, + "12383": {"x":266,"y":206,"w":14,"h":32,"character":12383,"shift":16,"offset":1,}, + "12384": {"x":250,"y":206,"w":14,"h":32,"character":12384,"shift":16,"offset":1,}, + "12385": {"x":347,"y":206,"w":14,"h":32,"character":12385,"shift":16,"offset":1,}, + "12387": {"x":471,"y":206,"w":11,"h":32,"character":12387,"shift":16,"offset":2,}, + "12388": {"x":484,"y":206,"w":14,"h":32,"character":12388,"shift":16,"offset":1,}, + "12390": {"x":2,"y":240,"w":14,"h":32,"character":12390,"shift":16,"offset":1,}, + "12391": {"x":237,"y":240,"w":14,"h":32,"character":12391,"shift":16,"offset":1,}, + "12392": {"x":224,"y":240,"w":11,"h":32,"character":12392,"shift":16,"offset":2,}, + "12393": {"x":209,"y":240,"w":13,"h":32,"character":12393,"shift":16,"offset":2,}, + "12394": {"x":193,"y":240,"w":14,"h":32,"character":12394,"shift":16,"offset":1,}, + "12395": {"x":178,"y":240,"w":13,"h":32,"character":12395,"shift":16,"offset":2,}, + "12396": {"x":162,"y":240,"w":14,"h":32,"character":12396,"shift":16,"offset":1,}, + "12397": {"x":145,"y":240,"w":15,"h":32,"character":12397,"shift":16,"offset":1,}, + "12398": {"x":129,"y":240,"w":14,"h":32,"character":12398,"shift":16,"offset":1,}, + "12399": {"x":114,"y":240,"w":13,"h":32,"character":12399,"shift":16,"offset":2,}, + "12400": {"x":98,"y":240,"w":14,"h":32,"character":12400,"shift":16,"offset":2,}, + "12401": {"x":82,"y":240,"w":14,"h":32,"character":12401,"shift":16,"offset":2,}, + "12403": {"x":65,"y":240,"w":15,"h":32,"character":12403,"shift":16,"offset":1,}, + "12405": {"x":49,"y":240,"w":14,"h":32,"character":12405,"shift":16,"offset":1,}, + "12408": {"x":33,"y":240,"w":14,"h":32,"character":12408,"shift":16,"offset":1,}, + "12411": {"x":18,"y":240,"w":13,"h":32,"character":12411,"shift":16,"offset":2,}, + "12414": {"x":473,"y":138,"w":12,"h":32,"character":12414,"shift":16,"offset":2,}, + "12415": {"x":457,"y":138,"w":14,"h":32,"character":12415,"shift":16,"offset":1,}, + "12417": {"x":441,"y":138,"w":14,"h":32,"character":12417,"shift":16,"offset":1,}, + "12418": {"x":153,"y":70,"w":12,"h":32,"character":12418,"shift":16,"offset":2,}, + "12419": {"x":337,"y":36,"w":11,"h":32,"character":12419,"shift":16,"offset":2,}, + "12420": {"x":321,"y":36,"w":14,"h":32,"character":12420,"shift":16,"offset":1,}, + "12423": {"x":309,"y":36,"w":10,"h":32,"character":12423,"shift":16,"offset":3,}, + "12424": {"x":294,"y":36,"w":13,"h":32,"character":12424,"shift":16,"offset":1,}, + "12425": {"x":280,"y":36,"w":12,"h":32,"character":12425,"shift":16,"offset":2,}, + "12426": {"x":268,"y":36,"w":10,"h":32,"character":12426,"shift":16,"offset":3,}, + "12427": {"x":350,"y":36,"w":12,"h":32,"character":12427,"shift":16,"offset":2,}, + "12428": {"x":251,"y":36,"w":15,"h":32,"character":12428,"shift":16,"offset":1,}, + "12429": {"x":223,"y":36,"w":12,"h":32,"character":12429,"shift":16,"offset":2,}, + "12431": {"x":207,"y":36,"w":14,"h":32,"character":12431,"shift":16,"offset":1,}, + "12434": {"x":191,"y":36,"w":14,"h":32,"character":12434,"shift":16,"offset":1,}, + "12435": {"x":174,"y":36,"w":15,"h":32,"character":12435,"shift":16,"offset":1,}, + "12450": {"x":159,"y":36,"w":13,"h":32,"character":12450,"shift":16,"offset":2,}, + "12452": {"x":145,"y":36,"w":12,"h":32,"character":12452,"shift":16,"offset":2,}, + "12454": {"x":237,"y":36,"w":12,"h":32,"character":12454,"shift":16,"offset":2,}, + "12455": {"x":364,"y":36,"w":12,"h":32,"character":12455,"shift":16,"offset":2,}, + "12460": {"x":378,"y":36,"w":15,"h":32,"character":12460,"shift":16,"offset":1,}, + "12462": {"x":395,"y":36,"w":14,"h":32,"character":12462,"shift":16,"offset":1,}, + "12463": {"x":122,"y":70,"w":13,"h":32,"character":12463,"shift":16,"offset":1,}, + "12469": {"x":106,"y":70,"w":14,"h":32,"character":12469,"shift":16,"offset":1,}, + "12473": {"x":90,"y":70,"w":14,"h":32,"character":12473,"shift":16,"offset":1,}, + "12474": {"x":73,"y":70,"w":15,"h":32,"character":12474,"shift":16,"offset":1,}, + "12481": {"x":57,"y":70,"w":14,"h":32,"character":12481,"shift":16,"offset":1,}, + "12488": {"x":46,"y":70,"w":9,"h":32,"character":12488,"shift":16,"offset":5,}, + "12489": {"x":34,"y":70,"w":10,"h":32,"character":12489,"shift":16,"offset":4,}, + "12490": {"x":18,"y":70,"w":14,"h":32,"character":12490,"shift":16,"offset":1,}, + "12495": {"x":2,"y":70,"w":14,"h":32,"character":12495,"shift":16,"offset":1,}, + "12501": {"x":493,"y":36,"w":12,"h":32,"character":12501,"shift":16,"offset":2,}, + "12522": {"x":481,"y":36,"w":10,"h":32,"character":12522,"shift":16,"offset":3,}, + "12540": {"x":465,"y":36,"w":14,"h":32,"character":12540,"shift":16,"offset":1,}, + "19968": {"x":447,"y":36,"w":16,"h":32,"character":19968,"shift":16,"offset":0,}, + "20055": {"x":429,"y":36,"w":16,"h":32,"character":20055,"shift":16,"offset":0,}, + "20107": {"x":411,"y":36,"w":16,"h":32,"character":20107,"shift":16,"offset":0,}, + "20154": {"x":127,"y":36,"w":16,"h":32,"character":20154,"shift":16,"offset":0,}, + "20170": {"x":109,"y":36,"w":16,"h":32,"character":20170,"shift":16,"offset":0,}, + "20250": {"x":91,"y":36,"w":16,"h":32,"character":20250,"shift":16,"offset":0,}, + "20303": {"x":272,"y":2,"w":16,"h":32,"character":20303,"shift":16,"offset":0,}, + "20304": {"x":236,"y":2,"w":16,"h":32,"character":20304,"shift":16,"offset":0,}, + "20309": {"x":218,"y":2,"w":16,"h":32,"character":20309,"shift":16,"offset":0,}, + "20381": {"x":200,"y":2,"w":16,"h":32,"character":20381,"shift":16,"offset":0,}, + "20405": {"x":182,"y":2,"w":16,"h":32,"character":20405,"shift":16,"offset":0,}, + "20498": {"x":165,"y":2,"w":15,"h":32,"character":20498,"shift":16,"offset":0,}, + "20986": {"x":149,"y":2,"w":14,"h":32,"character":20986,"shift":16,"offset":1,}, + "20998": {"x":254,"y":2,"w":16,"h":32,"character":20998,"shift":16,"offset":0,}, + "21069": {"x":131,"y":2,"w":16,"h":32,"character":21069,"shift":16,"offset":0,}, + "21152": {"x":96,"y":2,"w":15,"h":32,"character":21152,"shift":16,"offset":0,}, + "21161": {"x":79,"y":2,"w":15,"h":32,"character":21161,"shift":16,"offset":0,}, + "21191": {"x":62,"y":2,"w":15,"h":32,"character":21191,"shift":16,"offset":0,}, + "21205": {"x":45,"y":2,"w":15,"h":32,"character":21205,"shift":16,"offset":0,}, + "21213": {"x":27,"y":2,"w":16,"h":32,"character":21213,"shift":16,"offset":0,}, + "21442": {"x":9,"y":2,"w":16,"h":32,"character":21442,"shift":16,"offset":0,}, + "21462": {"x":113,"y":2,"w":16,"h":32,"character":21462,"shift":16,"offset":0,}, + "21531": {"x":290,"y":2,"w":16,"h":32,"character":21531,"shift":16,"offset":0,}, + "22099": {"x":429,"y":2,"w":15,"h":32,"character":22099,"shift":16,"offset":1,}, + "22269": {"x":308,"y":2,"w":14,"h":32,"character":22269,"shift":16,"offset":1,}, + "22312": {"x":56,"y":36,"w":16,"h":32,"character":22312,"shift":16,"offset":0,}, + "22580": {"x":38,"y":36,"w":16,"h":32,"character":22580,"shift":16,"offset":0,}, + "22730": {"x":20,"y":36,"w":16,"h":32,"character":22730,"shift":16,"offset":0,}, + "22763": {"x":2,"y":36,"w":16,"h":32,"character":22763,"shift":16,"offset":0,}, + "22806": {"x":482,"y":2,"w":16,"h":32,"character":22806,"shift":16,"offset":0,}, + "22818": {"x":464,"y":2,"w":16,"h":32,"character":22818,"shift":16,"offset":0,}, + "22987": {"x":74,"y":36,"w":15,"h":32,"character":22987,"shift":16,"offset":1,}, + "23019": {"x":446,"y":2,"w":16,"h":32,"character":23019,"shift":16,"offset":0,}, + "23305": {"x":411,"y":2,"w":16,"h":32,"character":23305,"shift":16,"offset":0,}, + "23376": {"x":393,"y":2,"w":16,"h":32,"character":23376,"shift":16,"offset":0,}, + "23432": {"x":375,"y":2,"w":16,"h":32,"character":23432,"shift":16,"offset":0,}, + "23558": {"x":357,"y":2,"w":16,"h":32,"character":23558,"shift":16,"offset":0,}, + "23569": {"x":340,"y":2,"w":15,"h":32,"character":23569,"shift":16,"offset":1,}, + "23665": {"x":324,"y":2,"w":14,"h":32,"character":23665,"shift":16,"offset":1,}, + "24040": {"x":137,"y":70,"w":14,"h":32,"character":24040,"shift":16,"offset":1,}, + "24112": {"x":167,"y":70,"w":16,"h":32,"character":24112,"shift":16,"offset":0,}, + "24187": {"x":424,"y":138,"w":15,"h":32,"character":24187,"shift":16,"offset":0,}, + "24341": {"x":185,"y":70,"w":13,"h":32,"character":24341,"shift":16,"offset":1,}, + "24369": {"x":72,"y":138,"w":15,"h":32,"character":24369,"shift":16,"offset":0,}, + "24375": {"x":54,"y":138,"w":16,"h":32,"character":24375,"shift":16,"offset":0,}, + "24403": {"x":38,"y":138,"w":14,"h":32,"character":24403,"shift":16,"offset":1,}, + "24453": {"x":20,"y":138,"w":16,"h":32,"character":24453,"shift":16,"offset":0,}, + "24517": {"x":2,"y":138,"w":16,"h":32,"character":24517,"shift":16,"offset":0,}, + "24746": {"x":481,"y":104,"w":16,"h":32,"character":24746,"shift":16,"offset":0,}, + "24819": {"x":89,"y":138,"w":16,"h":32,"character":24819,"shift":16,"offset":0,}, + "24931": {"x":463,"y":104,"w":16,"h":32,"character":24931,"shift":16,"offset":0,}, + "25105": {"x":431,"y":104,"w":16,"h":32,"character":25105,"shift":16,"offset":0,}, + "25126": {"x":413,"y":104,"w":16,"h":32,"character":25126,"shift":16,"offset":0,}, + "25731": {"x":395,"y":104,"w":16,"h":32,"character":25731,"shift":16,"offset":0,}, + "25915": {"x":377,"y":104,"w":16,"h":32,"character":25915,"shift":16,"offset":0,}, + "25973": {"x":359,"y":104,"w":16,"h":32,"character":25973,"shift":16,"offset":0,}, + "26053": {"x":341,"y":104,"w":16,"h":32,"character":26053,"shift":16,"offset":0,}, + "26085": {"x":449,"y":104,"w":12,"h":32,"character":26085,"shift":16,"offset":2,}, + "26376": {"x":107,"y":138,"w":14,"h":32,"character":26376,"shift":16,"offset":0,}, + "26412": {"x":123,"y":138,"w":16,"h":32,"character":26412,"shift":16,"offset":0,}, + "26469": {"x":141,"y":138,"w":16,"h":32,"character":26469,"shift":16,"offset":0,}, + "26827": {"x":406,"y":138,"w":16,"h":32,"character":26827,"shift":16,"offset":0,}, + "26907": {"x":388,"y":138,"w":16,"h":32,"character":26907,"shift":16,"offset":0,}, + "27083": {"x":370,"y":138,"w":16,"h":32,"character":27083,"shift":16,"offset":0,}, + "27231": {"x":352,"y":138,"w":16,"h":32,"character":27231,"shift":16,"offset":0,}, + "27425": {"x":334,"y":138,"w":16,"h":32,"character":27425,"shift":16,"offset":0,}, + "27442": {"x":316,"y":138,"w":16,"h":32,"character":27442,"shift":16,"offset":0,}, + "27490": {"x":298,"y":138,"w":16,"h":32,"character":27490,"shift":16,"offset":0,}, + "27515": {"x":280,"y":138,"w":16,"h":32,"character":27515,"shift":16,"offset":0,}, + "27827": {"x":262,"y":138,"w":16,"h":32,"character":27827,"shift":16,"offset":0,}, + "28023": {"x":244,"y":138,"w":16,"h":32,"character":28023,"shift":16,"offset":0,}, + "28382": {"x":226,"y":138,"w":16,"h":32,"character":28382,"shift":16,"offset":0,}, + "28528": {"x":208,"y":138,"w":16,"h":32,"character":28528,"shift":16,"offset":0,}, + "30011": {"x":190,"y":138,"w":16,"h":32,"character":30011,"shift":16,"offset":0,}, + "30053": {"x":173,"y":138,"w":15,"h":32,"character":30053,"shift":16,"offset":1,}, + "30446": {"x":159,"y":138,"w":12,"h":32,"character":30446,"shift":16,"offset":2,}, + "30452": {"x":324,"y":104,"w":15,"h":32,"character":30452,"shift":16,"offset":1,}, + "30693": {"x":307,"y":104,"w":15,"h":32,"character":30693,"shift":16,"offset":0,}, + "30772": {"x":289,"y":104,"w":16,"h":32,"character":30772,"shift":16,"offset":0,}, + "31062": {"x":463,"y":70,"w":16,"h":32,"character":31062,"shift":16,"offset":0,}, + "31169": {"x":429,"y":70,"w":16,"h":32,"character":31169,"shift":16,"offset":0,}, + "31227": {"x":411,"y":70,"w":16,"h":32,"character":31227,"shift":16,"offset":0,}, + "31461": {"x":393,"y":70,"w":16,"h":32,"character":31461,"shift":16,"offset":0,}, + "32066": {"x":375,"y":70,"w":16,"h":32,"character":32066,"shift":16,"offset":0,}, + "32210": {"x":357,"y":70,"w":16,"h":32,"character":32210,"shift":16,"offset":0,}, + "32622": {"x":340,"y":70,"w":15,"h":32,"character":32622,"shift":16,"offset":1,}, + "32722": {"x":447,"y":70,"w":14,"h":32,"character":32722,"shift":16,"offset":1,}, + "32771": {"x":322,"y":70,"w":16,"h":32,"character":32771,"shift":16,"offset":0,}, + "32773": {"x":288,"y":70,"w":16,"h":32,"character":32773,"shift":16,"offset":0,}, + "32862": {"x":272,"y":70,"w":14,"h":32,"character":32862,"shift":16,"offset":1,}, + "33521": {"x":254,"y":70,"w":16,"h":32,"character":33521,"shift":16,"offset":0,}, + "33879": {"x":236,"y":70,"w":16,"h":32,"character":33879,"shift":16,"offset":0,}, + "34892": {"x":218,"y":70,"w":16,"h":32,"character":34892,"shift":16,"offset":0,}, + "35186": {"x":200,"y":70,"w":16,"h":32,"character":35186,"shift":16,"offset":0,}, + "35201": {"x":306,"y":70,"w":14,"h":32,"character":35201,"shift":16,"offset":1,}, + "35211": {"x":481,"y":70,"w":16,"h":32,"character":35211,"shift":16,"offset":0,}, + "35328": {"x":128,"y":104,"w":16,"h":32,"character":35328,"shift":16,"offset":0,}, + "35336": {"x":2,"y":104,"w":16,"h":32,"character":35336,"shift":16,"offset":0,}, + "35352": {"x":253,"y":104,"w":16,"h":32,"character":35352,"shift":16,"offset":0,}, + "35486": {"x":235,"y":104,"w":16,"h":32,"character":35486,"shift":16,"offset":0,}, + "35504": {"x":217,"y":104,"w":16,"h":32,"character":35504,"shift":16,"offset":0,}, + "35519": {"x":200,"y":104,"w":15,"h":32,"character":35519,"shift":16,"offset":0,}, + "35548": {"x":182,"y":104,"w":16,"h":32,"character":35548,"shift":16,"offset":0,}, + "36234": {"x":164,"y":104,"w":16,"h":32,"character":36234,"shift":16,"offset":0,}, + "36817": {"x":271,"y":104,"w":16,"h":32,"character":36817,"shift":16,"offset":0,}, + "36861": {"x":146,"y":104,"w":16,"h":32,"character":36861,"shift":16,"offset":0,}, + "36949": {"x":110,"y":104,"w":16,"h":32,"character":36949,"shift":16,"offset":0,}, + "37111": {"x":92,"y":104,"w":16,"h":32,"character":37111,"shift":16,"offset":0,}, + "37197": {"x":74,"y":104,"w":16,"h":32,"character":37197,"shift":16,"offset":0,}, + "38666": {"x":56,"y":104,"w":16,"h":32,"character":38666,"shift":16,"offset":0,}, + "38754": {"x":38,"y":104,"w":16,"h":32,"character":38754,"shift":16,"offset":0,}, + "39131": {"x":20,"y":104,"w":16,"h":32,"character":39131,"shift":16,"offset":0,}, + "65281": {"x":268,"y":240,"w":8,"h":32,"character":65281,"shift":16,"offset":4,}, + "65311": {"x":161,"y":274,"w":10,"h":32,"character":65311,"shift":16,"offset":3,}, }, "kerningPairs": [], "ranges": [ {"lower":32,"upper":127,}, + {"lower":8217,"upper":8217,}, + {"lower":8230,"upper":8230,}, {"lower":9647,"upper":9647,}, {"lower":10240,"upper":10241,}, {"lower":10243,"upper":10243,}, @@ -161,17 +350,155 @@ {"lower":10484,"upper":10484,}, {"lower":10486,"upper":10489,}, {"lower":10492,"upper":10495,}, - {"lower":12414,"upper":12414,}, - {"lower":12427,"upper":12427,}, + {"lower":12288,"upper":12290,}, + {"lower":12353,"upper":12354,}, + {"lower":12356,"upper":12356,}, + {"lower":12358,"upper":12358,}, + {"lower":12360,"upper":12360,}, + {"lower":12362,"upper":12369,}, + {"lower":12371,"upper":12371,}, + {"lower":12373,"upper":12373,}, + {"lower":12375,"upper":12377,}, + {"lower":12379,"upper":12385,}, + {"lower":12387,"upper":12388,}, + {"lower":12390,"upper":12401,}, + {"lower":12403,"upper":12403,}, + {"lower":12405,"upper":12405,}, + {"lower":12408,"upper":12408,}, + {"lower":12411,"upper":12411,}, + {"lower":12414,"upper":12415,}, + {"lower":12417,"upper":12420,}, + {"lower":12423,"upper":12429,}, {"lower":12431,"upper":12431,}, + {"lower":12434,"upper":12435,}, + {"lower":12450,"upper":12450,}, + {"lower":12452,"upper":12452,}, + {"lower":12454,"upper":12455,}, + {"lower":12460,"upper":12460,}, + {"lower":12462,"upper":12463,}, + {"lower":12469,"upper":12469,}, + {"lower":12473,"upper":12474,}, + {"lower":12481,"upper":12481,}, + {"lower":12488,"upper":12490,}, + {"lower":12495,"upper":12495,}, + {"lower":12501,"upper":12501,}, + {"lower":12522,"upper":12522,}, + {"lower":12540,"upper":12540,}, + {"lower":19968,"upper":19968,}, + {"lower":20055,"upper":20055,}, + {"lower":20107,"upper":20107,}, + {"lower":20154,"upper":20154,}, + {"lower":20170,"upper":20170,}, + {"lower":20250,"upper":20250,}, + {"lower":20303,"upper":20304,}, + {"lower":20309,"upper":20309,}, + {"lower":20381,"upper":20381,}, + {"lower":20405,"upper":20405,}, + {"lower":20498,"upper":20498,}, + {"lower":20986,"upper":20986,}, + {"lower":20998,"upper":20998,}, + {"lower":21069,"upper":21069,}, + {"lower":21152,"upper":21152,}, + {"lower":21161,"upper":21161,}, + {"lower":21191,"upper":21191,}, + {"lower":21205,"upper":21205,}, + {"lower":21213,"upper":21213,}, + {"lower":21442,"upper":21442,}, + {"lower":21462,"upper":21462,}, + {"lower":21531,"upper":21531,}, + {"lower":22099,"upper":22099,}, + {"lower":22269,"upper":22269,}, + {"lower":22312,"upper":22312,}, + {"lower":22580,"upper":22580,}, + {"lower":22730,"upper":22730,}, + {"lower":22763,"upper":22763,}, + {"lower":22806,"upper":22806,}, + {"lower":22818,"upper":22818,}, {"lower":22987,"upper":22987,}, + {"lower":23019,"upper":23019,}, + {"lower":23305,"upper":23305,}, + {"lower":23376,"upper":23376,}, + {"lower":23432,"upper":23432,}, + {"lower":23558,"upper":23558,}, + {"lower":23569,"upper":23569,}, + {"lower":23665,"upper":23665,}, + {"lower":24040,"upper":24040,}, + {"lower":24112,"upper":24112,}, + {"lower":24187,"upper":24187,}, + {"lower":24341,"upper":24341,}, + {"lower":24369,"upper":24369,}, + {"lower":24375,"upper":24375,}, + {"lower":24403,"upper":24403,}, + {"lower":24453,"upper":24453,}, + {"lower":24517,"upper":24517,}, + {"lower":24746,"upper":24746,}, + {"lower":24819,"upper":24819,}, + {"lower":24931,"upper":24931,}, + {"lower":25105,"upper":25105,}, + {"lower":25126,"upper":25126,}, + {"lower":25731,"upper":25731,}, + {"lower":25915,"upper":25915,}, + {"lower":25973,"upper":25973,}, + {"lower":26053,"upper":26053,}, {"lower":26085,"upper":26085,}, + {"lower":26376,"upper":26376,}, {"lower":26412,"upper":26412,}, + {"lower":26469,"upper":26469,}, + {"lower":26827,"upper":26827,}, + {"lower":26907,"upper":26907,}, + {"lower":27083,"upper":27083,}, + {"lower":27231,"upper":27231,}, + {"lower":27425,"upper":27425,}, + {"lower":27442,"upper":27442,}, + {"lower":27490,"upper":27490,}, + {"lower":27515,"upper":27515,}, + {"lower":27827,"upper":27827,}, + {"lower":28023,"upper":28023,}, + {"lower":28382,"upper":28382,}, + {"lower":28528,"upper":28528,}, + {"lower":30011,"upper":30011,}, + {"lower":30053,"upper":30053,}, + {"lower":30446,"upper":30446,}, + {"lower":30452,"upper":30452,}, + {"lower":30693,"upper":30693,}, + {"lower":30772,"upper":30772,}, + {"lower":31062,"upper":31062,}, + {"lower":31169,"upper":31169,}, + {"lower":31227,"upper":31227,}, + {"lower":31461,"upper":31461,}, {"lower":32066,"upper":32066,}, + {"lower":32210,"upper":32210,}, + {"lower":32622,"upper":32622,}, + {"lower":32722,"upper":32722,}, + {"lower":32771,"upper":32771,}, + {"lower":32773,"upper":32773,}, + {"lower":32862,"upper":32862,}, {"lower":33521,"upper":33521,}, + {"lower":33879,"upper":33879,}, + {"lower":34892,"upper":34892,}, + {"lower":35186,"upper":35186,}, + {"lower":35201,"upper":35201,}, + {"lower":35211,"upper":35211,}, + {"lower":35328,"upper":35328,}, + {"lower":35336,"upper":35336,}, + {"lower":35352,"upper":35352,}, {"lower":35486,"upper":35486,}, + {"lower":35504,"upper":35504,}, + {"lower":35519,"upper":35519,}, + {"lower":35548,"upper":35548,}, + {"lower":36234,"upper":36234,}, + {"lower":36817,"upper":36817,}, + {"lower":36861,"upper":36861,}, + {"lower":36949,"upper":36949,}, + {"lower":37111,"upper":37111,}, + {"lower":37197,"upper":37197,}, + {"lower":38666,"upper":38666,}, + {"lower":38754,"upper":38754,}, + {"lower":39131,"upper":39131,}, {"lower":55357,"upper":55357,}, {"lower":56628,"upper":56628,}, + {"lower":65281,"upper":65281,}, + {"lower":65311,"upper":65311,}, ], "regenerateBitmap": false, "canGenerateBitmap": true, diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index c67fb71..3373715 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -1,4 +1,4 @@ -draw_set_font(ft_chiaro); + //c_addunit(un.chara, ARMY.US); //c_addunit(un.kris, ARMY.THEM); var i; @@ -56,7 +56,7 @@ models = []; //var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0); -textbox_create(txt_test); +textbox_create(txt_intro); var spr = sprite_add("./map1/mapatlas.png",0,false,false,0,0); nu Model("./map1/map1.dat", spr, u, 200, 140, u, 4, u, u, u,); setCam(); \ No newline at end of file diff --git a/eastern flames/objects/ARTICULATOR/Step_0.gml b/eastern flames/objects/ARTICULATOR/Step_0.gml index fa298f8..861433b 100644 --- a/eastern flames/objects/ARTICULATOR/Step_0.gml +++ b/eastern flames/objects/ARTICULATOR/Step_0.gml @@ -1 +1,2 @@ -state(); \ No newline at end of file +state(); +draw_set_font(ft_chiaro); \ No newline at end of file diff --git a/eastern flames/scripts/txt_aya/txt_aya.gml b/eastern flames/scripts/txt_aya/txt_aya.gml index b89f728..55c3bcb 100644 --- a/eastern flames/scripts/txt_aya/txt_aya.gml +++ b/eastern flames/scripts/txt_aya/txt_aya.gml @@ -2,15 +2,15 @@ function txt_aya() { ARTICULATOR.state = c_null; msg = msglang([ - txt("Ayaya!", AYA.SURPRISED), + txt("Ayaya!", AYA.SURPRISED, SPRITEPOS.RIGHT), txt("Stop right there!"), txt("I was flying around to try to find a scoop!", AYA.SURPRISED), - txt("What’s going on!?", AYA.SURPRISED), + txt("What's going on!?", AYA.SURPRISED), ],[ - txt("あやや！", AYA.SURPRISED), + txt("あやや！", AYA.SURPRISED, SPRITEPOS.RIGHT), txt("フリーズ！"), txt("一人で飛んで記事を見つけたかったんだよ！", AYA.SURPRISED), txt("何これ！？", AYA.SURPRISED), @@ -18,5 +18,5 @@ function txt_aya() { ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_intro/txt_intro.gml b/eastern flames/scripts/txt_intro/txt_intro.gml index b6152ee..013c869 100644 --- a/eastern flames/scripts/txt_intro/txt_intro.gml +++ b/eastern flames/scripts/txt_intro/txt_intro.gml @@ -1,26 +1,26 @@ function txt_intro() { - + ARTICULATOR.state = c_null; msg = msglang([ - txt("Checkmate!", MOMIJI.SMUG), - txt("Aw man! No matter what I do, I can’t seem to beat you!", NITORI.SHOCKED), + txt("Checkmate!", MOMIJI.SMUG, SPRITEPOS.LEFT, s_black), + txt("Aw man! No matter what I do, I can't seem to beat you!", NITORI.SHOCKED, SPRITEPOS.RIGHT), txt("Hehe! You gotta plan out a lot of your moves ahead of time in Shogi.", MOMIJI.SMUG), txt("One move leads into another, and then another, and then...", MOMIJI.HAPPY), - txt("Yeah, yeah. I don’t think I can match your wit.", NITORI.ANNOYED), + txt("Yeah, yeah. I don't think I can match your wit.", NITORI.ANNOYED), txt("Well, practice makes perfect.", MOMIJI.NEUTRAL), - txt("Why don’t we play-", MOMIJI.HAPPY), + txt("Why don't we play-", MOMIJI.HAPPY), //txt("!!! (Emphasis sound effect)", MOMIJI.ANNOYED), - txt("Someone’s coming.", MOMIJI.ANGRY), + txt("Someone's coming.", MOMIJI.ANGRY), txt("Huh?", NITORI.HAPPY), - txt("Rabbits have surrounded the Kappa’s hideout"), - txt("Lunarians!? They’ll overrun the hideout at this rate!", NITORI.SHOCKED), + //txt("Rabbits have surrounded the Kappa's hideout"), + txt("Lunarians!? They'll overrun the hideout at this rate!", NITORI.SHOCKED), txt("Not just the hideout, the entire mountain too!", MOMIJI.ANNOYED), - txt("We’ve got to stop them!", MOMIJI.ANGRY), + txt("We've got to stop them!", MOMIJI.ANGRY), ],[ - txt("つみ！", MOMIJI.SMUG), - txt("くっそー！ どうしても勝てれない！", NITORI.SHOCKED), + txt("つみ！", MOMIJI.SMUG, SPRITEPOS.LEFT), + txt("くっそー！ どうしても勝てれない！", NITORI.SHOCKED, SPRITEPOS.RIGHT), txt("うふふ！ 将棋では、たくさん計画を考えなきゃ。", MOMIJI.HAPPY), txt("一つの行動が、次の行動につながり、さらに次の行動へ...", MOMIJI.HAPPY), txt("はい、はい。私より椛の機知が強いんだ。", NITORI.ANNOYED), @@ -29,7 +29,7 @@ function txt_intro() { //txt("!!! (Emphasis sound effect)", MOMIJI.ANNOYED), txt("誰か来るぞ。", MOMIJI.ANGRY), txt("え？", NITORI.HAPPY), - txt("Rabbits have surrounded the Kappa’s hideout"), + //txt("Rabbits have surrounded the Kappa's hideout"), txt("月人！？このまま、あいつらはハイドアウトを侵略する！", NITORI.SHOCKED), txt("山も！", MOMIJI.ANNOYED), txt("我らは、月人を止められなきゃ！", MOMIJI.ANGRY), @@ -37,5 +37,5 @@ function txt_intro() { ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_momijiyaya/txt_momijiyaya.gml b/eastern flames/scripts/txt_momijiyaya/txt_momijiyaya.gml index 593f590..eb01c6b 100644 --- a/eastern flames/scripts/txt_momijiyaya/txt_momijiyaya.gml +++ b/eastern flames/scripts/txt_momijiyaya/txt_momijiyaya.gml @@ -2,19 +2,19 @@ function txt_momijiyaya() { ARTICULATOR.state = c_null; msg = msglang([ - txt("Oh great, you...", MOMIJI.ANNOYED), - txt("Hm? Aren’t you happy to see your savior?", AYA.SMUG), - txt("I don’t need you!", MOMIJI.ANGRY), - txt("Alright then, I guess I’ll just be on my way…", AYA.NOTMYPROBLEM), + txt("Oh great, you...", MOMIJI.ANNOYED, SPRITEPOS.RIGHT), + txt("Hm? Aren't you happy to see your savior?", AYA.SMUG, SPRITEPOS.RIGHT), + txt("I don't need you!", MOMIJI.ANGRY), + txt("Alright then, I guess I'll just be on my way...", AYA.NOTMYPROBLEM), txt("...Wait.", MOMIJI.UNINTERESTED), - txt("Hehe, that’s what I thought. Do you want to ask me for help?", AYA.HAPPY), - txt("Don’t push it.", MOMIJI.ANGRY), + txt("Hehe, that's what I thought. Do you want to ask me for help?", AYA.HAPPY), + txt("Don't push it.", MOMIJI.ANGRY), txt("Fiiinnne.", AYA.BORED), ],[ - txt("面倒が来た...", MOMIJI.ANNOYED), - txt("えええ？勇者に会えて嬉しくないのか？", AYA.SMUG), + txt("面倒が来た...", MOMIJI.ANNOYED, SPRITEPOS.RIGHT), + txt("えええ？勇者に会えて嬉しくないのか？", AYA.SMUG, SPRITEPOS.RIGHT), txt("お前が必要がない！", MOMIJI.ANGRY), txt("分かった！じゃあね！", AYA.NOTMYPROBLEM), txt("...待って。", MOMIJI.UNINTERESTED), @@ -25,5 +25,5 @@ function txt_momijiyaya() { ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_momijiyreisen/txt_momijiyreisen.gml b/eastern flames/scripts/txt_momijiyreisen/txt_momijiyreisen.gml index a7b318b..448f233 100644 --- a/eastern flames/scripts/txt_momijiyreisen/txt_momijiyreisen.gml +++ b/eastern flames/scripts/txt_momijiyreisen/txt_momijiyreisen.gml @@ -3,21 +3,21 @@ function txt_momijiyreisen() { ARTICULATOR.state = c_null; msg = msglang([ - txt("Are you the commander of the other side?", REISEN.WOBBLE), - txt("Uh, I just play Shogi. I don’t really command people.", MOMIJI.CONFUSED), - txt("Oh. This... This is my first day on the job. I’m a bit nervous.", REISEN.WOBBLE), + txt("Are you the commander of the other side?", REISEN.WOBBLE, SPRITEPOS.RIGHT), + txt("Uh, I just play Shogi. I don't really command people.", MOMIJI.CONFUSED, SPRITEPOS.RIGHT), + txt("Oh. This... This is my first day on the job. I'm a bit nervous.", REISEN.WOBBLE), txt("Well, the enemy arrangement gave us trouble, you certainly did a good job with that.", MOMIJI.NEUTRAL), txt("R-Really!?", REISEN.WOBBLE), txt("Yeah! Everyone was positioned very strategically.", MOMIJI.HAPPY), - txt("...But, I can’t have you stay on this mountain any longer.", MOMIJI.ANGRY), + txt("...But, I can't have you stay on this mountain any longer.", MOMIJI.ANGRY), txt("...Of course.", REISEN.POUTING), txt("Well then, this battle ends here!", REISEN.POUTING), ],[ - txt("あなたは...敵の少佐ですか？", REISEN.WOBBLE), - txt("ええ...私は将棋をできる人だけ...", MOMIJI.CONFUSED), + txt("あなたは...敵の少佐ですか？", REISEN.WOBBLE, SPRITEPOS.RIGHT), + txt("ええ...私は将棋をできる人だけ...", MOMIJI.CONFUSED, SPRITEPOS.RIGHT), txt("あ。今日は私の一日目です。ちょっと近著しています...", REISEN.WOBBLE), txt("まあぁ、君たちの配置は強かった。", MOMIJI.NEUTRAL), txt("ほ...本当！？", REISEN.WOBBLE), @@ -29,5 +29,5 @@ function txt_momijiyreisen() { ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_momijiytkn/txt_momijiytkn.gml b/eastern flames/scripts/txt_momijiytkn/txt_momijiytkn.gml index 19347c3..94c7a86 100644 --- a/eastern flames/scripts/txt_momijiytkn/txt_momijiytkn.gml +++ b/eastern flames/scripts/txt_momijiytkn/txt_momijiytkn.gml @@ -2,20 +2,20 @@ function txt_momijiytkn() { ARTICULATOR.state = c_null; msg = msglang([ - txt("Ah! I’ve been spotted!", TAKANE.SURPRISED), - txt("What are you doing here?", MOMIJI.NEUTRAL), + txt("Ah! I've been spotted!", TAKANE.SURPRISED, SPRITEPOS.RIGHT), + txt("What are you doing here?", MOMIJI.NEUTRAL, SPRITEPOS.RIGHT), txt("Well, I was keeping an eye on the River Kappa...", TAKANE.REASONING), txt("But then those rabbits showed up out of nowhere!", TAKANE.SURPRISED), txt("How am I supposed to get home now...", TAKANE.SURPRISED), - txt("There won’t be a home to go to if these rabbits have their way.", MOMIJI.ANNOYED), - txt("Why don’t you join up with us? We can fight them off together.", MOMIJI.NEUTRAL), + txt("There won't be a home to go to if these rabbits have their way.", MOMIJI.ANNOYED), + txt("Why don't you join up with us? We can fight them off together.", MOMIJI.NEUTRAL), txt("Well, it beats dying alone...", TAKANE.REASONING), ],[ - txt("しまった！見つかっちゃった！", TAKANE.SURPRISED), - txt("ここで何をしてる？", MOMIJI.NEUTRAL), + txt("しまった！見つかっちゃった！", TAKANE.SURPRISED, SPRITEPOS.RIGHT), + txt("ここで何をしてる？", MOMIJI.NEUTRAL, SPRITEPOS.RIGHT), txt("ええ、河童を見ていますが...", TAKANE.REASONING), txt("でも、びっくりにそのウサギがあわれだ！", TAKANE.SURPRISED), txt("このままで、どうすれば帰れる？", TAKANE.SURPRISED), @@ -26,5 +26,5 @@ function txt_momijiytkn() { ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_nitoriytkn/txt_nitoriytkn.gml b/eastern flames/scripts/txt_nitoriytkn/txt_nitoriytkn.gml index a19318f..3c2b081 100644 --- a/eastern flames/scripts/txt_nitoriytkn/txt_nitoriytkn.gml +++ b/eastern flames/scripts/txt_nitoriytkn/txt_nitoriytkn.gml @@ -2,21 +2,21 @@ function txt_nitoriytkn() { ARTICULATOR.state = c_null; msg = msglang([ - txt("Aaah!", TAKANE.SURPRISED), - txt("A Yamawaro! Gah, I thought we told you to stay out of our territory!", NITORI.ANGRY), - txt("Hey! You have Scouts down by our base too, don’tcha!?", TAKANE.ANGRY), - txt("T-That’s confidential!",NITORI.SHOCKED), - txt("...I guess this doesn’t matter right now!", NITORI.ANNOYED), + txt("Aaah!", TAKANE.SURPRISED, SPRITEPOS.RIGHT), + txt("A Yamawaro! Gah, I thought we told you to stay out of our territory!", NITORI.ANGRY, SPRITEPOS.RIGHT), + txt("Hey! You have Scouts down by our base too, don'tcha!?", TAKANE.ANGRY), + txt("T-That's confidential!",NITORI.SHOCKED), + txt("...I guess this doesn't matter right now!", NITORI.ANNOYED), txt("Listen, if these rabbits overrun us, both the river and mountain Kappa will be toast.", NITORI.ANNOYED), txt("Help us take them out!", NITORI.ANGRY), txt("A River Kappa and a Yamawaro side by side...", TAKANE.REASONING), - txt("Well, if it’s our only way out of this, then sure!", TAKANE.ANGRY), + txt("Well, if it's our only way out of this, then sure!", TAKANE.ANGRY), ],[ - txt("うわあああ！", TAKANE.SURPRISED), - txt("山童！？ガ！出て行くと言っただろ！", NITORI.ANGRY), + txt("うわあああ！", TAKANE.SURPRISED, SPRITEPOS.RIGHT), + txt("山童！？ガ！出て行くと言っただろ！", NITORI.ANGRY, SPRITEPOS.RIGHT), txt("ふん！河童の諜すこと、もう知っている！", TAKANE.ANGRY), txt("ち... 違う！", NITORI.SHOCKED), txt("…今、構わない！", NITORI.ANNOYED), @@ -27,5 +27,5 @@ function txt_nitoriytkn() { ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_reisen/txt_reisen.gml b/eastern flames/scripts/txt_reisen/txt_reisen.gml index 89fb1c3..f473b9f 100644 --- a/eastern flames/scripts/txt_reisen/txt_reisen.gml +++ b/eastern flames/scripts/txt_reisen/txt_reisen.gml @@ -2,17 +2,17 @@ function txt_reisen() { ARTICULATOR.state = c_null; msg = msglang([ - txt("E-Enemy spotted!", REISEN.WOBBLE), - txt("I’ll stop you here!", REISEN.POUTING), + txt("E-Enemy spotted!", REISEN.WOBBLE, SPRITEPOS.RIGHT), + txt("I'll stop you here!", REISEN.POUTING), ],[ - txt("て...敵!", REISEN.WOBBLE), + txt("て...敵!", REISEN.WOBBLE, SPRITEPOS.RIGHT), txt("止まれ！", REISEN.POUTING), ]) - endevent = c_null; + endevent = function() {ARTICULATOR.state = st_control}; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_win/txt_win.gml b/eastern flames/scripts/txt_win/txt_win.gml index a37114c..5a4d2ec 100644 --- a/eastern flames/scripts/txt_win/txt_win.gml +++ b/eastern flames/scripts/txt_win/txt_win.gml @@ -2,27 +2,27 @@ function txt_win() { ARTICULATOR.state = c_null; msg = msglang([ - txt("Ow...", REISEN.WOBBLE), - txt("Hm, You don’t seem like a bad person", MOMIJI.CONFUSED), + txt("Ow...", REISEN.WOBBLE, SPRITEPOS.RIGHT, s_black), + txt("Hm, You don't seem like a bad person", MOMIJI.CONFUSED, SPRITEPOS.LEFT), txt("Why are the rabbits attacking?", MOMIJI.CONFUSED), - txt("We... We’re looking to build a summer home on Earth.", REISEN.WOBBLE), - txt("You’re lying.", MOMIJI.ANNOYED), + txt("We... We're looking to build a summer home on Earth.", REISEN.WOBBLE), + txt("You're lying.", MOMIJI.ANNOYED), txt("...Okay, fine.", REISEN.POUTING), - txt("Lady Yorihime told me that we’re relocating to Gensokyo.", REISEN.POUTING), - txt("There’s a great evil that’s taken over the Moon.", REISEN.WOBBLE), - txt("So, we’re going to be staying here.", REISEN.WOBBLE), - txt("An invasion from the Lunar Capital...", AYA.SURPRISED), - txt("I’m guessing Reimu and her friends will find their way to the Moon…", AYA.HAPPY), + txt("Lady Yorihime told me that we're relocating to Gensokyo.", REISEN.POUTING), + txt("There's a great evil that's taken over the Moon.", REISEN.WOBBLE), + txt("So, we're going to be staying here.", REISEN.WOBBLE), + txt("An invasion from the Lunar Capital...", AYA.SURPRISED, SPRITEPOS.LEFT), + txt("I'm guessing Reimu and her friends will find their way to the Moon…", AYA.HAPPY), txt("...Which leaves us to defend the surface.", AYA.HAPPY), - txt("Think you’re up to it, miss Shogi master?", NITORI.HAPPY), - txt("...I won’t let anyone take over my home.", MOMIJI.ANGRY), - txt("Okay! Let’s drive these Lunarians out of here!", MOMIJI.DETERMINED), + txt("Think you're up to it, miss Shogi master?", NITORI.HAPPY, SPRITEPOS.LEFT), + txt("...I won't let anyone take over my home.", MOMIJI.ANGRY), + txt("Okay! Let's drive these Lunarians out of here!", MOMIJI.DETERMINED), ],[ - txt("いった...", REISEN.WOBBLE), - txt("えっと、 君は悪に見えない。", MOMIJI.CONFUSED), + txt("いった...", REISEN.WOBBLE, SPRITEPOS.RIGHT), + txt("えっと、 君は悪に見えない。", MOMIJI.CONFUSED, SPRITEPOS.LEFT), txt("なぜうさぎは攻撃しているのか？", MOMIJI,CONFUSED), txt("私たちは…海外旅行に行きたかったです...か？", REISEN.WOBBLE), txt("...それは弱い噓だぞ。", MOMIJI.ANNOYED), @@ -30,10 +30,10 @@ function txt_win() { txt("幻想郷に月人が引っ越すと依姫さまから聞きました", REISEN.POUTING), txt("巨悪が月に侵略しました。", REISEN.WOBBLE), txt("そんなわけで、私たちは移住します。", REISEN.WOBBLE), - txt("月の来襲か... ", AYA.SURPRISED), + txt("月の来襲か... ", AYA.SURPRISED, SPRITEPOS.LEFT), txt("おそらく霊夢たちは直ぐに月に行く...", AYA.HAPPY), txt("...そして、我らは幻想郷を守る。", AYA.HAPPY), - txt("棋士さん、出来る？", NITORI.HAPPY), + txt("棋士さん、出来る？", NITORI.HAPPY, SPRITEPOS.LEFT), txt("...私は誰にも祖国を乗っ取らせない。", MOMIJI.ANGRY), txt("よし！我らは月人を追い出す！", MOMIJI.DETERMINED), diff --git a/eastern flames/scripts/x_charsetup/x_charsetup.gml b/eastern flames/scripts/x_charsetup/x_charsetup.gml index 956e213..12d9ef7 100644 --- a/eastern flames/scripts/x_charsetup/x_charsetup.gml +++ b/eastern flames/scripts/x_charsetup/x_charsetup.gml @@ -58,7 +58,7 @@ var z=0; #macro MOMIJI global.textguy[?"momiji"] #macro NITORI global.textguy[?"nitori"] #macro AYA global.textguy[?"aya"] -#macro TAKANE global.textguy[?"aya"] +#macro TAKANE global.textguy[?"takane"] #macro REISEN global.textguy[?"rei'sen"] diff --git a/eastern flames/scripts/x_textstyles/x_textstyles.gml b/eastern flames/scripts/x_textstyles/x_textstyles.gml index a1ab963..e9375cb 100644 --- a/eastern flames/scripts/x_textstyles/x_textstyles.gml +++ b/eastern flames/scripts/x_textstyles/x_textstyles.gml @@ -11,14 +11,14 @@ enum TEXTTYPE { global.textdefault = { x: 320, - y: 200, + y: 260, width: 640, height: 100, spriteposx: 210, spriteposy: 190, sprite: s_spacetext, type: TEXTTYPE.ADV, - font: ft_chiaro, + font: ft_couriernew, } diff --git a/eastern flames/sprites/s_black/s_black.yy b/eastern flames/sprites/s_black/s_black.yy index cc1a1b9..e7bde6d 100644 --- a/eastern flames/sprites/s_black/s_black.yy +++ b/eastern flames/sprites/s_black/s_black.yy @@ -2,7 +2,7 @@ "bboxMode": 0, "collisionKind": 0, "type": 0, - "origin": 4, + "origin": 0, "preMultiplyAlpha": false, "edgeFiltering": false, "collisionTolerance": 0, @@ -54,8 +54,8 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 320, - "yorigin": 320, + "xorigin": 0, + "yorigin": 0, "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_black","path":"sprites/s_black/s_black.yy",},