takane

eastern flames/eastern flames.yyp

@@ -2,28 +2,33 @@
   "resources": [
     {"id":{"name":"c_loadstageone","path":"scripts/c_loadstageone/c_loadstageone.yy",},"order":20,},
     {"id":{"name":"draw_sprite_at","path":"scripts/draw_sprite_at/draw_sprite_at.yy",},"order":8,},
+    {"id":{"name":"s_takaneup","path":"sprites/s_takaneup/s_takaneup.yy",},"order":1,},
     {"id":{"name":"c_inheritunit","path":"scripts/c_inheritunit/c_inheritunit.yy",},"order":5,},
     {"id":{"name":"vertex_format_create_simple","path":"scripts/vertex_format_create_simple/vertex_format_create_simple.yy",},"order":5,},
     {"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":"s_takane","path":"sprites/s_takane/s_takane.yy",},"order":0,},
     {"id":{"name":"array_remove","path":"scripts/array_remove/array_remove.yy",},"order":6,},
+    {"id":{"name":"txt_win","path":"scripts/txt_win/txt_win.yy",},"order":9,},
     {"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,},
     {"id":{"name":"c_getstats","path":"scripts/c_getstats/c_getstats.yy",},"order":16,},
     {"id":{"name":"stat","path":"scripts/stat/stat.yy",},"order":3,},
     {"id":{"name":"vlambeer","path":"scripts/vlambeer/vlambeer.yy",},"order":1,},
+    {"id":{"name":"txt_momijiyreisen","path":"scripts/txt_momijiyreisen/txt_momijiyreisen.yy",},"order":8,},
     {"id":{"name":"da_title","path":"rooms/da_title/da_title.yy",},"order":1,},
     {"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":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.yy",},"order":3,},
     {"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":1,},
+    {"id":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"order":16,},
     {"id":{"name":"easing","path":"scripts/easing/easing.yy",},"order":4,},
+    {"id":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"order":1,},
     {"id":{"name":"o_title","path":"objects/o_title/o_title.yy",},"order":3,},
     {"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,},
@@ -31,13 +36,14 @@
     {"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_cursorup","path":"sprites/s_cursorup/s_cursorup.yy",},"order":4,},
     {"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":"s_takanedown","path":"sprites/s_takanedown/s_takanedown.yy",},"order":2,},
     {"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,},
@@ -47,21 +53,25 @@
     {"id":{"name":"o_unit","path":"objects/o_unit/o_unit.yy",},"order":2,},
     {"id":{"name":"combat","path":"scripts/combat/combat.yy",},"order":13,},
     {"id":{"name":"mod_negative","path":"scripts/mod_negative/mod_negative.yy",},"order":11,},
+    {"id":{"name":"x_otherdudes","path":"scripts/x_otherdudes/x_otherdudes.yy",},"order":34,},
     {"id":{"name":"draw_circle_width","path":"scripts/draw_circle_width/draw_circle_width.yy",},"order":3,},
     {"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":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"order":0,},
     {"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":"s_box","path":"sprites/s_box/s_box.yy",},"order":6,},
     {"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":"txt_","path":"scripts/txt_/txt_.yy",},"order":0,},
     {"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":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"order":2,},
     {"id":{"name":"sinmult","path":"scripts/sinmult/sinmult.yy",},"order":16,},
     {"id":{"name":"munction","path":"scripts/munction/munction.yy",},"order":12,},
     {"id":{"name":"function_append","path":"scripts/function_append/function_append.yy",},"order":13,},
@@ -72,30 +82,34 @@
     {"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":"txt_nitoriytkn","path":"scripts/txt_nitoriytkn/txt_nitoriytkn.yy",},"order":6,},
     {"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":"txt_reisen","path":"scripts/txt_reisen/txt_reisen.yy",},"order":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":"s_cursor","path":"sprites/s_cursor/s_cursor.yy",},"order":5,},
     {"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":7,},
+    {"id":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"order":2,},
     {"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":"txt_aya","path":"scripts/txt_aya/txt_aya.yy",},"order":3,},
     {"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":2,},
