diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 803e09f..017616d 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -7,6 +7,7 @@ {"id":{"name":"array_sum","path":"scripts/array_sum/array_sum.yy",},"order":7,}, {"id":{"name":"c_doenemyai","path":"scripts/c_doenemyai/c_doenemyai.yy",},"order":23,}, {"id":{"name":"clampneg","path":"scripts/clampneg/clampneg.yy",},"order":8,}, + {"id":{"name":"x_charsetup","path":"scripts/x_charsetup/x_charsetup.yy",},"order":10,}, {"id":{"name":"array_remove","path":"scripts/array_remove/array_remove.yy",},"order":6,}, {"id":{"name":"lerp_angle","path":"scripts/lerp_angle/lerp_angle.yy",},"order":9,}, {"id":{"name":"s_reisen","path":"sprites/s_reisen/s_reisen.yy",},"order":0,}, @@ -16,21 +17,28 @@ {"id":{"name":"x_unitsetup","path":"scripts/x_unitsetup/x_unitsetup.yy",},"order":0,}, {"id":{"name":"x_skillstuff","path":"scripts/x_skillstuff/x_skillstuff.yy",},"order":12,}, {"id":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"order":1,}, + {"id":{"name":"st_textadv","path":"scripts/st_textadv/st_textadv.yy",},"order":6,}, {"id":{"name":"c_decolor","path":"scripts/c_decolor/c_decolor.yy",},"order":10,}, + {"id":{"name":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.yy",},"order":8,}, + {"id":{"name":"c_errorstring","path":"scripts/c_errorstring/c_errorstring.yy",},"order":31,}, {"id":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"order":0,}, {"id":{"name":"easing","path":"scripts/easing/easing.yy",},"order":4,}, {"id":{"name":"bint_sort","path":"scripts/bint_sort/bint_sort.yy",},"order":0,}, + {"id":{"name":"st_enemyturn","path":"scripts/st_enemyturn/st_enemyturn.yy",},"order":28,}, {"id":{"name":"vec2","path":"scripts/vec2/vec2.yy",},"order":0,}, {"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,}, + {"id":{"name":"c_txtspecial","path":"scripts/c_txtspecial/c_txtspecial.yy",},"order":2,}, {"id":{"name":"deep_copy","path":"scripts/deep_copy/deep_copy.yy",},"order":10,}, {"id":{"name":"utils","path":"scripts/utils/utils.yy",},"order":19,}, {"id":{"name":"rescale","path":"scripts/rescale/rescale.yy",},"order":16,}, {"id":{"name":"draw_settings","path":"scripts/draw_settings/draw_settings.yy",},"order":3,}, + {"id":{"name":"txt","path":"scripts/txt/txt.yy",},"order":9,}, {"id":{"name":"draw_circle_curve","path":"scripts/draw_circle_curve/draw_circle_curve.yy",},"order":2,}, {"id":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"order":2,}, {"id":{"name":"camera_reset","path":"scripts/camera_reset/camera_reset.yy",},"order":0,}, @@ -41,10 +49,15 @@ {"id":{"name":"gcd","path":"scripts/gcd/gcd.yy",},"order":5,}, {"id":{"name":"string_extend_digits","path":"scripts/string_extend_digits/string_extend_digits.yy",},"order":18,}, {"id":{"name":"s_reisendown","path":"sprites/s_reisendown/s_reisendown.yy",},"order":2,}, + {"id":{"name":"c_charpush","path":"scripts/c_charpush/c_charpush.yy",},"order":1,}, + {"id":{"name":"chardata","path":"scripts/chardata/chardata.yy",},"order":3,}, {"id":{"name":"music_set","path":"scripts/music_set/music_set.yy",},"order":0,}, {"id":{"name":"format_time","path":"scripts/format_time/format_time.yy",},"order":12,}, + {"id":{"name":"textbox_create","path":"scripts/textbox_create/textbox_create.yy",},"order":26,}, {"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,}, @@ -54,18 +67,25 @@ {"id":{"name":"is_prime","path":"scripts/is_prime/is_prime.yy",},"order":14,}, {"id":{"name":"weapon","path":"scripts/weapon/weapon.yy",},"order":15,}, {"id":{"name":"KROMER_scrip","path":"scripts/KROMER_scrip/KROMER_scrip.yy",},"order":0,}, + {"id":{"name":"st_textnvl","path":"scripts/st_textnvl/st_textnvl.yy",},"order":7,}, {"id":{"name":"is_oob","path":"scripts/is_oob/is_oob.yy",},"order":7,}, {"id":{"name":"linear_approach","path":"scripts/linear_approach/linear_approach.yy",},"order":18,}, {"id":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"order":1,}, {"id":{"name":"array_contains","path":"scripts/array_contains/array_contains.yy",},"order":0,}, + {"id":{"name":"x_textstyles","path":"scripts/x_textstyles/x_textstyles.yy",},"order":11,}, {"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,}, {"id":{"name":"keyboard_check_advanced","path":"scripts/keyboard_check_advanced/keyboard_check_advanced.yy",},"order":8,}, + {"id":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"order":6,}, {"id":{"name":"collision_line_width","path":"scripts/collision_line_width/collision_line_width.yy",},"order":9,}, {"id":{"name":"draw_rectangle_width","path":"scripts/draw_rectangle_width/draw_rectangle_width.yy",},"order":7,}, + {"id":{"name":"msglang","path":"scripts/msglang/msglang.yy",},"order":4,}, + {"id":{"name":"lb_auto","path":"scripts/lb_auto/lb_auto.yy",},"order":32,}, {"id":{"name":"x_units","path":"scripts/x_units/x_units.yy",},"order":19,}, {"id":{"name":"c_2dto3d","path":"scripts/c_2dto3d/c_2dto3d.yy",},"order":20,}, {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":1,}, @@ -73,6 +93,7 @@ {"id":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"order":0,}, {"id":{"name":"dir2hv","path":"scripts/dir2hv/dir2hv.yy",},"order":2,}, {"id":{"name":"s_null","path":"sprites/s_null/s_null.yy",},"order":4,}, + {"id":{"name":"se_null","path":"sounds/se_null/se_null.yy",},"order":0,}, {"id":{"name":"tag","path":"scripts/tag/tag.yy",},"order":6,}, {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},"order":6,}, {"id":{"name":"c_selectunit","path":"scripts/c_selectunit/c_selectunit.yy",},"order":9,}, @@ -82,15 +103,19 @@ {"id":{"name":"unit","path":"scripts/unit/unit.yy",},"order":2,}, {"id":{"name":"c_moveunit","path":"scripts/c_moveunit/c_moveunit.yy",},"order":17,}, {"id":{"name":"se_play","path":"scripts/se_play/se_play.yy",},"order":5,}, - {"id":{"name":"msglang","path":"scripts/msglang/msglang.yy",},"order":15,}, {"id":{"name":"array_front","path":"scripts/array_front/array_front.yy",},"order":2,}, {"id":{"name":"model_load","path":"scripts/model_load/model_load.yy",},"order":3,}, {"id":{"name":"with_array","path":"scripts/with_array/with_array.yy",},"order":17,}, {"id":{"name":"matrux_transpose","path":"scripts/matrux_transpose/matrux_transpose.yy",},"order":1,}, {"id":{"name":"point_me","path":"scripts/point_me/point_me.yy",},"order":15,}, + {"id":{"name":"c_badpractice","path":"scripts/c_badpractice/c_badpractice.yy",},"order":0,}, {"id":{"name":"draw_hitbox","path":"scripts/draw_hitbox/draw_hitbox.yy",},"order":4,}, + {"id":{"name":"textline_next","path":"scripts/textline_next/textline_next.yy",},"order":8,}, {"id":{"name":"ARTICULATOR","path":"objects/ARTICULATOR/ARTICULATOR.yy",},"order":0,}, + {"id":{"name":"txt_test","path":"scripts/txt_test/txt_test.yy",},"order":30,}, {"id":{"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",},"order":0,}, + {"id":{"name":"o_textbox","path":"objects/o_textbox/o_textbox.yy",},"order":5,}, + {"id":{"name":"st_control","path":"scripts/st_control/st_control.yy",},"order":27,}, {"id":{"name":"draw_outline","path":"scripts/draw_outline/draw_outline.yy",},"order":5,}, {"id":{"name":"distabs","path":"scripts/distabs/distabs.yy",},"order":11,}, {"id":{"name":"nam","path":"scripts/nam/nam.yy",},"order":13,}, @@ -103,7 +128,7 @@ {"id":{"name":"c_passableeval","path":"scripts/c_passableeval/c_passableeval.yy",},"order":25,}, {"id":{"name":"st_moving","path":"scripts/st_moving/st_moving.yy",},"order":7,}, {"id":{"name":"c_deleteunit","path":"scripts/c_deleteunit/c_deleteunit.yy",},"order":22,}, - {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,}, + {"id":{"name":"da_game","path":"rooms/da_game/da_game.yy",},"order":0,}, ], "Options": [ {"name":"Linux","path":"options/linux/options_linux.yy",}, @@ -119,7 +144,7 @@ "children": [], }, "RoomOrderNodes": [ - {"roomId":{"name":"Room1","path":"rooms/Room1/Room1.yy",},}, + {"roomId":{"name":"da_game","path":"rooms/da_game/da_game.yy",},}, ], "Folders": [ {"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",}, @@ -143,6 +168,8 @@ {"folderPath":"folders/Sprites/wabbit.yy","order":3,"resourceVersion":"1.0","name":"wabbit","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Scripts/3d.yy","order":19,"resourceVersion":"1.0","name":"3d","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/rei'sen.yy","order":5,"resourceVersion":"1.0","name":"rei'sen","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Fonts.yy","order":8,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Textbox.yy","order":9,"resourceVersion":"1.0","name":"Textbox","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, 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/fonts/ft_couriernew/ft_calibri.old.png b/eastern flames/fonts/ft_couriernew/ft_calibri.old.png new file mode 100644 index 0000000..56a6299 Binary files /dev/null and b/eastern flames/fonts/ft_couriernew/ft_calibri.old.png differ diff --git a/eastern flames/fonts/ft_couriernew/ft_calibri.old.yy b/eastern flames/fonts/ft_couriernew/ft_calibri.old.yy new file mode 100644 index 0000000..f39ce68 --- /dev/null +++ b/eastern flames/fonts/ft_couriernew/ft_calibri.old.yy @@ -0,0 +1,200 @@ +{ + "hinting": 0, + "glyphOperations": 0, + "interpreter": 0, + "pointRounding": 0, + "fontName": "Calibri", + "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":20,"character":32,"shift":4,"offset":0,}, + "33": {"x":18,"y":46,"w":1,"h":20,"character":33,"shift":5,"offset":2,}, + "34": {"x":12,"y":46,"w":4,"h":20,"character":34,"shift":6,"offset":1,}, + "35": {"x":2,"y":46,"w":8,"h":20,"character":35,"shift":8,"offset":0,}, + "36": {"x":243,"y":24,"w":6,"h":20,"character":36,"shift":8,"offset":1,}, + "37": {"x":231,"y":24,"w":10,"h":20,"character":37,"shift":11,"offset":0,}, + "38": {"x":220,"y":24,"w":9,"h":20,"character":38,"shift":11,"offset":1,}, + "39": {"x":217,"y":24,"w":1,"h":20,"character":39,"shift":4,"offset":1,}, + "40": {"x":212,"y":24,"w":3,"h":20,"character":40,"shift":5,"offset":1,}, + "41": {"x":207,"y":24,"w":3,"h":20,"character":41,"shift":5,"offset":1,}, + "42": {"x":21,"y":46,"w":5,"h":20,"character":42,"shift":8,"offset":1,}, + "43": {"x":198,"y":24,"w":7,"h":20,"character":43,"shift":8,"offset":0,}, + "44": {"x":186,"y":24,"w":2,"h":20,"character":44,"shift":4,"offset":0,}, + "45": {"x":181,"y":24,"w":3,"h":20,"character":45,"shift":5,"offset":1,}, + "46": {"x":178,"y":24,"w":1,"h":20,"character":46,"shift":4,"offset":1,}, + "47": {"x":170,"y":24,"w":6,"h":20,"character":47,"shift":6,"offset":0,}, + "48": {"x":162,"y":24,"w":6,"h":20,"character":48,"shift":8,"offset":1,}, + "49": {"x":155,"y":24,"w":5,"h":20,"character":49,"shift":8,"offset":2,}, + "50": {"x":147,"y":24,"w":6,"h":20,"character":50,"shift":8,"offset":1,}, + "51": {"x":139,"y":24,"w":6,"h":20,"character":51,"shift":8,"offset":1,}, + "52": {"x":131,"y":24,"w":6,"h":20,"character":52,"shift":8,"offset":1,}, + "53": {"x":190,"y":24,"w":6,"h":20,"character":53,"shift":8,"offset":1,}, + "54": {"x":28,"y":46,"w":6,"h":20,"character":54,"shift":8,"offset":1,}, + "55": {"x":36,"y":46,"w":6,"h":20,"character":55,"shift":8,"offset":1,}, + "56": {"x":44,"y":46,"w":6,"h":20,"character":56,"shift":8,"offset":1,}, + "57": {"x":218,"y":46,"w":6,"h":20,"character":57,"shift":8,"offset":1,}, + "58": {"x":215,"y":46,"w":1,"h":20,"character":58,"shift":4,"offset":1,}, + "59": {"x":211,"y":46,"w":2,"h":20,"character":59,"shift":4,"offset":0,}, + "60": {"x":203,"y":46,"w":6,"h":20,"character":60,"shift":8,"offset":1,}, + "61": {"x":194,"y":46,"w":7,"h":20,"character":61,"shift":8,"offset":0,}, + "62": {"x":186,"y":46,"w":6,"h":20,"character":62,"shift":8,"offset":1,}, + "63": {"x":179,"y":46,"w":5,"h":20,"character":63,"shift":7,"offset":1,}, + "64": {"x":165,"y":46,"w":12,"h":20,"character":64,"shift":14,"offset":1,}, + "65": {"x":154,"y":46,"w":9,"h":20,"character":65,"shift":9,"offset":0,}, + "66": {"x":145,"y":46,"w":7,"h":20,"character":66,"shift":9,"offset":1,}, + "67": {"x":135,"y":46,"w":8,"h":20,"character":67,"shift":9,"offset":1,}, + "68": {"x":125,"y":46,"w":8,"h":20,"character":68,"shift":10,"offset":1,}, + "69": {"x":117,"y":46,"w":6,"h":20,"character":69,"shift":8,"offset":1,}, + "70": {"x":110,"y":46,"w":5,"h":20,"character":70,"shift":7,"offset":1,}, + "71": {"x":100,"y":46,"w":8,"h":20,"character":71,"shift":10,"offset":1,}, + "72": {"x":90,"y":46,"w":8,"h":20,"character":72,"shift":10,"offset":1,}, + "73": {"x":87,"y":46,"w":1,"h":20,"character":73,"shift":4,"offset":1,}, + "74": {"x":81,"y":46,"w":4,"h":20,"character":74,"shift":5,"offset":0,}, + "75": {"x":73,"y":46,"w":6,"h":20,"character":75,"shift":8,"offset":1,}, + "76": {"x":65,"y":46,"w":6,"h":20,"character":76,"shift":7,"offset":1,}, + "77": {"x":52,"y":46,"w":11,"h":20,"character":77,"shift":13,"offset":1,}, + "78": {"x":121,"y":24,"w":8,"h":20,"character":78,"shift":10,"offset":1,}, + "79": {"x":110,"y":24,"w":9,"h":20,"character":79,"shift":11,"offset":1,}, + "80": {"x":102,"y":24,"w":6,"h":20,"character":80,"shift":8,"offset":1,}, + "81": {"x":182,"y":2,"w":10,"h":20,"character":81,"shift":11,"offset":1,}, + "82": {"x":168,"y":2,"w":7,"h":20,"character":82,"shift":9,"offset":1,}, + "83": {"x":161,"y":2,"w":5,"h":20,"character":83,"shift":7,"offset":1,}, + "84": {"x":152,"y":2,"w":7,"h":20,"character":84,"shift":8,"offset":0,}, + "85": {"x":142,"y":2,"w":8,"h":20,"character":85,"shift":10,"offset":1,}, + "86": {"x":131,"y":2,"w":9,"h":20,"character":86,"shift":9,"offset":0,}, + "87": {"x":118,"y":2,"w":11,"h":20,"character":87,"shift":14,"offset":1,}, + "88": {"x":108,"y":2,"w":8,"h":20,"character":88,"shift":8,"offset":0,}, + "89": {"x":99,"y":2,"w":7,"h":20,"character":89,"shift":8,"offset":0,}, + "90": {"x":90,"y":2,"w":7,"h":20,"character":90,"shift":8,"offset":0,}, + "91": {"x":177,"y":2,"w":3,"h":20,"character":91,"shift":5,"offset":1,}, + "92": {"x":82,"y":2,"w":6,"h":20,"character":92,"shift":6,"offset":0,}, + "93": {"x":71,"y":2,"w":3,"h":20,"character":93,"shift":5,"offset":1,}, + "94": {"x":62,"y":2,"w":7,"h":20,"character":94,"shift":8,"offset":0,}, + "95": {"x":52,"y":2,"w":8,"h":20,"character":95,"shift":8,"offset":0,}, + "96": {"x":47,"y":2,"w":3,"h":20,"character":96,"shift":5,"offset":1,}, + "97": {"x":39,"y":2,"w":6,"h":20,"character":97,"shift":8,"offset":1,}, + "98": {"x":31,"y":2,"w":6,"h":20,"character":98,"shift":8,"offset":1,}, + "99": {"x":24,"y":2,"w":5,"h":20,"character":99,"shift":7,"offset":1,}, + "100": {"x":16,"y":2,"w":6,"h":20,"character":100,"shift":8,"offset":1,}, + "101": {"x":8,"y":2,"w":6,"h":20,"character":101,"shift":8,"offset":1,}, + "102": {"x":76,"y":2,"w":4,"h":20,"character":102,"shift":5,"offset":0,}, + "103": {"x":194,"y":2,"w":7,"h":20,"character":103,"shift":8,"offset":1,}, + "104": {"x":17,"y":24,"w":6,"h":20,"character":104,"shift":8,"offset":1,}, + "105": {"x":203,"y":2,"w":1,"h":20,"character":105,"shift":4,"offset":1,}, + "106": {"x":90,"y":24,"w":3,"h":20,"character":106,"shift":4,"offset":-1,}, + "107": {"x":83,"y":24,"w":5,"h":20,"character":107,"shift":7,"offset":1,}, + "108": {"x":80,"y":24,"w":1,"h":20,"character":108,"shift":4,"offset":1,}, + "109": {"x":69,"y":24,"w":9,"h":20,"character":109,"shift":12,"offset":1,}, + "110": {"x":61,"y":24,"w":6,"h":20,"character":110,"shift":8,"offset":1,}, + "111": {"x":53,"y":24,"w":6,"h":20,"character":111,"shift":8,"offset":1,}, + "112": {"x":45,"y":24,"w":6,"h":20,"character":112,"shift":8,"offset":1,}, + "113": {"x":37,"y":24,"w":6,"h":20,"character":113,"shift":8,"offset":1,}, + "114": {"x":31,"y":24,"w":4,"h":20,"character":114,"shift":5,"offset":1,}, + "115": {"x":95,"y":24,"w":5,"h":20,"character":115,"shift":7,"offset":1,}, + "116": {"x":25,"y":24,"w":4,"h":20,"character":116,"shift":5,"offset":0,}, + "117": {"x":9,"y":24,"w":6,"h":20,"character":117,"shift":8,"offset":1,}, + "118": {"x":2,"y":24,"w":5,"h":20,"character":118,"shift":7,"offset":1,}, + "119": {"x":241,"y":2,"w":10,"h":20,"character":119,"shift":11,"offset":0,}, + "120": {"x":234,"y":2,"w":5,"h":20,"character":120,"shift":7,"offset":1,}, + "121": {"x":227,"y":2,"w":5,"h":20,"character":121,"shift":7,"offset":1,}, + "122": {"x":221,"y":2,"w":4,"h":20,"character":122,"shift":6,"offset":1,}, + "123": {"x":215,"y":2,"w":4,"h":20,"character":123,"shift":5,"offset":1,}, + "124": {"x":212,"y":2,"w":1,"h":20,"character":124,"shift":7,"offset":3,}, + "125": {"x":206,"y":2,"w":4,"h":20,"character":125,"shift":5,"offset":0,}, + "126": {"x":226,"y":46,"w":7,"h":20,"character":126,"shift":8,"offset":0,}, + "9647": {"x":235,"y":46,"w":10,"h":20,"character":9647,"shift":16,"offset":3,}, + }, + "kerningPairs": [ + {"first":65,"second":84,"amount":-1,}, + {"first":65,"second":89,"amount":-1,}, + {"first":65,"second":221,"amount":-1,}, + {"first":65,"second":356,"amount":-1,}, + {"first":65,"second":374,"amount":-1,}, + {"first":65,"second":376,"amount":-1,}, + {"first":65,"second":538,"amount":-1,}, + {"first":65,"second":7922,"amount":-1,}, + {"first":65,"second":7924,"amount":-1,}, + {"first":65,"second":7926,"amount":-1,}, + {"first":65,"second":7928,"amount":-1,}, + {"first":65,"second":8216,"amount":-1,}, + {"first":65,"second":8220,"amount":-1,}, + {"first":70,"second":44,"amount":-1,}, + {"first":70,"second":46,"amount":-1,}, + {"first":70,"second":65,"amount":-1,}, + {"first":70,"second":74,"amount":-1,}, + {"first":70,"second":192,"amount":-1,}, + {"first":70,"second":193,"amount":-1,}, + {"first":70,"second":194,"amount":-1,}, + {"first":70,"second":195,"amount":-1,}, + {"first":70,"second":196,"amount":-1,}, + {"first":70,"second":197,"amount":-1,}, + {"first":70,"second":256,"amount":-1,}, + {"first":70,"second":258,"amount":-1,}, + {"first":70,"second":260,"amount":-1,}, + {"first":70,"second":308,"amount":-1,}, + {"first":70,"second":506,"amount":-1,}, + {"first":70,"second":7840,"amount":-1,}, + {"first":70,"second":7842,"amount":-1,}, + {"first":70,"second":7844,"amount":-1,}, + {"first":70,"second":7846,"amount":-1,}, + {"first":70,"second":7848,"amount":-1,}, + {"first":70,"second":7850,"amount":-1,}, + {"first":70,"second":7852,"amount":-1,}, + {"first":70,"second":7854,"amount":-1,}, + {"first":70,"second":7856,"amount":-1,}, + {"first":70,"second":7858,"amount":-1,}, + {"first":70,"second":7860,"amount":-1,}, + {"first":70,"second":7862,"amount":-1,}, + {"first":75,"second":118,"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":221,"amount":-1,}, + {"first":76,"second":356,"amount":-1,}, + {"first":76,"second":372,"amount":-1,}, + {"first":76,"second":374,"amount":-1,}, + {"first":76,"second":376,"amount":-1,}, + {"first":76,"second":538,"amount":-1,}, + {"first":76,"second":7808,"amount":-1,}, + {"first":76,"second":7810,"amount":-1,}, + {"first":76,"second":7812,"amount":-1,}, + {"first":76,"second":7922,"amount":-1,}, + {"first":76,"second":7924,"amount":-1,}, + {"first":76,"second":7926,"amount":-1,}, + {"first":76,"second":7928,"amount":-1,}, + {"first":76,"second":8216,"amount":-1,}, + {"first":76,"second":8217,"amount":-1,}, + {"first":76,"second":8220,"amount":-1,}, + {"first":76,"second":8221,"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_calibri", + "tags": [], + "resourceType": "GMFont", +} \ No newline at end of file diff --git a/eastern flames/fonts/ft_couriernew/ft_couriernew.png b/eastern flames/fonts/ft_couriernew/ft_couriernew.png new file mode 100644 index 0000000..6e93170 Binary files /dev/null and b/eastern flames/fonts/ft_couriernew/ft_couriernew.png differ diff --git a/eastern flames/fonts/ft_couriernew/ft_couriernew.yy b/eastern flames/fonts/ft_couriernew/ft_couriernew.yy new file mode 100644 index 0000000..395c0fc --- /dev/null +++ b/eastern flames/fonts/ft_couriernew/ft_couriernew.yy @@ -0,0 +1,137 @@ +{ + "hinting": 0, + "glyphOperations": 0, + "interpreter": 0, + "pointRounding": 0, + "fontName": "Courier New", + "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":10,"h":18,"character":32,"shift":10,"offset":0,}, + "33": {"x":152,"y":42,"w":3,"h":18,"character":33,"shift":10,"offset":3,}, + "34": {"x":144,"y":42,"w":6,"h":18,"character":34,"shift":10,"offset":2,}, + "35": {"x":134,"y":42,"w":8,"h":18,"character":35,"shift":10,"offset":1,}, + "36": {"x":125,"y":42,"w":7,"h":18,"character":36,"shift":10,"offset":1,}, + "37": {"x":115,"y":42,"w":8,"h":18,"character":37,"shift":10,"offset":1,}, + "38": {"x":106,"y":42,"w":7,"h":18,"character":38,"shift":10,"offset":1,}, + "39": {"x":101,"y":42,"w":3,"h":18,"character":39,"shift":10,"offset":3,}, + "40": {"x":95,"y":42,"w":4,"h":18,"character":40,"shift":10,"offset":4,}, + "41": {"x":90,"y":42,"w":3,"h":18,"character":41,"shift":10,"offset":2,}, + "42": {"x":157,"y":42,"w":7,"h":18,"character":42,"shift":10,"offset":1,}, + "43": {"x":80,"y":42,"w":8,"h":18,"character":43,"shift":10,"offset":1,}, + "44": {"x":64,"y":42,"w":4,"h":18,"character":44,"shift":10,"offset":2,}, + "45": {"x":54,"y":42,"w":8,"h":18,"character":45,"shift":10,"offset":1,}, + "46": {"x":48,"y":42,"w":4,"h":18,"character":46,"shift":10,"offset":3,}, + "47": {"x":39,"y":42,"w":7,"h":18,"character":47,"shift":10,"offset":1,}, + "48": {"x":30,"y":42,"w":7,"h":18,"character":48,"shift":10,"offset":1,}, + "49": {"x":21,"y":42,"w":7,"h":18,"character":49,"shift":10,"offset":1,}, + "50": {"x":12,"y":42,"w":7,"h":18,"character":50,"shift":10,"offset":1,}, + "51": {"x":2,"y":42,"w":8,"h":18,"character":51,"shift":10,"offset":1,}, + "52": {"x":241,"y":22,"w":7,"h":18,"character":52,"shift":10,"offset":1,}, + "53": {"x":70,"y":42,"w":8,"h":18,"character":53,"shift":10,"offset":1,}, + "54": {"x":166,"y":42,"w":7,"h":18,"character":54,"shift":10,"offset":2,}, + "55": {"x":175,"y":42,"w":7,"h":18,"character":55,"shift":10,"offset":1,}, + "56": {"x":184,"y":42,"w":7,"h":18,"character":56,"shift":10,"offset":1,}, + "57": {"x":149,"y":62,"w":7,"h":18,"character":57,"shift":10,"offset":2,}, + "58": {"x":143,"y":62,"w":4,"h":18,"character":58,"shift":10,"offset":3,}, + "59": {"x":137,"y":62,"w":4,"h":18,"character":59,"shift":10,"offset":2,}, + "60": {"x":126,"y":62,"w":9,"h":18,"character":60,"shift":10,"offset":0,}, + "61": {"x":115,"y":62,"w":9,"h":18,"character":61,"shift":10,"offset":0,}, + "62": {"x":105,"y":62,"w":8,"h":18,"character":62,"shift":10,"offset":1,}, + "63": {"x":97,"y":62,"w":6,"h":18,"character":63,"shift":10,"offset":2,}, + "64": {"x":88,"y":62,"w":7,"h":18,"character":64,"shift":10,"offset":1,}, + "65": {"x":76,"y":62,"w":10,"h":18,"character":65,"shift":10,"offset":0,}, + "66": {"x":65,"y":62,"w":9,"h":18,"character":66,"shift":10,"offset":0,}, + "67": {"x":55,"y":62,"w":8,"h":18,"character":67,"shift":10,"offset":1,}, + "68": {"x":45,"y":62,"w":8,"h":18,"character":68,"shift":10,"offset":1,}, + "69": {"x":34,"y":62,"w":9,"h":18,"character":69,"shift":10,"offset":0,}, + "70": {"x":24,"y":62,"w":8,"h":18,"character":70,"shift":10,"offset":1,}, + "71": {"x":13,"y":62,"w":9,"h":18,"character":71,"shift":10,"offset":1,}, + "72": {"x":2,"y":62,"w":9,"h":18,"character":72,"shift":10,"offset":0,}, + "73": {"x":238,"y":42,"w":7,"h":18,"character":73,"shift":10,"offset":1,}, + "74": {"x":227,"y":42,"w":9,"h":18,"character":74,"shift":10,"offset":1,}, + "75": {"x":215,"y":42,"w":10,"h":18,"character":75,"shift":10,"offset":0,}, + "76": {"x":205,"y":42,"w":8,"h":18,"character":76,"shift":10,"offset":1,}, + "77": {"x":193,"y":42,"w":10,"h":18,"character":77,"shift":10,"offset":0,}, + "78": {"x":229,"y":22,"w":10,"h":18,"character":78,"shift":10,"offset":0,}, + "79": {"x":218,"y":22,"w":9,"h":18,"character":79,"shift":10,"offset":0,}, + "80": {"x":208,"y":22,"w":8,"h":18,"character":80,"shift":10,"offset":1,}, + "81": {"x":223,"y":2,"w":9,"h":18,"character":81,"shift":10,"offset":0,}, + "82": {"x":205,"y":2,"w":10,"h":18,"character":82,"shift":10,"offset":0,}, + "83": {"x":195,"y":2,"w":8,"h":18,"character":83,"shift":10,"offset":1,}, + "84": {"x":185,"y":2,"w":8,"h":18,"character":84,"shift":10,"offset":1,}, + "85": {"x":174,"y":2,"w":9,"h":18,"character":85,"shift":10,"offset":0,}, + "86": {"x":162,"y":2,"w":10,"h":18,"character":86,"shift":10,"offset":0,}, + "87": {"x":150,"y":2,"w":10,"h":18,"character":87,"shift":10,"offset":0,}, + "88": {"x":139,"y":2,"w":9,"h":18,"character":88,"shift":10,"offset":0,}, + "89": {"x":128,"y":2,"w":9,"h":18,"character":89,"shift":10,"offset":0,}, + "90": {"x":119,"y":2,"w":7,"h":18,"character":90,"shift":10,"offset":1,}, + "91": {"x":217,"y":2,"w":4,"h":18,"character":91,"shift":10,"offset":4,}, + "92": {"x":110,"y":2,"w":7,"h":18,"character":92,"shift":10,"offset":1,}, + "93": {"x":94,"y":2,"w":4,"h":18,"character":93,"shift":10,"offset":2,}, + "94": {"x":85,"y":2,"w":7,"h":18,"character":94,"shift":10,"offset":1,}, + "95": {"x":73,"y":2,"w":10,"h":18,"character":95,"shift":10,"offset":0,}, + "96": {"x":67,"y":2,"w":4,"h":18,"character":96,"shift":10,"offset":3,}, + "97": {"x":57,"y":2,"w":8,"h":18,"character":97,"shift":10,"offset":1,}, + "98": {"x":46,"y":2,"w":9,"h":18,"character":98,"shift":10,"offset":0,}, + "99": {"x":36,"y":2,"w":8,"h":18,"character":99,"shift":10,"offset":1,}, + "100": {"x":24,"y":2,"w":10,"h":18,"character":100,"shift":10,"offset":0,}, + "101": {"x":14,"y":2,"w":8,"h":18,"character":101,"shift":10,"offset":1,}, + "102": {"x":100,"y":2,"w":8,"h":18,"character":102,"shift":10,"offset":1,}, + "103": {"x":234,"y":2,"w":9,"h":18,"character":103,"shift":10,"offset":0,}, + "104": {"x":84,"y":22,"w":9,"h":18,"character":104,"shift":10,"offset":0,}, + "105": {"x":245,"y":2,"w":8,"h":18,"character":105,"shift":10,"offset":1,}, + "106": {"x":191,"y":22,"w":6,"h":18,"character":106,"shift":10,"offset":1,}, + "107": {"x":180,"y":22,"w":9,"h":18,"character":107,"shift":10,"offset":1,}, + "108": {"x":170,"y":22,"w":8,"h":18,"character":108,"shift":10,"offset":1,}, + "109": {"x":158,"y":22,"w":10,"h":18,"character":109,"shift":10,"offset":0,}, + "110": {"x":147,"y":22,"w":9,"h":18,"character":110,"shift":10,"offset":0,}, + "111": {"x":137,"y":22,"w":8,"h":18,"character":111,"shift":10,"offset":1,}, + "112": {"x":126,"y":22,"w":9,"h":18,"character":112,"shift":10,"offset":0,}, + "113": {"x":115,"y":22,"w":9,"h":18,"character":113,"shift":10,"offset":1,}, + "114": {"x":105,"y":22,"w":8,"h":18,"character":114,"shift":10,"offset":1,}, + "115": {"x":199,"y":22,"w":7,"h":18,"character":115,"shift":10,"offset":1,}, + "116": {"x":95,"y":22,"w":8,"h":18,"character":116,"shift":10,"offset":1,}, + "117": {"x":73,"y":22,"w":9,"h":18,"character":117,"shift":10,"offset":0,}, + "118": {"x":61,"y":22,"w":10,"h":18,"character":118,"shift":10,"offset":0,}, + "119": {"x":49,"y":22,"w":10,"h":18,"character":119,"shift":10,"offset":0,}, + "120": {"x":38,"y":22,"w":9,"h":18,"character":120,"shift":10,"offset":0,}, + "121": {"x":27,"y":22,"w":9,"h":18,"character":121,"shift":10,"offset":1,}, + "122": {"x":18,"y":22,"w":7,"h":18,"character":122,"shift":10,"offset":1,}, + "123": {"x":12,"y":22,"w":4,"h":18,"character":123,"shift":10,"offset":3,}, + "124": {"x":8,"y":22,"w":2,"h":18,"character":124,"shift":10,"offset":4,}, + "125": {"x":2,"y":22,"w":4,"h":18,"character":125,"shift":10,"offset":3,}, + "126": {"x":158,"y":62,"w":8,"h":18,"character":126,"shift":10,"offset":1,}, + "9647": {"x":168,"y":62,"w":10,"h":18,"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_couriernew", + "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/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index b514683..48399f8 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -16,6 +16,8 @@ global.gw = 640; global.gh = 360; global.camerax = 0; global.cameray = 0; +state = st_control; +cursor = new vec2(0, 0); //these are functions bc c_2dto3d uses them function getProj(){ return matrix_build_projection_perspective_fov(60,-16/9,1,4000) @@ -51,5 +53,8 @@ function drawModels(){ models = []; //var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0); + +textbox_create(txt_test); var spr = sprite_add("./map1/mapatlas.png",0,false,false,0,0); -nu Model("./map1/map1.dat", spr, u, u, u, u, u, u, u, u,); \ No newline at end of file +nu Model("./map1/map1.dat", spr, u, 200, 140, u, .65, u, u, u,); +setCam(); \ No newline at end of file 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= 0 { - if mousey < array_length(global.map[mousex]) && mousey >= 0 { - var i; - for (i=0; i global.gw-100 { - var guyhits = floor(abs(mouse.y-global.gh-10)/32); - log(guyhits, array_length(selectedunit.inventory)); - if guyhits < array_length(selectedunit.inventory) { - //log("doing"); - selectedunit.equippedweapon = guyhits+1; - c_equipweapon(selectedunit, selectedunit.inventory[selectedunit.equippedweapon]); - } - //draw_text(global.gw-10, global.gh-10-i*20; - } -} -if selectedunit == noone { - hspd = lerp(hspd, (right-left)*((.1+stop*.1)*(ts.x)), .4); - vspd = lerp(vspd, (down-up)*((.1+stop*.1)*(ts.y)), .4); - x += hspd; - y += vspd; - -} else { - hspd = 0; - vspd = 0; - x = lerp(x, selectedunit.x, .4); - y = lerp(y, selectedunit.y, .4); -} - -global.camerax = x; -global.cameray = y; -var mousex = floor(mouse.x/global.tilesize.x); -var mousey = floor(mouse.y/global.tilesize.y); -//log(mousex, mousey); -hoveredunit = selectedunit; -if mousex < array_length(global.map) && mousex >= 0 { - if mousey < array_length(global.map[mousex]) && mousey >= 0 { - var i; - for (i=0; i= maxlength { + for (j=0; j= 0 { + if mousey < array_length(global.map[mousex]) && mousey >= 0 { + var i; + for (i=0; i global.gw-100 { + var guyhits = floor(abs(mouse.y-global.gh-10)/32); + log(guyhits, array_length(selectedunit.inventory)); + if guyhits < array_length(selectedunit.inventory) { + //log("doing"); + selectedunit.equippedweapon = guyhits+1; + c_equipweapon(selectedunit, selectedunit.inventory[selectedunit.equippedweapon]); + } + //draw_text(global.gw-10, global.gh-10-i*20; + } + } + if selectedunit == noone { + hspd = lerp(hspd, (right-left)*((.1+stop*.1)*(ts.x)), .4); + vspd = lerp(vspd, (down-up)*((.1+stop*.1)*(ts.y)), .4); + x += hspd; + y += vspd; + } else { + hspd = 0; + vspd = 0; + x = lerp(x, selectedunit.x, .4); + y = lerp(y, selectedunit.y, .4); + //cursor.x = selectedunit.x; + //cursor.y = selectedunit.y; + } + cursor.x = mouse_x; + cursor.y = mouse_y; + global.camerax = x; + global.cameray = y; + var mousex = floor(mouse.x/global.tilesize.x); + var mousey = floor(mouse.y/global.tilesize.y); + //log(mousex, mousey); + hoveredunit = selectedunit; + if mousex < array_length(global.map) && mousex >= 0 { + if mousey < array_length(global.map[mousex]) && mousey >= 0 { + var i; + 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/st_textadv/st_textadv.gml b/eastern flames/scripts/st_textadv/st_textadv.gml new file mode 100644 index 0000000..b1bf18f --- /dev/null +++ b/eastern flames/scripts/st_textadv/st_textadv.gml @@ -0,0 +1,69 @@ +global.thecolor = 0xFFFFFF + +function st_textadv() { + //surface_set_target(global.surfaces.HUD); + draw_sprite(bg, 0, 0, 0); + for (i=array_length(talker)-1; i>=0; i--) { + draw_sprite_ext(talker[i].sprite, + talker[i].index, + talker[i].x, + talker[i].y, + ineg(talker[i].position > SPRITEPOS.CENTER), + 1, 0, make_color_hsv(0, 0, 255-(i>0)*100), talker[i].alpha*(talker[i].position <= SPRITEPOS.RIGHT)); + } + if halting { exit} + draw_sprite(sprite_index, 0, x, y); + draw_set_font(font); + clr = c_white; + var xpos = 0; + var lb = 0; + sizemult = 1; + var effchars = drawchars; + specialchars = 0; + wigglex = 0; + wiggley = 0; + shake = 0; + sizepos = 0; + pressing = 0; + fontsize = font_get_size(draw_get_font())*.8; + atsound = 0; + atfunc = 0; + j = 0; + if msg[talkpos].type == "normal" { + draw_set_color(talker[0].namecolor); + draw_set_halign(fa_center); + draw_text(x+width/20-width/2+17, y-18, talker[0].name); + draw_set_halign(fa_left); + draw_set_color(c_white); + } + draw_set_halign(fa_left); + atsound = 0; + atfunc = 0; + for (i=1; i<=effchars; i++) { + while string_char_at(msg[talkpos].text, i) = "|" { + c_txtspecial(); + } + effchars = drawchars+specialchars; + var centerOffset = 0; + if(draw_get_halign() == fa_center || draw_get_halign() == fa_right) { + var linelist = string_split(msg[talkpos].text,"#"); + var msglen = string_length(linelist[lb]) + centeroffset = ((width/(fontsize+5))) - msglen; + if(draw_get_halign() == fa_center) { + centeroffset/=2; + } + } + var textoffsetx = cos((count+i*2)/(talkspeed*20))*wigglex+random(shake/2)-shake/4; + var textoffsety = sin((count+i*2)/(talkspeed*20))*wiggley+random(shake/2)-shake/4; + var textxpos = x+margin+(xpos+centerOffset)*(fontsize)-width/2; + var textypos = y+(fontsize)+(lb+nvlline)*(fontsize*2); + var thechar = string_hash_to_newline(string_char_at(msg[talkpos].text, i)); + draw_text_ext_transformed_colour(textxpos+textoffsetx, textypos+textoffsety, thechar, 0, 999, sizemult, sizemult, 0, clr, clr, clr, clr, 1); + if string_char_at(msg[talkpos].text, i) = "#" { + lb++; + xpos = -1; + } + xpos += sizemult; + } +} + diff --git a/eastern flames/scripts/st_textadv/st_textadv.yy b/eastern flames/scripts/st_textadv/st_textadv.yy new file mode 100644 index 0000000..bcd74fc --- /dev/null +++ b/eastern flames/scripts/st_textadv/st_textadv.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Textbox", + "path": "folders/Textbox.yy", + }, + "resourceVersion": "1.0", + "name": "st_textadv", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/eastern flames/scripts/st_textnvl/st_textnvl.gml b/eastern flames/scripts/st_textnvl/st_textnvl.gml new file mode 100644 index 0000000..ac888b4 --- /dev/null +++ b/eastern flames/scripts/st_textnvl/st_textnvl.gml @@ -0,0 +1,120 @@ +function st_textnvl() { + //surface_set_target(global.surfaces.HUD); + draw_sprite(bg, 0, 0, 0); + for (i=array_length(talker)-1; i>=0; i--) { + draw_sprite_ext(talker[i].sprite, + talker[i].index, + talker[i].x, + talker[i].y, + ineg(talker[i].position > SPRITEPOS.CENTER), + 1, 0, make_color_hsv(0, 0, 255-(i>0)*100), talker[i].alpha*(talker[i].position <= SPRITEPOS.RIGHT)); + } + if halting { exit} + + draw_sprite(sprite_index, 0, x, y); + draw_set_font(font); + clr = c_white; + var xpos = 0; + var lb = 0; + sizemult = 1; + var effchars = drawchars; + specialchars = 0; + wigglex = 0; + wiggley = 0; + shake = 0; + sizepos = 0; + pressing = 0; + fontsize = font_get_size(draw_get_font())*.8; + backlogging = true; + atsound = 0; + atfunc = 0; + j = 0; + for (j=0; j",}, + "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 diff --git a/eastern flames/sprites/s_spacetext/1df64697-d9f9-472c-9a43-746015b3d2c3.png b/eastern flames/sprites/s_spacetext/1df64697-d9f9-472c-9a43-746015b3d2c3.png new file mode 100644 index 0000000..711eaf5 Binary files /dev/null and b/eastern flames/sprites/s_spacetext/1df64697-d9f9-472c-9a43-746015b3d2c3.png differ diff --git a/eastern flames/sprites/s_spacetext/layers/1df64697-d9f9-472c-9a43-746015b3d2c3/9068e15e-678a-45a9-a502-81162ba7b302.png b/eastern flames/sprites/s_spacetext/layers/1df64697-d9f9-472c-9a43-746015b3d2c3/9068e15e-678a-45a9-a502-81162ba7b302.png new file mode 100644 index 0000000..711eaf5 Binary files /dev/null and b/eastern flames/sprites/s_spacetext/layers/1df64697-d9f9-472c-9a43-746015b3d2c3/9068e15e-678a-45a9-a502-81162ba7b302.png differ diff --git a/eastern flames/sprites/s_spacetext/s_spacetext.yy b/eastern flames/sprites/s_spacetext/s_spacetext.yy new file mode 100644 index 0000000..cfe739e --- /dev/null +++ b/eastern flames/sprites/s_spacetext/s_spacetext.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 0, + "type": 0, + "origin": 1, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 639, + "bbox_top": 0, + "bbox_bottom": 99, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 640, + "height": 100, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext/s_spacetext.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext/s_spacetext.yy",},"LayerId":{"name":"9068e15e-678a-45a9-a502-81162ba7b302","path":"sprites/s_spacetext/s_spacetext.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"resourceVersion":"1.0","name":"1df64697-d9f9-472c-9a43-746015b3d2c3","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.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":"5b993abf-65a3-480c-905a-fd45ef5ca415","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext/s_spacetext.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": 320, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",}, + "resourceVersion": "1.3", + "name": "s_spacetext", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9068e15e-678a-45a9-a502-81162ba7b302","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "s_spacetext", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/eastern flames/sprites/s_spacetext15/1df64697-d9f9-472c-9a43-746015b3d2c3.png b/eastern flames/sprites/s_spacetext15/1df64697-d9f9-472c-9a43-746015b3d2c3.png new file mode 100644 index 0000000..28788f5 Binary files /dev/null and b/eastern flames/sprites/s_spacetext15/1df64697-d9f9-472c-9a43-746015b3d2c3.png differ diff --git a/eastern flames/sprites/s_spacetext15/layers/1df64697-d9f9-472c-9a43-746015b3d2c3/9068e15e-678a-45a9-a502-81162ba7b302.png b/eastern flames/sprites/s_spacetext15/layers/1df64697-d9f9-472c-9a43-746015b3d2c3/9068e15e-678a-45a9-a502-81162ba7b302.png new file mode 100644 index 0000000..28788f5 Binary files /dev/null and b/eastern flames/sprites/s_spacetext15/layers/1df64697-d9f9-472c-9a43-746015b3d2c3/9068e15e-678a-45a9-a502-81162ba7b302.png differ diff --git a/eastern flames/sprites/s_spacetext15/s_spacetext.yy b/eastern flames/sprites/s_spacetext15/s_spacetext.yy new file mode 100644 index 0000000..259f771 --- /dev/null +++ b/eastern flames/sprites/s_spacetext15/s_spacetext.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 0, + "type": 0, + "origin": 9, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 831, + "bbox_top": 0, + "bbox_bottom": 207, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 832, + "height": 208, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext/s_spacetext.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext/s_spacetext.yy",},"LayerId":{"name":"9068e15e-678a-45a9-a502-81162ba7b302","path":"sprites/s_spacetext/s_spacetext.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"resourceVersion":"1.0","name":"1df64697-d9f9-472c-9a43-746015b3d2c3","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.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":"5b993abf-65a3-480c-905a-fd45ef5ca415","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext/s_spacetext.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": 416, + "yorigin": 47, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",}, + "resourceVersion": "1.3", + "name": "s_spacetext", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9068e15e-678a-45a9-a502-81162ba7b302","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "s_spacetext", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/eastern flames/sprites/s_spacetext15/s_spacetext15.yy b/eastern flames/sprites/s_spacetext15/s_spacetext15.yy new file mode 100644 index 0000000..8705896 --- /dev/null +++ b/eastern flames/sprites/s_spacetext15/s_spacetext15.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 0, + "type": 0, + "origin": 9, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 831, + "bbox_top": 0, + "bbox_bottom": 207, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 832, + "height": 208, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext15/s_spacetext15.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext15/s_spacetext15.yy",},"LayerId":{"name":"9068e15e-678a-45a9-a502-81162ba7b302","path":"sprites/s_spacetext15/s_spacetext15.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.yy",},"resourceVersion":"1.0","name":"1df64697-d9f9-472c-9a43-746015b3d2c3","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.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":"68ef9b83-0c89-414a-bd1a-d2d9cbc21bfc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1df64697-d9f9-472c-9a43-746015b3d2c3","path":"sprites/s_spacetext15/s_spacetext15.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": 416, + "yorigin": 47, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.yy",}, + "resourceVersion": "1.3", + "name": "s_spacetext", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9068e15e-678a-45a9-a502-81162ba7b302","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "s_spacetext15", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file