diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index f52af47..017616d 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -29,6 +29,7 @@ {"id":{"name":"array_insert_array","path":"scripts/array_insert_array/array_insert_array.yy",},"order":5,}, {"id":{"name":"c_tiledist","path":"scripts/c_tiledist/c_tiledist.yy",},"order":24,}, {"id":{"name":"draw_percent","path":"scripts/draw_percent/draw_percent.yy",},"order":6,}, + {"id":{"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",},"order":9,}, {"id":{"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",},"order":2,}, {"id":{"name":"o_flash","path":"objects/o_flash/o_flash.yy",},"order":0,}, {"id":{"name":"tiledata","path":"scripts/tiledata/tiledata.yy",},"order":4,}, @@ -56,6 +57,7 @@ {"id":{"name":"o_screenshake","path":"objects/o_screenshake/o_screenshake.yy",},"order":0,}, {"id":{"name":"ncm","path":"scripts/ncm/ncm.yy",},"order":14,}, {"id":{"name":"txt_","path":"scripts/txt_/txt_.yy",},"order":29,}, + {"id":{"name":"ft_chiaro","path":"fonts/ft_chiaro/ft_chiaro.yy",},"order":1,}, {"id":{"name":"Model","path":"scripts/Model/Model.yy",},"order":2,}, {"id":{"name":"c_gettile","path":"scripts/c_gettile/c_gettile.yy",},"order":11,}, {"id":{"name":"sinmult","path":"scripts/sinmult/sinmult.yy",},"order":16,}, @@ -74,6 +76,7 @@ {"id":{"name":"model_transform","path":"scripts/model_transform/model_transform.yy",},"order":4,}, {"id":{"name":"song","path":"scripts/song/song.yy",},"order":1,}, {"id":{"name":"ft_couriernew","path":"fonts/ft_couriernew/ft_couriernew.yy",},"order":0,}, + {"id":{"name":"s_cursor","path":"sprites/s_cursor/s_cursor.yy",},"order":10,}, {"id":{"name":"cpp","path":"scripts/cpp/cpp.yy",},"order":1,}, {"id":{"name":"log","path":"scripts/log/log.yy",},"order":10,}, {"id":{"name":"c_fulleval","path":"scripts/c_fulleval/c_fulleval.yy",},"order":18,}, diff --git a/eastern flames/fonts/ft_chiaro/ft_chiaro.old.png b/eastern flames/fonts/ft_chiaro/ft_chiaro.old.png new file mode 100644 index 0000000..87fbfea Binary files /dev/null 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 new file mode 100644 index 0000000..add71e3 --- /dev/null +++ b/eastern flames/fonts/ft_chiaro/ft_chiaro.old.yy @@ -0,0 +1,209 @@ +{ + "hinting": 0, + "glyphOperations": 0, + "interpreter": 0, + "pointRounding": 0, + "fontName": "Arial", + "styleName": "Regular", + "size": 12.0, + "bold": false, + "italic": false, + "charset": 0, + "AntiAlias": 1, + "first": 0, + "last": 0, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "includeTTF": false, + "TTFName": "", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "ascenderOffset": 0, + "glyphs": { + "32": {"x":2,"y":2,"w":4,"h":18,"character":32,"shift":4,"offset":0,}, + "33": {"x":165,"y":42,"w":3,"h":18,"character":33,"shift":4,"offset":1,}, + "34": {"x":158,"y":42,"w":5,"h":18,"character":34,"shift":6,"offset":0,}, + "35": {"x":147,"y":42,"w":9,"h":18,"character":35,"shift":9,"offset":0,}, + "36": {"x":136,"y":42,"w":9,"h":18,"character":36,"shift":9,"offset":0,}, + "37": {"x":120,"y":42,"w":14,"h":18,"character":37,"shift":14,"offset":0,}, + "38": {"x":107,"y":42,"w":11,"h":18,"character":38,"shift":11,"offset":0,}, + "39": {"x":102,"y":42,"w":3,"h":18,"character":39,"shift":3,"offset":0,}, + "40": {"x":95,"y":42,"w":5,"h":18,"character":40,"shift":5,"offset":0,}, + "41": {"x":88,"y":42,"w":5,"h":18,"character":41,"shift":5,"offset":0,}, + "42": {"x":170,"y":42,"w":6,"h":18,"character":42,"shift":6,"offset":0,}, + "43": {"x":77,"y":42,"w":9,"h":18,"character":43,"shift":9,"offset":0,}, + "44": {"x":61,"y":42,"w":3,"h":18,"character":44,"shift":4,"offset":1,}, + "45": {"x":54,"y":42,"w":5,"h":18,"character":45,"shift":5,"offset":0,}, + "46": {"x":49,"y":42,"w":3,"h":18,"character":46,"shift":4,"offset":1,}, + "47": {"x":42,"y":42,"w":5,"h":18,"character":47,"shift":4,"offset":0,}, + "48": {"x":31,"y":42,"w":9,"h":18,"character":48,"shift":9,"offset":0,}, + "49": {"x":24,"y":42,"w":5,"h":18,"character":49,"shift":9,"offset":1,}, + "50": {"x":13,"y":42,"w":9,"h":18,"character":50,"shift":9,"offset":0,}, + "51": {"x":2,"y":42,"w":9,"h":18,"character":51,"shift":9,"offset":0,}, + "52": {"x":240,"y":22,"w":9,"h":18,"character":52,"shift":9,"offset":0,}, + "53": {"x":66,"y":42,"w":9,"h":18,"character":53,"shift":9,"offset":0,}, + "54": {"x":178,"y":42,"w":9,"h":18,"character":54,"shift":9,"offset":0,}, + "55": {"x":189,"y":42,"w":9,"h":18,"character":55,"shift":9,"offset":0,}, + "56": {"x":200,"y":42,"w":9,"h":18,"character":56,"shift":9,"offset":0,}, + "57": {"x":186,"y":62,"w":9,"h":18,"character":57,"shift":9,"offset":0,}, + "58": {"x":181,"y":62,"w":3,"h":18,"character":58,"shift":4,"offset":1,}, + "59": {"x":176,"y":62,"w":3,"h":18,"character":59,"shift":4,"offset":1,}, + "60": {"x":165,"y":62,"w":9,"h":18,"character":60,"shift":9,"offset":0,}, + "61": {"x":154,"y":62,"w":9,"h":18,"character":61,"shift":9,"offset":0,}, + "62": {"x":143,"y":62,"w":9,"h":18,"character":62,"shift":9,"offset":0,}, + "63": {"x":132,"y":62,"w":9,"h":18,"character":63,"shift":9,"offset":0,}, + "64": {"x":114,"y":62,"w":16,"h":18,"character":64,"shift":16,"offset":0,}, + "65": {"x":100,"y":62,"w":12,"h":18,"character":65,"shift":11,"offset":-1,}, + "66": {"x":89,"y":62,"w":9,"h":18,"character":66,"shift":11,"offset":1,}, + "67": {"x":76,"y":62,"w":11,"h":18,"character":67,"shift":12,"offset":0,}, + "68": {"x":64,"y":62,"w":10,"h":18,"character":68,"shift":12,"offset":1,}, + "69": {"x":53,"y":62,"w":9,"h":18,"character":69,"shift":11,"offset":1,}, + "70": {"x":42,"y":62,"w":9,"h":18,"character":70,"shift":10,"offset":1,}, + "71": {"x":28,"y":62,"w":12,"h":18,"character":71,"shift":12,"offset":0,}, + "72": {"x":16,"y":62,"w":10,"h":18,"character":72,"shift":12,"offset":1,}, + "73": {"x":11,"y":62,"w":3,"h":18,"character":73,"shift":4,"offset":1,}, + "74": {"x":2,"y":62,"w":7,"h":18,"character":74,"shift":8,"offset":0,}, + "75": {"x":235,"y":42,"w":10,"h":18,"character":75,"shift":11,"offset":1,}, + "76": {"x":225,"y":42,"w":8,"h":18,"character":76,"shift":9,"offset":1,}, + "77": {"x":211,"y":42,"w":12,"h":18,"character":77,"shift":13,"offset":1,}, + "78": {"x":228,"y":22,"w":10,"h":18,"character":78,"shift":12,"offset":1,}, + "79": {"x":214,"y":22,"w":12,"h":18,"character":79,"shift":12,"offset":0,}, + "80": {"x":203,"y":22,"w":9,"h":18,"character":80,"shift":11,"offset":1,}, + "81": {"x":232,"y":2,"w":12,"h":18,"character":81,"shift":12,"offset":0,}, + "82": {"x":213,"y":2,"w":11,"h":18,"character":82,"shift":12,"offset":1,}, + "83": {"x":201,"y":2,"w":10,"h":18,"character":83,"shift":11,"offset":0,}, + "84": {"x":189,"y":2,"w":10,"h":18,"character":84,"shift":10,"offset":0,}, + "85": {"x":177,"y":2,"w":10,"h":18,"character":85,"shift":12,"offset":1,}, + "86": {"x":164,"y":2,"w":11,"h":18,"character":86,"shift":11,"offset":0,}, + "87": {"x":147,"y":2,"w":15,"h":18,"character":87,"shift":15,"offset":0,}, + "88": {"x":134,"y":2,"w":11,"h":18,"character":88,"shift":11,"offset":0,}, + "89": {"x":121,"y":2,"w":11,"h":18,"character":89,"shift":11,"offset":0,}, + "90": {"x":109,"y":2,"w":10,"h":18,"character":90,"shift":10,"offset":0,}, + "91": {"x":226,"y":2,"w":4,"h":18,"character":91,"shift":4,"offset":1,}, + "92": {"x":102,"y":2,"w":5,"h":18,"character":92,"shift":4,"offset":0,}, + "93": {"x":89,"y":2,"w":4,"h":18,"character":93,"shift":4,"offset":0,}, + "94": {"x":79,"y":2,"w":8,"h":18,"character":94,"shift":8,"offset":0,}, + "95": {"x":66,"y":2,"w":11,"h":18,"character":95,"shift":9,"offset":-1,}, + "96": {"x":60,"y":2,"w":4,"h":18,"character":96,"shift":5,"offset":0,}, + "97": {"x":49,"y":2,"w":9,"h":18,"character":97,"shift":9,"offset":0,}, + "98": {"x":39,"y":2,"w":8,"h":18,"character":98,"shift":9,"offset":1,}, + "99": {"x":29,"y":2,"w":8,"h":18,"character":99,"shift":8,"offset":0,}, + "100": {"x":19,"y":2,"w":8,"h":18,"character":100,"shift":9,"offset":0,}, + "101": {"x":8,"y":2,"w":9,"h":18,"character":101,"shift":9,"offset":0,}, + "102": {"x":95,"y":2,"w":5,"h":18,"character":102,"shift":4,"offset":0,}, + "103": {"x":2,"y":22,"w":8,"h":18,"character":103,"shift":9,"offset":0,}, + "104": {"x":97,"y":22,"w":7,"h":18,"character":104,"shift":9,"offset":1,}, + "105": {"x":12,"y":22,"w":2,"h":18,"character":105,"shift":4,"offset":1,}, + "106": {"x":187,"y":22,"w":4,"h":18,"character":106,"shift":4,"offset":-1,}, + "107": {"x":178,"y":22,"w":7,"h":18,"character":107,"shift":8,"offset":1,}, + "108": {"x":174,"y":22,"w":2,"h":18,"character":108,"shift":4,"offset":1,}, + "109": {"x":160,"y":22,"w":12,"h":18,"character":109,"shift":13,"offset":1,}, + "110": {"x":151,"y":22,"w":7,"h":18,"character":110,"shift":9,"offset":1,}, + "111": {"x":140,"y":22,"w":9,"h":18,"character":111,"shift":9,"offset":0,}, + "112": {"x":130,"y":22,"w":8,"h":18,"character":112,"shift":9,"offset":1,}, + "113": {"x":120,"y":22,"w":8,"h":18,"character":113,"shift":9,"offset":0,}, + "114": {"x":113,"y":22,"w":5,"h":18,"character":114,"shift":5,"offset":1,}, + "115": {"x":193,"y":22,"w":8,"h":18,"character":115,"shift":8,"offset":0,}, + "116": {"x":106,"y":22,"w":5,"h":18,"character":116,"shift":4,"offset":0,}, + "117": {"x":88,"y":22,"w":7,"h":18,"character":117,"shift":9,"offset":1,}, + "118": {"x":78,"y":22,"w":8,"h":18,"character":118,"shift":8,"offset":0,}, + "119": {"x":64,"y":22,"w":12,"h":18,"character":119,"shift":12,"offset":0,}, + "120": {"x":54,"y":22,"w":8,"h":18,"character":120,"shift":8,"offset":0,}, + "121": {"x":44,"y":22,"w":8,"h":18,"character":121,"shift":8,"offset":0,}, + "122": {"x":34,"y":22,"w":8,"h":18,"character":122,"shift":8,"offset":0,}, + "123": {"x":27,"y":22,"w":5,"h":18,"character":123,"shift":5,"offset":0,}, + "124": {"x":23,"y":22,"w":2,"h":18,"character":124,"shift":4,"offset":1,}, + "125": {"x":16,"y":22,"w":5,"h":18,"character":125,"shift":5,"offset":0,}, + "126": {"x":197,"y":62,"w":9,"h":18,"character":126,"shift":9,"offset":0,}, + "9647": {"x":208,"y":62,"w":10,"h":18,"character":9647,"shift":16,"offset":3,}, + }, + "kerningPairs": [ + {"first":32,"second":65,"amount":-1,}, + {"first":32,"second":902,"amount":-1,}, + {"first":32,"second":913,"amount":-1,}, + {"first":32,"second":916,"amount":-1,}, + {"first":32,"second":923,"amount":-1,}, + {"first":49,"second":49,"amount":-1,}, + {"first":65,"second":32,"amount":-1,}, + {"first":65,"second":84,"amount":-1,}, + {"first":65,"second":86,"amount":-1,}, + {"first":65,"second":89,"amount":-1,}, + {"first":65,"second":160,"amount":-1,}, + {"first":65,"second":8217,"amount":-1,}, + {"first":70,"second":44,"amount":-1,}, + {"first":70,"second":46,"amount":-1,}, + {"first":70,"second":65,"amount":-1,}, + {"first":76,"second":84,"amount":-1,}, + {"first":76,"second":86,"amount":-1,}, + {"first":76,"second":87,"amount":-1,}, + {"first":76,"second":89,"amount":-1,}, + {"first":76,"second":8217,"amount":-1,}, + {"first":80,"second":44,"amount":-1,}, + {"first":80,"second":46,"amount":-1,}, + {"first":80,"second":65,"amount":-1,}, + {"first":84,"second":44,"amount":-1,}, + {"first":84,"second":45,"amount":-1,}, + {"first":84,"second":46,"amount":-1,}, + {"first":84,"second":58,"amount":-1,}, + {"first":84,"second":59,"amount":-1,}, + {"first":84,"second":65,"amount":-1,}, + {"first":84,"second":97,"amount":-1,}, + {"first":84,"second":99,"amount":-1,}, + {"first":84,"second":101,"amount":-1,}, + {"first":84,"second":111,"amount":-1,}, + {"first":84,"second":115,"amount":-1,}, + {"first":84,"second":119,"amount":-1,}, + {"first":84,"second":121,"amount":-1,}, + {"first":84,"second":173,"amount":-1,}, + {"first":84,"second":894,"amount":-1,}, + {"first":86,"second":44,"amount":-1,}, + {"first":86,"second":45,"amount":-1,}, + {"first":86,"second":46,"amount":-1,}, + {"first":86,"second":65,"amount":-1,}, + {"first":86,"second":97,"amount":-1,}, + {"first":86,"second":101,"amount":-1,}, + {"first":86,"second":111,"amount":-1,}, + {"first":86,"second":173,"amount":-1,}, + {"first":87,"second":44,"amount":-1,}, + {"first":87,"second":46,"amount":-1,}, + {"first":89,"second":44,"amount":-1,}, + {"first":89,"second":45,"amount":-1,}, + {"first":89,"second":46,"amount":-1,}, + {"first":89,"second":58,"amount":-1,}, + {"first":89,"second":59,"amount":-1,}, + {"first":89,"second":65,"amount":-1,}, + {"first":89,"second":97,"amount":-1,}, + {"first":89,"second":101,"amount":-1,}, + {"first":89,"second":111,"amount":-1,}, + {"first":89,"second":112,"amount":-1,}, + {"first":89,"second":113,"amount":-1,}, + {"first":89,"second":117,"amount":-1,}, + {"first":89,"second":118,"amount":-1,}, + {"first":89,"second":173,"amount":-1,}, + {"first":89,"second":894,"amount":-1,}, + {"first":114,"second":44,"amount":-1,}, + {"first":114,"second":46,"amount":-1,}, + {"first":118,"second":44,"amount":-1,}, + {"first":118,"second":46,"amount":-1,}, + {"first":119,"second":44,"amount":-1,}, + {"first":119,"second":46,"amount":-1,}, + {"first":121,"second":44,"amount":-1,}, + {"first":121,"second":46,"amount":-1,}, + ], + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "canGenerateBitmap": true, + "maintainGms1Font": false, + "parent": { + "name": "Fonts", + "path": "folders/Fonts.yy", + }, + "resourceVersion": "1.0", + "name": "ft_chiaro", + "tags": [], + "resourceType": "GMFont", +} \ No newline at end of file diff --git a/eastern flames/fonts/ft_chiaro/ft_chiaro.png b/eastern flames/fonts/ft_chiaro/ft_chiaro.png new file mode 100644 index 0000000..76cdb0d Binary files /dev/null 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 new file mode 100644 index 0000000..cca9bae --- /dev/null +++ b/eastern flames/fonts/ft_chiaro/ft_chiaro.yy @@ -0,0 +1,137 @@ +{ + "hinting": 0, + "glyphOperations": 0, + "interpreter": 0, + "pointRounding": 0, + "fontName": "FOT-キアロ Std B", + "styleName": "B", + "size": 12.0, + "bold": false, + "italic": false, + "charset": 0, + "AntiAlias": 1, + "first": 0, + "last": 0, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "includeTTF": false, + "TTFName": "", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "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,}, + }, + "kerningPairs": [], + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "canGenerateBitmap": true, + "maintainGms1Font": false, + "parent": { + "name": "Fonts", + "path": "folders/Fonts.yy", + }, + "resourceVersion": "1.0", + "name": "ft_chiaro", + "tags": [], + "resourceType": "GMFont", +} \ No newline at end of file diff --git a/eastern flames/objects/ARTICULATOR/ARTICULATOR.yy b/eastern flames/objects/ARTICULATOR/ARTICULATOR.yy index 79f59ad..9b1a8a4 100644 --- a/eastern flames/objects/ARTICULATOR/ARTICULATOR.yy +++ b/eastern flames/objects/ARTICULATOR/ARTICULATOR.yy @@ -22,6 +22,7 @@ {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":72,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":73,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/eastern flames/objects/ARTICULATOR/Draw_64.gml b/eastern flames/objects/ARTICULATOR/Draw_64.gml index 614c54e..33a072a 100644 --- a/eastern flames/objects/ARTICULATOR/Draw_64.gml +++ b/eastern flames/objects/ARTICULATOR/Draw_64.gml @@ -1,4 +1,5 @@ if hoveredunit != noone { + draw_set_font(ft_chiaro); draw_set_color(c_black); draw_rectangle(global.gw, global.gh, global.gw-140, global.gh-(array_length(hoveredunit.inventory)-1)*32-16, false); draw_set_color(c_white); diff --git a/eastern flames/objects/ARTICULATOR/Draw_72.gml b/eastern flames/objects/ARTICULATOR/Draw_72.gml index 7da52fd..b27f661 100644 --- a/eastern flames/objects/ARTICULATOR/Draw_72.gml +++ b/eastern flames/objects/ARTICULATOR/Draw_72.gml @@ -6,6 +6,8 @@ setCam(); draw_set_color(c_black); draw_rectangle(-9999, -9999, 9999, 9999, false); drawModels(); +matrix_set(matrix_world,matrix_build_identity()) +//setCam(); var i, j, k; for (i=0; i mov*ts.x { - if !stop { - x += hspd*ts.x; - y += vspd*ts.y; - } - while !remainingmov { - hspd = 0; + + //while !remainingmov { + /*hspd = 0; vspd = 0; - x = linear_approach(x, returnpos.x*ts.x+16, 1); - y = linear_approach(y, returnpos.y*ts.y+16, 1); + x = linear_approach(x, returnpos.x*ts.x, 1); + y = linear_approach(y, returnpos.y*ts.y, 1); log(x, returnpos.x*ts.x); log(y, returnpos.y*ts.y); var remainingmov = mov+1 - ( abs(x+hspd-16-returnpos.x*ts.x)/ts.x + abs(y+vspd-16-returnpos.y*ts.y)/ts.y - ); + );*/ //log("oob, " + string(remainingmov)); /*} else { log("not oob!");*/ + //} + var dude = c_gettile(x+hspd+abs(sprite_width)/4, y+vspd, true); + if dude != noone { + var dist = c_tiledist(dude.x, dude.y, returnpos.x, returnpos.y); + if dist.x + dist.y <= data.mov.val && dude.passable { + pos.x = dude.x; + pos.y = dude.y; + if !stop { + x += hspd*ts.x; + y += vspd*ts.y; + } + } else { + x -= hspd*ts.x; + y -= vspd*ts.y; + x = linear_approach(x, returnpos.x*ts.x+abs(sprite_width)/4, 1); + y = linear_approach(y, returnpos.y*ts.y, 1); + } + } else { + x -= hspd*ts.x; + y -= vspd*ts.y; + x = linear_approach(x, returnpos.x*ts.x+abs(sprite_width)/4, 1); + y = linear_approach(y, returnpos.y*ts.y, 1); } - var dude = c_gettile(x, y, true); - pos.x = dude.x; - pos.y = dude.y; - prevremainingmov = remainingmov; + //prevremainingmov = remainingmov; c_decolor_all(c_red); c_decolor_all(c_green); var guy = c_gettile(pos.x, pos.y); @@ -97,7 +115,7 @@ function st_moving() { c_moveunit(id, c_gettile(returnpos.x, returnpos.y)); c_deselectunit(id); } - if dir == DIR.NONE && select { + if dir == DIR.NONE && select && stop && ARTICULATOR.hoveredunit == id{ c_moveunit(id, c_gettile(x, y, true)); waiting = true; c_deselectunit(id); diff --git a/eastern flames/scripts/tiledata/tiledata.gml b/eastern flames/scripts/tiledata/tiledata.gml index c128afd..8e1a711 100644 --- a/eastern flames/scripts/tiledata/tiledata.gml +++ b/eastern flames/scripts/tiledata/tiledata.gml @@ -1,5 +1,5 @@ -var forest123456 = function() {return new tiledata(u, u, [c_lime], [new statmod(st.def, 5, add)])} -var block1234567 = function() {return new tiledata(false, u, [c_black])} +var forest123456 = function() {return new tiledata(u, u, [], [new statmod(st.def, 5, add)])} +var block1234567 = function() {return new tiledata(false, u, [])} global.map = c_mapgen([ [block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], [block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], diff --git a/eastern flames/sprites/s_cursor/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e.png b/eastern flames/sprites/s_cursor/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e.png new file mode 100644 index 0000000..184e3fa Binary files /dev/null and b/eastern flames/sprites/s_cursor/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e.png differ diff --git a/eastern flames/sprites/s_cursor/layers/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e/03b3d9cd-70c8-4101-9291-2e442b29c2b5.png b/eastern flames/sprites/s_cursor/layers/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e/03b3d9cd-70c8-4101-9291-2e442b29c2b5.png new file mode 100644 index 0000000..184e3fa Binary files /dev/null and b/eastern flames/sprites/s_cursor/layers/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e/03b3d9cd-70c8-4101-9291-2e442b29c2b5.png differ diff --git a/eastern flames/sprites/s_cursor/s_cursor.yy b/eastern flames/sprites/s_cursor/s_cursor.yy new file mode 100644 index 0000000..207a252 --- /dev/null +++ b/eastern flames/sprites/s_cursor/s_cursor.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 0, + "type": 0, + "origin": 6, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bbox_bottom": 6, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 1, + "height": 7, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursor/s_cursor.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursor/s_cursor.yy",},"LayerId":{"name":"03b3d9cd-70c8-4101-9291-2e442b29c2b5","path":"sprites/s_cursor/s_cursor.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_cursor","path":"sprites/s_cursor/s_cursor.yy",},"resourceVersion":"1.0","name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_cursor","path":"sprites/s_cursor/s_cursor.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"1fa1047f-3043-4cf3-904e-ec45de4d11cf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursor/s_cursor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 7, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_cursor","path":"sprites/s_cursor/s_cursor.yy",}, + "resourceVersion": "1.3", + "name": "s_cursor", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"03b3d9cd-70c8-4101-9291-2e442b29c2b5","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "s_cursor", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/eastern flames/sprites/s_cursor/s_cursorup.yy b/eastern flames/sprites/s_cursor/s_cursorup.yy new file mode 100644 index 0000000..6a5103e --- /dev/null +++ b/eastern flames/sprites/s_cursor/s_cursorup.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 0, + "type": 0, + "origin": 3, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bbox_bottom": 6, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 1, + "height": 7, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursorup/s_cursorup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursorup/s_cursorup.yy",},"LayerId":{"name":"03b3d9cd-70c8-4101-9291-2e442b29c2b5","path":"sprites/s_cursorup/s_cursorup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",},"resourceVersion":"1.0","name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"78e27135-493b-41c3-844b-907a199a5546","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursorup/s_cursorup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 3, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",}, + "resourceVersion": "1.3", + "name": "s_cursorup", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"03b3d9cd-70c8-4101-9291-2e442b29c2b5","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "s_cursorup", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/eastern flames/sprites/s_cursorup/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e.png b/eastern flames/sprites/s_cursorup/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e.png new file mode 100644 index 0000000..8e3a68a Binary files /dev/null and b/eastern flames/sprites/s_cursorup/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e.png differ diff --git a/eastern flames/sprites/s_cursorup/layers/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e/03b3d9cd-70c8-4101-9291-2e442b29c2b5.png b/eastern flames/sprites/s_cursorup/layers/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e/03b3d9cd-70c8-4101-9291-2e442b29c2b5.png new file mode 100644 index 0000000..8e3a68a Binary files /dev/null and b/eastern flames/sprites/s_cursorup/layers/622a1997-8b2f-4a3a-9f7d-5d6300d97e2e/03b3d9cd-70c8-4101-9291-2e442b29c2b5.png differ diff --git a/eastern flames/sprites/s_cursorup/s_cursorup.yy b/eastern flames/sprites/s_cursorup/s_cursorup.yy new file mode 100644 index 0000000..a1f2e85 --- /dev/null +++ b/eastern flames/sprites/s_cursorup/s_cursorup.yy @@ -0,0 +1,103 @@ +{ + "bboxMode": 0, + "collisionKind": 0, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 19, + "bbox_top": 0, + "bbox_bottom": 19, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 20, + "height": 20, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursorup/s_cursorup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursorup/s_cursorup.yy",},"LayerId":{"name":"03b3d9cd-70c8-4101-9291-2e442b29c2b5","path":"sprites/s_cursorup/s_cursorup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",},"resourceVersion":"1.0","name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"78e27135-493b-41c3-844b-907a199a5546","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"622a1997-8b2f-4a3a-9f7d-5d6300d97e2e","path":"sprites/s_cursorup/s_cursorup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 10, + "yorigin": 10, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",}, + "resourceVersion": "1.3", + "name": "s_cursorup", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"03b3d9cd-70c8-4101-9291-2e442b29c2b5","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": { + "left": 7, + "top": 7, + "right": 7, + "bottom": 7, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "enabled": false, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "resourceVersion": "1.0", + "loadedVersion": null, + "resourceType": "GMNineSliceData", + }, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "s_cursorup", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file