+    {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":0,},
     {"id":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"order":0,},
+    {"id":{"name":"txt_intro","path":"scripts/txt_intro/txt_intro.yy",},"order":2,},
     {"id":{"name":"s_reisenup","path":"sprites/s_reisenup/s_reisenup.yy",},"order":1,},
     {"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":5,},
+    {"id":{"name":"s_null","path":"sprites/s_null/s_null.yy",},"order":1,},
     {"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,},
@@ -110,26 +124,29 @@
     {"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":"txt_momijiyaya","path":"scripts/txt_momijiyaya/txt_momijiyaya.yy",},"order":4,},
     {"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":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"order":12,},
+    {"id":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"order":2,},
     {"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":"txt_test","path":"scripts/txt_test/txt_test.yy",},"order":1,},
     {"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,},
-    {"id":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"order":11,},
+    {"id":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"order":1,},
+    {"id":{"name":"txt_momijiytkn","path":"scripts/txt_momijiytkn/txt_momijiytkn.yy",},"order":5,},
     {"id":{"name":"c_dewait","path":"scripts/c_dewait/c_dewait.yy",},"order":21,},
     {"id":{"name":"c_resetbattlevar","path":"scripts/c_resetbattlevar/c_resetbattlevar.yy",},"order":14,},
     {"id":{"name":"array_find_index","path":"scripts/array_find_index/array_find_index.yy",},"order":1,},
     {"id":{"name":"array_greatest","path":"scripts/array_greatest/array_greatest.yy",},"order":4,},
     {"id":{"name":"c_null","path":"scripts/c_null/c_null.yy",},"order":4,},
     {"id":{"name":"array_contains_within","path":"scripts/array_contains_within/array_contains_within.yy",},"order":19,},
+    {"id":{"name":"x_bunnies","path":"scripts/x_bunnies/x_bunnies.yy",},"order":33,},
     {"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,},
@@ -154,15 +171,15 @@
   ],
   "Folders": [
     {"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Sounds.yy","order":2,"resourceVersion":"1.0","name":"Sounds","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sounds.yy","order":18,"resourceVersion":"1.0","name":"Sounds","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Scripts.yy","order":3,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Scripts.yy","order":19,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Shaders.yy","order":4,"resourceVersion":"1.0","name":"Shaders","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Shaders.yy","order":20,"resourceVersion":"1.0","name":"Shaders","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Misc/Fonts.yy","order":2,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Objects.yy","order":5,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Objects.yy","order":21,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Rooms.yy","order":6,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Rooms.yy","order":22,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Misc/Extensions.yy","order":1,"resourceVersion":"1.0","name":"Extensions","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Misc.yy","order":7,"resourceVersion":"1.0","name":"Misc","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Misc.yy","order":23,"resourceVersion":"1.0","name":"Misc","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Music.yy","order":1,"resourceVersion":"1.0","name":"Music","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Music.yy","order":17,"resourceVersion":"1.0","name":"Music","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Objects/vfx-likes.yy","order":1,"resourceVersion":"1.0","name":"vfx-likes","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Scripts/util/constructors.yy","order":0,"resourceVersion":"1.0","name":"constructors","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Scripts/util/convenience.yy","order":1,"resourceVersion":"1.0","name":"convenience","tags":[],"resourceType":"GMFolder",},
@@ -170,12 +187,17 @@
     {"folderPath":"folders/Scripts/util/drawing.yy","order":3,"resourceVersion":"1.0","name":"drawing","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Scripts/util/drawing/vlambeer.yy","order":1,"resourceVersion":"1.0","name":"vlambeer","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Scripts/util.yy","order":1,"resourceVersion":"1.0","name":"util","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Sprites/momiji.yy","order":3,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes/momiji.yy","order":4,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Sprites/wabbit.yy","order":4,"resourceVersion":"1.0","name":"wabbit","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes/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":6,"resourceVersion":"1.0","name":"rei'sen","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes/rei'sen.yy","order":2,"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/Fonts.yy","order":24,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Textbox.yy","order":9,"resourceVersion":"1.0","name":"Textbox","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Textbox.yy","order":25,"resourceVersion":"1.0","name":"Textbox","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes/nitori.yy","order":0,"resourceVersion":"1.0","name":"nitori","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes/aya.yy","order":1,"resourceVersion":"1.0","name":"aya","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes.yy","order":7,"resourceVersion":"1.0","name":"dudes","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Dialogue.yy","order":26,"resourceVersion":"1.0","name":"Dialogue","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/dudes/takane.yy","order":5,"resourceVersion":"1.0","name":"takane","tags":[],"resourceType":"GMFolder",},
   ],
   "AudioGroups": [
     {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},

eastern flames/fonts/ft_chiaro/ft_chiaro.old.yy

@@ -3,8 +3,8 @@
   "glyphOperations": 0,
   "interpreter": 0,
   "pointRounding": 0,
-  "fontName": "Arial",
+  "fontName": "FOT-キアロ Std B",
-  "styleName": "Regular",
+  "styleName": "B",
   "size": 12.0,
   "bold": false,
   "italic": false,
@@ -21,176 +21,104 @@
   },
   "ascenderOffset": 0,
   "glyphs": {
-    "32": {"x":2,"y":2,"w":4,"h":18,"character":32,"shift":4,"offset":0,},
+    "32": {"x":2,"y":2,"w":5,"h":32,"character":32,"shift":5,"offset":0,},
-    "33": {"x":165,"y":42,"w":3,"h":18,"character":33,"shift":4,"offset":1,},
+    "33": {"x":195,"y":70,"w":5,"h":32,"character":33,"shift":6,"offset":1,},
-    "34": {"x":158,"y":42,"w":5,"h":18,"character":34,"shift":6,"offset":0,},
+    "34": {"x":188,"y":70,"w":5,"h":32,"character":34,"shift":6,"offset":1,},
-    "35": {"x":147,"y":42,"w":9,"h":18,"character":35,"shift":9,"offset":0,},
+    "35": {"x":177,"y":70,"w":9,"h":32,"character":35,"shift":10,"offset":1,},
-    "36": {"x":136,"y":42,"w":9,"h":18,"character":36,"shift":9,"offset":0,},
+    "36": {"x":165,"y":70,"w":10,"h":32,"character":36,"shift":10,"offset":0,},
-    "37": {"x":120,"y":42,"w":14,"h":18,"character":37,"shift":14,"offset":0,},
+    "37": {"x":149,"y":70,"w":14,"h":32,"character":37,"shift":16,"offset":1,},
-    "38": {"x":107,"y":42,"w":11,"h":18,"character":38,"shift":11,"offset":0,},
+    "38": {"x":134,"y":70,"w":13,"h":32,"character":38,"shift":13,"offset":0,},
-    "39": {"x":102,"y":42,"w":3,"h":18,"character":39,"shift":3,"offset":0,},
+    "39": {"x":129,"y":70,"w":3,"h":32,"character":39,"shift":5,"offset":1,},
-    "40": {"x":95,"y":42,"w":5,"h":18,"character":40,"shift":5,"offset":0,},
+    "40": {"x":122,"y":70,"w":5,"h":32,"character":40,"shift":6,"offset":1,},
-    "41": {"x":88,"y":42,"w":5,"h":18,"character":41,"shift":5,"offset":0,},
+    "41": {"x":115,"y":70,"w":5,"h":32,"character":41,"shift":6,"offset":0,},
-    "42": {"x":170,"y":42,"w":6,"h":18,"character":42,"shift":6,"offset":0,},
+    "42": {"x":202,"y":70,"w":6,"h":32,"character":42,"shift":8,"offset":1,},
-    "43": {"x":77,"y":42,"w":9,"h":18,"character":43,"shift":9,"offset":0,},
+    "43": {"x":105,"y":70,"w":8,"h":32,"character":43,"shift":10,"offset":1,},
-    "44": {"x":61,"y":42,"w":3,"h":18,"character":44,"shift":4,"offset":1,},
+    "44": {"x":89,"y":70,"w":3,"h":32,"character":44,"shift":5,"offset":1,},
-    "45": {"x":54,"y":42,"w":5,"h":18,"character":45,"shift":5,"offset":0,},
+    "45": {"x":81,"y":70,"w":6,"h":32,"character":45,"shift":6,"offset":0,},
-    "46": {"x":49,"y":42,"w":3,"h":18,"character":46,"shift":4,"offset":1,},
+    "46": {"x":76,"y":70,"w":3,"h":32,"character":46,"shift":5,"offset":1,},
-    "47": {"x":42,"y":42,"w":5,"h":18,"character":47,"shift":4,"offset":0,},
+    "47": {"x":68,"y":70,"w":6,"h":32,"character":47,"shift":6,"offset":0,},
-    "48": {"x":31,"y":42,"w":9,"h":18,"character":48,"shift":9,"offset":0,},
+    "48": {"x":56,"y":70,"w":10,"h":32,"character":48,"shift":10,"offset":0,},
-    "49": {"x":24,"y":42,"w":5,"h":18,"character":49,"shift":9,"offset":1,},
+    "49": {"x":49,"y":70,"w":5,"h":32,"character":49,"shift":10,"offset":2,},
-    "50": {"x":13,"y":42,"w":9,"h":18,"character":50,"shift":9,"offset":0,},
+    "50": {"x":38,"y":70,"w":9,"h":32,"character":50,"shift":10,"offset":1,},
-    "51": {"x":2,"y":42,"w":9,"h":18,"character":51,"shift":9,"offset":0,},
+    "51": {"x":26,"y":70,"w":10,"h":32,"character":51,"shift":10,"offset":0,},
-    "52": {"x":240,"y":22,"w":9,"h":18,"character":52,"shift":9,"offset":0,},
+    "52": {"x":14,"y":70,"w":10,"h":32,"character":52,"shift":10,"offset":0,},
-    "53": {"x":66,"y":42,"w":9,"h":18,"character":53,"shift":9,"offset":0,},
+    "53": {"x":94,"y":70,"w":9,"h":32,"character":53,"shift":10,"offset":0,},
-    "54": {"x":178,"y":42,"w":9,"h":18,"character":54,"shift":9,"offset":0,},
+    "54": {"x":210,"y":70,"w":10,"h":32,"character":54,"shift":10,"offset":0,},
-    "55": {"x":189,"y":42,"w":9,"h":18,"character":55,"shift":9,"offset":0,},
+    "55": {"x":222,"y":70,"w":10,"h":32,"character":55,"shift":10,"offset":0,},
-    "56": {"x":200,"y":42,"w":9,"h":18,"character":56,"shift":9,"offset":0,},
+    "56": {"x":234,"y":70,"w":10,"h":32,"character":56,"shift":10,"offset":0,},
-    "57": {"x":186,"y":62,"w":9,"h":18,"character":57,"shift":9,"offset":0,},
+    "57": {"x":216,"y":104,"w":10,"h":32,"character":57,"shift":10,"offset":0,},
-    "58": {"x":181,"y":62,"w":3,"h":18,"character":58,"shift":4,"offset":1,},
+    "58": {"x":211,"y":104,"w":3,"h":32,"character":58,"shift":5,"offset":1,},
-    "59": {"x":176,"y":62,"w":3,"h":18,"character":59,"shift":4,"offset":1,},
+    "59": {"x":206,"y":104,"w":3,"h":32,"character":59,"shift":5,"offset":1,},
-    "60": {"x":165,"y":62,"w":9,"h":18,"character":60,"shift":9,"offset":0,},
+    "60": {"x":198,"y":104,"w":6,"h":32,"character":60,"shift":10,"offset":2,},
-    "61": {"x":154,"y":62,"w":9,"h":18,"character":61,"shift":9,"offset":0,},
+    "61": {"x":188,"y":104,"w":8,"h":32,"character":61,"shift":10,"offset":1,},
-    "62": {"x":143,"y":62,"w":9,"h":18,"character":62,"shift":9,"offset":0,},
+    "62": {"x":180,"y":104,"w":6,"h":32,"character":62,"shift":10,"offset":2,},
-    "63": {"x":132,"y":62,"w":9,"h":18,"character":63,"shift":9,"offset":0,},
+    "63": {"x":168,"y":104,"w":10,"h":32,"character":63,"shift":10,"offset":0,},
-    "64": {"x":114,"y":62,"w":16,"h":18,"character":64,"shift":16,"offset":0,},
+    "64": {"x":152,"y":104,"w":14,"h":32,"character":64,"shift":14,"offset":0,},
-    "65": {"x":100,"y":62,"w":12,"h":18,"character":65,"shift":11,"offset":-1,},
+    "65": {"x":137,"y":104,"w":13,"h":32,"character":65,"shift":11,"offset":-1,},
-    "66": {"x":89,"y":62,"w":9,"h":18,"character":66,"shift":11,"offset":1,},
+    "66": {"x":126,"y":104,"w":9,"h":32,"character":66,"shift":10,"offset":1,},
-    "67": {"x":76,"y":62,"w":11,"h":18,"character":67,"shift":12,"offset":0,},
+    "67": {"x":112,"y":104,"w":12,"h":32,"character":67,"shift":12,"offset":0,},
-    "68": {"x":64,"y":62,"w":10,"h":18,"character":68,"shift":12,"offset":1,},
+    "68": {"x":99,"y":104,"w":11,"h":32,"character":68,"shift":13,"offset":1,},
-    "69": {"x":53,"y":62,"w":9,"h":18,"character":69,"shift":11,"offset":1,},
+    "69": {"x":89,"y":104,"w":8,"h":32,"character":69,"shift":9,"offset":1,},
-    "70": {"x":42,"y":62,"w":9,"h":18,"character":70,"shift":10,"offset":1,},
+    "70": {"x":79,"y":104,"w":8,"h":32,"character":70,"shift":9,"offset":1,},
-    "71": {"x":28,"y":62,"w":12,"h":18,"character":71,"shift":12,"offset":0,},
+    "71": {"x":65,"y":104,"w":12,"h":32,"character":71,"shift":13,"offset":0,},
-    "72": {"x":16,"y":62,"w":10,"h":18,"character":72,"shift":12,"offset":1,},
+    "72": {"x":53,"y":104,"w":10,"h":32,"character":72,"shift":12,"offset":1,},
-    "73": {"x":11,"y":62,"w":3,"h":18,"character":73,"shift":4,"offset":1,},
+    "73": {"x":48,"y":104,"w":3,"h":32,"character":73,"shift":5,"offset":1,},
-    "74": {"x":2,"y":62,"w":7,"h":18,"character":74,"shift":8,"offset":0,},
+    "74": {"x":39,"y":104,"w":7,"h":32,"character":74,"shift":6,"offset":-2,},
-    "75": {"x":235,"y":42,"w":10,"h":18,"character":75,"shift":11,"offset":1,},
+    "75": {"x":27,"y":104,"w":10,"h":32,"character":75,"shift":11,"offset":1,},
-    "76": {"x":225,"y":42,"w":8,"h":18,"character":76,"shift":9,"offset":1,},
+    "76": {"x":17,"y":104,"w":8,"h":32,"character":76,"shift":9,"offset":1,},
-    "77": {"x":211,"y":42,"w":12,"h":18,"character":77,"shift":13,"offset":1,},
+    "77": {"x":2,"y":104,"w":13,"h":32,"character":77,"shift":15,"offset":1,},
-    "78": {"x":228,"y":22,"w":10,"h":18,"character":78,"shift":12,"offset":1,},
+    "78": {"x":2,"y":70,"w":10,"h":32,"character":78,"shift":12,"offset":1,},
-    "79": {"x":214,"y":22,"w":12,"h":18,"character":79,"shift":12,"offset":0,},
+    "79": {"x":231,"y":36,"w":14,"h":32,"character":79,"shift":14,"offset":0,},
-    "80": {"x":203,"y":22,"w":9,"h":18,"character":80,"shift":11,"offset":1,},
+    "80": {"x":220,"y":36,"w":9,"h":32,"character":80,"shift":10,"offset":1,},
-    "81": {"x":232,"y":2,"w":12,"h":18,"character":81,"shift":12,"offset":0,},
+    "81": {"x":238,"y":2,"w":14,"h":32,"character":81,"shift":14,"offset":0,},
-    "82": {"x":213,"y":2,"w":11,"h":18,"character":82,"shift":12,"offset":1,},
+    "82": {"x":219,"y":2,"w":11,"h":32,"character":82,"shift":11,"offset":1,},
-    "83": {"x":201,"y":2,"w":10,"h":18,"character":83,"shift":11,"offset":0,},
+    "83": {"x":207,"y":2,"w":10,"h":32,"character":83,"shift":10,"offset":0,},
-    "84": {"x":189,"y":2,"w":10,"h":18,"character":84,"shift":10,"offset":0,},
+    "84": {"x":195,"y":2,"w":10,"h":32,"character":84,"shift":10,"offset":0,},
-    "85": {"x":177,"y":2,"w":10,"h":18,"character":85,"shift":12,"offset":1,},
+    "85": {"x":183,"y":2,"w":10,"h":32,"character":85,"shift":12,"offset":1,},
-    "86": {"x":164,"y":2,"w":11,"h":18,"character":86,"shift":11,"offset":0,},
+    "86": {"x":169,"y":2,"w":12,"h":32,"character":86,"shift":10,"offset":-1,},
-    "87": {"x":147,"y":2,"w":15,"h":18,"character":87,"shift":15,"offset":0,},
+    "87": {"x":151,"y":2,"w":16,"h":32,"character":87,"shift":15,"offset":-1,},
-    "88": {"x":134,"y":2,"w":11,"h":18,"character":88,"shift":11,"offset":0,},
+    "88": {"x":138,"y":2,"w":11,"h":32,"character":88,"shift":10,"offset":-1,},
-    "89": {"x":121,"y":2,"w":11,"h":18,"character":89,"shift":11,"offset":0,},
+    "89": {"x":125,"y":2,"w":11,"h":32,"character":89,"shift":9,"offset":-1,},
-    "90": {"x":109,"y":2,"w":10,"h":18,"character":90,"shift":10,"offset":0,},
+    "90": {"x":113,"y":2,"w":10,"h":32,"character":90,"shift":10,"offset":0,},
-    "91": {"x":226,"y":2,"w":4,"h":18,"character":91,"shift":4,"offset":1,},
+    "91": {"x":232,"y":2,"w":4,"h":32,"character":91,"shift":6,"offset":2,},
-    "92": {"x":102,"y":2,"w":5,"h":18,"character":92,"shift":4,"offset":0,},
+    "92": {"x":105,"y":2,"w":6,"h":32,"character":92,"shift":6,"offset":0,},
-    "93": {"x":89,"y":2,"w":4,"h":18,"character":93,"shift":4,"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":18,"character":94,"shift":8,"offset":0,},
+    "94": {"x":79,"y":2,"w":8,"h":32,"character":94,"shift":10,"offset":1,},
-    "95": {"x":66,"y":2,"w":11,"h":18,"character":95,"shift":9,"offset":-1,},
+    "95": {"x":69,"y":2,"w":8,"h":32,"character":95,"shift":8,"offset":0,},
-    "96": {"x":60,"y":2,"w":4,"h":18,"character":96,"shift":5,"offset":0,},
+    "96": {"x":63,"y":2,"w":4,"h":32,"character":96,"shift":6,"offset":1,},
-    "97": {"x":49,"y":2,"w":9,"h":18,"character":97,"shift":9,"offset":0,},
+    "97": {"x":52,"y":2,"w":9,"h":32,"character":97,"shift":9,"offset":0,},
-    "98": {"x":39,"y":2,"w":8,"h":18,"character":98,"shift":9,"offset":1,},
+    "98": {"x":42,"y":2,"w":8,"h":32,"character":98,"shift":10,"offset":1,},
-    "99": {"x":29,"y":2,"w":8,"h":18,"character":99,"shift":8,"offset":0,},
+    "99": {"x":31,"y":2,"w":9,"h":32,"character":99,"shift":9,"offset":0,},
-    "100": {"x":19,"y":2,"w":8,"h":18,"character":100,"shift":9,"offset":0,},
+    "100": {"x":20,"y":2,"w":9,"h":32,"character":100,"shift":10,"offset":0,},
-    "101": {"x":8,"y":2,"w":9,"h":18,"character":101,"shift":9,"offset":0,},
+    "101": {"x":9,"y":2,"w":9,"h":32,"character":101,"shift":9,"offset":0,},
-    "102": {"x":95,"y":2,"w":5,"h":18,"character":102,"shift":4,"offset":0,},
+    "102": {"x":95,"y":2,"w":8,"h":32,"character":102,"shift":6,"offset":0,},
-    "103": {"x":2,"y":22,"w":8,"h":18,"character":103,"shift":9,"offset":0,},
+    "103": {"x":2,"y":36,"w":9,"h":32,"character":103,"shift":10,"offset":0,},
-    "104": {"x":97,"y":22,"w":7,"h":18,"character":104,"shift":9,"offset":1,},
+    "104": {"x":105,"y":36,"w":8,"h":32,"character":104,"shift":9,"offset":1,},
-    "105": {"x":12,"y":22,"w":2,"h":18,"character":105,"shift":4,"offset":1,},
+    "105": {"x":13,"y":36,"w":4,"h":32,"character":105,"shift":4,"offset":0,},
-    "106": {"x":187,"y":22,"w":4,"h":18,"character":106,"shift":4,"offset":-1,},
+    "106": {"x":202,"y":36,"w":6,"h":32,"character":106,"shift":4,"offset":-2,},
-    "107": {"x":178,"y":22,"w":7,"h":18,"character":107,"shift":8,"offset":1,},
+    "107": {"x":192,"y":36,"w":8,"h":32,"character":107,"shift":8,"offset":1,},
-    "108": {"x":174,"y":22,"w":2,"h":18,"character":108,"shift":4,"offset":1,},
+    "108": {"x":187,"y":36,"w":3,"h":32,"character":108,"shift":4,"offset":1,},
-    "109": {"x":160,"y":22,"w":12,"h":18,"character":109,"shift":13,"offset":1,},
+    "109": {"x":173,"y":36,"w":12,"h":32,"character":109,"shift":13,"offset":1,},
-    "110": {"x":151,"y":22,"w":7,"h":18,"character":110,"shift":9,"offset":1,},
+    "110": {"x":163,"y":36,"w":8,"h":32,"character":110,"shift":9,"offset":1,},
-    "111": {"x":140,"y":22,"w":9,"h":18,"character":111,"shift":9,"offset":0,},
+    "111": {"x":152,"y":36,"w":9,"h":32,"character":111,"shift":10,"offset":0,},
-    "112": {"x":130,"y":22,"w":8,"h":18,"character":112,"shift":9,"offset":1,},
+    "112": {"x":142,"y":36,"w":8,"h":32,"character":112,"shift":10,"offset":1,},
-    "113": {"x":120,"y":22,"w":8,"h":18,"character":113,"shift":9,"offset":0,},
+    "113": {"x":131,"y":36,"w":9,"h":32,"character":113,"shift":10,"offset":0,},
-    "114": {"x":113,"y":22,"w":5,"h":18,"character":114,"shift":5,"offset":1,},
+    "114": {"x":123,"y":36,"w":6,"h":32,"character":114,"shift":7,"offset":1,},
-    "115": {"x":193,"y":22,"w":8,"h":18,"character":115,"shift":8,"offset":0,},
+    "115": {"x":210,"y":36,"w":8,"h":32,"character":115,"shift":8,"offset":0,},
-    "116": {"x":106,"y":22,"w":5,"h":18,"character":116,"shift":4,"offset":0,},
+    "116": {"x":115,"y":36,"w":6,"h":32,"character":116,"shift":6,"offset":0,},
-    "117": {"x":88,"y":22,"w":7,"h":18,"character":117,"shift":9,"offset":1,},
+    "117": {"x":95,"y":36,"w":8,"h":32,"character":117,"shift":9,"offset":1,},
-    "118": {"x":78,"y":22,"w":8,"h":18,"character":118,"shift":8,"offset":0,},
+    "118": {"x":84,"y":36,"w":9,"h":32,"character":118,"shift":7,"offset":-1,},
-    "119": {"x":64,"y":22,"w":12,"h":18,"character":119,"shift":12,"offset":0,},
+    "119": {"x":70,"y":36,"w":12,"h":32,"character":119,"shift":11,"offset":0,},
-    "120": {"x":54,"y":22,"w":8,"h":18,"character":120,"shift":8,"offset":0,},
+    "120": {"x":59,"y":36,"w":9,"h":32,"character":120,"shift":7,"offset":-1,},
-    "121": {"x":44,"y":22,"w":8,"h":18,"character":121,"shift":8,"offset":0,},
+    "121": {"x":48,"y":36,"w":9,"h":32,"character":121,"shift":8,"offset":-1,},
-    "122": {"x":34,"y":22,"w":8,"h":18,"character":122,"shift":8,"offset":0,},
+    "122": {"x":38,"y":36,"w":8,"h":32,"character":122,"shift":8,"offset":0,},
-    "123": {"x":27,"y":22,"w":5,"h":18,"character":123,"shift":5,"offset":0,},
+    "123": {"x":31,"y":36,"w":5,"h":32,"character":123,"shift":6,"offset":1,},
-    "124": {"x":23,"y":22,"w":2,"h":18,"character":124,"shift":4,"offset":1,},
+    "124": {"x":26,"y":36,"w":3,"h":32,"character":124,"shift":5,"offset":1,},
-    "125": {"x":16,"y":22,"w":5,"h":18,"character":125,"shift":5,"offset":0,},
+    "125": {"x":19,"y":36,"w":5,"h":32,"character":125,"shift":6,"offset":0,},
-    "126": {"x":197,"y":62,"w":9,"h":18,"character":126,"shift":9,"offset":0,},
+    "126": {"x":228,"y":104,"w":6,"h":32,"character":126,"shift":8,"offset":1,},
-    "9647": {"x":208,"y":62,"w":10,"h":18,"character":9647,"shift":16,"offset":3,},
+    "9647": {"x":236,"y":104,"w":10,"h":32,"character":9647,"shift":16,"offset":3,},
   },
-  "kerningPairs": [
+  "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,},

eastern flames/fonts/ft_chiaro/ft_chiaro.yy

@@ -22,106 +22,156 @@
   "ascenderOffset": 0,
   "glyphs": {
     "32": {"x":2,"y":2,"w":5,"h":32,"character":32,"shift":5,"offset":0,},
-    "33": {"x":195,"y":70,"w":5,"h":32,"character":33,"shift":6,"offset":1,},
+    "33": {"x":48,"y":104,"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,},
+    "34": {"x":41,"y":104,"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,},
+    "35": {"x":30,"y":104,"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,},
+    "36": {"x":18,"y":104,"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,},
+    "37": {"x":2,"y":104,"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,},
+    "38": {"x":238,"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,},
+    "39": {"x":233,"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,},
+    "40": {"x":226,"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,},
+    "41": {"x":219,"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,},
+    "42": {"x":211,"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,},
+    "43": {"x":55,"y":104,"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,},
+    "44": {"x":206,"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,},
+    "45": {"x":186,"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,},
+    "46": {"x":181,"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,},
+    "47": {"x":173,"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,},
+    "48": {"x":161,"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,},
+    "49": {"x":154,"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,},
+    "50": {"x":143,"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,},
+    "51": {"x":131,"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,},
+    "52": {"x":119,"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,},
+    "53": {"x":108,"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,},
+    "54": {"x":96,"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,},
+    "55": {"x":194,"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,},
+    "56": {"x":65,"y":104,"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,},
+    "57": {"x":77,"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,},
+    "58": {"x":89,"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,},
+    "59": {"x":109,"y":138,"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,},
+    "60": {"x":101,"y":138,"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,},
+    "61": {"x":91,"y":138,"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,},
+    "62": {"x":83,"y":138,"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,},
+    "63": {"x":71,"y":138,"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,},
+    "64": {"x":55,"y":138,"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,},
+    "65": {"x":40,"y":138,"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,},
+    "66": {"x":29,"y":138,"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,},
+    "67": {"x":15,"y":138,"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,},
+    "68": {"x":2,"y":138,"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,},
+    "69": {"x":236,"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,},
+    "70": {"x":226,"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,},
+    "71": {"x":212,"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,},
+    "72": {"x":200,"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,},
+    "73": {"x":195,"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,},
+    "74": {"x":186,"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,},
+    "75": {"x":174,"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,},
+    "76": {"x":164,"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,},
+    "77": {"x":149,"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,},
+    "78": {"x":137,"y":104,"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,},
+    "79": {"x":121,"y":104,"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,},
+    "80": {"x":110,"y":104,"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,},
+    "81": {"x":94,"y":104,"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,},
+    "82": {"x":83,"y":70,"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,},
+    "83": {"x":114,"y":138,"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,},
+    "84": {"x":71,"y":70,"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,},
+    "85": {"x":41,"y":70,"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,},
+    "86": {"x":219,"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,},
+    "87": {"x":201,"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,},
+    "88": {"x":188,"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,},
+    "89": {"x":175,"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,},
+    "90": {"x":163,"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,},
+    "91": {"x":157,"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,},
+    "92": {"x":149,"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,},
+    "93": {"x":143,"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,},
+    "94": {"x":133,"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,},
+    "95": {"x":123,"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,},
+    "96": {"x":233,"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,},
+    "97": {"x":112,"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,},
+    "98": {"x":97,"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,},
+    "99": {"x":86,"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,},
+    "100": {"x":75,"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,},
+    "101": {"x":64,"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,},
+    "102": {"x":54,"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,},
+    "103": {"x":43,"y":2,"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,},
+    "104": {"x":33,"y":2,"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,},
+    "105": {"x":27,"y":2,"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,},
+    "106": {"x":19,"y":2,"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,},
+    "107": {"x":9,"y":2,"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,},
+    "108": {"x":107,"y":2,"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,},
+    "109": {"x":239,"y":2,"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,},
+    "110": {"x":2,"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,},
+    "111": {"x":12,"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,},
+    "112": {"x":31,"y":70,"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,},
+    "113": {"x":20,"y":70,"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,},
+    "114": {"x":12,"y":70,"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,},
+    "115": {"x":2,"y":70,"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,},
+    "116": {"x":240,"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,},
+    "117": {"x":230,"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,},
+    "118": {"x":219,"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,},
+    "119": {"x":205,"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,},
+    "120": {"x":194,"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,},
+    "121": {"x":183,"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,},
+    "122": {"x":173,"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,},
+    "123": {"x":166,"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,},
+    "124": {"x":161,"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,},
+    "125": {"x":154,"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,},
+    "126": {"x":146,"y":36,"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,},
+    "9647": {"x":134,"y":36,"w":10,"h":32,"character":9647,"shift":16,"offset":3,},
+    "12414": {"x":120,"y":36,"w":12,"h":32,"character":12414,"shift":16,"offset":2,},
+    "12427": {"x":106,"y":36,"w":12,"h":32,"character":12427,"shift":16,"offset":2,},
+    "12431": {"x":90,"y":36,"w":14,"h":32,"character":12431,"shift":16,"offset":1,},
+    "22987": {"x":73,"y":36,"w":15,"h":32,"character":22987,"shift":16,"offset":1,},
+    "26085": {"x":59,"y":36,"w":12,"h":32,"character":26085,"shift":16,"offset":2,},
+    "26412": {"x":41,"y":36,"w":16,"h":32,"character":26412,"shift":16,"offset":0,},
+    "32066": {"x":23,"y":36,"w":16,"h":32,"character":32066,"shift":16,"offset":0,},
+    "33521": {"x":53,"y":70,"w":16,"h":32,"character":33521,"shift":16,"offset":0,},
+    "35486": {"x":126,"y":138,"w":16,"h":32,"character":35486,"shift":16,"offset":0,},
   },
   "kerningPairs": [],
   "ranges": [
     {"lower":32,"upper":127,},
     {"lower":9647,"upper":9647,},
+    {"lower":10240,"upper":10241,},
+    {"lower":10243,"upper":10243,},
+    {"lower":10247,"upper":10249,},
+    {"lower":10251,"upper":10251,},
+    {"lower":10255,"upper":10255,},
+    {"lower":10264,"upper":10265,},
+    {"lower":10267,"upper":10267,},
+    {"lower":10294,"upper":10294,},
+    {"lower":10296,"upper":10297,},
+    {"lower":10299,"upper":10299,},
+    {"lower":10303,"upper":10304,},
+    {"lower":10308,"upper":10308,},
+    {"lower":10310,"upper":10311,},
+    {"lower":10319,"upper":10319,},
+    {"lower":10335,"upper":10335,},
+    {"lower":10367,"upper":10368,},
+    {"lower":10400,"upper":10400,},
+    {"lower":10416,"upper":10416,},
+    {"lower":10424,"upper":10425,},
+    {"lower":10427,"upper":10427,},
+    {"lower":10431,"upper":10432,},
+    {"lower":10436,"upper":10436,},
+    {"lower":10438,"upper":10439,},
+    {"lower":10464,"upper":10464,},
+    {"lower":10468,"upper":10468,},
+    {"lower":10470,"upper":10471,},
+    {"lower":10479,"upper":10480,},
+    {"lower":10484,"upper":10484,},
+    {"lower":10486,"upper":10489,},
+    {"lower":10492,"upper":10495,},
+    {"lower":12414,"upper":12414,},
+    {"lower":12427,"upper":12427,},
+    {"lower":12431,"upper":12431,},
+    {"lower":22987,"upper":22987,},
+    {"lower":26085,"upper":26085,},
+    {"lower":26412,"upper":26412,},
+    {"lower":32066,"upper":32066,},
+    {"lower":33521,"upper":33521,},
+    {"lower":35486,"upper":35486,},
+    {"lower":55357,"upper":55357,},
+    {"lower":56628,"upper":56628,},
   ],
   "regenerateBitmap": false,
   "canGenerateBitmap": true,

eastern flames/objects/ARTICULATOR/Draw_64.gml

@@ -1,22 +1,25 @@
 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_rectangle(global.gw, global.gh, global.gw-140, global.gh-(array_length(hoveredunit.inventory)-1)*32-16, false);
+	//draw_sprite(s_box, 0, global.gw-140, global.gh-(array_length(hoveredunit.inventory)-1)*32-16);
+	draw_sprite_ext(s_box, 0, global.gw, global.gh, 4, .5+((array_length(hoveredunit.inventory)-1)*32-16)/30, 180, c_white, 1);
 	draw_set_color(c_white);
 	var i;
 	draw_set_halign(fa_right);
 	for (i=1; i<array_length(hoveredunit.inventory); i++) {
-		draw_text(global.gw-10, global.gh-10-i*20, (hoveredunit.equippedweapon == i ? "X " : "  ") + hoveredunit.inventory[i].name);
+		draw_text(global.gw-10, global.gh-17-i*20, (hoveredunit.equippedweapon == i ? "X " : "  ") + hoveredunit.inventory[i].name);
 	}
 	draw_set_halign(fa_left);
 	
 	var dudes = c_getstats(hoveredunit);
 	draw_set_color(c_black);
-	draw_rectangle(0, 0, 100, (array_length(dudes)-1)*32+16, false);
+	//draw_rectangle(0, 0, 100, (array_length(dudes)-1)*32+16, false);
+	draw_sprite_ext(s_box, 0, 0, 0, 2.5, .5+((array_length(dudes)-1)*32-16)/30, 0, c_white, 1);
 	draw_set_color(c_white);
 	var i;
 	for (i=0; i<array_length(dudes); i++) {
-		draw_text(10, 10+i*20, dudes[i].name + ": " + string(dudes[i].val));
+		draw_text(10, 5+i*20, dudes[i].name + ": " + string(dudes[i].val));
 	}
 	draw_set_halign(fa_left);
 }

eastern flames/objects/o_title/Draw_0.gml

@@ -1,3 +1,6 @@
+draw_set_color(c_black);
+draw_rectangle(0, 0, 640, 360, false);
+draw_set_color(c_white);
 draw_set_halign(fa_center);
 draw_text(320, 40, "CRESCENT INCURSION");
 draw_text(320, 180-40, msglang("START", "始まる"));

eastern flames/scripts/c_loadstageone/c_loadstageone.gml

@@ -5,9 +5,12 @@ function c_loadstageone() {
 	var kris = c_inheritunit(10, 5, un.kris, ARMY.THEM);
 	c_addweapon(kris, wp[$"iron sword"], true, true);*/
 	var momiji = c_inheritunit(5, 9, un.Momiji, ARMY.US);
-	c_addweapon(momiji, wp[$"iron sword"], true);
+	c_addweapon(momiji, wp[$"Blade"], true);
 	var nitori = c_inheritunit(4, 10, un.Nitori, ARMY.US);
-	c_addweapon(nitori, wp[$"iron sword"], true);
+	c_addweapon(nitori, wp[$"Wrench"], true);
+	
+	var nitori = c_inheritunit(7, 13, un.Takane, ARMY.US);
+	c_addweapon(nitori, wp[$"Healgun"], true);
 	
 	
 	var bunny = c_inheritunit(19, 3, un[$"Bunny Buddy"], ARMY.THEM);

eastern flames/scripts/tiledata/tiledata.gml

@@ -1,6 +1,19 @@
+global.gotaya = false;
+global.gottkn = false;
 var forest123456 = function() {return new tiledata(u, u, [], [new statmod(st.def, 5, add)])}
 var block1234567 = function() {return new tiledata(false, u, [])}
-var recruit_tile = function() {return new tiledata(u, u, u, u, function() {})}
+var recruit__aya = function() {return new tiledata(u, u, u, u, function(unitobject) {
+	if unitobject.alignment == ARMY.US {
+		switch unitobject.data.name {
+			case "Momiji":
+				textbox_create(txt_momijiyaya);
+				if !global.gotaya {
+					global.gotaya = true;
+				}
+				break;
+		}
+	}
+})}
 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()],

eastern flames/scripts/txt_aya/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_aya/txt_aya.gml

@@ -0,0 +1,20 @@
+function txt_aya() {
+	
+	msg = msglang([
+	
+	txt("Ayaya!"),
+	txt("Stop right there!"),
+	txt("I was flying around to try to find a scoop!"),
+	txt("What’s going on!?"),
+	
+	],[
+	
+	txt("あやや！"),
+	txt("フリーズ！"),
+	txt("一人で飛んで記事を見つけたかったんだよ！"),
+	txt("何これ！？"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_aya/txt_aya.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_aya",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_intro/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_intro/txt_intro.gml

@@ -0,0 +1,40 @@
+function txt_intro() {
+	
+	msg = msglang([
+	
+	txt("Checkmate!"),
+	txt("Aw man! No matter what I do, I can’t seem to beat you!"),
+	txt("Hehe! You gotta plan out a lot of your moves ahead of time in Shogi."),
+	txt("One move leads into another, and then another, and then..."),
+	txt("Yeah, yeah. I don’t think I can match your wit."),
+	txt("Well, practice makes perfect."),
+	txt("Why don’t we play-"),
+	//txt("!!! (Emphasis sound effect)"),
+	txt("Someone’s coming."),
+	txt("Huh?"),
+	txt("Rabbits have surrounded the Kappa’s hideout"),
+	txt("Lunarians!? They’ll overrun the hideout at this rate!"),
+	txt("Not just the hideout, the entire mountain too!"),
+	txt("We’ve got to stop them!"),
+	
+	],[
+	
+	txt("つみ！"),
+	txt("くっそー！ どうしても勝てれない！"),
+	txt("うふふ！ 将棋では、たくさん計画を考えなきゃ。"),
+	txt("一つの行動が、次の行動につながり、さらに次の行動へ..."),
+	txt("はい、はい。私より椛の機知が強いんだ。"),
+	txt("習うより慣れろ。"),
+	txt("それでも、もういち..."),
+	//txt("!!! (Emphasis sound effect)"),
+	txt("誰か来るぞ。"),
+	txt("え？"),
+	txt("Rabbits have surrounded the Kappa’s hideout"),
+	txt("月人！？このまま、あいつらはハイドアウトを侵略する！"),
+	txt("山も！"),
+	txt("我らは、月人を止められなきゃ！"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_intro/txt_intro.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_intro",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiyaya/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiyaya/txt_intro.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_intro",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiyaya/txt_momijiyaya.gml

@@ -0,0 +1,28 @@
+function txt_momijiyaya() {
+	
+	msg = msglang([
+	
+	txt("Oh great, you..."),
+	txt("Hm? Aren’t you happy to see your savior?"),
+	txt("I don’t need you!"),
+	txt("Alright then, I guess I’ll just be on my way…"),
+	txt("...Wait."),
+	txt("Hehe, that’s what I thought. Do you want to ask me for help?"),
+	txt("Don’t push it."),
+	txt("Fiiinnne."),
+	
+	],[
+	
+	txt("面倒が来た..."),
+	txt("えええ？勇者に会えて嬉しくないのか？"),
+	txt("お前が必要がない！"),
+	txt("分かった！じゃあね！"),
+	txt("...待って。"),
+	txt("クスクス！やっぱりね。私の助けが欲しいのか？"),
+	txt("調子に乗るな。"),
+	txt("はい、はい。"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_momijiyaya/txt_momijiyaya.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_momijiyaya",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiyreisen/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiyreisen/txt_momijiyreisen.gml

@@ -0,0 +1,35 @@
+global.everyonealive = true;
+function txt_momijiyreisen() {
+	
+	msg = msglang([
+	
+	txt("Are you the commander of the other side?"),
+	txt("Uh, I just play Shogi. I don’t really command people."),
+	txt("Oh. This... This is my first day on the job. I’m a bit nervous."),
+	global.everyonealive ? [
+		txt("Well, the enemy arrangement gave us trouble, you certainly did a good job with that."),
+		txt("R-Really!?"),
+		txt("Yeah! Everyone was positioned very strategically."),
+	] : [
+		txt(""),
+	],
+	txt("...But, I can’t have you stay on this mountain any longer."),
+	txt("...Of course."),
+	txt("Well then, this battle ends here!"),
+	
+	],[
+	
+	txt("あなたは...敵の少佐ですか"),
+	txt("ええ...私は将棋をできる人だけ..."),
+	txt("あ。今日は私の一日目です。ちょっと近著しています..."),
+	txt("まあぁ、君たちの配置は強かった。"),
+	txt("ほ...本当！？"),
+	txt("うん。 月人の戦場はとても戦略がいい。"),
+	txt("...でも、山に滞在しない。"),
+	txt("...分かります。"),
+	txt("それじゃ、私はあなたを倒します！"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_momijiyreisen/txt_momijiyreisen.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_momijiyreisen",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiytkn/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_momijiytkn/txt_momijiytkn.gml

@@ -0,0 +1,28 @@
+function txt_momijiytkn() {
+	
+	msg = msglang([
+	
+	txt("Ah! I’ve been spotted!"),
+	txt("What are you doing here?"),
+	txt("Well, I was keeping an eye on the River Kappa..."),
+	txt("But then those rabbits showed up out of nowhere!"),
+	txt("How am I supposed to get home now..."),
+	txt("There won’t be a home to go to if these rabbits have their way."),
+	txt("Why don’t you join up with us? We can fight them off together."),
+	txt("Well, it beats dying alone…"),
+	
+	],[
+	
+	txt("しまった！見つかっちゃった！"),
+	txt("ここで何をしてる？"),
+	txt("ええ、河童を見ていますが..."),
+	txt("でも、びっくりにそのウサギがあわれだ！"),
+	txt("このままで、どうすれば帰れる？"),
+	txt("ウサギに乗っ取られたら、山童か河童か、この山に帰れない。"),
+	txt("君は私たちに参加しないか？　一緒に ウナギを潰す。"),
+	txt("え、こりゃあ一人で死ぬよりましかも..."),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_momijiytkn/txt_momijiytkn.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_momijiytkn",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_nitoriytkn/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_nitoriytkn/txt_momijiytkn.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_momijiytkn",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_nitoriytkn/txt_nitoriytkn.gml

@@ -0,0 +1,30 @@
+function txt_nitoriytkn() {
+	
+	msg = msglang([
+	
+	txt("Aaah!"),
+	txt("A Yamawaro! Gah, I thought we told you to stay out of our territory!"),
+	txt("Hey! You have Scouts down by our base too, don’tcha!?"),
+	txt("T-That’s confidential!"),
+	txt("...I guess this doesn’t matter right now!"),
+	txt("Listen, if these rabbits overrun us, both the river and mountain Kappa will be toast."),
+	txt("Help us take them out!"),
+	txt("A River Kappa and a Yamawaro side by side…"),
+	txt("Well, if it’s our only way out of this, then sure!"),
+	
+	],[
+	
+	txt("うわあああ！"),
+	txt("山童！？ガ！出て行くと言っただろ！"),
+	txt("ふん！河童の諜すこと、もう知っている！"),
+	txt("ち... 違う！"),
+	txt("…今、構わない！"),
+	txt("ウサギに乗っ取られたら、河童と山童は破壊される！"),
+	txt("私たちを参加しろ！"),
+	txt("河童と山童..."),
+	txt("…もう知らん！参加するよ。"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_nitoriytkn/txt_nitoriytkn.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_nitoriytkn",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_reisen/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_reisen/txt_reisen.gml

@@ -0,0 +1,16 @@
+function txt_reisen() {
+	
+	msg = msglang([
+	
+	txt("E-Enemy spotted!"),
+	txt("I’ll stop you here!"),
+	
+	],[
+	
+	txt("て...敵!"),
+	txt("止まれ！"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_reisen/txt_reisen.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_reisen",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_test/txt_test.yy

@@ -2,8 +2,8 @@
   "isDnD": false,
   "isCompatibility": false,
   "parent": {
-    "name": "Scripts",
+    "name": "Dialogue",
-    "path": "folders/Scripts.yy",
+    "path": "folders/Dialogue.yy",
   },
   "resourceVersion": "1.0",
   "name": "txt_test",

eastern flames/scripts/txt_win/txt_.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/txt_win/txt_win.gml

@@ -0,0 +1,42 @@
+function txt_win() {
+	
+	msg = msglang([
+	
+	txt("Ow..."),
+	txt("Hm, You don’t seem like a bad person"),
+	txt("Why are the rabbits attacking?"),
+	txt("We... We’re looking to build a summer home on Earth."),
+	txt("You’re lying."),
+	txt("...Okay, fine."),
+	txt("Lady Yorihime told me that we’re relocating to Gensokyo."),
+	txt("There’s a great evil that’s taken over the Moon."),
+	txt("So, we’re going to be staying here."),
+	txt("An invasion from the Lunar Capital..."),
+	txt("I’m guessing Reimu and her friends will find their way to the Moon…"),
+	txt("...Which leaves us to defend the surface."),
+	txt("Think you’re up to it, miss Shogi master?"),
+	txt("...I won’t let anyone take over my home."),
+	txt("Okay! Let’s drive these Lunarians out of here!"),
+	
+	],[
+	
+	txt("いった。。。"),
+	txt("えっと...、 君は悪に見えない。"),
+	txt("なぜうさぎは攻撃しているのか？"),
+	txt("私たちは…海外旅行に行きたかったです...か？"),
+	txt("...それは弱い噓だぞ。"),
+	txt("...チェ。"),
+	txt("幻想郷に月人が引っ越すと依姫さまから聞きました"),
+	txt("巨悪が月に侵略しました。"),
+	txt("そんなわけで、私たちは移住します。"),
+	txt("月の来襲か... "),
+	txt("おそらく霊夢たちは直ぐに月に行く..."),
+	txt("...そして、我らは幻想郷を守る。"),
+	txt("棋士さん、出来る？"),
+	txt("...私は誰にも祖国を乗っ取らせない。"),
+	txt("よし！我らは月人を追い出す！"),
+	
+	])
+	
+	endevent = c_null;
+}

eastern flames/scripts/txt_win/txt_win.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Dialogue",
+    "path": "folders/Dialogue.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "txt_win",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/unit/unit.gml

@@ -4,6 +4,7 @@ global.units = [[],[]];
 enum ARMY {
 	US,
 	THEM,
+	GREEN,
 }
 //exit;
 

eastern flames/scripts/weapon/weapon.gml

@@ -36,15 +36,14 @@ nu weapon("knife", "bleed, bleed", WPTYPE.SWORD, [new statmod(st.str, 20, add),
 nu weapon("iron sword", "made of a cringe material", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
 
 nu weapon("Blade", "it's blade.", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
-
-
 nu weapon("Maple Leaf", "eh? not going for true end?", WPTYPE.SWORD, [new statmod(st.str, 5, add), new statmod(st.hit, 95, add)]);
 nu weapon("Microlaser", "special science laser instead of magic!", WPTYPE.SWORD, [new statmod(st.str, 4, add), new statmod(st.hit, 90, add)]);
 nu weapon("Wrench", "a wrench of a common material", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 60, add)]);
+nu weapon("Healgun", "heal-ish gun", WPTYPE.SWORD, [new statmod(st.str, 0, add), new statmod(st.str, -1, mult), new statmod(st.hit, 100, add)]);
 
 nu weapon("Bayonet", "it's out of ammo...", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 80, add)]);
 nu weapon("Rifle", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
-nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
+
 nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
 nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
 

eastern flames/scripts/x_bunnies/x_bunnies.gml

@@ -0,0 +1,164 @@
+mydata = {
+	name: "bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+
+mydata = {
+	name: "Bunny Forerunner",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bold Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Admiring Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bunny in the Middle",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Forest Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Plains Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Mountain Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bunny Buddy",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Final Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+
+mydata = {
+	name: "Bored Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Veteran Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Rabbit",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bnuuy",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Sneaky Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.ESCAPER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(6), st.def.add(4), st.spd.add(15), st.mov.add(3), st.hit.add(0), st.rng.add(1)]);
+
+
+mydata = {
+	name: "Rei'sen",
+	desc: "",
+	skills: [],
+	idle: s_reisen,
+	up: s_reisenup,
+	down: s_reisendown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(40), st.str.add(14), st.def.add(10), st.spd.add(13), st.mov.add(2), st.hit.add(0), st.rng.add(1)]);

eastern flames/scripts/x_bunnies/x_bunnies.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "x_bunnies",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/x_otherdudes/x_otherdudes.gml

@@ -0,0 +1,21 @@
+/*var mydata = {
+	name: "chara",
+	desc: "the first fallen human",
+	skills: ["SKILLS.LUNA"],
+	idle: s_momiji,
+	up: s_momijiup,
+	down: s_momijidown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+
+mydata = {
+	name: "kris",
+	desc: "totally kris",
+	skills: ["SKILLS.LUNA"],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(110), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);

eastern flames/scripts/x_otherdudes/x_otherdudes.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "x_otherdudes",
+  "tags": [],
+  "resourceType": "GMScript",
+}

eastern flames/scripts/x_units/x_units.gml

@@ -6,27 +6,7 @@ enum AI {
 	ESCAPER,
 }
 
-var mydata = {
-	name: "chara",
-	desc: "the first fallen human",
-	skills: ["SKILLS.LUNA"],
-	idle: s_momiji,
-	up: s_momijiup,
-	down: s_momijidown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
 
-mydata = {
-	name: "kris",
-	desc: "totally kris",
-	skills: ["SKILLS.LUNA"],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(110), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
 
 mydata = {
 	name: "Momiji",
@@ -42,175 +22,31 @@ mydata = {
 	name: "Nitori",
 	desc: "",
 	skills: [],
-	idle: s_bunny,
+	idle: s_nitori,
-	up: s_bunnyup,
+	up: s_nitoriup,
-	down: s_bunnydown,
+	down: s_nitoridown,
 	aitype: AI.KILLER,
 }
 nu unit(mydata, mydata, [st.hp.add(34), st.str.add(10), st.def.add(6), st.spd.add(6), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Aya",
+	desc: "",
+	skills: [],
+	idle: s_aya,
+	up: s_ayaup,
+	down: s_ayadown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(35), st.str.add(13), st.def.add(3), st.spd.add(13), st.mov.add(5), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Takane",
+	desc: "",
+	skills: [],
+	idle: s_takane,
+	up: s_takaneup,
+	down: s_takanedown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(27), st.str.add(7), st.def.add(6), st.spd.add(6), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
 
 
-mydata = {
-	name: "bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-
-mydata = {
-	name: "Bunny Forerunner",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Bold Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Admiring Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Bunny in the Middle",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Forest Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Plains Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Mountain Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Bunny Buddy",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Final Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.KILLER,
-}
-nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
-
-mydata = {
-	name: "Bored Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.WAITER,
-}
-nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Veteran Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.WAITER,
-}
-nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Rabbit",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.WAITER,
-}
-nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Bnuuy",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.WAITER,
-}
-nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
-mydata = {
-	name: "Sneaky Bunny",
-	desc: "",
-	skills: [],
-	idle: s_bunny,
-	up: s_bunnyup,
-	down: s_bunnydown,
-	aitype: AI.ESCAPER,
-}
-nu unit(mydata, mydata, [st.hp.add(20), st.str.add(6), st.def.add(4), st.spd.add(15), st.mov.add(3), st.hit.add(0), st.rng.add(1)]);
-
-
-mydata = {
-	name: "Rei'sen",
-	desc: "",
-	skills: [],
-	idle: s_reisen,
-	up: s_reisenup,
-	down: s_reisendown,
-	aitype: AI.WAITER,
-}
-nu unit(mydata, mydata, [st.hp.add(40), st.str.add(14), st.def.add(10), st.spd.add(13), st.mov.add(2), st.hit.add(0), st.rng.add(1)]);

eastern flames/sprites/s_aya/s_aya.yy

@@ -73,8 +73,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "Sprites",
+    "name": "aya",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/dudes/aya.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_aya",

eastern flames/sprites/s_ayadown/s_ayadown.yy

@@ -8,13 +8,13 @@
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
   "bbox_left": 7,
-  "bbox_right": 122,
+  "bbox_right": 26,
   "bbox_top": 4,
   "bbox_bottom": 28,
   "HTile": false,
   "VTile": false,
   "For3D": false,
-  "width": 128,
+  "width": 32,
   "height": 32,
   "textureGroupId": {
     "name": "Default",
@@ -24,9 +24,18 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"30fb6869-766e-45a9-a5c2-7b5377367372","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"d7614e95-7064-4ccf-a2fc-c20bfccef1b3","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"30fb6869-766e-45a9-a5c2-7b5377367372","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":{"name":"ea6843da-30d5-48ce-b017-b515849ed014","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"d7614e95-7064-4ccf-a2fc-c20bfccef1b3","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":{"name":"8f589687-137d-43ba-a709-64b1b9b8f3ec","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"30fb6869-766e-45a9-a5c2-7b5377367372","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"d7614e95-7064-4ccf-a2fc-c20bfccef1b3","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"da8b8c07-c9a6-4f73-962c-d464bc5266a3","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"da8b8c07-c9a6-4f73-962c-d464bc5266a3","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":{"name":"8f589687-137d-43ba-a709-64b1b9b8f3ec","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"da8b8c07-c9a6-4f73-962c-d464bc5266a3","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"1fc407a7-f1bd-422d-b10f-7bcfae14757e","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"1fc407a7-f1bd-422d-b10f-7bcfae14757e","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":{"name":"8f589687-137d-43ba-a709-64b1b9b8f3ec","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"1fc407a7-f1bd-422d-b10f-7bcfae14757e","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"c2d14670-a8a7-4fe6-82b5-1c983cfdf776","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c2d14670-a8a7-4fe6-82b5-1c983cfdf776","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":{"name":"8f589687-137d-43ba-a709-64b1b9b8f3ec","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"c2d14670-a8a7-4fe6-82b5-1c983cfdf776","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
     "spriteId": {"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},
@@ -36,12 +45,15 @@
     "playbackSpeedType": 0,
     "autoRecord": true,
     "volume": 1.0,
-    "length": 1.0,
+    "length": 4.0,
     "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"28659646-7cc5-4922-9987-c21e6607fa2f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"30fb6869-766e-45a9-a5c2-7b5377367372","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"56ab239d-ac98-4df9-9cd0-b2dc3d77e1c6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d7614e95-7064-4ccf-a2fc-c20bfccef1b3","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"5c9c4601-003f-41ba-a9e4-4b0f693ad33a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"da8b8c07-c9a6-4f73-962c-d464bc5266a3","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"c65822fc-99fc-4cd3-b3d8-51e1a3dad6eb","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1fc407a7-f1bd-422d-b10f-7bcfae14757e","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"e38fb132-8364-4e41-83bc-c1919dd1969f","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c2d14670-a8a7-4fe6-82b5-1c983cfdf776","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -65,12 +77,12 @@
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ea6843da-30d5-48ce-b017-b515849ed014","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8f589687-137d-43ba-a709-64b1b9b8f3ec","tags":[],"resourceType":"GMImageLayer",},
   ],
   "nineSlice": null,
   "parent": {
-    "name": "Sprites",
+    "name": "aya",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/dudes/aya.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_ayadown",

eastern flames/sprites/s_ayaup/s_ayaup.yy

@@ -81,8 +81,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "Sprites",
+    "name": "aya",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/dudes/aya.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_ayaup",

eastern flames/sprites/s_box/s_box.yy

@@ -0,0 +1,103 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 0,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 0,
+  "bbox_right": 29,
+  "bbox_top": 0,
+  "bbox_bottom": 29,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 30,
+  "height": 30,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"c4b43451-f8e3-4e4a-8921-71c7109c5464","path":"sprites/s_box/s_box.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c4b43451-f8e3-4e4a-8921-71c7109c5464","path":"sprites/s_box/s_box.yy",},"LayerId":{"name":"f5479fae-ab88-497e-97e6-e26e5f7d2288","path":"sprites/s_box/s_box.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_box","path":"sprites/s_box/s_box.yy",},"resourceVersion":"1.0","name":"c4b43451-f8e3-4e4a-8921-71c7109c5464","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_box","path":"sprites/s_box/s_box.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<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"a63db845-c17e-414f-b55a-35b2624592de","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c4b43451-f8e3-4e4a-8921-71c7109c5464","path":"sprites/s_box/s_box.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"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": 0,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_box","path":"sprites/s_box/s_box.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_box",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f5479fae-ab88-497e-97e6-e26e5f7d2288","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": {
+    "left": 3,
+    "top": 3,
+    "right": 3,
+    "bottom": 3,
+    "guideColour": [
+      4294902015,
+      4294902015,
+      4294902015,
+      4294902015,
+    ],
+    "highlightColour": 1728023040,
+    "highlightStyle": 0,
+    "enabled": true,
+    "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_box",
+  "tags": [],
+  "resourceType": "GMSprite",
+}

eastern flames/sprites/s_bunny/s_bunny.yy

@@ -74,7 +74,7 @@
   "nineSlice": null,
   "parent": {
     "name": "wabbit",
-    "path": "folders/Sprites/wabbit.yy",
+    "path": "folders/Sprites/dudes/wabbit.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_bunny",

eastern flames/sprites/s_bunnydown/s_bunnydown.yy

@@ -82,7 +82,7 @@
   "nineSlice": null,
   "parent": {
     "name": "wabbit",
-    "path": "folders/Sprites/wabbit.yy",
+    "path": "folders/Sprites/dudes/wabbit.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_bunnydown",

eastern flames/sprites/s_bunnyup/s_bunnyup.yy

@@ -82,7 +82,7 @@
   "nineSlice": null,
   "parent": {
     "name": "wabbit",
-    "path": "folders/Sprites/wabbit.yy",
+    "path": "folders/Sprites/dudes/wabbit.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_bunnyup",

eastern flames/sprites/s_guy/s_guy.yy

@@ -69,8 +69,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "Sprites",
+    "name": "eastern flames",
-    "path": "folders/Sprites.yy",
+    "path": "eastern flames.yyp",
   },
   "resourceVersion": "1.0",
   "name": "s_guy",

eastern flames/sprites/s_momiji/s_momiji.yy

@@ -74,7 +74,7 @@
   "nineSlice": null,
   "parent": {
     "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
+    "path": "folders/Sprites/dudes/momiji.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_momiji",

eastern flames/sprites/s_momijidown/s_momijidown.yy

@@ -82,7 +82,7 @@
   "nineSlice": null,
   "parent": {
     "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
+    "path": "folders/Sprites/dudes/momiji.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_momijidown",

eastern flames/sprites/s_momijiup/s_momijiup.yy

@@ -82,7 +82,7 @@
   "nineSlice": null,
   "parent": {
     "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
+    "path": "folders/Sprites/dudes/momiji.yy",
   },
   "resourceVersion": "1.0",
   "name": "s_momijiup",

eastern flames/sprites/s_nitori/s_nitori.yy

@@ -0,0 +1,83 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 7,
+  "bbox_right": 24,
+  "bbox_top": 5,
+  "bbox_bottom": 25,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 32,
+  "height": 32,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"c0d82e37-179f-4aef-8c20-53561901a506","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"712b567c-8e0f-455e-ba74-776434d10a2f","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"c0d82e37-179f-4aef-8c20-53561901a506","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 2.0,
+    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"6aa94ef3-e8a4-4aee-9890-9a003f8f6a49","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"966860dd-e405-45a1-8dbf-9f65f933293a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"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": 16,
+    "yorigin": 26,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_nitori",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c0d82e37-179f-4aef-8c20-53561901a506","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "nitori",
+    "path": "folders/Sprites/dudes/nitori.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_nitori",
+  "tags": [],
+  "resourceType": "GMSprite",
+}

eastern flames/sprites/s_nitoridown/s_nitori.yy

@@ -0,0 +1,83 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 4,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 7,
+  "bbox_right": 24,
+  "bbox_top": 5,
+  "bbox_bottom": 25,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 32,
+  "height": 32,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"c0d82e37-179f-4aef-8c20-53561901a506","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"712b567c-8e0f-455e-ba74-776434d10a2f","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"c0d82e37-179f-4aef-8c20-53561901a506","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 2.0,
+    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"6aa94ef3-e8a4-4aee-9890-9a003f8f6a49","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"966860dd-e405-45a1-8dbf-9f65f933293a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"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": 16,
+    "yorigin": 16,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_nitori",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c0d82e37-179f-4aef-8c20-53561901a506","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_nitori",
+  "tags": [],
+  "resourceType": "GMSprite",
+}