From 33483b43c9f7917078625f08ece378dd2826302d Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 13 May 2020 17:24:07 -0300 Subject: [PATCH 01/86] Change "Room speed" to "Max frame rate" Fixes #146 --- scripts/draw_window_preferences/draw_window_preferences.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 7671b1eea..912ce70c6 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -90,7 +90,7 @@ if (selected_tab = 0) { if (draw_radiobox(x1 + 40, y1 + 164 + 16, theme == 0, "Aqua", "Use the aqua theme.")) {theme = 0 change_theme()} if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20, theme == 2, "Dark", "Use the dark theme.")) {theme = 2 change_theme()} if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20 + 20, theme == 1, "90s", "Use the 90s theme.")) {theme = 1 change_theme()} - draw_areaheader(x1+258,y1+164,220,60,"Room Speed (Experimental)") + draw_areaheader(x1+258,y1+164,220,60,"Max frame rate (experimental)") if (draw_radiobox(x1+274,y1+164+16,!refreshrate,"30FPS","Run the program at 30FPS.")) { game_set_speed(30,gamespeed_fps) refreshrate=0 From 042d20715af33bfaa335bd2ebe7df6254e6685dc Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sun, 17 May 2020 18:06:12 -0300 Subject: [PATCH 02/86] Change "sound file" to "MIDI file" in greeting window Fixes #142 --- scripts/draw_window_greeting/draw_window_greeting.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_greeting/draw_window_greeting.gml b/scripts/draw_window_greeting/draw_window_greeting.gml index 4024bf48e..0660a96b1 100644 --- a/scripts/draw_window_greeting/draw_window_greeting.gml +++ b/scripts/draw_window_greeting/draw_window_greeting.gml @@ -133,7 +133,7 @@ a = mouse_rectangle(b, c, 224, 32) a += (a && (mouse_check_button(mb_left) || mouse_check_button_released(mb_left))) draw_sprite(spr_frame2, a + 3 * theme, b, c) draw_sprite(spr_bigicons, 2, b + (a > 1), c + (a > 1)) -draw_text(b + 48 + (a > 1), c + 9 + (a > 1), "Generate song out of sound file") +draw_text(b + 48 + (a > 1), c + 9 + (a > 1), "Generate song out of MIDI file") if (a = 2 && mouse_check_button_released(mb_left)) open_midi("") b = x1 + 300 From ad1f03c09254da5c6ace20c807739ab671f10b3a Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sun, 17 May 2020 18:31:15 -0300 Subject: [PATCH 03/86] Delete temp folder before/after creating a data pack More problems with GameMaker's sandbox: https://docs.yoyogames.com/source/dadiospice/002_reference/file%20handling/directory_destroy.html Fixes #143 --- scripts/datapack_export/datapack_export.gml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/datapack_export/datapack_export.gml b/scripts/datapack_export/datapack_export.gml index aaf5a231e..f09b0afb2 100644 --- a/scripts/datapack_export/datapack_export.gml +++ b/scripts/datapack_export/datapack_export.gml @@ -37,6 +37,9 @@ with (new(obj_dummy2)) { // Create folder structure tempdir = data_directory + "TempDatapack\\" + if (directory_exists_lib(tempdir)) { + directory_delete_lib(tempdir) + } functiondir = dat_makefolders(path, namespace) //pack.mcmeta @@ -143,7 +146,7 @@ with (new(obj_dummy2)) { ExecuteShell("\"" + data_directory + "move.bat\" \"" + fn + "\\\"", true, true) } - directory_destroy(tempdir) + directory_delete_lib(tempdir) instance_destroy() } message("Data pack saved!" + br + br + "To play the song in-game, use:" + br + br + "/function " + functionpath + "play" + br + "/function " + functionpath + "pause" + br + "/function " + functionpath + "stop","Data Pack Export") From 09782f3f396cfd991749ff7a10bf04f51c6af633 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sun, 17 May 2020 19:51:50 -0300 Subject: [PATCH 04/86] Add script to draw text as a URL --- Minecraft Note Block Studio.yyp | 9 ++++++++ scripts/draw_text_url/draw_text_url.gml | 21 +++++++++++++++++++ scripts/draw_text_url/draw_text_url.yy | 8 +++++++ views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy | 3 ++- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 scripts/draw_text_url/draw_text_url.gml create mode 100644 scripts/draw_text_url/draw_text_url.yy diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index b4ce7a5f4..04b44b7c0 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -1102,6 +1102,14 @@ "resourceType": "GMScript" } }, + { + "Key": "40098377-e7c6-4b5e-a120-da03737a0214", + "Value": { + "id": "5fee1600-9815-449d-b6bc-f0d282d71b6e", + "resourcePath": "scripts\\draw_text_url\\draw_text_url.yy", + "resourceType": "GMScript" + } + }, { "Key": "40a52518-cec3-4511-9f3b-a8ab42f01822", "Value": { @@ -4331,6 +4339,7 @@ "ab93f4d7-71bd-4260-85f1-366e065b1656", "fca0f17f-26af-492a-84ef-996e87cb1bb6", "796c8fe4-8c63-4006-854e-09d8afd9f16a", + "40098377-e7c6-4b5e-a120-da03737a0214", "34fabfc3-6919-45bb-801b-7f8ba4763e7f", "59d9febe-e0ed-4521-bf23-90d0f68a15da", "98e2e6c6-16e2-4c86-958d-4c6f3357273d", diff --git a/scripts/draw_text_url/draw_text_url.gml b/scripts/draw_text_url/draw_text_url.gml new file mode 100644 index 000000000..a7e15f7d3 --- /dev/null +++ b/scripts/draw_text_url/draw_text_url.gml @@ -0,0 +1,21 @@ +// draw_text_url(x, y, text, url) +// Draws a piece of text that opens a URL when clicked + +var xx, yy, text, url, width + +xx = argument0 +yy = argument1 +text = argument2 +url = argument3 +width = string_width(text) + +draw_set_color(make_color_rgb(62, 144, 255)) +draw_text_center(xx, yy, text) +draw_line(xx - floor(width/2) - 1, yy + 12, xx + ceil(width/2) - 1, yy + 13) +draw_theme_color() + +if (mouse_rectangle(xx - width/2, yy, width, 12)) { + curs = cr_handpoint + if (mouse_check_button_pressed(mb_left)) + open_url(url) +} diff --git a/scripts/draw_text_url/draw_text_url.yy b/scripts/draw_text_url/draw_text_url.yy new file mode 100644 index 000000000..215081c6f --- /dev/null +++ b/scripts/draw_text_url/draw_text_url.yy @@ -0,0 +1,8 @@ +{ + "id": "40098377-e7c6-4b5e-a120-da03737a0214", + "modelName": "GMScript", + "mvc": "1.0", + "name": "draw_text_url", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy b/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy index eef07bed5..3d95e8dbf 100644 --- a/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy +++ b/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy @@ -31,7 +31,8 @@ "06542021-ad62-4bba-857f-09ba0f0f8534", "ab93f4d7-71bd-4260-85f1-366e065b1656", "fca0f17f-26af-492a-84ef-996e87cb1bb6", - "796c8fe4-8c63-4006-854e-09d8afd9f16a" + "796c8fe4-8c63-4006-854e-09d8afd9f16a", + "40098377-e7c6-4b5e-a120-da03737a0214" ], "filterType": "GMScript", "folderName": "Interface", From d5cb160dfb566a30ee7537c920c456814196e35a Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sun, 17 May 2020 19:53:41 -0300 Subject: [PATCH 05/86] Use URL drawing function; change website URL to new domain name --- .../draw_window_greeting.gml | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/scripts/draw_window_greeting/draw_window_greeting.gml b/scripts/draw_window_greeting/draw_window_greeting.gml index 0660a96b1..09e4bcf16 100644 --- a/scripts/draw_window_greeting/draw_window_greeting.gml +++ b/scripts/draw_window_greeting/draw_window_greeting.gml @@ -6,7 +6,7 @@ y1 = floor(window_height / 2 - 210) draw_window(x1, y1, x1 + 700, y1 + 430) draw_sprite_ext(spr_logo, 0, x1 + 64, y1 + 50, 0.55, 0.55, 0, c_white, 1) draw_set_font(fnt_info_med_bold) -draw_text_center(x1 + 132, y1 + 213, "Open Minecraft Note Block Studio") +draw_text_center(x1 + 132, y1 + 213, "Open Note Block Studio") draw_set_font(fnt_mainbold) if (check_update) { if (update = -1) { @@ -39,27 +39,10 @@ draw_theme_color() draw_text_center(x1 + 132, y1 + 233, "Version " + version + " - Released " + version_date) draw_text_center(x1 + 132, y1 + 280, "Open source Minecraft Note Block Studio") draw_set_color(make_color_rgb(62, 144, 255)) -draw_text_center(x1 + 132, y1 + 296, "www.git.io/fjQH3") -draw_line(x1 + 85, y1 + 309, x1 + 177, y1 + 309) - -a = mouse_rectangle(x1 + 86, y1 + 298, 92, 12) -if (a) { - curs = cr_handpoint - if (mouse_check_button_pressed(mb_left)) - open_url("https://git.io/fjQH3") -} - +draw_text_url(x1 + 132, y1 + 296, "opennbs.org", "https://git.io/fjQH3") draw_theme_color() draw_text_center(x1 + 132, y1 + 340, "Original created by David Norgren") -draw_set_color(make_color_rgb(62, 144, 255)) -draw_text_center(x1 + 132, y1 + 356, "www.stuffbydavid.com") -draw_line(x1 + 70, y1 + 369, x1 + 193, y1 + 369) -a = mouse_rectangle(x1 + 71, y1 + 358, 123, 12) -if (a) { - curs = cr_handpoint - if (mouse_check_button_pressed(mb_left)) - open_url("http://www.stuffbydavid.com") -} +draw_text_url(x1 + 132, y1 + 356, "stuffbydavid.com", "https://www.stuffbydavid.com") draw_set_color(c_white) draw_line(x1 + 270, y1 + 24, x1 + 270, y1 + 396) draw_set_alpha(0.25) From e5a8e624028ca4cb393e43394035bfbb11321943 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 18 May 2020 04:37:02 -0300 Subject: [PATCH 06/86] Add separate option for enabling the loop in a song Enabling looping persistently for a song now requires ticking the "Enable looping" check box in Song properties. The loop button in the toolbar will only control looping for the current session; however, its state will be loaded from the song when you open a song. --- scripts/control_create/control_create.gml | 1 + scripts/control_draw/control_draw.gml | 2 +- .../draw_window_properties/draw_window_properties.gml | 11 ++++++----- scripts/load_song/load_song.gml | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 1613d11b0..ac6d9cb9b 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -235,6 +235,7 @@ asso_midi = 0 asso_sch = 0 w_asso_start = 1 wmenu = 0 +loop_toggle = 0 loop = 0 loopmax = 0 loopstart = 0 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index bfdda5846..d4958be76 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1079,7 +1079,7 @@ forward = 0 if (draw_icon(icons.BACK, xx, "Rewind song", 0, 0)) {forward = -1} xx += 25 if (draw_icon(icons.FORWARD, xx, "Fast-forward song", 0, 0)) {forward = 1} xx += 25 if (draw_icon(icons.RECORD, xx, "Record key presses", 0, playing > 0 && record)) {playing = 0.25 record=!record} xx += 25 -if (draw_icon(icons.LOOP_INACTIVE + loop, xx, "Toggle looping", 0, 0)) loop = !loop xx += 25 +if (draw_icon(icons.LOOP_INACTIVE + loop_toggle, xx, "Toggle looping", 0, 0)) loop_toggle = !loop_toggle xx += 25 if metronome { if (metronome_played == -1 || (metronome_played - 1) mod 8 == 0) metricon = icons.METRONOME_1 else metricon = icons.METRONOME_2 diff --git a/scripts/draw_window_properties/draw_window_properties.gml b/scripts/draw_window_properties/draw_window_properties.gml index 6b9babe1a..0aff433d3 100644 --- a/scripts/draw_window_properties/draw_window_properties.gml +++ b/scripts/draw_window_properties/draw_window_properties.gml @@ -47,12 +47,13 @@ timesignature = median(2, draw_dragvalue(3, x1 + 120, y1 + 270, timesignature, 1 draw_text(x1 + 120 + string_width(string(timesignature)), y1 + 270, " / 4") popup_set_window(x1 + 32, y1 + 268, 110, 18, "The time signature of the song.") -draw_text(x1 + 232, y1 + 270, "Loop start tick:") -loopstart = median(0, draw_dragvalue(7, x1 + 320, y1 + 270, loopstart, 0.5), obj_controller.enda) +if (draw_checkbox(x1 + 232, y1 + 270, loop, "Enable looping", "Whether to loop this song back to"+br+"the start at the end of playback.")) loop=!loop +draw_text(x1 + 232, y1 + 290, "Loop start tick:") +loopstart = median(0, draw_dragvalue(7, x1 + 320, y1 + 290, loopstart, 0.5), obj_controller.enda) -draw_text(x1 + 232, y1 + 290, "Times to loop:") -loopmax = median(0, draw_dragvalue(13, x1 + 320, y1 + 290, loopmax, 0.5), 10) -if loopmax = 0 draw_text(x1 + 340, y1 + 290, "(infinite)") +draw_text(x1 + 232, y1 + 310, "Times to loop:") +loopmax = median(0, draw_dragvalue(13, x1 + 320, y1 + 310, loopmax, 0.5), 10) +if loopmax = 0 draw_text(x1 + 340, y1 + 310, "(infinite)") timestoloop = loopmax if (draw_button2(x1 + 320, y1 + 328, 72, "OK")) {window = 0} window_set_cursor(curs) diff --git a/scripts/load_song/load_song.gml b/scripts/load_song/load_song.gml index 85783d861..240a3bc7c 100644 --- a/scripts/load_song/load_song.gml +++ b/scripts/load_song/load_song.gml @@ -90,6 +90,7 @@ if (file_ext = ".nbs") { // LOOP if (song_nbs_version >= 4) { loop = buffer_read_byte() + loop_toggle = loop if (string_count("format4beta", filename_name(fn)) = 1) { loopstart = buffer_read_byte() loopmax = 0 From 13c5808775126742bbe693d3b4504d3cd9b0c215 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 18 May 2020 06:02:14 -0300 Subject: [PATCH 07/86] Improve layout of song properties window --- .../draw_window_properties.gml | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/scripts/draw_window_properties/draw_window_properties.gml b/scripts/draw_window_properties/draw_window_properties.gml index 0aff433d3..ded42f9c9 100644 --- a/scripts/draw_window_properties/draw_window_properties.gml +++ b/scripts/draw_window_properties/draw_window_properties.gml @@ -3,8 +3,8 @@ var x1, y1, a; curs = cr_default text_exists[0] = 0 x1 = floor(window_width / 2 - 220) -y1 = floor(window_height / 2 - 180) -draw_window(x1, y1, x1 + 440, y1 + 360) +y1 = floor(window_height / 2 - 200) +draw_window(x1, y1, x1 + 440, y1 + 400) draw_set_font(fnt_mainbold) draw_text(x1 + 8, y1 + 8, "Song Properties") draw_set_font(fnt_main) @@ -42,18 +42,31 @@ song_desc = draw_textarea(4, x1 + 158, y1 + 64 + 23 * 3, 240, 100, song_desc, "E if (a != song_desc) changed = 1 draw_theme_color() -draw_text(x1 + 32, y1 + 270, "Time signature:") -timesignature = median(2, draw_dragvalue(3, x1 + 120, y1 + 270, timesignature, 1), 8) -draw_text(x1 + 120 + string_width(string(timesignature)), y1 + 270, " / 4") -popup_set_window(x1 + 32, y1 + 268, 110, 18, "The time signature of the song.") - -if (draw_checkbox(x1 + 232, y1 + 270, loop, "Enable looping", "Whether to loop this song back to"+br+"the start at the end of playback.")) loop=!loop -draw_text(x1 + 232, y1 + 290, "Loop start tick:") -loopstart = median(0, draw_dragvalue(7, x1 + 320, y1 + 290, loopstart, 0.5), obj_controller.enda) - -draw_text(x1 + 232, y1 + 310, "Times to loop:") -loopmax = median(0, draw_dragvalue(13, x1 + 320, y1 + 310, loopmax, 0.5), 10) -if loopmax = 0 draw_text(x1 + 340, y1 + 310, "(infinite)") +draw_areaheader(x1 + 22, y1 + 268, 396, 85, "Playback") + +draw_text(x1 + 37, y1 + 285, "Time signature:") +timesignature = median(2, draw_dragvalue(3, x1 + 135, y1 + 285, timesignature, 1), 8) +draw_text(x1 + 135 + string_width(string(timesignature)), y1 + 285, " / 4") +popup_set_window(x1 + 37, y1 + 283, 110, 18, "The time signature of the song.") + +if (draw_checkbox(x1 + 232, y1 + 285, loop, "Enable looping", "Whether to loop this song back to"+br+"the start at the end of playback.")) loop=!loop +if (!loop) draw_set_color(c_gray) +draw_text(x1 + 232, y1 + 305, "Loop start tick:") +if (loop) { + loopstart = median(0, draw_dragvalue(7, x1 + 320, y1 + 305, loopstart, 0.5), obj_controller.enda) +} else { + draw_text(x1 + 320, y1 + 305, loopstart) +} + +draw_text(x1 + 232, y1 + 325, "Times to loop:") +if (loop) { + loopmax = median(0, draw_dragvalue(13, x1 + 320, y1 + 325, loopmax, 0.5), 10) +} else { + draw_text(x1 + 320, y1 + 325, loopmax) +} +if (loopmax = 0) draw_text(x1 + 340, y1 + 325, "(infinite)") timestoloop = loopmax -if (draw_button2(x1 + 320, y1 + 328, 72, "OK")) {window = 0} +draw_theme_color() + +if (draw_button2(x1 + 430 - 72, y1 + 366, 72, "OK")) {window = 0} window_set_cursor(curs) From eb42b1e737c5f97fc0f038ba4271d5fbcfaa78de Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 18 May 2020 06:39:16 -0300 Subject: [PATCH 08/86] Fix input box ID clashes ...between macros, data pack info, clipboard editor and custom instrument names. Moved all new text inputs in ONBS to IDs 50-99. --- scripts/control_create/control_create.gml | 1 - .../draw_window_branch_export.gml | 4 ++-- .../draw_window_clip_editor.gml | 5 ++--- .../draw_window_datapack_export.gml | 10 +++++----- .../draw_window_macro_arpeggio.gml | 2 +- .../draw_window_macro_stagger.gml | 2 +- scripts/reset/reset.gml | 1 - 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index ac6d9cb9b..f6836f5af 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -324,7 +324,6 @@ leg_sus = 20 port_cent = 0 porta_reverse = 0 stereo_width = 50 -times_clipedited = 0 setvel = 100 setpan = 0 setpit = 0 diff --git a/scripts/draw_window_branch_export/draw_window_branch_export.gml b/scripts/draw_window_branch_export/draw_window_branch_export.gml index 90a08d018..4c9fa41e9 100644 --- a/scripts/draw_window_branch_export/draw_window_branch_export.gml +++ b/scripts/draw_window_branch_export/draw_window_branch_export.gml @@ -102,8 +102,8 @@ if (selected_tab_sch = 0) { draw_text(x1 + 520, y1 + 240 + 16, string(enda * 2 + 4) + "x" + string(2) + "x" + string(schwidth)) draw_set_halign(fa_left) draw_text(x1 + 380, y1 + 280, "Range:") - sch_exp_range_start = draw_inputbox(25,x1 + 380, y1 + 300,40,sch_exp_range_start,"Start Tick") - sch_exp_range_end = draw_inputbox(26,x1 + 425, y1 + 300,40,sch_exp_range_end,"End Tick") + sch_exp_range_start = draw_inputbox(55,x1 + 380, y1 + 300,40,sch_exp_range_start,"Start Tick") + sch_exp_range_end = draw_inputbox(56,x1 + 425, y1 + 300,40,sch_exp_range_end,"End Tick") draw_set_halign(fa_left) } else { if (theme = 1) { diff --git a/scripts/draw_window_clip_editor/draw_window_clip_editor.gml b/scripts/draw_window_clip_editor/draw_window_clip_editor.gml index fdb2ca0c7..582243097 100644 --- a/scripts/draw_window_clip_editor/draw_window_clip_editor.gml +++ b/scripts/draw_window_clip_editor/draw_window_clip_editor.gml @@ -1,7 +1,6 @@ // draw_window_clip_editor() var x1, y1; curs = cr_default -text_exists[0] = 0 x1 = floor(window_width / 2 - 220) y1 = floor(window_height / 2 - 215) draw_window(x1, y1, x1 + 440, y1 + 430) @@ -17,10 +16,10 @@ if (theme = 0) { draw_theme_color() draw_areaheader(x1 + 22, y1 + 48, 396, 330, "Clipboard") draw_theme_color() -selection_copied = draw_text_edit(23 + times_clipedited, selection_copied, x1 + 32, y1 + 23 * 3, 370, 300, 0, 0) +text_exists[59] = 0 +selection_copied = draw_text_edit(59, selection_copied, x1 + 32, y1 + 23 * 3, 370, 300, 0, 0) if (draw_button2(x1 + 320, y1 + 398, 72, "OK")) { - if times_clipedited < 100 times_clipedited ++ window = 0 } window_set_cursor(curs) \ No newline at end of file diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml index a6842413e..a76b8ce79 100644 --- a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml +++ b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml @@ -73,21 +73,21 @@ if (selected_tab_dat = 0) { if (song_name != "") dat_name = song_name else if (filename != "") dat_name = string_copy(filename_name(filename), 1, string_length(filename_name(filename))-4) else dat_name = "" - dat_name = draw_inputbox(20,x1 + 16, y1 + 225,145,dat_name,"This name will be used in the command"+br+"for playing the song inside the game.") + dat_name = draw_inputbox(50,x1 + 16, y1 + 225,145,dat_name,"This name will be used in the command"+br+"for playing the song inside the game.") //Namespace draw_set_color(c_gray) if ((string_path(dat_name) != "") && (string_path(dat_namespace) != "")) draw_theme_color() draw_text(x1 + 16, y1 + 255, "Namespace:") draw_theme_color() - dat_namespace = draw_inputbox(21,x1 + 16, y1 + 272,145,dat_namespace,"(optional) Use this to place the functions under a custom namespace."+br+"If empty, namespace will be the name of the song.") + dat_namespace = draw_inputbox(51,x1 + 16, y1 + 272,145,dat_namespace,"(optional) Use this to place the functions under a custom namespace."+br+"If empty, namespace will be the name of the song.") //Path draw_set_color(c_gray) if ((string_path(dat_name) != "") && (string_path(dat_namespace) != "") && dat_getpath(dat_path) != "") draw_theme_color() draw_text(x1 + 16, y1 + 301, "Path:") draw_theme_color() - dat_path = draw_inputbox(22,x1 + 16, y1 + 318,145,dat_path,"(optional) Path to the song from the main 'functions'"+br+"folder. You can use '/' to add subfolders.") + dat_path = draw_inputbox(52,x1 + 16, y1 + 318,145,dat_path,"(optional) Path to the song from the main 'functions'"+br+"folder. You can use '/' to add subfolders.") //Preview draw_text(x1 + 16, y1 + 348, "Command preview:") @@ -162,9 +162,9 @@ if (selected_tab_dat = 0) { dat_yval = median(0, draw_dragvalue(11, x1 + 33, y1 + 275, dat_yval, 0.5), 256) draw_text(x1 + 33, y1 + 295, "Position in map:") draw_text(x1 + 33, y1 + 318, "X value:") - dat_xval = draw_inputbox(23,x1 + 83, y1 + 315,40,dat_xval,"X value") + dat_xval = draw_inputbox(53,x1 + 83, y1 + 315,40,dat_xval,"X value") draw_text(x1 + 33, y1 + 338, "Z value:") - dat_zval = draw_inputbox(24,x1 + 83, y1 + 335,40,dat_zval,"Z value") + dat_zval = draw_inputbox(54,x1 + 83, y1 + 335,40,dat_zval,"Z value") //Get note block textures button if (draw_button2(x1 + 13, y1 + 360, 152, "Get note block textures")) { datapack_getinstextures() diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml index fd916e4df..e9f565dc0 100644 --- a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml +++ b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml @@ -18,7 +18,7 @@ if (theme = 0) { } draw_areaheader(x1 + 10, y1 + 43, 120, 35, "Pattern") -pattern = draw_textarea(7, x1 + 15, y1 + 50, 113, 25, string(pattern), "Must separate relative keys with pipes.") +pattern = draw_textarea(57, x1 + 15, y1 + 50, 113, 25, string(pattern), "Must separate relative keys with pipes.") draw_theme_color() if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) { diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml index bfcc45144..056eb94b5 100644 --- a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml +++ b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml @@ -22,7 +22,7 @@ if (theme = 0) { } draw_areaheader(x1 + 15, y1 + 53, 120, 35, "Pattern") -pattern = draw_textarea(5, x1 + 20, y1 + 60, 113, 25, string(pattern), "Must separate relative keys with pipes.") +pattern = draw_textarea(58, x1 + 20, y1 + 60, 113, 25, string(pattern), "Must separate relative keys with pipes.") draw_set_font(fnt_main) draw_text(x1 + 25, y1 + 92,"This may replace \nlower note blocks!") if (draw_button2(x1 + 15, y1 + 128, 60, "OK")) { diff --git a/scripts/reset/reset.gml b/scripts/reset/reset.gml index ae05c3085..7d1030e64 100644 --- a/scripts/reset/reset.gml +++ b/scripts/reset/reset.gml @@ -134,7 +134,6 @@ leg_sus = 20 port_cent = 0 porta_reverse = 0 stereo_width = 50 -times_clipedited = 0 setvel = 100 setpan = 0 setpit = 0 From ca5c2d660ae7502b589363556c06314b42cc08d2 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 18 May 2020 17:38:53 -0300 Subject: [PATCH 09/86] Set unsaved changes when changing layer properties Renaming, shifting, adding, removing or (un)locking layers will now mark the song as having unsaved changes. --- scripts/add_layer/add_layer.gml | 1 + scripts/control_draw/control_draw.gml | 9 ++++++++- scripts/remove_layer/remove_layer.gml | 1 + scripts/shift_layers/shift_layers.gml | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/add_layer/add_layer.gml b/scripts/add_layer/add_layer.gml index 24631917c..ba66e2123 100644 --- a/scripts/add_layer/add_layer.gml +++ b/scripts/add_layer/add_layer.gml @@ -72,4 +72,5 @@ layerlock[num] = lock layervol[num] = vol layerstereo[num] = pan +changed = 1 if (!argument[1]) history_set(h_addlayer, num, blocks, xx, name, lock, vol, pan) \ No newline at end of file diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index d4958be76..cdf01c4b5 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1,5 +1,5 @@ // control_draw() -var a, b, c, d, e, f, g, p, l, s, exist, str, str2, m, xx, x1, y1, x2, y2, iconcolor, showmenu, rw, rh, totalcols, totalrows, compx +var a, b, c, d, e, f, g, p, l, s, exist, str, str2, m, xx, x1, y1, x2, y2, iconcolor, showmenu, rw, rh, totalcols, totalrows, compx, prev rw = window_width rh = window_height curs = cr_default @@ -827,12 +827,14 @@ for (b = 0; b < totalrows; b += 1) { draw_sprite(spr_layerbox, 0 + (theme = 2), x1, y1) popup_set(x1 + 10, y1 + 10, 75, 13, "The name for this layer") draw_set_font(fnt_small) + prev = layername[startb + b] layername[startb + b] = draw_text_edit(100 + startb + b, layername[startb + b], x1 + 11, y1 + 10, 72, 14, 1, 0) if (layername[startb + b] = "") { draw_set_color(c_gray) if(theme = 2) draw_set_color(make_color_rgb(160, 160, 160)) draw_text(x1 + 11, y1 + 10, "Layer " + string(startb + b + 1)) } + if (prev != layername[startb + b]) changed = 1 draw_theme_color() // Vol if (realvolume) { @@ -894,6 +896,7 @@ for (b = 0; b < totalrows; b += 1) { if (draw_layericon(0, x1 + 126-!realvolume-realstereo * 10, y1 + 8, "Lock this layer", 0, p)) { if (layerlock[startb + b] = 2) solostr = string_replace_all(solostr, "|" + string(startb + b) + "|", "") if (layerlock[startb + b] = 1) {layerlock[startb + b] = 0} else {layerlock[startb + b] = 1} + changed = 1 } // Solo button p = 0 @@ -938,6 +941,7 @@ for (b = 0; b < totalrows; b += 1) { } } if (window = w_dragvol) { + prev = layervol[dragvolb] dragvol += (mouse_yprev - mouse_y) dragvol = median(0, dragvol, 100) if (!keyboard_check(vk_shift)) { @@ -945,11 +949,13 @@ if (window = w_dragvol) { } else { layervol[dragvolb] = dragvol } + if (layervol[dragvolb] != prev) changed = 1 if (!mouse_check_button(mb_left)) { window = w_releasemouse } } if (window = w_dragstereo) { + prev = layerstereo[dragstereob] dragstereo += (mouse_yprev - mouse_y) dragstereo = median(0, dragstereo, 200) if (!keyboard_check(vk_shift)) { @@ -957,6 +963,7 @@ if (window = w_dragstereo) { } else { layerstereo[dragstereob] = dragstereo } + if (layerstereo[dragstereob] != prev) changed = 1 if (!mouse_check_button(mb_left)) { window = w_releasemouse } diff --git a/scripts/remove_layer/remove_layer.gml b/scripts/remove_layer/remove_layer.gml index 58cad0514..ae636f012 100644 --- a/scripts/remove_layer/remove_layer.gml +++ b/scripts/remove_layer/remove_layer.gml @@ -56,4 +56,5 @@ for (l = num; l < endb2 - 1; l++) { endb2 -= 1 +changed = 1 if (!argument1) history_set(h_removelayer, num, blocks, xx, name, lock, vol, pan) \ No newline at end of file diff --git a/scripts/shift_layers/shift_layers.gml b/scripts/shift_layers/shift_layers.gml index 12d2137d4..5410ed5a4 100644 --- a/scripts/shift_layers/shift_layers.gml +++ b/scripts/shift_layers/shift_layers.gml @@ -51,4 +51,5 @@ layerstereo[l2] = templayerstereo // Swap name boxes swap_text_edit(100 + l1, 100 + l2) +changed = 1 if (!argument2) history_set(h_swaplayer, l1, l2) \ No newline at end of file From 56c35dedb2df182590733ea7034115ddbfdbbb82 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 18 May 2020 17:40:29 -0300 Subject: [PATCH 10/86] Set unsaved changes when editing song properties Changing the time signature, looping, loop start tick or max loop count will now mark the song as having unsaved changes. --- scripts/draw_window_properties/draw_window_properties.gml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/draw_window_properties/draw_window_properties.gml b/scripts/draw_window_properties/draw_window_properties.gml index ded42f9c9..10e4b0ef1 100644 --- a/scripts/draw_window_properties/draw_window_properties.gml +++ b/scripts/draw_window_properties/draw_window_properties.gml @@ -45,26 +45,34 @@ draw_theme_color() draw_areaheader(x1 + 22, y1 + 268, 396, 85, "Playback") draw_text(x1 + 37, y1 + 285, "Time signature:") +a = timesignature timesignature = median(2, draw_dragvalue(3, x1 + 135, y1 + 285, timesignature, 1), 8) +if (a != timesignature) changed = 1 draw_text(x1 + 135 + string_width(string(timesignature)), y1 + 285, " / 4") popup_set_window(x1 + 37, y1 + 283, 110, 18, "The time signature of the song.") +a = loop if (draw_checkbox(x1 + 232, y1 + 285, loop, "Enable looping", "Whether to loop this song back to"+br+"the start at the end of playback.")) loop=!loop +if (a != loop) changed = 1 if (!loop) draw_set_color(c_gray) draw_text(x1 + 232, y1 + 305, "Loop start tick:") +a = loopstart if (loop) { loopstart = median(0, draw_dragvalue(7, x1 + 320, y1 + 305, loopstart, 0.5), obj_controller.enda) } else { draw_text(x1 + 320, y1 + 305, loopstart) } +if (a != loopstart) changed = 1 draw_text(x1 + 232, y1 + 325, "Times to loop:") +a = loopmax if (loop) { loopmax = median(0, draw_dragvalue(13, x1 + 320, y1 + 325, loopmax, 0.5), 10) } else { draw_text(x1 + 320, y1 + 325, loopmax) } if (loopmax = 0) draw_text(x1 + 340, y1 + 325, "(infinite)") +if (a != loopmax) changed = 1 timestoloop = loopmax draw_theme_color() From bed3d778e88a236634047823466ac6ffdf27aa40 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 04:42:51 -0300 Subject: [PATCH 11/86] Add fullscreen workspace toggle with F11 Closes #121 --- scripts/control_create/control_create.gml | 1 + scripts/control_draw/control_draw.gml | 28 +++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index f6836f5af..4c596e774 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -37,6 +37,7 @@ icons_init() refreshrate = 0 //0 = 30fps, 1 = 60fps fade = 0 rhval = 270 +fullscreen = 0 autosave = 0 autosavemins = 10 tonextsave = 0 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index cdf01c4b5..d0f5c5758 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -73,7 +73,7 @@ iconcolor = c_black if (theme = 2) iconcolor = c_white // Calculate area -if (show_layers) { +if (!fullscreen && show_layers) { totalcols = floor((rw - 8 - 270) / 32) } else { totalcols = floor((rw - 8) / 32) @@ -82,6 +82,9 @@ rhval = 270 if (!show_piano) { rhval = 130 } +if (fullscreen) { + rhval = 42 +} totalrows = floor((rh - rhval) / 32) if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { startkey = 27 - floor(min(keysmax, floor((rw - 32) / 39)) / 2) @@ -93,10 +96,14 @@ if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { } keysshow = min(keysmax, floor((rw - 32) / 39)) x1 = 4 -if (show_layers) { +if (!fullscreen && show_layers) { x1 = 264 } -y1 = 52 +if (fullscreen) { + y1 = 0 +} else { + y1 = 52 +} if ((window = 0 || select > 0) && playing = 0) { if (mouse_rectangle(x1 + 2, y1 + 34, totalcols * 32, totalrows * 32) || select > 0) { sela = floor((mouse_x - (x1 + 2)) / 32) @@ -575,7 +582,10 @@ if (window = 0 && text_focus = -1) { macro_reset() } } - + } + // Toggle fullscreen + if (keyboard_check_pressed(vk_f11)) { + fullscreen = !fullscreen } } // Selecting note blocks @@ -821,7 +831,7 @@ for (b = 0; b < totalrows; b += 1) { } x1 = 4 y1 = 54 + 32 + b * 32 - 1 - if (show_layers) { + if (!fullscreen && show_layers) { // Name m = mouse_rectangle(x1 + 10, y1 + 10, 75, 13) draw_sprite(spr_layerbox, 0 + (theme = 2), x1, y1) @@ -993,6 +1003,7 @@ if (draw_macroicon(14, xx, yy + 16, "Reset all properties", 0, 0)) {playing = 0 } // Tabs +if (!fullscreen) { if (theme = 0) draw_sprite_ext(spr_tabbar, 0, 0, 0, rw, 1, 0, -1, 1) tab_x = 1 draw_set_font(fnt_small) @@ -1237,8 +1248,6 @@ if (sela > -1 && selb > -1) { } } } - - draw_set_halign(fa_right) str = "" for (a = 0; a < midi_devices; a += 1) str += condstr(a > 0, ", ") + midi_input_device_name(a) @@ -1246,8 +1255,9 @@ if (midi_devices = 0) str = "No connected MIDI devices" else str = "MIDI devices: " + str draw_text(rw - 6, rh - 18, str) draw_set_halign(fa_left) +} -if (show_layers) { +if (!fullscreen && show_layers) { // Marker position draw_set_halign(fa_right) draw_theme_color() @@ -1303,7 +1313,7 @@ if (show_layers) { } // Piano -if (show_piano) { +if (!fullscreen && show_piano) { draw_piano(floor(rw / 2 - (keysshow * 39) / 2), rh - 154, keysshow, totalcols) if (mouse_rectangle(floor(rw / 2 - (keysshow * 39) / 2), rh - 162, keysshow * 39, 136) && window = 0) curs = cr_handpoint } From 879711b615fa616b7d2b8c6d36a3e6039509308d Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 04:58:21 -0300 Subject: [PATCH 12/86] Fix piano keys played with keyboard not emitting sound during playback Fixes #156 --- scripts/draw_piano/draw_piano.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_piano/draw_piano.gml b/scripts/draw_piano/draw_piano.gml index 04dcd390e..c155c2169 100644 --- a/scripts/draw_piano/draw_piano.gml +++ b/scripts/draw_piano/draw_piano.gml @@ -175,7 +175,7 @@ for (a = 0; a <= 87; a += 1) { if (piano_key[a] > 0) { if (key_press[a] = 0 && keyboard_check(piano_key[a])) { if (select_lastpressed) selected_key = a - if (playing = 0) play_sound(instrument, a, 100 ,100, 0) + if (record = 0) play_sound(instrument, a, 100 ,100, 0) if (playing = 0.25) toggle_playing(totalcols) if (playing && record) { b = 0 From 18125389e83f726cc540d18ce87d93622c52f1ce Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 05:14:10 -0300 Subject: [PATCH 13/86] Fix typo and improve wording in preferences --- .../draw_window_preferences.gml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 912ce70c6..418d99fb1 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -133,11 +133,11 @@ if (selected_tab = 0) { if (draw_button2(x1 + 22 + 84 + 84, y1 + 326, 96, "Use default")) patternfolder = pattern_directory } else if (selected_tab = 1) { draw_areaheader(x1 + 22, y1 + 74, 456, 170, "Note blocks") - if (draw_radiobox(x1 + 40, y1 + 90, draw_type = 0, "Use colored note blocks", "If the instruments of the note blocks\nshould be recognized by different colors.")) draw_type = 0 - if (draw_radiobox(x1 + 40, y1 + 110, draw_type = 1, "Show instrument icons", "If the instruments of the note blocks should\nbe recognized by their respective icons.")) draw_type = 1 - if (draw_radiobox(x1 + 40, y1 + 130, draw_type = 2, "Use different shapes for each instrument", "Whether each instrument should have a different shape\nto make them more distinquisable.")) draw_type = 2 + if (draw_radiobox(x1 + 40, y1 + 90, draw_type = 0, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) draw_type = 0 + if (draw_radiobox(x1 + 40, y1 + 110, draw_type = 1, "Show instrument icons", "If the instruments should be identified with\ntheir respective icons.")) draw_type = 1 + if (draw_radiobox(x1 + 40, y1 + 130, draw_type = 2, "Use different shapes for each instrument", "If the instruments should be identified\nwith different shapes.")) draw_type = 2 - if (draw_checkbox(x1 + 40, y1 + 160, show_numbers, "Show key numbers", "Whether to show the amount of right - clicks required\nfor each note block.")) show_numbers=!show_numbers + if (draw_checkbox(x1 + 40, y1 + 160, show_numbers, "Show key numbers", "Whether to show the amount of right-clicks required\nfor each note block.")) show_numbers=!show_numbers if (draw_checkbox(x1 + 40, y1 + 180, show_octaves, "Show octave numbers", "Whether the number of the octave the note block\nis in should be shown.")) show_octaves=!show_octaves if (draw_checkbox(x1 + 40, y1 + 200, fade, "No fading", "Disables transparency animations on note block sprites")) fade = !fade if (draw_checkbox(x1 + 40, y1 + 220, show_layers, "Show layer boxes", "Whether the layer boxes should be\nshown to the right of the workspace.")) show_layers = !show_layers @@ -164,7 +164,7 @@ if (selected_tab = 0) { //draw_text(x1 + 40, y1 + 178, "Tip: Hold Shift while scrolling over a note to change a whole octave,\nor fine-tune its velocity, panning or pitch.") draw_areaheader(x1 + 22, y1 + 220, 456, 105, "Piano") if (draw_checkbox(x1 + 40, y1 + 236, select_lastpressed, "Set selected key to pressed one", "If the selected key should be set\nto the one pressed using the keyboard.")) select_lastpressed=!select_lastpressed - draw_text(x1 + 40, y1 + 270, "Right - click on keys to change their shortcuts.") + draw_text(x1 + 40, y1 + 270, "Right-click on keys to change their shortcuts.") if (draw_button2(x1 + 40, y1 + 290, 160, "Reset key shortcuts")) { if (question("Are you sure?", "Confirm")) init_keys() } From 27124c12b7758200b5d645deae12006ba41b39d4 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 05:18:16 -0300 Subject: [PATCH 14/86] Change key to select multiple layers from Shift to Ctrl Makes more sense in a Windows environment. :P --- scripts/control_draw/control_draw.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index d0f5c5758..d71943de3 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -921,9 +921,9 @@ for (b = 0; b < totalrows; b += 1) { } } // Select all - if (draw_layericon(2, x1 + 162 - !realvolume-realstereo * 10, y1 + 8, "Select all note blocks in this layer\n(Hold Shift to select multiple layers)", 0, 0)) { + if (draw_layericon(2, x1 + 162 - !realvolume-realstereo * 10, y1 + 8, "Select all note blocks in this layer\n(Hold Ctrl to select multiple layers)", 0, 0)) { playing = 0 - if (!keyboard_check(vk_shift)) { + if (!keyboard_check(vk_control)) { selection_place(0) } selection_add(0, startb + b, enda, startb + b, 0, 0) From 2160563883156c8719e9a60b572061ad4f6d0322 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 05:21:51 -0300 Subject: [PATCH 15/86] Improve glowing effect description on data pack visualizer --- .../draw_window_datapack_export/draw_window_datapack_export.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml index a76b8ce79..022f4cf14 100644 --- a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml +++ b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml @@ -157,7 +157,7 @@ if (selected_tab_dat = 0) { if (draw_radiobox(x1 + 33, y1 + 175, dat_vis_type = "Piano Roll", "Piano Roll", "Use Piano Roll visualizer.")) dat_vis_type = "Piano Roll" if (draw_radiobox(x1 + 33, y1 + 195, dat_vis_type = "Fountain", "Fountain", "Use Fountain visualizer.")) dat_vis_type = "Fountain" if (draw_radiobox(x1 + 33, y1 + 215, dat_vis_type = "Rittai Onkyou", "Rittai Onkyou", "Use Rittai Onkyou visualizer.")) dat_vis_type = "Rittai Onkyou" - if (draw_checkbox(x1 + 33, y1 + 235, dat_glow, "Add Glow", "Whether to add a dat_glow to each instrument.")) dat_glow=!dat_glow + if (draw_checkbox(x1 + 33, y1 + 235, dat_glow, "Add glow", "Whether to add a glowing effect to each note block.")) dat_glow=!dat_glow draw_text(x1 + 33, y1 + 255, "Spawn height:") dat_yval = median(0, draw_dragvalue(11, x1 + 33, y1 + 275, dat_yval, 0.5), 256) draw_text(x1 + 33, y1 + 295, "Position in map:") From 502381831d3e12f91a2a2eb09d641a9459e7cca9 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 05:22:55 -0300 Subject: [PATCH 16/86] Fix range of spawn height drag control on visualizer --- .../draw_window_datapack_export/draw_window_datapack_export.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml index 022f4cf14..bccef1b69 100644 --- a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml +++ b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml @@ -159,7 +159,7 @@ if (selected_tab_dat = 0) { if (draw_radiobox(x1 + 33, y1 + 215, dat_vis_type = "Rittai Onkyou", "Rittai Onkyou", "Use Rittai Onkyou visualizer.")) dat_vis_type = "Rittai Onkyou" if (draw_checkbox(x1 + 33, y1 + 235, dat_glow, "Add glow", "Whether to add a glowing effect to each note block.")) dat_glow=!dat_glow draw_text(x1 + 33, y1 + 255, "Spawn height:") - dat_yval = median(0, draw_dragvalue(11, x1 + 33, y1 + 275, dat_yval, 0.5), 256) + dat_yval = median(0, draw_dragvalue(11, x1 + 33, y1 + 275, dat_yval, 0.5), 255) draw_text(x1 + 33, y1 + 295, "Position in map:") draw_text(x1 + 33, y1 + 318, "X value:") dat_xval = draw_inputbox(53,x1 + 83, y1 + 315,40,dat_xval,"X value") From 2dd35da98ef3c4c5a41366512576c0fe29f35069 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 05:48:59 -0300 Subject: [PATCH 17/86] Only create visualizer teams when the glow effect is enabled --- scripts/datapack_export/datapack_export.gml | 120 +++++++++++--------- 1 file changed, 68 insertions(+), 52 deletions(-) diff --git a/scripts/datapack_export/datapack_export.gml b/scripts/datapack_export/datapack_export.gml index f09b0afb2..ff1272ebd 100644 --- a/scripts/datapack_export/datapack_export.gml +++ b/scripts/datapack_export/datapack_export.gml @@ -22,6 +22,7 @@ with (new(obj_dummy2)) { var functionpath var functiondir var inputString + var add_teams = (o.dat_visualizer && o.dat_glow) if namespace = "" { path = "" @@ -73,40 +74,9 @@ with (new(obj_dummy2)) { //play.mcfunction inputString = "tag @s add " + tag + br inputString += "scoreboard players set @s " + objective + "_t -1" + br - inputString += "team add 1" + br - inputString += "team add 2" + br - inputString += "team add 3" + br - inputString += "team add 4" + br - inputString += "team add 5" + br - inputString += "team add 6" + br - inputString += "team add 7" + br - inputString += "team add 8" + br - inputString += "team add 9" + br - inputString += "team add 10" + br - inputString += "team add 11" + br - inputString += "team add 12" + br - inputString += "team add 13" + br - inputString += "team add 14" + br - inputString += "team add 15" + br - inputString += "team add 16" + br - inputString += "team add 17" + br - inputString += "team modify 1 color dark_gray" + br - inputString += "team modify 2 color red" + br - inputString += "team modify 3 color black" + br - inputString += "team modify 4 color yellow" + br - inputString += "team modify 5 color light_purple" + br - inputString += "team modify 6 color green" + br - inputString += "team modify 7 color dark_red" + br - inputString += "team modify 8 color dark_aqua" + br - inputString += "team modify 9 color dark_green" + br - inputString += "team modify 10 color blue" + br - inputString += "team modify 11 color aqua" + br - inputString += "team modify 12 color dark_blue" + br - inputString += "team modify 13 color dark_gray" + br - inputString += "team modify 14 color dark_green" + br - inputString += "team modify 15 color gray" + br - inputString += "team modify 16 color gold" + br - inputString += "team modify 17 color white" + if (add_teams) { + inputString += "function " + functionpath + "add_teams" + } dat_writefile(inputString, functiondir + "play.mcfunction") //pause.mcfunction @@ -116,26 +86,72 @@ with (new(obj_dummy2)) { //stop.mcfunction inputString = "tag @s remove " + tag + br inputString += "scoreboard players reset @s " + objective + br - inputString += "scoreboard players reset @s " + objective + "_t" + br - inputString += "team remove 1" + br - inputString += "team remove 2" + br - inputString += "team remove 3" + br - inputString += "team remove 4" + br - inputString += "team remove 5" + br - inputString += "team remove 6" + br - inputString += "team remove 7" + br - inputString += "team remove 8" + br - inputString += "team remove 9" + br - inputString += "team remove 10" + br - inputString += "team remove 11" + br - inputString += "team remove 12" + br - inputString += "team remove 13" + br - inputString += "team remove 14" + br - inputString += "team remove 15" + br - inputString += "team remove 16" + br - inputString += "team remove 17" + inputString += "scoreboard players reset @s " + objective + "_t" + br + if (add_teams) { + inputString += "function " + functionpath + "remove_teams" + } + dat_writefile(inputString, functiondir + "stop.mcfunction") + if (add_teams) { + //add_teams.mcfunction + inputString = "team add 1" + br + inputString += "team add 2" + br + inputString += "team add 3" + br + inputString += "team add 4" + br + inputString += "team add 5" + br + inputString += "team add 6" + br + inputString += "team add 7" + br + inputString += "team add 8" + br + inputString += "team add 9" + br + inputString += "team add 10" + br + inputString += "team add 11" + br + inputString += "team add 12" + br + inputString += "team add 13" + br + inputString += "team add 14" + br + inputString += "team add 15" + br + inputString += "team add 16" + br + inputString += "team add 17" + br + inputString += "team modify 1 color dark_gray" + br + inputString += "team modify 2 color red" + br + inputString += "team modify 3 color black" + br + inputString += "team modify 4 color yellow" + br + inputString += "team modify 5 color light_purple" + br + inputString += "team modify 6 color green" + br + inputString += "team modify 7 color dark_red" + br + inputString += "team modify 8 color dark_aqua" + br + inputString += "team modify 9 color dark_green" + br + inputString += "team modify 10 color blue" + br + inputString += "team modify 11 color aqua" + br + inputString += "team modify 12 color dark_blue" + br + inputString += "team modify 13 color dark_gray" + br + inputString += "team modify 14 color dark_green" + br + inputString += "team modify 15 color gray" + br + inputString += "team modify 16 color gold" + br + inputString += "team modify 17 color white" + dat_writefile(inputString, functiondir + "add_teams.mcfunction") + + //remove_teams.mcfunction + inputString = "team remove 1" + br + inputString += "team remove 2" + br + inputString += "team remove 3" + br + inputString += "team remove 4" + br + inputString += "team remove 5" + br + inputString += "team remove 6" + br + inputString += "team remove 7" + br + inputString += "team remove 8" + br + inputString += "team remove 9" + br + inputString += "team remove 10" + br + inputString += "team remove 11" + br + inputString += "team remove 12" + br + inputString += "team remove 13" + br + inputString += "team remove 14" + br + inputString += "team remove 15" + br + inputString += "team remove 16" + br + inputString += "team remove 17" + dat_writefile(inputString, functiondir + "remove_teams.mcfunction") + } + //Generate binary tree and notes dat_generate(functionpath, functiondir, objective) From 6e31cb086a4c8887e88d151fbfbb4074dbfdddfe Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 19 May 2020 17:44:17 -0300 Subject: [PATCH 18/86] Add nbs prefix to visualizer teams --- scripts/dat_generate/dat_generate.gml | 12 +-- scripts/datapack_export/datapack_export.gml | 102 ++++++++++---------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/scripts/dat_generate/dat_generate.gml b/scripts/dat_generate/dat_generate.gml index 168c349c9..2c48bd100 100644 --- a/scripts/dat_generate/dat_generate.gml +++ b/scripts/dat_generate/dat_generate.gml @@ -39,7 +39,7 @@ for (a = 0; a <= o.enda; a++) { } str += "Time:-120,DropItem:0,Motion:[0.0d,1.0d,1.0d]}" + br if o.dat_glow = 1 { - str += "team join " + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } } @@ -50,7 +50,7 @@ for (a = 0; a <= o.enda; a++) { } str += "Time:-80,DropItem:0,Motion:[0.0d,-1.3d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join " + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } } @@ -61,7 +61,7 @@ for (a = 0; a <= o.enda; a++) { } str += "Time:-50,DropItem:0,NoGravity:1,Motion:[0.0d,0.0d,2.5d]}" + br if o.dat_glow = 1 { - str += "team join " + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } str += "particle minecraft:note " + "-" + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(real(o.dat_zval)) + " " + "0.5 0 0.5 1 4 force @p" + br } @@ -73,7 +73,7 @@ for (a = 0; a <= o.enda; a++) { } str += "Time:-50,DropItem:0,Glowing:1,NoGravity:1,Motion:[0.0d,1.0d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join " + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } } @@ -84,7 +84,7 @@ for (a = 0; a <= o.enda; a++) { } str += "Time:-80,DropItem:0,Motion:[0.0d,1.3d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join " + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Fountain" { // Fountain @@ -96,7 +96,7 @@ for (a = 0; a <= o.enda; a++) { str += "Time:-80,DropItem:0,Motion:[0.5d,1.5d,0.0d]}" + br } else str += "Time:-80,DropItem:0,Motion:[-0.5d,1.5d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join " + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Rittai Onkyou" { // Rittai Onkyou diff --git a/scripts/datapack_export/datapack_export.gml b/scripts/datapack_export/datapack_export.gml index ff1272ebd..2e6a97d27 100644 --- a/scripts/datapack_export/datapack_export.gml +++ b/scripts/datapack_export/datapack_export.gml @@ -95,60 +95,60 @@ with (new(obj_dummy2)) { if (add_teams) { //add_teams.mcfunction - inputString = "team add 1" + br - inputString += "team add 2" + br - inputString += "team add 3" + br - inputString += "team add 4" + br - inputString += "team add 5" + br - inputString += "team add 6" + br - inputString += "team add 7" + br - inputString += "team add 8" + br - inputString += "team add 9" + br - inputString += "team add 10" + br - inputString += "team add 11" + br - inputString += "team add 12" + br - inputString += "team add 13" + br - inputString += "team add 14" + br - inputString += "team add 15" + br - inputString += "team add 16" + br - inputString += "team add 17" + br - inputString += "team modify 1 color dark_gray" + br - inputString += "team modify 2 color red" + br - inputString += "team modify 3 color black" + br - inputString += "team modify 4 color yellow" + br - inputString += "team modify 5 color light_purple" + br - inputString += "team modify 6 color green" + br - inputString += "team modify 7 color dark_red" + br - inputString += "team modify 8 color dark_aqua" + br - inputString += "team modify 9 color dark_green" + br - inputString += "team modify 10 color blue" + br - inputString += "team modify 11 color aqua" + br - inputString += "team modify 12 color dark_blue" + br - inputString += "team modify 13 color dark_gray" + br - inputString += "team modify 14 color dark_green" + br - inputString += "team modify 15 color gray" + br - inputString += "team modify 16 color gold" + br - inputString += "team modify 17 color white" + inputString = "team add nbs_1" + br + inputString += "team add nbs_2" + br + inputString += "team add nbs_3" + br + inputString += "team add nbs_4" + br + inputString += "team add nbs_5" + br + inputString += "team add nbs_6" + br + inputString += "team add nbs_7" + br + inputString += "team add nbs_8" + br + inputString += "team add nbs_9" + br + inputString += "team add nbs_10" + br + inputString += "team add nbs_11" + br + inputString += "team add nbs_12" + br + inputString += "team add nbs_13" + br + inputString += "team add nbs_14" + br + inputString += "team add nbs_15" + br + inputString += "team add nbs_16" + br + inputString += "team add nbs_17" + br + inputString += "team modify nbs_1 color dark_gray" + br + inputString += "team modify nbs_2 color red" + br + inputString += "team modify nbs_3 color black" + br + inputString += "team modify nbs_4 color yellow" + br + inputString += "team modify nbs_5 color light_purple" + br + inputString += "team modify nbs_6 color green" + br + inputString += "team modify nbs_7 color dark_red" + br + inputString += "team modify nbs_8 color dark_aqua" + br + inputString += "team modify nbs_9 color dark_green" + br + inputString += "team modify nbs_10 color blue" + br + inputString += "team modify nbs_11 color aqua" + br + inputString += "team modify nbs_12 color dark_blue" + br + inputString += "team modify nbs_13 color dark_gray" + br + inputString += "team modify nbs_14 color dark_green" + br + inputString += "team modify nbs_15 color gray" + br + inputString += "team modify nbs_16 color gold" + br + inputString += "team modify nbs_17 color white" dat_writefile(inputString, functiondir + "add_teams.mcfunction") //remove_teams.mcfunction - inputString = "team remove 1" + br - inputString += "team remove 2" + br - inputString += "team remove 3" + br - inputString += "team remove 4" + br - inputString += "team remove 5" + br - inputString += "team remove 6" + br - inputString += "team remove 7" + br - inputString += "team remove 8" + br - inputString += "team remove 9" + br - inputString += "team remove 10" + br - inputString += "team remove 11" + br - inputString += "team remove 12" + br - inputString += "team remove 13" + br - inputString += "team remove 14" + br - inputString += "team remove 15" + br - inputString += "team remove 16" + br - inputString += "team remove 17" + inputString = "team remove nbs_1" + br + inputString += "team remove nbs_2" + br + inputString += "team remove nbs_3" + br + inputString += "team remove nbs_4" + br + inputString += "team remove nbs_5" + br + inputString += "team remove nbs_6" + br + inputString += "team remove nbs_7" + br + inputString += "team remove nbs_8" + br + inputString += "team remove nbs_9" + br + inputString += "team remove nbs_10" + br + inputString += "team remove nbs_11" + br + inputString += "team remove nbs_12" + br + inputString += "team remove nbs_13" + br + inputString += "team remove nbs_14" + br + inputString += "team remove nbs_15" + br + inputString += "team remove nbs_16" + br + inputString += "team remove nbs_17" dat_writefile(inputString, functiondir + "remove_teams.mcfunction") } From d7167543522f56d249b817b1270e4b3bb5208065 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sun, 14 Jun 2020 21:47:06 -0300 Subject: [PATCH 19/86] Fix emittters lasting much longer than they should For some weird reason the audio_get_length() GM function seems to return a value that's consistently 4-5x the actual length of the sound. On top of that, since this value is multiplied by the inverse of the sound pitch to make up for the change in duration, it was the case that some lower pitched sounds could stay 20 seconds in memory instead of 4, causing the polyphony limit to be reached much quicker. The fix was to simply divide the length by 4, which is just enough to prevent cutoffs in the lower notes. (I found the lowest GM length/actual length ratio in the default instruments to be 4.09, so it may be a bit longer than the sound but will never be shorter.) --- scripts/play_sound/play_sound.gml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/play_sound/play_sound.gml b/scripts/play_sound/play_sound.gml index 8dd1ccd0a..71bb96138 100644 --- a/scripts/play_sound/play_sound.gml +++ b/scripts/play_sound/play_sound.gml @@ -26,5 +26,6 @@ audio_play_sound_on(emitter,ins.sound, 0, 0) //Schedule emitter to be deleted from memory newemitter = ds_list_create() ds_list_add(newemitter,emitter) //store emitter id -ds_list_add(newemitter, (audio_sound_length(ins.sound) * 1000000 * (1/audio_emitter_get_pitch(emitter))) + get_timer()) //store moment at which the emitter should be removed +var length = audio_sound_length(ins.sound) / 4 * (1/audio_emitter_get_pitch(emitter)) +ds_list_add(newemitter, (get_timer() + length * 1000000)) //store moment at which the emitter should be removed ds_list_add(emitters_to_remove, newemitter) \ No newline at end of file From d91512178f112483329d636daca63f0b51f588ef Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 15 Jun 2020 00:57:11 -0300 Subject: [PATCH 20/86] Increase polyphony limit to 256 sounds --- scripts/control_create/control_create.gml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 4c596e774..4a6b7e009 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -20,6 +20,10 @@ cam_window = camera_create() view_set_camera(0, cam_window) window_background = c_white +// Audio +channels = 256 +audio_channel_num(channels) + // Application update = 0 check_update = 1 From 6de1ff333960ac906da0e3fcabc46b8d131d7517 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 15 Jun 2020 00:57:43 -0300 Subject: [PATCH 21/86] Add current sound count display to status bar --- scripts/control_create/control_create.gml | 1 + scripts/control_draw/control_draw.gml | 32 +++++++++++++++------ scripts/play_sound/play_sound.gml | 1 + scripts/remove_emitters/remove_emitters.gml | 1 + 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 4a6b7e009..36ca49904 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -22,6 +22,7 @@ window_background = c_white // Audio channels = 256 +sounds = 0 audio_channel_num(channels) // Application diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index d71943de3..ad6281929 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1211,9 +1211,11 @@ draw_text(xx, rh - 18, "Selected: " + string(selected) + " / " + string(totalblo draw_separator(xx, rh - 20) draw_theme_color() +var hovernote = 0 if (sela > -1 && selb > -1) { if (selbx < arraylength && selby < arrayheight) { if (song_exists[selbx, selby]) { + hovernote = 1 xx += 4 draw_text(xx, rh - 18, "Key: " + get_keyname(song_key[selbx, selby], 1)) xx += 90 @@ -1236,18 +1238,30 @@ if (sela > -1 && selb > -1) { xx += 4 draw_text(xx, rh - 18, "Pitch: " + condstr(song_pit[selbx, selby] > 0, "+") + string_format(song_pit[selbx, selby], 1, 0) + " cents") draw_theme_color() - } else { // If no note exists, draw auto-save remaining time - if (autosave && filename_ext(filename) = ".nbs") { - draw_separator(xx, rh - 20) - draw_theme_color() - xx += 4 - draw_text(xx, rh - 18, "Next auto-save: " + string(ceil(tonextsave)) + " minute" + condstr(ceil(tonextsave)<>1, "s")) xx += 180 - // draw_separator(xx, rh - 20) - draw_theme_color() - } } } } +if (!hovernote) { + // Auto-save remaining time + if (autosave && filename_ext(filename) = ".nbs") { + draw_theme_color() + xx += 4 + draw_text(xx, rh - 18, "Next auto-save: " + string(ceil(tonextsave)) + " minute" + condstr(ceil(tonextsave)<>1, "s")) + xx += 210 + draw_separator(xx, rh - 20) + draw_theme_color() + } + // Active sounds count + if (true) { + xx += 4 + if (sounds > channels) { + draw_set_color(c_red) + } + draw_text(xx, rh - 18, "Sounds: " + string(sounds) + " / " + string(channels)) + draw_theme_color() + } +} + draw_set_halign(fa_right) str = "" for (a = 0; a < midi_devices; a += 1) str += condstr(a > 0, ", ") + midi_input_device_name(a) diff --git a/scripts/play_sound/play_sound.gml b/scripts/play_sound/play_sound.gml index 71bb96138..3cc2398eb 100644 --- a/scripts/play_sound/play_sound.gml +++ b/scripts/play_sound/play_sound.gml @@ -22,6 +22,7 @@ if (realstereo = 0) audio_emitter_position(emitter,pan,0,0) else audio_emitter_position(emitter,100,0,0) audio_play_sound_on(emitter,ins.sound, 0, 0) +sounds++ //Schedule emitter to be deleted from memory newemitter = ds_list_create() diff --git a/scripts/remove_emitters/remove_emitters.gml b/scripts/remove_emitters/remove_emitters.gml index 386e01c0b..9926835cd 100644 --- a/scripts/remove_emitters/remove_emitters.gml +++ b/scripts/remove_emitters/remove_emitters.gml @@ -12,5 +12,6 @@ for(pos = 0; pos < ds_list_size(emitters_to_remove); pos++){ ds_list_delete(emitters_to_remove,pos) audio_emitter_free(emitterid) //log("freeing emitter with id " + string(emitterid)) + sounds-- } } \ No newline at end of file From dcbe41946ca0119454bd0be75b0bb8c70cbdf2f0 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 15 Jun 2020 01:15:03 -0300 Subject: [PATCH 22/86] Add preference to toggle showing sound count --- scripts/control_create/control_create.gml | 1 + scripts/control_draw/control_draw.gml | 2 +- scripts/draw_window_preferences/draw_window_preferences.gml | 3 ++- scripts/load_settings/load_settings.gml | 1 + scripts/save_settings/save_settings.gml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 36ca49904..b89f3d5eb 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -24,6 +24,7 @@ window_background = c_white channels = 256 sounds = 0 audio_channel_num(channels) +show_soundcount = 0 // Application update = 0 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index ad6281929..76eb2b159 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1252,7 +1252,7 @@ if (!hovernote) { draw_theme_color() } // Active sounds count - if (true) { + if (show_soundcount) { xx += 4 if (sounds > channels) { draw_set_color(c_red) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 418d99fb1..072116326 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -175,10 +175,11 @@ if (selected_tab = 0) { if (draw_radiobox(x1 + 70, y1 + 130, !marker_pagebypage, "Tick by tick", "Scroll with the marker every tick.", !marker_follow)) marker_pagebypage = 0 if (draw_checkbox(x1 + 40, y1 + 150, marker_start, "Start playing in section", "Whether to always start playing\nat the start of the active section.")) marker_start=!marker_start if (draw_checkbox(x1 + 40, y1 + 170, marker_end, "Stop playing after section", "Whether to stop playing when the\nmarker passes the active section.")) marker_end=!marker_end - draw_areaheader(x1 + 22, y1 + 224, 218, 80, "Playing") + draw_areaheader(x1 + 22, y1 + 224, 218, 100, "Playing") if (draw_checkbox(x1 + 32, y1 + 224 + 16, realvolume, "Show layer volumes", "Whether to show the volume of layers.")) realvolume=!realvolume if (draw_checkbox(x1 + 32, y1 + 244 + 16, realstereo, "Disable stereo", "Disables stereo playback.")) realstereo = !realstereo if (draw_checkbox(x1 + 32, y1 + 264 + 16, looptobarend, "Loop to bar end", "Loops to the end of the bar/measure.")) looptobarend = !looptobarend + if (draw_checkbox(x1 + 32, y1 + 284 + 16, show_soundcount, "Show number of active sounds", "Displays the number of sounds that are\ncurrently playing in the status bar.")) show_soundcount = !show_soundcount draw_areaheader(x1 + 233 + 22, y1 + 224, 223, 60, "Tempo unit") if (draw_radiobox(x1 + 233 + 32, y1 + 224 + 16, !use_bpm, "Ticks per second (t/s)", "Display song tempos in ticks per second.")) use_bpm = 0 if (draw_radiobox(x1 + 233 + 32, y1 + 244 + 16, use_bpm, "Beats per minute (BPM)", "Display song tempos in beats per minute.")) use_bpm = 1 diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index 2822c9cd7..7e372886f 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -39,6 +39,7 @@ marker_end = ini_read_real( "preferences", "marker_end", marker realvolume = ini_read_real( "preferences", "show_layer_volumes", realvolume) realstereo = ini_read_real( "preferences", "use_stereo", realstereo) looptobarend = ini_read_real( "preferences", "loop_to_bar_end", looptobarend) +show_soundcount = ini_read_real( "preferences", "show_soundcount", show_soundcount) use_bpm = ini_read_real( "preferences", "use_bpm", use_bpm) save_version = ini_read_real( "preferences", "save_version", save_version) diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index 8c72d91cc..b3596c7a3 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -38,6 +38,7 @@ ini_write_real_clean("preferences", "marker_end", marker_end) ini_write_real_clean("preferences", "show_layer_volumes", realvolume) ini_write_real_clean("preferences", "use_stereo", realstereo) ini_write_real_clean("preferences", "loop_to_bar_end", looptobarend) +ini_write_real_clean("preferences", "show_soundcount", show_soundcount) ini_write_real_clean("preferences", "use_bpm", use_bpm) ini_write_real_clean("preferences", "save_version", save_version) From 67da7c882efdfe3839a594bb348e13aae8ca1bd6 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 15 Jun 2020 01:50:12 -0300 Subject: [PATCH 23/86] Fix pattern export adding .nbs extension to filename --- scripts/pattern_export/pattern_export.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pattern_export/pattern_export.gml b/scripts/pattern_export/pattern_export.gml index 60fb36cc2..0c73966a2 100644 --- a/scripts/pattern_export/pattern_export.gml +++ b/scripts/pattern_export/pattern_export.gml @@ -4,7 +4,7 @@ fn = "" if (selected = 0) return 0 if (fn = "") { playing = 0 - fsave = filename_name(filename) + fsave = filename_change_ext(filename_name(filename), ".nbp") if (!directory_exists_lib(patternfolder)) patternfolder = pattern_directory fn = string(get_save_filename_ext("Note Block Pattern (*.nbp)|*.nbp", fsave, patternfolder, "Save pattern")) if (fn = "") return 0 From 2bb2de3b667c392a18827e656b68a42788c5dc54 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 15 Jun 2020 02:03:03 -0300 Subject: [PATCH 24/86] Prevent renaming default instruments added in 1.14 --- scripts/draw_window_instruments/draw_window_instruments.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml index e14f91e86..a49243eaa 100644 --- a/scripts/draw_window_instruments/draw_window_instruments.gml +++ b/scripts/draw_window_instruments/draw_window_instruments.gml @@ -78,7 +78,7 @@ for (a = 0; a <= 10; a += 1) { if (ins.user) draw_theme_color() if (insselect = b) draw_set_color(c_white) // INS NAME - ins.name = draw_text_edit(b + 5, ins.name, x1 + 18, y1 + 90 + 20 * a, 178, 20, 1, b < 10) + ins.name = draw_text_edit(b + 5, ins.name, x1 + 18, y1 + 90 + 20 * a, 178, 20, 1, b < first_custom_index) // INS SOUND draw_set_color(make_color_rgb(120, 120, 120)) if (ins.user) {draw_theme_color()} From 5f4d18ca6fe44ff2afadb4d5623c1a5ec3eba3c1 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 15 Jun 2020 04:06:45 -0300 Subject: [PATCH 25/86] Show number of clicks in piano keys inside the 2-octave range Closes #154 --- scripts/draw_piano/draw_piano.gml | 35 +++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/scripts/draw_piano/draw_piano.gml b/scripts/draw_piano/draw_piano.gml index c155c2169..925fac812 100644 --- a/scripts/draw_piano/draw_piano.gml +++ b/scripts/draw_piano/draw_piano.gml @@ -1,5 +1,5 @@ // draw_piano(x, y, keys, totalcols) -var a, b, c, d, t, out, xx, yy, k, alpha, down, c1, c2, k1, k2, col, selectedkey, totalcols; +var a, b, c, d, t, out, xx, yy, k, alpha, down, c1, c2, k1, k2, showclicks1, showclicks2, col, selectedkey, totalcols; draw_set_color(0) xx = argument0 yy = argument1 @@ -54,6 +54,7 @@ for (a = 0; a < k; a += 1) { } // White out = (c2 < 33 || c2 > 57) + showclicks2 = !out && show_notechart col = c_white down[1] = 0 if (out) col = 8224255 @@ -65,6 +66,7 @@ for (a = 0; a < k; a += 1) { // Black down[0] = 0 out = (c1 < 33 || c1 > 57) + showclicks1 = !out && show_notechart col = c_white if (out) col = 8224255 if (selected_key = c1 && playing = 0) col = 16753828 @@ -80,21 +82,30 @@ for (a = 0; a < k; a += 1) { if (show_keynames) { draw_set_font(fnt_mainbold) draw_set_color(0) - draw_text(xx + 39 * a + 20, yy + 85 + floor(7 * down[1]) - 4 * (k2 && show_keyboard), get_keyname(c2, 1)) + draw_text(xx + 39 * a + 20, yy + 85 + floor(7 * down[1]) - 4 * (k2 && show_keyboard) - 4 * (k1 && show_keyboard && showclicks2) - 6 * (showclicks2), get_keyname(c2, 1)) draw_set_color(c_white) - draw_text(xx + 39 * a, yy + 24 + floor(7 * down[0]) - 4 * (k1 && show_keyboard), get_keyname(c1, 1)) - draw_set_font(fnt_main) + draw_text(xx + 39 * a, yy + 24 + floor(7 * down[0]) - 4 * (k1 && show_keyboard) - 4 * (k1 && show_keyboard && showclicks1) - 6 * (showclicks1), get_keyname(c1, 1)) } + draw_set_font(fnt_mainbold) + if (showclicks2) { + draw_set_color(0) + draw_text(xx + 39 * a + 20, yy + 85 + 5 + floor(7 * down[1]) - 8 * (k2 && show_keyboard), string(c2 - 33)) + } + if (showclicks1) { + draw_set_color(c_white) + draw_text(xx + 39 * a, yy + 24 + 5 + floor(7 * down[0]) - 8 * (k1 && show_keyboard), string(c1 - 33)) + } + draw_set_font(fnt_main) if (k2) { if (show_keyboard) { draw_set_color(0) - if ((editline mod 15) < 7 || key_edit != c2) draw_text(xx + 39 * a + 20, yy + 93 + floor(7 * down[1]), chr(piano_key[c2])) + if ((editline mod 15) < 7 || key_edit != c2) draw_text(xx + 39 * a + 20, yy + 95 + floor(7 * down[1]), chr(piano_key[c2])) } } if (k1) { if (show_keyboard) { draw_set_color(c_white) - if ((editline mod 15) < 7 || key_edit != c1) draw_text(xx + 39 * a, yy + 32 + floor(7 * down[0]), chr(piano_key[c1])) + if ((editline mod 15) < 7 || key_edit != c1) draw_text(xx + 39 * a, yy + 34 + floor(7 * down[0]), chr(piano_key[c1])) } } draw_set_halign(fa_left) @@ -121,6 +132,7 @@ for (a = 0; a < k; a += 1) { key_click[c1] = 0 } out = (c1 < 33 || c1 > 57) + showclicks1 = !out && show_notechart col = c_white down = 0 if (out) col = 8224255 @@ -135,13 +147,18 @@ for (a = 0; a < k; a += 1) { if (show_keynames) { draw_set_color(0) draw_set_font(fnt_mainbold) - draw_text(xx + 39 * a + 20, yy + 85 + floor(7 * down) - 4 * (k1 && show_keyboard), get_keyname(c1, 1)) - draw_set_font(fnt_main) + draw_text(xx + 39 * a + 20, yy + 85 + floor(7 * down) - 4 * (k1 && show_keyboard) - 4 * (k1 && show_keyboard && showclicks1) - 6 * showclicks1, get_keyname(c1, 1)) } + if (showclicks1) { + draw_set_font(fnt_mainbold) + draw_set_color(0) + draw_text(xx + 39 * a + 20, yy + 85 + 5 + floor(7 * down) - 8 * (k1 && show_keyboard), string(c1 - 33)) + } + draw_set_font(fnt_main) if (k1) { if (show_keyboard) { draw_set_color(0) - if ((editline mod 15) < 7 || key_edit != c1) draw_text(xx + 39 * a + 20, yy + 93 + floor(7 * down), chr(piano_key[c1])) + if ((editline mod 15) < 7 || key_edit != c1) draw_text(xx + 39 * a + 20, yy + 95 + floor(7 * down), chr(piano_key[c1])) } } draw_set_halign(fa_left) From 7faeb7fea9968f22ac9883c4124e44b954db0b1f Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 05:16:23 -0300 Subject: [PATCH 26/86] Display running speed percentage in the window caption MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This feature was in Note Block Studio a long, long while ago. It's back, baby 😎 --- scripts/control_draw/control_draw.gml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 76eb2b159..62ae2fb65 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -6,7 +6,10 @@ curs = cr_default showmenu = 0 cursmarker = 0 compx = 180 -window_set_caption(condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") + +var targetspeed = 1000000 / room_speed +var currspeed = targetspeed / delta_time +if (current_time % 1 == 0) window_set_caption("(" + string_format(currspeed * 100, 1, 0) + "%) " + condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") draw_set_alpha(1) draw_theme_color() draw_set_font(fnt_main) From 8460acda0e7315cc542b6458cd199ce71b3fbd98 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 05:17:35 -0300 Subject: [PATCH 27/86] Create artificial lag to test program slowdown --- scripts/control_draw/control_draw.gml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 62ae2fb65..0e0520ba6 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -10,6 +10,10 @@ compx = 180 var targetspeed = 1000000 / room_speed var currspeed = targetspeed / delta_time if (current_time % 1 == 0) window_set_caption("(" + string_format(currspeed * 100, 1, 0) + "%) " + condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") +var a = 0 +for (i = 0; i < 200000; i++) { + a++ +} draw_set_alpha(1) draw_theme_color() draw_set_font(fnt_main) From dd259c85a3388e56619adc73697988f15eac9b1e Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 05:32:57 -0300 Subject: [PATCH 28/86] Make up for slowdowns during playback by moving marker further By multiplying the marker position change by the inverse of the current speed factor, we figure out how much it should have moved by that time, achieving a constant playback rate even when the program is running as low as 20% speed. --- scripts/control_draw/control_draw.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 0e0520ba6..059095f87 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -650,9 +650,9 @@ for (a = 0; a <= totalcols; a += 1) { // Marker if (playing = 0) metronome_played = -1 if (playing = 1 || forward<>0) { - if (playing = 1) marker_pos += (tempo / room_speed) + if (playing = 1) marker_pos += (tempo / room_speed) * (1 / currspeed) if (forward != 0) { - marker_pos += (tempo / room_speed) * (forward - (forward < 0 && playing = 1)) + marker_pos += (tempo / room_speed) * (1 / currspeed) * (forward - (forward < 0 && playing = 1)) } //metronome if (metronome) { From 2959f054e766b63689a9d64fdb4c0613aaad5845 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 05:48:30 -0300 Subject: [PATCH 29/86] Prevent marker from skipping notes on fast playback speeds The cause of this issue was that the marker only plays notes that it flies over. When the playback speed is fast enough (or when the program is lagging), sometimes it will move more than a whole tick, thus having the chance of not stopping for at least a single frame in some ticks. The fix for this issue was, rather than playing only the ticks that the marker "touches", to play every tick after the previous one that was played, up to the current one. This makes sure no ticks are missed, even though they may clip sometimes. This absolutely fixes #101. Unbelievable! --- scripts/control_draw/control_draw.gml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 059095f87..78e9373df 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -288,7 +288,8 @@ draw_set_halign(fa_left) // Play column if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && (floor(marker_pos) != section_end || window = w_dragmarker || forward<>0 || marker_end = 0 || marker_prevpos >= section_end)) { - xx = floor(marker_pos) + for (i = floor(marker_prevpos) + 1; i <= floor(marker_pos); i++) { + xx = i if (colamount[xx] > 0) { for (b = colfirst[xx]; b <= collast[xx]; b += 1) { if (song_exists[xx, b]) { @@ -322,6 +323,7 @@ if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && ( } } } + } } if (window = w_dragselection) { selection_x = starta + floor((mouse_x - (x1 + 2)) / 32) - select_pressa From 5c8e162e68dd2ee4df052617d0a961038e8ac596 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 06:04:49 -0300 Subject: [PATCH 30/86] Fix indentation in playback code --- scripts/control_draw/control_draw.gml | 68 +++++++++++++-------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 78e9373df..f6a7aaee7 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -289,40 +289,40 @@ draw_set_halign(fa_left) // Play column if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && (floor(marker_pos) != section_end || window = w_dragmarker || forward<>0 || marker_end = 0 || marker_prevpos >= section_end)) { for (i = floor(marker_prevpos) + 1; i <= floor(marker_pos); i++) { - xx = i - if (colamount[xx] > 0) { - for (b = colfirst[xx]; b <= collast[xx]; b += 1) { - if (song_exists[xx, b]) { - a = 1 - if (b < endb2) { - c = (layervol[b] /100) * song_vel[xx, b] - if layerstereo[b] = 100 { - d = song_pan[xx, b] - } else d = (layerstereo[b] + song_pan[xx, b]) / 2 - e = song_pit[xx, b] - } - if (solostr != "") { - if (string_count("|" + string(b) + "|", solostr) = 0) { - a = 0 - } else if (layerlock[b] = 1) { - a = 0 - } - } else if (b < endb2) { - if (layerlock[b] = 1) { - a = 0 - } - } - if (record = 1 && playing = 1) { - if (current_time - song_added[xx, b] < 1000) a = 0 - } - if (a) { - if (song_ins[xx, b].loaded) play_sound(song_ins[xx, b], song_key[xx, b], c , d, e) - if (song_ins[xx, b].press) key_played[song_key[xx, b]] = current_time - song_played[xx, b] = current_time - } - } - } - } + xx = i + if (colamount[xx] > 0) { + for (b = colfirst[xx]; b <= collast[xx]; b += 1) { + if (song_exists[xx, b]) { + a = 1 + if (b < endb2) { + c = (layervol[b] /100) * song_vel[xx, b] + if layerstereo[b] = 100 { + d = song_pan[xx, b] + } else d = (layerstereo[b] + song_pan[xx, b]) / 2 + e = song_pit[xx, b] + } + if (solostr != "") { + if (string_count("|" + string(b) + "|", solostr) = 0) { + a = 0 + } else if (layerlock[b] = 1) { + a = 0 + } + } else if (b < endb2) { + if (layerlock[b] = 1) { + a = 0 + } + } + if (record = 1 && playing = 1) { + if (current_time - song_added[xx, b] < 1000) a = 0 + } + if (a) { + if (song_ins[xx, b].loaded) play_sound(song_ins[xx, b], song_key[xx, b], c , d, e) + if (song_ins[xx, b].press) key_played[song_key[xx, b]] = current_time + song_played[xx, b] = current_time + } + } + } + } } } if (window = w_dragselection) { From c54cec764c221cbff7479b8af92ea535e7419949 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 08:16:00 -0300 Subject: [PATCH 31/86] Remove lag machine; sort code a little bit --- scripts/control_draw/control_draw.gml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index f6a7aaee7..27bd4a6a3 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1,19 +1,16 @@ // control_draw() var a, b, c, d, e, f, g, p, l, s, exist, str, str2, m, xx, x1, y1, x2, y2, iconcolor, showmenu, rw, rh, totalcols, totalrows, compx, prev + +var targetspeed = 1000000 / room_speed +var currspeed = targetspeed / delta_time + rw = window_width rh = window_height curs = cr_default showmenu = 0 cursmarker = 0 compx = 180 - -var targetspeed = 1000000 / room_speed -var currspeed = targetspeed / delta_time -if (current_time % 1 == 0) window_set_caption("(" + string_format(currspeed * 100, 1, 0) + "%) " + condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") -var a = 0 -for (i = 0; i < 200000; i++) { - a++ -} +window_set_caption("(" + string_format(currspeed * 100, 1, 0) + "%) " + condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") draw_set_alpha(1) draw_theme_color() draw_set_font(fnt_main) From 51d9fd3af4abb3e82b5886709941e39c9f559f15 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 20:20:21 -0300 Subject: [PATCH 32/86] Fix issues with looping - Temp variable "loop" in schematic export was conflicting with "loop" setting for the song. The former got renamed to sch_loop. - Renamed loop_toggle to loop_session. This variable controls looping only for the current session, whose state gets loaded when you load the song, but does NOT get saved when you save the song. To change it for the song you must go to Song Properties. - Looping was taking into account the loop setting in the song, not the state for the current session. This is now fixed. --- scripts/control_create/control_create.gml | 2 +- scripts/control_draw/control_draw.gml | 18 ++---------------- scripts/load_song/load_song.gml | 2 +- scripts/reset/reset.gml | 1 + scripts/schematic_export/schematic_export.gml | 10 +++++----- 5 files changed, 10 insertions(+), 23 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index b89f3d5eb..8b263d5df 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -242,7 +242,7 @@ asso_midi = 0 asso_sch = 0 w_asso_start = 1 wmenu = 0 -loop_toggle = 0 +loop_session = 0 loop = 0 loopmax = 0 loopstart = 0 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 27bd4a6a3..e8ac06a02 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -673,21 +673,7 @@ if (playing = 1 || forward<>0) { } } //loop song - if looptobarend = 1 { - if (loop = 1 && marker_pos > enda + 1 && marker_pos mod (timesignature * 4) < 1) { - timestoloop -- - starta = loopstart - marker_pos = starta - metronome_played = -1 - sb_val[scrollbarh] = starta - if loopmax != 0 { - if timestoloop < 0 { - playing = 0 - timestoloop = real(loopmax) - } - } - } - } else if (loop = 1 && marker_pos > enda + 1) { + if (loop_session = 1 && marker_pos > enda + 1 && (!looptobarend || marker_pos mod (timesignature * 4) < 1)) { timestoloop -- starta = loopstart marker_pos = starta @@ -1103,7 +1089,7 @@ forward = 0 if (draw_icon(icons.BACK, xx, "Rewind song", 0, 0)) {forward = -1} xx += 25 if (draw_icon(icons.FORWARD, xx, "Fast-forward song", 0, 0)) {forward = 1} xx += 25 if (draw_icon(icons.RECORD, xx, "Record key presses", 0, playing > 0 && record)) {playing = 0.25 record=!record} xx += 25 -if (draw_icon(icons.LOOP_INACTIVE + loop_toggle, xx, "Toggle looping", 0, 0)) loop_toggle = !loop_toggle xx += 25 +if (draw_icon(icons.LOOP_INACTIVE + loop_session, xx, "Toggle looping", 0, 0)) loop_session = !loop_session xx += 25 if metronome { if (metronome_played == -1 || (metronome_played - 1) mod 8 == 0) metricon = icons.METRONOME_1 else metricon = icons.METRONOME_2 diff --git a/scripts/load_song/load_song.gml b/scripts/load_song/load_song.gml index 240a3bc7c..f7753ba57 100644 --- a/scripts/load_song/load_song.gml +++ b/scripts/load_song/load_song.gml @@ -90,7 +90,7 @@ if (file_ext = ".nbs") { // LOOP if (song_nbs_version >= 4) { loop = buffer_read_byte() - loop_toggle = loop + loop_session = loop if (string_count("format4beta", filename_name(fn)) = 1) { loopstart = buffer_read_byte() loopmax = 0 diff --git a/scripts/reset/reset.gml b/scripts/reset/reset.gml index 7d1030e64..5dbae623c 100644 --- a/scripts/reset/reset.gml +++ b/scripts/reset/reset.gml @@ -145,6 +145,7 @@ tonextbackup = 0 //Loop loop = 0 +loop_session = 0 loopstart = 0 loopmax = 0 looptobarend = 1 \ No newline at end of file diff --git a/scripts/schematic_export/schematic_export.gml b/scripts/schematic_export/schematic_export.gml index d2d1c0a56..69d00077f 100644 --- a/scripts/schematic_export/schematic_export.gml +++ b/scripts/schematic_export/schematic_export.gml @@ -28,7 +28,7 @@ with (new(obj_dummy2)) { block_ground_data = o.sch_exp_ground_data blockspr = o.sch_exp_notesperrow // Blocks per row layout = o.sch_exp_layout // Layout number - loop = (o.sch_exp_loop && layout = 0) // Whether to loop + sch_loop = (o.sch_exp_loop && layout = 0) // Whether to loop minecart = (o.sch_exp_minecart && layout < 2) // Whether to add minecart tracks chest = (o.sch_exp_chest && minecart) // Whether to add a minecart chest blocksam = o.sch_exp_totalblocks[o.sch_exp_includelocked] // Amount of blocks @@ -102,7 +102,7 @@ with (new(obj_dummy2)) { block_other(1, yy + 1, hei - 1, 35, 11) block_other(2, yy, hei - 1, 68, 3) // Button block_other(2, yy + 1, hei - 1, 77, 3) - if (loop) { + if (sch_loop) { block_other(2, yy, hei - 2, 68, 3) block_other(2, yy + 1, hei - 2, 69, 3 + 8) block_other(1, yy + 1, hei - 3, WIRE, 15) @@ -345,7 +345,7 @@ with (new(obj_dummy2)) { block_other(len - 1, cyy + 2, hei - 2, RAIL, 1) block_other(len - 1, cyy + 3, hei - 2, RAIL, 9) } - if (loop && lturnx > -1) { // Loop + if (sch_loop && lturnx > -1) { // Loop xx = lturnx yy = lturny zz = (layers - 1) * 3 @@ -568,7 +568,7 @@ with (new(obj_dummy2)) { buffer_write_float_be(0) TAG_End() } - TAG_List("TileEntities", 1 + noteblocks + loop + chest, 10) + TAG_List("TileEntities", 1 + noteblocks + sch_loop + chest, 10) if (o.sch_exp_minecraft_old) TAG_String("id", "Sign") else @@ -588,7 +588,7 @@ with (new(obj_dummy2)) { TAG_String("Text4", "{\"text\": \"Block Studio\"}") } TAG_End() - if (loop) { + if (sch_loop) { if (o.sch_exp_minecraft_old) TAG_String("id", "Sign") else From ae014b4bb5b46459b27167c033dea9379e3bcfa9 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 20:35:02 -0300 Subject: [PATCH 33/86] Add preference to toggle right-click numbers in piano keys --- scripts/control_create/control_create.gml | 1 + scripts/draw_piano/draw_piano.gml | 8 ++++---- .../draw_window_preferences/draw_window_preferences.gml | 8 ++++---- scripts/load_settings/load_settings.gml | 1 + scripts/save_settings/save_settings.gml | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 8b263d5df..a52f6c548 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -178,6 +178,7 @@ dragstereo = 0 // Piano show_piano = 1 show_keynames = 1 +show_keynumbers = 0 show_keyboard = 1 show_notechart = 0 editline = 0 diff --git a/scripts/draw_piano/draw_piano.gml b/scripts/draw_piano/draw_piano.gml index 925fac812..191be0844 100644 --- a/scripts/draw_piano/draw_piano.gml +++ b/scripts/draw_piano/draw_piano.gml @@ -41,7 +41,7 @@ for (a = 0; a < k; a += 1) { key_click[c2] = 0 } if (window = 0 && mouse_rectangle(xx + 39 * a - 12, yy - 7, 25, 71)) { - if (show_notechart && c1 > 6 && c1 < 70 && playing = 0) draw_notechart(xx + 39 * a - 12 + 12, yy - 32, startkey + a - 1, 1) + if (show_keynumbers && c1 > 6 && c1 < 70 && playing = 0) draw_notechart(xx + 39 * a - 12 + 12, yy - 32, startkey + a - 1, 1) if (mouse_check_button_pressed(mb_right) && show_keyboard) key_edit = c1 t = key_click[c1] key_click[c1] = mouse_check_button(mb_left) @@ -54,7 +54,7 @@ for (a = 0; a < k; a += 1) { } // White out = (c2 < 33 || c2 > 57) - showclicks2 = !out && show_notechart + showclicks2 = !out && show_keynumbers col = c_white down[1] = 0 if (out) col = 8224255 @@ -66,7 +66,7 @@ for (a = 0; a < k; a += 1) { // Black down[0] = 0 out = (c1 < 33 || c1 > 57) - showclicks1 = !out && show_notechart + showclicks1 = !out && show_keynumbers col = c_white if (out) col = 8224255 if (selected_key = c1 && playing = 0) col = 16753828 @@ -132,7 +132,7 @@ for (a = 0; a < k; a += 1) { key_click[c1] = 0 } out = (c1 < 33 || c1 > 57) - showclicks1 = !out && show_notechart + showclicks1 = !out && show_keynumbers col = c_white down = 0 if (out) col = 8224255 diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 072116326..c5b1d1d74 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -136,16 +136,16 @@ if (selected_tab = 0) { if (draw_radiobox(x1 + 40, y1 + 90, draw_type = 0, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) draw_type = 0 if (draw_radiobox(x1 + 40, y1 + 110, draw_type = 1, "Show instrument icons", "If the instruments should be identified with\ntheir respective icons.")) draw_type = 1 if (draw_radiobox(x1 + 40, y1 + 130, draw_type = 2, "Use different shapes for each instrument", "If the instruments should be identified\nwith different shapes.")) draw_type = 2 - if (draw_checkbox(x1 + 40, y1 + 160, show_numbers, "Show key numbers", "Whether to show the amount of right-clicks required\nfor each note block.")) show_numbers=!show_numbers if (draw_checkbox(x1 + 40, y1 + 180, show_octaves, "Show octave numbers", "Whether the number of the octave the note block\nis in should be shown.")) show_octaves=!show_octaves if (draw_checkbox(x1 + 40, y1 + 200, fade, "No fading", "Disables transparency animations on note block sprites")) fade = !fade if (draw_checkbox(x1 + 40, y1 + 220, show_layers, "Show layer boxes", "Whether the layer boxes should be\nshown to the right of the workspace.")) show_layers = !show_layers - draw_areaheader(x1 + 22, y1 + 260, 456, 95, "Piano") + draw_areaheader(x1 + 22, y1 + 260, 456, 115, "Piano") if (draw_checkbox(x1 + 40, y1 + 276, show_piano, "Show piano", "Whether the piano should be visible.")) show_piano = !show_piano if (draw_checkbox(x1 + 40, y1 + 296, show_keynames, "Show key names", "If the names of the keys should be shown.")) show_keynames=!show_keynames - if (draw_checkbox(x1 + 40, y1 + 316, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard - if (draw_checkbox(x1 + 40, y1 + 336, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart + if (draw_checkbox(x1 + 40, y1 + 316, show_keynumbers, "Show key numbers", "Whether to show the amount of right-clicks required\non each key inside the 2 octave range.")) show_keynumbers=!show_keynumbers + if (draw_checkbox(x1 + 40, y1 + 336, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard + if (draw_checkbox(x1 + 40, y1 + 356, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart if (!show_piano) draw_set_color(c_gray) draw_text(x1 + 180, y1 + 275, "Keys to show:") if (show_piano) { diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index 7e372886f..7121870e1 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -27,6 +27,7 @@ show_layers = ini_read_real( "preferences", "show_layers", show_l show_piano = ini_read_real( "preferences", "show_piano", show_piano) keysmax = ini_read_real( "preferences", "keys_to_show", keysmax) show_keynames = ini_read_real( "preferences", "show_keynames", show_keynames) +show_keynumbers = ini_read_real( "preferences", "show_keynumbers", show_keynumbers) show_keyboard = ini_read_real( "preferences", "show_keyboard", show_keyboard) show_notechart = ini_read_real( "preferences", "show_notechart", show_notechart) mousewheel = ini_read_real( "preferences", "mousewheel", mousewheel) diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index b3596c7a3..55786b95e 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -26,6 +26,7 @@ ini_write_real_clean("preferences", "show_layers", show_layers) ini_write_real_clean("preferences", "show_piano", show_piano) ini_write_real_clean("preferences", "keys_to_show", keysmax) ini_write_real_clean("preferences", "show_keynames", show_keynames) +ini_write_real_clean("preferences", "show_keynumbers", show_keynumbers) ini_write_real_clean("preferences", "show_keyboard", show_keyboard) ini_write_real_clean("preferences", "show_notechart", show_notechart) ini_write_real_clean("preferences", "mousewheel", mousewheel) From 896a8b3540d93ad98cfd181f820918a9190123ea Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 16 Jun 2020 20:49:44 -0300 Subject: [PATCH 34/86] Change note block display setting to three individual toggles --- scripts/control_create/control_create.gml | 4 +++- scripts/draw_window_preferences/draw_window_preferences.gml | 6 +++--- scripts/load_settings/load_settings.gml | 4 +++- scripts/save_settings/save_settings.gml | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index a52f6c548..650e1db27 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -116,7 +116,9 @@ collast[0] = -1 show_numbers = 1 show_octaves = 0 -draw_type = 0 +use_colors = 1 +use_icons = 0 +use_shapes = 0 totalblocks = 0 mousewheel = 0 diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index c5b1d1d74..34c9db6c6 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -133,9 +133,9 @@ if (selected_tab = 0) { if (draw_button2(x1 + 22 + 84 + 84, y1 + 326, 96, "Use default")) patternfolder = pattern_directory } else if (selected_tab = 1) { draw_areaheader(x1 + 22, y1 + 74, 456, 170, "Note blocks") - if (draw_radiobox(x1 + 40, y1 + 90, draw_type = 0, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) draw_type = 0 - if (draw_radiobox(x1 + 40, y1 + 110, draw_type = 1, "Show instrument icons", "If the instruments should be identified with\ntheir respective icons.")) draw_type = 1 - if (draw_radiobox(x1 + 40, y1 + 130, draw_type = 2, "Use different shapes for each instrument", "If the instruments should be identified\nwith different shapes.")) draw_type = 2 + if (draw_checkbox(x1 + 40, y1 + 90, use_colors, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) use_colors=!use_colors + if (draw_checkbox(x1 + 40, y1 + 110, use_icons, "Show instrument icons", "If the instruments should be identified with\ntheir respective icons.")) use_icons=!use_icons + if (draw_checkbox(x1 + 40, y1 + 130, use_shapes, "Use different shapes for each instrument", "If the instruments should be identified\nwith different shapes.")) use_shapes=!use_shapes if (draw_checkbox(x1 + 40, y1 + 160, show_numbers, "Show key numbers", "Whether to show the amount of right-clicks required\nfor each note block.")) show_numbers=!show_numbers if (draw_checkbox(x1 + 40, y1 + 180, show_octaves, "Show octave numbers", "Whether the number of the octave the note block\nis in should be shown.")) show_octaves=!show_octaves if (draw_checkbox(x1 + 40, y1 + 200, fade, "No fading", "Disables transparency animations on note block sprites")) fade = !fade diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index 7121870e1..4008fc081 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -19,7 +19,9 @@ theme = ini_read_real( "preferences", "theme", theme) refreshrate = ini_read_real( "preferences", "refresh_rate", refreshrate) songfolder = ini_read_string("preferences", "song_folder", songfolder) patternfolder = ini_read_string("preferences", "pattern_folder", patternfolder) -draw_type = ini_read_real( "preferences", "draw_type", draw_type) +use_colors = ini_read_real( "preferences", "use_colors", use_colors) +use_icons = ini_read_real( "preferences", "use_icons", use_icons) +use_shapes = ini_read_real( "preferences", "use_shapes", use_shapes) show_numbers = ini_read_real( "preferences", "show_numbers", show_numbers) show_octaves = ini_read_real( "preferences", "show_octaves", show_octaves) fade = ini_read_real( "preferences", "use_fading", fade) diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index 55786b95e..360af9835 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -18,7 +18,9 @@ ini_write_real_clean("preferences", "theme", theme) ini_write_real_clean("preferences", "refresh_rate", refreshrate) ini_write_string( "preferences", "song_folder", songfolder) ini_write_string( "preferences", "pattern_folder", patternfolder) -ini_write_real_clean("preferences", "draw_type", draw_type) +ini_write_real_clean("preferences", "use_colors", use_colors) +ini_write_real_clean("preferences", "use_icons", use_icons) +ini_write_real_clean("preferences", "use_shapes", use_shapes) ini_write_real_clean("preferences", "show_numbers", show_numbers) ini_write_real_clean("preferences", "show_octaves", show_octaves) ini_write_real_clean("preferences", "use_fading", fade) From 269632182147455a4e012b3ce4cf5a055649bbb3 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 17 Jun 2020 07:54:51 -0300 Subject: [PATCH 35/86] Add extra note block sprites for independent drawing Added sprites of custom-shaped note blocks without any color, and instrument icons for custom instruments numbered 01-18. --- .../007cc264-be6a-47fe-bfd5-f2d0e5b55f58.png | Bin 745 -> 0 bytes .../010be783-1cec-42e1-a60c-0fabfa129043.png | Bin 0 -> 268 bytes .../0cebcee4-6bcd-40a9-aaf4-d993e92a2938.png | Bin 486 -> 0 bytes .../18b92ef8-323e-485f-8c75-29b1ec74be2a.png | Bin 823 -> 0 bytes .../1cb849fe-336e-4765-9ad5-183d53ae6fa3.png | Bin 583 -> 0 bytes .../200e2d06-de49-422f-b350-9dd356027870.png | Bin 0 -> 408 bytes .../202ab7c9-c58b-4dd9-9874-a3a746c288a2.png | Bin 698 -> 0 bytes .../21251641-be86-4820-8cd5-b9b0dc9df135.png | Bin 0 -> 503 bytes .../2533757b-b298-47c2-ba4b-46063a63081d.png | Bin 0 -> 364 bytes .../2b9ca9fc-5c11-4279-9801-bc201fa585bf.png | Bin 0 -> 503 bytes .../39d59e03-2445-49f5-a401-e05313c57ff1.png | Bin 0 -> 406 bytes .../44c9c181-2263-427a-af5d-7cc86b691e18.png | Bin 0 -> 410 bytes .../56ae952c-067a-45ca-9a10-28270b90b5a7.png | Bin 0 -> 286 bytes .../5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png | Bin 0 -> 437 bytes .../6ed53314-f509-4c2c-8f25-7f7e1f536f66.png | Bin 445 -> 0 bytes .../742bf7ac-d484-4564-877e-a1b6753db6be.png | Bin 0 -> 289 bytes .../86c1948d-32d1-4787-9776-e6a8520f0357.png | Bin 371 -> 0 bytes .../91b8a957-d79c-4574-9f2e-18df23c7a6b5.png | Bin 0 -> 364 bytes .../97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc.png | Bin 520 -> 0 bytes .../9926628a-2431-45e1-9378-f4e5b5e34eb9.png | Bin 0 -> 318 bytes .../a177c980-f438-489f-86ea-4e301ce86a0e.png | Bin 0 -> 420 bytes .../c4151e6a-4906-4ce7-9907-31fb8adc43a5.png | Bin 584 -> 0 bytes .../ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc.png | Bin 0 -> 418 bytes .../d231e946-b285-47be-a81d-5136674215be.png | Bin 863 -> 0 bytes .../d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png | Bin 0 -> 420 bytes .../d72a7986-5f91-4bed-bba1-8e9f1b1f0782.png | Bin 678 -> 0 bytes .../d7bb8497-4635-46a9-894b-aea0bd47cf78.png | Bin 390 -> 402 bytes .../df39f2d1-e8ef-4d9d-b6ff-420aeef16650.png | Bin 639 -> 0 bytes .../df7bf26d-12c0-4bc9-8428-5a06063a4f04.png | Bin 0 -> 308 bytes .../e093dc36-e954-4a72-8f38-ec9faf0fbd57.png | Bin 1025 -> 0 bytes .../e2f2e76d-4616-4ab8-bf84-75bdf705a2d7.png | Bin 651 -> 0 bytes .../e45ada33-e4d6-47de-af58-a47b532b267a.png | Bin 936 -> 0 bytes .../e6e99706-8eeb-4a5f-9235-c45b823858d0.png | Bin 859 -> 0 bytes .../eb2d1b3d-0c2f-4010-87dc-05e7b40846fb.png | Bin 827 -> 0 bytes .../ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png | Bin 0 -> 423 bytes .../ecc58aa3-152b-42f8-b4ec-b0a325e43b6a.png | Bin 635 -> 0 bytes .../fd392c9e-705c-41c8-820e-b21aaea252a5.png | Bin 0 -> 423 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 745 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 268 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 486 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 823 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 583 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 408 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 698 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 503 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 364 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 503 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 406 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 410 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 286 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 437 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 445 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 289 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 371 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 364 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 520 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 318 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 420 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 584 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 418 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 863 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 420 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 678 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 422 -> 441 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 639 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 308 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 1025 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 651 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 936 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 859 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 827 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 423 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 635 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 423 bytes sprites/spr_block/spr_block.yy | 180 ++++---- .../0a8bb888-4379-4675-af34-809c17181a1f.png | Bin 0 -> 175 bytes .../1a62484f-87ff-4a6b-9260-6b56881c34e9.png | Bin 0 -> 183 bytes .../22cbab71-9620-42d2-846c-dc9d0afbe250.png | Bin 0 -> 181 bytes .../236f3f44-bcd8-4991-8334-dd1dcba3a0be.png | Bin 0 -> 178 bytes .../26a94b6e-2731-4e34-b12d-0875daff5130.png | Bin 0 -> 162 bytes .../27ae2cf1-4d7b-4112-a2b9-828146908a41.png | Bin 0 -> 178 bytes .../3d1b4453-7b25-4b58-820c-5018674ed7b3.png | Bin 0 -> 185 bytes .../5162509f-6965-41f8-abcd-b782e0cb52b7.png | Bin 0 -> 182 bytes .../5bf6e115-a5b5-4410-84b2-d433d2140d53.png | Bin 0 -> 181 bytes .../673f22b0-fdc7-481e-8ffe-a108467c9b31.png | Bin 0 -> 178 bytes .../71fc5f0c-1c8d-476f-839b-f7152b03996b.png | Bin 0 -> 175 bytes .../72c45179-f6c8-4af3-9793-2e6ed80172b9.png | Bin 0 -> 182 bytes .../96b2398b-961b-4040-af26-3ddeb343dccd.png | Bin 0 -> 175 bytes .../9f6abf2e-c5dd-4535-9b0b-7651286e1cb3.png | Bin 0 -> 177 bytes .../b0443b9b-ed75-4725-8e1a-e3482a4597b7.png | Bin 0 -> 174 bytes .../c3a374aa-3c69-4658-b739-4048a60ee57b.png | Bin 0 -> 181 bytes .../c98c7682-8bed-40ee-8305-b748dafe961f.png | Bin 0 -> 183 bytes .../e68c7937-14d3-48ed-a84d-dfe346cb95c2.png | Bin 0 -> 182 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 175 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 183 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 181 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 178 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 162 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 178 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 185 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 182 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 181 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 178 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 175 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 182 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 175 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 177 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 174 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 181 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 183 bytes .../18af6b60-a826-4a43-836c-ef503ae61c47.png | Bin 0 -> 182 bytes .../spr_instrumenticons.yy | 396 ++++++++++++++++++ 112 files changed, 486 insertions(+), 90 deletions(-) delete mode 100644 sprites/spr_block/007cc264-be6a-47fe-bfd5-f2d0e5b55f58.png create mode 100644 sprites/spr_block/010be783-1cec-42e1-a60c-0fabfa129043.png delete mode 100644 sprites/spr_block/0cebcee4-6bcd-40a9-aaf4-d993e92a2938.png delete mode 100644 sprites/spr_block/18b92ef8-323e-485f-8c75-29b1ec74be2a.png delete mode 100644 sprites/spr_block/1cb849fe-336e-4765-9ad5-183d53ae6fa3.png create mode 100644 sprites/spr_block/200e2d06-de49-422f-b350-9dd356027870.png delete mode 100644 sprites/spr_block/202ab7c9-c58b-4dd9-9874-a3a746c288a2.png create mode 100644 sprites/spr_block/21251641-be86-4820-8cd5-b9b0dc9df135.png create mode 100644 sprites/spr_block/2533757b-b298-47c2-ba4b-46063a63081d.png create mode 100644 sprites/spr_block/2b9ca9fc-5c11-4279-9801-bc201fa585bf.png create mode 100644 sprites/spr_block/39d59e03-2445-49f5-a401-e05313c57ff1.png create mode 100644 sprites/spr_block/44c9c181-2263-427a-af5d-7cc86b691e18.png create mode 100644 sprites/spr_block/56ae952c-067a-45ca-9a10-28270b90b5a7.png create mode 100644 sprites/spr_block/5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png delete mode 100644 sprites/spr_block/6ed53314-f509-4c2c-8f25-7f7e1f536f66.png create mode 100644 sprites/spr_block/742bf7ac-d484-4564-877e-a1b6753db6be.png delete mode 100644 sprites/spr_block/86c1948d-32d1-4787-9776-e6a8520f0357.png create mode 100644 sprites/spr_block/91b8a957-d79c-4574-9f2e-18df23c7a6b5.png delete mode 100644 sprites/spr_block/97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc.png create mode 100644 sprites/spr_block/9926628a-2431-45e1-9378-f4e5b5e34eb9.png create mode 100644 sprites/spr_block/a177c980-f438-489f-86ea-4e301ce86a0e.png delete mode 100644 sprites/spr_block/c4151e6a-4906-4ce7-9907-31fb8adc43a5.png create mode 100644 sprites/spr_block/ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc.png delete mode 100644 sprites/spr_block/d231e946-b285-47be-a81d-5136674215be.png create mode 100644 sprites/spr_block/d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png delete mode 100644 sprites/spr_block/d72a7986-5f91-4bed-bba1-8e9f1b1f0782.png delete mode 100644 sprites/spr_block/df39f2d1-e8ef-4d9d-b6ff-420aeef16650.png create mode 100644 sprites/spr_block/df7bf26d-12c0-4bc9-8428-5a06063a4f04.png delete mode 100644 sprites/spr_block/e093dc36-e954-4a72-8f38-ec9faf0fbd57.png delete mode 100644 sprites/spr_block/e2f2e76d-4616-4ab8-bf84-75bdf705a2d7.png delete mode 100644 sprites/spr_block/e45ada33-e4d6-47de-af58-a47b532b267a.png delete mode 100644 sprites/spr_block/e6e99706-8eeb-4a5f-9235-c45b823858d0.png delete mode 100644 sprites/spr_block/eb2d1b3d-0c2f-4010-87dc-05e7b40846fb.png create mode 100644 sprites/spr_block/ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png delete mode 100644 sprites/spr_block/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a.png create mode 100644 sprites/spr_block/fd392c9e-705c-41c8-820e-b21aaea252a5.png delete mode 100644 sprites/spr_block/layers/007cc264-be6a-47fe-bfd5-f2d0e5b55f58/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/010be783-1cec-42e1-a60c-0fabfa129043/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/0cebcee4-6bcd-40a9-aaf4-d993e92a2938/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/18b92ef8-323e-485f-8c75-29b1ec74be2a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/1cb849fe-336e-4765-9ad5-183d53ae6fa3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/200e2d06-de49-422f-b350-9dd356027870/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/202ab7c9-c58b-4dd9-9874-a3a746c288a2/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/21251641-be86-4820-8cd5-b9b0dc9df135/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/2533757b-b298-47c2-ba4b-46063a63081d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/2b9ca9fc-5c11-4279-9801-bc201fa585bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/39d59e03-2445-49f5-a401-e05313c57ff1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/44c9c181-2263-427a-af5d-7cc86b691e18/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/56ae952c-067a-45ca-9a10-28270b90b5a7/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/5b93e3ff-90b6-4dc6-8614-0c4b73004ded/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/6ed53314-f509-4c2c-8f25-7f7e1f536f66/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/742bf7ac-d484-4564-877e-a1b6753db6be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/86c1948d-32d1-4787-9776-e6a8520f0357/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/91b8a957-d79c-4574-9f2e-18df23c7a6b5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/9926628a-2431-45e1-9378-f4e5b5e34eb9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/a177c980-f438-489f-86ea-4e301ce86a0e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/c4151e6a-4906-4ce7-9907-31fb8adc43a5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/d231e946-b285-47be-a81d-5136674215be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/d34a3ca1-3d4b-4cb6-b64c-631c053546e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/d72a7986-5f91-4bed-bba1-8e9f1b1f0782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/df39f2d1-e8ef-4d9d-b6ff-420aeef16650/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/df7bf26d-12c0-4bc9-8428-5a06063a4f04/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/e093dc36-e954-4a72-8f38-ec9faf0fbd57/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/e2f2e76d-4616-4ab8-bf84-75bdf705a2d7/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/e45ada33-e4d6-47de-af58-a47b532b267a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/e6e99706-8eeb-4a5f-9235-c45b823858d0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/eb2d1b3d-0c2f-4010-87dc-05e7b40846fb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/ec2ccfb8-139b-4079-bf5f-8b746c1581bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block/layers/fd392c9e-705c-41c8-820e-b21aaea252a5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_instrumenticons/0a8bb888-4379-4675-af34-809c17181a1f.png create mode 100644 sprites/spr_instrumenticons/1a62484f-87ff-4a6b-9260-6b56881c34e9.png create mode 100644 sprites/spr_instrumenticons/22cbab71-9620-42d2-846c-dc9d0afbe250.png create mode 100644 sprites/spr_instrumenticons/236f3f44-bcd8-4991-8334-dd1dcba3a0be.png create mode 100644 sprites/spr_instrumenticons/26a94b6e-2731-4e34-b12d-0875daff5130.png create mode 100644 sprites/spr_instrumenticons/27ae2cf1-4d7b-4112-a2b9-828146908a41.png create mode 100644 sprites/spr_instrumenticons/3d1b4453-7b25-4b58-820c-5018674ed7b3.png create mode 100644 sprites/spr_instrumenticons/5162509f-6965-41f8-abcd-b782e0cb52b7.png create mode 100644 sprites/spr_instrumenticons/5bf6e115-a5b5-4410-84b2-d433d2140d53.png create mode 100644 sprites/spr_instrumenticons/673f22b0-fdc7-481e-8ffe-a108467c9b31.png create mode 100644 sprites/spr_instrumenticons/71fc5f0c-1c8d-476f-839b-f7152b03996b.png create mode 100644 sprites/spr_instrumenticons/72c45179-f6c8-4af3-9793-2e6ed80172b9.png create mode 100644 sprites/spr_instrumenticons/96b2398b-961b-4040-af26-3ddeb343dccd.png create mode 100644 sprites/spr_instrumenticons/9f6abf2e-c5dd-4535-9b0b-7651286e1cb3.png create mode 100644 sprites/spr_instrumenticons/b0443b9b-ed75-4725-8e1a-e3482a4597b7.png create mode 100644 sprites/spr_instrumenticons/c3a374aa-3c69-4658-b739-4048a60ee57b.png create mode 100644 sprites/spr_instrumenticons/c98c7682-8bed-40ee-8305-b748dafe961f.png create mode 100644 sprites/spr_instrumenticons/e68c7937-14d3-48ed-a84d-dfe346cb95c2.png create mode 100644 sprites/spr_instrumenticons/layers/0a8bb888-4379-4675-af34-809c17181a1f/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/1a62484f-87ff-4a6b-9260-6b56881c34e9/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/22cbab71-9620-42d2-846c-dc9d0afbe250/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/236f3f44-bcd8-4991-8334-dd1dcba3a0be/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/26a94b6e-2731-4e34-b12d-0875daff5130/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/27ae2cf1-4d7b-4112-a2b9-828146908a41/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/3d1b4453-7b25-4b58-820c-5018674ed7b3/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/5162509f-6965-41f8-abcd-b782e0cb52b7/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/5bf6e115-a5b5-4410-84b2-d433d2140d53/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/673f22b0-fdc7-481e-8ffe-a108467c9b31/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/71fc5f0c-1c8d-476f-839b-f7152b03996b/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/72c45179-f6c8-4af3-9793-2e6ed80172b9/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/96b2398b-961b-4040-af26-3ddeb343dccd/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/9f6abf2e-c5dd-4535-9b0b-7651286e1cb3/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/b0443b9b-ed75-4725-8e1a-e3482a4597b7/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/c3a374aa-3c69-4658-b739-4048a60ee57b/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/c98c7682-8bed-40ee-8305-b748dafe961f/18af6b60-a826-4a43-836c-ef503ae61c47.png create mode 100644 sprites/spr_instrumenticons/layers/e68c7937-14d3-48ed-a84d-dfe346cb95c2/18af6b60-a826-4a43-836c-ef503ae61c47.png diff --git a/sprites/spr_block/007cc264-be6a-47fe-bfd5-f2d0e5b55f58.png b/sprites/spr_block/007cc264-be6a-47fe-bfd5-f2d0e5b55f58.png deleted file mode 100644 index 67ea95ce85b6b31f6687de90b314d546e367f0cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmVQ{H??sR}9cBZ3Bw%2Mi`FZB}Y2FOL|CRtia84DZYGrXVkMr~MYLATT z0i-3NQ(!2SOq)4ZHqEc{KnOru650Wk@n)U*)SVc;3qk_R zwGoq2j!&cmJMT7daBzO=_BfYZ2P*qzn6?AA(#Jy-(LCv6Xy;&Jhyw1R z+xv}TDF^pt-t*6U8nA3f1`xcZn6VTFyY4NSf7VCV8X&J_MTJxy+1&aSZ9(WszjOM> zn_WU3pqa96S?5AiqUu%=^$%XlwQ=nI@=&@rmIwGW#O*}D?GxKxDvm#}IT2OM0IMrS zw02#|pEwUt+ZhNiBiZedO@0D`V?+Zm^d+G~+^y^c`zI4b0hzoW6_;2CXvwPH35XKz zgc>gaU?w!%9VsyG>ozWtc(UT9zV1Hz<*-=-AGa=F-~2Km*jJ>|Rnn8=|FPOd zPu7|!JX^c_qs&!CX4VIM75{#+&p7r}Si*r{GU)01{XZM-g2fwl@`$;&Jem_xIir%t zU!gE>sRrY+^ZR%91Fc~yVAts4Xn6TMVEQ43qlJ8?{9;BMwzNG2%N+Qm%2d#BQaoN^ z&*$augVp*I?Pf8vaczj%|FNOaLDpcxw0@AQ7xPJ!GH@_3JmSgh6LER@4d^`vPgg&e IbxsLQ0MvbHE&u=k literal 0 HcmV?d00001 diff --git a/sprites/spr_block/0cebcee4-6bcd-40a9-aaf4-d993e92a2938.png b/sprites/spr_block/0cebcee4-6bcd-40a9-aaf4-d993e92a2938.png deleted file mode 100644 index af12874aff361d4631aa8512b407201a5961c761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P) zm-L$tU@6oA(39Uk?U}s2ahQBOM4V3TD*xTqmg?)vfb!(~h+6=Ctey7GdNKegYg(OT z=h%bnsQKnC=@-DUQ3p`ZDT$PxOjUE09q+R*t@Z$xf-nUZIZ0Q|ak4Hu42uZk^s|5-BN`~IkPp67|T;ZPm`T-P16 zc^HOF&ej8Yo=cx=n%3$g@W2L)MHsB>mNZRMczID2+;3giYdwx*K7gsnvTW2kB@bX4 zR6S91d)4hUz0K6i>_PxjQI?>Yasbbo=`W!yfn{7UDR4LG3D|+jC723TirFSDlOQl* zl74Uws;^s$t|@?yQmk(Z0Q3L_G9=pnxm`*!Jtkq+DF9@tFVRXw_@^=!K@f~uH%kV} cTWu`<02tO8DUl-9+5i9m07*qoM6N<$g6{U&0ssI2 diff --git a/sprites/spr_block/18b92ef8-323e-485f-8c75-29b1ec74be2a.png b/sprites/spr_block/18b92ef8-323e-485f-8c75-29b1ec74be2a.png deleted file mode 100644 index f0cd8f51f6fbe0f2be88089cdc101113f7fcb5f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmV-71IYY|P)-TmBm(K4V1FfDP43ih) zd|7>-J9meHD6KJ_d$PAXxRpM}oQ_5}1Mt740npTGhBWuAE#__dxZhyAe>H%0$wC$M zGf%FIdGzc$eclHa0IW+Eav<+`w~hI=IWa#A767bE8UPVljL}VF{{HaCr5o>m`r2YL zUB40r%&*tPR1=q)+&z5XDEY>*M2`KyP7xLH87`~kE#j?ri>Kjj`+$h*Z8rBTTifsC zKJfbVB>G3&QHUGZihlJtiL22 zu8{eLpun&7V*()W1F;&~a-!+&$adp%i%E4i{3EM1SOCo|01$gHP~%6EQ*x2DC9d`A z7*HHPGR8#HDv+yfqj!pZg>WgnKK-+K}~&3kv26H)I0znd%5D~d*a=6+ zzmvV&zHSpy(g$FvvjZ@o8pfT(pFSZ-8DV>hJxwS*EuBve zp>P%`B%QEhXP_L^>lw}iZG2@U0RBa|c(e4oe*rv1%BoIZ@kamv002ovPDHLkV1gxP Be6s)m diff --git a/sprites/spr_block/1cb849fe-336e-4765-9ad5-183d53ae6fa3.png b/sprites/spr_block/1cb849fe-336e-4765-9ad5-183d53ae6fa3.png deleted file mode 100644 index 7e8758600200e8c74aa86c2758c2e4627a1a9316..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P)6RJq*S$#HpIYX~~EtNaUD!&jfa3@9V7HiQpQ zAJS#P}bCmq>wX4vSZDmWe!JR(r^j5_mnWDk*R8~vg3Y6S{qCtDoD3LBasBv z93u;|(>Wj!hze2<(1|x{%>#SFc?%>0QNbmE%&Jo2bT3A66=#fI|IuQBc(eo(i{MsSY(0)y^`z@ZE*(bmP5#o zWFM?NJS&bqJ-2|)0lW>Wo^WTor`z4=#vw2%um&7RKuaxiDa~%u6KMY{{yhWtW(j#=%sv~ev2?W9djW`I(9-zPs$@Y#t**sA(_(jjwkRaMa z&A|EXC+u#`2A0CBy9Dr`$~f@eeQdJdwHWb>35^&^2KGnRyU4%TBa)K@)Ho$$JX`5YLI{lB^epvu%u>mmi zr){h4Ls?kkBynd(3_x0JfVv%PjG1G6HUMd{0jff2OVSs<98js9UTt+!dLTyIS-KcXYmO@ETy5RSM+u|bGl}r|9dL-^>*y@zjq$szJQt2 zF*4y>?P37Z;{O+{ubublS8g!?X|VyC;XN*Zw7vlOA+2Vw|Hldd0000@M6upZIx`;*$)Q1XrT{Wv}#Z93gxDlZ%f1n@G|L_l7iwj+dD?!|dLZBNpS{J69 zG=;PzfwWCqP!U9P#&=$4?qr&#dH8yu%$vE>x#!+<=T19SnJxd395I!rbBDmK(gicd zrJ@<5!g*(7`|zhT*LDr==RVGxy}lVg_kOqp@0GUrOwSf0rqg8LtqjdPS49y)HjY0DID05BVv%m2yh+n z`hc)wsSbABD_Q8)q#;Ff@RK*6WN|Jw4nc_N2BB{v>ufHjU> z+gW=ng~2x^a|q}@z}pb2iL|#T)y@LDIKL#V+L8VMGGTvHlFTw-J8NuLASJ;6R89li38L0b2tW3FKzSSj glK`m%@VJbNzjRN`&_GCx%m4rY07*qoM6N<$g6!o$ZU6uP diff --git a/sprites/spr_block/21251641-be86-4820-8cd5-b9b0dc9df135.png b/sprites/spr_block/21251641-be86-4820-8cd5-b9b0dc9df135.png new file mode 100644 index 0000000000000000000000000000000000000000..c83bf3b27a27ba305396b595e6c62e479a9363df GIT binary patch literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~hh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP90nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^xQKD35iG&xo!zSh?6P1HoRP@=yey&{p{_-`(D{Ly(49`AqUB15gWkRs8h#fQY zw+RbpF|XkDC_Aw6^#qHypEAdm&j#}wrY=*O;pWf0VM4{n)?<7N%oMD77ko}sEUvpT zo!Maip_+9X%$kz!ah45oLM6ovTNzLCIrM*?7|wU6{*z3reH35Mog#*3#a~Pui`fID zC&co}>}K@+D>cF7AOmmb!+5>}HGSvWTaWydUb3`vp*YhdrKX6Z@Av<7kO!%L)9^We eAO9MlLl{iw#)j!NEieRnn8DN4&t;ucLK6VcXl@Ar literal 0 HcmV?d00001 diff --git a/sprites/spr_block/5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png b/sprites/spr_block/5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png new file mode 100644 index 0000000000000000000000000000000000000000..f87fc85521d85f5211fc2c7bfe824142be081202 GIT binary patch literal 437 zcmV;m0ZRUfP)%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr literal 0 HcmV?d00001 diff --git a/sprites/spr_block/6ed53314-f509-4c2c-8f25-7f7e1f536f66.png b/sprites/spr_block/6ed53314-f509-4c2c-8f25-7f7e1f536f66.png deleted file mode 100644 index 329d7b97e234ef75ad099ad6543e78d4b893047f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmV;u0Yd(XP)*V(3tBF_}7a$&~+)|Jbd+p_#h0&?zLFI}~h)p@j~~mg1}55lN@| zqb7F`g3w9!J)LxtGfpSBhml8&eQr(&+(j2gCef9V@#Q&j%)j?U=XMVG!w-5^ei`{z z?kE9YumpJIk1uN@7x$@=&zp?s+^+f0CW%uI?*!Dy*BN;LdS5%Qop4S7P;**GGE0+A zcI15Yk+&moYFGmHo-(F9GA-wt9q&tS;=c*_g17}Si=-*%h^)!Z`+y+e3!(;i$LpH& z#+s;Sfgs=umH?O`M{RTdv?-h~et3OXwxs@poWN?;@0(^iJ(JV0Yaal%+isf|^+AMF z19nQGW3dj_G$n!MlIruhT*n$AFa)Yij$eMfR{dOdwGZGnXf(NQ2Pbf9h)$T7pTt4?x@`+r;W-Hm0aQ9)0}&S?wFWqFLefrqyB4js9!?G5 npGsd8?xEP8z<*FpwZ8ZPvBc?xoUN@=00000NkvXXu0mjfA+5%* diff --git a/sprites/spr_block/742bf7ac-d484-4564-877e-a1b6753db6be.png b/sprites/spr_block/742bf7ac-d484-4564-877e-a1b6753db6be.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211 GIT binary patch literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL literal 0 HcmV?d00001 diff --git a/sprites/spr_block/86c1948d-32d1-4787-9776-e6a8520f0357.png b/sprites/spr_block/86c1948d-32d1-4787-9776-e6a8520f0357.png deleted file mode 100644 index 546a43f4b1f99fd5c1e2122c6a709ef40504c8fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2MP){wai05-a5?~5a5Acbn>v<86yFe0P3b_C% zgGcXru9^dbo-3k#cL8q0PtO7VUt!M<+-|9CVr8D`dj3Ci07_Lofy#7wd*=Y)xm6J* z&sb0B@=0*KzCSx{_RRr!6D0?dp!&OgmH(X{;DGXX`9cBTMlJwdX-t4ATmXnU2>`uY RS@Zw^002ovPDHLkV1ljfq0;~W diff --git a/sprites/spr_block/91b8a957-d79c-4574-9f2e-18df23c7a6b5.png b/sprites/spr_block/91b8a957-d79c-4574-9f2e-18df23c7a6b5.png new file mode 100644 index 0000000000000000000000000000000000000000..80f42a19b3c520dc8c305a2b81b5cbc97132fed4 GIT binary patch literal 364 zcmV-y0h9iTP)lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~h0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;0|pAf9RPC~ERKkc^ZhqoU^RHznFlzm zL{(3f5V-K_CCPejJo~^9VW5s#82o(9}U!d&)9!T!OCLWc01QZq2!d&hI73SlFnPE>0&)Hv%7^7P7#Msd z;qy1|Q54{6-J%0rA%l^op!OJ|JAhuGY~2Bdt{?|EA7>gs2QZgo%D*5WkI;{9IaUYI z5};d-;s97rg&Y8?SPWa2Fv#-rFg*VFg(y8BwI~jt1b}KaasdGA{um#`kW6p@0000< KMNUMnLSTYJTH6%> diff --git a/sprites/spr_block/9926628a-2431-45e1-9378-f4e5b5e34eb9.png b/sprites/spr_block/9926628a-2431-45e1-9378-f4e5b5e34eb9.png new file mode 100644 index 0000000000000000000000000000000000000000..73680809434ab6f14b952f601015e47eec1b8350 GIT binary patch literal 318 zcmV-E0m1%>P)4$E(caHR) zA0HW5L&6FY7EsI$iqUZm=W`y%7f3imBLiLp1A65LNZ3Qd5sJq;Zq468&&KWTKyKwk z??i1}*G@Y-KuU938t1s!z}y4_Jf|lp#;WGhIN!H{UK;QsIR$){=A0|b#r69V170LG zPSLNQbOfR6u84QS|mYCLOTZh`?;rJDgS9;e!@#-S+k QDgXcg07*qoM6N<$f|Oc^N&o-= literal 0 HcmV?d00001 diff --git a/sprites/spr_block/a177c980-f438-489f-86ea-4e301ce86a0e.png b/sprites/spr_block/a177c980-f438-489f-86ea-4e301ce86a0e.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8a6c5e2cb260a54eb7999b85aab3773a506ad9 GIT binary patch literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000XdGoQerP^*C&qaZ#7U|p|aN^aK47{e2eq-C%I2=!nHP>@sKlWig2;Y@_ z2qTj~QP2c<3j2Ez8SI>KAb20!pYZ^z= zZ3mh3sJVC^{*J(ZLle;FlriOzxoYmx!(MRcFDFnGtW)5#NLJMxk*(76Ibabe3RVyB ziI=tJD|;fo3oHUfK@$Ko)abW0zwVDx4PV|rI$WCjbIHKP&9|t>6Lx2-q~zoy`OcZm z7P3}b=%r3RJMWh5+c4`KP*GHp-_-Fk=bvBkyICT2K^m7vrR0vOej?_^bAy1sr7*GB z1Y34Xa-$%FND(asN|xIxpwWW_bu7z7_n=pta{#Bo)f0NQvu>v~mjuusaL$`FmkjU} z!2eZsMGtl-y1MM-+d>%j|f2 zC2@2h#M5iy9C~XK4#PLYkn8I<4LIi!`3r$=@4qBbQ++NOpp8Y3q;w8a6tXPNL4+RQ zK!$AnNIRFH4T<4H0fM>D0cuPChlCd?=zIKB%?ok9% zK@ouGQ`JCmm)j2!2`_E=SoB>RFAhn5l96l0A|S1Sk6QBoO9O=RdGww^zD#9DyY{`&VlHh zi#dQ=Qv^~$&4GoO-R9FCjd~UB|A!HMb+&VWH>-QAjKksevJ&{&4Yk6Pq{C*@jbp7!d(5*bBXnr8p zIV>O}DqV#xZbxea#G@!b~PZ zPft&rba{E1f!XbL^85ctS1cCk{{EhJc6PJ?)VGwFSkeT0?JbGKxm=E1E*E*dUZ(!+ z?2IlhE*ON>Y9&QcsM%~%I2>liPESvbV<4N&lE>rW3l&!?6$XOD@IxwMHemJvOdk4Akp&a=YDJ;mOGfx7o_d3cDYEfcB9{gwFyPW&+Hp0U#z} z>8`4IxZYp4e+TGApTls+$H(gMffSpYoAmhjNa=K%TT{#gL%ZPe@{*R8miROLU^1C_ zEWRjT(g+lBN_yRx<4-ffQ zg+jqN2B1HvMq>B@7y2GDfSrwv4epA$xj9~gA;FjmK>VjNPN47Ma(DnnY`5D?xiBAQ p1YD2AI19!wIW++OCE)gP;}^to)4ycX<9Gl7002ovPDHLkV1k_eobLbt diff --git a/sprites/spr_block/d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png b/sprites/spr_block/d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8a6c5e2cb260a54eb7999b85aab3773a506ad9 GIT binary patch literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O00000SDI|P=h4`hw1k7TWtW}J=P z;hAG=zXtbnAMLnzEbC71w@aWXSOPlp_3f6dYs*bpKel7X*8b4`)kc(R-@gh3GjGMt z4YafRwRY}L1&ClzZ!%eJMq~NebJOYGjllngC1B5~VyZI>^*rR~^P+m~b^=AgI|VhB z$*7()vr&FM2Rs5r!P9`Ac;ohbq$Y0O1s;K-UHZ?z9nAN=9-w?IgDe=Zex z_x6pf-QJO@RUez@^`~Ng@9fKW!0_x+)@u2oc~YJ=mC~$vzp?4R4ac1W03H_qJTQ&u znQ6yA#I97zmeAqg#F99_xD*?Ea;pH*AD##atRS@V`jzST2NH04YEt%a#U6)%eM@m- zsR?%5TapiBRtShplYq_OxMpi|sQ^n1A|QbPC^xbvIRuXu=B>?pf^&eUA*2aA+ppB# z8=QKimYXjm7z06g&8{0pFLkRTBVPX|Y3cseM~R04E(vs-C`e&S_)&IU|s zK#LAw6;cUg0W$p3`DM>INhDi??4gP6)>mndrvXkvs*?!)x=kV(oHGH}BsPt6e-#|x zmu4oNYUHK?28Yma0;qWS&<f#TF+&7}fRHa=PK7g#FCxTWqQ=>Px# M07*qoM6N<$g2RzB{{R30 diff --git a/sprites/spr_block/d7bb8497-4635-46a9-894b-aea0bd47cf78.png b/sprites/spr_block/d7bb8497-4635-46a9-894b-aea0bd47cf78.png index c7e5ec945b89bea3527ae939ab7aa27f92262f99..6caf27fc08d16974fe9fbba43c5eee8ab3435d6f 100644 GIT binary patch delta 375 zcmV--0f_#F1Cj%fB!5{+L_t(|oMT}i5=4fo{3li|2rOTHhmja{ETkAp3qZ01j15J> zv;aRFR{6aLp3>F<)CMFw0Os?<$DV^}TPsNvKFu9KZ9uXEE?<2IreQvZ@#*FOY6FrT zpsOterqR;?EF@mN{!Uv5P#ch)2GIGikQx5v0L-T_pUcYdfPd+cR}P?u1lbNCwVEXs z5Nj^UA%Gs|R4WH$q`ASgxEL4Iz_(Z}AOv95HB7&*wlJ7}{NxLikD6WK4uDwF4XApm3O$=wmI>}7a|DvMt*pcf$M0Q8V}^7JcF1`nCuF#uy@ V&H#`Zp@IMa002ovPDHLkV1h5VpC14K delta 363 zcmV-x0hIod1BL^TB!5jwL_t(|oaL9l4go5RDRVfQnMQk%|{k@iw9nB^BNP zm8j54B>rT4a>i|Dhh2nUGd8og`|UTkyC)1RX*YtSZQl#cPLQza7itFefm%SdLNT3+ z&-ePC1-M2n04pC1Db{QEZSMkHqZTlmQN+s8ewzT-s09>@6o2_U04G*!&jMWY^gF=Y zaAx)M=KxlUmFMyl|L+{&PCP9@d(GNnJFeORUUO&XK;b%YHcN3bjh{dQ*EOCmmnbe5 z6j3@{+cyE27#)FBb19GU;M{h1pZ}g+Fd9>Yg+QvgZ5}1r?+pSzMToCgY#Ye4(E`Z8}_y7xt9e*NGkeTa{~RAh)~>G-PiyC002ov JPDHLkV1j!^p_>2z diff --git a/sprites/spr_block/df39f2d1-e8ef-4d9d-b6ff-420aeef16650.png b/sprites/spr_block/df39f2d1-e8ef-4d9d-b6ff-420aeef16650.png deleted file mode 100644 index 3424bb98492e2e08a49f0098dac70e4c25207203..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)FxS7wV{=kG5A z!N}_k=L?(d>42GvVtK%W~@=aHQ&3u?Yi*h@l9Y$ z*FTjE)V{B(cDt?iP8({e+zFud>%sGz_?Xx4F-B3OmeTMO#o~} zfaJw>qE;#s=3Oco*sh)HF_-&by-ggS$Hza8KYhJEpxCiQ2Ycz3{POvev)NSKiSS3# z($5$HM9&fdUpEfZI|cUQNHtTBXO?5BocFX5>;pUvAx)Ux{-kz9iI2T8!3{gLFR7{M z6@Cxw9@L#06SgK`r&es6N1zao>(T4oLKCzDh)fc~iJ%sc8N$v`Y8s%(Y(m%+AG_u( zgYEBi!e(;kEEf88Yl9*K7@-s!d>}$wln#Oa!Os4bsj01nZhb*&C8z-jX2`eSs_OE* z^G2S38;Bk)8>RTRb&{S2SYLqR<10>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000PVgJJ3x7Ynmd!F{RKJWudahn~6L zKWY8uN^b1@!((7#=J`X<26ui@zrS}r90pvQSkt$eY_8_c<#%h2Qsw;s{NFYNFubQe zr2fn%)qIlQJufF^-VI<@HgXFxzD&-lxtrNpe!mWk0GO4H^nhRS&Rg>{d*ba|Fals! zHU!`zb8GazHQz2&#~%Fa!B=o5kD$gH- z52aA66~Okxpo78bF;JC@pz1WjEDJ+75Q|@euIaFB!U9dB*X@$A1uhanDwT4wrzpw` zVE9V8ise(VcfOJV8*yGl-6-R7YRUN&jzvL{;5GqKmR}J@28gl(2JIedS`~|ni_>F( z<2Y1EkoB*A#M4K=Kuo96dEJEF388CixPI+AYVrvwZyu2dk60`Q(=@#R{5s&?hDkj! z)b`VEH#zj%ud%=P8)R7_0WJ~Rd+7BI1nD6DDVLDsGr0Ekr#N`AiwF}(d!S8^f%ZT} zHoE}5BSTuuLRA|Ogn5YKRTPhoU?^SGQ9O9?8B*0FMQb5fWpW@b`r4KQ)d{ zARJ~93(TWSGN-5xXp2MXP{zEF#nl^W{PFu80#ZV|Nv>gl9`2nA15ftuN#lqx6Ni`-Nt6znM1ZQ5GJ-@OTBeF*GBG^{7$$_Rtxc3(96?-2W07N@`56+0=wy)8nJg#n#iSvzLBp zyw7{wH#?7dJ?Xr-1mZG7Kt{fObf(vh)tp}U&zsI(`a}2E7qdP0|1Sf<$j_S2A8`L& zzpS1AlL1;#)6YoObJ?N%)Lh-R1|#s-W(b%*6-;GhA-l znN*F_hThkY>Z(*K>F?ccSKVCSm~-4)m|sx$_jhV@Ys-Hd4m$^E0H2wiQHKWy8pH;c z=NFe3nnYw7sMTuvfdF}We%5CIN0gb&lsU&8kbw^*90KMo#fc>**jI1K@kGKzwY0pX zqa-N;6$%A?&Wz9^>w{q$Kuf14duBq`1pSPV8l&J~HaKNrO;DQ1GC**)9n)`T zgffr_R59-N1V{=2npcW1|d+UW%;WCFnW;5*KKr3ZG2z&Ld5mP3oOHejd;uMK}OXWLeg8>K<*ewU6M94px4tq@W{ZIwcj=HWPg z+swVK19sxRWD#a_<;=D3nKNgO9eHQ_evBoCyv)N>03OzLzP9UYd~H^>)W(kKq^`61 zY$W@WeaZDfZ^+lrJv$9xSuq2Ut^DoBJ-$ADw8PgA`vS1ZX9 zJlBV+mf(5b84IESF$^g0Lsk^%nm%JE1z`4;N*pWWU>Ck6g&1n749A7Zx!zd$&e886w#xB;@YOsm=k$Fn3 zQivfHQ52;CWPKo+hCEHoyq&2%QV@~2hW)Rwrw*|}2T-M9>_HSnOeQ8YVyM+>U^MEI zSXBfBtS|fw1`w|_@teG|tghuGS@hp{yv zPa-`YH*~;fJwt8;?gcq6!xyJFwU7k_Zh* zG#QMc!WdvwJE4o?<0GuBtdIx+*K@JCaTm73gsAh$;A2Vca6N}wlQE*?pUO>w*{(un z#Du2EGzmW0Zb{(I*gNf_PSg*FLq4i1G2k;WVSx<1c>egt_x=VK{^vX(R@&150000< KMNUMnLSTY_Pq)SZ diff --git a/sprites/spr_block/e6e99706-8eeb-4a5f-9235-c45b823858d0.png b/sprites/spr_block/e6e99706-8eeb-4a5f-9235-c45b823858d0.png deleted file mode 100644 index 9950a34540e9f98ec0a0ee8d4167ad6218ff57f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1ElV4%+2+#{ijFMt@Fp1fzHU!=8Z4t z`9s%D?L3|gXzS#39m(nO^j_*Bm?U7t67KDimduB=rB z6C;w_IMY};u9*xaRb$1*zDO?OGpk1*N=q-hF^EQ6{NNQVnTR+w_Z83@7wNFgB+ z*PxJw@zZDhWgyS4VS&!mGy$bBI>&~x$k;J)WAUJ%5(*rO908Q2@jzns0bLDUn%MMq zR67aFvWaJlFO_+QbSVC8Sq}4F7WoPf(lH$Etv~mr0eqFBVqVb~jy7jvS(7*=UsqTG zQ9M8}9@67sCfw}+CgUetGhu2%uX9Z3FhX&qB7rQu0zbkh>=M9P!y^l#m@`Cs|FvE+ zP-CP@N)%azjs{Sb8F)d+G!;V`#}qU?u6%;zZ-{lJ>9lJEV03qSoa=B zN;)7guIqzD=hUQJ-v^&71}RapzYIk2J|sy3Q8YxQm*8XfD=`bCc;cJ7A(bA!aWh&& z-VQ)(z%-qq_WA{2AX=!i~{33N#5G)8Tv@To}cU|a4Y)oU^ON~)<;fL-dpo>-! zK~NO3vWQ<4B*mf$q9)deibxeBI_IYMIrAoyG<9%#piJI-H}9T%?q^b8sI&Dqc?h4E z&MgGi`5XBe^f&P{uxNqBF#q+tWv!p<5PPwcb+-7KpHGTYRsvo@5zr&Q@*u;{-J3%E z92?JC*7~`VeOG6&;(G2W;23!(Yx#n#XM3*K&fHNz;F#0tNV-D7y3Qr%^d>(u0{J$ZDPIbHGNxE7)p4pLq4=yk<>IzYA;x zyn-Si%p^xM&3SsfQ1RkR4|5JKt@f@c@bg84o{r`ym3~aV#`2X*=QYsw&1-ot(6*em ztyx7I_8;T3(&RAPZ;X%H--h+h0YIF?(XT>T$;od&=<>a1iV!}h(mj+syGz--rhqxh z@S&~j;MV=;OacT3&yP`Q;xNS`*C}$~Dt`y|bo-Tk4vNJD7lmOd@cR7cT0|yShlj628S+E>_Ue-3LxL%-d1)5Ajeok1*j439agG{b6VV9 zCNG!hb3nSmsV3BHH>w>{L)yOXT$u=!>jL|5D#Z!ssF6qK;>yky1(44V?>@34IF#y# zQ;@*;WKl^3+|c0x}8n#ZQ*YoqpY#AuZR}yya4iUmRTFtx< zJG3BFLe03Q0G#;RPZ$HJJcJJJ>EXx+Oj8k&V+~S1>Njd5M@O$^{t}S?RAvJ>fpf`! z%fk8G4H&(psS?{DdPEJ!QZs-n3gE3q_^SqE?gNP0j6WES?!tl{9H0OI002ovPDHLk FV1k71h%^8I diff --git a/sprites/spr_block/ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png b/sprites/spr_block/ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png new file mode 100644 index 0000000000000000000000000000000000000000..dd41c341635d40a55504a20727a2817f43adad0c GIT binary patch literal 423 zcmV;Y0a*TtP)h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY literal 0 HcmV?d00001 diff --git a/sprites/spr_block/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a.png b/sprites/spr_block/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a.png deleted file mode 100644 index b3e7aa4ef62c7b73e49931c55aa54ec3570c396d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 635 zcmV->0)+jEP)y%F@olLJ%x2m5qXkkVj)g zgybZkBB)K!o4L#;JG*O4I6XfI`N{--~Nsi;{j1DV` z_16#O%;g-UPkMB&HJ@?4YQC!k;({c=JwLiAF4G%#`FJ+fYtMI zP5A{G^+duGeIO-|3tOgY~ZhznX5 zILwn?IVaD0$@v`62*d@g2KdD5H|ITTqWvz=2*d?RfS6H^ewuTy(l9>w@bb=LQq_+n z0y}R<+MU-bi`9fHS3seDg6l#m8|sX1>upWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/007cc264-be6a-47fe-bfd5-f2d0e5b55f58/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/007cc264-be6a-47fe-bfd5-f2d0e5b55f58/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 67ea95ce85b6b31f6687de90b314d546e367f0cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmVQ{H??sR}9cBZ3Bw%2Mi`FZB}Y2FOL|CRtia84DZYGrXVkMr~MYLATT z0i-3NQ(!2SOq)4ZHqEc{KnOru650Wk@n)U*)SVc;3qk_R zwGoq2j!&cmJMT7daBzO=_BfYZ2P*qzn6?AA(#Jy-(LCv6Xy;&Jhyw1R z+xv}TDF^pt-t*6U8nA3f1`xcZn6VTFyY4NSf7VCV8X&J_MTJxy+1&aSZ9(WszjOM> zn_WU3pqa96S?5AiqUu%=^$%XlwQ=nI@=&@rmIwGW#O*}D?GxKxDvm#}IT2OM0IMrS zw02#|pEwUt+ZhNiBiZedO@0D`V?+Zm^d+G~+^y^c`zI4b0hzoW6_;2CXvwPH35XKz zgc>gaU?w!%9VsyG>ozWtc(UT9zV1Hz<*-=-AGa=F-~2Km*jJ>|Rnn8=|FPOd zPu7|!JX^c_qs&!CX4VIM75{#+&p7r}Si*r{GU)01{XZM-g2fwl@`$;&Jem_xIir%t zU!gE>sRrY+^ZR%91Fc~yVAts4Xn6TMVEQ43qlJ8?{9;BMwzNG2%N+Qm%2d#BQaoN^ z&*$augVp*I?Pf8vaczj%|FNOaLDpcxw0@AQ7xPJ!GH@_3JmSgh6LER@4d^`vPgg&e IbxsLQ0MvbHE&u=k literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/0cebcee4-6bcd-40a9-aaf4-d993e92a2938/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/0cebcee4-6bcd-40a9-aaf4-d993e92a2938/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index af12874aff361d4631aa8512b407201a5961c761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P) zm-L$tU@6oA(39Uk?U}s2ahQBOM4V3TD*xTqmg?)vfb!(~h+6=Ctey7GdNKegYg(OT z=h%bnsQKnC=@-DUQ3p`ZDT$PxOjUE09q+R*t@Z$xf-nUZIZ0Q|ak4Hu42uZk^s|5-BN`~IkPp67|T;ZPm`T-P16 zc^HOF&ej8Yo=cx=n%3$g@W2L)MHsB>mNZRMczID2+;3giYdwx*K7gsnvTW2kB@bX4 zR6S91d)4hUz0K6i>_PxjQI?>Yasbbo=`W!yfn{7UDR4LG3D|+jC723TirFSDlOQl* zl74Uws;^s$t|@?yQmk(Z0Q3L_G9=pnxm`*!Jtkq+DF9@tFVRXw_@^=!K@f~uH%kV} cTWu`<02tO8DUl-9+5i9m07*qoM6N<$g6{U&0ssI2 diff --git a/sprites/spr_block/layers/18b92ef8-323e-485f-8c75-29b1ec74be2a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/18b92ef8-323e-485f-8c75-29b1ec74be2a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index f0cd8f51f6fbe0f2be88089cdc101113f7fcb5f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmV-71IYY|P)-TmBm(K4V1FfDP43ih) zd|7>-J9meHD6KJ_d$PAXxRpM}oQ_5}1Mt740npTGhBWuAE#__dxZhyAe>H%0$wC$M zGf%FIdGzc$eclHa0IW+Eav<+`w~hI=IWa#A767bE8UPVljL}VF{{HaCr5o>m`r2YL zUB40r%&*tPR1=q)+&z5XDEY>*M2`KyP7xLH87`~kE#j?ri>Kjj`+$h*Z8rBTTifsC zKJfbVB>G3&QHUGZihlJtiL22 zu8{eLpun&7V*()W1F;&~a-!+&$adp%i%E4i{3EM1SOCo|01$gHP~%6EQ*x2DC9d`A z7*HHPGR8#HDv+yfqj!pZg>WgnKK-+K}~&3kv26H)I0znd%5D~d*a=6+ zzmvV&zHSpy(g$FvvjZ@o8pfT(pFSZ-8DV>hJxwS*EuBve zp>P%`B%QEhXP_L^>lw}iZG2@U0RBa|c(e4oe*rv1%BoIZ@kamv002ovPDHLkV1gxP Be6s)m diff --git a/sprites/spr_block/layers/1cb849fe-336e-4765-9ad5-183d53ae6fa3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/1cb849fe-336e-4765-9ad5-183d53ae6fa3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 7e8758600200e8c74aa86c2758c2e4627a1a9316..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P)6RJq*S$#HpIYX~~EtNaUD!&jfa3@9V7HiQpQ zAJS#P}bCmq>wX4vSZDmWe!JR(r^j5_mnWDk*R8~vg3Y6S{qCtDoD3LBasBv z93u;|(>Wj!hze2<(1|x{%>#SFc?%>0QNbmE%&Jo2bT3A66=#fI|IuQBc(eo(i{MsSY(0)y^`z@ZE*(bmP5#o zWFM?NJS&bqJ-2|)0lW>Wo^WTor`z4=#vw2%um&7RKuaxiDa~%u6KMY{{yhWtW(j#=%sv~ev2?W9djW`I(9-zPs$@Y#t**sA(_(jjwkRaMa z&A|EXC+u#`2A0CBy9Dr`$~f@eeQdJdwHWb>35^&^2KGnRyU4%TBa)K@)Ho$$JX`5YLI{lB^epvu%u>mmi zr){h4Ls?kkBynd(3_x0JfVv%PjG1G6HUMd{0jff2OVSs<98js9UTt+!dLTyIS-KcXYmO@ETy5RSM+u|bGl}r|9dL-^>*y@zjq$szJQt2 zF*4y>?P37Z;{O+{ubublS8g!?X|VyC;XN*Zw7vlOA+2Vw|Hldd0000@M6upZIx`;*$)Q1XrT{Wv}#Z93gxDlZ%f1n@G|L_l7iwj+dD?!|dLZBNpS{J69 zG=;PzfwWCqP!U9P#&=$4?qr&#dH8yu%$vE>x#!+<=T19SnJxd395I!rbBDmK(gicd zrJ@<5!g*(7`|zhT*LDr==RVGxy}lVg_kOqp@0GUrOwSf0rqg8LtqjdPS49y)HjY0DID05BVv%m2yh+n z`hc)wsSbABD_Q8)q#;Ff@RK*6WN|Jw4nc_N2BB{v>ufHjU> z+gW=ng~2x^a|q}@z}pb2iL|#T)y@LDIKL#V+L8VMGGTvHlFTw-J8NuLASJ;6R89li38L0b2tW3FKzSSj glK`m%@VJbNzjRN`&_GCx%m4rY07*qoM6N<$g6!o$ZU6uP diff --git a/sprites/spr_block/layers/21251641-be86-4820-8cd5-b9b0dc9df135/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/21251641-be86-4820-8cd5-b9b0dc9df135/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..c83bf3b27a27ba305396b595e6c62e479a9363df GIT binary patch literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~hh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP90nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^xQKD35iG&xo!zSh?6P1HoRP@=yey&{p{_-`(D{Ly(49`AqUB15gWkRs8h#fQY zw+RbpF|XkDC_Aw6^#qHypEAdm&j#}wrY=*O;pWf0VM4{n)?<7N%oMD77ko}sEUvpT zo!Maip_+9X%$kz!ah45oLM6ovTNzLCIrM*?7|wU6{*z3reH35Mog#*3#a~Pui`fID zC&co}>}K@+D>cF7AOmmb!+5>}HGSvWTaWydUb3`vp*YhdrKX6Z@Av<7kO!%L)9^We eAO9MlLl{iw#)j!NEieRnn8DN4&t;ucLK6VcXl@Ar literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/5b93e3ff-90b6-4dc6-8614-0c4b73004ded/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/5b93e3ff-90b6-4dc6-8614-0c4b73004ded/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..f87fc85521d85f5211fc2c7bfe824142be081202 GIT binary patch literal 437 zcmV;m0ZRUfP)%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/6ed53314-f509-4c2c-8f25-7f7e1f536f66/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/6ed53314-f509-4c2c-8f25-7f7e1f536f66/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 329d7b97e234ef75ad099ad6543e78d4b893047f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmV;u0Yd(XP)*V(3tBF_}7a$&~+)|Jbd+p_#h0&?zLFI}~h)p@j~~mg1}55lN@| zqb7F`g3w9!J)LxtGfpSBhml8&eQr(&+(j2gCef9V@#Q&j%)j?U=XMVG!w-5^ei`{z z?kE9YumpJIk1uN@7x$@=&zp?s+^+f0CW%uI?*!Dy*BN;LdS5%Qop4S7P;**GGE0+A zcI15Yk+&moYFGmHo-(F9GA-wt9q&tS;=c*_g17}Si=-*%h^)!Z`+y+e3!(;i$LpH& z#+s;Sfgs=umH?O`M{RTdv?-h~et3OXwxs@poWN?;@0(^iJ(JV0Yaal%+isf|^+AMF z19nQGW3dj_G$n!MlIruhT*n$AFa)Yij$eMfR{dOdwGZGnXf(NQ2Pbf9h)$T7pTt4?x@`+r;W-Hm0aQ9)0}&S?wFWqFLefrqyB4js9!?G5 npGsd8?xEP8z<*FpwZ8ZPvBc?xoUN@=00000NkvXXu0mjfA+5%* diff --git a/sprites/spr_block/layers/742bf7ac-d484-4564-877e-a1b6753db6be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/742bf7ac-d484-4564-877e-a1b6753db6be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211 GIT binary patch literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/86c1948d-32d1-4787-9776-e6a8520f0357/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/86c1948d-32d1-4787-9776-e6a8520f0357/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 546a43f4b1f99fd5c1e2122c6a709ef40504c8fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2MP){wai05-a5?~5a5Acbn>v<86yFe0P3b_C% zgGcXru9^dbo-3k#cL8q0PtO7VUt!M<+-|9CVr8D`dj3Ci07_Lofy#7wd*=Y)xm6J* z&sb0B@=0*KzCSx{_RRr!6D0?dp!&OgmH(X{;DGXX`9cBTMlJwdX-t4ATmXnU2>`uY RS@Zw^002ovPDHLkV1ljfq0;~W diff --git a/sprites/spr_block/layers/91b8a957-d79c-4574-9f2e-18df23c7a6b5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/91b8a957-d79c-4574-9f2e-18df23c7a6b5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..80f42a19b3c520dc8c305a2b81b5cbc97132fed4 GIT binary patch literal 364 zcmV-y0h9iTP)lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~h0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;0|pAf9RPC~ERKkc^ZhqoU^RHznFlzm zL{(3f5V-K_CCPejJo~^9VW5s#82o(9}U!d&)9!T!OCLWc01QZq2!d&hI73SlFnPE>0&)Hv%7^7P7#Msd z;qy1|Q54{6-J%0rA%l^op!OJ|JAhuGY~2Bdt{?|EA7>gs2QZgo%D*5WkI;{9IaUYI z5};d-;s97rg&Y8?SPWa2Fv#-rFg*VFg(y8BwI~jt1b}KaasdGA{um#`kW6p@0000< KMNUMnLSTYJTH6%> diff --git a/sprites/spr_block/layers/9926628a-2431-45e1-9378-f4e5b5e34eb9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/9926628a-2431-45e1-9378-f4e5b5e34eb9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..73680809434ab6f14b952f601015e47eec1b8350 GIT binary patch literal 318 zcmV-E0m1%>P)4$E(caHR) zA0HW5L&6FY7EsI$iqUZm=W`y%7f3imBLiLp1A65LNZ3Qd5sJq;Zq468&&KWTKyKwk z??i1}*G@Y-KuU938t1s!z}y4_Jf|lp#;WGhIN!H{UK;QsIR$){=A0|b#r69V170LG zPSLNQbOfR6u84QS|mYCLOTZh`?;rJDgS9;e!@#-S+k QDgXcg07*qoM6N<$f|Oc^N&o-= literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/a177c980-f438-489f-86ea-4e301ce86a0e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/a177c980-f438-489f-86ea-4e301ce86a0e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8a6c5e2cb260a54eb7999b85aab3773a506ad9 GIT binary patch literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000XdGoQerP^*C&qaZ#7U|p|aN^aK47{e2eq-C%I2=!nHP>@sKlWig2;Y@_ z2qTj~QP2c<3j2Ez8SI>KAb20!pYZ^z= zZ3mh3sJVC^{*J(ZLle;FlriOzxoYmx!(MRcFDFnGtW)5#NLJMxk*(76Ibabe3RVyB ziI=tJD|;fo3oHUfK@$Ko)abW0zwVDx4PV|rI$WCjbIHKP&9|t>6Lx2-q~zoy`OcZm z7P3}b=%r3RJMWh5+c4`KP*GHp-_-Fk=bvBkyICT2K^m7vrR0vOej?_^bAy1sr7*GB z1Y34Xa-$%FND(asN|xIxpwWW_bu7z7_n=pta{#Bo)f0NQvu>v~mjuusaL$`FmkjU} z!2eZsMGtl-y1MM-+d>%j|f2 zC2@2h#M5iy9C~XK4#PLYkn8I<4LIi!`3r$=@4qBbQ++NOpp8Y3q;w8a6tXPNL4+RQ zK!$AnNIRFH4T<4H0fM>D0cuPChlCd?=zIKB%?ok9% zK@ouGQ`JCmm)j2!2`_E=SoB>RFAhn5l96l0A|S1Sk6QBoO9O=RdGww^zD#9DyY{`&VlHh zi#dQ=Qv^~$&4GoO-R9FCjd~UB|A!HMb+&VWH>-QAjKksevJ&{&4Yk6Pq{C*@jbp7!d(5*bBXnr8p zIV>O}DqV#xZbxea#G@!b~PZ zPft&rba{E1f!XbL^85ctS1cCk{{EhJc6PJ?)VGwFSkeT0?JbGKxm=E1E*E*dUZ(!+ z?2IlhE*ON>Y9&QcsM%~%I2>liPESvbV<4N&lE>rW3l&!?6$XOD@IxwMHemJvOdk4Akp&a=YDJ;mOGfx7o_d3cDYEfcB9{gwFyPW&+Hp0U#z} z>8`4IxZYp4e+TGApTls+$H(gMffSpYoAmhjNa=K%TT{#gL%ZPe@{*R8miROLU^1C_ zEWRjT(g+lBN_yRx<4-ffQ zg+jqN2B1HvMq>B@7y2GDfSrwv4epA$xj9~gA;FjmK>VjNPN47Ma(DnnY`5D?xiBAQ p1YD2AI19!wIW++OCE)gP;}^to)4ycX<9Gl7002ovPDHLkV1k_eobLbt diff --git a/sprites/spr_block/layers/d34a3ca1-3d4b-4cb6-b64c-631c053546e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/d34a3ca1-3d4b-4cb6-b64c-631c053546e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8a6c5e2cb260a54eb7999b85aab3773a506ad9 GIT binary patch literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O00000SDI|P=h4`hw1k7TWtW}J=P z;hAG=zXtbnAMLnzEbC71w@aWXSOPlp_3f6dYs*bpKel7X*8b4`)kc(R-@gh3GjGMt z4YafRwRY}L1&ClzZ!%eJMq~NebJOYGjllngC1B5~VyZI>^*rR~^P+m~b^=AgI|VhB z$*7()vr&FM2Rs5r!P9`Ac;ohbq$Y0O1s;K-UHZ?z9nAN=9-w?IgDe=Zex z_x6pf-QJO@RUez@^`~Ng@9fKW!0_x+)@u2oc~YJ=mC~$vzp?4R4ac1W03H_qJTQ&u znQ6yA#I97zmeAqg#F99_xD*?Ea;pH*AD##atRS@V`jzST2NH04YEt%a#U6)%eM@m- zsR?%5TapiBRtShplYq_OxMpi|sQ^n1A|QbPC^xbvIRuXu=B>?pf^&eUA*2aA+ppB# z8=QKimYXjm7z06g&8{0pFLkRTBVPX|Y3cseM~R04E(vs-C`e&S_)&IU|s zK#LAw6;cUg0W$p3`DM>INhDi??4gP6)>mndrvXkvs*?!)x=kV(oHGH}BsPt6e-#|x zmu4oNYUHK?28Yma0;qWS&<f#TF+&7}fRHa=PK7g#FCxTWqQ=>Px# M07*qoM6N<$g2RzB{{R30 diff --git a/sprites/spr_block/layers/d7bb8497-4635-46a9-894b-aea0bd47cf78/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/d7bb8497-4635-46a9-894b-aea0bd47cf78/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png index 3ac3dac590cbade50d5daa0c280d534077a745b7..57247211822c5ee71fa23b3e273828ae763afa6f 100644 GIT binary patch delta 415 zcmV;Q0bu^71Gxi`B!7TOL_t(|oMZX_|33pUASz6iIE7HKY}IW>V$`vaVkj*D$qq0! z6a~`){A^g|_a1mkTL(}Zkn8}M&krAa4yJ9bBvJS@cL22k$qu-D^&Oao`5eZln**o~ zNOpj(wh)*`PXn-!c=h@_Z5=>uKz15H=fgr~_?H7PpTc}DD}TcSrbk{mfF2TLJAl+` zmRLZnxg>`GdYn_O9FURb2GinVTu=kwVzqz}fK}Hp{kq!1VEXZsFHk;ec7;0tW-&}5 z3=oQQLh>;4U?KP6<1ZBX!IKNlo_`IdVL=E3gyNi7d03SE`t=XH0|pAPz*?`cY=a&W zxY7j7XT-{*`+po}@4$xujG-rYN4TQr|2teE0R!l93d?4=Aj>KD z59t6S3J9eMn9pDUJtT1X92mlkARog3j7|4601J8;!07;7AptA0(ZS1C-@r7!I0pe_ z%kesZUI6X@Mn*(u7P-fa9uiNUekICaSe(Ox9Np&_4j33H006gV=l3Sjov8o-002ov JPDHLkV1fWiv~U0b delta 396 zcmV;70dxMj1EvFzB!6v5L_t(|oaL9lPQx$|hq0Om0I_rg-k>nSSn)^JCz z5F<>`H=s;aCt$6F6dEocb*?tHgF`F$mWy?c{kuE=Ns6*8H)1$HF>xJhPA^Im)2~Pw zvLlz9b-mUP9k!J^-J^sz;dIFsuLo002ovP6b4+LSTaAAh}ln diff --git a/sprites/spr_block/layers/df39f2d1-e8ef-4d9d-b6ff-420aeef16650/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/df39f2d1-e8ef-4d9d-b6ff-420aeef16650/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 3424bb98492e2e08a49f0098dac70e4c25207203..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)FxS7wV{=kG5A z!N}_k=L?(d>42GvVtK%W~@=aHQ&3u?Yi*h@l9Y$ z*FTjE)V{B(cDt?iP8({e+zFud>%sGz_?Xx4F-B3OmeTMO#o~} zfaJw>qE;#s=3Oco*sh)HF_-&by-ggS$Hza8KYhJEpxCiQ2Ycz3{POvev)NSKiSS3# z($5$HM9&fdUpEfZI|cUQNHtTBXO?5BocFX5>;pUvAx)Ux{-kz9iI2T8!3{gLFR7{M z6@Cxw9@L#06SgK`r&es6N1zao>(T4oLKCzDh)fc~iJ%sc8N$v`Y8s%(Y(m%+AG_u( zgYEBi!e(;kEEf88Yl9*K7@-s!d>}$wln#Oa!Os4bsj01nZhb*&C8z-jX2`eSs_OE* z^G2S38;Bk)8>RTRb&{S2SYLqR<10>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000PVgJJ3x7Ynmd!F{RKJWudahn~6L zKWY8uN^b1@!((7#=J`X<26ui@zrS}r90pvQSkt$eY_8_c<#%h2Qsw;s{NFYNFubQe zr2fn%)qIlQJufF^-VI<@HgXFxzD&-lxtrNpe!mWk0GO4H^nhRS&Rg>{d*ba|Fals! zHU!`zb8GazHQz2&#~%Fa!B=o5kD$gH- z52aA66~Okxpo78bF;JC@pz1WjEDJ+75Q|@euIaFB!U9dB*X@$A1uhanDwT4wrzpw` zVE9V8ise(VcfOJV8*yGl-6-R7YRUN&jzvL{;5GqKmR}J@28gl(2JIedS`~|ni_>F( z<2Y1EkoB*A#M4K=Kuo96dEJEF388CixPI+AYVrvwZyu2dk60`Q(=@#R{5s&?hDkj! z)b`VEH#zj%ud%=P8)R7_0WJ~Rd+7BI1nD6DDVLDsGr0Ekr#N`AiwF}(d!S8^f%ZT} zHoE}5BSTuuLRA|Ogn5YKRTPhoU?^SGQ9O9?8B*0FMQb5fWpW@b`r4KQ)d{ zARJ~93(TWSGN-5xXp2MXP{zEF#nl^W{PFu80#ZV|Nv>gl9`2nA15ftuN#lqx6Ni`-Nt6znM1ZQ5GJ-@OTBeF*GBG^{7$$_Rtxc3(96?-2W07N@`56+0=wy)8nJg#n#iSvzLBp zyw7{wH#?7dJ?Xr-1mZG7Kt{fObf(vh)tp}U&zsI(`a}2E7qdP0|1Sf<$j_S2A8`L& zzpS1AlL1;#)6YoObJ?N%)Lh-R1|#s-W(b%*6-;GhA-l znN*F_hThkY>Z(*K>F?ccSKVCSm~-4)m|sx$_jhV@Ys-Hd4m$^E0H2wiQHKWy8pH;c z=NFe3nnYw7sMTuvfdF}We%5CIN0gb&lsU&8kbw^*90KMo#fc>**jI1K@kGKzwY0pX zqa-N;6$%A?&Wz9^>w{q$Kuf14duBq`1pSPV8l&J~HaKNrO;DQ1GC**)9n)`T zgffr_R59-N1V{=2npcW1|d+UW%;WCFnW;5*KKr3ZG2z&Ld5mP3oOHejd;uMK}OXWLeg8>K<*ewU6M94px4tq@W{ZIwcj=HWPg z+swVK19sxRWD#a_<;=D3nKNgO9eHQ_evBoCyv)N>03OzLzP9UYd~H^>)W(kKq^`61 zY$W@WeaZDfZ^+lrJv$9xSuq2Ut^DoBJ-$ADw8PgA`vS1ZX9 zJlBV+mf(5b84IESF$^g0Lsk^%nm%JE1z`4;N*pWWU>Ck6g&1n749A7Zx!zd$&e886w#xB;@YOsm=k$Fn3 zQivfHQ52;CWPKo+hCEHoyq&2%QV@~2hW)Rwrw*|}2T-M9>_HSnOeQ8YVyM+>U^MEI zSXBfBtS|fw1`w|_@teG|tghuGS@hp{yv zPa-`YH*~;fJwt8;?gcq6!xyJFwU7k_Zh* zG#QMc!WdvwJE4o?<0GuBtdIx+*K@JCaTm73gsAh$;A2Vca6N}wlQE*?pUO>w*{(un z#Du2EGzmW0Zb{(I*gNf_PSg*FLq4i1G2k;WVSx<1c>egt_x=VK{^vX(R@&150000< KMNUMnLSTY_Pq)SZ diff --git a/sprites/spr_block/layers/e6e99706-8eeb-4a5f-9235-c45b823858d0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/e6e99706-8eeb-4a5f-9235-c45b823858d0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 9950a34540e9f98ec0a0ee8d4167ad6218ff57f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1ElV4%+2+#{ijFMt@Fp1fzHU!=8Z4t z`9s%D?L3|gXzS#39m(nO^j_*Bm?U7t67KDimduB=rB z6C;w_IMY};u9*xaRb$1*zDO?OGpk1*N=q-hF^EQ6{NNQVnTR+w_Z83@7wNFgB+ z*PxJw@zZDhWgyS4VS&!mGy$bBI>&~x$k;J)WAUJ%5(*rO908Q2@jzns0bLDUn%MMq zR67aFvWaJlFO_+QbSVC8Sq}4F7WoPf(lH$Etv~mr0eqFBVqVb~jy7jvS(7*=UsqTG zQ9M8}9@67sCfw}+CgUetGhu2%uX9Z3FhX&qB7rQu0zbkh>=M9P!y^l#m@`Cs|FvE+ zP-CP@N)%azjs{Sb8F)d+G!;V`#}qU?u6%;zZ-{lJ>9lJEV03qSoa=B zN;)7guIqzD=hUQJ-v^&71}RapzYIk2J|sy3Q8YxQm*8XfD=`bCc;cJ7A(bA!aWh&& z-VQ)(z%-qq_WA{2AX=!i~{33N#5G)8Tv@To}cU|a4Y)oU^ON~)<;fL-dpo>-! zK~NO3vWQ<4B*mf$q9)deibxeBI_IYMIrAoyG<9%#piJI-H}9T%?q^b8sI&Dqc?h4E z&MgGi`5XBe^f&P{uxNqBF#q+tWv!p<5PPwcb+-7KpHGTYRsvo@5zr&Q@*u;{-J3%E z92?JC*7~`VeOG6&;(G2W;23!(Yx#n#XM3*K&fHNz;F#0tNV-D7y3Qr%^d>(u0{J$ZDPIbHGNxE7)p4pLq4=yk<>IzYA;x zyn-Si%p^xM&3SsfQ1RkR4|5JKt@f@c@bg84o{r`ym3~aV#`2X*=QYsw&1-ot(6*em ztyx7I_8;T3(&RAPZ;X%H--h+h0YIF?(XT>T$;od&=<>a1iV!}h(mj+syGz--rhqxh z@S&~j;MV=;OacT3&yP`Q;xNS`*C}$~Dt`y|bo-Tk4vNJD7lmOd@cR7cT0|yShlj628S+E>_Ue-3LxL%-d1)5Ajeok1*j439agG{b6VV9 zCNG!hb3nSmsV3BHH>w>{L)yOXT$u=!>jL|5D#Z!ssF6qK;>yky1(44V?>@34IF#y# zQ;@*;WKl^3+|c0x}8n#ZQ*YoqpY#AuZR}yya4iUmRTFtx< zJG3BFLe03Q0G#;RPZ$HJJcJJJ>EXx+Oj8k&V+~S1>Njd5M@O$^{t}S?RAvJ>fpf`! z%fk8G4H&(psS?{DdPEJ!QZs-n3gE3q_^SqE?gNP0j6WES?!tl{9H0OI002ovPDHLk FV1k71h%^8I diff --git a/sprites/spr_block/layers/ec2ccfb8-139b-4079-bf5f-8b746c1581bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/ec2ccfb8-139b-4079-bf5f-8b746c1581bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..dd41c341635d40a55504a20727a2817f43adad0c GIT binary patch literal 423 zcmV;Y0a*TtP)h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index b3e7aa4ef62c7b73e49931c55aa54ec3570c396d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 635 zcmV->0)+jEP)y%F@olLJ%x2m5qXkkVj)g zgybZkBB)K!o4L#;JG*O4I6XfI`N{--~Nsi;{j1DV` z_16#O%;g-UPkMB&HJ@?4YQC!k;({c=JwLiAF4G%#`FJ+fYtMI zP5A{G^+duGeIO-|3tOgY~ZhznX5 zILwn?IVaD0$@v`62*d@g2KdD5H|ITTqWvz=2*d?RfS6H^ewuTy(l9>w@bb=LQq_+n z0y}R<+MU-bi`9fHS3seDg6l#m8|sX1>upWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT literal 0 HcmV?d00001 diff --git a/sprites/spr_block/spr_block.yy b/sprites/spr_block/spr_block.yy index 0637dc3b4..545a1b305 100644 --- a/sprites/spr_block/spr_block.yy +++ b/sprites/spr_block/spr_block.yy @@ -368,353 +368,353 @@ ] }, { - "id": "202ab7c9-c58b-4dd9-9874-a3a746c288a2", + "id": "21251641-be86-4820-8cd5-b9b0dc9df135", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "bbabd343-9efc-4798-ae79-8b613a3344c1", + "id": "7252ea99-3a29-42cb-a6c8-b9629401fb96", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "202ab7c9-c58b-4dd9-9874-a3a746c288a2", + "FrameId": "21251641-be86-4820-8cd5-b9b0dc9df135", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "d6a5383f-ac79-426e-a6d0-b44f5eb45c9d", + "id": "8a0b4768-2be4-46b0-894f-ba0ad399986b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "202ab7c9-c58b-4dd9-9874-a3a746c288a2", + "FrameId": "21251641-be86-4820-8cd5-b9b0dc9df135", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "df39f2d1-e8ef-4d9d-b6ff-420aeef16650", + "id": "a177c980-f438-489f-86ea-4e301ce86a0e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "e35a7507-a2dd-4752-9442-361fd32ce3e7", + "id": "0d57d7c5-b25a-4941-bb36-4182774d934b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "df39f2d1-e8ef-4d9d-b6ff-420aeef16650", + "FrameId": "a177c980-f438-489f-86ea-4e301ce86a0e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "b6d0158b-e64a-464a-9540-0a40787937d8", + "id": "a146293f-d7f1-4173-be3e-8e8969dee398", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "df39f2d1-e8ef-4d9d-b6ff-420aeef16650", + "FrameId": "a177c980-f438-489f-86ea-4e301ce86a0e", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "e2f2e76d-4616-4ab8-bf84-75bdf705a2d7", + "id": "742bf7ac-d484-4564-877e-a1b6753db6be", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "265bc042-90ac-40b1-96db-128919442c59", + "id": "bd584001-9219-4538-85a0-7acff3c78fe5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e2f2e76d-4616-4ab8-bf84-75bdf705a2d7", + "FrameId": "742bf7ac-d484-4564-877e-a1b6753db6be", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "ce944c42-526e-486b-8930-d106cf922e46", + "id": "d6a701fc-4ad4-4ec7-b428-4417860d7215", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e2f2e76d-4616-4ab8-bf84-75bdf705a2d7", + "FrameId": "742bf7ac-d484-4564-877e-a1b6753db6be", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "e093dc36-e954-4a72-8f38-ec9faf0fbd57", + "id": "df7bf26d-12c0-4bc9-8428-5a06063a4f04", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "c3ab0378-6993-4939-b5da-6bd302fe49fb", + "id": "ebe8163e-7974-4700-8eae-70e330bc4746", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e093dc36-e954-4a72-8f38-ec9faf0fbd57", + "FrameId": "df7bf26d-12c0-4bc9-8428-5a06063a4f04", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "ffeb27aa-4a72-402a-a099-f30a64ebb364", + "id": "fb80b51d-9f5f-4257-aad3-3a99f96e57e9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e093dc36-e954-4a72-8f38-ec9faf0fbd57", + "FrameId": "df7bf26d-12c0-4bc9-8428-5a06063a4f04", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc", + "id": "56ae952c-067a-45ca-9a10-28270b90b5a7", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "391b7673-a77f-4dea-aeb4-9e8954635ec5", + "id": "03e3ed94-4357-48c7-9518-c75647416462", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc", + "FrameId": "56ae952c-067a-45ca-9a10-28270b90b5a7", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "ff5b134a-8e5e-46fc-a80b-de1539f3e23e", + "id": "3fc70cee-3f1a-442b-9e30-db72b413f55c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc", + "FrameId": "56ae952c-067a-45ca-9a10-28270b90b5a7", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "d231e946-b285-47be-a81d-5136674215be", + "id": "44c9c181-2263-427a-af5d-7cc86b691e18", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "caf12197-e538-4583-b0d6-4125a68bc582", + "id": "21b35ec4-b6db-4134-8386-298e701ed5dc", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d231e946-b285-47be-a81d-5136674215be", + "FrameId": "44c9c181-2263-427a-af5d-7cc86b691e18", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "383f6e45-e682-46d1-9cf2-b925daed512e", + "id": "3c999c19-26cc-4d05-abfa-5af19b56b21c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d231e946-b285-47be-a81d-5136674215be", + "FrameId": "44c9c181-2263-427a-af5d-7cc86b691e18", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "e45ada33-e4d6-47de-af58-a47b532b267a", + "id": "39d59e03-2445-49f5-a401-e05313c57ff1", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "d41773e1-93a2-49d1-a347-7c5f3d4e3163", + "id": "61261028-f359-4fe9-9706-d9e684f7c7cc", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e45ada33-e4d6-47de-af58-a47b532b267a", + "FrameId": "39d59e03-2445-49f5-a401-e05313c57ff1", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0907e7d5-9ac4-426b-b26c-6f6283c960ca", + "id": "e8f68b59-6732-41b0-b140-4d9e543eee8d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e45ada33-e4d6-47de-af58-a47b532b267a", + "FrameId": "39d59e03-2445-49f5-a401-e05313c57ff1", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "18b92ef8-323e-485f-8c75-29b1ec74be2a", + "id": "91b8a957-d79c-4574-9f2e-18df23c7a6b5", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "93379271-e1b1-4943-a63d-6ac2a94c81d7", + "id": "931307ed-e5aa-4b6e-9050-1af9043d836f", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "18b92ef8-323e-485f-8c75-29b1ec74be2a", + "FrameId": "91b8a957-d79c-4574-9f2e-18df23c7a6b5", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "338f2243-d16c-40e1-9d71-a021ab8b0820", + "id": "fb5d3bfe-1979-4e28-9f97-b51c56332c7c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "18b92ef8-323e-485f-8c75-29b1ec74be2a", + "FrameId": "91b8a957-d79c-4574-9f2e-18df23c7a6b5", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "c4151e6a-4906-4ce7-9907-31fb8adc43a5", + "id": "5b93e3ff-90b6-4dc6-8614-0c4b73004ded", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "7c9d84a5-1bcc-4cb7-ad96-bf556274827d", + "id": "fa7deef9-3547-4318-979c-268dfe5564c0", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "c4151e6a-4906-4ce7-9907-31fb8adc43a5", + "FrameId": "5b93e3ff-90b6-4dc6-8614-0c4b73004ded", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "f1aa5d69-1d06-40ef-9b0d-0689c972cf2e", + "id": "b1f4ad58-e5e6-4a30-b032-6fe7df81edec", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "c4151e6a-4906-4ce7-9907-31fb8adc43a5", + "FrameId": "5b93e3ff-90b6-4dc6-8614-0c4b73004ded", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "e6e99706-8eeb-4a5f-9235-c45b823858d0", + "id": "ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "3d9fd1b2-fbd0-4ca0-a4a8-4dfe2ecc9718", + "id": "a05b8428-a3e1-4a3b-9024-3aa256f889d2", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e6e99706-8eeb-4a5f-9235-c45b823858d0", + "FrameId": "ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "9d0dfca1-5284-44b8-82d5-4ef0f7a94ed7", + "id": "e74cbc35-1776-4b56-8160-812d3fea4386", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e6e99706-8eeb-4a5f-9235-c45b823858d0", + "FrameId": "ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "0cebcee4-6bcd-40a9-aaf4-d993e92a2938", + "id": "010be783-1cec-42e1-a60c-0fabfa129043", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "beb4f977-7d83-4a9d-9d64-a9bc1ace10cd", + "id": "472c3108-6310-4057-a064-4db966fa0186", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0cebcee4-6bcd-40a9-aaf4-d993e92a2938", + "FrameId": "010be783-1cec-42e1-a60c-0fabfa129043", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "d5fb9698-bebf-4153-a52d-f4e5cc1309ca", + "id": "9151afd2-c6f8-4de6-ba1b-db1ac12140a9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0cebcee4-6bcd-40a9-aaf4-d993e92a2938", + "FrameId": "010be783-1cec-42e1-a60c-0fabfa129043", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "d72a7986-5f91-4bed-bba1-8e9f1b1f0782", + "id": "fd392c9e-705c-41c8-820e-b21aaea252a5", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "1f8ff00d-571d-4a2b-a7c2-d2f789f00196", + "id": "a6fd3f2e-63f8-4111-b0fd-d4176832a288", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d72a7986-5f91-4bed-bba1-8e9f1b1f0782", + "FrameId": "fd392c9e-705c-41c8-820e-b21aaea252a5", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "edd408a8-9107-4e04-ae59-a06833c779af", + "id": "42b1717e-8040-499c-ac8b-12a39a3dfd24", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d72a7986-5f91-4bed-bba1-8e9f1b1f0782", + "FrameId": "fd392c9e-705c-41c8-820e-b21aaea252a5", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "1cb849fe-336e-4765-9ad5-183d53ae6fa3", + "id": "ec2ccfb8-139b-4079-bf5f-8b746c1581bf", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "eb7231e5-4a85-4657-9e5f-3a6a81559999", + "id": "50fd337f-2865-4a44-8721-047057a82213", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1cb849fe-336e-4765-9ad5-183d53ae6fa3", + "FrameId": "ec2ccfb8-139b-4079-bf5f-8b746c1581bf", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "3e74d5eb-6bc0-4fe9-b2aa-0c2fa88387e4", + "id": "a35d9a78-52d4-4cf3-8427-6634a7dd5416", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1cb849fe-336e-4765-9ad5-183d53ae6fa3", + "FrameId": "ec2ccfb8-139b-4079-bf5f-8b746c1581bf", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "ecc58aa3-152b-42f8-b4ec-b0a325e43b6a", + "id": "200e2d06-de49-422f-b350-9dd356027870", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "1f409315-a991-40b6-a0ca-3488b290de97", + "id": "eaf8897d-7b16-4921-90f5-1cf73b65aabf", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ecc58aa3-152b-42f8-b4ec-b0a325e43b6a", + "FrameId": "200e2d06-de49-422f-b350-9dd356027870", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "79033fdb-875c-4d1c-8eeb-802f136cfffe", + "id": "5943a2ba-3318-4d02-bf21-400dec77ad31", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ecc58aa3-152b-42f8-b4ec-b0a325e43b6a", + "FrameId": "200e2d06-de49-422f-b350-9dd356027870", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "007cc264-be6a-47fe-bfd5-f2d0e5b55f58", + "id": "d34a3ca1-3d4b-4cb6-b64c-631c053546e0", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "242acdbf-72cf-45eb-a1c1-cf84ada63b39", + "id": "8c8ee576-f3a2-4bda-8c0d-d9a7bd8d70c9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "007cc264-be6a-47fe-bfd5-f2d0e5b55f58", + "FrameId": "d34a3ca1-3d4b-4cb6-b64c-631c053546e0", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "9b7ffff5-04d9-4bf2-8df8-5ac9efcabd52", + "id": "bf125796-386d-4966-84b3-601a22e0cb17", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "007cc264-be6a-47fe-bfd5-f2d0e5b55f58", + "FrameId": "d34a3ca1-3d4b-4cb6-b64c-631c053546e0", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "eb2d1b3d-0c2f-4010-87dc-05e7b40846fb", + "id": "2b9ca9fc-5c11-4279-9801-bc201fa585bf", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "3eabd186-7102-4db3-88f1-bd61db4f0d66", + "id": "033f5636-535d-4c02-8c24-6dd3371b324a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "eb2d1b3d-0c2f-4010-87dc-05e7b40846fb", + "FrameId": "2b9ca9fc-5c11-4279-9801-bc201fa585bf", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "374cc3e6-1e6b-4bd9-b903-b95bc741655e", + "id": "1cd8f740-f21a-4eb7-9aa3-8cc69bb4b592", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "eb2d1b3d-0c2f-4010-87dc-05e7b40846fb", + "FrameId": "2b9ca9fc-5c11-4279-9801-bc201fa585bf", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] @@ -874,23 +874,23 @@ ] }, { - "id": "86c1948d-32d1-4787-9776-e6a8520f0357", + "id": "9926628a-2431-45e1-9378-f4e5b5e34eb9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "3c0edf53-adb8-4feb-9161-45075da30457", + "id": "872d3424-65b1-4eb6-b988-15002e847462", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "86c1948d-32d1-4787-9776-e6a8520f0357", + "FrameId": "9926628a-2431-45e1-9378-f4e5b5e34eb9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8691e1ca-3aaa-4d32-999f-5becb286ae33", + "id": "2e156297-d623-4db1-8fe0-20643d0fb081", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "86c1948d-32d1-4787-9776-e6a8520f0357", + "FrameId": "9926628a-2431-45e1-9378-f4e5b5e34eb9", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] @@ -1072,23 +1072,23 @@ ] }, { - "id": "6ed53314-f509-4c2c-8f25-7f7e1f536f66", + "id": "2533757b-b298-47c2-ba4b-46063a63081d", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "ad39ac8f-f839-4394-907b-4a8ba445024b", + "id": "df7ee87d-fd79-4d44-8ff9-80c370850acd", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "6ed53314-f509-4c2c-8f25-7f7e1f536f66", + "FrameId": "2533757b-b298-47c2-ba4b-46063a63081d", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "49e6239a-7efe-468a-8134-8f49eb7a8544", + "id": "2e48d233-d78d-4881-997c-a54494c310df", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "6ed53314-f509-4c2c-8f25-7f7e1f536f66", + "FrameId": "2533757b-b298-47c2-ba4b-46063a63081d", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] diff --git a/sprites/spr_instrumenticons/0a8bb888-4379-4675-af34-809c17181a1f.png b/sprites/spr_instrumenticons/0a8bb888-4379-4675-af34-809c17181a1f.png new file mode 100644 index 0000000000000000000000000000000000000000..26c1906020765c83f967d027c21b5f862729ebdf GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Wu7jMAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tHjpDzyFlx%0bA=1pC$85;Mpy^`H z5@~FuV9AqkPgz^w;^8(O@deBx%oG0dB|rXb-^SP?l0132uanYghKMZ_QW-SDCvr3F XtDnm{r-UW|0a-W! literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/1a62484f-87ff-4a6b-9260-6b56881c34e9.png b/sprites/spr_instrumenticons/1a62484f-87ff-4a6b-9260-6b56881c34e9.png new file mode 100644 index 0000000000000000000000000000000000000000..f57296949a87da30d5a9bba555387426b8d6cd87 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b)GJcAr*7>PQJ)_K!L|4xIp@N z0nhVdm2v@@MNc)Hcswt1?BzF{wPyx1v*6v51r1BXkwBL)c)I$ztaD0e0s!DmKmh;% literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/22cbab71-9620-42d2-846c-dc9d0afbe250.png b/sprites/spr_instrumenticons/22cbab71-9620-42d2-846c-dc9d0afbe250.png new file mode 100644 index 0000000000000000000000000000000000000000..29983e8e8131ab1afbf9a70f93140cd6bd7011ac GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`HJ&bxAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&2zvp$M}>*9FtYA2*K7om;qrVRr8i zhA`#{xowt`(;FiWGu+&1(4cK&z;j@kpy literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/236f3f44-bcd8-4991-8334-dd1dcba3a0be.png b/sprites/spr_instrumenticons/236f3f44-bcd8-4991-8334-dd1dcba3a0be.png new file mode 100644 index 0000000000000000000000000000000000000000..d53695e3669c6482cd0e653e6877d92a3867007f GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`m7Xq+Ar*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7Lq2_6gUWJ87}0?Rn(_UrXsX8jS< z#G7EskY;SQ{P2?kHlzPToB`` b$G~v%tm^sZx)x8MBN#kg{an^LB{Ts5Su#C& literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/26a94b6e-2731-4e34-b12d-0875daff5130.png b/sprites/spr_instrumenticons/26a94b6e-2731-4e34-b12d-0875daff5130.png new file mode 100644 index 0000000000000000000000000000000000000000..f7b4ec8e2d22ac43fa41c1a6042986a05dbd848b GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nVv3=Ar*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tGG;o}AjOE{)4blJ&}!fbYQ$B|57 zHs*AOP4bC3CHoKGICn0B=YUu#P*9FtYA2*K7om;r0VM6Z< zhSiKG%#w{oRN9RNF3$D#kU7i{WRfh=@Gd82BLkBKv*2vs8%HvxPdH)5@JwYB55rTf bB1VQC5xV)cUmvmn9l_w~>gTe~DWM4f=Q=(% literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/3d1b4453-7b25-4b58-820c-5018674ed7b3.png b/sprites/spr_instrumenticons/3d1b4453-7b25-4b58-820c-5018674ed7b3.png new file mode 100644 index 0000000000000000000000000000000000000000..e3c54f79de4d65fe61188e9b51d5ed42e28e5685 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`4W2HJAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7Lq2_6gUWJ87}0?Rn(_UrI5vFvTg z(>9y_(1an)*hhHRTZO_kaSr8Xh75-pa%O#$>`G$Tw0R=$VYNPEfx??EQ@BqsUNL5P iroM@X;i*;;BZIiK)@@!Jz1cvwFnGH9xvXpPJE literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/5162509f-6965-41f8-abcd-b782e0cb52b7.png b/sprites/spr_instrumenticons/5162509f-6965-41f8-abcd-b782e0cb52b7.png new file mode 100644 index 0000000000000000000000000000000000000000..510875d3334e98ff759c73382b7ab48e85cb378c GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*7hPQJ)_K!L|4xIp@N z0nhVdm2v@@MNc&vFQ_co_+8QM>}g38!Hd4^UJ_OPhDH107)+kWeUdnIu+zsO+hyx3 z(`k2t87eO@E9o6&e6WD^BUjGXhPfUmj1IgyEq1^wj3Kl4xyPSdZaMpy*Pq(d-0_e3 h!(1nZKdV;AwQo{g`{d!bRG>o`JYD@<);T3K0RRi^N5TLA literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/5bf6e115-a5b5-4410-84b2-d433d2140d53.png b/sprites/spr_instrumenticons/5bf6e115-a5b5-4410-84b2-d433d2140d53.png new file mode 100644 index 0000000000000000000000000000000000000000..57b5270fc75e92c57536e75ec2261fcd6cbafb2e GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`HJ&bxAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&2zvp$M}>*9FtYA2*K7om;r0VM6Z< zhSiKG%#w{oRN9RNF3#=dNqAJTx53xg&N-0Bq1?*9FtYA2*K7om;qrVRr8i zhA`#{xowt`ceyQ?1@G>>apXf4W2~`aLlT48@<&3)U$VyN9Z>cA+v2i~(ZGIUDuYJ& bL~e$_Vm;N6Yge;?j$rU~^>bP0l+XkK3Wz>z literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/71fc5f0c-1c8d-476f-839b-f7152b03996b.png b/sprites/spr_instrumenticons/71fc5f0c-1c8d-476f-839b-f7152b03996b.png new file mode 100644 index 0000000000000000000000000000000000000000..07440b2bd12847b8df05906b6f2ee32b52b09670 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Wu7jMAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tG_*$gKe8#WvBF(+_+knCB*c9@}r zwI#+iMB>3`p^J?jr?Xuo8}h8r88}R9*jQ*OyPB~@M0xe%TqmW|3^OL5Fk+ap`UES3 Yv5J!8{5ik&0$sr1>FVdQ&MBb@0NQapl>h($ literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/72c45179-f6c8-4af3-9793-2e6ed80172b9.png b/sprites/spr_instrumenticons/72c45179-f6c8-4af3-9793-2e6ed80172b9.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f5f39f5c22851097d010b74269b089552a4583 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$ov5qX`U=e1{oQT6gfUe4IPCP=X<- zBadTO_5?=HLr?RyhbVkvMys$)maK{dbIEiTg-4b&&5 fGH8TPpV$ov5qX`U=e1{oQT6gfUe4IPCP=X<- zB0y85}Sb4q9e0BCGFg8%>k literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/9f6abf2e-c5dd-4535-9b0b-7651286e1cb3.png b/sprites/spr_instrumenticons/9f6abf2e-c5dd-4535-9b0b-7651286e1cb3.png new file mode 100644 index 0000000000000000000000000000000000000000..54b7c59129627b1b6eac850bfd80f74abc6d3df7 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7Lqwi$ai8;dbJOgb^E;NwKygD+WA zTyO9k&Su!OiTFbkhS_N)hI0}dgTe~DWM4f)bl@~ literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/b0443b9b-ed75-4725-8e1a-e3482a4597b7.png b/sprites/spr_instrumenticons/b0443b9b-ed75-4725-8e1a-e3482a4597b7.png new file mode 100644 index 0000000000000000000000000000000000000000..845756bc5c2300594fcede86a22cfc217813202b GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rJgR1Ar*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7LqnOzdxcC06AQkp;RVwmlnulttS@tnlCB;%L?!`+)Vm;{cMm8l(My>TRC`h*i^49`?H@i08qDq>_{ XWK>SJlLmmgugD*^Ww=e8{_NM1BLyX^1)&L%da5vv4F^ eLy_oC28Oj~wOZLeZCwv^2ZN`ppUXO@geCyeoj`T~ literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/c98c7682-8bed-40ee-8305-b748dafe961f.png b/sprites/spr_instrumenticons/c98c7682-8bed-40ee-8305-b748dafe961f.png new file mode 100644 index 0000000000000000000000000000000000000000..f45cea5b89ba69c9f1ad822576e0f4be9c30d5ca GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b)GJcAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$ov5qX`U=e1{oQT6gfUe4IPCP=X<- zBadTO_5?=HLJzLCb{gvW>ZVhs0A0f1>FVdQ&MBb@0QJW^W&i*H literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/e68c7937-14d3-48ed-a84d-dfe346cb95c2.png b/sprites/spr_instrumenticons/e68c7937-14d3-48ed-a84d-dfe346cb95c2.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b0d1748af631bbb00601f53e0fb9e803ce78fc GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tG_-OUV}WZD=FT#ra~B{Fyj?o!-g zl5EN#?qDXeUc7)Y#aH3*oVlJRKmkLBn=?-+_Q~lf*j+1W&|dK2UVpzndEcw#00^~9VPgg&ebxsLQ0E(_U>;M1& literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/0a8bb888-4379-4675-af34-809c17181a1f/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/0a8bb888-4379-4675-af34-809c17181a1f/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..26c1906020765c83f967d027c21b5f862729ebdf GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Wu7jMAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tHjpDzyFlx%0bA=1pC$85;Mpy^`H z5@~FuV9AqkPgz^w;^8(O@deBx%oG0dB|rXb-^SP?l0132uanYghKMZ_QW-SDCvr3F XtDnm{r-UW|0a-W! literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/1a62484f-87ff-4a6b-9260-6b56881c34e9/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/1a62484f-87ff-4a6b-9260-6b56881c34e9/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..f57296949a87da30d5a9bba555387426b8d6cd87 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b)GJcAr*7>PQJ)_K!L|4xIp@N z0nhVdm2v@@MNc)Hcswt1?BzF{wPyx1v*6v51r1BXkwBL)c)I$ztaD0e0s!DmKmh;% literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/22cbab71-9620-42d2-846c-dc9d0afbe250/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/22cbab71-9620-42d2-846c-dc9d0afbe250/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..29983e8e8131ab1afbf9a70f93140cd6bd7011ac GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`HJ&bxAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&2zvp$M}>*9FtYA2*K7om;qrVRr8i zhA`#{xowt`(;FiWGu+&1(4cK&z;j@kpy literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/236f3f44-bcd8-4991-8334-dd1dcba3a0be/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/236f3f44-bcd8-4991-8334-dd1dcba3a0be/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..d53695e3669c6482cd0e653e6877d92a3867007f GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`m7Xq+Ar*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7Lq2_6gUWJ87}0?Rn(_UrXsX8jS< z#G7EskY;SQ{P2?kHlzPToB`` b$G~v%tm^sZx)x8MBN#kg{an^LB{Ts5Su#C& literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/26a94b6e-2731-4e34-b12d-0875daff5130/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/26a94b6e-2731-4e34-b12d-0875daff5130/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..f7b4ec8e2d22ac43fa41c1a6042986a05dbd848b GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nVv3=Ar*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tGG;o}AjOE{)4blJ&}!fbYQ$B|57 zHs*AOP4bC3CHoKGICn0B=YUu#P*9FtYA2*K7om;r0VM6Z< zhSiKG%#w{oRN9RNF3$D#kU7i{WRfh=@Gd82BLkBKv*2vs8%HvxPdH)5@JwYB55rTf bB1VQC5xV)cUmvmn9l_w~>gTe~DWM4f=Q=(% literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/3d1b4453-7b25-4b58-820c-5018674ed7b3/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/3d1b4453-7b25-4b58-820c-5018674ed7b3/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..e3c54f79de4d65fe61188e9b51d5ed42e28e5685 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`4W2HJAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7Lq2_6gUWJ87}0?Rn(_UrI5vFvTg z(>9y_(1an)*hhHRTZO_kaSr8Xh75-pa%O#$>`G$Tw0R=$VYNPEfx??EQ@BqsUNL5P iroM@X;i*;;BZIiK)@@!Jz1cvwFnGH9xvXpPJE literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/5162509f-6965-41f8-abcd-b782e0cb52b7/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/5162509f-6965-41f8-abcd-b782e0cb52b7/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..510875d3334e98ff759c73382b7ab48e85cb378c GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*7hPQJ)_K!L|4xIp@N z0nhVdm2v@@MNc&vFQ_co_+8QM>}g38!Hd4^UJ_OPhDH107)+kWeUdnIu+zsO+hyx3 z(`k2t87eO@E9o6&e6WD^BUjGXhPfUmj1IgyEq1^wj3Kl4xyPSdZaMpy*Pq(d-0_e3 h!(1nZKdV;AwQo{g`{d!bRG>o`JYD@<);T3K0RRi^N5TLA literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/5bf6e115-a5b5-4410-84b2-d433d2140d53/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/5bf6e115-a5b5-4410-84b2-d433d2140d53/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..57b5270fc75e92c57536e75ec2261fcd6cbafb2e GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`HJ&bxAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&2zvp$M}>*9FtYA2*K7om;r0VM6Z< zhSiKG%#w{oRN9RNF3#=dNqAJTx53xg&N-0Bq1?*9FtYA2*K7om;qrVRr8i zhA`#{xowt`ceyQ?1@G>>apXf4W2~`aLlT48@<&3)U$VyN9Z>cA+v2i~(ZGIUDuYJ& bL~e$_Vm;N6Yge;?j$rU~^>bP0l+XkK3Wz>z literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/71fc5f0c-1c8d-476f-839b-f7152b03996b/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/71fc5f0c-1c8d-476f-839b-f7152b03996b/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..07440b2bd12847b8df05906b6f2ee32b52b09670 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Wu7jMAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tG_*$gKe8#WvBF(+_+knCB*c9@}r zwI#+iMB>3`p^J?jr?Xuo8}h8r88}R9*jQ*OyPB~@M0xe%TqmW|3^OL5Fk+ap`UES3 Yv5J!8{5ik&0$sr1>FVdQ&MBb@0NQapl>h($ literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/72c45179-f6c8-4af3-9793-2e6ed80172b9/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/72c45179-f6c8-4af3-9793-2e6ed80172b9/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f5f39f5c22851097d010b74269b089552a4583 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$ov5qX`U=e1{oQT6gfUe4IPCP=X<- zBadTO_5?=HLr?RyhbVkvMys$)maK{dbIEiTg-4b&&5 fGH8TPpV$ov5qX`U=e1{oQT6gfUe4IPCP=X<- zB0y85}Sb4q9e0BCGFg8%>k literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/9f6abf2e-c5dd-4535-9b0b-7651286e1cb3/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/9f6abf2e-c5dd-4535-9b0b-7651286e1cb3/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..54b7c59129627b1b6eac850bfd80f74abc6d3df7 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7Lqwi$ai8;dbJOgb^E;NwKygD+WA zTyO9k&Su!OiTFbkhS_N)hI0}dgTe~DWM4f)bl@~ literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/b0443b9b-ed75-4725-8e1a-e3482a4597b7/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/b0443b9b-ed75-4725-8e1a-e3482a4597b7/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..845756bc5c2300594fcede86a22cfc217813202b GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rJgR1Ar*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nb#~aA_$=S&7LqnOzdxcC06AQkp;RVwmlnulttS@tnlCB;%L?!`+)Vm;{cMm8l(My>TRC`h*i^49`?H@i08qDq>_{ XWK>SJlLmmgugD*^Ww=e8{_NM1BLyX^1)&L%da5vv4F^ eLy_oC28Oj~wOZLeZCwv^2ZN`ppUXO@geCyeoj`T~ literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/c98c7682-8bed-40ee-8305-b748dafe961f/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/c98c7682-8bed-40ee-8305-b748dafe961f/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..f45cea5b89ba69c9f1ad822576e0f4be9c30d5ca GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b)GJcAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$ov5qX`U=e1{oQT6gfUe4IPCP=X<- zBadTO_5?=HLJzLCb{gvW>ZVhs0A0f1>FVdQ&MBb@0QJW^W&i*H literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/layers/e68c7937-14d3-48ed-a84d-dfe346cb95c2/18af6b60-a826-4a43-836c-ef503ae61c47.png b/sprites/spr_instrumenticons/layers/e68c7937-14d3-48ed-a84d-dfe346cb95c2/18af6b60-a826-4a43-836c-ef503ae61c47.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b0d1748af631bbb00601f53e0fb9e803ce78fc GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*6y6B81CoOfVMU=$2r zKPkO!o0;+v27!vdvrNwF$0_V=5Nf#Eu+&>pV$tG_-OUV}WZD=FT#ra~B{Fyj?o!-g zl5EN#?qDXeUc7)Y#aH3*oVlJRKmkLBn=?-+_Q~lf*j+1W&|dK2UVpzndEcw#00^~9VPgg&ebxsLQ0E(_U>;M1& literal 0 HcmV?d00001 diff --git a/sprites/spr_instrumenticons/spr_instrumenticons.yy b/sprites/spr_instrumenticons/spr_instrumenticons.yy index bc92900e3..fcba92888 100644 --- a/sprites/spr_instrumenticons/spr_instrumenticons.yy +++ b/sprites/spr_instrumenticons/spr_instrumenticons.yy @@ -366,6 +366,402 @@ "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" } ] + }, + { + "id": "b0443b9b-ed75-4725-8e1a-e3482a4597b7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "51c75e8e-e829-440f-b92c-d8f292286021", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b0443b9b-ed75-4725-8e1a-e3482a4597b7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "25287890-18d2-478d-99f8-2d7dcd27c360", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b0443b9b-ed75-4725-8e1a-e3482a4597b7", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "27ae2cf1-4d7b-4112-a2b9-828146908a41", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "8e2ffe64-7c02-4dd9-9a32-6871177cd3aa", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "27ae2cf1-4d7b-4112-a2b9-828146908a41", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "6ae5e00f-1a31-4ef9-8aad-f1de33e975d4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "27ae2cf1-4d7b-4112-a2b9-828146908a41", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "5bf6e115-a5b5-4410-84b2-d433d2140d53", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "b81da8d9-6fce-4864-9ece-505ba094a05f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5bf6e115-a5b5-4410-84b2-d433d2140d53", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0e5c001a-de79-475d-89ff-90c51d76efc5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5bf6e115-a5b5-4410-84b2-d433d2140d53", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "9f6abf2e-c5dd-4535-9b0b-7651286e1cb3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "b3e20830-5280-473d-aa52-c098a1bb8ea1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9f6abf2e-c5dd-4535-9b0b-7651286e1cb3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3fa713b6-79ad-4cb0-a3c7-72d69e2cc70a", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9f6abf2e-c5dd-4535-9b0b-7651286e1cb3", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "3d1b4453-7b25-4b58-820c-5018674ed7b3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "95f03d7f-52f5-4c71-974f-9897ab18286d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3d1b4453-7b25-4b58-820c-5018674ed7b3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "56ce12d6-47de-4a7b-89aa-8197c7cdd654", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3d1b4453-7b25-4b58-820c-5018674ed7b3", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "c3a374aa-3c69-4658-b739-4048a60ee57b", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "a0fd5a65-05b1-4249-8d61-7f1c0c4ea85c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c3a374aa-3c69-4658-b739-4048a60ee57b", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ed633ee5-5893-42f4-8493-4d346e98dda6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c3a374aa-3c69-4658-b739-4048a60ee57b", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "236f3f44-bcd8-4991-8334-dd1dcba3a0be", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "962fd6f5-7d56-43f7-9c6a-b3010d8f3ac0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "236f3f44-bcd8-4991-8334-dd1dcba3a0be", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "aef84b5b-d4a2-405b-b7fb-37007b5c7515", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "236f3f44-bcd8-4991-8334-dd1dcba3a0be", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "673f22b0-fdc7-481e-8ffe-a108467c9b31", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "24aa50d5-e9e7-42d3-bec6-6d886688ad11", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "673f22b0-fdc7-481e-8ffe-a108467c9b31", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "99849709-5a00-4a11-b71e-9cc29036414b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "673f22b0-fdc7-481e-8ffe-a108467c9b31", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "22cbab71-9620-42d2-846c-dc9d0afbe250", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "468de7d6-06c5-4522-920a-2b1829acd112", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "22cbab71-9620-42d2-846c-dc9d0afbe250", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ddc5535e-01e3-4cae-a52a-ba1bee8cfe30", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "22cbab71-9620-42d2-846c-dc9d0afbe250", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "5162509f-6965-41f8-abcd-b782e0cb52b7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "702144bb-e68a-4caf-be55-1388ee0e491a", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5162509f-6965-41f8-abcd-b782e0cb52b7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "bd6789d9-8747-4fa1-ac86-abd1621426e7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5162509f-6965-41f8-abcd-b782e0cb52b7", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "26a94b6e-2731-4e34-b12d-0875daff5130", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "c60ecc85-3323-42d1-b235-c8448dd12c9c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "26a94b6e-2731-4e34-b12d-0875daff5130", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "00c86b82-4b56-45fb-87d2-b6ef4b6af162", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "26a94b6e-2731-4e34-b12d-0875daff5130", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "72c45179-f6c8-4af3-9793-2e6ed80172b9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "091553b2-c9a6-437b-a6db-6f1a0d06a2f0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "72c45179-f6c8-4af3-9793-2e6ed80172b9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1d4a3762-c74d-4c54-9e60-21a9b3747062", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "72c45179-f6c8-4af3-9793-2e6ed80172b9", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "c98c7682-8bed-40ee-8305-b748dafe961f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "f4790f64-f884-42ca-af33-83cc1d6f498e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c98c7682-8bed-40ee-8305-b748dafe961f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "429d4783-2472-4c18-82bd-da8d89f0f4e8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c98c7682-8bed-40ee-8305-b748dafe961f", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "71fc5f0c-1c8d-476f-839b-f7152b03996b", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "72f64b46-05f5-450e-a8ce-0a8ce6ec7dfb", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "71fc5f0c-1c8d-476f-839b-f7152b03996b", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1d63cb4f-7ff2-484b-bfdf-374130c12dea", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "71fc5f0c-1c8d-476f-839b-f7152b03996b", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "1a62484f-87ff-4a6b-9260-6b56881c34e9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "7ea12253-089f-4562-a228-56ad46614ebf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1a62484f-87ff-4a6b-9260-6b56881c34e9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "6f60e90c-877d-4c75-b96a-151c0dda74a6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1a62484f-87ff-4a6b-9260-6b56881c34e9", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "e68c7937-14d3-48ed-a84d-dfe346cb95c2", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "e121d62e-bd69-4ae9-8989-050a7b734c6f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e68c7937-14d3-48ed-a84d-dfe346cb95c2", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "50789a89-367d-438b-b9fc-e4b13d57bb63", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e68c7937-14d3-48ed-a84d-dfe346cb95c2", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "0a8bb888-4379-4675-af34-809c17181a1f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "d4d3239f-0ad7-41ef-99d8-6123692e16b5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0a8bb888-4379-4675-af34-809c17181a1f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d9789212-6317-45b8-bc7d-663a6a6a3355", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0a8bb888-4379-4675-af34-809c17181a1f", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] + }, + { + "id": "96b2398b-961b-4040-af26-3ddeb343dccd", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d", + "compositeImage": { + "id": "450457f0-308f-4809-85f6-d93dc868aef4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "96b2398b-961b-4040-af26-3ddeb343dccd", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "cde9646c-9be4-4575-9024-bfb3c0035e17", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "96b2398b-961b-4040-af26-3ddeb343dccd", + "LayerId": "18af6b60-a826-4a43-836c-ef503ae61c47" + } + ] } ], "gridX": 0, From 40c66259310b713522f3bf8bb1ee8ca47182d66b Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 17 Jun 2020 07:58:26 -0300 Subject: [PATCH 36/86] Implement individual note block drawing toggles The instrument icon by the side of the note block is now a separate sprite that's added independently of the note block sprite according to the setting. Closes #134. --- scripts/draw_block/draw_block.gml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/scripts/draw_block/draw_block.gml b/scripts/draw_block/draw_block.gml index 6ea170b78..e11826d6b 100644 --- a/scripts/draw_block/draw_block.gml +++ b/scripts/draw_block/draw_block.gml @@ -1,5 +1,5 @@ // draw_block(x, y, ins, key, pan, vel, pit, alpha, selalpha) -var xx, yy, ins, key, pan, vel, pit, alpha, salpha, index; +var xx, yy, ins, key, pan, vel, pit, alpha, salpha, index, frame; xx = argument0 yy = argument1 ins = argument2 @@ -15,11 +15,23 @@ index = ds_list_find_index(instrument_list, ins) //If index isnt found, don't draw if(index = -1)return; -//For custom instruments, pick the last frame from spr_block -if(index >= first_custom_index) { - draw_sprite_ext(spr_block, 48, xx, yy, 1, 1, 0, -1, alpha) +if (use_colors) { + if (!use_shapes) { + frame = index + } else { + frame = index + 32 + } } else { - draw_sprite_ext(spr_block, index + (16 * draw_type), xx, yy, 1, 1, 0, -1, alpha) + if (!use_shapes) { + frame = 48 + } else { + frame = index + 16 + } +} +draw_sprite_ext(spr_block, frame, xx, yy, 1, 1, 0, -1, alpha) +draw_set_alpha(1) +if (use_icons) { + draw_sprite_ext(spr_instrumenticons, index, xx + 16, yy + 16, 1, 1, 0, -1, alpha) } //Draw a red or blue tint in the block when the pitch is off @@ -46,10 +58,10 @@ if (salpha > 0) { draw_set_alpha(alpha + 0.25) } if (show_numbers) { - if (editmode == 0) draw_text(xx + 16 - 8 * (draw_type = 1), yy + 16, condstr(key < 33, " < ") + condstr(key > 57, " > ") + condstr(key > 32 && key < 58, string(key - 33))) - else if (editmode == 1) draw_text(xx + 16 - 8 * (draw_type = 1), yy + 16, string_format(vel, 1, 0)) - else if (editmode == 2) draw_text(xx + 16 - 8 * (draw_type = 1), yy + 16, condstr(pan < 100, "L ") + condstr(pan > 100, "R ") + string_format(abs(pan - 100), 1, 0)) - else if (editmode == 3) draw_text(xx + 16 - 8 * (draw_type = 1), yy + 16, condstr(pit > 0, "+") + string_format(pit, 1, 0)) + if (editmode == 0) draw_text(xx + 16 - 8 * (use_icons), yy + 16, condstr(key < 33, " < ") + condstr(key > 57, " > ") + condstr(key > 32 && key < 58, string(key - 33))) + else if (editmode == 1) draw_text(xx + 16 - 8 * (use_icons), yy + 16, string_format(vel, 1, 0)) + else if (editmode == 2) draw_text(xx + 16 - 8 * (use_icons), yy + 16, condstr(pan < 100, "L ") + condstr(pan > 100, "R ") + string_format(abs(pan - 100), 1, 0)) + else if (editmode == 3) draw_text(xx + 16 - 8 * (use_icons), yy + 16, condstr(pit > 0, "+") + string_format(pit, 1, 0)) } if(theme=2) draw_set_color(c_white) else draw_set_color(c_yellow) From f049f8a4beea8244f2b2fd4efa29a062ec43948b Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 17 Jun 2020 19:02:26 -0300 Subject: [PATCH 37/86] Fix double negative sign in /particle command in Piano Roll visualizer Fixes #144 --- scripts/dat_generate/dat_generate.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dat_generate/dat_generate.gml b/scripts/dat_generate/dat_generate.gml index 2c48bd100..e80f9197b 100644 --- a/scripts/dat_generate/dat_generate.gml +++ b/scripts/dat_generate/dat_generate.gml @@ -63,7 +63,7 @@ for (a = 0; a <= o.enda; a++) { if o.dat_glow = 1 { str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } - str += "particle minecraft:note " + "-" + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(real(o.dat_zval)) + " " + "0.5 0 0.5 1 4 force @p" + br + str += "particle minecraft:note " + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(real(o.dat_zval)) + " " + "0.5 0 0.5 1 4 force @p" + br } if o.dat_vis_type = "Rise" { // Rise From 1a91bcac27b7848f405b32ab4505d4da0d8d5371 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 17 Jun 2020 19:14:06 -0300 Subject: [PATCH 38/86] Increase size of Preferences window --- .../draw_window_preferences.gml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 34c9db6c6..2fc9e71e7 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -3,8 +3,8 @@ var x1, y1, a, b, c, as, stabx, stabw, nsel, str; curs = cr_default nsel = -1 x1 = floor(window_width / 2 - 250) -y1 = floor(window_height / 2 - 200) -draw_window(x1, y1, x1 + 500, y1 + 400) +y1 = floor(window_height / 2 - 250) +draw_window(x1, y1, x1 + 500, y1 + 500) draw_set_font(fnt_mainbold) draw_text(x1 + 8, y1 + 8, "Preferences") draw_set_font(fnt_main) @@ -14,7 +14,7 @@ str[1] = "Appearance" str[2] = "Usability" str[3] = "Playback" if (theme = 1) { - draw_window(x1 + 4, y1 + 45, x1 + 496, y1 + 364) + draw_window(x1 + 4, y1 + 45, x1 + 496, y1 + 464) } for (a = 0; a < 4; a += 1) { c = mouse_rectangle(x1 + b, y1 + 28, string_width(str[a]) + 12, 18) @@ -33,9 +33,9 @@ for (a = 0; a < 4; a += 1) { if (theme = 0 || theme = 2) { draw_set_color(c_white) if(theme = 2) draw_set_color(c_dark) - draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 362, 0) + draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 462, 0) draw_set_color(make_color_rgb(137, 140, 149)) - draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 362, 1) + draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 462, 1) draw_set_color(c_white) if(theme = 2) draw_set_color(c_dark) draw_rectangle(x1 + stabx, y1 + 26, x1 + stabx + stabw, y1 + 26 + 20, 0) @@ -47,7 +47,7 @@ if (theme = 0 || theme = 2) { draw_theme_color() draw_text(x1 + stabx + 8, y1 + 28, str[selected_tab]) draw_set_color(make_color_rgb(213, 223, 229)) - if(theme = 0) draw_roundrect(x1 + 10, y1 + 50, x1 + 490, y1 + 358, 1) + if(theme = 0) draw_roundrect(x1 + 10, y1 + 50, x1 + 490, y1 + 458, 1) }else{ draw_sprite(spr_tabbuttons, 18, x1 + stabx - 1, y1 + 26) draw_sprite_ext(spr_tabbuttons, 19, x1 + stabx + 1, y1 + 26, stabw / 2 - 1, 1, 0, -1, 1) @@ -184,5 +184,5 @@ if (selected_tab = 0) { if (draw_radiobox(x1 + 233 + 32, y1 + 224 + 16, !use_bpm, "Ticks per second (t/s)", "Display song tempos in ticks per second.")) use_bpm = 0 if (draw_radiobox(x1 + 233 + 32, y1 + 244 + 16, use_bpm, "Beats per minute (BPM)", "Display song tempos in beats per minute.")) use_bpm = 1 } -if (draw_button2(x1 + 420, y1 + 368, 72, "OK")) window = 0 +if (draw_button2(x1 + 420, y1 + 468, 72, "OK")) window = 0 window_set_cursor(curs) From 1cd4ad631c8916517372581c77743f82900ca541 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 17 Jun 2020 20:48:16 -0300 Subject: [PATCH 39/86] Include changelog as a separate text file --- Minecraft Note Block Studio.yyp | 17 ++ datafiles/Data/changelog.txt | 205 ++++++++++++++++++ datafiles_yy/Data/changelog.txt.yy | 19 ++ views/0da24e0a-f71e-4abd-a5b1-b6dbf8f9af62.yy | 3 +- views/a89d59b8-0ac7-4c34-a3aa-a1c4e95fa1e3.yy | 3 +- 5 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 datafiles/Data/changelog.txt create mode 100644 datafiles_yy/Data/changelog.txt.yy diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index 04b44b7c0..75a30f582 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -1462,6 +1462,14 @@ "resourceType": "GMScript" } }, + { + "Key": "57e3d1ab-df80-4484-93a5-72022d451dc3", + "Value": { + "id": "ff3187df-9ec2-4830-810c-c4fc4beacfba", + "resourcePath": "scripts\\load_text\\load_text.yy", + "resourceType": "GMScript" + } + }, { "Key": "58554c84-41d9-41c4-ab93-b3874b99dd10", "Value": { @@ -2094,6 +2102,14 @@ "resourceType": "GMScript" } }, + { + "Key": "7b2f21ca-e95c-4baa-8c7b-4224bf271723", + "Value": { + "id": "28dc3df6-aab7-4947-8dd5-7c7acebb7013", + "resourcePath": "datafiles_yy\\Data\\changelog.txt.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "7c7864c0-6a83-4544-b26d-4ecb97178a63", "Value": { @@ -4253,6 +4269,7 @@ "a0fe9bd7-a654-4de6-abd8-41b5be7e41a8", "7dfa1c5c-2dd7-4604-a776-ff2a1c2d26b0", "f136e3ca-963a-4648-ae87-60c3ee8476a9", + "57e3d1ab-df80-4484-93a5-72022d451dc3", "1501c0c9-c863-4723-9ccc-f004078dc78d", "c032c6f1-0ef4-493c-82d0-cbc09ed91a90", "c54d19c6-44b4-403d-83b5-46645ef6d7d0", diff --git a/datafiles/Data/changelog.txt b/datafiles/Data/changelog.txt new file mode 100644 index 000000000..717a7a225 --- /dev/null +++ b/datafiles/Data/changelog.txt @@ -0,0 +1,205 @@ +Changes in v3.7.2 (2020.02.27): +* Auto-saving will now wait until you pause the song to prevent stuttering. +* Fixed notes in the first tick of a song not playing when selected. +* Fixed C8 key on piano not being playable through keyboard shortcuts. +* Fixed a crash when scrolling down to layer 200. +* Fixed scrollbar in the note block area getting outside the screen in some +window sizes. +* Fixed compatibility indicator being incorrect in some circumstances. + +Changes in v3.7.1 (2020.01.20): +* Added an auto-updater. When a new version is available, Note Block Studio +will now be able to download and install it automatically. You don't even need +to open your browser! +* Pressing Shift while clicking 'Select all note blocks in this layer' will add those +notes to the selection rather than clearing it. +* Holding Shift while dragging layer volumes/stereo will change them in +increments of 1, allowing a finer control. +* Note panning is now prioritized over layer panning. Layers that haven't had +their panning changed will not have any effect on note panning. +* Re-added the option to import instruments from another song. +* Bugfixes and improvements: + * Fixed layer volume and stereo controls being too sensitive. + * Fixed selection being automatically cleared once every minute. + * Fixed contents of macro windows not being shown in some circumstances, +forcing you to quit the program. + * Fixed MIDI import setting pitch of all notes to +1. + * Fixed lower notes not playing all the way through/stopping too early. + * Fixed note count on 'Song stats' not being reset when creating a new song +(and showing wrong percentages). + * Fixed a crash when redoing a manual block placement. + * Fixed a crash when opening the program with the greeting window disabled. + * Fixed long recent file names overflowing the greeting window. + * Fixed song area height being calculated incorrectly when the piano is +disabled. + * Improved contrast of various pieces of text in the dark theme. + * Removed the ability to drag the layer stereo controls with a window open. + +Changes in v3.7.0 (2019.12.31): +* Added a cool demo song to showcase the new features in 3.7.0! +* It's now possible to set velocity, panning and detune on each individual note. +* Added a metronome. +* Added an option to display tempo as BPM rather than t/s. +* Auto-save is now a global preference rather than being saved per song. +* Added an auto-recovery feature so work is not lost if the program crashes. +* Added Patterns. You can export note block data as a pattern, and import it +into whatever song you wish. +* Note block songs now save song looping. +* Added a bars/beats/sixteenths display. +* Added lines that mark each bar in a song. +* Added an option to choose if looping should wait for the end of the bar. +* Added an option to show or hide layer boxes. +* Added four edit modes, which allow you to change different properties of +notes (key/velocity/panning/pitch). +* Holding Shift while scrolling over a note will change a whole octave, or +fine-tune its velocity/panning/pitch. +* Added Macros: +(Accessible by right-clicking a selection, or from the new macro bar) + * Tremolo + * Stereo + * Arpeggio + * Portamento + * Vibrato + * Stagger + * Chorus + * Volume LFO + * Fade in + * Fade out + * Replace key + * Set velocity + * Set panning + * Set pitch +* Added branch export, a new layout for exporting as schematics. +* Added a metronome function. +* Added layer management buttons (shift layers up and down, insert, delete). +* Added a secret clipboard editor for power users. +* (Slightly) Improved MIDI import, and made it support note velocity. +* Improved data pack performance; impact on tick rate should be negligible. +* Data packs can now export notes outside the octave range by providing +a resource pack. +* Data packs can now be exported as ZIP. +* Data packs now allow any tempo to be imported into Minecraft. +* It's now possible to set a custom namespace and path for data pack functions. +* Added six types of visualizers to data packs. +* Double-clicking a NBS file will now open the song. +* Added the ability to export songs in previous NBS format versions +via the Save Options window. +* Note Block Studio will now refuse to load NBS versions made in the future. +* NBS format updated to version 4. +* Improved contrast of layer icons in dark theme. +* Prevented dragging layer stereo from changing the song tempo. +* Fixed 'Keys to show' resetting to 20 when enabling the piano. +* Fixed crash in MP3 and data pack export. +* Fixed crash on opening after updating. +* Fixed memory leak from audio emitters piling up. + +Changes in v3.6.0 (2019.08.08): +* Added MP3 export option to select whether you want to include + locked layers. +* Added loop button to loop the current song. +* Readded colored note blocks, added option for the shaped ones. +* Added option to toggle piano visibility. +* Updated icon. +* NBS format updated to version 3. Now stores song length again. +* Fixed an issue where there was an unintended gradient over sprites. +* Fixed typo in preferences. +* Fixed instrument icons being blank. +* Fixed preferences not saving. + +Changes in v3.5.1 (2019.07.14): +* Fixed MIDI Import crash + +Changes in v3.5.0 (2019.07.11): +* Added Stereo. +* Stereo added to Datapack Export. +* Improved MIDI import, again. +* Added settings to enhance performance. + *Added new sprites for note blocks. + +Changes in v3.4.0 (2019.05.11): +* Added dark theme. +* Datapack export: added option to let nearby players hear your music too. +* Improved MIDI import. +* NBS format now stores its version for future proofing. This means that + songs made here can't be opened in older versions of Note Block Studio. + +Changes in v3.3.8 (2019.03.21): +* Fixed a glitch with layer names. +* Fixed a glitch with compatibility indicator. + + +Changes in v3.3.7 (2019.03.13): +* Changed fonts. +* Added support for cyrillic characters. +* Updated desktop icon. +* Fixed crash while checking for updates. + +Changes in v3.3.6 (2019.03.02): +* Added new note block sounds: Iron Xylophone, Cow Bell, Didgeridoo, + Bit, Banjo and Pling. +* Updated icon. +* Updated note block texture + +Changes in v3.3.5 (2019.01.20): +* Added option to export song as datapack. File -> Export as Datapack + +Changes in v3.3.4 (2018.02.01): +* Fixed a crash when importing certain MIDI files. + +Changes in v3.3.3 (2017.06.10): +* Stability fixes. + +Changes in v3.3.2 (2017.06.02): +* Added new note block sounds: Guitar, Flute, Bell, Chime and Xylophone. +* Added new blocks to the schematic exporter. +* Added an option to export schematics for old Minecraft versions. +* Fixed an audio stuttering bug for imported sounds. + +Changes in v3.3.1 (2017.03.25): +* Schematics fixed for new Minecraft entity names. +* Error fixed when importing MIDIs. + +Changes in v3.3.0 (2016.03.20): +* MP3 export (MIDI export removed). +* New blocks when exporting schematic. +* Red outline around invalid blocks. +* Piano renamed to Harp. +* Improved performance. +* New audio engine. +* Schematic height limit increased to 256. + +Changes in v3.2.1 (2013.10.27): +* Added 20 new songs. +* Fixed a glitch with the info box. + +Changes in v3.2.0 (2013.10.26): +* Added support for MIDI devices. +* Added recording button. +* Better text boxes. +* Better menus. +* Fixed an error in the help file. + +Changes in v3.1.3 (2012.04.01): +* Fixed a glitch when creating Minecart schematics with more than one layer. +* Added option to change the sound system, for users with audio problems. + +Changes in v3.1.2 (2012.03.20): +* 2.5 and 5 tick / second songs are now compatible with Minecraft. +* Removed support for Minecraft versions below 1.8.1. +* Compress selection feature (found in the edit menu.) +* Ctrl to add new blocks to a selection, Alt to clone. + +Changes in v3.1.1 (2011.12.03): +* Schematic exporting updated to v1.0.0 of Minecraft. +* Added list of changes upon startup of new version. +* Custom instruments can now be in the .wav and .mp3 format. +* Fixed a few grammatical errors in the help file. + +Changes in v3.1.0 (2011.11.05): +* Added links to tutorial videos in the program and help file. +* You will now need to hold Shift while selecting to add blocks to the selection. +* Fixed some issues with looping the song when exporting as Schematic. +* Slight performance boosting. +* Removed an old debugging feature. +* Fixed a glitch with redoing a selection. +* Fixed some rounding errors when drawing shapes. \ No newline at end of file diff --git a/datafiles_yy/Data/changelog.txt.yy b/datafiles_yy/Data/changelog.txt.yy new file mode 100644 index 000000000..a532d2c47 --- /dev/null +++ b/datafiles_yy/Data/changelog.txt.yy @@ -0,0 +1,19 @@ +{ + "id": "7b2f21ca-e95c-4baa-8c7b-4224bf271723", + "modelName": "GMIncludedFile", + "mvc": "1.0", + "name": "changelog.txt", + "CopyToMask": -1, + "exists": false, + "exportAction": 0, + "exportDir": "", + "fileName": "changelog.txt", + "filePath": "datafiles\\Data", + "freeData": false, + "origName": "", + "overwrite": false, + "removeEnd": false, + "size": 0, + "store": false, + "tags": "" +} \ No newline at end of file diff --git a/views/0da24e0a-f71e-4abd-a5b1-b6dbf8f9af62.yy b/views/0da24e0a-f71e-4abd-a5b1-b6dbf8f9af62.yy index df74d0574..b15527583 100644 --- a/views/0da24e0a-f71e-4abd-a5b1-b6dbf8f9af62.yy +++ b/views/0da24e0a-f71e-4abd-a5b1-b6dbf8f9af62.yy @@ -13,7 +13,8 @@ "da744c1c-0587-41df-9a62-9f25dc0b2001", "b97f74da-532b-4d10-8916-42971e9453ca", "b388b550-2b8c-4063-b058-e9ed3b451129", - "3342ecf7-6ac3-4c95-8250-a4cf0ddca468" + "3342ecf7-6ac3-4c95-8250-a4cf0ddca468", + "7b2f21ca-e95c-4baa-8c7b-4224bf271723" ], "filterType": "GMIncludedFile", "folderName": "Data", diff --git a/views/a89d59b8-0ac7-4c34-a3aa-a1c4e95fa1e3.yy b/views/a89d59b8-0ac7-4c34-a3aa-a1c4e95fa1e3.yy index 8bfea894a..94e2c278c 100644 --- a/views/a89d59b8-0ac7-4c34-a3aa-a1c4e95fa1e3.yy +++ b/views/a89d59b8-0ac7-4c34-a3aa-a1c4e95fa1e3.yy @@ -17,7 +17,8 @@ "af9a3525-3682-420e-b2a0-d952cc347296", "a0fe9bd7-a654-4de6-abd8-41b5be7e41a8", "7dfa1c5c-2dd7-4604-a776-ff2a1c2d26b0", - "f136e3ca-963a-4648-ae87-60c3ee8476a9" + "f136e3ca-963a-4648-ae87-60c3ee8476a9", + "57e3d1ab-df80-4484-93a5-72022d451dc3" ], "filterType": "GMScript", "folderName": "File", From 97adb8916abe992d88371cfc2c8edc44cfc3f2b9 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 17 Jun 2020 20:50:22 -0300 Subject: [PATCH 40/86] Load changelog from text file instead of creating it in the code --- .../draw_window_update/draw_window_update.gml | 33 ++++++------------- scripts/load_text/load_text.gml | 23 +++++++++++++ scripts/load_text/load_text.yy | 8 +++++ 3 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 scripts/load_text/load_text.gml create mode 100644 scripts/load_text/load_text.yy diff --git a/scripts/draw_window_update/draw_window_update.gml b/scripts/draw_window_update/draw_window_update.gml index b92ac1524..7c2fd0ffc 100644 --- a/scripts/draw_window_update/draw_window_update.gml +++ b/scripts/draw_window_update/draw_window_update.gml @@ -1,5 +1,15 @@ // draw_window_update() var x1, y1, a, n, fullstr, str, strb; +fullstr = load_text(data_directory + "changelog.txt") +if (fullstr = 0) { + show_message("Changelist not found!") + if (window = w_update) { + window = w_greeting + } else { + window = 0 + } + return +} x1 = floor(window_width / 2 - 250) y1 = floor(window_height / 2 - 200) draw_window(x1, y1, x1 + 500, y1 + 400) @@ -9,29 +19,6 @@ else draw_text(x1 + 8, y1 + 8, "Changelist") draw_set_font(fnt_main) if (window = w_update) draw_text(x1 + 32, y1 + 32, "Thank you for upgrading to version " + version + "!") draw_area(x1 + 16, y1 + 58, x1 + 487, y1 + 310) -fullstr = "" -fullstr += "Changes in v3.7.2 (2020.02.27):\n* Auto-saving will now wait until you pause the song to prevent stuttering.\n* Fixed notes in the first tick of a song not playing when selected.\n* Fixed C8 key on piano not being playable through keyboard shortcuts.\n* Fixed a crash when scrolling down to layer 200.\n* Fixed scrollbar in the note block area getting outside the screen in some\nwindow sizes.\n* Fixed compatibility indicator being incorrect in some circumstances.\n\n" -fullstr += "Changes in v3.7.1 (2020.01.20):\n* Added an auto-updater. When a new version is available, Note Block Studio\nwill now be able to download and install it automatically. You don't even need\nto open your browser!\n* Pressing Shift while clicking 'Select all note blocks in this layer' will add those\nnotes to the selection rather than clearing it.\n* Holding Shift while dragging layer volumes/stereo will change them in\nincrements of 1, allowing a finer control.\n* Note panning is now prioritized over layer panning. Layers that haven't had\ntheir panning changed will not have any effect on note panning.\n* Re-added the option to import instruments from another song.\n* Bugfixes and improvements:\n * Fixed layer volume and stereo controls being too sensitive.\n * Fixed selection being automatically cleared once every minute.\n * Fixed contents of macro windows not being shown in some circumstances,\nforcing you to quit the program.\n * Fixed MIDI import setting pitch of all notes to +1.\n * Fixed lower notes not playing all the way through/stopping too early.\n * Fixed note count on 'Song stats' not being reset when creating a new song\n(and showing wrong percentages).\n * Fixed a crash when redoing a manual block placement.\n * Fixed a crash when opening the program with the greeting window disabled.\n * Fixed long recent file names overflowing the greeting window.\n * Fixed song area height being calculated incorrectly when the piano is\ndisabled.\n * Improved contrast of various pieces of text in the dark theme.\n * Removed the ability to drag the layer stereo controls with a window open.\n\n" -fullstr += "Changes in v3.7.0 (2019.12.31):\n* Added a cool demo song to showcase the new features in 3.7.0!\n* It's now possible to set velocity, panning and detune on each individual note.\n* Added a metronome.\n* Added an option to display tempo as BPM rather than t/s.\n* Auto-save is now a global preference rather than being saved per song.\n* Added an auto-recovery feature so work is not lost if the program crashes.\n* Added Patterns. You can export note block data as a pattern, and import it\ninto whatever song you wish.\n* Note block songs now save song looping.\n* Added a bars/beats/sixteenths display.\n* Added lines that mark each bar in a song.\n* Added an option to choose if looping should wait for the end of the bar.\n* Added an option to show or hide layer boxes.\n* Added four edit modes, which allow you to change different properties of\nnotes (key/velocity/panning/pitch).\n* Holding Shift while scrolling over a note will change a whole octave, or\nfine-tune its velocity/panning/pitch.\n* Added Macros:\n(Accessible by right-clicking a selection, or from the new macro bar)\n * Tremolo\n * Stereo\n * Arpeggio\n * Portamento\n * Vibrato\n * Stagger\n * Chorus\n * Volume LFO\n * Fade in\n * Fade out\n * Replace key\n * Set velocity\n * Set panning\n * Set pitch\n* Added branch export, a new layout for exporting as schematics.\n* Added a metronome function.\n* Added layer management buttons (shift layers up and down, insert, delete).\n* Added a secret clipboard editor for power users.\n* (Slightly) Improved MIDI import, and made it support note velocity.\n* Improved data pack performance; impact on tick rate should be negligible.\n* Data packs can now export notes outside the octave range by providing\na resource pack.\n* Data packs can now be exported as ZIP.\n* Data packs now allow any tempo to be imported into Minecraft.\n* It's now possible to set a custom namespace and path for data pack functions.\n* Added six types of visualizers to data packs.\n* Double-clicking a NBS file will now open the song.\n* Added the ability to export songs in previous NBS format versions\nvia the Save Options window.\n* Note Block Studio will now refuse to load NBS versions made in the future.\n* NBS format updated to version 4.\n* Improved contrast of layer icons in dark theme.\n* Prevented dragging layer stereo from changing the song tempo.\n* Fixed 'Keys to show' resetting to 20 when enabling the piano.\n* Fixed crash in MP3 and data pack export.\n* Fixed crash on opening after updating.\n* Fixed memory leak from audio emitters piling up.\n\n" -fullstr += "Changes in v3.6.0 (2019.08.08):\n* Added MP3 export option to select whether you want to include\n locked layers.\n* Added loop button to loop the current song.\n* Readded colored note blocks, added option for the shaped ones.\n* Added option to toggle piano visibility.\n* Updated icon.\n* NBS format updated to version 3. Now stores song length again.\n* Fixed an issue where there was an unintended gradient over sprites.\n* Fixed typo in preferences.\n* Fixed instrument icons being blank.\n* Fixed preferences not saving.\n\n" -fullstr += "Changes in v3.5.1 (2019.07.14):\n* Fixed MIDI Import crash\n\n" -fullstr += "Changes in v3.5.0 (2019.07.11):\n* Added Stereo.\n* Stereo added to Datapack Export.\n* Improved MIDI import, again.\n* Added settings to enhance performance.\n *Added new sprites for note blocks.\n\n" -fullstr += "Changes in v3.4.0 (2019.05.11):\n* Added dark theme.\n* Datapack export: added option to let nearby players hear your music too.\n* Improved MIDI import.\n* NBS format now stores its version for future proofing. This means that\n songs made here can't be opened in older versions of Note Block Studio.\n\n" -fullstr += "Changes in v3.3.8 (2019.03.21):\n* Fixed a glitch with layer names.\n* Fixed a glitch with compatibility indicator.\n\n" -fullstr += "Changes in v3.3.7 (2019.03.13):\n* Changed fonts.\n* Added support for cyrillic characters.\n* Updated desktop icon.\n* Fixed crash while checking for updates.\n\n" -fullstr += "Changes in v3.3.6 (2019.03.02):\n* Added new note block sounds: Iron Xylophone, Cow Bell, Didgeridoo,\n Bit, Banjo and Pling.\n* Updated icon.\n* Updated note block texture\n\n" -fullstr += "Changes in v3.3.5 (2019.01.20):\n* Added option to export song as datapack. File -> Export as Datapack\n\n" -fullstr += "Changes in v3.3.4 (2018.02.01):\n* Fixed a crash when importing certain MIDI files.\n\n" -fullstr += "Changes in v3.3.3 (2017.06.10):\n* Stability fixes.\n\n" -fullstr += "Changes in v3.3.2 (2017.06.02):\n* Added new note block sounds: Guitar, Flute, Bell, Chime and Xylophone.\n* Added new blocks to the schematic exporter.\n* Added an option to export schematics for old Minecraft versions.\n* Fixed an audio stuttering bug for imported sounds.\n\n" -fullstr += "Changes in v3.3.1 (2017.03.25):\n* Schematics fixed for new Minecraft entity names.\n* Error fixed when importing MIDIs.\n\n" -fullstr += "Changes in v3.3.0 (2016.03.20):\n* MP3 export (MIDI export removed).\n* New blocks when exporting schematic.\n* Red outline around invalid blocks.\n* Piano renamed to Harp.\n* Improved performance.\n* New audio engine.\n* Schematic height limit increased to 256.\n\n" -fullstr += "Changes in v3.2.1 (2013.10.27):\n* Added 20 new songs.\n* Fixed a glitch with the info box.\n\n" -fullstr += "Changes in v3.2.0 (2013.10.26):\n* Added support for MIDI devices.\n* Added recording button.\n* Better text boxes.\n* Better menus.\n* Fixed an error in the help file.\n\n" -fullstr += "Changes in v3.1.3 (2012.04.01):\n* Fixed a glitch when creating Minecart schematics with more than one layer.\n* Added option to change the sound system, for users with audio problems.\n\n" -fullstr += "Changes in v3.1.2 (2012.03.20):\n* 2.5 and 5 tick / second songs are now compatible with Minecraft.\n* Removed support for Minecraft versions below 1.8.1.\n* Compress selection feature (found in the edit menu.)\n* Ctrl to add new blocks to a selection, Alt to clone.\n\n" -fullstr += "Changes in v3.1.1 (2011.12.03):\n* Schematic exporting updated to v1.0.0 of Minecraft.\n* Added list of changes upon startup of new version.\n* Custom instruments can now be in the .wav and .mp3 format.\n* Fixed a few grammatical errors in the help file.\n\n" -fullstr += "Changes in v3.1.0 (2011.11.05):\n* Added links to tutorial videos in the program and help file.\n* You will now need to hold Shift while selecting to add blocks to the selection.\n* Fixed some issues with looping the song when exporting as Schematic.\n* Slight performance boosting.\n* Removed an old debugging feature.\n* Fixed a glitch with redoing a selection.\n* Fixed some rounding errors when drawing shapes." n = string_count("\n", fullstr) for (a = 0; a < n; a += 1) { str[a] = string_copy(fullstr, 1, string_pos("\n", fullstr) - 1) diff --git a/scripts/load_text/load_text.gml b/scripts/load_text/load_text.gml new file mode 100644 index 000000000..be7a29caf --- /dev/null +++ b/scripts/load_text/load_text.gml @@ -0,0 +1,23 @@ +// load_text(filename) +// Loads a text file into a string. + +if (file_exists_lib(argument0)) { + + var file, str + + file = file_text_open_read(argument0) + str = "" + + while (!file_text_eof(file)) { + str += file_text_readln(file) + } + + file_text_close(file) + + return str + +} else { + + return 0 + +} \ No newline at end of file diff --git a/scripts/load_text/load_text.yy b/scripts/load_text/load_text.yy new file mode 100644 index 000000000..8eabd4342 --- /dev/null +++ b/scripts/load_text/load_text.yy @@ -0,0 +1,8 @@ +{ + "id": "57e3d1ab-df80-4484-93a5-72022d451dc3", + "modelName": "GMScript", + "mvc": "1.0", + "name": "load_text", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file From 7c5b62c234aefed7e8c3d1971bcc738dcdc988b5 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 23 Jun 2020 06:35:10 -0300 Subject: [PATCH 41/86] Split button to select out of range notes into lower and higher Split button to select out of range notes into lower and higher Fixes #161 --- .../draw_window_minecraft.gml | 20 +++++++++++++------ scripts/select_outside/select_outside.gml | 6 +++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/scripts/draw_window_minecraft/draw_window_minecraft.gml b/scripts/draw_window_minecraft/draw_window_minecraft.gml index 1c57eb2e6..c257bdb44 100644 --- a/scripts/draw_window_minecraft/draw_window_minecraft.gml +++ b/scripts/draw_window_minecraft/draw_window_minecraft.gml @@ -114,11 +114,15 @@ if (selected_tab_mc = 0) { // Schematic } else { draw_text(x1 + 45, yy + 16, "There are " + string(block_outside) + " blocks outside the 2 octave range.") } - if (draw_button2(x1 + 45, yy + 34, 130, "Select affected blocks")) { - select_outside() + if (draw_button2(x1 + 45, yy + 34, 120, "Select lower blocks")) { + select_outside(true, false) window = 0 } - if (draw_button2(x1 + 185, yy + 34, 100, "Transpose notes")) { + if (draw_button2(x1 + 175, yy + 34, 120, "Select higher blocks")) { + select_outside(false, true) + window = 0 + } + if (draw_button2(x1 + 305, yy + 34, 100, "Transpose notes")) { if (question("Transpose notes so that they fall within Minecraft's 2 octaves?", "Transpose notes")) { select_all(-1, 0) selection_transpose() @@ -197,11 +201,15 @@ if (selected_tab_mc = 0) { // Schematic } else { draw_text(x1 + 45, yy + 32, "There are " + string(block_outside) + " blocks outside the 2 octave range.") } - if (draw_button2(x1 + 45, yy + 50, 130, "Select affected blocks")) { - select_outside() + if (draw_button2(x1 + 45, yy + 50, 120, "Select lower blocks")) { + select_outside(true, false) + window = 0 + } + if (draw_button2(x1 + 175, yy + 50, 120, "Select higher blocks")) { + select_outside(false, true) window = 0 } - if (draw_button2(x1 + 185, yy + 50, 100, "Transpose notes")) { + if (draw_button2(x1 + 305, yy + 50, 100, "Transpose notes")) { if (question("Transpose notes so that they fall within Minecraft's 2 octaves?", "Transpose notes")) { select_all(-1, 0) selection_transpose() diff --git a/scripts/select_outside/select_outside.gml b/scripts/select_outside/select_outside.gml index 03aef267c..6315f0156 100644 --- a/scripts/select_outside/select_outside.gml +++ b/scripts/select_outside/select_outside.gml @@ -1,5 +1,5 @@ -// select_outside() -// Selects all the note blocks outside the 2 octave range. +// select_outside(lower, higher) +// Selects all the note blocks below and/or above the 2 octave range. var a, b, str, ins, key, vel, pan, pit; str = selection_code if (selected > 0) selection_place(1) @@ -30,7 +30,7 @@ for (a = 0; a <= enda; a += 1) { vel = song_vel[a, b] pan = song_pan[a, b] pit = song_pit[a, b] - if (key < 33 || key > 57) { + if ((argument0 && key < 33) || (argument1 && key > 57)) { selection_exists[a, b] = 1 selection_ins[a, b] = ins selection_key[a, b] = key From 34456a37dde5a883000f8398bb88d14c712a5097 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 23 Jun 2020 20:17:14 -0300 Subject: [PATCH 42/86] Add placeholder sprites for colored custom instruments --- Minecraft Note Block Studio.yyp | 26 +- .../47c58330-743c-4c01-916c-9b5ee39be3ea.png | Bin 383 -> 0 bytes .../703020fd-b570-4333-bcc3-cbb3a719f1ea.png | Bin 398 -> 0 bytes ... 7d0d3b41-bd33-49d7-ad5b-bb8eb6ea85a2.png} | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 436 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 372 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 376 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 389 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 276 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 417 -> 0 bytes .../82c76b05-fe07-44c3-ad9a-59c31e2cec58.png} | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 460 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 250 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 282 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 482 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 268 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 437 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 476 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 441 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 317 -> 0 bytes sprites/spr_block/spr_block.yy | 1080 +---------------- .../09af78ec-8c67-4fa0-ba8c-e70886ed7634.png | Bin .../28c2b399-0172-42ba-b68d-a6fd7b0c7e23.png | Bin 0 -> 367 bytes .../2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646.png | Bin 0 -> 374 bytes .../3275a111-edb5-4d3f-8c90-f07aca3d235c.png | Bin .../355dc121-1f32-4a3d-b6fd-531e882c93cf.png | Bin .../39b2852e-5bbf-46d2-928f-f7124dc5a782.png | Bin 0 -> 366 bytes .../3c1d183e-8e77-4982-9c9a-d9edfcf89241.png | Bin .../406bd3f2-c153-40bd-9cb3-301370bbece3.png | Bin 0 -> 348 bytes .../4d49f0c2-f9ae-4a23-ae65-746ef0100cb3.png | Bin 0 -> 351 bytes .../588290da-b5bf-49b6-91d7-324b61018608.png | Bin .../5bba66a2-8b1f-4d0a-beae-3e1522b21a21.png | Bin .../5ea6b4ca-80a3-4e1a-81f7-dbf2250c711d.png | Bin .../61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82.png | Bin 0 -> 330 bytes .../6424d1d9-aa72-431f-94d0-69810a5579e0.png | Bin .../6672cac7-d619-4624-9693-64fa62a1fd5a.png | Bin 0 -> 331 bytes .../7cab3939-805e-4543-b45a-46e36045761c.png | Bin .../81350207-a9e8-41a7-8a4e-87cf29a7203f.png | Bin .../82aeebe0-8995-4711-9ab7-a6e4a34db80a.png | Bin .../83636ef1-c905-4115-b8f1-c06a5242e29b.png | Bin .../a4b7e245-a218-42c9-880d-00be2fff2c9c.png | Bin 0 -> 324 bytes .../a6acf370-1f09-42f8-a02a-710c2abe0173.png | Bin 0 -> 377 bytes .../b190b1e0-8066-4abd-8c48-dd40876d3559.png | Bin 0 -> 341 bytes .../b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png | Bin 0 -> 363 bytes .../c5152919-a8f5-46c0-b320-09e6b3f9535c.png | Bin .../ca062147-d4cf-4e89-81ee-e5ebe1d4b165.png | Bin 0 -> 342 bytes .../cc4ed8a2-59d3-4488-bd3d-645806634603.png | Bin .../cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png | Bin 0 -> 372 bytes .../cce58db7-3b8b-4712-b6d4-1791b1a20e88.png | Bin 0 -> 362 bytes .../d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png | Bin 0 -> 348 bytes .../e4256469-5548-4970-81d4-fe78a957f8bf.png | Bin .../eca1b1bd-673a-46c5-902c-8bd4c795cf31.png | Bin 0 -> 311 bytes .../f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c.png | Bin 0 -> 392 bytes .../ff1daf32-8dc0-408a-9d33-e4d74c14df8e.png | Bin 0 -> 351 bytes .../ff952cd6-2f4c-4942-8a29-7f895aa5c00d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 367 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 374 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 366 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 348 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 351 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 330 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 331 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 324 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 377 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 341 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 363 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 342 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 372 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 362 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 348 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 311 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 392 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 351 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin sprites/spr_block_color/spr_block_color.yy | 796 ++++++++++++ .../137e1fee-e8f6-499f-8e08-ced3ac0e44ed.png} | Bin .../14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png | Bin 0 -> 393 bytes .../1e53ebf2-29bf-41dc-b447-5e8562f97a8b.png} | Bin .../21c46e6e-dd05-45ae-ace3-961a2c7ec4b4.png | Bin 0 -> 418 bytes .../378def89-d34d-4405-a5f5-2d16dcb9c410.png | Bin 0 -> 391 bytes .../38ce098a-4d09-4dd3-a3db-068345b0f946.png | Bin 0 -> 384 bytes .../3bf63775-9706-483c-8c28-f52ba15484c9.png} | Bin .../3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b.png} | Bin .../3c40c312-4fe7-48ce-af63-68ea74b251df.png} | Bin .../46825d5d-002e-43e8-a62b-198caac29b0e.png} | Bin .../4c2de224-b6d3-4354-aef6-ac7e60089e89.png} | Bin .../55ba8420-6cdf-4485-a29c-1794c2ac8d44.png} | Bin .../570118b1-123c-474b-9147-9560ccc537f7.png} | Bin .../728ef579-ae8b-4a23-b96f-a15dbeaf267f.png | Bin 0 -> 327 bytes .../778cb7be-b35a-431b-8b9c-85c7e8e65469.png} | Bin .../8184b047-3992-4f30-9b53-ec835acf0e46.png | Bin 0 -> 277 bytes .../8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png | Bin 0 -> 243 bytes .../8ef19192-7161-41e6-8877-65db720af07e.png | Bin 0 -> 392 bytes .../a42742d6-70a2-462d-bb6b-66bdfdc30a0d.png | Bin 0 -> 485 bytes .../a48d6d91-2e8d-4aff-a833-98d374d5e829.png} | Bin .../aa20fb47-8580-4242-af3e-c1859f0accfe.png | Bin 0 -> 493 bytes .../adcd5e12-8fe9-4f12-b63c-69e6cb230a47.png | Bin 0 -> 408 bytes .../b72a8afd-72b9-4a76-8c2c-173286dacdc1.png | Bin 0 -> 397 bytes .../b952d932-78e5-4629-b113-8bee4d60d7ff.png | Bin 0 -> 266 bytes .../d1c859be-2b28-46ff-8289-fae7b22b7db4.png} | Bin .../d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png} | Bin .../dd35adba-1568-4614-8b5d-3beb257ba943.png | Bin 0 -> 418 bytes .../e2fb0926-5dd1-4e21-ba04-27a0d35c57d6.png | Bin 0 -> 287 bytes .../e3d6124f-a72f-4abd-bb7c-1734c08ca471.png | Bin 0 -> 398 bytes .../e99bb026-b4da-4b3f-ae51-3fe387b81757.png | Bin 0 -> 386 bytes .../ec92d6a7-2d39-4858-8a51-8c7c6ee5925d.png | Bin 0 -> 443 bytes .../fac8bf2b-317a-4d97-87aa-a82b1e367b54.png | Bin 0 -> 331 bytes .../face835c-3101-4ac5-8d77-497d75e97c76.png} | Bin .../ffc96e9c-fbff-47c0-bfd2-ae47361135e5.png | Bin 0 -> 481 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 364 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 396 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 441 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 425 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 393 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 387 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 277 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 241 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 470 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 268 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 312 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 406 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 392 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 332 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 402 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 277 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 252 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 392 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 490 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png} | Bin .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 492 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 410 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 397 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 268 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 274 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 481 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 421 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 293 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 398 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 397 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 446 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 331 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 412 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 482 bytes .../spr_block_color_shape.yy | 796 ++++++++++++ .../0489e482-a8bc-4db7-a76d-bfe130d123a3.png} | Bin .../0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png} | Bin .../0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png} | Bin .../1191deec-4fa1-4663-af79-00b6177fd83e.png} | Bin .../1a3812af-5599-4a6f-aff6-6ee7d775a93d.png} | Bin .../1c015f46-bb21-4d72-933a-fc000856c139.png} | Bin .../24d9d25c-8f41-4e40-91e0-fa38ee9bb241.png} | Bin .../2a66ba51-6191-4628-8a95-4f2dadb33b97.png} | Bin .../31705630-56fc-4717-aa82-3b3db883bc2e.png} | Bin .../3b9fbc7c-6833-4d26-99f8-8991977ecab8.png} | Bin .../419a54b5-a831-4448-ae3a-925a6a2d63d7.png} | Bin .../51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png} | Bin .../69ebfe16-4cc5-4952-8977-5c510fce44ad.png} | Bin .../7518daa5-bf1d-4080-aee9-fb9957368a76.png} | Bin .../7c2c4e2c-1c63-40a4-96de-8dd261a9afbb.png} | Bin .../81f77345-54c5-403d-bcac-7f47e44695c1.png} | Bin .../82937588-f8bb-4e02-9909-abbd6f25f0c8.png} | Bin .../846d3d7a-f4ce-4ce0-9d9d-72decd05b498.png} | Bin .../96fcb7e5-783c-4fbd-9f31-776290f79e14.png} | Bin .../a0330a31-3b35-4c70-99ee-3168b6fc3edc.png} | Bin .../a3328f14-825b-463a-bd47-5ab454815f2d.png} | Bin .../ad6ede62-3ff7-4d4a-8942-0f64740718b9.png} | Bin .../ae0bbb1b-460a-4348-a21f-d56dc3b5942e.png} | Bin .../aff4abf7-9702-4bb5-8318-bd0665453dc4.png} | Bin .../b20e7617-27aa-42d0-b20e-7b59e19d948a.png} | Bin .../b3f879ca-b3f8-4931-99d9-6368d1bb082d.png} | Bin .../bf24468a-71df-461e-b733-02d2b326d01c.png} | Bin .../cb790ae3-7320-49c4-aa40-0b8ddb500698.png} | Bin .../d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png | Bin 0 -> 503 bytes .../e791ba50-55e5-4c7b-8d47-de1c7cc1658a.png | Bin 0 -> 364 bytes .../ebcf8ece-d170-46f5-a07e-65d5e93d80da.png} | Bin .../f07a1190-33bf-4050-819f-561b9725dcf3.png} | Bin .../f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a.png} | Bin .../fae1e21c-8265-4c14-8d90-cfe248fa2263.png} | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 418 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 289 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 289 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 364 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 437 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 268 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 503 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 286 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 423 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 503 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 420 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 423 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 308 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 408 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 420 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 268 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 420 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 408 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 308 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 364 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 410 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 503 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 420 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 423 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 406 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 410 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 406 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 503 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 503 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 364 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 286 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 418 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 423 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 437 bytes sprites/spr_block_shape/spr_block_shape.yy | 796 ++++++++++++ views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy | 3 + 229 files changed, 2428 insertions(+), 1069 deletions(-) delete mode 100644 sprites/spr_block/47c58330-743c-4c01-916c-9b5ee39be3ea.png delete mode 100644 sprites/spr_block/703020fd-b570-4333-bcc3-cbb3a719f1ea.png rename sprites/spr_block/{2533757b-b298-47c2-ba4b-46063a63081d.png => 7d0d3b41-bd33-49d7-ad5b-bb8eb6ea85a2.png} (100%) delete mode 100644 sprites/spr_block/layers/11708232-91ca-4da0-9d83-25e0e8f65a3d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/2fc3ad72-ee43-419d-9a96-01302c6177d0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/47c58330-743c-4c01-916c-9b5ee39be3ea/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/489ad059-cafa-4c66-8c20-0a50ac6c418b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/613634c1-9d3b-427b-98a9-e74f0d4a1754/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/703020fd-b570-4333-bcc3-cbb3a719f1ea/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/spr_block/{91b8a957-d79c-4574-9f2e-18df23c7a6b5.png => layers/7d0d3b41-bd33-49d7-ad5b-bb8eb6ea85a2/82c76b05-fe07-44c3-ad9a-59c31e2cec58.png} (100%) delete mode 100644 sprites/spr_block/layers/898fd156-ac32-4fca-af44-026db47f97ad/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/8ffad02c-0051-4752-9808-6a2a98aa9fe6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/91831ea0-99e4-413b-b23c-ca1c6eb82d53/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/a1d4ae60-7ee8-4e26-8b30-8287ff7f4932/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/a367257e-c8f3-4c76-a497-b310cb5220cb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/a4ac5e69-2dfa-4ec4-82ae-d3bc357f2cf0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/af2a9be9-a16f-441a-aa8d-73459207626b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/d7bb8497-4635-46a9-894b-aea0bd47cf78/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block/layers/ee1740c0-ad45-4a69-bd1a-a2a28e34aa7c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/09af78ec-8c67-4fa0-ba8c-e70886ed7634.png (100%) create mode 100644 sprites/spr_block_color/28c2b399-0172-42ba-b68d-a6fd7b0c7e23.png create mode 100644 sprites/spr_block_color/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646.png rename sprites/{spr_block => spr_block_color}/3275a111-edb5-4d3f-8c90-f07aca3d235c.png (100%) rename sprites/{spr_block => spr_block_color}/355dc121-1f32-4a3d-b6fd-531e882c93cf.png (100%) create mode 100644 sprites/spr_block_color/39b2852e-5bbf-46d2-928f-f7124dc5a782.png rename sprites/{spr_block => spr_block_color}/3c1d183e-8e77-4982-9c9a-d9edfcf89241.png (100%) create mode 100644 sprites/spr_block_color/406bd3f2-c153-40bd-9cb3-301370bbece3.png create mode 100644 sprites/spr_block_color/4d49f0c2-f9ae-4a23-ae65-746ef0100cb3.png rename sprites/{spr_block => spr_block_color}/588290da-b5bf-49b6-91d7-324b61018608.png (100%) rename sprites/{spr_block => spr_block_color}/5bba66a2-8b1f-4d0a-beae-3e1522b21a21.png (100%) rename sprites/{spr_block => spr_block_color}/5ea6b4ca-80a3-4e1a-81f7-dbf2250c711d.png (100%) create mode 100644 sprites/spr_block_color/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82.png rename sprites/{spr_block => spr_block_color}/6424d1d9-aa72-431f-94d0-69810a5579e0.png (100%) create mode 100644 sprites/spr_block_color/6672cac7-d619-4624-9693-64fa62a1fd5a.png rename sprites/{spr_block => spr_block_color}/7cab3939-805e-4543-b45a-46e36045761c.png (100%) rename sprites/{spr_block => spr_block_color}/81350207-a9e8-41a7-8a4e-87cf29a7203f.png (100%) rename sprites/{spr_block => spr_block_color}/82aeebe0-8995-4711-9ab7-a6e4a34db80a.png (100%) rename sprites/{spr_block => spr_block_color}/83636ef1-c905-4115-b8f1-c06a5242e29b.png (100%) create mode 100644 sprites/spr_block_color/a4b7e245-a218-42c9-880d-00be2fff2c9c.png create mode 100644 sprites/spr_block_color/a6acf370-1f09-42f8-a02a-710c2abe0173.png create mode 100644 sprites/spr_block_color/b190b1e0-8066-4abd-8c48-dd40876d3559.png create mode 100644 sprites/spr_block_color/b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png rename sprites/{spr_block => spr_block_color}/c5152919-a8f5-46c0-b320-09e6b3f9535c.png (100%) create mode 100644 sprites/spr_block_color/ca062147-d4cf-4e89-81ee-e5ebe1d4b165.png rename sprites/{spr_block => spr_block_color}/cc4ed8a2-59d3-4488-bd3d-645806634603.png (100%) create mode 100644 sprites/spr_block_color/cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png create mode 100644 sprites/spr_block_color/cce58db7-3b8b-4712-b6d4-1791b1a20e88.png create mode 100644 sprites/spr_block_color/d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png rename sprites/{spr_block => spr_block_color}/e4256469-5548-4970-81d4-fe78a957f8bf.png (100%) create mode 100644 sprites/spr_block_color/eca1b1bd-673a-46c5-902c-8bd4c795cf31.png create mode 100644 sprites/spr_block_color/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c.png create mode 100644 sprites/spr_block_color/ff1daf32-8dc0-408a-9d33-e4d74c14df8e.png rename sprites/{spr_block => spr_block_color}/ff952cd6-2f4c-4942-8a29-7f895aa5c00d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/09af78ec-8c67-4fa0-ba8c-e70886ed7634/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/28c2b399-0172-42ba-b68d-a6fd7b0c7e23/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/3275a111-edb5-4d3f-8c90-f07aca3d235c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/355dc121-1f32-4a3d-b6fd-531e882c93cf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/39b2852e-5bbf-46d2-928f-f7124dc5a782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/3c1d183e-8e77-4982-9c9a-d9edfcf89241/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/406bd3f2-c153-40bd-9cb3-301370bbece3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/4d49f0c2-f9ae-4a23-ae65-746ef0100cb3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/588290da-b5bf-49b6-91d7-324b61018608/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/5bba66a2-8b1f-4d0a-beae-3e1522b21a21/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/5ea6b4ca-80a3-4e1a-81f7-dbf2250c711d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/6424d1d9-aa72-431f-94d0-69810a5579e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/6672cac7-d619-4624-9693-64fa62a1fd5a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/7cab3939-805e-4543-b45a-46e36045761c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/81350207-a9e8-41a7-8a4e-87cf29a7203f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/82aeebe0-8995-4711-9ab7-a6e4a34db80a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) rename sprites/{spr_block => spr_block_color}/layers/83636ef1-c905-4115-b8f1-c06a5242e29b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/a4b7e245-a218-42c9-880d-00be2fff2c9c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/a6acf370-1f09-42f8-a02a-710c2abe0173/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/b190b1e0-8066-4abd-8c48-dd40876d3559/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/b8c3d60c-33f4-450b-a94f-1cd51e0785d9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/c5152919-a8f5-46c0-b320-09e6b3f9535c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/ca062147-d4cf-4e89-81ee-e5ebe1d4b165/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block/layers/9926628a-2431-45e1-9378-f4e5b5e34eb9 => spr_block_color/layers/cc4ed8a2-59d3-4488-bd3d-645806634603}/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/cc5e53a2-ec1a-457d-acd8-f69a2edcd397/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/cce58db7-3b8b-4712-b6d4-1791b1a20e88/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/d53f5a5e-1012-48ab-a444-ef8b434cc7e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/e4256469-5548-4970-81d4-fe78a957f8bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/layers/eca1b1bd-673a-46c5-902c-8bd4c795cf31/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/ff1daf32-8dc0-408a-9d33-e4d74c14df8e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename sprites/{spr_block => spr_block_color}/layers/ff952cd6-2f4c-4942-8a29-7f895aa5c00d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png (100%) create mode 100644 sprites/spr_block_color/spr_block_color.yy rename sprites/{spr_block/2fc3ad72-ee43-419d-9a96-01302c6177d0.png => spr_block_color_shape/137e1fee-e8f6-499f-8e08-ced3ac0e44ed.png} (100%) create mode 100644 sprites/spr_block_color_shape/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png rename sprites/{spr_block/898fd156-ac32-4fca-af44-026db47f97ad.png => spr_block_color_shape/1e53ebf2-29bf-41dc-b447-5e8562f97a8b.png} (100%) create mode 100644 sprites/spr_block_color_shape/21c46e6e-dd05-45ae-ace3-961a2c7ec4b4.png create mode 100644 sprites/spr_block_color_shape/378def89-d34d-4405-a5f5-2d16dcb9c410.png create mode 100644 sprites/spr_block_color_shape/38ce098a-4d09-4dd3-a3db-068345b0f946.png rename sprites/{spr_block/91831ea0-99e4-413b-b23c-ca1c6eb82d53.png => spr_block_color_shape/3bf63775-9706-483c-8c28-f52ba15484c9.png} (100%) rename sprites/{spr_block/8ffad02c-0051-4752-9808-6a2a98aa9fe6.png => spr_block_color_shape/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b.png} (100%) rename sprites/{spr_block/af2a9be9-a16f-441a-aa8d-73459207626b.png => spr_block_color_shape/3c40c312-4fe7-48ce-af63-68ea74b251df.png} (100%) rename sprites/{spr_block/a367257e-c8f3-4c76-a497-b310cb5220cb.png => spr_block_color_shape/46825d5d-002e-43e8-a62b-198caac29b0e.png} (100%) rename sprites/{spr_block/ee1740c0-ad45-4a69-bd1a-a2a28e34aa7c.png => spr_block_color_shape/4c2de224-b6d3-4354-aef6-ac7e60089e89.png} (100%) rename sprites/{spr_block/11708232-91ca-4da0-9d83-25e0e8f65a3d.png => spr_block_color_shape/55ba8420-6cdf-4485-a29c-1794c2ac8d44.png} (100%) rename sprites/{spr_block/489ad059-cafa-4c66-8c20-0a50ac6c418b.png => spr_block_color_shape/570118b1-123c-474b-9147-9560ccc537f7.png} (100%) create mode 100644 sprites/spr_block_color_shape/728ef579-ae8b-4a23-b96f-a15dbeaf267f.png rename sprites/{spr_block/d7bb8497-4635-46a9-894b-aea0bd47cf78.png => spr_block_color_shape/778cb7be-b35a-431b-8b9c-85c7e8e65469.png} (100%) create mode 100644 sprites/spr_block_color_shape/8184b047-3992-4f30-9b53-ec835acf0e46.png create mode 100644 sprites/spr_block_color_shape/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png create mode 100644 sprites/spr_block_color_shape/8ef19192-7161-41e6-8877-65db720af07e.png create mode 100644 sprites/spr_block_color_shape/a42742d6-70a2-462d-bb6b-66bdfdc30a0d.png rename sprites/{spr_block/9926628a-2431-45e1-9378-f4e5b5e34eb9.png => spr_block_color_shape/a48d6d91-2e8d-4aff-a833-98d374d5e829.png} (100%) create mode 100644 sprites/spr_block_color_shape/aa20fb47-8580-4242-af3e-c1859f0accfe.png create mode 100644 sprites/spr_block_color_shape/adcd5e12-8fe9-4f12-b63c-69e6cb230a47.png create mode 100644 sprites/spr_block_color_shape/b72a8afd-72b9-4a76-8c2c-173286dacdc1.png create mode 100644 sprites/spr_block_color_shape/b952d932-78e5-4629-b113-8bee4d60d7ff.png rename sprites/{spr_block/613634c1-9d3b-427b-98a9-e74f0d4a1754.png => spr_block_color_shape/d1c859be-2b28-46ff-8289-fae7b22b7db4.png} (100%) rename sprites/{spr_block/a1d4ae60-7ee8-4e26-8b30-8287ff7f4932.png => spr_block_color_shape/d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png} (100%) create mode 100644 sprites/spr_block_color_shape/dd35adba-1568-4614-8b5d-3beb257ba943.png create mode 100644 sprites/spr_block_color_shape/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6.png create mode 100644 sprites/spr_block_color_shape/e3d6124f-a72f-4abd-bb7c-1734c08ca471.png create mode 100644 sprites/spr_block_color_shape/e99bb026-b4da-4b3f-ae51-3fe387b81757.png create mode 100644 sprites/spr_block_color_shape/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d.png create mode 100644 sprites/spr_block_color_shape/fac8bf2b-317a-4d97-87aa-a82b1e367b54.png rename sprites/{spr_block/a4ac5e69-2dfa-4ec4-82ae-d3bc357f2cf0.png => spr_block_color_shape/face835c-3101-4ac5-8d77-497d75e97c76.png} (100%) create mode 100644 sprites/spr_block_color_shape/ffc96e9c-fbff-47c0-bfd2-ae47361135e5.png create mode 100644 sprites/spr_block_color_shape/layers/137e1fee-e8f6-499f-8e08-ced3ac0e44ed/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/1e53ebf2-29bf-41dc-b447-5e8562f97a8b/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/21c46e6e-dd05-45ae-ace3-961a2c7ec4b4/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/378def89-d34d-4405-a5f5-2d16dcb9c410/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/38ce098a-4d09-4dd3-a3db-068345b0f946/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/3bf63775-9706-483c-8c28-f52ba15484c9/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/3c40c312-4fe7-48ce-af63-68ea74b251df/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/46825d5d-002e-43e8-a62b-198caac29b0e/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/4c2de224-b6d3-4354-aef6-ac7e60089e89/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/55ba8420-6cdf-4485-a29c-1794c2ac8d44/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/570118b1-123c-474b-9147-9560ccc537f7/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/728ef579-ae8b-4a23-b96f-a15dbeaf267f/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/778cb7be-b35a-431b-8b9c-85c7e8e65469/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/8184b047-3992-4f30-9b53-ec835acf0e46/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/8ef19192-7161-41e6-8877-65db720af07e/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/a42742d6-70a2-462d-bb6b-66bdfdc30a0d/993fc71a-1863-4c01-93cb-615fa49362bc.png rename sprites/{spr_block/layers/cc4ed8a2-59d3-4488-bd3d-645806634603/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_color_shape/layers/a48d6d91-2e8d-4aff-a833-98d374d5e829/993fc71a-1863-4c01-93cb-615fa49362bc.png} (100%) create mode 100644 sprites/spr_block_color_shape/layers/aa20fb47-8580-4242-af3e-c1859f0accfe/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/adcd5e12-8fe9-4f12-b63c-69e6cb230a47/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/b72a8afd-72b9-4a76-8c2c-173286dacdc1/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/b952d932-78e5-4629-b113-8bee4d60d7ff/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/d1c859be-2b28-46ff-8289-fae7b22b7db4/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/d7b3baf5-9f31-416b-ac0f-de9bca90d60e/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/dd35adba-1568-4614-8b5d-3beb257ba943/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e3d6124f-a72f-4abd-bb7c-1734c08ca471/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e99bb026-b4da-4b3f-ae51-3fe387b81757/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/fac8bf2b-317a-4d97-87aa-a82b1e367b54/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/face835c-3101-4ac5-8d77-497d75e97c76/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/ffc96e9c-fbff-47c0-bfd2-ae47361135e5/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/spr_block_color_shape.yy rename sprites/{spr_block/ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc.png => spr_block_shape/0489e482-a8bc-4db7-a76d-bfe130d123a3.png} (100%) rename sprites/{spr_block/742bf7ac-d484-4564-877e-a1b6753db6be.png => spr_block_shape/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png} (100%) rename sprites/{spr_block/layers/742bf7ac-d484-4564-877e-a1b6753db6be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png} (100%) rename sprites/{spr_block/layers/2533757b-b298-47c2-ba4b-46063a63081d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/1191deec-4fa1-4663-af79-00b6177fd83e.png} (100%) rename sprites/{spr_block/5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png => spr_block_shape/1a3812af-5599-4a6f-aff6-6ee7d775a93d.png} (100%) rename sprites/{spr_block/010be783-1cec-42e1-a60c-0fabfa129043.png => spr_block_shape/1c015f46-bb21-4d72-933a-fc000856c139.png} (100%) rename sprites/{spr_block/21251641-be86-4820-8cd5-b9b0dc9df135.png => spr_block_shape/24d9d25c-8f41-4e40-91e0-fa38ee9bb241.png} (100%) rename sprites/{spr_block/56ae952c-067a-45ca-9a10-28270b90b5a7.png => spr_block_shape/2a66ba51-6191-4628-8a95-4f2dadb33b97.png} (100%) rename sprites/{spr_block/fd392c9e-705c-41c8-820e-b21aaea252a5.png => spr_block_shape/31705630-56fc-4717-aa82-3b3db883bc2e.png} (100%) rename sprites/{spr_block/2b9ca9fc-5c11-4279-9801-bc201fa585bf.png => spr_block_shape/3b9fbc7c-6833-4d26-99f8-8991977ecab8.png} (100%) rename sprites/{spr_block/a177c980-f438-489f-86ea-4e301ce86a0e.png => spr_block_shape/419a54b5-a831-4448-ae3a-925a6a2d63d7.png} (100%) rename sprites/{spr_block/ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png => spr_block_shape/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png} (100%) rename sprites/{spr_block/df7bf26d-12c0-4bc9-8428-5a06063a4f04.png => spr_block_shape/69ebfe16-4cc5-4952-8977-5c510fce44ad.png} (100%) rename sprites/{spr_block/200e2d06-de49-422f-b350-9dd356027870.png => spr_block_shape/7518daa5-bf1d-4080-aee9-fb9957368a76.png} (100%) rename sprites/{spr_block/d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png => spr_block_shape/7c2c4e2c-1c63-40a4-96de-8dd261a9afbb.png} (100%) rename sprites/{spr_block/layers/010be783-1cec-42e1-a60c-0fabfa129043/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/81f77345-54c5-403d-bcac-7f47e44695c1.png} (100%) rename sprites/{spr_block/layers/a177c980-f438-489f-86ea-4e301ce86a0e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/82937588-f8bb-4e02-9909-abbd6f25f0c8.png} (100%) rename sprites/{spr_block/layers/200e2d06-de49-422f-b350-9dd356027870/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/846d3d7a-f4ce-4ce0-9d9d-72decd05b498.png} (100%) rename sprites/{spr_block/layers/df7bf26d-12c0-4bc9-8428-5a06063a4f04/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/96fcb7e5-783c-4fbd-9f31-776290f79e14.png} (100%) rename sprites/{spr_block/layers/91b8a957-d79c-4574-9f2e-18df23c7a6b5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/a0330a31-3b35-4c70-99ee-3168b6fc3edc.png} (100%) rename sprites/{spr_block/44c9c181-2263-427a-af5d-7cc86b691e18.png => spr_block_shape/a3328f14-825b-463a-bd47-5ab454815f2d.png} (100%) rename sprites/{spr_block/layers/21251641-be86-4820-8cd5-b9b0dc9df135/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/ad6ede62-3ff7-4d4a-8942-0f64740718b9.png} (100%) rename sprites/{spr_block/layers/d34a3ca1-3d4b-4cb6-b64c-631c053546e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/ae0bbb1b-460a-4348-a21f-d56dc3b5942e.png} (100%) rename sprites/{spr_block/layers/ec2ccfb8-139b-4079-bf5f-8b746c1581bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/aff4abf7-9702-4bb5-8318-bd0665453dc4.png} (100%) rename sprites/{spr_block/39d59e03-2445-49f5-a401-e05313c57ff1.png => spr_block_shape/b20e7617-27aa-42d0-b20e-7b59e19d948a.png} (100%) rename sprites/{spr_block/layers/44c9c181-2263-427a-af5d-7cc86b691e18/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/b3f879ca-b3f8-4931-99d9-6368d1bb082d.png} (100%) rename sprites/{spr_block/layers/39d59e03-2445-49f5-a401-e05313c57ff1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/bf24468a-71df-461e-b733-02d2b326d01c.png} (100%) rename sprites/{spr_block/layers/2b9ca9fc-5c11-4279-9801-bc201fa585bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/cb790ae3-7320-49c4-aa40-0b8ddb500698.png} (100%) create mode 100644 sprites/spr_block_shape/d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png create mode 100644 sprites/spr_block_shape/e791ba50-55e5-4c7b-8d47-de1c7cc1658a.png rename sprites/{spr_block/layers/56ae952c-067a-45ca-9a10-28270b90b5a7/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/ebcf8ece-d170-46f5-a07e-65d5e93d80da.png} (100%) rename sprites/{spr_block/layers/ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/f07a1190-33bf-4050-819f-561b9725dcf3.png} (100%) rename sprites/{spr_block/layers/fd392c9e-705c-41c8-820e-b21aaea252a5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a.png} (100%) rename sprites/{spr_block/layers/5b93e3ff-90b6-4dc6-8614-0c4b73004ded/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png => spr_block_shape/fae1e21c-8265-4c14-8d90-cfe248fa2263.png} (100%) create mode 100644 sprites/spr_block_shape/layers/0489e482-a8bc-4db7-a76d-bfe130d123a3/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/1191deec-4fa1-4663-af79-00b6177fd83e/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/1a3812af-5599-4a6f-aff6-6ee7d775a93d/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/1c015f46-bb21-4d72-933a-fc000856c139/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/24d9d25c-8f41-4e40-91e0-fa38ee9bb241/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/2a66ba51-6191-4628-8a95-4f2dadb33b97/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/31705630-56fc-4717-aa82-3b3db883bc2e/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/3b9fbc7c-6833-4d26-99f8-8991977ecab8/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/419a54b5-a831-4448-ae3a-925a6a2d63d7/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/69ebfe16-4cc5-4952-8977-5c510fce44ad/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/7518daa5-bf1d-4080-aee9-fb9957368a76/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/7c2c4e2c-1c63-40a4-96de-8dd261a9afbb/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/81f77345-54c5-403d-bcac-7f47e44695c1/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/82937588-f8bb-4e02-9909-abbd6f25f0c8/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/846d3d7a-f4ce-4ce0-9d9d-72decd05b498/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/96fcb7e5-783c-4fbd-9f31-776290f79e14/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/a0330a31-3b35-4c70-99ee-3168b6fc3edc/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/a3328f14-825b-463a-bd47-5ab454815f2d/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/ad6ede62-3ff7-4d4a-8942-0f64740718b9/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/ae0bbb1b-460a-4348-a21f-d56dc3b5942e/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/aff4abf7-9702-4bb5-8318-bd0665453dc4/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/b20e7617-27aa-42d0-b20e-7b59e19d948a/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/b3f879ca-b3f8-4931-99d9-6368d1bb082d/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/bf24468a-71df-461e-b733-02d2b326d01c/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/cb790ae3-7320-49c4-aa40-0b8ddb500698/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/d44c2077-1a8a-4a9b-8051-1b4bd83d6988/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/e791ba50-55e5-4c7b-8d47-de1c7cc1658a/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/ebcf8ece-d170-46f5-a07e-65d5e93d80da/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/f07a1190-33bf-4050-819f-561b9725dcf3/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/fae1e21c-8265-4c14-8d90-cfe248fa2263/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/spr_block_shape.yy diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index 75a30f582..1c634bda3 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -2490,7 +2490,7 @@ "Key": "91f6b839-aba4-422a-9992-a736e55fb77f", "Value": { "id": "dc3bb9e5-0340-483b-abd9-12a1b538269a", - "resourcePath": "sprites\\spr_block\\spr_block.yy", + "resourcePath": "sprites\\spr_block_color\\spr_block_color.yy", "resourceType": "GMSprite" } }, @@ -3190,6 +3190,14 @@ "resourceType": "GMScript" } }, + { + "Key": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "Value": { + "id": "30543ddf-507a-471b-b1e6-7dee415caf97", + "resourcePath": "sprites\\spr_block_shape\\spr_block_shape.yy", + "resourceType": "GMSprite" + } + }, { "Key": "bdc74c97-7914-4a89-a5e6-39de084bd475", "Value": { @@ -3566,6 +3574,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "d6ca26e6-4a91-4de7-b4d1-c7f1fe4ed031", + "Value": { + "id": "b1fed2a9-8af5-4406-90d2-bc75b578ad4f", + "resourcePath": "sprites\\spr_block\\spr_block.yy", + "resourceType": "GMSprite" + } + }, { "Key": "d6ee4472-3c3d-4cdc-8f2e-50d7b7d705d3", "Value": { @@ -3870,6 +3886,14 @@ "resourceType": "GMScript" } }, + { + "Key": "e75662af-0378-424e-9585-ecaa16921eab", + "Value": { + "id": "14985a69-5344-46c4-ab6c-378290939273", + "resourcePath": "sprites\\spr_block_color_shape\\spr_block_color_shape.yy", + "resourceType": "GMSprite" + } + }, { "Key": "e7ef2956-a38a-44fc-858f-fcc654140bb3", "Value": { diff --git a/sprites/spr_block/47c58330-743c-4c01-916c-9b5ee39be3ea.png b/sprites/spr_block/47c58330-743c-4c01-916c-9b5ee39be3ea.png deleted file mode 100644 index 39d7352b7aab413d8f36197ccffe5f532c6dd2d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmV-_0f7FAP)b;@5F7-uKq*L?Sc*tNMa2`Sctu{Ahft^D0TfAN2??4ADGf*~#`5j4_SrbOQ>IzY zd%ByQ-CHdq7m@cBVXgi`F_NYvwlQYdocG`_Q|gPI`z+a;z zz<2wJZ)by!%*wgt=XtMqs3#B$B>{FU+R&UcvL?Si&m#~EUJZo4^R6{f;B=cnER+Pu ztgoC~ePDs9*stsBNJoJj6S2SD2lQN#jsn(%(>CY-rw@>+RTGS?tv}s9Ks;kC*2-B^ zPAxwb=4(r*4^-xKnbA1C68H82?f<}DY&ughe~=NUYI)KdTe002ovPDHLkV1gktso?+s diff --git a/sprites/spr_block/703020fd-b570-4333-bcc3-cbb3a719f1ea.png b/sprites/spr_block/703020fd-b570-4333-bcc3-cbb3a719f1ea.png deleted file mode 100644 index 0cfcae33a5f92589f9d3fe61bebefc752e331106..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P);P&3 zq8)%9_b{J7{(xN_v1wuGga8bM{xiy0L%A>9zbaHI46`QUVfp_0kj4f z4#1V~3B@^1c{Fp;)572j0T_VQ_vmp7o0GjrWIEnD_{{R3007*qoM6N<$f_lBE5dZ)H diff --git a/sprites/spr_block/2533757b-b298-47c2-ba4b-46063a63081d.png b/sprites/spr_block/7d0d3b41-bd33-49d7-ad5b-bb8eb6ea85a2.png similarity index 100% rename from sprites/spr_block/2533757b-b298-47c2-ba4b-46063a63081d.png rename to sprites/spr_block/7d0d3b41-bd33-49d7-ad5b-bb8eb6ea85a2.png diff --git a/sprites/spr_block/layers/11708232-91ca-4da0-9d83-25e0e8f65a3d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/11708232-91ca-4da0-9d83-25e0e8f65a3d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 8bbeed7c650ce60a8925a3d38138e6cb540a4f20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmV;l0ZaagP)D<&SLd=Ab6T&qa8mqCE;zZdvN(Kr=656?mWB}>}@##RXcsc1wX ze$Eozu2rnt*F%c>G%h{A3M167DF6VkQk&#kU);qPx_wHkOl~5`BttJi|36c+c*4xJ za%^=P`08}AwNB+ssoLPk3(cBVnXJO9YNm1Uz&_7mOf-G`djKw|7ocV|GpXiMoX-3D zSO~zEH~{2@u9`2WVQYL}@U?FP7*!1bXu9OBZv7XcoAK1a_U0Z>sda5XJOJprEKzSRq0ESUhX>w>fnFz;CdI8`Tr zv@XEe@hv~-R@(2a0bHvO0P+Go^O??j8vrLV29VARUHkoD0IqZn0P+HJ-#Ngb>J31> ez{Q*b46P%~3*2kU%|xC60000JkN>G_CVkFt8eV12(Sf30Gwad14)wX6Yw;o0CX#_*&mkQ zblbfF^65_EwiEDu-)Nn33&8x|^4ozpoZ)*bj(my$TTpsH=LFzR_QvrRC<1Ij3V<@x znw!RX&C@g`cJD2~Yslxo*_!h?fL>Ds*n%<#IHqYL*1d{b@%PRFD1}3D@UNKnl)G~P z2*Z$=ck@y3?#FF&Zw{a~e>J}Zyr^e9JYtki2`B z9M?F{bFyI*&Fzkc*yhK`HXpZnND~+Y5c!%W+Wd{4+IUDw>Bd-(b=a3H5sm^p@*QQ$ zt|(RZKv!+d{nGj+jg(EOqn!gK{43xZIlz^u>&H1b*S`XM!ZoL^evF+7{2B!TyxSAq zwFNvfDd&b#wkdbpTAIJAugR`opaQz?izqN;#{_spN;k zcx~a-0d%M6(a^mDpVk5H-_u3eaJpiAa3!X!gTd{^9pR|*^T-VXzF-jGO09U5cJVn@qtC^MK9hx_zQlzKjF=TCodLJs-+@QA$9`UG&Zf(1n07*6O!H8&9XXa znl|zftfu)yMTF~pGw-`o=OtAjIe^GV%Ru=4xZZ_zyYId|82hmg=Tar?QGiAsZH~+i z7h`7QT_mh2uiD?651DN_E#V$0VO{~<$N{QESswS`Uh@jj54t(k<*~l$I`C_72k>rh zheX&wBU9yE#p670(tYoMDR2kSv3i-+%{d|~;^}#k1EwI=fbKi5S`+t^_#W(00G`#A zb5$Sc&IYe_n1~LT0(ZdmJ!Ze%2k2a3j{@ieUbaTg%I5rk`T(z9MNJ^Gvb?>00C4>d zvyu`SugYl=A7={l*Je#0z;uck4bv;|X&<2cWqW4Uo~al=s1jZvPB5rm)CffpPa~Hc jFa^m0szhC|_TTXn?{FK=HDq~#00000NkvXXu0mjf$U?5C diff --git a/sprites/spr_block/layers/613634c1-9d3b-427b-98a9-e74f0d4a1754/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/613634c1-9d3b-427b-98a9-e74f0d4a1754/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 5181ac6d6d8273053a8904cc6091723cbc5a4bbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ+nz3tAr*6yfBye(&un6q zSiS|z|B1&dd^)^eM&XK_#6Lxa6N(+7f8Ls3s`1+fw)4R1^;4c!cLD8UU?}>ND)CC% RR2=9{22WQ%mvv4FO#ntyZLt6V diff --git a/sprites/spr_block/layers/703020fd-b570-4333-bcc3-cbb3a719f1ea/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/703020fd-b570-4333-bcc3-cbb3a719f1ea/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 10bb2691e2ba3ef2b1c9e2c52d02fb3412f4697e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmV;S0bc%zP)Y5WUD5KREP)iCPE=l18vdBiLynXp>)SV_{*ZV3R_y36j!}NKOdx6E#fo&dglK z%|R}^uNjuN?9F>K`*D8x;P}VO0IiF&+$8h-EIytFaRN)lb&8AO8pV7Nu!$etE*ne! zp>fT|mBSNq*5rgc4oKxsHw}uV-5SN0R+Eh-Kj+W0F&r^DF*66YkLvq(=ciX{0-Ew@ zs2qrd6B@r!+oK34zP~;%`)(whaHj_Vt;SFmR;sD^LUo5?r+G_J_JlhQV4wHe_iTbx zrqx{Iv7Y9HI}TtMKp(s-xcmS@b|(Q)DSgGTXT(va_s*^0=A%@19A5% zJppB=o{{U0AlJVU9dZCz2n!SwPKcf`@mkH@eG%a#e2+S8f>bJNDen$Vxi_r2nt&~+ zJs<&xG+zE0jbN;DHGx?pP5`&l6hYnopL&*nE&Kv@?IMnqYMglh00009u&CgHGs8Kf0=KD^1(HtMFPvUzw<~Vx(_OV^g-*-9`k5A$ zt}80HpI>B|(7zN+~jXXG=gdn8YVF@UK_+(zTG^_e7@bH58vWrLo5$t4D>hMjYQDw`mZ)3n&n cFfy|;6m+-g@O#BG0zJ#%>FVdQ&MBb@0E-82^#A|> diff --git a/sprites/spr_block/layers/a1d4ae60-7ee8-4e26-8b30-8287ff7f4932/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/a1d4ae60-7ee8-4e26-8b30-8287ff7f4932/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 3769e37afc4bcc3e9cfc2ab36ac2cd52d055e7f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmV<80UiE{P)k4CExFd?6hTKY&!>33R-Zjwg@`3+ZeSf7=etA7|K0$h31G%mJnyUSagc-sLij%y@gg^GZryz4r*uIt*x z)9I9~>$>~C#tE|nR5=GFp+%4YR}KYkx0_p|a{P=qpU=rW&%66WPN*G#;#yD=F^B}D zo}<$1_39#@0V%JUiKqjip2wh>i5-DZ&ruogc`P5B39kc|p2rZHiIg%!SbCo4xhlUb zi#QW64jk!u4AM-bRDD%dUL}a5Gm&Lk@_0Pl8frfsfa2c*CGjLMO_Ph4%f-c`J;yvg zZyZM#%d&Lwg#cUtX5RokIa8QKoC6@ihvaC_Q8_w8i;KGe_ABh$zd+yjFV|9J0uh~{ zB&ylhdl|>i_@%07*qoM6N<$g27MIuK)l5 diff --git a/sprites/spr_block/layers/a367257e-c8f3-4c76-a497-b310cb5220cb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/a367257e-c8f3-4c76-a497-b310cb5220cb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 7376c99d8b793d7e06257f48c03ab32460149507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdAr*7pPTk1cV!-2SsmXld z;sK7H0}47P#6qrw^f2&--~fRuK&k2?VD<&&bMRR**>2@zv5!1fN6GO zt^JjL+~4OuyYt-1_SJ;-tNTwMV%So`^x<6l!Q;z57S75z_jmWNUHi^mwr-4gE@0mo zUu$Rmat?#a-r$w}F+3l(`7!LdT)B+3{Ibs1jd7u_3|mC@FuA;(yLj`A^Vhk7yfY17 z=Ki-9{vpo7@Ythw-+r}w+tTgq4l*`Oi@7c#QfW_Foot=&BI2ls5*Uys7d7KN@!#bG1ynom+ElLWYB?REk zAJ&;2@2;kHeBR__&g0Vhn8Xpyh znn!QDb^u)q0q{O$q}-WQb14qLH@i4L44@_NE|?6dlTgjUSt!o?fCr!@Zx8T}cWljr zd*b^n@Bp-g06+#c`fJUlKCp~kJS}nxpd|!=^EoO{+XwE~G~S;KfUsjR^8e}s{F3?^ zSY^4HyZYIu1+UJZR12N|eeR*u@#FZ*mXW`getueS?v$vFYg zlm}4niF%YW@w1yFGUrdfA?G4M*AfAwOf1Hu#`SQPv~^AZj4}8@RdxGcHCO_k2|P2x fI_SJLz^U~Ge}Ns2f@GP>00000NkvXXu0mjfBM-=Q diff --git a/sprites/spr_block/layers/af2a9be9-a16f-441a-aa8d-73459207626b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/af2a9be9-a16f-441a-aa8d-73459207626b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 90f2ca7570d4f88e7b7b0cc82d510c3d0c3f6290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmV<20VDp2P)-Ok->1KlrKsL#nhku@)4Bt0D*n_541=>`vbYy-8rBaJ>$AMM`hj60kSM>r3-Ngwm3OzR0Krj zFRQS=xDD}S>fF~h`o6{qy8~1?2O*(FkwBsx3iRu+M&r5rJaQQ5o-fEnk_5yaSe=*HD-VPnnId^!#kD z%YSafnMfUI>3I#pO!!Fs`AuF4qID*~k@wf1CDh(K0LA|bgv6cz4oP<%Vr$PakIzHQ zu0l)*zy-Yd*dT9C50f~~0g&JaM{Cb_N=I>|xV#IX6|irQfw#xxl1C;GM<*x=YtM6e zQe1Zu9?}Uxxkx~Cf`co=9_R8IfC&2T;9JoE6M@7DR`_53JN^b9w*!B} S>@-gR0000lkYXq;0Lcz8HWUTZ0{m=P<@X+VN?Qj|8<6Y(n9mO% zdk&^;tt3(SG`GdYn_O9FURb2GinVTu=kw zVzqz}fK}Hp{kq!1VEXZsFHk;ec7;0tW-&}53=oQQLh>;4U?KP6<1ZBX!IKNlo_`Id zVL=E3gyNi7d03SE`t=XH0|pAPz*?`cY=a&WxY7j7XT-{*`y6KPz=r^gp(l4oxT5F( zJ6s_F1L$!I%VxObarwNXgpmPgAHo43%PIE{=>Q`N2&D;_&tL#OByjm07{ZJoAHx8Q zP4_ea3wjv9=>S|I0V}f6!OK_Qz%;%%2LWWu@j8HB0PX-rMnq>8xyOti5>K9fCCXq} joWp_~-RBq%7$^V$w`b?~CefX#00000NkvXXu0mjf%bd1J diff --git a/sprites/spr_block/layers/ee1740c0-ad45-4a69-bd1a-a2a28e34aa7c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block/layers/ee1740c0-ad45-4a69-bd1a-a2a28e34aa7c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 107012db11f1248ab27153a9b30db738b739d9fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmV-D0mA-?P)^E7PF84KAvsN+2 zg+}2JbPGxG7=vbAWeJ)?c7Pq(rQkp125^=g06RaEZP++FfV1oX7qSf-e+|G{c7QEe z{tX}#x7+~Es;nLE?VJneUK_W32F9m7^Pr}wny=Y7y+6&2Z^cq?hyLz9V16Uj2j-uFTA1&Jd3OM3*#WxJ0M2>*U%P+Up{!5_LZtlGyC|N{o37$cH?Lok76ku%ikv1t|bm?#;&O`dDt$ z)twBL81qyU literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646.png b/sprites/spr_block_color/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646.png new file mode 100644 index 0000000000000000000000000000000000000000..349cae1f7a63816b9df48fa9c00bc8db8e73dfa2 GIT binary patch literal 374 zcmV-+0g3*JP)$L&E*_r0Ea2C$0_-`h zl}G|SL}ila5|8(7lFM@eTF9J&D7EZW&rz9+=W`(=Kns~3;1e&e=gyu;?}Cf~Em#3i zhI9L==h7U&&iHp1;5PjB9N_;e{MmuWEkzaP_1rxNXixaF1AGoZsnipwEHCfx8~~#8 z{WC%G%;l-XhxN*xPfweFa{%6il_E*tm0fH U5F#;pcK`qY07*qoM6N<$f>3a%YybcN literal 0 HcmV?d00001 diff --git a/sprites/spr_block/3275a111-edb5-4d3f-8c90-f07aca3d235c.png b/sprites/spr_block_color/3275a111-edb5-4d3f-8c90-f07aca3d235c.png similarity index 100% rename from sprites/spr_block/3275a111-edb5-4d3f-8c90-f07aca3d235c.png rename to sprites/spr_block_color/3275a111-edb5-4d3f-8c90-f07aca3d235c.png diff --git a/sprites/spr_block/355dc121-1f32-4a3d-b6fd-531e882c93cf.png b/sprites/spr_block_color/355dc121-1f32-4a3d-b6fd-531e882c93cf.png similarity index 100% rename from sprites/spr_block/355dc121-1f32-4a3d-b6fd-531e882c93cf.png rename to sprites/spr_block_color/355dc121-1f32-4a3d-b6fd-531e882c93cf.png diff --git a/sprites/spr_block_color/39b2852e-5bbf-46d2-928f-f7124dc5a782.png b/sprites/spr_block_color/39b2852e-5bbf-46d2-928f-f7124dc5a782.png new file mode 100644 index 0000000000000000000000000000000000000000..c4026e6e3288844fdfdb0d4154ea33fe1bc83be2 GIT binary patch literal 366 zcmV-!0g?WRP)Ut0lFad0H1hKYaYhqEszB0LLdOj zP@{Kiu9^ex%ooWO@d#O!8df@qcw? z5#R~tDL`!MIV!X9d=3}_Ji+V%KJi>VxAC|O3;~{?1V9-)>gu^P2liWv;oSwe4Zl4H z*t;U29pEna44SKggfy;-7GE)j=Gzh(&3!;Gz(GDY-N@wQ3^15R2Ku^H8!3AJWBcfE*&AL3k z7iYWY0!%@gf>bfLs+uFSDxQ8%5?~5a59rSMt383cKoVdITmY24tLCabusLs;weK## zZTRUuK;ISioB+S2u(62p|Jwt_%cZ<0kXc>c-aP;$`H5MnW~3+T^1;I|rp>lJfZBv! xM+j)T2PpqLJwO5FP5DXz-v$?et~4gV6z)Pb<3OwOmi~uNuM|VBf=D@N@Oz$qhZTRgu!0(E5RzQ2C#MgX7J c#|6Z~8=(@IYV;H$ivR!s07*qoM6N<$f=+mlEC2ui literal 0 HcmV?d00001 diff --git a/sprites/spr_block/6424d1d9-aa72-431f-94d0-69810a5579e0.png b/sprites/spr_block_color/6424d1d9-aa72-431f-94d0-69810a5579e0.png similarity index 100% rename from sprites/spr_block/6424d1d9-aa72-431f-94d0-69810a5579e0.png rename to sprites/spr_block_color/6424d1d9-aa72-431f-94d0-69810a5579e0.png diff --git a/sprites/spr_block_color/6672cac7-d619-4624-9693-64fa62a1fd5a.png b/sprites/spr_block_color/6672cac7-d619-4624-9693-64fa62a1fd5a.png new file mode 100644 index 0000000000000000000000000000000000000000..4a377d7dfa21c5cc293253242ef61b44da68ba90 GIT binary patch literal 331 zcmV-R0kr;!P)#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? literal 0 HcmV?d00001 diff --git a/sprites/spr_block/7cab3939-805e-4543-b45a-46e36045761c.png b/sprites/spr_block_color/7cab3939-805e-4543-b45a-46e36045761c.png similarity index 100% rename from sprites/spr_block/7cab3939-805e-4543-b45a-46e36045761c.png rename to sprites/spr_block_color/7cab3939-805e-4543-b45a-46e36045761c.png diff --git a/sprites/spr_block/81350207-a9e8-41a7-8a4e-87cf29a7203f.png b/sprites/spr_block_color/81350207-a9e8-41a7-8a4e-87cf29a7203f.png similarity index 100% rename from sprites/spr_block/81350207-a9e8-41a7-8a4e-87cf29a7203f.png rename to sprites/spr_block_color/81350207-a9e8-41a7-8a4e-87cf29a7203f.png diff --git a/sprites/spr_block/82aeebe0-8995-4711-9ab7-a6e4a34db80a.png b/sprites/spr_block_color/82aeebe0-8995-4711-9ab7-a6e4a34db80a.png similarity index 100% rename from sprites/spr_block/82aeebe0-8995-4711-9ab7-a6e4a34db80a.png rename to sprites/spr_block_color/82aeebe0-8995-4711-9ab7-a6e4a34db80a.png diff --git a/sprites/spr_block/83636ef1-c905-4115-b8f1-c06a5242e29b.png b/sprites/spr_block_color/83636ef1-c905-4115-b8f1-c06a5242e29b.png similarity index 100% rename from sprites/spr_block/83636ef1-c905-4115-b8f1-c06a5242e29b.png rename to sprites/spr_block_color/83636ef1-c905-4115-b8f1-c06a5242e29b.png diff --git a/sprites/spr_block_color/a4b7e245-a218-42c9-880d-00be2fff2c9c.png b/sprites/spr_block_color/a4b7e245-a218-42c9-880d-00be2fff2c9c.png new file mode 100644 index 0000000000000000000000000000000000000000..32c4c4c665f72dcac5225ed53d6b71f900c19fb9 GIT binary patch literal 324 zcmV-K0lWT*P)RLjhXw0{G4Qz9&15BUx*0;B#JzpQh=lUtR`M zHwSnoj`F;B%EFE^Gvq9w*are^8N00009U5cJT4mMU5iJr?og%}?afCncgZIVd?xhBjB_RNj&d%BwkMuyU?yPInN6(eyqnj zWg`)QbL#ZE%mThLnddSd?~B*rYXQ0-oPt9@V_wfuSr*UF0YQK+2tB}0JXO!Lc-#eo z09{A~Kp8wL>bYzVM5`r<=G_Ij4Zl4H`2PxXb^voAUeg?&se1lDbKu#%={~mNzuR~D-{}D!P+pYJ6i_x20q9C?0(9XH XQy=2+hCu<*00000NkvXXu0mjfU(lVb literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/b190b1e0-8066-4abd-8c48-dd40876d3559.png b/sprites/spr_block_color/b190b1e0-8066-4abd-8c48-dd40876d3559.png new file mode 100644 index 0000000000000000000000000000000000000000..7b4968a89416c48abb60aa67a5851ddf0cc9f56a GIT binary patch literal 341 zcmV-b0jmCqP)!JZ6CY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png b/sprites/spr_block_color/b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png new file mode 100644 index 0000000000000000000000000000000000000000..46c9ecb4cd7055e59952d7a8e5bb66adab12e2e6 GIT binary patch literal 363 zcmV-x0hIoUP)xUedMMeR}{@LDo)Ow(c$eVZY?(Z0!> zOyVtO^JmQ>Jewbv1nlEj#OQVt@scD`VyDrN)|96}KJu^*eP6^u5Xb^-Ar(L?pAJVN zE_YiI$GuQmQ=ZFTAEUQx_jZ7*d=mDhA7EXSr@iCO4gj2|sALr#jCgpSTR_!F1>l?x zg0_@EE8{%pc>Lc!zJ3;93(6@#%a^kYRX|ulX-!DUC zmLF#VmSv&1t}DfT-&tW%6fBp#1nNope?J&^$#a<2Xj~@cgiVr{M(PoMLwZvNO$djmQ6C&Zq*c z;GF`*qn@L)5HII|C%_8c9*`3+*7FdLyTB7*1t$Q?;L%mjwK*`)GsX1o0^Ejo&jI<{907*qoM6N<$f|Wm-HUIzs literal 0 HcmV?d00001 diff --git a/sprites/spr_block/cc4ed8a2-59d3-4488-bd3d-645806634603.png b/sprites/spr_block_color/cc4ed8a2-59d3-4488-bd3d-645806634603.png similarity index 100% rename from sprites/spr_block/cc4ed8a2-59d3-4488-bd3d-645806634603.png rename to sprites/spr_block_color/cc4ed8a2-59d3-4488-bd3d-645806634603.png diff --git a/sprites/spr_block_color/cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png b/sprites/spr_block_color/cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png new file mode 100644 index 0000000000000000000000000000000000000000..5b73f2c431d9e77de89c582b69e33018ed06b62c GIT binary patch literal 372 zcmV-)0gL{LP)UYh9F$YA14Af=X4{smus>fq8mvZbXz3mJO}cThdAgt$r^f1DnJTK0Iz%+bdz5Etcn@6=}p0F$SvWVw&6czE9MJ`_+j zlmML5&~r!vugv7RiO2VC&e!(>q@bMwte<+0%JO(V2Q&dv(0YJRJX_E6c-#e=04XQ| zPzI06dTyEn>l5yR4iz8;?Kb@O9N_PY`s{%A!g+dT>-qo8f$Zh-x+hSXEnnX`0PHSl zFKC{zp0MTpe!9ciX{+0t5Z;V>^qiVrw?+Bi=>ZNXFU#i&s2WND{;P=zkir8R9^V8< S3y;$!WWbuUU1 zbKbT8nsqdmW87q^-GIyap`aQOPvuSRho8ocVY@7c2p>VATMhc%eD>@ip_D&J92r`gU&4U31{3 zYb@Qr;jiZae^;b)1K$^po>)3(p*i=?0r@X;z`R@>H34U#e7bW0c*?OBteml$2<5k8 z++eybxi=wlvlFyWxf8@w`TwZ_4k(|?dj%{FBY^ko;sRpf19LCfmt@Q9R{#J207*qo IM6N<$g5vF+4*&oF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png b/sprites/spr_block_color/d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png new file mode 100644 index 0000000000000000000000000000000000000000..13d0fe58a2b8da181699288a95786e99496ba652 GIT binary patch literal 348 zcmV-i0i*tjP)X|WUWZHD1R`{t9$B%9s# zITA!7`Eg4?b-rtxKeR0>>!3=N}2r$Lm`^!VGYcuTtv={vR z_}&8Z8h(2Y;9e0?25`dx<^MMaaC0GGWTAY#bAUj%!KoSaL@2L}kGCzJ3^e;X)QH<| uyYj!&0|-*ym-h-78f_0STkBu~r0@cQf8N#US6Daz00006%FZ literal 0 HcmV?d00001 diff --git a/sprites/spr_block/e4256469-5548-4970-81d4-fe78a957f8bf.png b/sprites/spr_block_color/e4256469-5548-4970-81d4-fe78a957f8bf.png similarity index 100% rename from sprites/spr_block/e4256469-5548-4970-81d4-fe78a957f8bf.png rename to sprites/spr_block_color/e4256469-5548-4970-81d4-fe78a957f8bf.png diff --git a/sprites/spr_block_color/eca1b1bd-673a-46c5-902c-8bd4c795cf31.png b/sprites/spr_block_color/eca1b1bd-673a-46c5-902c-8bd4c795cf31.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e904b0ce8ee64b3c7830bab2ca7627dfe9bd8b GIT binary patch literal 311 zcmV-70m%M|P)L4;iT1ED|gzy8A?2;v8F5hP#G%Z{N_mo%*=t8-bxY}?tLWSh<%-NQ9R z*Ye|I0YTzTVx-J1t(j*aKhoMu>{&n~BmrFcLE=f`p4QB3`4?qvuLD};13fXUHwg5ib~FfJUpK*pfZvGoYS5%xH8RijmP_fdkaGyh!p2~9%k}92POgZC; z=c&qXB+_X!)B$+2qYUkKyOjT(J;3lE;WStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED0000L4#f2z>8*d==27<@+9^ODGUcikYiVIQPXdC(hnK-2J(}}*#5Z=(fnU_qG zEopHlMP!;kcLZ$dY~qeCCLZYKB#x-#tU1qteB@z0p`M9T>bnB8UfwQ?Y5orvZ6-btqefaEDES=Sym<>7f_0d2zyz&XY41bAhV z=MsJIbMmQDxY&6v7Q xg7mt5mH(YRzyam&@<9P@!wTT%wRHhncmVnlmOl^qIJp1-002ovPDHLkV1mQOpostg literal 0 HcmV?d00001 diff --git a/sprites/spr_block/ff952cd6-2f4c-4942-8a29-7f895aa5c00d.png b/sprites/spr_block_color/ff952cd6-2f4c-4942-8a29-7f895aa5c00d.png similarity index 100% rename from sprites/spr_block/ff952cd6-2f4c-4942-8a29-7f895aa5c00d.png rename to sprites/spr_block_color/ff952cd6-2f4c-4942-8a29-7f895aa5c00d.png diff --git a/sprites/spr_block/layers/09af78ec-8c67-4fa0-ba8c-e70886ed7634/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/09af78ec-8c67-4fa0-ba8c-e70886ed7634/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/09af78ec-8c67-4fa0-ba8c-e70886ed7634/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/09af78ec-8c67-4fa0-ba8c-e70886ed7634/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/layers/28c2b399-0172-42ba-b68d-a6fd7b0c7e23/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/28c2b399-0172-42ba-b68d-a6fd7b0c7e23/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..152e6d84281810e8127d0d09d9bd37b2c75efcc9 GIT binary patch literal 367 zcmV-#0g(QQP)*U%P+Up{!5_LZtlGyC|N{o37$cH?Lok76ku%ikv1t|bm?#;&O`dDt$ z)twBL81qyU literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..349cae1f7a63816b9df48fa9c00bc8db8e73dfa2 GIT binary patch literal 374 zcmV-+0g3*JP)$L&E*_r0Ea2C$0_-`h zl}G|SL}ila5|8(7lFM@eTF9J&D7EZW&rz9+=W`(=Kns~3;1e&e=gyu;?}Cf~Em#3i zhI9L==h7U&&iHp1;5PjB9N_;e{MmuWEkzaP_1rxNXixaF1AGoZsnipwEHCfx8~~#8 z{WC%G%;l-XhxN*xPfweFa{%6il_E*tm0fH U5F#;pcK`qY07*qoM6N<$f>3a%YybcN literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/3275a111-edb5-4d3f-8c90-f07aca3d235c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/3275a111-edb5-4d3f-8c90-f07aca3d235c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/3275a111-edb5-4d3f-8c90-f07aca3d235c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/3275a111-edb5-4d3f-8c90-f07aca3d235c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/355dc121-1f32-4a3d-b6fd-531e882c93cf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/355dc121-1f32-4a3d-b6fd-531e882c93cf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/355dc121-1f32-4a3d-b6fd-531e882c93cf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/355dc121-1f32-4a3d-b6fd-531e882c93cf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/layers/39b2852e-5bbf-46d2-928f-f7124dc5a782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/39b2852e-5bbf-46d2-928f-f7124dc5a782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..c4026e6e3288844fdfdb0d4154ea33fe1bc83be2 GIT binary patch literal 366 zcmV-!0g?WRP)Ut0lFad0H1hKYaYhqEszB0LLdOj zP@{Kiu9^ex%ooWO@d#O!8df@qcw? z5#R~tDL`!MIV!X9d=3}_Ji+V%KJi>VxAC|O3;~{?1V9-)>gu^P2liWv;oSwe4Zl4H z*t;U29pEna44SKggfy;-7GE)j=Gzh(&3!;Gz(GDY-N@wQ3^15R2Ku^H8!3AJWBcfE*&AL3k z7iYWY0!%@gf>bfLs+uFSDxQ8%5?~5a59rSMt383cKoVdITmY24tLCabusLs;weK## zZTRUuK;ISioB+S2u(62p|Jwt_%cZ<0kXc>c-aP;$`H5MnW~3+T^1;I|rp>lJfZBv! xM+j)T2PpqLJwO5FP5DXz-v$?et~4gV6z)Pb<3OwOmi~uNuM|VBf=D@N@Oz$qhZTRgu!0(E5RzQ2C#MgX7J c#|6Z~8=(@IYV;H$ivR!s07*qoM6N<$f=+mlEC2ui literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/6424d1d9-aa72-431f-94d0-69810a5579e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/6424d1d9-aa72-431f-94d0-69810a5579e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/6424d1d9-aa72-431f-94d0-69810a5579e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/6424d1d9-aa72-431f-94d0-69810a5579e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/layers/6672cac7-d619-4624-9693-64fa62a1fd5a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/6672cac7-d619-4624-9693-64fa62a1fd5a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..4a377d7dfa21c5cc293253242ef61b44da68ba90 GIT binary patch literal 331 zcmV-R0kr;!P)#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/7cab3939-805e-4543-b45a-46e36045761c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/7cab3939-805e-4543-b45a-46e36045761c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/7cab3939-805e-4543-b45a-46e36045761c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/7cab3939-805e-4543-b45a-46e36045761c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/81350207-a9e8-41a7-8a4e-87cf29a7203f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/81350207-a9e8-41a7-8a4e-87cf29a7203f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/81350207-a9e8-41a7-8a4e-87cf29a7203f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/81350207-a9e8-41a7-8a4e-87cf29a7203f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/82aeebe0-8995-4711-9ab7-a6e4a34db80a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/82aeebe0-8995-4711-9ab7-a6e4a34db80a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/82aeebe0-8995-4711-9ab7-a6e4a34db80a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/82aeebe0-8995-4711-9ab7-a6e4a34db80a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/83636ef1-c905-4115-b8f1-c06a5242e29b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/83636ef1-c905-4115-b8f1-c06a5242e29b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/83636ef1-c905-4115-b8f1-c06a5242e29b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/83636ef1-c905-4115-b8f1-c06a5242e29b/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/layers/a4b7e245-a218-42c9-880d-00be2fff2c9c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/a4b7e245-a218-42c9-880d-00be2fff2c9c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..32c4c4c665f72dcac5225ed53d6b71f900c19fb9 GIT binary patch literal 324 zcmV-K0lWT*P)RLjhXw0{G4Qz9&15BUx*0;B#JzpQh=lUtR`M zHwSnoj`F;B%EFE^Gvq9w*are^8N00009U5cJT4mMU5iJr?og%}?afCncgZIVd?xhBjB_RNj&d%BwkMuyU?yPInN6(eyqnj zWg`)QbL#ZE%mThLnddSd?~B*rYXQ0-oPt9@V_wfuSr*UF0YQK+2tB}0JXO!Lc-#eo z09{A~Kp8wL>bYzVM5`r<=G_Ij4Zl4H`2PxXb^voAUeg?&se1lDbKu#%={~mNzuR~D-{}D!P+pYJ6i_x20q9C?0(9XH XQy=2+hCu<*00000NkvXXu0mjfU(lVb literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/b190b1e0-8066-4abd-8c48-dd40876d3559/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/b190b1e0-8066-4abd-8c48-dd40876d3559/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..7b4968a89416c48abb60aa67a5851ddf0cc9f56a GIT binary patch literal 341 zcmV-b0jmCqP)!JZ6CY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/b8c3d60c-33f4-450b-a94f-1cd51e0785d9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/b8c3d60c-33f4-450b-a94f-1cd51e0785d9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..46c9ecb4cd7055e59952d7a8e5bb66adab12e2e6 GIT binary patch literal 363 zcmV-x0hIoUP)xUedMMeR}{@LDo)Ow(c$eVZY?(Z0!> zOyVtO^JmQ>Jewbv1nlEj#OQVt@scD`VyDrN)|96}KJu^*eP6^u5Xb^-Ar(L?pAJVN zE_YiI$GuQmQ=ZFTAEUQx_jZ7*d=mDhA7EXSr@iCO4gj2|sALr#jCgpSTR_!F1>l?x zg0_@EE8{%pc>Lc!zJ3;93(6@#%a^kYRX|ulX-!DUC zmLF#VmSv&1t}DfT-&tW%6fBp#1nNope?J&^$#a<2Xj~@cgiVr{M(PoMLwZvNO$djmQ6C&Zq*c z;GF`*qn@L)5HII|C%_8c9*`3+*7FdLyTB7*1t$Q?;L%mjwK*`)GsX1o0^Ejo&jI<{907*qoM6N<$f|Wm-HUIzs literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/9926628a-2431-45e1-9378-f4e5b5e34eb9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/cc4ed8a2-59d3-4488-bd3d-645806634603/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/9926628a-2431-45e1-9378-f4e5b5e34eb9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/cc4ed8a2-59d3-4488-bd3d-645806634603/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/layers/cc5e53a2-ec1a-457d-acd8-f69a2edcd397/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/cc5e53a2-ec1a-457d-acd8-f69a2edcd397/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..5b73f2c431d9e77de89c582b69e33018ed06b62c GIT binary patch literal 372 zcmV-)0gL{LP)UYh9F$YA14Af=X4{smus>fq8mvZbXz3mJO}cThdAgt$r^f1DnJTK0Iz%+bdz5Etcn@6=}p0F$SvWVw&6czE9MJ`_+j zlmML5&~r!vugv7RiO2VC&e!(>q@bMwte<+0%JO(V2Q&dv(0YJRJX_E6c-#e=04XQ| zPzI06dTyEn>l5yR4iz8;?Kb@O9N_PY`s{%A!g+dT>-qo8f$Zh-x+hSXEnnX`0PHSl zFKC{zp0MTpe!9ciX{+0t5Z;V>^qiVrw?+Bi=>ZNXFU#i&s2WND{;P=zkir8R9^V8< S3y;$!WWbuUU1 zbKbT8nsqdmW87q^-GIyap`aQOPvuSRho8ocVY@7c2p>VATMhc%eD>@ip_D&J92r`gU&4U31{3 zYb@Qr;jiZae^;b)1K$^po>)3(p*i=?0r@X;z`R@>H34U#e7bW0c*?OBteml$2<5k8 z++eybxi=wlvlFyWxf8@w`TwZ_4k(|?dj%{FBY^ko;sRpf19LCfmt@Q9R{#J207*qo IM6N<$g5vF+4*&oF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/d53f5a5e-1012-48ab-a444-ef8b434cc7e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/d53f5a5e-1012-48ab-a444-ef8b434cc7e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..13d0fe58a2b8da181699288a95786e99496ba652 GIT binary patch literal 348 zcmV-i0i*tjP)X|WUWZHD1R`{t9$B%9s# zITA!7`Eg4?b-rtxKeR0>>!3=N}2r$Lm`^!VGYcuTtv={vR z_}&8Z8h(2Y;9e0?25`dx<^MMaaC0GGWTAY#bAUj%!KoSaL@2L}kGCzJ3^e;X)QH<| uyYj!&0|-*ym-h-78f_0STkBu~r0@cQf8N#US6Daz00006%FZ literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/e4256469-5548-4970-81d4-fe78a957f8bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/e4256469-5548-4970-81d4-fe78a957f8bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/e4256469-5548-4970-81d4-fe78a957f8bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/e4256469-5548-4970-81d4-fe78a957f8bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/layers/eca1b1bd-673a-46c5-902c-8bd4c795cf31/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/eca1b1bd-673a-46c5-902c-8bd4c795cf31/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e904b0ce8ee64b3c7830bab2ca7627dfe9bd8b GIT binary patch literal 311 zcmV-70m%M|P)L4;iT1ED|gzy8A?2;v8F5hP#G%Z{N_mo%*=t8-bxY}?tLWSh<%-NQ9R z*Ye|I0YTzTVx-J1t(j*aKhoMu>{&n~BmrFcLE=f`p4QB3`4?qvuLD};13fXUHwg5ib~FfJUpK*pfZvGoYS5%xH8RijmP_fdkaGyh!p2~9%k}92POgZC; z=c&qXB+_X!)B$+2qYUkKyOjT(J;3lE;WStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED0000L4#f2z>8*d==27<@+9^ODGUcikYiVIQPXdC(hnK-2J(}}*#5Z=(fnU_qG zEopHlMP!;kcLZ$dY~qeCCLZYKB#x-#tU1qteB@z0p`M9T>bnB8UfwQ?Y5orvZ6-btqefaEDES=Sym<>7f_0d2zyz&XY41bAhV z=MsJIbMmQDxY&6v7Q xg7mt5mH(YRzyam&@<9P@!wTT%wRHhncmVnlmOl^qIJp1-002ovPDHLkV1mQOpostg literal 0 HcmV?d00001 diff --git a/sprites/spr_block/layers/ff952cd6-2f4c-4942-8a29-7f895aa5c00d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/ff952cd6-2f4c-4942-8a29-7f895aa5c00d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/ff952cd6-2f4c-4942-8a29-7f895aa5c00d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_color/layers/ff952cd6-2f4c-4942-8a29-7f895aa5c00d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block_color/spr_block_color.yy b/sprites/spr_block_color/spr_block_color.yy new file mode 100644 index 000000000..d29a4f65a --- /dev/null +++ b/sprites/spr_block_color/spr_block_color.yy @@ -0,0 +1,796 @@ +{ + "id": "91f6b839-aba4-422a-9992-a736e55fb77f", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_block_color", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 31, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "81350207-a9e8-41a7-8a4e-87cf29a7203f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "2d0f14f5-b079-43d1-b475-9798d83355d4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "81350207-a9e8-41a7-8a4e-87cf29a7203f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "67d97156-9de8-430d-9941-01aabd59f0f3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "81350207-a9e8-41a7-8a4e-87cf29a7203f", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "ff952cd6-2f4c-4942-8a29-7f895aa5c00d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "78e0399c-5560-4364-94cb-7bc5fafd06eb", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ff952cd6-2f4c-4942-8a29-7f895aa5c00d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "b5bc5055-310a-4237-9910-018d72cda3c4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ff952cd6-2f4c-4942-8a29-7f895aa5c00d", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "09af78ec-8c67-4fa0-ba8c-e70886ed7634", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "bc1197ff-8e7d-41cf-9c02-d56f2f3f0428", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "09af78ec-8c67-4fa0-ba8c-e70886ed7634", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "82170986-e14a-4c35-b0db-13c09dcd7f13", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "09af78ec-8c67-4fa0-ba8c-e70886ed7634", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "83636ef1-c905-4115-b8f1-c06a5242e29b", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "9d4ae717-ae09-4620-b37d-0f6ab3389564", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "83636ef1-c905-4115-b8f1-c06a5242e29b", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "35e81b76-b466-4bc9-8b46-8266847d1269", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "83636ef1-c905-4115-b8f1-c06a5242e29b", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "7cab3939-805e-4543-b45a-46e36045761c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "d7aadef0-26db-4b22-b51e-eebb82c5f033", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7cab3939-805e-4543-b45a-46e36045761c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e6d061bd-50ae-4b5e-9e49-1e8c2090cbc4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7cab3939-805e-4543-b45a-46e36045761c", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "5bba66a2-8b1f-4d0a-beae-3e1522b21a21", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "be453b0a-4d98-4ea1-874f-a625d764c3b2", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5bba66a2-8b1f-4d0a-beae-3e1522b21a21", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "cd23e66d-746d-4f69-8ceb-d2f0b2472f54", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5bba66a2-8b1f-4d0a-beae-3e1522b21a21", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "3c1d183e-8e77-4982-9c9a-d9edfcf89241", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "31a01cda-a42b-4101-a3f3-ee534d9a4367", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3c1d183e-8e77-4982-9c9a-d9edfcf89241", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "28e88b8c-a881-4d86-8c52-b9984531b3e8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3c1d183e-8e77-4982-9c9a-d9edfcf89241", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "cc4ed8a2-59d3-4488-bd3d-645806634603", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "0726e4b9-2c63-40fe-bb6b-c22a5d31ca81", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cc4ed8a2-59d3-4488-bd3d-645806634603", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "03b21ce3-5186-4382-a84e-5b898b68932d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cc4ed8a2-59d3-4488-bd3d-645806634603", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "6424d1d9-aa72-431f-94d0-69810a5579e0", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "a433172a-e37e-48d9-9093-fc2f1a49ea66", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "6424d1d9-aa72-431f-94d0-69810a5579e0", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ac36b7b9-c25b-487c-8d28-4ec780affded", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "6424d1d9-aa72-431f-94d0-69810a5579e0", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e4256469-5548-4970-81d4-fe78a957f8bf", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "1a0c0358-193e-466c-9865-5a52ebf18b5f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e4256469-5548-4970-81d4-fe78a957f8bf", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "25862b01-0986-4ae3-a16b-788f37d61a3f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e4256469-5548-4970-81d4-fe78a957f8bf", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "c5152919-a8f5-46c0-b320-09e6b3f9535c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "82cbc2e5-0a48-4284-aac2-c37c84d3a541", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c5152919-a8f5-46c0-b320-09e6b3f9535c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "cbdb0a94-f90e-4feb-9822-85f337223042", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c5152919-a8f5-46c0-b320-09e6b3f9535c", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "5ea6b4ca-80a3-4e1a-81f7-dbf2250c711d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "12821f1a-a3f3-44e5-8216-58df1b7aa387", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5ea6b4ca-80a3-4e1a-81f7-dbf2250c711d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d54390e3-5fb6-42ef-aa9d-9124a015c87d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5ea6b4ca-80a3-4e1a-81f7-dbf2250c711d", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "3275a111-edb5-4d3f-8c90-f07aca3d235c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "10a4045a-d032-43d8-a8f9-0b4dfcabd7ad", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3275a111-edb5-4d3f-8c90-f07aca3d235c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "730efbe7-38da-4de7-82a3-cc400a9cd6a5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3275a111-edb5-4d3f-8c90-f07aca3d235c", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "355dc121-1f32-4a3d-b6fd-531e882c93cf", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "6d73a150-2ea7-4ab7-b2ed-f9d90c24dc2b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "355dc121-1f32-4a3d-b6fd-531e882c93cf", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1e77f4b5-cc1d-45da-89d2-e11c5f0e43af", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "355dc121-1f32-4a3d-b6fd-531e882c93cf", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "82aeebe0-8995-4711-9ab7-a6e4a34db80a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "0e2a68d2-d1fe-4ab7-bce6-d350271cb5cb", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "82aeebe0-8995-4711-9ab7-a6e4a34db80a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "96aa8738-44a4-426e-823d-343bc68b6197", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "82aeebe0-8995-4711-9ab7-a6e4a34db80a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "588290da-b5bf-49b6-91d7-324b61018608", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "a28df933-ea6e-4c76-be8b-c2a5dab3c17c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "588290da-b5bf-49b6-91d7-324b61018608", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d1717e14-501b-4651-a9ff-27f962502119", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "588290da-b5bf-49b6-91d7-324b61018608", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "b190b1e0-8066-4abd-8c48-dd40876d3559", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "5b95eb9d-5de7-4763-99f2-ae2e3fe8e3d2", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b190b1e0-8066-4abd-8c48-dd40876d3559", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "8789be26-ac87-4ed2-8124-e42c3e92a2b8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b190b1e0-8066-4abd-8c48-dd40876d3559", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "d53f5a5e-1012-48ab-a444-ef8b434cc7e4", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "957b34d5-8d08-44e5-bd8a-4afbaf5bf30d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d53f5a5e-1012-48ab-a444-ef8b434cc7e4", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "cc7260cc-a6fc-402c-8f7c-5a5897ee0577", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d53f5a5e-1012-48ab-a444-ef8b434cc7e4", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "b8c3d60c-33f4-450b-a94f-1cd51e0785d9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "5240bd9b-c7df-478e-a351-f11cd1eaec76", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b8c3d60c-33f4-450b-a94f-1cd51e0785d9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "5b9452bd-48fa-496f-8b61-56b27e713d17", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b8c3d60c-33f4-450b-a94f-1cd51e0785d9", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "c4902b2a-1003-48be-a987-4d4e6605cd22", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "a48f41e9-6658-4fbe-ab98-c23b27c9ba87", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "4d49f0c2-f9ae-4a23-ae65-746ef0100cb3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "7452e214-4fb8-46d0-ac34-100b7ab6f21a", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4d49f0c2-f9ae-4a23-ae65-746ef0100cb3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1e74bcfb-e524-45bf-b56f-027fc814beba", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4d49f0c2-f9ae-4a23-ae65-746ef0100cb3", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "c5be5830-b562-4311-9a22-024246fdbedf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "65dc11a5-2e4e-46a5-aaa3-428886d0618e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "39b2852e-5bbf-46d2-928f-f7124dc5a782", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "a017ddaa-8959-4df6-b029-ccd8145d297f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "39b2852e-5bbf-46d2-928f-f7124dc5a782", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ff1a1bef-53f9-4e97-af63-07d6cd6fa9a3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "39b2852e-5bbf-46d2-928f-f7124dc5a782", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "6672cac7-d619-4624-9693-64fa62a1fd5a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "4707ed88-12cf-4166-a472-dea7d0015a94", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "6672cac7-d619-4624-9693-64fa62a1fd5a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "bf5820bb-d0b5-46ee-bddb-ca4b766c1a8c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "6672cac7-d619-4624-9693-64fa62a1fd5a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "a6acf370-1f09-42f8-a02a-710c2abe0173", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "83472bb8-f36c-4300-873a-6c2c33263de7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a6acf370-1f09-42f8-a02a-710c2abe0173", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "9fb1c926-5564-42aa-9e09-cf86b2142263", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a6acf370-1f09-42f8-a02a-710c2abe0173", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "ca062147-d4cf-4e89-81ee-e5ebe1d4b165", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "89302324-dfbc-421f-b80e-9c4ba2a3ee8b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ca062147-d4cf-4e89-81ee-e5ebe1d4b165", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0371cabd-2ede-4673-9bb3-f8959773411c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ca062147-d4cf-4e89-81ee-e5ebe1d4b165", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "406bd3f2-c153-40bd-9cb3-301370bbece3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "ee218cfe-7d64-4926-aa95-bc9d7981b042", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "406bd3f2-c153-40bd-9cb3-301370bbece3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d73590e2-8e6c-46e3-b306-d39258b0322c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "406bd3f2-c153-40bd-9cb3-301370bbece3", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "cce58db7-3b8b-4712-b6d4-1791b1a20e88", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "be5ad818-7012-410c-9ca5-81b7a2c3dbec", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cce58db7-3b8b-4712-b6d4-1791b1a20e88", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d8d02bc2-e685-4287-9560-b0bec080c753", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cce58db7-3b8b-4712-b6d4-1791b1a20e88", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "cc5e53a2-ec1a-457d-acd8-f69a2edcd397", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "ba257c14-257f-4292-b599-ff75a9a29e38", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cc5e53a2-ec1a-457d-acd8-f69a2edcd397", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "24193799-44ec-465d-98d1-f15e1c268d28", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cc5e53a2-ec1a-457d-acd8-f69a2edcd397", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "eca1b1bd-673a-46c5-902c-8bd4c795cf31", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "cc24cb4a-fb85-43ed-bdba-2fb4774dd8c3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "eca1b1bd-673a-46c5-902c-8bd4c795cf31", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "04deb737-a08c-445a-90ce-74259a5ab503", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "eca1b1bd-673a-46c5-902c-8bd4c795cf31", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "ff1daf32-8dc0-408a-9d33-e4d74c14df8e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "79aedbc1-6f38-4b8a-a1ff-83f367c81ec6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ff1daf32-8dc0-408a-9d33-e4d74c14df8e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "249a75fc-8857-4966-9dc3-ac947d343048", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ff1daf32-8dc0-408a-9d33-e4d74c14df8e", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "a4b7e245-a218-42c9-880d-00be2fff2c9c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "e2a4f552-b1d9-4f60-966d-4577a204a82f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a4b7e245-a218-42c9-880d-00be2fff2c9c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "7e57a3f0-7412-49a7-8e7f-76b828178f54", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a4b7e245-a218-42c9-880d-00be2fff2c9c", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "9ecd6921-5cfa-47ee-b57f-f9c7be8560de", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e08401f5-7dde-4125-8a86-7e2b15f26f01", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "28c2b399-0172-42ba-b68d-a6fd7b0c7e23", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "8a2e6af9-00c5-49a5-a683-2b2a4c0a4e03", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "28c2b399-0172-42ba-b68d-a6fd7b0c7e23", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e39cda45-7c36-41e9-b79d-2a10e2e931c8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "28c2b399-0172-42ba-b68d-a6fd7b0c7e23", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 32, + "layers": [ + { + "id": "43ce33d3-56f7-4441-b17b-bf81479f6b4d", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 1, + "playbackSpeedType": 1, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 32, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_block/2fc3ad72-ee43-419d-9a96-01302c6177d0.png b/sprites/spr_block_color_shape/137e1fee-e8f6-499f-8e08-ced3ac0e44ed.png similarity index 100% rename from sprites/spr_block/2fc3ad72-ee43-419d-9a96-01302c6177d0.png rename to sprites/spr_block_color_shape/137e1fee-e8f6-499f-8e08-ced3ac0e44ed.png diff --git a/sprites/spr_block_color_shape/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png b/sprites/spr_block_color_shape/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png new file mode 100644 index 0000000000000000000000000000000000000000..1053d08a3dd9a2b0836cd14d4b3eef50f105cedf GIT binary patch literal 393 zcmV;40e1e0P)Kg)Ltp7C~bXuZ?sC8r=Dz{p?m<*oP8^}d(*IeIYnb05!DCCX7i zBY(ue*>}vH9pT>lR=>4>ij}il{Cf9LiTn!0A|F?g5Mxmy)z5o)Z+-=I!OAHk`KWT* z)Xy4dOyJU}3Gm$xap!H&$gG@Oex5hO_i+NbP!nLsqHUUUMi%pHUkC`~LQn(R@ltah z^AB))m_RPn1juaKQqHYD@QJmvd>!Q|FvrH(bN2zAE6P#8ns8Ecem#AFOs$$=WU2mg z`v9@nO>cWxIg91g^7kr*^|j?!fYT{wG)}LCMlzCjp6Z|A!P#=AV*XGibb?{^vPKj! nzeXMq$c2D_D$y2-{dfEi-F2(ZercLs00000NkvXXu0mjfj3T&r literal 0 HcmV?d00001 diff --git a/sprites/spr_block/898fd156-ac32-4fca-af44-026db47f97ad.png b/sprites/spr_block_color_shape/1e53ebf2-29bf-41dc-b447-5e8562f97a8b.png similarity index 100% rename from sprites/spr_block/898fd156-ac32-4fca-af44-026db47f97ad.png rename to sprites/spr_block_color_shape/1e53ebf2-29bf-41dc-b447-5e8562f97a8b.png diff --git a/sprites/spr_block_color_shape/21c46e6e-dd05-45ae-ace3-961a2c7ec4b4.png b/sprites/spr_block_color_shape/21c46e6e-dd05-45ae-ace3-961a2c7ec4b4.png new file mode 100644 index 0000000000000000000000000000000000000000..aed85203408037664920835dd0e1f9bb8b8f6f07 GIT binary patch literal 418 zcmV;T0bTxyP)6vka+Afg)!QpF9BSeO~P0|#kO(TnsB9Xofa#0?N55(6j@NQ#_(mi)@Y4%o@U zw>&xTfq(B$?5K}kzYq;dHM#jkfbV>-?K-y$)0a=yn);~_k2tI+vU?q%ZmIchtrKy06n9baXsh!^u6~6s7wC< z=q$K;zRXWo{fUs)|2hHcmJGt6DtAH{9l$g%KrYI}m z>N)(}d(Q&ArkmQcw*Xu+6(UDEoe9iLaDZ5H0&wR7cMj0|{%(NSstkZ0 zeQSeUIV*TmY8u?c^aedYt1-6Hxu)+!Q*1)&Ro+xbi)r zI42~JD=iGZ5P$(#eUBdJFg~s{fi6#|Tp0Ke0LG0JFkYUa$33n%C6p#`$-@A8T3`WL zP7R-s3oxPpJ>SE8f*$9@%EMYtxY`SYA`PI#y$~mahWQKzU_QYmk4yc#@2GrOZh+Z4 l@F9RMKyLe}2 zu%50GmsMcfHlzQpf*CIG(szCRSlT_6Owf)W5_ z=+R!!P2;@h<2VxgcNgF`TQ3+eX{ZSMV^V8-}1<;!$Nlx8B=P4n;6|^1zbT1@RU_G9>R>0j*0&FwY eVQ*dM6?g-kkD)d=a)2ZN0000ORS9EcLOAVy0M4=l+=TDOoeu|amK}iqD@F%! Z))NHwEoRh8yAS{X002ovPDHLkV1kk(hmHUM literal 0 HcmV?d00001 diff --git a/sprites/spr_block/d7bb8497-4635-46a9-894b-aea0bd47cf78.png b/sprites/spr_block_color_shape/778cb7be-b35a-431b-8b9c-85c7e8e65469.png similarity index 100% rename from sprites/spr_block/d7bb8497-4635-46a9-894b-aea0bd47cf78.png rename to sprites/spr_block_color_shape/778cb7be-b35a-431b-8b9c-85c7e8e65469.png diff --git a/sprites/spr_block_color_shape/8184b047-3992-4f30-9b53-ec835acf0e46.png b/sprites/spr_block_color_shape/8184b047-3992-4f30-9b53-ec835acf0e46.png new file mode 100644 index 0000000000000000000000000000000000000000..eba0e6990f4259f178e00b6d8475d952f3e5cfdb GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJDx6%Ar*7pPTk1cV!-2CEW~Qc z%PXyLF(7yov+^c(X@!l9yu8|XM6bDTYG%FT`CQ~*Z)&acyvG8Y3VGfqtTa0bKk@A z4*%BbpZBw}X2>*lRsa0w%<(h%%zvWU8TJLw@$)EKb~fhoN4q=5S`AYdt!Mc7?##uT zQ}y3BavbowC^^CW-sPF`KYxh3Fyx-@-Dj_U?(_Yc$`fzh4R{`=awY8C!EDh0Mh-#@ Z@{!yj`WLtLOa=Or!PC{xWt~$(6956FbN>JU literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png b/sprites/spr_block_color_shape/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png new file mode 100644 index 0000000000000000000000000000000000000000..b1dcfbce8f5d08b2ec829768956058c186be25a9 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU7jwEAr*6y6D1N37`^s6BBO`F@##Ez9$HFz2niW{0 klqJBWStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED0000a_y|bl(`$@}XK~))M1KdUIIW3<6E*^x z@`F=cKi**c`fQ&ziob7g!tVfAF2P9{ktZOPLxH_xT$6J8O!#oB=Iwn2E9jxt^C`n2DG`uIHpo_PmrY%tYD&PtQxp%tVNo5j;JA zpV{*3Tk1@79jNJf3Cc`_Nd41oS_z?cCg!ap;|Z?Y+A9a3_+NpMSP|G*4#~?s#@e1! zo}Rb8RQ>jVu|ohZ%xC=+dBIN3u-KC{2S7r;IBI)N%E=jiY^%Ef_ABh$-@yJ!=Taah zi%3pz65gJt^1Qg|O*o_zigKNR=7fY)Mm09BcR?fO8-`HDEASNP5=q{+IA}U5zxTTj`1Y_-N6V*CuHIO b`0w}!z@yWX`Hu~*00000NkvXXu0mjfhX?7% literal 0 HcmV?d00001 diff --git a/sprites/spr_block/9926628a-2431-45e1-9378-f4e5b5e34eb9.png b/sprites/spr_block_color_shape/a48d6d91-2e8d-4aff-a833-98d374d5e829.png similarity index 100% rename from sprites/spr_block/9926628a-2431-45e1-9378-f4e5b5e34eb9.png rename to sprites/spr_block_color_shape/a48d6d91-2e8d-4aff-a833-98d374d5e829.png diff --git a/sprites/spr_block_color_shape/aa20fb47-8580-4242-af3e-c1859f0accfe.png b/sprites/spr_block_color_shape/aa20fb47-8580-4242-af3e-c1859f0accfe.png new file mode 100644 index 0000000000000000000000000000000000000000..45795975eadf4841292b518d66ba4885a0f649b6 GIT binary patch literal 493 zcmVMu@8Vm)FdNo-YfqVN0W=Y07?P-b{l9e zrqMlzOkhMOC<$xLlW~$bu6S9N((@;1J0g*4W{3{|AAHB)k&7N4xlz5*#R)0+geG0 z>BGlfpzvw#0BQr09iXQp45nc|hw0IAh1v4B`}Ne%(@IHy`U@Z{+iF#Yn? zcQCE3DS*`iLI74>!}MRh{sBzONOOZ}M0S-$bpXs_m_isJ6z7EGVdlX?PDqdgMSk$) z0%Jo_FbxYr1_o4@09Q!B zifnWsF2)I_iS;=_2ha-;bO3rt$Vl@LW$=*c9RmQ4>812kD>Fs_0000s$+ynch+&;>tpvcO; zojLPhti!+*qi;)B1#ehB9NVv7^N}j>44~()7&`l(_;S`yXr8>7=S%10Ud=>43~0~a zu@*T&U*rOXv(|d+{P_R=N7S5m$V7SuLY~jDbw1#_s=kz4@@{$t^oA8vdh&u!lzxm> zoB{X7!2s6nO4Yme%!;|C=Y0dCZ{))OI~L`+F{fuCz3vO10jc2SfbMv)F%RiC*c~?@ z6%Gc_GS=;-F}M1_Guk3q9r-ZOLqp`P`+%M+@?pT5aAIQ~?gMU46Or)a9veD!-vRxregk}MVylL1jFoQ rj%bAR+H=oz5J}NxA;Tm zJBBRgNwN!+mhdb~v}^zP@)?+4@ceG9LGL`a1VzOoC;g+@1EeR+WxMcm!vx8HPZ`cE zH<-Ww&nFq5{yjwuwkj_mS{me@E3cOkcs|kPVgEE{|f`Nhil zj8Z~}_sb|;k(2nR_~G4e_BD^3<{bJ`$gq`Bvb6EV0jq{v3=BMnJR}WkA{c?5WAJqK Kb6Mw<&;$VLDQt%T literal 0 HcmV?d00001 diff --git a/sprites/spr_block/613634c1-9d3b-427b-98a9-e74f0d4a1754.png b/sprites/spr_block_color_shape/d1c859be-2b28-46ff-8289-fae7b22b7db4.png similarity index 100% rename from sprites/spr_block/613634c1-9d3b-427b-98a9-e74f0d4a1754.png rename to sprites/spr_block_color_shape/d1c859be-2b28-46ff-8289-fae7b22b7db4.png diff --git a/sprites/spr_block/a1d4ae60-7ee8-4e26-8b30-8287ff7f4932.png b/sprites/spr_block_color_shape/d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png similarity index 100% rename from sprites/spr_block/a1d4ae60-7ee8-4e26-8b30-8287ff7f4932.png rename to sprites/spr_block_color_shape/d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png diff --git a/sprites/spr_block_color_shape/dd35adba-1568-4614-8b5d-3beb257ba943.png b/sprites/spr_block_color_shape/dd35adba-1568-4614-8b5d-3beb257ba943.png new file mode 100644 index 0000000000000000000000000000000000000000..90c65d8834c482a0a90bea05ca2bb99a4ba399b0 GIT binary patch literal 418 zcmV;T0bTxyP)MLyQ5)qO+&xWh z{F}LD=I*|k*_+jP@cgum6cuZ}oB(`GK8>9&SH{lLH3_VhugIGFxe$*ytnVr%V;ju} z3ZNwmz%%dN-x!;GEsSkd%Vf>{QvCQkV(Zk{1_#iR1rRg8y(TwceXO7Fo%5*xB=$7( zkLN$R{OEZwK+&=Q_B$U9!__v%*w7rshB?rcvF`lZYr04+HH zzDn@j%qtO^xd>3SL;$H0_y@&>vm`WgFF;Z90`N-MGb8Z6lL7u)J7dn}qBW;t7XSbN M07*qoM6N<$g68MH*Z=?k literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6.png b/sprites/spr_block_color_shape/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6.png new file mode 100644 index 0000000000000000000000000000000000000000..475136c36db5ad3aa2a8789d63f5d2d19776fab3 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXPz#OAr*6y6D1N37`^w`JYVcKjdMP}k?&nkP8P~*w*)O-t+c8|OdL$H3D(^XI z|F2i7Gp0R!%zk-#+&+fO>rS0o!PgMU6U@PE(3~ihSd;WL@!3HcwIe4xZCTj34#<9Z z_q%)zSAyR5so@NlcQnnJU{f_E!6IP+!yU#AI}T2*NMN{|zT{N*=MM?x2OJoA*!TSW zChGIJ%h;)~%X{AZW@aDdB5C;P&3 zq8)%9_b{J7`G8#=v1wuGga8bcGBPXC=S2{VEO*=LkNu?=Y-P4%dZqVfYt!R z0l4x#p*Y7Wk7h1P%By8r+H07*qoM6N<$f_l89Q2+n{ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/e99bb026-b4da-4b3f-ae51-3fe387b81757.png b/sprites/spr_block_color_shape/e99bb026-b4da-4b3f-ae51-3fe387b81757.png new file mode 100644 index 0000000000000000000000000000000000000000..1a22170199a45c72d3c1b5cd4ff8db42da612537 GIT binary patch literal 386 zcmV-|0e$|7P)>8?>01@?Y8~#>X2R_F4{eag!>3&dfsble}G=pj(c#g`v~xYHK)>(c)8DIS2fV7 zy++{IPz3O917gaa*>Y~P<2jUxnnA)Z8PXt7CPUN@y0M8X3MSv$9V*Y=908DK)p>mqj?r$Fe z@EVMqQBCBv2U6$P<~{O~G2S$6i^Am9oH g0iz~91aH5NZ!s+Sqej*3+W-In07*qoM6N<$f?tiQ_y7O^ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d.png b/sprites/spr_block_color_shape/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d.png new file mode 100644 index 0000000000000000000000000000000000000000..c59f861686a484aafbbe315acf5fdaf914b2bae8 GIT binary patch literal 443 zcmV;s0Yv_ZP)N&y#v#KzI{ej$i<7oN0%4ZH$&mWLY7cS z44x1`_qnK+A((!B?L3$kR8T?Tqs#yM{Tqc33lTygLAMa_U$E6;V}kbyoDRU{a{(n4 z6b&#wA^DdVPl0JzNHDRo9tVa7Mo0{vGyns*;uz+$5BKhnB>(pIbucZgstKmi)5PEj z0a!lgkq}2wfbKI~agIwKW*)AP7(5{W%LO0qL1<#*{L71%M9IU-5%iE4JRtx}1L!3l zsc}w7o>NE&y8{Laz#RZ{+4~37iF24d%sd_mh&`X5JOtBR!s4h77$|^I8`7#AfXSn` zD+W&pz{-IyFCctaoRJ#mxa46zhvk0^2MiRzSq>mlFZMJ6^BJKugKjPi48GbB27Y{k zw)30|0jI>d9`)<(B{e002ovPDHLkV1l1-ySM-V literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/fac8bf2b-317a-4d97-87aa-a82b1e367b54.png b/sprites/spr_block_color_shape/fac8bf2b-317a-4d97-87aa-a82b1e367b54.png new file mode 100644 index 0000000000000000000000000000000000000000..4a377d7dfa21c5cc293253242ef61b44da68ba90 GIT binary patch literal 331 zcmV-R0kr;!P)#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? literal 0 HcmV?d00001 diff --git a/sprites/spr_block/a4ac5e69-2dfa-4ec4-82ae-d3bc357f2cf0.png b/sprites/spr_block_color_shape/face835c-3101-4ac5-8d77-497d75e97c76.png similarity index 100% rename from sprites/spr_block/a4ac5e69-2dfa-4ec4-82ae-d3bc357f2cf0.png rename to sprites/spr_block_color_shape/face835c-3101-4ac5-8d77-497d75e97c76.png diff --git a/sprites/spr_block_color_shape/ffc96e9c-fbff-47c0-bfd2-ae47361135e5.png b/sprites/spr_block_color_shape/ffc96e9c-fbff-47c0-bfd2-ae47361135e5.png new file mode 100644 index 0000000000000000000000000000000000000000..46d324a21cb2f14759a017014b5b54382e62de76 GIT binary patch literal 481 zcmV<70UrK|P)k4CEw)XerY`!wZn8P=1h-XHxP5M1{l)Xj1V7x;uF#N4v)C+K@!LX}sVB&y2ln z5=SR6&+{*LzpAPq?X%)D1l|c10jj*~IuqNrb@Cb~PCJ0bag8Lj5E0;%KOPUW?)%=v zZQG(WO`Xq6oKQPpE2pqYNZ}maXd;~fE-#shpaZ_1hai~=hk&o=sEqbJln>3sp#z$phv1uu*k*>%^n6(sQ9jEu zb|!WXTi5G!9&rO`B$;7KY$2>l- zEKBElM*waBvv0sYIb)baoC6?{B#HCkt35~M=!{*Q-372;Vc&iN_xpW!FGeO1(FvP` zw&zEAySV60_)aG{t^55|v Xb3r$hyks7e00000NkvXXu0mjfwI9ayRN%r z132&dUbrXj9G!fSv4(<1NqxxPlS@Wwtf9jdRWO zJQw!wEx>EYbKq>vc@Ci0Gy$%l%>l+d&%&lxaV!4bIRK?_c=WHBd&=KA0K{=D%-wtx z-2J$1{>=f@1~tD5+*9xA0RXi+3glzwMgdPl2{`N2gsr^JPv8$bY{PfVxk?cL0000< KMNUMnLSTZ$y`m8S literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..c5569ce2c714a3ef250440bb88242e018d5de907 GIT binary patch literal 396 zcmV;70dxL|P)3Z5FJ4Tu@FVD@dkp8wS}kfjGn>5!W#(U1w;@;u@FU&RYP7NlO3~>)dXKNZeB>< zd@_vHEXybl)530~U!;-qe=9H+}^8f|OHuveY>( z%A*Df3-~pR0KD5CHLMNXGb!g1kMlNkelH*vi~w{j*rGXyXFi_y1xG+EI5ogKUTDsJ ze3$C^0%E}kfU;FdIhXptnoi2%b)*x49bJ_Db|2t#MLH3XCY;cm|4$!)QmH23Sty@w z9{~2x>Fot6XTF?Dd{al5zqa@hFmt+|(J;LN+><_g=b`+NI?ARq72^jKVM^u`45}A3 q!r|k&=Z=6_a0Kv3l!avf9X|j@bhXnY5RG!i4-Ru7(O3vkNF$_3BiN;|u<_^GSXfvoq)8#z1k}!tNG=c(O~fb@-^t86 z>>cF1&1;6`EqC+Y%zk;*=E*dd0v;~Um*ULx()f82L)*)dV!<;g514 z6i#S-rEy3RPJDh$uD;zcoN%WH0IkMQ7VOm$@x|H!#a`!@qU;HG9Kbpsb|2XUsZ6W6 z#^ZaM6Ye;GRgm|&5?jqT$~&=m>?6_%cN{_f&29W!`1*GOSs_XQnHA<#bMW}y zFgIHbo4ZwtqwX_LAS)QBVOskDczLgI$ARA)&a8&0S<;$oJd|Vo8wq3ubsvbjSLq2T zv-OPpF5up22&@K0iiQ)SCv3b{b9Zk<*a_dm9-APQ%38{^Bd&5IfvlkRfCL=Uc=<8{ j7UyMz(`jBJ5QdH8gym6%A`;>TNHo-xoPmQNaR^QVXP~4`gOnSfbU`4260*rI(JW)hKbhE@ z*t-pXGxE+P{^qgvnuo)Fsalk2bMv(T!{VFlTj3U_ulJla`cWLualF3N`386CaRkug>IiHg~?{u9t`la}h%AK|PEgbLLeg*KswaLgn$XBz6y zO1&OnRr=FaImX-Z?=Hie<1AoLIg^*gLe=q)memXlbmixLEI{;>YDxs)o?&KE&m}*; z_rU;7=??(Tg0JVV#d4!RQ`-4oFF@1s0`R#oQw7=3nHU7-W~1&7j(hjh&w0?VBFX|F zG0wtASyjN-bM{N`y$EnSeQ!K_2f!y=Avn@;CU|C|1Ei7{Kspzsa{%xAodHs-HURgS zza7tXhpcqpM+b`4vK=$N8n#5E>RTXJ0~SV#@`%1G-!p*~)hR|3$2Ws0H8- zfcX#x(BmFgoa0Ip=;q)`3vdVY9;3hSQ5=8^!1BGFJcLG%bDU`cs$ZO&LI=J($CW0~NklZ5C14y!;%Sv zlZ^xG=_+wr1=e*n`cIq!aF%7n+!Odl9GT&qZ^bbOgaB6%9?)e1;JfR(U2)t6LVznM z0Z@h>ZS~wV&U-!#1M&Ut0^Ejt4%qgb&jEN%2yg{42RPsj-L2^R{?|A>@PBgvN>PEm zuVU`0`_2Jio@ZiI!WM9U5Cp{hwB4ry=uH$whi;(rln~$wS`Pra7m_Kk9?x7W;A$uV hwwda%wXX9DyaBy4p*afc2(bVF002ovPDHLkV1m}+p-}(; literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/3bf63775-9706-483c-8c28-f52ba15484c9/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/3bf63775-9706-483c-8c28-f52ba15484c9/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..b1522c62e2dd297c468bda6ee8ae88960f595abf GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJDx6%Ar*6y6D1N37`32s85wJLS-SPp|9WkOitg%$RiNPJ&eU9Ko*Om`@u7 z+MaGxpKq5~&ajv94&#O$m0!PVcQJXLW-R%+a5CEk#xqZ+oDwd9NQPJ@@JVPeFlc2o V>(qKhd;t2B!PC{xWt~$(6991?YzzPZ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..e3be545cc56d47a22c55690ae9e0453db1d278a8 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9iA?ZAr*6y6D1N37`jBFh25*CY3+3et1C|aWUW$IypsN-UxaUo((_xJnE*`su2&+YV! zG6oI|4;$9YE12lbKfq9RVuIHHf2w@!JOU0D49|>Ql^)NDsGL!0ps<*4;e8v&;sXqf zEzB%O6~DYbzCuf*w|GY7h6#;JO?e<1X6YLqXb%_obtvxClSC6gpkP9x#fCYB39<$U jfKFS?CsBG}1vA5j?e0g{Ub;FB=m!Q*S3j3^P6u@1T^JOcWHcb znd0tV2w$K1_YF??9pK6(I0+-_1f+6GFg~O)l;bn7KZNi;=FeB0uscA>t>7dY&4c(OC!jeYA(f%VrS*bxoq&cOCo0P81S~xo2I+^D=xK!e8#gK`@I%?Y~IIHVIs z6t2Nx9UaO|~3{r~^~ M07*qoM6N<$g4)i}ga7~l literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/46825d5d-002e-43e8-a62b-198caac29b0e/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/46825d5d-002e-43e8-a62b-198caac29b0e/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..505777ad77bf68bcbc54270a18f646b7b62470f4 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdAr*7pPTk1cV!-2C9K^O@ zaigF_qvMPTnk!bUlwg!vapS?d4!cRR0cYlx_&vNIac%pg=SLXtm%e)|^3>E^ogq{- zDY7j>WXlJOjB~YmR~GaA+}65d9gl;zI>Y-K8Rwka0?%hYyR(0F{;bzF`-MG9`94mr zc=h?_$>%HzFXwvIK1ph*f6a2hI#w*I!2E2G{OhZwOb*@`wH>D1v$XR5S+kb|$m8+2 z|8u)>W4$Abf$tTGw(Li>|IZ#*w_v(3>3#M0Al3_a?lABi03!wN2L9{5DH}tX)^`HE O$KdJe=d#Wzp$PzCiEr%y literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/4c2de224-b6d3-4354-aef6-ac7e60089e89/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/4c2de224-b6d3-4354-aef6-ac7e60089e89/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..f93832a28dac7a969a303844e6a93227b1a762a9 GIT binary patch literal 312 zcmV-80muG{P)XE_)CC+@MYU;HkI+eRNW{Vr^0;9Lw^-V?*Xcom`6v62rqzm z8HchRia@qM=Sb<(I5)rV`AQ$cy7lh>9auzJCL zw;+MVsTcA!%`)kG*`}Gs;elx}_soo+BW>_VfjEb0!hA;kGNq9w<5HAkE~_bkBl zw68pS1wbdRrqmPgjCBB4(gJYz0(TG4@BR(oT7>~nWBfb*CTH1l@4a;Z+cE~AUZDSc zrsuvifGd>-K+SdUy)yt?DhxoqK*yZ}*wzQ&0%G6XhVE3;8UO$Q07*qoM6N<$f+(-L AIRF3v literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/570118b1-123c-474b-9147-9560ccc537f7/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/570118b1-123c-474b-9147-9560ccc537f7/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..60d3ea9f99c192faa1e932a5cd7ce3c64a407ace GIT binary patch literal 392 zcmV;30eAk1P)naPArL|!nZBrT2u({N5pOZ6qvZM7v5c3~ zpgr#0b-pxMPZs%C-@Pm^NdtudB5#a3()Zi(Dy@rE|LwupAK6FeawXhRfJeTcZphY$ zEwZQiURra%ZhvJ^CtL6e(mhbZz5=F^16+xu{zz@nz4jI0A53#<>c{$GO5oQJ1n_Pz z%d@nBN2bfU&X4ngZuva{TMz`$u_~c8%{d~A^Yil*0=A&kfayC=TNBr<{2ts<0L-$= zxvmeC`?cqKb(RU(f*{~G1G3-l1AMM0Pve7 zvWgO+UzgK3|0z^hyf$b0Kx9s*84c4b@M$05{=;lX)}5&sKfnl6a?p_{7*sE6gd@(+ mBUcF6f|5g~R+Qn&rzx<|7qZd0# zlZOx%8fE)T*O3%d4WM&awmW ef5q$o&Uyf2;WlPiK~~WK0000(f2cFW_0n`R0I{@bM!^fV3 zX11?{E2c}^@hwke0Ir;t|A7DfQp)>*W84RF@1hGEH=>U2IoDRSh60jm09lU(? w4NMd3bAk?_7a-^W^pJS+^ea&Y51HOE0Apj$0FW7>f&c&j07*qoM6N<$g3dFcW&i*H literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/8184b047-3992-4f30-9b53-ec835acf0e46/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/8184b047-3992-4f30-9b53-ec835acf0e46/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..19309e45ec581724dfe3b00707102d3b574c000b GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJDx6%Ar*7pPPOG~ao}l<-LPTX z#*b`Gy<3;2f9Se*SeoPBfn&$CceqwK8L`!inFT*FRowHUW@b;a70=0e5?Whh<}m7T zA1z(FBX^I%`AWT7%`1!fDgy&_ycrXgGCP#r+a_{+Vp8bGm|szUZRS7!__pC%W$b76 z3H!f3z1f-0u8_OzMarysKWF^RZK!|EaG<>FGUv&2TV`h4-D|IQW8Dz+K~&-1TuZCn zpPt$ZFhpotFn>B$ZS`4O{(lq0g3KKkOP?Q!{5D&kf9GG0Uv>XyFh%ISW8ixLMgpt{ Z#Lt}#)w$@_`X1;{22WQ%mvv4FO#lulctHRF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..53ac2758bc63ace1438d29e84f52b0b88f50437c GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ!=5gVAr*6yfBye(f7pR(8spa5 zD~yZzBuWpgV0Pe3SQBZv!1dvQc7{2nW#+4TCdswzE9Z2|zU}m4b$j5``!7Gu5@%xsrF1+w>8C4gMYz{sFG)zo@dX5C_-cNjcf{an^LB{Ts5_Z40o literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/8ef19192-7161-41e6-8877-65db720af07e/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/8ef19192-7161-41e6-8877-65db720af07e/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..21930fc05b0efaec5bcd605c8392396283e090b9 GIT binary patch literal 392 zcmV;30eAk1P)WStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED0000HL4#=&5rT!4b~cuNf}h~m`3Zi4rH!3d3K9sS77+vs;mo+1%k1pz?o9R+ ze9dfb?rz?DGkbS&ZQC|h3@)z3i`vWcf%RU_T)k(Q2t>*su6;Z_3-T5x)^`Al<9bQL z3KaoS`N64QKi&BF^|`p)FgRc1gxvwEoP&_iB1<4r4h8m({Th|yZ^XxI(`@Yo*XNwj zI{?MCAS6l<35Y#MrO$Uh@)?lwikT=okn4E~ikS!qWP6Uvc+X4u!c3$cu=Koy%uG1S ztb?WJ?^9iVV_AP=OAuzl1?p$FX(fo-nV2se8BczePgc^E*-2gB_mvfgcQ@jqx9i*5`YdP8zG0XMaOI!(Pk!9HIuGI&Cw}b!CdWCFutG&Z zQr=un{k(f<{n&qWRXu5f-)o#OJ3y6lP!d{X32^0*z|Btl9F^lW;_LOj+BrT5*5{m1 zI{?YGpd?BV2}m_ZrK|aiA9)YN@rkM@iVoyzUV^440s^_3qcUFeQoPg?Ne3)7FCo_x zjxs}7YQA19Rq=XX?up2OF*Pqi>Ip~HcaLpS$*^E#Pk0|B^!i?=5)}B*atu&YLbyPAC&)yqshfx0HuI^yA3oK z)99Wf5+be0WyI;(@`@30000lkYXq;0LczGd;T?;e)s+dR(V$^S=u^)+JIySz|=nAA5nqr?~^D4M=u?o{lh>hWQ-Er<(()4M=vtr7Lg2GZ9sM! zK*D$^rC{Alm_?R-IRtpFLSal84fA#tYFfAj^4W<#s$+ynch+&;>tpvcO; zojLPhti!+*qi;)B1#ehB9NVv7^N}j>44~()7&`l(_;S`yXr8>7=S%10Ud=>43~0~a zu@*T&U*rOXv(|d+{P_R=N7S5m$V7SuLY~jDbw1#_s=kz4@@{$t^oA8vdh&u!lzxm> zoB{X7!2s6nO4Yme%!;|C=Y0dCZ{))OI~L`+F{fuCz3vO10jc2SfbMv)F%RiC*c~?@ z6%Gc_GS=;-F}M1_Guk3q9r-ZOLqp`P`+%M+@?pT5aAIQ~?gMU46Or)a9veD!-vRxregk}MVylL1jFoQ rj%bAR+H=oOS*4JyuWaeZRu{$g4 zkPB4zZqIJ+Wr=p}A74IW$YP!(yFh6P&$5e`8FW zGn`p&FyH$_N8`(h;d~3)S?k4CEvvzCcHl7a*wM33Pd9I-UR(5-*@ZH0h|R?&OsmEylZRLlWtx@dgJxGxoAc z9GyU(=fB+baU6fN&x+3wcqdc@sPg;$ZsOzd*yS}&oOS?<;~Gh5AtJyjZ`;$rvsXvhv1uu*k*>%^!#?aiSp~Z zvNLgT;7ZR!;ASGW)z@|HRD!rV6Iqr;^E{h1)P6Yt#lHoc#EZbPEGCv^Y2wwMV;-M3 zO_Pa5QJ8oj02hGSH(;NfF-#)P0g#|Wa<%8E9G$U?v%3KHE9~1(pzFHBwHTQ|L?>(# z+Mc`ec5%_0@SRR@%2@)O6BJY#_SltoDQ5|AxZ;FQxtD-sCWc`!k?wP;axVc68Yd*m zMFcn};8e3goscRQ5#RtXD%WoXjdB$M>I9IWuWhYz6#)+R*?|Yk8K?+QCure+`S17- X(!ExbF_PDl00000NkvXXu0mjfgT~ms literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/dd35adba-1568-4614-8b5d-3beb257ba943/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/dd35adba-1568-4614-8b5d-3beb257ba943/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..18271e6a9146359b0ac6041a3436cbcd62b42b92 GIT binary patch literal 421 zcmV;W0b2fvP)T}^SZ8EA62M9hK+XK9&Thc^w|=>IcBcZ6+SA-W ze*Y}wN6(`H%9aCg-)VJ^1)zt>OzXMk$MdF()n))Id0)XSZ&_^5ky*$u=Yj`dC2tSN ziC47e!99_m1s;Hv9017h-EP}+Z4RI^yLT4gd`?Ca7Vy_|;I4c5Gk}#m06DRW_B=EP zf&gVJZFO%e-xn{#KK(lGU0sl4@bE}hI~$N$tiRcAvpBrhz5=)iRRZ#7d$!T9W$po3 z$pZ*gLhfc+iP+3lfU>0mXqCV}C@GvJv6%+}%2E(OR>GYbk@sy4@Zb6ZZ3f;G@o$KH P00000NkvXXu0mjfJvzlC literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..4f8807c9270da83f98da7c8f2f175330562e3393 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJH=ZtzAr*6yfBye(f7pR(8spa5 zD~yZzBuWpgV0M!=c-7$euwm-Lhs;s({52d0B>e4anJ(+^uVK7=E9p_fuMdaW6QcZM zm{z@0_WTqcznA5*QO%!(UzbjcC)^5+l)TDl(4EMY$dG2>quk@a#^#L8jKeJ!mK)m- zI56&DzE}IdFO>1j(`}!)5~RW>2v2hF7vf>(5oxey5HsH)#Lu(fcTY%Vp`6?sJ_(J6 zhYjZU_cdk46uN2n6`uTDT+oo|lK1%VJBBLe9n1-Z%7>2jE@HT=ZeX|ble0SS0_GW~ nHK(e-fXJ>aIv`^Zz`!6kz3``N@nR;RzZpDT{an^LB{Ts5u*z`* literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/e3d6124f-a72f-4abd-bb7c-1734c08ca471/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e3d6124f-a72f-4abd-bb7c-1734c08ca471/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..770b1ad693c1ae1cb1389be6175325092f260531 GIT binary patch literal 398 zcmV;90df9`P);P&3 zq8)%9_b{J7`G8#=v1wuGga8bcGBPXC=S2{VEO*=LkNu?=Y-P4%dZqVfYt!R z0l4x#p*Y7Wk7h1P%By8r+H07*qoM6N<$f_l89Q2+n{ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/e99bb026-b4da-4b3f-ae51-3fe387b81757/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e99bb026-b4da-4b3f-ae51-3fe387b81757/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..ac6e8c510f2083c9650426135b9dab56f51c91dd GIT binary patch literal 397 zcmV;80doF{P)3@;Ta)iM@Xg*0CzUy^pM(**Y2oSmFB z`OZ%cXL-{!nGdVSd%s~Mp4JZ+zV-Z+myCf!0G^l6@7B7Q2}_ri>^vCzv2T^N=W-;{ zi2!?EEN_%7Up|z)x}91&+e7>7?Pq&|JXrT267eI@>-pWx`T+V^JMKYE#E$?k1aqoA zsW;UiyQzWsQ(B z@rLHSw{IiGXH?9Q`)up*~Q*ezkV3rxO8L?v?!OKEQKDLJ{BzhnSyV9{|%( zO_-bxw5Qt#0K5h#XH*kI?LzDP+Tuq5(&Os@cY0)4c7ajj%JQ!##+Na!h(ejv*!+hSa1k%Bu<57{~dn=`r-OrW66a@00000NkvXXu0mjfvqrHp literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..9b93b154347aec0dace95403487f1860d5ab5f35 GIT binary patch literal 446 zcmV;v0YUzWP)e)UnXQa#8@?0pH%f1k>N&y#v#KzI{ej$i<7oN0%4ZH$&kEE!zza zSwbN(ctQZ(=b~DMVEXm7^I%#~K?Q}6F8}ZMZxlW(L;Wmp6@m?ozIsli? z1(Z}!G{E?TJq1*Tyk!NkgX92goHAu)K;01V)YW0=oA+`B`P{M*~t!L+cdCYVM~ z6N4uNVELR!LL5Z_y3cUMIWBpadALGi@Pq&?7ksz}p^1(2FE3saB@Zh{&_iPIga9lJ zpqF^0#yKH*P9Y)e4j3o^cL2;~?;lVn&SCN}^LQj6_I!Tw5KMCki=#SVpa4c~NUL%H zCXe2(7(5{WD+j*3fbd~)Mrxenl85;mmj5vvFi-$zIe#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/face835c-3101-4ac5-8d77-497d75e97c76/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/face835c-3101-4ac5-8d77-497d75e97c76/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..7121a7183f9ffc8e5e4b8a4add08499a623afced GIT binary patch literal 412 zcmV;N0b~A&P)gnG(Jgo4qOhG-$6H0ifxW*s+HlkvOk4ztPr zW@a;+)-)I#JVmuMHzxqIUO63iJH~D#k^e5S#m@^-qC+(vGr}0%*wqNRhv<6Y>D;|N8maxt|O`QcV#_IPx#@qvqaM zS`DCS836O0GEyFyRCCFX_l+O>=K-{2eFeidjl@-RMCS7IK41Z8$vOkP<6T;F=b8Au z3oHOF832%>M%UI{>I0!)`lBqN09rBtxSzee-ahcMqW=5I0AxBABfnK2;9KfvU>Sct z{7mq7{1%syKL;hbbT=Tfs{SpD75nOE025ax_?fVJyWp21w*a(c0k|^pcbYw7^S@tL zv5Mk4CEw)Xenu+;R6&@h#ye$OiF%$s8a9&npAv&j+0k%v>3B%hg_ta#()9OjJ<3U z?)x5SG0!vmP+68g+INNO>K}%R09D@iy@_4d9r79{-gW?s<1v!ZLPUU5-nOkd9)`ih zZQFu4jt}=soKQPpE2pqYNZ}+vl|zBLuFWwj$8*HGu0finhv!{Rh#i39QrIMXUwv50K1gQbK)}^=R7QL5%ll^H(g97+eQ?c0Xfs1-dcG`+D4!$= zI};}d?)2OTZYDxo{Wy-7N)UHv;`w|Ad7hhNsQq#Pihm0>i5Gz^%S?Pc9wy%HIp*(# z+MZwK?c$;@;U}Hol(PglCn%^g?D19pN;yk_!yPAF%AEuxGf`EQiFBPyl{*P=&^RGc zE+W7=0lS(F>V#CehyVxJ&8~hcXq2l6P$z%{{cLNMs|awg_YT}x-hqk$b%GZDm;a7` Y0cnytlm-RVs{jB107*qoM6N<$g0u0|82|tP literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/spr_block_color_shape.yy b/sprites/spr_block_color_shape/spr_block_color_shape.yy new file mode 100644 index 000000000..89e3a6287 --- /dev/null +++ b/sprites/spr_block_color_shape/spr_block_color_shape.yy @@ -0,0 +1,796 @@ +{ + "id": "e75662af-0378-424e-9585-ecaa16921eab", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_block_color_shape", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 31, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "3c40c312-4fe7-48ce-af63-68ea74b251df", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "d30ea133-2837-443a-b0db-237267106d7e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3c40c312-4fe7-48ce-af63-68ea74b251df", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "91d06aed-0260-4e91-a723-d6ccc27e0826", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3c40c312-4fe7-48ce-af63-68ea74b251df", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "570118b1-123c-474b-9147-9560ccc537f7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "37a74ffc-318a-4517-928e-27d5ba85c81d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "570118b1-123c-474b-9147-9560ccc537f7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "cb1db3ec-3979-46ca-bb72-b6cf695854ac", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "570118b1-123c-474b-9147-9560ccc537f7", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "3bf63775-9706-483c-8c28-f52ba15484c9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "7ae04598-3564-49c8-8de7-8e0295371f38", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3bf63775-9706-483c-8c28-f52ba15484c9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "20396424-a361-4dc3-83ce-af3007c79baf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3bf63775-9706-483c-8c28-f52ba15484c9", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "46825d5d-002e-43e8-a62b-198caac29b0e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "9a08146b-d591-4c25-b206-1e5f0f5c4932", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "46825d5d-002e-43e8-a62b-198caac29b0e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "81709677-7a55-4160-a4f0-60c6e32b8912", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "46825d5d-002e-43e8-a62b-198caac29b0e", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "d1c859be-2b28-46ff-8289-fae7b22b7db4", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "48631ace-aedb-47df-87ee-73aebcf2b874", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d1c859be-2b28-46ff-8289-fae7b22b7db4", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "00c4c9c1-8459-4aeb-9640-0c17d9508e28", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d1c859be-2b28-46ff-8289-fae7b22b7db4", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "face835c-3101-4ac5-8d77-497d75e97c76", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "20d95152-ae95-48fb-bb34-cdc1f425538c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "face835c-3101-4ac5-8d77-497d75e97c76", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "7676a47b-1452-4514-99f3-db1249d2e1cf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "face835c-3101-4ac5-8d77-497d75e97c76", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "778cb7be-b35a-431b-8b9c-85c7e8e65469", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "d2538ebd-e2ce-4755-ba0a-2bf2e254be00", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "778cb7be-b35a-431b-8b9c-85c7e8e65469", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "2a094ca6-8c36-4851-a1dc-bfbb7db157e6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "778cb7be-b35a-431b-8b9c-85c7e8e65469", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "a48d6d91-2e8d-4aff-a833-98d374d5e829", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "657834c6-564c-48cd-90f3-0a654e0ecad0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a48d6d91-2e8d-4aff-a833-98d374d5e829", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f13c233e-6eea-421b-be68-88c25a9e0f02", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a48d6d91-2e8d-4aff-a833-98d374d5e829", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "1e53ebf2-29bf-41dc-b447-5e8562f97a8b", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "5f92c141-8fef-48a9-9f8e-c73e985146b8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1e53ebf2-29bf-41dc-b447-5e8562f97a8b", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "70936ffe-604f-4a52-af3f-b8adf0502941", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1e53ebf2-29bf-41dc-b447-5e8562f97a8b", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "137e1fee-e8f6-499f-8e08-ced3ac0e44ed", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "9f52e505-e179-41be-a66f-7540bd746933", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "137e1fee-e8f6-499f-8e08-ced3ac0e44ed", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "9e7d6291-d8a6-45aa-8fec-6c97eef3bb2b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "137e1fee-e8f6-499f-8e08-ced3ac0e44ed", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "0740e753-f526-471f-a5c4-9882ec858bb1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "582fc4b3-b3da-43bf-b7d2-d729e2d5616c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "55ba8420-6cdf-4485-a29c-1794c2ac8d44", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "a0a5e0a7-ab4e-4bd9-a5aa-47795583e1f9", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "55ba8420-6cdf-4485-a29c-1794c2ac8d44", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "a931fe62-d1bb-4661-af0e-2367dff6f79e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "55ba8420-6cdf-4485-a29c-1794c2ac8d44", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "e3d6124f-a72f-4abd-bb7c-1734c08ca471", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "165ff8f9-7347-4cb1-b22e-48cf404958b5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e3d6124f-a72f-4abd-bb7c-1734c08ca471", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "70367dda-c5f3-4c6e-acfd-bc50d7e8f743", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e3d6124f-a72f-4abd-bb7c-1734c08ca471", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "4c2de224-b6d3-4354-aef6-ac7e60089e89", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "b1f36ff1-f322-435e-bc49-64a4d7311e38", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4c2de224-b6d3-4354-aef6-ac7e60089e89", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "dbfa433c-79e8-43a0-96e0-fcee6f270248", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4c2de224-b6d3-4354-aef6-ac7e60089e89", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "b72a8afd-72b9-4a76-8c2c-173286dacdc1", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "076969dd-b24f-4824-8e9e-6be8f65815da", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b72a8afd-72b9-4a76-8c2c-173286dacdc1", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "540cc0eb-ff97-474f-a9d8-9dcff64497c8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b72a8afd-72b9-4a76-8c2c-173286dacdc1", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "d7b3baf5-9f31-416b-ac0f-de9bca90d60e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "1660f58d-4ec4-4f4e-a0cd-521d7ef88479", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d7b3baf5-9f31-416b-ac0f-de9bca90d60e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0a5c61fe-8d75-48c1-b046-0e9c1a87ead0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d7b3baf5-9f31-416b-ac0f-de9bca90d60e", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "a42742d6-70a2-462d-bb6b-66bdfdc30a0d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "c8ab37aa-a65a-44be-a550-ba5149453351", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a42742d6-70a2-462d-bb6b-66bdfdc30a0d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "437948ba-9b31-42d8-885f-6e2b1b1bc17c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a42742d6-70a2-462d-bb6b-66bdfdc30a0d", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "e99bb026-b4da-4b3f-ae51-3fe387b81757", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "05af8e3a-7a08-4b79-aa26-cfc1f2544da6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e99bb026-b4da-4b3f-ae51-3fe387b81757", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "bc661fe9-22de-4b32-8fd5-5a8e6512ae6f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e99bb026-b4da-4b3f-ae51-3fe387b81757", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "e2fb0926-5dd1-4e21-ba04-27a0d35c57d6", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "adc8c0db-15be-41ce-94e1-d12f7b25c005", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e2fb0926-5dd1-4e21-ba04-27a0d35c57d6", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0a293e6d-2ba7-4e3c-bfc7-9b3f9c688191", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e2fb0926-5dd1-4e21-ba04-27a0d35c57d6", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "8184b047-3992-4f30-9b53-ec835acf0e46", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "6429e9a4-b07c-4f8c-a9e5-dee3793b0504", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8184b047-3992-4f30-9b53-ec835acf0e46", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "c395246f-0fdb-43e1-91f8-675d5f2d9d8e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8184b047-3992-4f30-9b53-ec835acf0e46", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "b952d932-78e5-4629-b113-8bee4d60d7ff", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "5e5198aa-d702-4528-8f7d-fff04656eb57", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b952d932-78e5-4629-b113-8bee4d60d7ff", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3c06b713-ad1a-4844-8a9f-c5db1af1137f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b952d932-78e5-4629-b113-8bee4d60d7ff", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "dd35adba-1568-4614-8b5d-3beb257ba943", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "72ed70cc-0282-4353-a550-e5c36b9f8cb0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "dd35adba-1568-4614-8b5d-3beb257ba943", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "503021db-108f-41e0-8097-e00835463d2c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "dd35adba-1568-4614-8b5d-3beb257ba943", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "adcd5e12-8fe9-4f12-b63c-69e6cb230a47", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "b7fb577f-3c4a-42ef-9887-3cd219207ef6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "adcd5e12-8fe9-4f12-b63c-69e6cb230a47", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "eff6d425-b860-41c7-ac1f-787aa6e1ad75", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "adcd5e12-8fe9-4f12-b63c-69e6cb230a47", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "fac8bf2b-317a-4d97-87aa-a82b1e367b54", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "d27cf762-35dd-4872-8764-bbc92650107e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "fac8bf2b-317a-4d97-87aa-a82b1e367b54", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "7cefd69c-af1f-4112-9834-8efa049e6010", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "fac8bf2b-317a-4d97-87aa-a82b1e367b54", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "ec92d6a7-2d39-4858-8a51-8c7c6ee5925d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "85c573b1-033e-4633-99cc-cf847a9c830e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ec92d6a7-2d39-4858-8a51-8c7c6ee5925d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "8fa53254-4aae-4820-8e9d-59e99c6e91c3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ec92d6a7-2d39-4858-8a51-8c7c6ee5925d", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "38ce098a-4d09-4dd3-a3db-068345b0f946", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "4395a2a0-0eb9-45db-b41c-4bc5afdd24ec", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "38ce098a-4d09-4dd3-a3db-068345b0f946", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "807c807a-5b36-42af-94f6-280879926ca1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "38ce098a-4d09-4dd3-a3db-068345b0f946", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "e85739a2-91a2-4e64-aa89-e5bfe98840f2", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3f3fcc21-fd9a-4306-a871-48b2f415a410", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "21c46e6e-dd05-45ae-ace3-961a2c7ec4b4", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "cc3c2ed0-f06d-4f25-8ff1-e55e104eae4c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "21c46e6e-dd05-45ae-ace3-961a2c7ec4b4", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "49f9b28b-8fab-440c-b94a-0df1564146f6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "21c46e6e-dd05-45ae-ace3-961a2c7ec4b4", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "378def89-d34d-4405-a5f5-2d16dcb9c410", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "6cf3d316-ca53-4a3a-8839-c1ddefdf43f1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "378def89-d34d-4405-a5f5-2d16dcb9c410", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e131ef98-a2da-4ce0-ba0e-c172cbe06aa2", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "378def89-d34d-4405-a5f5-2d16dcb9c410", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "728ef579-ae8b-4a23-b96f-a15dbeaf267f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "08ed0962-e12c-49fb-81b3-7e3edf21b0b8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "728ef579-ae8b-4a23-b96f-a15dbeaf267f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "7ff10d51-7155-414a-ac37-c7cc3c1d8f6c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "728ef579-ae8b-4a23-b96f-a15dbeaf267f", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "f8fbe72b-b9a8-4c2d-b921-ebd6e766fa32", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3d43c6ac-d5f8-474e-bf05-ae9ab804cd89", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "ffc96e9c-fbff-47c0-bfd2-ae47361135e5", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "6cef3c9d-0b15-40db-9fcb-26cf75452f83", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ffc96e9c-fbff-47c0-bfd2-ae47361135e5", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1e6b770f-d23d-42a8-9723-d6330a6e6d0b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ffc96e9c-fbff-47c0-bfd2-ae47361135e5", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "8ef19192-7161-41e6-8877-65db720af07e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "64ef6c8f-8186-4748-9c2b-3a7526b41273", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8ef19192-7161-41e6-8877-65db720af07e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "302be5d1-c1d4-4000-942c-0867cdae535c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8ef19192-7161-41e6-8877-65db720af07e", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + }, + { + "id": "aa20fb47-8580-4242-af3e-c1859f0accfe", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "compositeImage": { + "id": "7b928b36-2ed1-4d2e-8a62-9f135ed98027", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "aa20fb47-8580-4242-af3e-c1859f0accfe", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "030c6a4c-c19a-4d0f-a3bf-867628618b39", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "aa20fb47-8580-4242-af3e-c1859f0accfe", + "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 32, + "layers": [ + { + "id": "993fc71a-1863-4c01-93cb-615fa49362bc", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 32, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_block/ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc.png b/sprites/spr_block_shape/0489e482-a8bc-4db7-a76d-bfe130d123a3.png similarity index 100% rename from sprites/spr_block/ceee8a49-9fb6-42df-9fb9-9d5a9bb6d8dc.png rename to sprites/spr_block_shape/0489e482-a8bc-4db7-a76d-bfe130d123a3.png diff --git a/sprites/spr_block/742bf7ac-d484-4564-877e-a1b6753db6be.png b/sprites/spr_block_shape/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png similarity index 100% rename from sprites/spr_block/742bf7ac-d484-4564-877e-a1b6753db6be.png rename to sprites/spr_block_shape/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png diff --git a/sprites/spr_block/layers/742bf7ac-d484-4564-877e-a1b6753db6be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png similarity index 100% rename from sprites/spr_block/layers/742bf7ac-d484-4564-877e-a1b6753db6be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png diff --git a/sprites/spr_block/layers/2533757b-b298-47c2-ba4b-46063a63081d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/1191deec-4fa1-4663-af79-00b6177fd83e.png similarity index 100% rename from sprites/spr_block/layers/2533757b-b298-47c2-ba4b-46063a63081d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/1191deec-4fa1-4663-af79-00b6177fd83e.png diff --git a/sprites/spr_block/5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png b/sprites/spr_block_shape/1a3812af-5599-4a6f-aff6-6ee7d775a93d.png similarity index 100% rename from sprites/spr_block/5b93e3ff-90b6-4dc6-8614-0c4b73004ded.png rename to sprites/spr_block_shape/1a3812af-5599-4a6f-aff6-6ee7d775a93d.png diff --git a/sprites/spr_block/010be783-1cec-42e1-a60c-0fabfa129043.png b/sprites/spr_block_shape/1c015f46-bb21-4d72-933a-fc000856c139.png similarity index 100% rename from sprites/spr_block/010be783-1cec-42e1-a60c-0fabfa129043.png rename to sprites/spr_block_shape/1c015f46-bb21-4d72-933a-fc000856c139.png diff --git a/sprites/spr_block/21251641-be86-4820-8cd5-b9b0dc9df135.png b/sprites/spr_block_shape/24d9d25c-8f41-4e40-91e0-fa38ee9bb241.png similarity index 100% rename from sprites/spr_block/21251641-be86-4820-8cd5-b9b0dc9df135.png rename to sprites/spr_block_shape/24d9d25c-8f41-4e40-91e0-fa38ee9bb241.png diff --git a/sprites/spr_block/56ae952c-067a-45ca-9a10-28270b90b5a7.png b/sprites/spr_block_shape/2a66ba51-6191-4628-8a95-4f2dadb33b97.png similarity index 100% rename from sprites/spr_block/56ae952c-067a-45ca-9a10-28270b90b5a7.png rename to sprites/spr_block_shape/2a66ba51-6191-4628-8a95-4f2dadb33b97.png diff --git a/sprites/spr_block/fd392c9e-705c-41c8-820e-b21aaea252a5.png b/sprites/spr_block_shape/31705630-56fc-4717-aa82-3b3db883bc2e.png similarity index 100% rename from sprites/spr_block/fd392c9e-705c-41c8-820e-b21aaea252a5.png rename to sprites/spr_block_shape/31705630-56fc-4717-aa82-3b3db883bc2e.png diff --git a/sprites/spr_block/2b9ca9fc-5c11-4279-9801-bc201fa585bf.png b/sprites/spr_block_shape/3b9fbc7c-6833-4d26-99f8-8991977ecab8.png similarity index 100% rename from sprites/spr_block/2b9ca9fc-5c11-4279-9801-bc201fa585bf.png rename to sprites/spr_block_shape/3b9fbc7c-6833-4d26-99f8-8991977ecab8.png diff --git a/sprites/spr_block/a177c980-f438-489f-86ea-4e301ce86a0e.png b/sprites/spr_block_shape/419a54b5-a831-4448-ae3a-925a6a2d63d7.png similarity index 100% rename from sprites/spr_block/a177c980-f438-489f-86ea-4e301ce86a0e.png rename to sprites/spr_block_shape/419a54b5-a831-4448-ae3a-925a6a2d63d7.png diff --git a/sprites/spr_block/ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png b/sprites/spr_block_shape/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png similarity index 100% rename from sprites/spr_block/ec2ccfb8-139b-4079-bf5f-8b746c1581bf.png rename to sprites/spr_block_shape/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png diff --git a/sprites/spr_block/df7bf26d-12c0-4bc9-8428-5a06063a4f04.png b/sprites/spr_block_shape/69ebfe16-4cc5-4952-8977-5c510fce44ad.png similarity index 100% rename from sprites/spr_block/df7bf26d-12c0-4bc9-8428-5a06063a4f04.png rename to sprites/spr_block_shape/69ebfe16-4cc5-4952-8977-5c510fce44ad.png diff --git a/sprites/spr_block/200e2d06-de49-422f-b350-9dd356027870.png b/sprites/spr_block_shape/7518daa5-bf1d-4080-aee9-fb9957368a76.png similarity index 100% rename from sprites/spr_block/200e2d06-de49-422f-b350-9dd356027870.png rename to sprites/spr_block_shape/7518daa5-bf1d-4080-aee9-fb9957368a76.png diff --git a/sprites/spr_block/d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png b/sprites/spr_block_shape/7c2c4e2c-1c63-40a4-96de-8dd261a9afbb.png similarity index 100% rename from sprites/spr_block/d34a3ca1-3d4b-4cb6-b64c-631c053546e0.png rename to sprites/spr_block_shape/7c2c4e2c-1c63-40a4-96de-8dd261a9afbb.png diff --git a/sprites/spr_block/layers/010be783-1cec-42e1-a60c-0fabfa129043/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/81f77345-54c5-403d-bcac-7f47e44695c1.png similarity index 100% rename from sprites/spr_block/layers/010be783-1cec-42e1-a60c-0fabfa129043/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/81f77345-54c5-403d-bcac-7f47e44695c1.png diff --git a/sprites/spr_block/layers/a177c980-f438-489f-86ea-4e301ce86a0e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/82937588-f8bb-4e02-9909-abbd6f25f0c8.png similarity index 100% rename from sprites/spr_block/layers/a177c980-f438-489f-86ea-4e301ce86a0e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/82937588-f8bb-4e02-9909-abbd6f25f0c8.png diff --git a/sprites/spr_block/layers/200e2d06-de49-422f-b350-9dd356027870/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/846d3d7a-f4ce-4ce0-9d9d-72decd05b498.png similarity index 100% rename from sprites/spr_block/layers/200e2d06-de49-422f-b350-9dd356027870/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/846d3d7a-f4ce-4ce0-9d9d-72decd05b498.png diff --git a/sprites/spr_block/layers/df7bf26d-12c0-4bc9-8428-5a06063a4f04/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/96fcb7e5-783c-4fbd-9f31-776290f79e14.png similarity index 100% rename from sprites/spr_block/layers/df7bf26d-12c0-4bc9-8428-5a06063a4f04/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/96fcb7e5-783c-4fbd-9f31-776290f79e14.png diff --git a/sprites/spr_block/layers/91b8a957-d79c-4574-9f2e-18df23c7a6b5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/a0330a31-3b35-4c70-99ee-3168b6fc3edc.png similarity index 100% rename from sprites/spr_block/layers/91b8a957-d79c-4574-9f2e-18df23c7a6b5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/a0330a31-3b35-4c70-99ee-3168b6fc3edc.png diff --git a/sprites/spr_block/44c9c181-2263-427a-af5d-7cc86b691e18.png b/sprites/spr_block_shape/a3328f14-825b-463a-bd47-5ab454815f2d.png similarity index 100% rename from sprites/spr_block/44c9c181-2263-427a-af5d-7cc86b691e18.png rename to sprites/spr_block_shape/a3328f14-825b-463a-bd47-5ab454815f2d.png diff --git a/sprites/spr_block/layers/21251641-be86-4820-8cd5-b9b0dc9df135/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/ad6ede62-3ff7-4d4a-8942-0f64740718b9.png similarity index 100% rename from sprites/spr_block/layers/21251641-be86-4820-8cd5-b9b0dc9df135/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/ad6ede62-3ff7-4d4a-8942-0f64740718b9.png diff --git a/sprites/spr_block/layers/d34a3ca1-3d4b-4cb6-b64c-631c053546e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/ae0bbb1b-460a-4348-a21f-d56dc3b5942e.png similarity index 100% rename from sprites/spr_block/layers/d34a3ca1-3d4b-4cb6-b64c-631c053546e0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/ae0bbb1b-460a-4348-a21f-d56dc3b5942e.png diff --git a/sprites/spr_block/layers/ec2ccfb8-139b-4079-bf5f-8b746c1581bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/aff4abf7-9702-4bb5-8318-bd0665453dc4.png similarity index 100% rename from sprites/spr_block/layers/ec2ccfb8-139b-4079-bf5f-8b746c1581bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/aff4abf7-9702-4bb5-8318-bd0665453dc4.png diff --git a/sprites/spr_block/39d59e03-2445-49f5-a401-e05313c57ff1.png b/sprites/spr_block_shape/b20e7617-27aa-42d0-b20e-7b59e19d948a.png similarity index 100% rename from sprites/spr_block/39d59e03-2445-49f5-a401-e05313c57ff1.png rename to sprites/spr_block_shape/b20e7617-27aa-42d0-b20e-7b59e19d948a.png diff --git a/sprites/spr_block/layers/44c9c181-2263-427a-af5d-7cc86b691e18/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/b3f879ca-b3f8-4931-99d9-6368d1bb082d.png similarity index 100% rename from sprites/spr_block/layers/44c9c181-2263-427a-af5d-7cc86b691e18/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/b3f879ca-b3f8-4931-99d9-6368d1bb082d.png diff --git a/sprites/spr_block/layers/39d59e03-2445-49f5-a401-e05313c57ff1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/bf24468a-71df-461e-b733-02d2b326d01c.png similarity index 100% rename from sprites/spr_block/layers/39d59e03-2445-49f5-a401-e05313c57ff1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/bf24468a-71df-461e-b733-02d2b326d01c.png diff --git a/sprites/spr_block/layers/2b9ca9fc-5c11-4279-9801-bc201fa585bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_shape/cb790ae3-7320-49c4-aa40-0b8ddb500698.png similarity index 100% rename from sprites/spr_block/layers/2b9ca9fc-5c11-4279-9801-bc201fa585bf/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png rename to sprites/spr_block_shape/cb790ae3-7320-49c4-aa40-0b8ddb500698.png diff --git a/sprites/spr_block_shape/d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png b/sprites/spr_block_shape/d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png new file mode 100644 index 0000000000000000000000000000000000000000..c83bf3b27a27ba305396b595e6c62e479a9363df GIT binary patch literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~hPChlCd?=zIKB%?ok9% zK@ouGQ`JCmm)j2!2`_E=SoB>RFAhn5l96l0A|S1Sk6QBoO9O=RdGww^zD#9DyY{`&VlHh zi#dQ=Qv^~$&4GoO-R9FCjd~UB|A!HMb+&VWHVQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211 GIT binary patch literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/1191deec-4fa1-4663-af79-00b6177fd83e/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/1191deec-4fa1-4663-af79-00b6177fd83e/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..80f42a19b3c520dc8c305a2b81b5cbc97132fed4 GIT binary patch literal 364 zcmV-y0h9iTP)lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~h%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/1c015f46-bb21-4d72-933a-fc000856c139/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/1c015f46-bb21-4d72-933a-fc000856c139/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..32443c1dee919ce81a89bdd7cda43d00e555b162 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdAr*6y6D1N37`(UT9zV1Hz<*-=-AGa=F-~2Km*jJ>|Rnn8=|FPOd zPu7|!JX^c_qs&!CX4VIM75{#+&p7r}Si*r{GU)01{XZM-g2fwl@`$;&Jem_xIir%t zU!gE>sRrY+^ZR%91Fc~yVAts4Xn6TMVEQ43qlJ8?{9;BMwzNG2%N+Qm%2d#BQaoN^ z&*$augVp*I?Pf8vaczj%|FNOaLDpcxw0@AQ7xPJ!GH@_3JmSgh6LER@4d^`vPgg&e IbxsLQ0MvbHE&u=k literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/24d9d25c-8f41-4e40-91e0-fa38ee9bb241/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/24d9d25c-8f41-4e40-91e0-fa38ee9bb241/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..c83bf3b27a27ba305396b595e6c62e479a9363df GIT binary patch literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9QKD35iG&xo!zSh?6P1HoRP@=yey&{p{_-`(D{Ly(49`AqUB15gWkRs8h#fQY zw+RbpF|XkDC_Aw6^#qHypEAdm&j#}wrY=*O;pWf0VM4{n)?<7N%oMD77ko}sEUvpT zo!Maip_+9X%$kz!ah45oLM6ovTNzLCIrM*?7|wU6{*z3reH35Mog#*3#a~Pui`fID zC&co}>}K@+D>cF7AOmmb!+5>}HGSvWTaWydUb3`vp*YhdrKX6Z@Av<7kO!%L)9^We eAO9MlLl{iw#)j!NEieRnn8DN4&t;ucLK6VcXl@Ar literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/31705630-56fc-4717-aa82-3b3db883bc2e/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/31705630-56fc-4717-aa82-3b3db883bc2e/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..727399e07ce031367df851ee22384ca6fc54e58a GIT binary patch literal 423 zcmV;Y0a*TtP)pWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/3b9fbc7c-6833-4d26-99f8-8991977ecab8/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/3b9fbc7c-6833-4d26-99f8-8991977ecab8/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..c83bf3b27a27ba305396b595e6c62e479a9363df GIT binary patch literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP95dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/69ebfe16-4cc5-4952-8977-5c510fce44ad/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/69ebfe16-4cc5-4952-8977-5c510fce44ad/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..8c03e3be314960a3bd0f39bc296b258bc73524a0 GIT binary patch literal 308 zcmV-40n7f0P)0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000nRyU4%TBa)K@)Ho$$JX`5YLI{lB^epvu%u>mmi zr){h4Ls?kkBynd(3_x0JfVv%PjG1G6HUMd{0jff2OVSs<98js9UTt+!dLTyIS-KcXYmO@ETy5RSM+u|bGl}r|9dL-^>*y@zjq$szJQt2 zF*4y>?P37Z;{O+{ubublS8g!?X|VyC;XN*Zw7vlOA+2Vw|Hldd00005dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000(UT9zV1Hz<*-=-AGa=F-~2Km*jJ>|Rnn8=|FPOd zPu7|!JX^c_qs&!CX4VIM75{#+&p7r}Si*r{GU)01{XZM-g2fwl@`$;&Jem_xIir%t zU!gE>sRrY+^ZR%91Fc~yVAts4Xn6TMVEQ43qlJ8?{9;BMwzNG2%N+Qm%2d#BQaoN^ z&*$augVp*I?Pf8vaczj%|FNOaLDpcxw0@AQ7xPJ!GH@_3JmSgh6LER@4d^`vPgg&e IbxsLQ0MvbHE&u=k literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/82937588-f8bb-4e02-9909-abbd6f25f0c8/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/82937588-f8bb-4e02-9909-abbd6f25f0c8/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8a6c5e2cb260a54eb7999b85aab3773a506ad9 GIT binary patch literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000nRyU4%TBa)K@)Ho$$JX`5YLI{lB^epvu%u>mmi zr){h4Ls?kkBynd(3_x0JfVv%PjG1G6HUMd{0jff2OVSs<98js9UTt+!dLTyIS-KcXYmO@ETy5RSM+u|bGl}r|9dL-^>*y@zjq$szJQt2 zF*4y>?P37Z;{O+{ubublS8g!?X|VyC;XN*Zw7vlOA+2Vw|Hldd00000>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~h}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^xh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP95dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/b20e7617-27aa-42d0-b20e-7b59e19d948a/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/b20e7617-27aa-42d0-b20e-7b59e19d948a/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..b5d50bfeb2077c30fcba2c990d61549b1141c511 GIT binary patch literal 406 zcmV;H0crk;P)0nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^x0nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(Fh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9h;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~hQKD35iG&xo!zSh?6P1HoRP@=yey&{p{_-`(D{Ly(49`AqUB15gWkRs8h#fQY zw+RbpF|XkDC_Aw6^#qHypEAdm&j#}wrY=*O;pWf0VM4{n)?<7N%oMD77ko}sEUvpT zo!Maip_+9X%$kz!ah45oLM6ovTNzLCIrM*?7|wU6{*z3reH35Mog#*3#a~Pui`fID zC&co}>}K@+D>cF7AOmmb!+5>}HGSvWTaWydUb3`vp*YhdrKX6Z@Av<7kO!%L)9^We eAO9MlLl{iw#)j!NEieRnn8DN4&t;ucLK6VcXl@Ar literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/f07a1190-33bf-4050-819f-561b9725dcf3/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/f07a1190-33bf-4050-819f-561b9725dcf3/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..bd78e35642a120ceea9db28395580b534ad0067e GIT binary patch literal 418 zcmV;T0bTxyP)PChlCd?=zIKB%?ok9% zK@ouGQ`JCmm)j2!2`_E=SoB>RFAhn5l96l0A|S1Sk6QBoO9O=RdGww^zD#9DyY{`&VlHh zi#dQ=Qv^~$&4GoO-R9FCjd~UB|A!HMb+&VWHpWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/fae1e21c-8265-4c14-8d90-cfe248fa2263/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/fae1e21c-8265-4c14-8d90-cfe248fa2263/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..f87fc85521d85f5211fc2c7bfe824142be081202 GIT binary patch literal 437 zcmV;m0ZRUfP)%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/spr_block_shape.yy b/sprites/spr_block_shape/spr_block_shape.yy new file mode 100644 index 000000000..306d13a09 --- /dev/null +++ b/sprites/spr_block_shape/spr_block_shape.yy @@ -0,0 +1,796 @@ +{ + "id": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_block_shape", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 31, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "d44c2077-1a8a-4a9b-8051-1b4bd83d6988", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "0e698723-5a10-4ec6-abf6-1da2f4b6834d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d44c2077-1a8a-4a9b-8051-1b4bd83d6988", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e222da84-f1eb-465b-9c46-1cd3794260b8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d44c2077-1a8a-4a9b-8051-1b4bd83d6988", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "82937588-f8bb-4e02-9909-abbd6f25f0c8", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "7cfa7c20-cea4-47c1-a893-744f6726ca6c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "82937588-f8bb-4e02-9909-abbd6f25f0c8", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "877ddf1f-a33a-4dc8-a1b0-37f0043ed1c7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "82937588-f8bb-4e02-9909-abbd6f25f0c8", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "0ac53d40-d867-4137-bcc9-aa0bae9cf8ff", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "27df5f43-b452-41a1-a3fe-09f6cc65913b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0ac53d40-d867-4137-bcc9-aa0bae9cf8ff", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "a435bbf8-e924-4b57-96fe-a565fd088642", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0ac53d40-d867-4137-bcc9-aa0bae9cf8ff", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "96fcb7e5-783c-4fbd-9f31-776290f79e14", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "f7e861e3-bb0e-409a-bcc6-b271fa006443", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "96fcb7e5-783c-4fbd-9f31-776290f79e14", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "b0ca09a1-9d92-41fb-ae35-4394c1edb03b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "96fcb7e5-783c-4fbd-9f31-776290f79e14", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "2a66ba51-6191-4628-8a95-4f2dadb33b97", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "1fb9e3d1-b72f-45cf-950e-1f08c37891e8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "2a66ba51-6191-4628-8a95-4f2dadb33b97", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "2ebde10d-4aff-4c32-9ce5-9e53b2bb2d70", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "2a66ba51-6191-4628-8a95-4f2dadb33b97", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "a3328f14-825b-463a-bd47-5ab454815f2d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "39e511dc-3b03-4267-b0c2-df272408c2ff", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a3328f14-825b-463a-bd47-5ab454815f2d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "13368a1b-8635-4c34-ade3-676249fbed83", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a3328f14-825b-463a-bd47-5ab454815f2d", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "b20e7617-27aa-42d0-b20e-7b59e19d948a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "af790356-edfa-4c2c-b61b-9d2fdd411075", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b20e7617-27aa-42d0-b20e-7b59e19d948a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e8a0c918-9688-4d35-8b48-d733a90a2386", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b20e7617-27aa-42d0-b20e-7b59e19d948a", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "a0330a31-3b35-4c70-99ee-3168b6fc3edc", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "90974923-a6c8-41ad-a82f-990a22c8427c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a0330a31-3b35-4c70-99ee-3168b6fc3edc", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e7721bab-2c62-4dca-a66f-28269b0a2383", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a0330a31-3b35-4c70-99ee-3168b6fc3edc", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "1a3812af-5599-4a6f-aff6-6ee7d775a93d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "e57ef317-6ea2-4d5d-906f-0edac39e41e0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1a3812af-5599-4a6f-aff6-6ee7d775a93d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0233aa43-b129-409f-8e60-4a716287d6c3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1a3812af-5599-4a6f-aff6-6ee7d775a93d", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "0489e482-a8bc-4db7-a76d-bfe130d123a3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "773f24ee-0458-47dc-8cb7-6a8f822160bd", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0489e482-a8bc-4db7-a76d-bfe130d123a3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "7179d5b4-6850-4b44-887e-a329b27a3f52", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0489e482-a8bc-4db7-a76d-bfe130d123a3", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "1c015f46-bb21-4d72-933a-fc000856c139", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "8b424668-ca7e-401c-a1e2-0dacce1e8aac", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1c015f46-bb21-4d72-933a-fc000856c139", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0af22de0-4470-4469-888e-7f6e77da14e0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1c015f46-bb21-4d72-933a-fc000856c139", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "d8b7d45a-93ce-4235-8af1-db02b0fa5630", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "6ddeb638-f96a-4972-830b-6db9713c231d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "aff4abf7-9702-4bb5-8318-bd0665453dc4", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "835b8676-58ff-4c25-9ab9-ade6a7dc7170", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "aff4abf7-9702-4bb5-8318-bd0665453dc4", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "03e1f625-ac92-4a82-bf9a-b6c847c30e32", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "aff4abf7-9702-4bb5-8318-bd0665453dc4", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "7518daa5-bf1d-4080-aee9-fb9957368a76", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "d517f530-6a1e-4e87-b9f5-5687713fafe9", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7518daa5-bf1d-4080-aee9-fb9957368a76", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "dbdb7a57-4d95-4c60-9d51-90bfe3b1f5dc", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7518daa5-bf1d-4080-aee9-fb9957368a76", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "ae0bbb1b-460a-4348-a21f-d56dc3b5942e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "709290db-9199-4e78-8708-5da077b4f0b8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ae0bbb1b-460a-4348-a21f-d56dc3b5942e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d6c9ff9a-04bc-410e-8cad-405f3b2dd61b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ae0bbb1b-460a-4348-a21f-d56dc3b5942e", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "cb790ae3-7320-49c4-aa40-0b8ddb500698", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "8a54c6ac-aecc-4225-a86a-fd09ff344f2b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cb790ae3-7320-49c4-aa40-0b8ddb500698", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "811facf8-df4f-4e85-8b30-6b070bff33ae", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "cb790ae3-7320-49c4-aa40-0b8ddb500698", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "ad6ede62-3ff7-4d4a-8942-0f64740718b9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "e890ca37-fbad-4c2c-a992-28ecf6a60342", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ad6ede62-3ff7-4d4a-8942-0f64740718b9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "45001d84-0b56-4f1f-9d03-3807a1350bf6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ad6ede62-3ff7-4d4a-8942-0f64740718b9", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "419a54b5-a831-4448-ae3a-925a6a2d63d7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "28752b5d-3fe1-47b6-b222-b41c6eced1e9", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "419a54b5-a831-4448-ae3a-925a6a2d63d7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "434bedcd-747f-4792-9ea4-eff9a1d533d5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "419a54b5-a831-4448-ae3a-925a6a2d63d7", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "0d6a16ba-5b3e-4cff-b54c-4fa2351f5311", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "f6c9e193-743a-4bd1-bee9-5337e7f12363", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0d6a16ba-5b3e-4cff-b54c-4fa2351f5311", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "4920fae9-9ddf-44b0-aad4-194c65ca1d92", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0d6a16ba-5b3e-4cff-b54c-4fa2351f5311", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "69ebfe16-4cc5-4952-8977-5c510fce44ad", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "c94ae503-23ef-446d-98d5-44919a183e97", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "69ebfe16-4cc5-4952-8977-5c510fce44ad", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "c472a275-bf06-4c28-ae31-adc0e3d64e19", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "69ebfe16-4cc5-4952-8977-5c510fce44ad", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "ebcf8ece-d170-46f5-a07e-65d5e93d80da", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "b3515dfb-8618-451e-8450-baa872184d0b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ebcf8ece-d170-46f5-a07e-65d5e93d80da", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "92116b7f-49a5-45d5-88d5-b381251947c5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ebcf8ece-d170-46f5-a07e-65d5e93d80da", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "b3f879ca-b3f8-4931-99d9-6368d1bb082d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "a5123cda-d894-4625-a49a-54a091cb264f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b3f879ca-b3f8-4931-99d9-6368d1bb082d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "82306b7c-d4fb-4221-900d-c10209ad6ea7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b3f879ca-b3f8-4931-99d9-6368d1bb082d", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "bf24468a-71df-461e-b733-02d2b326d01c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "dea9d278-b4e4-4e8b-be8b-b41d0ce09150", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "bf24468a-71df-461e-b733-02d2b326d01c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "19a93ee8-32cc-4b6e-8a08-2364ea1b3bf8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "bf24468a-71df-461e-b733-02d2b326d01c", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "e791ba50-55e5-4c7b-8d47-de1c7cc1658a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "ca3b2fa8-316e-430f-81ae-f0dedfd59472", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e791ba50-55e5-4c7b-8d47-de1c7cc1658a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "eef24ec9-f0dd-45f9-b3c3-ba8be98b5065", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e791ba50-55e5-4c7b-8d47-de1c7cc1658a", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "fae1e21c-8265-4c14-8d90-cfe248fa2263", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "ee56aeb7-d28d-4576-9e54-0627f1feb726", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "fae1e21c-8265-4c14-8d90-cfe248fa2263", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "136477f8-2c75-46eb-b267-f16365f35582", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "fae1e21c-8265-4c14-8d90-cfe248fa2263", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "f07a1190-33bf-4050-819f-561b9725dcf3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "e1f698e3-b958-4ad6-8a00-c909a95cb4c4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f07a1190-33bf-4050-819f-561b9725dcf3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ce1d0ff9-b120-4a1c-8e64-63932ec148d4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f07a1190-33bf-4050-819f-561b9725dcf3", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "81f77345-54c5-403d-bcac-7f47e44695c1", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "24a7c0c8-c9de-4be9-af1f-8054e00dee50", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "81f77345-54c5-403d-bcac-7f47e44695c1", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e5bc198e-733f-409b-ab2c-2da7d2c2405c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "81f77345-54c5-403d-bcac-7f47e44695c1", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "31705630-56fc-4717-aa82-3b3db883bc2e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "01ab0240-913a-4d44-860f-919bea2f7bb3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "31705630-56fc-4717-aa82-3b3db883bc2e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0b506a69-bf46-4a20-8369-e4b12ad4dc25", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "31705630-56fc-4717-aa82-3b3db883bc2e", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "f4073ff2-5607-4f9c-9c9c-708d3f3ecf16", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "5c7ad329-f5b3-401d-bf14-ffa369c0a197", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "846d3d7a-f4ce-4ce0-9d9d-72decd05b498", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "0027711c-65cb-47e9-8c28-b0e5e3806bc3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "846d3d7a-f4ce-4ce0-9d9d-72decd05b498", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "22a1ce43-310a-4723-b5a0-f36267228202", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "846d3d7a-f4ce-4ce0-9d9d-72decd05b498", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "7c2c4e2c-1c63-40a4-96de-8dd261a9afbb", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "81af8b6c-ca77-42f3-bb63-1ebaab81b347", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7c2c4e2c-1c63-40a4-96de-8dd261a9afbb", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "2ae1ae74-d74a-4651-b342-f42254a2e77f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7c2c4e2c-1c63-40a4-96de-8dd261a9afbb", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "24d9d25c-8f41-4e40-91e0-fa38ee9bb241", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "85fce888-61a4-4608-a2c0-167120b8d1ef", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "24d9d25c-8f41-4e40-91e0-fa38ee9bb241", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f9c1e922-5c31-41ae-9602-6999bc14a041", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "24d9d25c-8f41-4e40-91e0-fa38ee9bb241", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "1191deec-4fa1-4663-af79-00b6177fd83e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "64191ede-84a3-4ce9-9404-397ce35a176c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1191deec-4fa1-4663-af79-00b6177fd83e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "cf71ef4e-2a9a-46d3-8e5e-4fe6221e4e96", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1191deec-4fa1-4663-af79-00b6177fd83e", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + }, + { + "id": "3b9fbc7c-6833-4d26-99f8-8991977ecab8", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "compositeImage": { + "id": "a8633dad-04ea-44bd-83c7-1774b5bb5392", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3b9fbc7c-6833-4d26-99f8-8991977ecab8", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "203d8a0a-d5e0-41e5-8394-7cc3a86669c1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3b9fbc7c-6833-4d26-99f8-8991977ecab8", + "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 32, + "layers": [ + { + "id": "c2a23d00-710e-4725-ae3e-92724d4af847", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 32, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy b/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy index e8d068f3c..61eec266f 100644 --- a/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy +++ b/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy @@ -4,7 +4,10 @@ "mvc": "1.1", "name": "a06987e4-dfbe-495d-83c7-d42257967bb5", "children": [ + "d6ca26e6-4a91-4de7-b4d1-c7f1fe4ed031", "91f6b839-aba4-422a-9992-a736e55fb77f", + "bd9644ee-a5d9-438b-ade9-63a01bd686b1", + "e75662af-0378-424e-9585-ecaa16921eab", "f6c72d6f-a880-4b21-bb5f-f5fcf13b3af6", "a5ad8905-a99c-48c3-845b-3485c00b826d", "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d" From c103740aad412abc2135a150c89ed306c100c554 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 23 Jun 2020 20:21:25 -0300 Subject: [PATCH 43/86] Draw colored custom instruments Closes #74 --- scripts/draw_block/draw_block.gml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/draw_block/draw_block.gml b/scripts/draw_block/draw_block.gml index e11826d6b..022bdd05b 100644 --- a/scripts/draw_block/draw_block.gml +++ b/scripts/draw_block/draw_block.gml @@ -1,5 +1,5 @@ // draw_block(x, y, ins, key, pan, vel, pit, alpha, selalpha) -var xx, yy, ins, key, pan, vel, pit, alpha, salpha, index, frame; +var xx, yy, ins, key, pan, vel, pit, alpha, salpha, index, sprite, frame; xx = argument0 yy = argument1 ins = argument2 @@ -11,24 +11,26 @@ alpha = argument7 salpha = argument8 index = ds_list_find_index(instrument_list, ins) +frame = index //If index isnt found, don't draw if(index = -1)return; if (use_colors) { - if (!use_shapes) { - frame = index + if (use_shapes) { + sprite = spr_block_color_shape } else { - frame = index + 32 + sprite = spr_block_color } } else { - if (!use_shapes) { - frame = 48 + if (use_shapes) { + sprite = spr_block_shape } else { - frame = index + 16 + sprite = spr_block + frame = 1 } } -draw_sprite_ext(spr_block, frame, xx, yy, 1, 1, 0, -1, alpha) +draw_sprite_ext(sprite, frame, xx, yy, 1, 1, 0, -1, alpha) draw_set_alpha(1) if (use_icons) { draw_sprite_ext(spr_instrumenticons, index, xx + 16, yy + 16, 1, 1, 0, -1, alpha) From 75d140dd2865698cb74e050a16ab96ffdaadec1a Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 24 Jun 2020 20:29:18 -0300 Subject: [PATCH 44/86] Fix left margins on fullscreen mode --- scripts/control_draw/control_draw.gml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index e8ac06a02..60dfdb152 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -99,7 +99,7 @@ if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { } } keysshow = min(keysmax, floor((rw - 32) / 39)) -x1 = 4 +x1 = 0 if (!fullscreen && show_layers) { x1 = 264 } @@ -797,16 +797,19 @@ draw_sprite_ext(spr_marker, 1 + 6 * (theme = 2), x1 + 2 + a, y1 + 2, 1, totalrow draw_set_font(fnt_main) -draw_set_color(15790320) -if (theme = 1) draw_set_color(13160660) -if (theme = 2) draw_set_color(c_dark) -draw_rectangle(0, 0, x1, rh, 0) -draw_rectangle(0, 0, rw, y1, 0) -draw_rectangle(0, y1 + totalrows * 32 + 52, rw, rh, 0) -draw_rectangle(x1 + totalcols * 32 + 20, 0, rw, rh, 0) -draw_rectangle(x1 + totalcols * 32 + 2, y1 + totalrows * 32 + 32, x1 + totalcols * 32 + 2 + 17, y1 + totalrows * 32 + 32 + 18, 0) -draw_area(x1, y1, x1 + totalcols * 32 + 20, y1 + totalrows * 32 + 52) +if (!fullscreen) { + draw_set_color(15790320) + if (theme = 1) draw_set_color(13160660) + if (theme = 2) draw_set_color(c_dark) + draw_rectangle(0, 0, x1, rh, 0) + draw_rectangle(0, 0, rw, y1, 0) + draw_rectangle(0, y1 + totalrows * 32 + 52, rw, rh, 0) + draw_rectangle(x1 + totalcols * 32 + 20, 0, rw, rh, 0) + draw_rectangle(x1 + totalcols * 32 + 2, y1 + totalrows * 32 + 32, x1 + totalcols * 32 + 2 + 17, y1 + totalrows * 32 + 32 + 18, 0) + draw_area(x1, y1, x1 + totalcols * 32 + 20, y1 + totalrows * 32 + 52) +} draw_theme_color() + // Scrollbars starta = draw_scrollbar(scrollbarh, x1, y1 + totalrows * 32 + 34, 32, totalcols - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) startb = draw_scrollbar(scrollbarv, x1 + totalcols * 32 + 2, y1 + 34, 32, totalrows - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) From 6162e3c7f9f3de0453e2f088c5d7e1f866d30ae3 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 25 Jun 2020 00:02:53 -0300 Subject: [PATCH 45/86] Clip scrollbars to the bottom/right edges of screen in fullscreen mode --- scripts/control_draw/control_draw.gml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 60dfdb152..22ce9c7b4 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -811,8 +811,15 @@ if (!fullscreen) { draw_theme_color() // Scrollbars -starta = draw_scrollbar(scrollbarh, x1, y1 + totalrows * 32 + 34, 32, totalcols - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) -startb = draw_scrollbar(scrollbarv, x1 + totalcols * 32 + 2, y1 + 34, 32, totalrows - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) +if (!fullscreen) { + starta = draw_scrollbar(scrollbarh, x1, y1 + totalrows * 32 + 34, 32, totalcols - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) + startb = draw_scrollbar(scrollbarv, x1 + totalcols * 32 + 2, y1 + 34, 32, totalrows - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) +} else { + starta = draw_scrollbar(scrollbarh, 0, rh - 16, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) + startb = draw_scrollbar(scrollbarv, rw - 16, 34, 32, ((rh - rhval - 8) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) + // the fifth parameters are totalrows & totalcols before rounding: ((rh - rhval) / 32), ((rw - 8) / 32) + // this is so it stretches to fill the whole width/height of the screen instead of clipping to the note block area size +} // Draw layers for (b = 0; b < totalrows; b += 1) { From ef3b88a9a9f371885e163c29b9d12b1e6e175420 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 25 Jun 2020 04:53:14 -0300 Subject: [PATCH 46/86] Make scrollbars only appear when the mouse is near the edge of the screen --- scripts/control_draw/control_draw.gml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 22ce9c7b4..c380c5c09 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -815,8 +815,12 @@ if (!fullscreen) { starta = draw_scrollbar(scrollbarh, x1, y1 + totalrows * 32 + 34, 32, totalcols - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) startb = draw_scrollbar(scrollbarv, x1 + totalcols * 32 + 2, y1 + 34, 32, totalrows - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) } else { - starta = draw_scrollbar(scrollbarh, 0, rh - 16, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) - startb = draw_scrollbar(scrollbarv, rw - 16, 34, 32, ((rh - rhval - 8) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) + if mouse_rectangle(0, rh - 25, rw, rh) { + starta = draw_scrollbar(scrollbarh, 0, rh - 16, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) + } + if mouse_rectangle(rw - 25, 0, rw, rh) { + startb = draw_scrollbar(scrollbarv, rw - 16, 34, 32, ((rh - rhval - 8) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) + } // the fifth parameters are totalrows & totalcols before rounding: ((rh - rhval) / 32), ((rw - 8) / 32) // this is so it stretches to fill the whole width/height of the screen instead of clipping to the note block area size } From 4feb56e59e4f96be7648d17e77e5dc63ec406a88 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 25 Jun 2020 05:11:19 -0300 Subject: [PATCH 47/86] Add scrollbar appearing animation in fullscreen mode --- scripts/control_create/control_create.gml | 2 ++ scripts/control_draw/control_draw.gml | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 650e1db27..845593a00 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -235,6 +235,8 @@ midi_sb3 = create_scrollbar(1) midi_sb4 = create_scrollbar(1) sch_exp_scrollbar = create_scrollbar(1) update_scrollbar = create_scrollbar(1) +sbh_anim = 0 +sbv_anim = 0 delay = 0 insedit = -1 insselect = -1 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index c380c5c09..022229f29 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -815,12 +815,20 @@ if (!fullscreen) { starta = draw_scrollbar(scrollbarh, x1, y1 + totalrows * 32 + 34, 32, totalcols - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) startb = draw_scrollbar(scrollbarv, x1 + totalcols * 32 + 2, y1 + 34, 32, totalrows - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) } else { - if mouse_rectangle(0, rh - 25, rw, rh) { - starta = draw_scrollbar(scrollbarh, 0, rh - 16, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) + // horizontal rise animation + if (mouse_rectangle(0, rh - 25, rw, rh)) { + if (sbh_anim < 16) sbh_anim += (2 * 30 / room_speed) + } else { + if (sbh_anim > 0) sbh_anim -= (2 * 30 / room_speed) } - if mouse_rectangle(rw - 25, 0, rw, rh) { - startb = draw_scrollbar(scrollbarv, rw - 16, 34, 32, ((rh - rhval - 8) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) + // vertical rise animation + if (mouse_rectangle(rw - 25, 0, rw, rh)) { + if (sbv_anim < 16) sbv_anim += (2 * 30 / room_speed) + } else { + if (sbv_anim > 0) sbv_anim -= (2 * 30 / room_speed) } + starta = draw_scrollbar(scrollbarh, 0, rh - sbh_anim, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) + startb = draw_scrollbar(scrollbarv, rw - sbv_anim, 34, 32, ((rh - rhval - 8) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) // the fifth parameters are totalrows & totalcols before rounding: ((rh - rhval) / 32), ((rw - 8) / 32) // this is so it stretches to fill the whole width/height of the screen instead of clipping to the note block area size } From 96e8ccc0d3ba4ead1742d3813cb4c2d66a64d1b0 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 25 Jun 2020 06:59:15 -0300 Subject: [PATCH 48/86] Fix fullscreen margins --- scripts/control_draw/control_draw.gml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 022229f29..d494188e2 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -80,14 +80,14 @@ if (theme = 2) iconcolor = c_white if (!fullscreen && show_layers) { totalcols = floor((rw - 8 - 270) / 32) } else { - totalcols = floor((rw - 8) / 32) + totalcols = floor((rw + 10) / 32) } rhval = 270 if (!show_piano) { rhval = 130 } if (fullscreen) { - rhval = 42 + rhval = 34 } totalrows = floor((rh - rhval) / 32) if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { @@ -99,12 +99,12 @@ if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { } } keysshow = min(keysmax, floor((rw - 32) / 39)) -x1 = 0 +x1 = -2 if (!fullscreen && show_layers) { x1 = 264 } if (fullscreen) { - y1 = 0 + y1 = -2 } else { y1 = 52 } @@ -828,7 +828,7 @@ if (!fullscreen) { if (sbv_anim > 0) sbv_anim -= (2 * 30 / room_speed) } starta = draw_scrollbar(scrollbarh, 0, rh - sbh_anim, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) - startb = draw_scrollbar(scrollbarv, rw - sbv_anim, 34, 32, ((rh - rhval - 8) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) + startb = draw_scrollbar(scrollbarv, rw - sbv_anim, 34, 32, ((rh - rhval - 16) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) // the fifth parameters are totalrows & totalcols before rounding: ((rh - rhval) / 32), ((rw - 8) / 32) // this is so it stretches to fill the whole width/height of the screen instead of clipping to the note block area size } From 0c1a7eb0d5dc2ac21a50f64d6f17b5aadc162ab9 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 25 Jun 2020 07:43:54 -0300 Subject: [PATCH 49/86] Fix fullscreen mode drawing one less row/column than needed --- scripts/control_draw/control_draw.gml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index d494188e2..116a9b702 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -80,16 +80,17 @@ if (theme = 2) iconcolor = c_white if (!fullscreen && show_layers) { totalcols = floor((rw - 8 - 270) / 32) } else { - totalcols = floor((rw + 10) / 32) + totalcols = floor(rw / 32) + 1 } rhval = 270 if (!show_piano) { rhval = 130 } if (fullscreen) { - rhval = 34 + rhval = 32 } totalrows = floor((rh - rhval) / 32) +if (fullscreen) totalrows += 1 if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { startkey = 27 - floor(min(keysmax, floor((rw - 32) / 39)) / 2) sharpkeys = 0 @@ -827,8 +828,8 @@ if (!fullscreen) { } else { if (sbv_anim > 0) sbv_anim -= (2 * 30 / room_speed) } - starta = draw_scrollbar(scrollbarh, 0, rh - sbh_anim, 32, ((rw - 16) / 32) - 1, enda + totalcols - 1, (exist && changepitch) || mousewheel > 0, 0) - startb = draw_scrollbar(scrollbarv, rw - sbv_anim, 34, 32, ((rh - rhval - 16) / 32) - 1, endb + totalrows - 1, (exist && changepitch) || mousewheel > 0, 0) + starta = draw_scrollbar(scrollbarh, 0, rh - sbh_anim, 32, ((rw - 16) / 32) - 1, enda + totalcols - 2, (exist && changepitch) || mousewheel > 0, 0) + startb = draw_scrollbar(scrollbarv, rw - sbv_anim, rhval, 32, ((rh - rhval - 16) / 32) - 1, endb + totalrows - 2, (exist && changepitch) || mousewheel > 0, 0) // the fifth parameters are totalrows & totalcols before rounding: ((rh - rhval) / 32), ((rw - 8) / 32) // this is so it stretches to fill the whole width/height of the screen instead of clipping to the note block area size } From 2713cffd7cbe106c1be0fe224fe6a00048d609ae Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 25 Jun 2020 07:45:43 -0300 Subject: [PATCH 50/86] Prevent scrollbars from hiding while they're being dragged --- scripts/control_draw/control_draw.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 116a9b702..970b28f52 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -819,13 +819,13 @@ if (!fullscreen) { // horizontal rise animation if (mouse_rectangle(0, rh - 25, rw, rh)) { if (sbh_anim < 16) sbh_anim += (2 * 30 / room_speed) - } else { + } else if (sb_drag = -1) { if (sbh_anim > 0) sbh_anim -= (2 * 30 / room_speed) } // vertical rise animation if (mouse_rectangle(rw - 25, 0, rw, rh)) { if (sbv_anim < 16) sbv_anim += (2 * 30 / room_speed) - } else { + } else if (sb_drag = -1) { if (sbv_anim > 0) sbv_anim -= (2 * 30 / room_speed) } starta = draw_scrollbar(scrollbarh, 0, rh - sbh_anim, 32, ((rw - 16) / 32) - 1, enda + totalcols - 2, (exist && changepitch) || mousewheel > 0, 0) From fb389c00cdb1c335735bf2fc12da047c6015f741 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 04:25:16 -0300 Subject: [PATCH 51/86] Add y parameter to toolbar icons Minor improvement to code modularity. --- scripts/control_draw/control_draw.gml | 68 +++++++++++++-------------- scripts/draw_icon/draw_icon.gml | 23 ++++----- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 970b28f52..6c51c7b3c 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1101,55 +1101,53 @@ draw_sprite(spr_iconbar, 0, 0, 20) draw_sprite_ext(spr_iconbar, 1, 2, 20, (rw - 4), 1, 0, -1, 1) draw_sprite(spr_iconbar, 2, rw - 2, 20) xx = 6 -if (draw_icon(icons.NEW, xx, "New song", 0, 0)) {new_song()} xx += 25 -if (draw_icon(icons.OPEN, xx, "Open song", 0, 0)) {playing = 0 load_song("")} xx += 25 -if (draw_icon(icons.SAVE, xx, "Save song", 0, 0)) {save_song(filename)} xx += 25 + 4 -draw_separator(xx, 26) xx += 4 -if (draw_icon(icons.PLAY + playing, xx, "Play / Pause song", 0, 0)) toggle_playing(totalcols) timestoloop = real(loopmax) +yy = 23 +if (draw_icon(icons.NEW, xx, yy, "New song", 0, 0)) {new_song()} xx += 25 +if (draw_icon(icons.OPEN, xx, yy, "Open song", 0, 0)) {playing = 0 load_song("")} xx += 25 +if (draw_icon(icons.SAVE, xx, yy, "Save song", 0, 0)) {save_song(filename)} xx += 25 + 4 +draw_separator(xx, yy + 3) xx += 4 +if (draw_icon(icons.PLAY + playing, xx, yy, "Play / Pause song", 0, 0)) toggle_playing(totalcols) timestoloop = real(loopmax) xx += 25 -if (draw_icon(icons.STOP, xx, "Stop song", 0, 0)) {playing = 0 marker_pos = 0 marker_prevpos = 0 timestoloop = real(loopmax)} xx += 25 +if (draw_icon(icons.STOP, xx, yy, "Stop song", 0, 0)) {playing = 0 marker_pos = 0 marker_prevpos = 0 timestoloop = real(loopmax)} xx += 25 forward = 0 -if (draw_icon(icons.BACK, xx, "Rewind song", 0, 0)) {forward = -1} xx += 25 -if (draw_icon(icons.FORWARD, xx, "Fast-forward song", 0, 0)) {forward = 1} xx += 25 -if (draw_icon(icons.RECORD, xx, "Record key presses", 0, playing > 0 && record)) {playing = 0.25 record=!record} xx += 25 -if (draw_icon(icons.LOOP_INACTIVE + loop_session, xx, "Toggle looping", 0, 0)) loop_session = !loop_session xx += 25 +if (draw_icon(icons.BACK, xx, yy, "Rewind song", 0, 0)) {forward = -1} xx += 25 +if (draw_icon(icons.FORWARD, xx, yy, "Fast-forward song", 0, 0)) {forward = 1} xx += 25 +if (draw_icon(icons.RECORD, xx, yy, "Record key presses", 0, playing > 0 && record)) {playing = 0.25 record=!record} xx += 25 +if (draw_icon(icons.LOOP_INACTIVE + loop_session, xx, yy, "Toggle looping", 0, 0)) loop_session = !loop_session xx += 25 if metronome { if (metronome_played == -1 || (metronome_played - 1) mod 8 == 0) metricon = icons.METRONOME_1 else metricon = icons.METRONOME_2 } else { metricon = icons.METRONOME_INACTIVE } -if(draw_icon(metricon, xx, "Toggle metronome", 0, 0)) metronome = !metronome +if(draw_icon(metricon, xx, yy, "Toggle metronome", 0, 0)) metronome = !metronome xx += 25 + 4 if (playing = 0) record = 0 -draw_separator(xx, 26) xx += 4 -if (draw_icon(icons.EDITMODE_KEY, xx, "Edit note key", 0, editmode = 0)) {editmode = 0} xx += 25 -if (draw_icon(icons.EDITMODE_VEL, xx, "Edit note velocity", 0, editmode = 1)) {editmode = 1} xx += 25 -if (draw_icon(icons.EDITMODE_PAN, xx, "Edit note panning", 0, editmode = 2)) {editmode = 2} xx += 25 -if (draw_icon(icons.EDITMODE_PIT, xx, "Edit note pitch", 0, editmode = 3)) {editmode = 3} xx += 25 + 4 -draw_separator(xx, 26) xx += 4 -for (a = 0; a < ds_list_size(instrument_list); a += 1) { - var ins = instrument_list[| a]; - if (draw_icon(icons.INS_1 + a, xx, "Change instrument to " + ins.name, 0, instrument = ins)) {play_sound(ins, selected_key, 100 ,100, 0) instrument = ins} xx += 25 +draw_separator(xx, yy + 3) xx += 4 +if (draw_icon(icons.EDITMODE_KEY, xx, yy, "Edit note key", 0, editmode = 0)) {editmode = 0} xx += 25 +if (draw_icon(icons.EDITMODE_VEL, xx, yy, "Edit note velocity", 0, editmode = 1)) {editmode = 1} xx += 25 +if (draw_icon(icons.EDITMODE_PAN, xx, yy, "Edit note panning", 0, editmode = 2)) {editmode = 2} xx += 25 +if (draw_icon(icons.EDITMODE_PIT, xx, yy, "Edit note pitch", 0, editmode = 3)) {editmode = 3} xx += 25 + 4 +draw_separator(xx, yy + 3) xx += 4 } -xx += 4 draw_separator(xx, 26) xx += 4 +xx += 4 draw_separator(xx, yy + 3) xx += 4 while (1) { -if (draw_icon(icons.UNDO, xx, "Undo the last change", historypos = historylen, 0)) {playing = 0 action_undo()} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.REDO, xx, "Redo the last undo", historypos = 0, 0)) {playing = 0 action_redo()} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.COPY, xx, "Copy the selected note blocks", selected = 0, 0)) {playing = 0 action_copy()} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.CUT, xx, "Cut the selected note blocks", selected = 0, 0)) {playing = 0 action_cut()} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.PASTE, xx, "Paste the copied note blocks", selection_copied = "", 0)) {playing = 0 action_paste(starta, startb)} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.DELETE, xx, "Delete the selected note blocks", selected = 0, 0)) {playing = 0 action_delete()} xx += 25 if (xx > rw - 190) break -xx += 4 draw_separator(xx, 26) xx += 4 if (xx > rw - 190) break -if (draw_icon(icons.INFORMATION, xx, "View song info")) {playing = 0 window = w_songinfoedit} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.PROPERTIES, xx, "Edit song properties")) {playing = 0 window = w_properties} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.INSTRUMENTS, xx, "Edit instruments")) {playing = 0 window = w_instruments} xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.MIDI_INPUT, xx, "MIDI device manager")) {playing = 0 window = w_mididevices} xx += 25 if (xx > rw - 190) break -xx += 4 draw_separator(xx, 26) xx += 4 if (xx > rw - 190) break -if (draw_icon(icons.HELP, xx, "Watch tutorial videos")) { +if (draw_icon(icons.UNDO, xx, yy, "Undo the last change", historypos = historylen, 0)) {playing = 0 action_undo()} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.REDO, xx, yy, "Redo the last undo", historypos = 0, 0)) {playing = 0 action_redo()} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.COPY, xx, yy, "Copy the selected note blocks", selected = 0, 0)) {playing = 0 action_copy()} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.CUT, xx, yy, "Cut the selected note blocks", selected = 0, 0)) {playing = 0 action_cut()} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.PASTE, xx, yy, "Paste the copied note blocks", selection_copied = "", 0)) {playing = 0 action_paste(starta, startb)} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.DELETE, xx, yy, "Delete the selected note blocks", selected = 0, 0)) {playing = 0 action_delete()} xx += 25 if (xx > rw - 190) break +xx += 4 draw_separator(xx, yy + 3) xx += 4 if (xx > rw - 190) break +if (draw_icon(icons.INFORMATION, xx, yy, "View song info")) {playing = 0 window = w_songinfoedit} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.PROPERTIES, xx, yy, "Edit song properties")) {playing = 0 window = w_properties} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.INSTRUMENTS, xx, yy, "Edit instruments")) {playing = 0 window = w_instruments} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.MIDI_INPUT, xx, yy, "MIDI device manager")) {playing = 0 window = w_mididevices} xx += 25 if (xx > rw - 190) break +xx += 4 draw_separator(xx, yy + 3) xx += 4 if (xx > rw - 190) break +if (draw_icon(icons.HELP, xx, yy, "Watch tutorial videos")) { open_url("http://www.youtube.com/playlist?list=PL7EA4F0D271DA6E86") } xx += 25 if (xx > rw - 190) break -if (draw_icon(icons.INTERNET, xx, "Visit the Minecraft Forums topic")) {open_url(link_topic)} xx += 25 if (xx > rw - 190) break +if (draw_icon(icons.INTERNET, xx, yy, "Visit the Minecraft Forums topic")) {open_url(link_topic)} xx += 25 if (xx > rw - 190) break break } diff --git a/scripts/draw_icon/draw_icon.gml b/scripts/draw_icon/draw_icon.gml index fbe61c5a1..9ae354ad3 100644 --- a/scripts/draw_icon/draw_icon.gml +++ b/scripts/draw_icon/draw_icon.gml @@ -1,22 +1,23 @@ -// draw_icon(i, xx, str[, locked[, pressed]]) -var i, a, xx, str, locked, pressed; +// draw_icon(i, xx, yy, str[, locked[, pressed]]) +var i, a, xx, yy, str, locked, pressed; i = argument[0] xx = argument[1] -str = argument[2] +yy = argument[2] +str = argument[3] locked = 0 pressed = 0 -if (argument_count > 3) - locked = argument[3] if (argument_count > 4) - pressed = argument[4] -popup_set(xx, 23, 25, 25, str) -a = (mouse_rectangle(xx, 23, 25, 25) && window = 0 && locked = 0 && sb_drag = -1) + locked = argument[4] +if (argument_count > 5) + pressed = argument[5] +popup_set(xx, yy, 25, 25, str) +a = (mouse_rectangle(xx, yy, 25, 25) && (window = 0) && locked = 0 && sb_drag = -1) a += ((mouse_check_button(mb_left) || mouse_check_button_released(mb_left)) && a) if (pressed = 1) { - draw_sprite(spr_frame1, 2 + 3 * theme, xx, 23) + draw_sprite(spr_frame1, 2 + 3 * theme, xx, yy) } else { - draw_sprite(spr_frame1, a + 3 * theme, xx, 23) + draw_sprite(spr_frame1, a + 3 * theme, xx, yy) } -draw_sprite(spr_icons, i - locked, xx + (a = 2 || pressed = 1), 23 + (a = 2 || pressed = 1)) +draw_sprite(spr_icons, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1)) if (i = 7 || i = 8) return (a = 2) return (a && mouse_check_button_released(mb_left)) From 02dfeb8e7f402cce3e2b0747bbfebcec42075ab1 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 04:52:57 -0300 Subject: [PATCH 52/86] Add expandable instrument box when there are too many Fixes #155 --- scripts/control_create/control_create.gml | 1 + scripts/control_draw/control_draw.gml | 36 +++++++++++++++++++ scripts/draw_icon_insbox/draw_icon_insbox.gml | 23 ++++++++++++ scripts/draw_icon_insbox/draw_icon_insbox.yy | 8 +++++ views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy | 1 + 5 files changed, 69 insertions(+) create mode 100644 scripts/draw_icon_insbox/draw_icon_insbox.gml create mode 100644 scripts/draw_icon_insbox/draw_icon_insbox.yy diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 845593a00..13215746b 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -237,6 +237,7 @@ sch_exp_scrollbar = create_scrollbar(1) update_scrollbar = create_scrollbar(1) sbh_anim = 0 sbv_anim = 0 +showinsbox = 0 delay = 0 insedit = -1 insselect = -1 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 6c51c7b3c..c2aa34b71 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1129,6 +1129,42 @@ if (draw_icon(icons.EDITMODE_VEL, xx, yy, "Edit note velocity", 0, editmode = 1) if (draw_icon(icons.EDITMODE_PAN, xx, yy, "Edit note panning", 0, editmode = 2)) {editmode = 2} xx += 25 if (draw_icon(icons.EDITMODE_PIT, xx, yy, "Edit note pitch", 0, editmode = 3)) {editmode = 3} xx += 25 + 4 draw_separator(xx, yy + 3) xx += 4 + +// Expandable instrument box +var ins_count = ds_list_size(instrument_list) +var ins_icons = median(5, ceil((rw - 920) / 25), ins_count) +if (ins_icons = ins_count - 1) ins_icons += 1 +var ins_rows = ceil(ins_count / ins_icons) +if (showinsbox) { + window = w_insbox + draw_theme_color() + draw_window(xx - 2, yy - 2, xx + (ins_icons * 25) + 2, yy + (ins_rows * 25) + 2) + for (a = 0; a < ins_rows; a += 1) { + for (b = 0; b < ins_icons; b += 1) { + var insindex = (a * ins_icons + b) + if (insindex >= ds_list_size(instrument_list)) break + var ins = instrument_list[| insindex]; + if (draw_icon_insbox(icons.INS_1 + insindex, xx + b * 25, yy + a * 25, "Change instrument to " + ins.name, 0, instrument = ins)) {play_sound(ins, selected_key, 100, 100, 0) instrument = ins} + } + } + // Click away + if (mouse_check_button_released(mb_left)) && !(mouse_rectangle(xx, yy, ins_icons * 25, ins_rows * 25)) { + showinsbox = 0 + window = 0 + } + xx += ins_icons * 25 + // 'Collapse' button + draw_icon_insbox(icons.BACK, xx, yy, "Less instruments", 0) // it's a fake button since clicking anywhere works :D + xx += 25 +} else { + for (a = 0; a < ins_icons; a += 1) { + var ins = instrument_list[| a]; + if (draw_icon(icons.INS_1 + a, xx, yy, "Change instrument to " + ins.name, 0, instrument = ins)) {play_sound(ins, selected_key, 100 ,100, 0) instrument = ins} xx += 25 + } + if (ins_icons < ds_list_size(instrument_list)) { + if (draw_icon(icons.EDITMODE_KEY, xx, yy, "More instruments...", 0, 0)) {showinsbox = 1} + xx += 25 + } } xx += 4 draw_separator(xx, yy + 3) xx += 4 while (1) { diff --git a/scripts/draw_icon_insbox/draw_icon_insbox.gml b/scripts/draw_icon_insbox/draw_icon_insbox.gml new file mode 100644 index 000000000..624e8b8a3 --- /dev/null +++ b/scripts/draw_icon_insbox/draw_icon_insbox.gml @@ -0,0 +1,23 @@ +// draw_icon(i, xx, yy, str[, locked[, pressed]]) +var i, a, xx, yy, str, locked, pressed; +i = argument[0] +xx = argument[1] +yy = argument[2] +str = argument[3] +locked = 0 +pressed = 0 +if (argument_count > 4) + locked = argument[4] +if (argument_count > 5) + pressed = argument[5] +popup_set_window(xx, yy, 25, 25, str) +a = (mouse_rectangle(xx, yy, 25, 25) && (window = w_insbox) && locked = 0 && sb_drag = -1) +a += ((mouse_check_button(mb_left) || mouse_check_button_released(mb_left)) && a) +if (pressed = 1) { + draw_sprite(spr_frame1, 2 + 3 * theme, xx, yy) +} else { + draw_sprite(spr_frame1, a + 3 * theme, xx, yy) +} +draw_sprite(spr_icons, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1)) +if (i = 7 || i = 8) return (a = 2) +return (a && mouse_check_button_released(mb_left)) diff --git a/scripts/draw_icon_insbox/draw_icon_insbox.yy b/scripts/draw_icon_insbox/draw_icon_insbox.yy new file mode 100644 index 000000000..ad01875a6 --- /dev/null +++ b/scripts/draw_icon_insbox/draw_icon_insbox.yy @@ -0,0 +1,8 @@ +{ + "id": "d67337c4-393c-4726-b910-8b59d93c9370", + "modelName": "GMScript", + "mvc": "1.0", + "name": "draw_icon_insbox", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy b/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy index 3d95e8dbf..1edd38a11 100644 --- a/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy +++ b/views/851a6098-0a35-48ef-8f86-8d6cd677f3fd.yy @@ -17,6 +17,7 @@ "2bbb101b-9227-491d-871c-60c4251f625f", "e6bece63-3d7c-4f94-9c4b-cc10c5dd5ebf", "df4f777a-ec71-49f8-8f9e-8b25350626c4", + "d67337c4-393c-4726-b910-8b59d93c9370", "bcc4cc3e-1061-409b-9610-433c5b682eae", "28131748-b621-459e-952c-fcd16de0bd8b", "36bf530d-9afd-4915-8e0f-6d9162ea03b2", From e676b0fd6a1cf3238ae3cd5b497d6a9a0d6f1649 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 05:36:22 -0300 Subject: [PATCH 53/86] Add expand/collapse icons to instrument box --- scripts/icons_init/icons_init.gml | 4 +- .../72f9ab59-e69e-43a7-b509-ff1726a508b2.png | Bin 0 -> 167 bytes .../ce1e0863-d76c-42ce-8bcd-40886dad2161.png | Bin 0 -> 170 bytes .../1f31e358-720d-4ad3-9c86-68eea54f958b.png | Bin 0 -> 167 bytes .../1f31e358-720d-4ad3-9c86-68eea54f958b.png | Bin 0 -> 211 bytes sprites/spr_icons/spr_icons.yy | 44 ++++++++++++++++++ 6 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 sprites/spr_icons/72f9ab59-e69e-43a7-b509-ff1726a508b2.png create mode 100644 sprites/spr_icons/ce1e0863-d76c-42ce-8bcd-40886dad2161.png create mode 100644 sprites/spr_icons/layers/72f9ab59-e69e-43a7-b509-ff1726a508b2/1f31e358-720d-4ad3-9c86-68eea54f958b.png create mode 100644 sprites/spr_icons/layers/ce1e0863-d76c-42ce-8bcd-40886dad2161/1f31e358-720d-4ad3-9c86-68eea54f958b.png diff --git a/scripts/icons_init/icons_init.gml b/scripts/icons_init/icons_init.gml index 13c250fe4..e984324e2 100644 --- a/scripts/icons_init/icons_init.gml +++ b/scripts/icons_init/icons_init.gml @@ -75,5 +75,7 @@ enum icons { EDITMODE_KEY, EDITMODE_VEL, EDITMODE_PAN, - EDITMODE_PIT + EDITMODE_PIT, + INSBOX_EXPAND, + INSBOX_COLLAPSE } diff --git a/sprites/spr_icons/72f9ab59-e69e-43a7-b509-ff1726a508b2.png b/sprites/spr_icons/72f9ab59-e69e-43a7-b509-ff1726a508b2.png new file mode 100644 index 0000000000000000000000000000000000000000..4507db3b52989626af15619a9dc9cf4753a022b1 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAId7dtgAr*6y6BjTiNN!EJGAYno zW5bcghxUp&c*rp-pe6=Bhwd3{1=!W}3Evpsm4y6eSiV19EneXZn zZKxv38Dhbe>5_=TI)Ej_B3LrEJUObi^KRYiUvO;^4V-#v<$F3f1OQLJZ#*$cKw- Sa;X3p&c*rp-pe6=Bhwd3{1=!W}3Evpsm4y6eSiV19EneXZn zZKxv3lm$bMmu}vYjDDeSdZ{`}6!-;IgnfN=)*q;<3354w-9biybqyy(Cp}+(Y!3u()%< zFGV4KJEtYa8b;b5-mW|GeR{h^!q&IXsvTNicrf@?`<&O{T%;&r@y?Jf#68G?Lr_au zwSn>J#0}lk9+^DK77CC{%()oFRx4S5#Pw70{e0E=e% literal 0 HcmV?d00001 diff --git a/sprites/spr_icons/spr_icons.yy b/sprites/spr_icons/spr_icons.yy index c40c26093..88af1b876 100644 --- a/sprites/spr_icons/spr_icons.yy +++ b/sprites/spr_icons/spr_icons.yy @@ -1642,6 +1642,50 @@ "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" } ] + }, + { + "id": "72f9ab59-e69e-43a7-b509-ff1726a508b2", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "bd7ff9bd-40a1-4101-a019-5bc704e1ad38", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "72f9ab59-e69e-43a7-b509-ff1726a508b2", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1229aeb0-37b4-466b-ad70-ea867f534655", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "72f9ab59-e69e-43a7-b509-ff1726a508b2", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "ce1e0863-d76c-42ce-8bcd-40886dad2161", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "750840e2-f1a4-4efe-96a9-ca2fc3f395de", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ce1e0863-d76c-42ce-8bcd-40886dad2161", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ba0df586-a14c-4e8f-b74d-75495dd45b9e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ce1e0863-d76c-42ce-8bcd-40886dad2161", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] } ], "gridX": 0, From aeeacb3398c09d9fee784d7077e76dd0a31996d2 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 06:22:24 -0300 Subject: [PATCH 54/86] Remove /particle command from Piano Roll visualizer After the removal of the negative sign in f049f8a4beea8244f2b2fd4efa29a062ec43948b, the command no longer works properly, since the particles will be flipped in relationship to where the falling blocks appear. Since I'm too lazy to fix it *cough cough*, it's easier to remove it for now - we can figure out later how to add it properly. --- scripts/dat_generate/dat_generate.gml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/dat_generate/dat_generate.gml b/scripts/dat_generate/dat_generate.gml index e80f9197b..671c26e61 100644 --- a/scripts/dat_generate/dat_generate.gml +++ b/scripts/dat_generate/dat_generate.gml @@ -63,7 +63,6 @@ for (a = 0; a <= o.enda; a++) { if o.dat_glow = 1 { str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br } - str += "particle minecraft:note " + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(real(o.dat_zval)) + " " + "0.5 0 0.5 1 4 force @p" + br } if o.dat_vis_type = "Rise" { // Rise From 856898cbe38d6397152c9b167198c9e78cb5b097 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 06:32:21 -0300 Subject: [PATCH 55/86] Prevent too many ticks from piling up during major lag or window resize Since we play all ticks since the last one played in order to "catch up" on missed ticks, a major lag spike, or even worse, a window resize or move operation (which freezes drawing completely but does not stop the song) would cause dozens of ticks to play at the same time, causing a very loud burst which was extremely dangerous for people's ears. (earrape = !cool) --- scripts/control_draw/control_draw.gml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index c2aa34b71..d42b9c8bf 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -286,8 +286,13 @@ draw_set_halign(fa_left) // Play column if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && (floor(marker_pos) != section_end || window = w_dragmarker || forward<>0 || marker_end = 0 || marker_prevpos >= section_end)) { - for (i = floor(marker_prevpos) + 1; i <= floor(marker_pos); i++) { - xx = i + var diff = floor(marker_pos) - floor(marker_prevpos) + var start + if (diff < 0 || diff > 3) { + start = floor(marker_pos) + } else { + start = floor(marker_prevpos) + 1 + } if (colamount[xx] > 0) { for (b = colfirst[xx]; b <= collast[xx]; b += 1) { if (song_exists[xx, b]) { From cf0bf3a72a3014a6934eff5cb2d5487c7b73d37d Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 06:47:51 -0300 Subject: [PATCH 56/86] Fix custom sound files not being copied to Sounds folder --- scripts/draw_window_instruments/draw_window_instruments.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml index a49243eaa..5deb294b5 100644 --- a/scripts/draw_window_instruments/draw_window_instruments.gml +++ b/scripts/draw_window_instruments/draw_window_instruments.gml @@ -93,7 +93,7 @@ for (a = 0; a <= 10; a += 1) { fn = string(get_open_filename_ext("Supported sounds (*.ogg;*.wav;*.mp3)|*.ogg;*.wav;*.mp3", "", sounds_directory, "Load sound file")) if (file_exists_lib(fn)) { var newfn = sounds_directory + filename_name(fn); - file_copy(fn, newfn) + files_copy_lib(fn, newfn) changed = true with (ins) { filename = filename_name(newfn) From 452f406064f54e44d527de5ef7efc5d92116bcb0 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 06:49:40 -0300 Subject: [PATCH 57/86] Set unsaved changes when renaming custom instruments --- scripts/draw_window_instruments/draw_window_instruments.gml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml index 5deb294b5..8c61e7018 100644 --- a/scripts/draw_window_instruments/draw_window_instruments.gml +++ b/scripts/draw_window_instruments/draw_window_instruments.gml @@ -1,5 +1,5 @@ // draw_window_instruments() -var x1, y1, a, b, c, str, menun, menua, menub; +var x1, y1, a, b, c, str, menun, menua, menub, prev; curs = cr_default menun = -1 x1 = floor(window_width / 2 - 275) @@ -78,7 +78,9 @@ for (a = 0; a <= 10; a += 1) { if (ins.user) draw_theme_color() if (insselect = b) draw_set_color(c_white) // INS NAME + prev = ins.name ins.name = draw_text_edit(b + 5, ins.name, x1 + 18, y1 + 90 + 20 * a, 178, 20, 1, b < first_custom_index) + if (ins.name != prev) changed = 1 // INS SOUND draw_set_color(make_color_rgb(120, 120, 120)) if (ins.user) {draw_theme_color()} From 938804a0a9c8782f1f28f9dbc9cc0ec7ae0be2b6 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 06:58:01 -0300 Subject: [PATCH 58/86] Add macro for instrument box window Whoops. --- scripts/macros/macros.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 47c8f94cf..d22c7278e 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -40,6 +40,7 @@ #macro w_menu 100 #macro w_releasemouse 29 #macro w_mididevices 28 +#macro w_insbox 42 #macro w_dragvol 27 #macro w_dragstereo 41 #macro w_dragsection_end 26 From 2230504013ac086d961aa13a2f1de3159e6bf0f4 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 07:13:36 -0300 Subject: [PATCH 59/86] Fix crash in Arpeggio and Stagger macros due to inserting invalid characters in the pattern --- Minecraft Note Block Studio.yyp | 9 +++++++++ .../draw_window_macro_arpeggio.gml | 1 + .../draw_window_macro_stagger.gml | 1 + .../string_digits_symbol.gml | 17 +++++++++++++++++ .../string_digits_symbol.yy | 8 ++++++++ views/8f90c88c-a49b-4a15-b19e-952f818913ff.yy | 3 ++- 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 scripts/string_digits_symbol/string_digits_symbol.gml create mode 100644 scripts/string_digits_symbol/string_digits_symbol.yy diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index 1c634bda3..c1bb806a4 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -534,6 +534,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "200d66e6-7b00-4232-b48e-fd664e81a946", + "Value": { + "id": "650cbd59-f62c-4d93-806e-fe22f0b8ab5a", + "resourcePath": "scripts\\string_digits_symbol\\string_digits_symbol.yy", + "resourceType": "GMScript" + } + }, { "Key": "207aac78-283b-43d8-9e95-0a42bcf32500", "Value": { @@ -4304,6 +4312,7 @@ "6d1d68e3-6bec-469d-80a7-1033b318611c", "b3da5933-67e7-4020-9adf-2298e0500949", "cd127ef5-f33a-4c45-adfb-022fef2d6775", + "200d66e6-7b00-4232-b48e-fd664e81a946", "24294793-1838-4e02-8f8d-dd3d195c0847", "d16acd0d-150b-41a6-a65f-f7ab7bdfb2cb", "8dad8688-dcad-4f45-976f-2e06a0a1b217", diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml index e9f565dc0..f2cddbec0 100644 --- a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml +++ b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml @@ -31,6 +31,7 @@ str = selection_code arr_data = selection_to_array(str) total_vals = string_count("|", str) val = 0 +pattern = string_digits_symbol(pattern, "|") pattern = string(pattern + "|") arp = selection_to_array(pattern) arplen = string_count("|", pattern) diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml index 056eb94b5..d77b57f4a 100644 --- a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml +++ b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml @@ -40,6 +40,7 @@ if (draw_button2(x1 + 15, y1 + 128, 60, "OK")) { total_vals = string_count("|", str) val = 0 conf = 0 + pattern = string_digits_symbol(pattern, "|") pattern = string(pattern + "|") arp = selection_to_array(pattern) arplen = string_count("|", pattern) diff --git a/scripts/string_digits_symbol/string_digits_symbol.gml b/scripts/string_digits_symbol/string_digits_symbol.gml new file mode 100644 index 000000000..103602938 --- /dev/null +++ b/scripts/string_digits_symbol/string_digits_symbol.gml @@ -0,0 +1,17 @@ +// string_digits_symbol(str, symbol) +// Filters string keeping only digits and an additional character of choice + +var str, symbol, nstr, char + +str = argument0 +symbol = argument1 +nstr = "" + +str = string_replace_all(string_lower(str), " ", "_") +for (i = 1; i <= string_length(str); i++) { + char = string_char_at(str, i) + if ((char = symbol) || (char = string_digits(char))) { + nstr += char + } +} +return nstr \ No newline at end of file diff --git a/scripts/string_digits_symbol/string_digits_symbol.yy b/scripts/string_digits_symbol/string_digits_symbol.yy new file mode 100644 index 000000000..63ebd2138 --- /dev/null +++ b/scripts/string_digits_symbol/string_digits_symbol.yy @@ -0,0 +1,8 @@ +{ + "id": "200d66e6-7b00-4232-b48e-fd664e81a946", + "modelName": "GMScript", + "mvc": "1.0", + "name": "string_digits_symbol", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/views/8f90c88c-a49b-4a15-b19e-952f818913ff.yy b/views/8f90c88c-a49b-4a15-b19e-952f818913ff.yy index c3d606364..73d67e15e 100644 --- a/views/8f90c88c-a49b-4a15-b19e-952f818913ff.yy +++ b/views/8f90c88c-a49b-4a15-b19e-952f818913ff.yy @@ -12,7 +12,8 @@ "684ae517-6f0d-4c08-b1ff-3863deb988e9", "6d1d68e3-6bec-469d-80a7-1033b318611c", "b3da5933-67e7-4020-9adf-2298e0500949", - "cd127ef5-f33a-4c45-adfb-022fef2d6775" + "cd127ef5-f33a-4c45-adfb-022fef2d6775", + "200d66e6-7b00-4232-b48e-fd664e81a946" ], "filterType": "GMScript", "folderName": "Strings", From dba37dc063199d7614fc61378818cafdd4849836 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 07:20:00 -0300 Subject: [PATCH 60/86] Prevent creating a data pack with no alphanumeric characters in the name --- .../draw_window_datapack_export/draw_window_datapack_export.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml index bccef1b69..9bab46b57 100644 --- a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml +++ b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml @@ -174,7 +174,7 @@ if (wmenu = 1 && !mouse_check_button(mb_left)) wmenu = 0 //Submit button if (draw_button2(x1 + 470, y1 + 398, 72, "Export", false)) { - if(string_replace_all(dat_name," ", "") != "") { + if(string_lettersdigits(dat_name) != "") { if(string_count("/", dat_getpath(dat_path)) >= 5) { message("Path can only contain up to 5 subfolders", "Error") } else { From b55c21c12e06badca2415870568e747f88a96d4d Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 07:21:21 -0300 Subject: [PATCH 61/86] Update Minecraft Note Block Studio.yyp --- Minecraft Note Block Studio.yyp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index c1bb806a4..2abadc62a 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -3574,6 +3574,14 @@ "resourceType": "GMObject" } }, + { + "Key": "d67337c4-393c-4726-b910-8b59d93c9370", + "Value": { + "id": "62ad5e16-817a-4ae4-8c83-ea890adc3aad", + "resourcePath": "scripts\\draw_icon_insbox\\draw_icon_insbox.yy", + "resourceType": "GMScript" + } + }, { "Key": "d68e2897-946a-48c2-99a1-5605c6133f82", "Value": { @@ -4374,6 +4382,7 @@ "2bbb101b-9227-491d-871c-60c4251f625f", "e6bece63-3d7c-4f94-9c4b-cc10c5dd5ebf", "df4f777a-ec71-49f8-8f9e-8b25350626c4", + "d67337c4-393c-4726-b910-8b59d93c9370", "bcc4cc3e-1061-409b-9610-433c5b682eae", "28131748-b621-459e-952c-fcd16de0bd8b", "36bf530d-9afd-4915-8e0f-6d9162ea03b2", From b5764fb060d263c5c2a07f0d7858ac4a8eb6f06f Mon Sep 17 00:00:00 2001 From: Bentroen Date: Fri, 26 Jun 2020 07:24:52 -0300 Subject: [PATCH 62/86] Replace temporary collapse/expand icons with actual icons Complements e676b0fd6a1cf3238ae3cd5b497d6a9a0d6f1649, because, apparently, I don't pay enough attention to what I'm comitting <_< --- scripts/control_draw/control_draw.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index d42b9c8bf..86f31689d 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1159,7 +1159,7 @@ if (showinsbox) { } xx += ins_icons * 25 // 'Collapse' button - draw_icon_insbox(icons.BACK, xx, yy, "Less instruments", 0) // it's a fake button since clicking anywhere works :D + draw_icon_insbox(icons.INSBOX_COLLAPSE, xx, yy, "Less instruments", 0) // it's a fake button since clicking anywhere works :D xx += 25 } else { for (a = 0; a < ins_icons; a += 1) { @@ -1167,7 +1167,7 @@ if (showinsbox) { if (draw_icon(icons.INS_1 + a, xx, yy, "Change instrument to " + ins.name, 0, instrument = ins)) {play_sound(ins, selected_key, 100 ,100, 0) instrument = ins} xx += 25 } if (ins_icons < ds_list_size(instrument_list)) { - if (draw_icon(icons.EDITMODE_KEY, xx, yy, "More instruments...", 0, 0)) {showinsbox = 1} + if (draw_icon(icons.INSBOX_EXPAND, xx, yy, "More instruments...", 0, 0)) {showinsbox = 1} xx += 25 } } From c8270f80885dab9ca1e27636c0606293421d5ba8 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 05:43:01 -0300 Subject: [PATCH 63/86] Add uninstall function to datapacks --- scripts/dat_generate/dat_generate.gml | 28 ++++++++++----------- scripts/datapack_export/datapack_export.gml | 24 +++++++++++++++--- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/scripts/dat_generate/dat_generate.gml b/scripts/dat_generate/dat_generate.gml index 671c26e61..ef09f2295 100644 --- a/scripts/dat_generate/dat_generate.gml +++ b/scripts/dat_generate/dat_generate.gml @@ -35,72 +35,72 @@ for (a = 0; a <= o.enda; a++) { if o.dat_vis_type = "Arc" { // Arc str += "summon minecraft:falling_block " + string(real((o.song_key[a, b]-45) * -1) + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(((o.song_ins[a, b]-100002) * 2) + real(o.dat_zval)) + " " + "{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"}," if o.dat_glow = 1 { - str += "Tags:[\"" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," + str += "Tags:[\"nbs\",\"nbs_" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," } str += "Time:-120,DropItem:0,Motion:[0.0d,1.0d,1.0d]}" + br if o.dat_glow = 1 { - str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=nbs_" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Fall" { // Fall str += "summon minecraft:falling_block " + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(((o.song_ins[a, b]-100002) * 2) + real(o.dat_zval)) + " " + "{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"}," if o.dat_glow = 1 { - str += "Tags:[\"" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," + str += "Tags:[\"nbs\",\"nbs_" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," } str += "Time:-80,DropItem:0,Motion:[0.0d,-1.3d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=nbs_" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Piano Roll" { // Piano Roll str += "summon minecraft:falling_block " + string(real((o.song_key[a, b]-45) * -1) + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(real(o.dat_zval)) + " " + "{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"}," if o.dat_glow = 1 { - str += "Tags:[\"" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," + str += "Tags:[\"nbs\",\"nbs_" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," } str += "Time:-50,DropItem:0,NoGravity:1,Motion:[0.0d,0.0d,2.5d]}" + br if o.dat_glow = 1 { - str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=nbs_" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Rise" { // Rise str += "summon minecraft:falling_block " + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(((o.song_ins[a, b]-100002) * 2) + real(o.dat_zval)) + " " + "{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"}," if o.dat_glow = 1 { - str += "Tags:[\"" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," + str += "Tags:[\"nbs\",\"nbs_" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," } str += "Time:-50,DropItem:0,Glowing:1,NoGravity:1,Motion:[0.0d,1.0d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=nbs_" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Bounce" { // Bounce str += "summon minecraft:falling_block " + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(((o.song_ins[a, b]-100002) * 2) + real(o.dat_zval)) + " " + "{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"}," if o.dat_glow = 1 { - str += "Tags:[\"" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," + str += "Tags:[\"nbs\",\"nbs_" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," } str += "Time:-80,DropItem:0,Motion:[0.0d,1.3d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=nbs_" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Fountain" { // Fountain str += "summon minecraft:falling_block " + string(o.song_key[a, b]-45 + real(o.dat_xval)) + " " + string(o.dat_yval) + " " + string(((o.song_ins[a, b]-100002) * 2) + real(o.dat_zval)) + " " + "{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"}," if o.dat_glow = 1 { - str += "Tags:[\"" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," + str += "Tags:[\"nbs\",\"nbs_" + string(o.song_ins[a, b]-100001) + "\"],Glowing:1," } if o.song_key[a, b] > 45 { str += "Time:-80,DropItem:0,Motion:[0.5d,1.5d,0.0d]}" + br } else str += "Time:-80,DropItem:0,Motion:[-0.5d,1.5d,0.0d]}" + br if o.dat_glow = 1 { - str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=" + string(o.song_ins[a, b]-100001) + "]" + br + str += "team join nbs_" + string(o.song_ins[a, b]-100001) + " @e[tag=nbs_" + string(o.song_ins[a, b]-100001) + "]" + br } } if o.dat_vis_type = "Rittai Onkyou" { // Rittai Onkyou - str += "summon minecraft:falling_block " + string(blockposition * 48) + " " + string(90) + " " + string(blockvolume * 48) + " " +"{BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"},Time:-80,DropItem:0,Motion:[0.0d,-1.3d,0.0d]}" + br - + "summon minecraft:falling_block " + string(blockposition * 48) + " " + string(90) + " " + string((blockvolume * 48) - 1) + " " +"{BlockState:{Name:\"minecraft:note_block\"},Time:-80,DropItem:0,Motion:[0.0d,-1.3d,0.0d]}" + br + str += "summon minecraft:falling_block " + string(blockposition * 48) + " " + string(90) + " " + string(blockvolume * 48) + " " +"{\"Tags\":[\"nbs\"],BlockState:{Name:\"minecraft:"+ string(block_get_namespaced_id(o.sch_exp_ins_block[o.song_ins[a, b]-100002], 0)) + "\"},Time:-80,DropItem:0,Motion:[0.0d,-1.3d,0.0d]}" + br + + "summon minecraft:falling_block " + string(blockposition * 48) + " " + string(90) + " " + string((blockvolume * 48) - 1) + " " +"{\"Tags\":[\"nbs\"],BlockState:{Name:\"minecraft:note_block\"},Time:-80,DropItem:0,Motion:[0.0d,-1.3d,0.0d]}" + br + "particle minecraft:note " + string(blockposition * 48) + " " + string(90) + " " + string((blockvolume * 48) - 2) + " 0 0 0 1 1 force @p" + br } } diff --git a/scripts/datapack_export/datapack_export.gml b/scripts/datapack_export/datapack_export.gml index 2e6a97d27..3e0a69710 100644 --- a/scripts/datapack_export/datapack_export.gml +++ b/scripts/datapack_export/datapack_export.gml @@ -86,13 +86,28 @@ with (new(obj_dummy2)) { //stop.mcfunction inputString = "tag @s remove " + tag + br inputString += "scoreboard players reset @s " + objective + br - inputString += "scoreboard players reset @s " + objective + "_t" + br + inputString += "scoreboard players reset @s " + objective + "_t" if (add_teams) { - inputString += "function " + functionpath + "remove_teams" + inputString += br + "function " + functionpath + "remove_teams" } - dat_writefile(inputString, functiondir + "stop.mcfunction") + //uninstall.mcfunction + inputString = "tag @e remove " + tag + br + inputString += "scoreboard objectives remove " + objective + br + inputString += "scoreboard objectives remove " + objective + "_t" + br + if (add_teams) { + inputString += "function " + functionpath + "remove_teams" + br + inputString += "kill @e[type=falling_block,tag=nbs]" + } + if (o.dat_usezip) { + inputString += "datapack disable \"file/" + filename_name(fn) + "\"" + br + } else { + inputString += "datapack disable \"" + filename_name(fn) + "\"" + br + } + inputString += "tellraw @s [\"\",{\"text\":\"Data pack \",\"color\":\"yellow\"},{\"text\":\"" + filename_name(fn) + "\",\"color\":\"gold\",\"underline\":\"true\"},{\"text\":\" uninstalled successfully. You may now remove it from your data pack folder.\",\"color\":\"yellow\"}]" + dat_writefile(inputString, functiondir + "uninstall.mcfunction") + if (add_teams) { //add_teams.mcfunction inputString = "team add nbs_1" + br @@ -165,5 +180,6 @@ with (new(obj_dummy2)) { directory_delete_lib(tempdir) instance_destroy() } -message("Data pack saved!" + br + br + "To play the song in-game, use:" + br + br + "/function " + functionpath + "play" + br + "/function " + functionpath + "pause" + br + "/function " + functionpath + "stop","Data Pack Export") + +message("Data pack saved!" + br + br + "To play the song in-game, use:" + br + br + "/function " + functionpath + "play" + br + "/function " + functionpath + "pause" + br + "/function " + functionpath + "stop" + br + br + "If you wish to uninstall it from" + br + "your world, run:" + br + br + "/function " + functionpath + "uninstall" + br + br + "and then remove it from the " + br + "'datapacks' folder.","Data Pack Export") window = w_datapack_export \ No newline at end of file From 03251c6a3dc2499ca6a6774777eea02ed9f9a57b Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 05:56:38 -0300 Subject: [PATCH 64/86] Add toggle to show red outline on incompatible note blocks --- scripts/control_create/control_create.gml | 1 + scripts/draw_block/draw_block.gml | 2 +- scripts/load_settings/load_settings.gml | 1 + scripts/save_settings/save_settings.gml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 13215746b..de8ace1c7 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -119,6 +119,7 @@ show_octaves = 0 use_colors = 1 use_icons = 0 use_shapes = 0 +show_incompatible = 1 totalblocks = 0 mousewheel = 0 diff --git a/scripts/draw_block/draw_block.gml b/scripts/draw_block/draw_block.gml index 022bdd05b..c5d0405bc 100644 --- a/scripts/draw_block/draw_block.gml +++ b/scripts/draw_block/draw_block.gml @@ -47,7 +47,7 @@ if (pit < 0) { draw_rectangle(xx, yy, xx + 32, yy + 32, false) } -if (ins.user || key < 33 || key > 57) { +if (show_incompatible && (ins.user || key < 33 || key > 57)) { draw_set_color(c_red) draw_set_alpha(1) draw_rectangle(xx, yy, xx + 32, yy + 32, 1) diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index 4008fc081..d4be6baca 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -24,6 +24,7 @@ use_icons = ini_read_real( "preferences", "use_icons", use_ic use_shapes = ini_read_real( "preferences", "use_shapes", use_shapes) show_numbers = ini_read_real( "preferences", "show_numbers", show_numbers) show_octaves = ini_read_real( "preferences", "show_octaves", show_octaves) +show_incompatible = ini_read_real( "preferences", "show_incompatible", show_incompatible) fade = ini_read_real( "preferences", "use_fading", fade) show_layers = ini_read_real( "preferences", "show_layers", show_layers) show_piano = ini_read_real( "preferences", "show_piano", show_piano) diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index 360af9835..5ec534c94 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -23,6 +23,7 @@ ini_write_real_clean("preferences", "use_icons", use_icons) ini_write_real_clean("preferences", "use_shapes", use_shapes) ini_write_real_clean("preferences", "show_numbers", show_numbers) ini_write_real_clean("preferences", "show_octaves", show_octaves) +ini_write_real_clean("preferences", "show_incompatible", show_incompatible) ini_write_real_clean("preferences", "use_fading", fade) ini_write_real_clean("preferences", "show_layers", show_layers) ini_write_real_clean("preferences", "show_piano", show_piano) From 31ab32ea315656495c6980ae1be6b67fa08c5e43 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 06:13:52 -0300 Subject: [PATCH 65/86] Add toggle for red tint on out of range piano keys --- scripts/control_create/control_create.gml | 1 + scripts/draw_piano/draw_piano.gml | 6 +++--- scripts/load_settings/load_settings.gml | 1 + scripts/save_settings/save_settings.gml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index de8ace1c7..478688f3a 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -184,6 +184,7 @@ show_keynames = 1 show_keynumbers = 0 show_keyboard = 1 show_notechart = 0 +show_outofrange = 1 editline = 0 piano_key[87] = 0 key_press[87] = 0 diff --git a/scripts/draw_piano/draw_piano.gml b/scripts/draw_piano/draw_piano.gml index 191be0844..f41571db2 100644 --- a/scripts/draw_piano/draw_piano.gml +++ b/scripts/draw_piano/draw_piano.gml @@ -57,7 +57,7 @@ for (a = 0; a < k; a += 1) { showclicks2 = !out && show_keynumbers col = c_white down[1] = 0 - if (out) col = 8224255 + if (show_outofrange && out) col = 8224255 if (selected_key = c2 && playing = 0) col = 16753828 if (current_time - key_played[c2] < 300) {col = merge_color(col, c_yellow, 1 - (current_time - key_played[c2]) / 300) down[1] = ((current_time - key_played[c2]) / 300) * 2 if (down[1] > 1) down[1] = 2 - down[1] down[1] = floor(down[1] * 3) / 3} if (key_midipress[c2] || key_press[c2] || key_click[c2]) down[1] = 0.75 @@ -68,7 +68,7 @@ for (a = 0; a < k; a += 1) { out = (c1 < 33 || c1 > 57) showclicks1 = !out && show_keynumbers col = c_white - if (out) col = 8224255 + if (show_outofrange && out) col = 8224255 if (selected_key = c1 && playing = 0) col = 16753828 if (current_time - key_played[c1] < 300) {col = merge_color(col, c_yellow, 1 - (current_time - key_played[c1]) / 300) down[0] = ((current_time - key_played[c1]) / 300) * 2 if (down[0] > 1) down[0] = 2 - down[0] down[0] = floor(down[0] * 3) / 3} if (key_midipress[c1] || key_press[c1] || key_click[c1]) down[0] = 0.75 @@ -135,7 +135,7 @@ for (a = 0; a < k; a += 1) { showclicks1 = !out && show_keynumbers col = c_white down = 0 - if (out) col = 8224255 + if (show_outofrange && out) col = 8224255 if (selected_key = c1 && playing = 0) col = 16753828 if (current_time - key_played[c1] < 300) {col = merge_color(col, c_yellow, 1 - (current_time - key_played[c1]) / 300) down = ((current_time - key_played[c1]) / 300) * 2 if (down > 1) down = 2 - down down = floor(down * 3) / 3} if (key_midipress[c1] || key_press[c1] || key_click[c1]) down = 0.75 diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index d4be6baca..b5bb93940 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -33,6 +33,7 @@ show_keynames = ini_read_real( "preferences", "show_keynames", show_k show_keynumbers = ini_read_real( "preferences", "show_keynumbers", show_keynumbers) show_keyboard = ini_read_real( "preferences", "show_keyboard", show_keyboard) show_notechart = ini_read_real( "preferences", "show_notechart", show_notechart) +show_outofrange = ini_read_real( "preferences", "show_outofrange", show_outofrange) mousewheel = ini_read_real( "preferences", "mousewheel", mousewheel) changepitch = ini_read_real( "preferences", "change_pitch", changepitch) select_lastpressed = ini_read_real( "preferences", "select_lastpressed", select_lastpressed) diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index 5ec534c94..20c2963c4 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -32,6 +32,7 @@ ini_write_real_clean("preferences", "show_keynames", show_keynames) ini_write_real_clean("preferences", "show_keynumbers", show_keynumbers) ini_write_real_clean("preferences", "show_keyboard", show_keyboard) ini_write_real_clean("preferences", "show_notechart", show_notechart) +ini_write_real_clean("preferences", "show_outofrange", show_outofrange) ini_write_real_clean("preferences", "mousewheel", mousewheel) ini_write_real_clean("preferences", "change_pitch", changepitch) ini_write_real_clean("preferences", "select_lastpressed", select_lastpressed) From 42fa73600c107d407f1b50d2397199644d9ef44e Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 06:48:06 -0300 Subject: [PATCH 66/86] Improve layout of Preferences window --- .../draw_window_preferences.gml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 2fc9e71e7..17fd76591 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -132,7 +132,7 @@ if (selected_tab = 0) { } if (draw_button2(x1 + 22 + 84 + 84, y1 + 326, 96, "Use default")) patternfolder = pattern_directory } else if (selected_tab = 1) { - draw_areaheader(x1 + 22, y1 + 74, 456, 170, "Note blocks") + draw_areaheader(x1 + 22, y1 + 74, 456, 176, "Note blocks") if (draw_checkbox(x1 + 40, y1 + 90, use_colors, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) use_colors=!use_colors if (draw_checkbox(x1 + 40, y1 + 110, use_icons, "Show instrument icons", "If the instruments should be identified with\ntheir respective icons.")) use_icons=!use_icons if (draw_checkbox(x1 + 40, y1 + 130, use_shapes, "Use different shapes for each instrument", "If the instruments should be identified\nwith different shapes.")) use_shapes=!use_shapes @@ -140,18 +140,18 @@ if (selected_tab = 0) { if (draw_checkbox(x1 + 40, y1 + 180, show_octaves, "Show octave numbers", "Whether the number of the octave the note block\nis in should be shown.")) show_octaves=!show_octaves if (draw_checkbox(x1 + 40, y1 + 200, fade, "No fading", "Disables transparency animations on note block sprites")) fade = !fade if (draw_checkbox(x1 + 40, y1 + 220, show_layers, "Show layer boxes", "Whether the layer boxes should be\nshown to the right of the workspace.")) show_layers = !show_layers - draw_areaheader(x1 + 22, y1 + 260, 456, 115, "Piano") - if (draw_checkbox(x1 + 40, y1 + 276, show_piano, "Show piano", "Whether the piano should be visible.")) show_piano = !show_piano - if (draw_checkbox(x1 + 40, y1 + 296, show_keynames, "Show key names", "If the names of the keys should be shown.")) show_keynames=!show_keynames - if (draw_checkbox(x1 + 40, y1 + 316, show_keynumbers, "Show key numbers", "Whether to show the amount of right-clicks required\non each key inside the 2 octave range.")) show_keynumbers=!show_keynumbers - if (draw_checkbox(x1 + 40, y1 + 336, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard - if (draw_checkbox(x1 + 40, y1 + 356, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart + draw_areaheader(x1 + 22, y1 + 274, 456, 151, "Piano") + if (draw_checkbox(x1 + 40, y1 + 290, show_piano, "Show piano", "Whether the piano should be visible.")) show_piano = !show_piano + if (draw_checkbox(x1 + 40, y1 + 335, show_keynames, "Show key names", "If the names of the keys should be shown.")) show_keynames=!show_keynames + if (draw_checkbox(x1 + 40, y1 + 355, show_keynumbers, "Show key numbers", "Whether to show the amount of right-clicks required\non each key inside the 2 octave range.")) show_keynumbers=!show_keynumbers + if (draw_checkbox(x1 + 40, y1 + 375, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard + if (draw_checkbox(x1 + 40, y1 + 395, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart if (!show_piano) draw_set_color(c_gray) - draw_text(x1 + 180, y1 + 275, "Keys to show:") + draw_text(x1 + 70, y1 + 310, "Keys to show:") if (show_piano) { - keysmax = median(20, draw_dragvalue(4, x1 + 260, y1 + 275, keysmax, 2), 50) + keysmax = median(20, draw_dragvalue(4, x1 + 150, y1 + 310, keysmax, 2), 50) } else { - draw_text(x1 + 260, y1 + 275, keysmax) + draw_text(x1 + 150, y1 + 310, keysmax) } draw_theme_color() popup_set_window(x1 + 180, y1 + 275, 150, 21, "The amount of keys to show. A high number may\nslow down the program on old computers.") From b290b5c2ea1dcf087725a71a95aa79d14bf01d1a Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 07:05:01 -0300 Subject: [PATCH 67/86] Add preference to toggle highlighting incompatible keys/note blocks --- .../draw_window_preferences.gml | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 17fd76591..29e998673 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -3,8 +3,8 @@ var x1, y1, a, b, c, as, stabx, stabw, nsel, str; curs = cr_default nsel = -1 x1 = floor(window_width / 2 - 250) -y1 = floor(window_height / 2 - 250) -draw_window(x1, y1, x1 + 500, y1 + 500) +y1 = floor(window_height / 2 - 255) +draw_window(x1, y1, x1 + 500, y1 + 510) draw_set_font(fnt_mainbold) draw_text(x1 + 8, y1 + 8, "Preferences") draw_set_font(fnt_main) @@ -14,7 +14,7 @@ str[1] = "Appearance" str[2] = "Usability" str[3] = "Playback" if (theme = 1) { - draw_window(x1 + 4, y1 + 45, x1 + 496, y1 + 464) + draw_window(x1 + 4, y1 + 45, x1 + 496, y1 + 474) } for (a = 0; a < 4; a += 1) { c = mouse_rectangle(x1 + b, y1 + 28, string_width(str[a]) + 12, 18) @@ -33,9 +33,9 @@ for (a = 0; a < 4; a += 1) { if (theme = 0 || theme = 2) { draw_set_color(c_white) if(theme = 2) draw_set_color(c_dark) - draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 462, 0) + draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 472, 0) draw_set_color(make_color_rgb(137, 140, 149)) - draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 462, 1) + draw_rectangle(x1 + 6, y1 + 46, x1 + 494, y1 + 472, 1) draw_set_color(c_white) if(theme = 2) draw_set_color(c_dark) draw_rectangle(x1 + stabx, y1 + 26, x1 + stabx + stabw, y1 + 26 + 20, 0) @@ -47,7 +47,7 @@ if (theme = 0 || theme = 2) { draw_theme_color() draw_text(x1 + stabx + 8, y1 + 28, str[selected_tab]) draw_set_color(make_color_rgb(213, 223, 229)) - if(theme = 0) draw_roundrect(x1 + 10, y1 + 50, x1 + 490, y1 + 458, 1) + if(theme = 0) draw_roundrect(x1 + 10, y1 + 50, x1 + 490, y1 + 468, 1) }else{ draw_sprite(spr_tabbuttons, 18, x1 + stabx - 1, y1 + 26) draw_sprite_ext(spr_tabbuttons, 19, x1 + stabx + 1, y1 + 26, stabw / 2 - 1, 1, 0, -1, 1) @@ -132,26 +132,28 @@ if (selected_tab = 0) { } if (draw_button2(x1 + 22 + 84 + 84, y1 + 326, 96, "Use default")) patternfolder = pattern_directory } else if (selected_tab = 1) { - draw_areaheader(x1 + 22, y1 + 74, 456, 176, "Note blocks") + draw_areaheader(x1 + 22, y1 + 74, 456, 196, "Note blocks") if (draw_checkbox(x1 + 40, y1 + 90, use_colors, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) use_colors=!use_colors if (draw_checkbox(x1 + 40, y1 + 110, use_icons, "Show instrument icons", "If the instruments should be identified with\ntheir respective icons.")) use_icons=!use_icons if (draw_checkbox(x1 + 40, y1 + 130, use_shapes, "Use different shapes for each instrument", "If the instruments should be identified\nwith different shapes.")) use_shapes=!use_shapes if (draw_checkbox(x1 + 40, y1 + 160, show_numbers, "Show key numbers", "Whether to show the amount of right-clicks required\nfor each note block.")) show_numbers=!show_numbers if (draw_checkbox(x1 + 40, y1 + 180, show_octaves, "Show octave numbers", "Whether the number of the octave the note block\nis in should be shown.")) show_octaves=!show_octaves - if (draw_checkbox(x1 + 40, y1 + 200, fade, "No fading", "Disables transparency animations on note block sprites")) fade = !fade - if (draw_checkbox(x1 + 40, y1 + 220, show_layers, "Show layer boxes", "Whether the layer boxes should be\nshown to the right of the workspace.")) show_layers = !show_layers - draw_areaheader(x1 + 22, y1 + 274, 456, 151, "Piano") - if (draw_checkbox(x1 + 40, y1 + 290, show_piano, "Show piano", "Whether the piano should be visible.")) show_piano = !show_piano - if (draw_checkbox(x1 + 40, y1 + 335, show_keynames, "Show key names", "If the names of the keys should be shown.")) show_keynames=!show_keynames - if (draw_checkbox(x1 + 40, y1 + 355, show_keynumbers, "Show key numbers", "Whether to show the amount of right-clicks required\non each key inside the 2 octave range.")) show_keynumbers=!show_keynumbers - if (draw_checkbox(x1 + 40, y1 + 375, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard - if (draw_checkbox(x1 + 40, y1 + 395, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart + if (draw_checkbox(x1 + 40, y1 + 200, show_incompatible, "Highlight incompatible note blocks", "Whether to show a red outline on note blocks with\ncustom instruments or outside the 2 octave range.")) show_incompatible=!show_incompatible + if (draw_checkbox(x1 + 40, y1 + 220, fade, "No fading", "Disables transparency animations on note block sprites")) fade = !fade + if (draw_checkbox(x1 + 40, y1 + 240, show_layers, "Show layer boxes", "Whether the layer boxes should be\nshown to the right of the workspace.")) show_layers = !show_layers + draw_areaheader(x1 + 22, y1 + 294, 456, 171, "Piano") + if (draw_checkbox(x1 + 40, y1 + 310, show_piano, "Show piano", "Whether the piano should be visible.")) show_piano = !show_piano + if (draw_checkbox(x1 + 40, y1 + 355, show_keynames, "Show key names", "If the names of the keys should be shown.")) show_keynames=!show_keynames + if (draw_checkbox(x1 + 40, y1 + 375, show_keynumbers, "Show key numbers", "Whether to show the amount of right-clicks required\non each key inside the 2 octave range.")) show_keynumbers=!show_keynumbers + if (draw_checkbox(x1 + 40, y1 + 395, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard + if (draw_checkbox(x1 + 40, y1 + 415, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart + if (draw_checkbox(x1 + 40, y1 + 435, show_outofrange, "Highlight out of range keys", "Whether to show a red tint on keys\noutside of the 2 octave range.")) show_outofrange=!show_outofrange if (!show_piano) draw_set_color(c_gray) - draw_text(x1 + 70, y1 + 310, "Keys to show:") + draw_text(x1 + 70, y1 + 330, "Keys to show:") if (show_piano) { - keysmax = median(20, draw_dragvalue(4, x1 + 150, y1 + 310, keysmax, 2), 50) + keysmax = median(20, draw_dragvalue(4, x1 + 150, y1 + 330, keysmax, 2), 50) } else { - draw_text(x1 + 150, y1 + 310, keysmax) + draw_text(x1 + 150, y1 + 330, keysmax) } draw_theme_color() popup_set_window(x1 + 180, y1 + 275, 150, 21, "The amount of keys to show. A high number may\nslow down the program on old computers.") @@ -184,5 +186,5 @@ if (selected_tab = 0) { if (draw_radiobox(x1 + 233 + 32, y1 + 224 + 16, !use_bpm, "Ticks per second (t/s)", "Display song tempos in ticks per second.")) use_bpm = 0 if (draw_radiobox(x1 + 233 + 32, y1 + 244 + 16, use_bpm, "Beats per minute (BPM)", "Display song tempos in beats per minute.")) use_bpm = 1 } -if (draw_button2(x1 + 420, y1 + 468, 72, "OK")) window = 0 +if (draw_button2(x1 + 420, y1 + 478, 72, "OK")) window = 0 window_set_cursor(curs) From cb515e2b70529e01fb80409a1cff2e6820cdd5c9 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 07:05:45 -0300 Subject: [PATCH 68/86] Add backend master volume control --- scripts/control_create/control_create.gml | 1 + scripts/play_sound/play_sound.gml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index 478688f3a..c74ccc9e9 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -67,6 +67,7 @@ audio_listener_orientation(0,1,0, 0,0,1) audio_listener_position(100,0,1) playing = 0 record = 0 +mastervol = 1 tempo = 10 tempodrag = 10 bpm = 0 diff --git a/scripts/play_sound/play_sound.gml b/scripts/play_sound/play_sound.gml index 3cc2398eb..fc83c5534 100644 --- a/scripts/play_sound/play_sound.gml +++ b/scripts/play_sound/play_sound.gml @@ -17,7 +17,7 @@ if (!ins.loaded) return 0 emitter=audio_emitter_create() audio_emitter_pitch(emitter, 0.495 * power(1.06, (key + (ins.key + (pit/100) - 78)))) -audio_emitter_gain(emitter, vol / 100) +audio_emitter_gain(emitter, (vol / 100) * mastervol) if (realstereo = 0) audio_emitter_position(emitter,pan,0,0) else audio_emitter_position(emitter,100,0,0) From 583bd168eec22f4bb58cdea3eaa58ad8970be976 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 07:20:03 -0300 Subject: [PATCH 69/86] Move save version setting to File menu instead of Settings Fixes #151 --- scripts/control_draw/control_draw.gml | 4 ++-- scripts/menu_click/menu_click.gml | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 86f31689d..20f0e6bd5 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -1037,7 +1037,7 @@ if (draw_tab("File")) { show_menu_ext("file", 0, 19, icon(icons.NEW)+"Ctrl + N$New song|"+ icon(icons.OPEN)+"Ctrl+O$Open song...|Recent songs...|\\|" + str + condstr(recent_song[0] != "", "-|Clear recent songs") + condstr(recent_song[0] = "", "^!No recent songs") + "|/|-|"+ icon(icons.SAVE)+"Ctrl+S$Save song|"+ - icon(icons.SAVE_AS)+"Save song as a new file...|-|"+ + icon(icons.SAVE_AS)+"Save song as a new file...|Save options...|-|"+ "Import pattern...|"+"Export pattern...|"+"Import from MIDI...|Import from schematic...|-|"+ inactive(totalblocks = 0) + "Export as MP3...|"+ inactive(totalblocks = 0) + "Export as schematic...|"+ @@ -1095,7 +1095,7 @@ if (draw_tab("Settings")) { } } show_menu_ext("settings", 59, 19, "Instrument|\\|" + str + "-|" + customstr + condstr(customstr != "", "-|") + - icon(icons.INSTRUMENTS)+"Instrument settings...|/|-|" + icon(icons.INFORMATION) + "Song info...|" + icon(icons.PROPERTIES) + "Song properties...|Song stats...|-|" + icon(icons.MIDI_INPUT) + "MIDI device manager|Save options...|Preferences...") + icon(icons.INSTRUMENTS)+"Instrument settings...|/|-|" + icon(icons.INFORMATION) + "Song info...|" + icon(icons.PROPERTIES) + "Song properties...|Song stats...|-|" + icon(icons.MIDI_INPUT) + "MIDI device manager|Preferences...") } if (draw_tab("Help")) { show_menu_ext("help", 109, 19, icon(icons.HELP) + "Tutorial videos|\\|Part 1: Composing note block music|Part 2: Opening MIDI files|Part 3: Importing songs into Minecraft|Part 4: Editing songs made in Minecraft |-|F1$View all|/|-|" + icon(icons.INTERNET) + "Minecraft Forums topic...|Minecraft Wiki page...|-|Changelist...|About...|GitHub") diff --git a/scripts/menu_click/menu_click.gml b/scripts/menu_click/menu_click.gml index 5410df6ba..fc45e1fb9 100644 --- a/scripts/menu_click/menu_click.gml +++ b/scripts/menu_click/menu_click.gml @@ -39,19 +39,20 @@ switch (m) { } if (sel = b + 4) save_song(filename) if (sel = b + 5) save_song("") - if (sel = b + 6) pattern_import("") - if (sel = b + 7) pattern_export("") - if (sel = b + 8) open_midi("") - if (sel = b + 9) open_schematic("") - if (sel = b + 10) window = w_mp3_export - if (sel = b + 11) { + if (sel = b + 6) window = w_saveoptions + if (sel = b + 7) pattern_import("") + if (sel = b + 8) pattern_export("") + if (sel = b + 9) open_midi("") + if (sel = b + 10) open_schematic("") + if (sel = b + 11) window = w_mp3_export + if (sel = b + 12) { if (calculate_size()) window = w_schematic_export } - if (sel = b + 12) { + if (sel = b + 13) { if (calculate_size()) window = w_branch_export } - if(sel = b + 13) window = w_datapack_export - if (sel = b + 14) game_end() + if(sel = b + 14) window = w_datapack_export + if (sel = b + 15) game_end() break } case "edit": { @@ -158,8 +159,7 @@ switch (m) { if (sel = b + 3) window = w_properties if (sel = b + 4) {selection_place(0) window = w_stats} if (sel = b + 5) window = w_mididevices - if (sel = b + 6) window = w_saveoptions - if (sel = b + 7) window = w_preferences + if (sel = b + 6) window = w_preferences break } case "help": { From 2de1478f9396dde44ec3a24a4267183bfcef1f24 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Sat, 27 Jun 2020 07:40:36 -0300 Subject: [PATCH 70/86] Improve macro bar positioning with hidden layer boxes/piano Fixes #136 --- scripts/control_draw/control_draw.gml | 31 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 20f0e6bd5..5426ffece 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -999,12 +999,19 @@ if (window = w_dragstereo) { } } // Macro Bar -if selected != 0 { -draw_sprite_ext(spr_iconbar, 0, x1, y1+32,1, 1.3, 0, -1, 1) -draw_sprite_ext(spr_iconbar, 1, x1, y1+32, 258, 1.3, 0, -1, 1) -draw_sprite_ext(spr_iconbar, 2, 258, y1+32, 1, 1.3, 0, -1, 1) +if (selected != 0 && show_piano) { +if (show_layers) { + draw_sprite_ext(spr_iconbar, 0, x1, y1+32,1, 1.3, 0, -1, 1) + draw_sprite_ext(spr_iconbar, 1, x1, y1+32, 258, 1.3, 0, -1, 1) + draw_sprite_ext(spr_iconbar, 2, 258, y1+32, 1, 1.3, 0, -1, 1) +} else { + draw_sprite_ext(spr_iconbar, 0, x1, y1+52 ,1, 0.75, 0, -1, 1) + draw_sprite_ext(spr_iconbar, 1, x1, y1+52, 383, 0.75, 0, -1, 1) + draw_sprite_ext(spr_iconbar, 2, 383, y1+52, 1, 0.75, 0, -1, 1) +} xx = x1 + 6 var yy = y1+37 +if (!show_layers) yy += 18 if (draw_macroicon(0, xx, yy, "Tremolo...", 0, 0)) {playing = 0 window = w_tremolo} xx += 25 if (draw_macroicon(1, xx, yy, "Stereo...", 0, 0)) {playing = 0 window = w_stereo} xx += 25 if (draw_macroicon(2, xx, yy, "Arpeggio...", 0, 0)) {playing = 0 window = w_arpeggio} xx += 25 @@ -1014,12 +1021,16 @@ if (draw_macroicon(5, xx, yy, "Stagger...", 0, 0)) {playing = 0 window = w_stagg if (draw_macroicon(6, xx, yy, "Chorus", 0, 0)) {playing = 0 macro_chorus()} xx += 25 if (draw_macroicon(7, xx, yy, "Volume LFO", 0, 0)) {playing = 0 macro_velocitylfo()} xx += 25 if (draw_macroicon(8, xx, yy, "Fade in", 0, 0)) {playing = 0 macro_fadein()} xx += 25 -if (draw_macroicon(9, xx, yy, "Fade out", 0, 0)) {playing = 0 macro_fadeout()} xx = x1 + 6 -if (draw_macroicon(10, xx, yy + 16, "Replace key", 0, 0)) {playing = 0 macro_replacekey()} xx += 25 -if (draw_macroicon(11, xx, yy + 16, "Set velocity...", 0, 0)) {playing = 0 window = w_setvelocity} xx += 25 -if (draw_macroicon(12, xx, yy + 16, "Set panning...", 0, 0)) {playing = 0 window = w_setpanning} xx += 25 -if (draw_macroicon(13, xx, yy + 16, "Set pitch...", 0, 0)) {playing = 0 window = w_setpitch} xx += 25 -if (draw_macroicon(14, xx, yy + 16, "Reset all properties", 0, 0)) {playing = 0 macro_reset()} xx += 25 +if (draw_macroicon(9, xx, yy, "Fade out", 0, 0)) {playing = 0 macro_fadeout()} xx += 25 +if (show_layers) { + xx = x1 + 6 + yy += 16 +} +if (draw_macroicon(10, xx, yy, "Replace key", 0, 0)) {playing = 0 macro_replacekey()} xx += 25 +if (draw_macroicon(11, xx, yy, "Set velocity...", 0, 0)) {playing = 0 window = w_setvelocity} xx += 25 +if (draw_macroicon(12, xx, yy, "Set panning...", 0, 0)) {playing = 0 window = w_setpanning} xx += 25 +if (draw_macroicon(13, xx, yy, "Set pitch...", 0, 0)) {playing = 0 window = w_setpitch} xx += 25 +if (draw_macroicon(14, xx, yy, "Reset all properties", 0, 0)) {playing = 0 macro_reset()} xx += 25 } // Tabs From 8cb53cda8bbdb34212ee29b55391d3b5d383c726 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 29 Jun 2020 17:51:42 -0300 Subject: [PATCH 71/86] Add remaining bit of code in multiple-tick playback Should have gone with 856898cbe38d6397152c9b167198c9e78cb5b097. --- scripts/control_draw/control_draw.gml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 5426ffece..b68711276 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -293,6 +293,8 @@ if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && ( } else { start = floor(marker_prevpos) + 1 } + for (i = start; i <= floor(marker_pos); i++) { + xx = i if (colamount[xx] > 0) { for (b = colfirst[xx]; b <= collast[xx]; b += 1) { if (song_exists[xx, b]) { From 74fa1ec661f769a2c51f1babdbd4d21aca42837b Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 29 Jun 2020 17:56:13 -0300 Subject: [PATCH 72/86] Add blackout mode toggle with F10 key --- scripts/control_create/control_create.gml | 1 + scripts/control_draw/control_draw.gml | 24 ++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index c74ccc9e9..c363e116b 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -32,6 +32,7 @@ check_update = 1 show_welcome = 1 scroll_wheel = 0 theme = 0 +blackout = 0 editmode = 0 clickinarea = 0 dontplace = 0 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index b68711276..50dca833b 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -241,14 +241,20 @@ for (b = 0; b <= totalrows; b += 1) { } } } +if (blackout) { + draw_set_color(c_black) + draw_rectangle(x1 + 2, y1 + 34, x1 + 2 + 32 * totalcols, y1 + 34 + 32 * totalrows, false) +} for (a = 0; a < totalcols; a += 1) { - if ((starta + a) mod (timesignature * 4) == 0) { - draw_set_alpha(0.3) - draw_rectangle(x1 + 2 + 32 * a, y1 + 34, (x1 + 2 + 32 * a) + 1, y1 + 34 + totalrows * 32, false) - } else { - draw_set_alpha(0.1) - if ((starta + a) mod 4 == 0) draw_set_alpha(0.25) - draw_line(x1 + 2 + 32 * a, y1 + 34, x1 + 2 + 32 * a, y1 + 34 + totalrows * 32) + if (!blackout) { + if ((starta + a) mod (timesignature * 4) == 0) { + draw_set_alpha(0.3) + draw_rectangle(x1 + 2 + 32 * a, y1 + 34, (x1 + 2 + 32 * a) + 1, y1 + 34 + totalrows * 32, false) + } else { + draw_set_alpha(0.1) + if ((starta + a) mod 4 == 0) draw_set_alpha(0.25) + draw_line(x1 + 2 + 32 * a, y1 + 34, x1 + 2 + 32 * a, y1 + 34 + totalrows * 32) + } } for (b = 0; b < totalrows; b += 1) { if (starta + a <= enda) { @@ -597,6 +603,10 @@ if (window = 0 && text_focus = -1) { } } } + // Toggle blackout mode + if (keyboard_check_pressed(vk_f10)) { + blackout = !blackout + } // Toggle fullscreen if (keyboard_check_pressed(vk_f11)) { fullscreen = !fullscreen From 9357d1a3b1acb2205db1e1e6b2b34fde6e63d615 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 29 Jun 2020 21:17:52 -0300 Subject: [PATCH 73/86] Make timeline solid black on blackout mode --- scripts/control_draw/control_draw.gml | 2 +- .../e0b0d622-31ac-4ace-b097-1920451aeb6e.png | Bin 0 -> 90 bytes .../49ee6315-ecbf-42b9-993f-146e2ec5c6e7.png | Bin 0 -> 90 bytes sprites/spr_timeline/spr_timeline.yy | 22 ++++++++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 sprites/spr_timeline/e0b0d622-31ac-4ace-b097-1920451aeb6e.png create mode 100644 sprites/spr_timeline/layers/e0b0d622-31ac-4ace-b097-1920451aeb6e/49ee6315-ecbf-42b9-993f-146e2ec5c6e7.png diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 50dca833b..7307424a3 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -630,7 +630,7 @@ if (select > 0) { } // Timeline and markers -draw_sprite_ext(spr_timeline, 0 + theme = 2, x1 + 2, y1 + 2, totalcols * 32 + 20, 1, 0, -1, 1) +draw_sprite_ext(spr_timeline, (0 + theme = 2) * !blackout + blackout * 2, x1 + 2, y1 + 2, totalcols * 32 + 20, 1, 0, -1, 1) draw_set_font(fnt_small) draw_set_halign(fa_left) c = 1 diff --git a/sprites/spr_timeline/e0b0d622-31ac-4ace-b097-1920451aeb6e.png b/sprites/spr_timeline/e0b0d622-31ac-4ace-b097-1920451aeb6e.png new file mode 100644 index 0000000000000000000000000000000000000000..2e0ea8ce93229c5719de1b6d2aafe9acca4a40f7 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfw!3HERKNXS!Qi`4~jv*Cuk`ogWew=4gkmdKI;Vst0IHE0g#Z8m literal 0 HcmV?d00001 diff --git a/sprites/spr_timeline/layers/e0b0d622-31ac-4ace-b097-1920451aeb6e/49ee6315-ecbf-42b9-993f-146e2ec5c6e7.png b/sprites/spr_timeline/layers/e0b0d622-31ac-4ace-b097-1920451aeb6e/49ee6315-ecbf-42b9-993f-146e2ec5c6e7.png new file mode 100644 index 0000000000000000000000000000000000000000..2e0ea8ce93229c5719de1b6d2aafe9acca4a40f7 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfw!3HERKNXS!Qi`4~jv*Cuk`ogWew=4gkmdKI;Vst0IHE0g#Z8m literal 0 HcmV?d00001 diff --git a/sprites/spr_timeline/spr_timeline.yy b/sprites/spr_timeline/spr_timeline.yy index 1d638358a..9e199be34 100644 --- a/sprites/spr_timeline/spr_timeline.yy +++ b/sprites/spr_timeline/spr_timeline.yy @@ -58,6 +58,28 @@ "LayerId": "49ee6315-ecbf-42b9-993f-146e2ec5c6e7" } ] + }, + { + "id": "e0b0d622-31ac-4ace-b097-1920451aeb6e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "e573fcd7-e024-40fb-b3c9-260e6c9fb4a0", + "compositeImage": { + "id": "bbb92a20-1ca6-4546-abdf-539b8475b6a2", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e0b0d622-31ac-4ace-b097-1920451aeb6e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f3207cb7-4d3c-4fad-8680-915a3c98a762", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e0b0d622-31ac-4ace-b097-1920451aeb6e", + "LayerId": "49ee6315-ecbf-42b9-993f-146e2ec5c6e7" + } + ] } ], "gridX": 0, From debe9b89902cd5b0e38ee1046b22f3259f16423f Mon Sep 17 00:00:00 2001 From: Bentroen Date: Mon, 29 Jun 2020 21:19:33 -0300 Subject: [PATCH 74/86] Fix workspace/timeline transition to blackout happening one frame apart --- scripts/control_draw/control_draw.gml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 7307424a3..d3f61129a 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -68,6 +68,15 @@ if (totalblocks > 0) { } } +// Toggle blackout mode +if (keyboard_check_pressed(vk_f10)) { + blackout = !blackout +} +// Toggle fullscreen +if (keyboard_check_pressed(vk_f11)) { + fullscreen = !fullscreen +} + if (theme = 0) window_background = 15790320 if (theme = 1) window_background = 13160660 if (theme = 2) window_background = c_dark @@ -603,14 +612,6 @@ if (window = 0 && text_focus = -1) { } } } - // Toggle blackout mode - if (keyboard_check_pressed(vk_f10)) { - blackout = !blackout - } - // Toggle fullscreen - if (keyboard_check_pressed(vk_f11)) { - fullscreen = !fullscreen - } } // Selecting note blocks if (select > 0) { From 4b7cd488711dd52f74f7da04e5e241c6a04bd3f9 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Tue, 30 Jun 2020 07:01:29 -0300 Subject: [PATCH 75/86] Fix marker contrast in blackout mode with light theme --- scripts/control_draw/control_draw.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index d3f61129a..7abe90173 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -811,8 +811,8 @@ if (section_exists) { marker_pos = median(0, marker_pos, enda + totalcols) a = floor(marker_pos * 32 - starta * 32) -draw_sprite(spr_marker, 0 + 6 * (theme = 2), x1 + 2 + a, y1 + 2) -draw_sprite_ext(spr_marker, 1 + 6 * (theme = 2), x1 + 2 + a, y1 + 2, 1, totalrows * 2 + 6, 0, -1, 1) +draw_sprite(spr_marker, 0 + 6 * (theme = 2 || blackout), x1 + 2 + a, y1 + 2) +draw_sprite_ext(spr_marker, 1 + 6 * (theme = 2 || blackout), x1 + 2 + a, y1 + 2, 1, totalrows * 2 + 6, 0, -1, 1) draw_set_font(fnt_main) From 74227886fed746a18d8157074de30acc91c7f579 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 04:22:13 -0300 Subject: [PATCH 76/86] Fix "out-of-range" hyphenization When the words work as the qualifier of a noun, they must be hyphenated. --- .../draw_window_datapack_export.gml | 4 ++-- scripts/draw_window_preferences/draw_window_preferences.gml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml index 9bab46b57..d6dec5180 100644 --- a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml +++ b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml @@ -116,8 +116,8 @@ if (selected_tab_dat = 0) { //Locked layers if (draw_checkbox(x1 + 362, y1 + 213, dat_includelocked, "Include locked layers", "Whether to include locked layers in the data pack.")) dat_includelocked=!dat_includelocked - //Out of range notes - if (draw_checkbox(x1 + 362, y1 + 238, dat_includeoutofrange, "Include out of range notes", "Whether to include notes that don't fall into the 2 octave range supported by"+br+"Minecraft. This will require an additional resource pack you can get below.")) dat_includeoutofrange = !dat_includeoutofrange + //Out-of-range notes + if (draw_checkbox(x1 + 362, y1 + 238, dat_includeoutofrange, "Include out-of-range notes", "Whether to include notes that don't fall into the 2 octave range supported by"+br+"Minecraft. This will require an additional resource pack you can get below.")) dat_includeoutofrange = !dat_includeoutofrange //Radius if (draw_checkbox(x1 + 362, y1 + 263, dat_enableradius, "Nearby listening", "Whether to let all players in a given"+br+"radius hear the music as well.")) dat_enableradius = !dat_enableradius diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 29e998673..56ea82762 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -147,7 +147,7 @@ if (selected_tab = 0) { if (draw_checkbox(x1 + 40, y1 + 375, show_keynumbers, "Show key numbers", "Whether to show the amount of right-clicks required\non each key inside the 2 octave range.")) show_keynumbers=!show_keynumbers if (draw_checkbox(x1 + 40, y1 + 395, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard if (draw_checkbox(x1 + 40, y1 + 415, show_notechart, "Show note chart when hovering over keys", "Whether to show a note chart\nwhen hovering over the keys.")) show_notechart=!show_notechart - if (draw_checkbox(x1 + 40, y1 + 435, show_outofrange, "Highlight out of range keys", "Whether to show a red tint on keys\noutside of the 2 octave range.")) show_outofrange=!show_outofrange + if (draw_checkbox(x1 + 40, y1 + 435, show_outofrange, "Highlight out-of-range keys", "Whether to show a red tint on keys\noutside of the 2 octave range.")) show_outofrange=!show_outofrange if (!show_piano) draw_set_color(c_gray) draw_text(x1 + 70, y1 + 330, "Keys to show:") if (show_piano) { From eba6584642cd2813888916224264cacda1178d15 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 04:30:56 -0300 Subject: [PATCH 77/86] Add fullscreen toggle to bottom right corner of workspace --- scripts/control_draw/control_draw.gml | 15 ++++++ .../50861285-0f24-44a9-9418-4a22a897acd7.png | Bin 0 -> 165 bytes .../8408a07d-430b-4d01-ba8c-1d30133d93de.png | Bin 0 -> 166 bytes .../a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd.png | Bin 0 -> 165 bytes .../a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd.png | Bin 0 -> 166 bytes sprites/spr_layericons/spr_layericons.yy | 44 ++++++++++++++++++ 6 files changed, 59 insertions(+) create mode 100644 sprites/spr_layericons/50861285-0f24-44a9-9418-4a22a897acd7.png create mode 100644 sprites/spr_layericons/8408a07d-430b-4d01-ba8c-1d30133d93de.png create mode 100644 sprites/spr_layericons/layers/50861285-0f24-44a9-9418-4a22a897acd7/a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd.png create mode 100644 sprites/spr_layericons/layers/8408a07d-430b-4d01-ba8c-1d30133d93de/a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd.png diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 7abe90173..030109e1b 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -851,6 +851,21 @@ if (!fullscreen) { // the fifth parameters are totalrows & totalcols before rounding: ((rh - rhval) / 32), ((rw - 8) / 32) // this is so it stretches to fill the whole width/height of the screen instead of clipping to the note block area size } +// Fullscreen button +if (fullscreen) { + xx = rw - sbv_anim + yy = rh - 16 +} else { + xx = x1 + totalcols * 32 + yy = y1 + totalrows * 32 + 34 +} +if (theme = 0) draw_set_color(15790320) +if (theme = 1) draw_set_color(13160660) +if (theme = 2) draw_set_color(c_dark) +draw_rectangle(xx, yy, xx + 16, yy + 16, false) +if (draw_layericon(7 + fullscreen, xx, yy, condstr(!fullscreen, "Expand workspace", "Return"), 0, 0)) { + fullscreen = !fullscreen +} // Draw layers for (b = 0; b < totalrows; b += 1) { diff --git a/sprites/spr_layericons/50861285-0f24-44a9-9418-4a22a897acd7.png b/sprites/spr_layericons/50861285-0f24-44a9-9418-4a22a897acd7.png new file mode 100644 index 0000000000000000000000000000000000000000..7a59453530df6cd2df326b1d2db442f16782c5dc GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar*7ZPCCeSK!L|u^wbc4D| zz)3+*uMLy5ILoHQF~&Oz#+ta)J?D`A-}$F=aieC$FVdQ&MBb@0BjRLdH?_b literal 0 HcmV?d00001 diff --git a/sprites/spr_layericons/layers/50861285-0f24-44a9-9418-4a22a897acd7/a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd.png b/sprites/spr_layericons/layers/50861285-0f24-44a9-9418-4a22a897acd7/a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd.png new file mode 100644 index 0000000000000000000000000000000000000000..7a59453530df6cd2df326b1d2db442f16782c5dc GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar*7ZPCCeSK!L|u^wbc4D| zz)3+*uMLy5ILoHQF~&Oz#+ta)J?D`A-}$F=aieC$FVdQ&MBb@0BjRLdH?_b literal 0 HcmV?d00001 diff --git a/sprites/spr_layericons/spr_layericons.yy b/sprites/spr_layericons/spr_layericons.yy index e0de8e1b0..f948509c7 100644 --- a/sprites/spr_layericons/spr_layericons.yy +++ b/sprites/spr_layericons/spr_layericons.yy @@ -168,6 +168,50 @@ "LayerId": "a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd" } ] + }, + { + "id": "8408a07d-430b-4d01-ba8c-1d30133d93de", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "6410a5c2-0fe1-4916-b691-37ba01600cb5", + "compositeImage": { + "id": "dacc1de0-0041-4b21-bf82-4e0ab53bbbbf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8408a07d-430b-4d01-ba8c-1d30133d93de", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "2fc97786-3fbe-4400-ac74-42e63a7d268c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8408a07d-430b-4d01-ba8c-1d30133d93de", + "LayerId": "a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd" + } + ] + }, + { + "id": "50861285-0f24-44a9-9418-4a22a897acd7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "6410a5c2-0fe1-4916-b691-37ba01600cb5", + "compositeImage": { + "id": "c9138eda-3d7a-45cf-a497-05d9e971c5e1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "50861285-0f24-44a9-9418-4a22a897acd7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "5a1e7f77-2e6a-4069-afe7-da7b4d70a359", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "50861285-0f24-44a9-9418-4a22a897acd7", + "LayerId": "a09afa65-0ce3-46d9-aeb6-ee67f2ff16cd" + } + ] } ], "gridX": 0, From 4a8985572c3448d405fcde85f9df4f45ab20e43f Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 04:51:38 -0300 Subject: [PATCH 78/86] Prevent unintended interactions between workspace and scrollbar/button --- scripts/control_draw/control_draw.gml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 030109e1b..b322608e0 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -836,13 +836,13 @@ if (!fullscreen) { } else { // horizontal rise animation if (mouse_rectangle(0, rh - 25, rw, rh)) { - if (sbh_anim < 16) sbh_anim += (2 * 30 / room_speed) + if (window = 0 && sbh_anim < 16) sbh_anim += (2 * 30 / room_speed) } else if (sb_drag = -1) { if (sbh_anim > 0) sbh_anim -= (2 * 30 / room_speed) } // vertical rise animation if (mouse_rectangle(rw - 25, 0, rw, rh)) { - if (sbv_anim < 16) sbv_anim += (2 * 30 / room_speed) + if (window = 0 && sbv_anim < 16) sbv_anim += (2 * 30 / room_speed) } else if (sb_drag = -1) { if (sbv_anim > 0) sbv_anim -= (2 * 30 / room_speed) } @@ -865,6 +865,7 @@ if (theme = 2) draw_set_color(c_dark) draw_rectangle(xx, yy, xx + 16, yy + 16, false) if (draw_layericon(7 + fullscreen, xx, yy, condstr(!fullscreen, "Expand workspace", "Return"), 0, 0)) { fullscreen = !fullscreen + dontplace = 1 } // Draw layers From 7e32c5e59bd34ebc639523f2cf7c35b1a796cb90 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 05:31:18 -0300 Subject: [PATCH 79/86] Update bundled resource packs to pack format 5 --- datafiles/Data/extranotes.zip | Bin 397099 -> 397099 bytes datafiles/Data/instrumenttextures.zip | Bin 429520 -> 429519 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/datafiles/Data/extranotes.zip b/datafiles/Data/extranotes.zip index 2d44774615b86a2e49215d0da09185c2061c39f8..7d0c94cb108daaed18538b12fe9b808253ab1d2f 100644 GIT binary patch delta 76 zcmZ2IPh#~viG~)&7N!>F7M3lnZ+~&5Yd#F{Jfmkb{p&AQ1ICrx)qbF7M3lnZ+~&j=vDV`%h64n{`D8D0b}QOwco7sgb|`=_}C2j UAKu#}zBlzMBb1)b!_OuU0KAqTtpET3 diff --git a/datafiles/Data/instrumenttextures.zip b/datafiles/Data/instrumenttextures.zip index e7f049993b656a1d832b3bd9d3afe7ce5c0fc98d..cfef522afdc82497bd375278059aac5b49667184 100644 GIT binary patch delta 118 zcmcaGTk8C5sfHHD7N!>F7M2#)C2U;03=A9$k(v(!;!|eTWl!hjVpHN{*r+(?$Cf{f z?i>+XFk|I*J1(}9O@i_aA`GZ%C3@Km_;qdHD%Sg7V}#Pv!+Y6`8T+Pp_p;fu+2*qW GwEzHSpeI}a delta 119 zcmX>F7M2#)C2U;0Obi?h4ZCCfO~dq_ Date: Wed, 1 Jul 2020 06:07:48 -0300 Subject: [PATCH 80/86] Fix loading issues in datapack uninstall function - Missing line break after a command - Add [NBS] tag to uninstall message - Change "underline" property to "underlined" --- scripts/datapack_export/datapack_export.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/datapack_export/datapack_export.gml b/scripts/datapack_export/datapack_export.gml index 3e0a69710..6ee169c07 100644 --- a/scripts/datapack_export/datapack_export.gml +++ b/scripts/datapack_export/datapack_export.gml @@ -97,15 +97,15 @@ with (new(obj_dummy2)) { inputString += "scoreboard objectives remove " + objective + br inputString += "scoreboard objectives remove " + objective + "_t" + br if (add_teams) { + inputString += "kill @e[type=falling_block,tag=nbs]" + br inputString += "function " + functionpath + "remove_teams" + br - inputString += "kill @e[type=falling_block,tag=nbs]" } if (o.dat_usezip) { inputString += "datapack disable \"file/" + filename_name(fn) + "\"" + br } else { inputString += "datapack disable \"" + filename_name(fn) + "\"" + br } - inputString += "tellraw @s [\"\",{\"text\":\"Data pack \",\"color\":\"yellow\"},{\"text\":\"" + filename_name(fn) + "\",\"color\":\"gold\",\"underline\":\"true\"},{\"text\":\" uninstalled successfully. You may now remove it from your data pack folder.\",\"color\":\"yellow\"}]" + inputString += "tellraw @s [\"\",{\"text\":\"[NBS] \",\"color\":\"gold\",\"bold\":\"true\"},{\"text\":\"Data pack \",\"color\":\"yellow\"},{\"text\":\"" + filename_name(fn) + "\",\"color\":\"gold\",\"underlined\":\"true\"},{\"text\":\" uninstalled successfully. You may now remove it from your data pack folder.\",\"color\":\"yellow\"}]" dat_writefile(inputString, functiondir + "uninstall.mcfunction") if (add_teams) { From 8e39e88174943c61f12112ef46734b9da4cc2f28 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 06:13:17 -0300 Subject: [PATCH 81/86] Remove performance indicator on window title May be added later after it's polished a little more. --- scripts/control_draw/control_draw.gml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index b322608e0..b98df2e00 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -10,7 +10,8 @@ curs = cr_default showmenu = 0 cursmarker = 0 compx = 180 -window_set_caption("(" + string_format(currspeed * 100, 1, 0) + "%) " + condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") +window_set_caption(condstr(filename = "", "Unsaved song") + filename_name(filename) + condstr(changed && filename != "", "*") + " - Minecraft Note Block Studio") +// Performance indicator: "(" + string_format(currspeed * 100, 1, 0) + "%) " draw_set_alpha(1) draw_theme_color() draw_set_font(fnt_main) From 4ddb8200463bd2ae5b2559f0da84514db8aa683d Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 06:29:41 -0300 Subject: [PATCH 82/86] Fix black timeline font on blackout mode --- scripts/control_draw/control_draw.gml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index b98df2e00..7566a5e78 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -635,6 +635,8 @@ if (select > 0) { draw_sprite_ext(spr_timeline, (0 + theme = 2) * !blackout + blackout * 2, x1 + 2, y1 + 2, totalcols * 32 + 20, 1, 0, -1, 1) draw_set_font(fnt_small) draw_set_halign(fa_left) +draw_theme_color() +if (blackout) draw_set_color(c_white) c = 1 if (tempo < 3.5) c = 5 if (tempo < 1) c = 10 From 6befe1f74a626b08df299b97af5d0b691cd128b2 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 06:34:19 -0300 Subject: [PATCH 83/86] Increase 'Theme' area size in Preferences --- .../draw_window_preferences.gml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 56ea82762..5d16db9a9 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -86,7 +86,7 @@ if (selected_tab = 0) { } popup_set_window(x1 + 306, y1 + 110, 180, 16, "The amount of minutes between each auto-save.") - draw_areaheader(x1 + 22, y1 + 164, 218, 80, "Theme") + draw_areaheader(x1 + 22, y1 + 164, 218, 110, "Theme") if (draw_radiobox(x1 + 40, y1 + 164 + 16, theme == 0, "Aqua", "Use the aqua theme.")) {theme = 0 change_theme()} if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20, theme == 2, "Dark", "Use the dark theme.")) {theme = 2 change_theme()} if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20 + 20, theme == 1, "90s", "Use the 90s theme.")) {theme = 1 change_theme()} @@ -100,37 +100,37 @@ if (selected_tab = 0) { refreshrate=1 } - draw_text(x1 + 22, y1 + 260, "Song folder: " + string_truncate(songfolder, 360)) - popup_set_window(x1 + 22, y1 + 260, 430, 18, songfolder) - if (draw_button2(x1 + 22, y1 + 276, 76, "Open")) { + draw_text(x1 + 22, y1 + 290, "Song folder: " + string_truncate(songfolder, 360)) + popup_set_window(x1 + 22, y1 + 290, 430, 18, songfolder) + if (draw_button2(x1 + 22, y1 + 306, 76, "Open")) { if (!directory_exists_lib(songfolder)) { message("The indicated folder doesn't exist!", "Error") } else { open_url(songfolder) } } - if (draw_button2(x1 + 22 + 84, y1 + 276, 76, "Change")) { + if (draw_button2(x1 + 22 + 84, y1 + 306, 76, "Change")) { message("Select the directory where saving/loading should be opened in.", "") a = string(get_save_filename_ext("", "Select song folder", songfolder, "Song folder")) if (a != "") songfolder = filename_dir(a) } - if (draw_button2(x1 + 22 + 84 + 84, y1 + 276, 96, "Use default")) songfolder = songs_directory + if (draw_button2(x1 + 22 + 84 + 84, y1 + 306, 96, "Use default")) songfolder = songs_directory - draw_text(x1 + 22, y1 + 310, "Pattern folder: " + string_truncate(patternfolder, 360)) - popup_set_window(x1 + 22, y1 + 300, 430, 18, patternfolder) - if (draw_button2(x1 + 22, y1 + 326, 76, "Open")) { + draw_text(x1 + 22, y1 + 340, "Pattern folder: " + string_truncate(patternfolder, 360)) + popup_set_window(x1 + 22, y1 + 340, 430, 18, patternfolder) + if (draw_button2(x1 + 22, y1 + 356, 76, "Open")) { if (!directory_exists_lib(patternfolder)) { message("The indicated folder doesn't exist!", "Error") } else { open_url(patternfolder) } } - if (draw_button2(x1 + 22 + 84, y1 + 326, 76, "Change")) { + if (draw_button2(x1 + 22 + 84, y1 + 356, 76, "Change")) { message("Select the directory where patterns can be imported/exported to.", "") a = string(get_save_filename_ext("", "Select patterns folder", patternfolder, "Pattern folder")) if (a != "") patternfolder = filename_dir(a) } - if (draw_button2(x1 + 22 + 84 + 84, y1 + 326, 96, "Use default")) patternfolder = pattern_directory + if (draw_button2(x1 + 22 + 84 + 84, y1 + 356, 96, "Use default")) patternfolder = pattern_directory } else if (selected_tab = 1) { draw_areaheader(x1 + 22, y1 + 74, 456, 196, "Note blocks") if (draw_checkbox(x1 + 40, y1 + 90, use_colors, "Use colored note blocks", "If the instruments should be identified with\ndifferent colors.")) use_colors=!use_colors From b81843e666dce16b302eec1e9900c829857e2476 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Wed, 1 Jul 2020 06:41:58 -0300 Subject: [PATCH 84/86] Add preference to toggle blackout mode --- scripts/draw_window_preferences/draw_window_preferences.gml | 1 + scripts/load_settings/load_settings.gml | 1 + scripts/save_settings/save_settings.gml | 1 + 3 files changed, 3 insertions(+) diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index 5d16db9a9..487cab711 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -90,6 +90,7 @@ if (selected_tab = 0) { if (draw_radiobox(x1 + 40, y1 + 164 + 16, theme == 0, "Aqua", "Use the aqua theme.")) {theme = 0 change_theme()} if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20, theme == 2, "Dark", "Use the dark theme.")) {theme = 2 change_theme()} if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20 + 20, theme == 1, "90s", "Use the 90s theme.")) {theme = 1 change_theme()} + if (draw_checkbox(x1 + 40, y1 + 164 + 16 + 20 + 20 + 25, blackout, "Blackout mode", "Makes the workspace background solid black, so you can\nkey it out in your video editor when recording the screen.")) blackout = !blackout draw_areaheader(x1+258,y1+164,220,60,"Max frame rate (experimental)") if (draw_radiobox(x1+274,y1+164+16,!refreshrate,"30FPS","Run the program at 30FPS.")) { game_set_speed(30,gamespeed_fps) diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index b5bb93940..3c97648b1 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -16,6 +16,7 @@ show_welcome = ini_read_real( "preferences", "show_welcome", show_w autosave = ini_read_real( "preferences", "autosave", autosave) autosavemins = ini_read_real( "preferences", "autosavemins", autosavemins) theme = ini_read_real( "preferences", "theme", theme) +blackout = ini_read_real( "preferences", "blackout", blackout) refreshrate = ini_read_real( "preferences", "refresh_rate", refreshrate) songfolder = ini_read_string("preferences", "song_folder", songfolder) patternfolder = ini_read_string("preferences", "pattern_folder", patternfolder) diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index 20c2963c4..350ca8022 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -15,6 +15,7 @@ ini_write_real_clean("preferences", "show_welcome", show_welcome) ini_write_real_clean("preferences", "autosave", autosave) ini_write_real_clean("preferences", "autosavemins", autosavemins) ini_write_real_clean("preferences", "theme", theme) +ini_write_real_clean("preferences", "blackout", blackout) ini_write_real_clean("preferences", "refresh_rate", refreshrate) ini_write_string( "preferences", "song_folder", songfolder) ini_write_string( "preferences", "pattern_folder", patternfolder) From 50693fab301370f12711af318e1affb2efd3cc66 Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 2 Jul 2020 07:40:49 -0300 Subject: [PATCH 85/86] Update colored custom instrument icons/Add gradients Special thanks to LeakyJAZZ for making the gradients. --- .../04e145c7-d721-476b-88df-32d820f451e4.png | Bin 0 -> 797 bytes .../18c76dbc-4e67-4504-a32e-e5dc3a3a77f6.png | Bin 0 -> 836 bytes .../1d31e489-0ae3-4422-8d41-44225335f9fb.png | Bin 0 -> 824 bytes .../28c2b399-0172-42ba-b68d-a6fd7b0c7e23.png | Bin 367 -> 0 bytes .../2a920cf2-7095-4c6b-95d6-349e2579e858.png | Bin 0 -> 668 bytes .../2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646.png | Bin 374 -> 0 bytes .../39b2852e-5bbf-46d2-928f-f7124dc5a782.png | Bin 366 -> 0 bytes .../404ea627-7fa8-46b5-9d90-e8b234638792.png | Bin 0 -> 767 bytes .../406bd3f2-c153-40bd-9cb3-301370bbece3.png | Bin 348 -> 0 bytes .../4d49f0c2-f9ae-4a23-ae65-746ef0100cb3.png | Bin 351 -> 0 bytes .../501156a2-ab03-4b98-af9b-dd96fe7678e9.png | Bin 0 -> 789 bytes .../53b7e75b-121c-425d-bc1a-c3ea72ccd51f.png | Bin 0 -> 711 bytes .../61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82.png | Bin 330 -> 0 bytes .../6672cac7-d619-4624-9693-64fa62a1fd5a.png | Bin 331 -> 0 bytes .../6dc43c4b-a119-4321-90f2-dee306cd4ca0.png | Bin 0 -> 774 bytes .../6fdb44d8-1398-4d7d-882b-160c2d526de6.png | Bin 0 -> 870 bytes .../71cc1cad-3807-4b13-8298-5151069c3dbe.png | Bin 0 -> 723 bytes .../76df8a47-d092-4c9b-a6cb-212df7a5a3f1.png | Bin 0 -> 678 bytes .../8c46ec0b-056c-42c8-b960-994df24be0f5.png | Bin 0 -> 688 bytes .../9aa8db6d-234b-475e-b6c3-42c3af3a7c7a.png | Bin 0 -> 674 bytes .../a4b7e245-a218-42c9-880d-00be2fff2c9c.png | Bin 324 -> 0 bytes .../a6acf370-1f09-42f8-a02a-710c2abe0173.png | Bin 377 -> 0 bytes .../ac576e98-ff6f-45d1-b561-eaa23be13968.png | Bin 0 -> 844 bytes .../b190b1e0-8066-4abd-8c48-dd40876d3559.png | Bin 341 -> 0 bytes .../b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png | Bin 363 -> 0 bytes .../c286e44d-7e67-4bf2-aa37-c59535e3cf15.png | Bin 0 -> 827 bytes .../ca062147-d4cf-4e89-81ee-e5ebe1d4b165.png | Bin 342 -> 0 bytes .../cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png | Bin 372 -> 0 bytes .../cce58db7-3b8b-4712-b6d4-1791b1a20e88.png | Bin 362 -> 0 bytes .../d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png | Bin 348 -> 0 bytes .../d7207c61-5205-4ed0-923e-c1dccab90dc5.png | Bin 0 -> 800 bytes .../eca1b1bd-673a-46c5-902c-8bd4c795cf31.png | Bin 311 -> 0 bytes .../f0342fcb-d589-4089-8f09-616756c59452.png | Bin 0 -> 747 bytes .../f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c.png | Bin 392 -> 0 bytes .../fa27ef49-70c5-4680-9be0-ba30ea05800f.png | Bin 0 -> 685 bytes .../ff1daf32-8dc0-408a-9d33-e4d74c14df8e.png | Bin 351 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 797 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 836 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 824 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 367 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 668 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 374 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 366 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 767 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 348 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 351 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 789 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 711 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 330 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 331 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 774 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 870 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 723 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 678 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 688 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 674 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 324 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 377 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 844 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 341 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 363 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 827 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 342 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 372 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 362 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 348 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 800 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 311 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 747 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 392 -> 0 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 0 -> 685 bytes .../43ce33d3-56f7-4441-b17b-bf81479f6b4d.png | Bin 351 -> 0 bytes sprites/spr_block_color/spr_block_color.yy | 180 +++++----- .../10c1cc73-5ebe-4b23-967a-d5cdfbcde838.png | Bin 0 -> 680 bytes .../137e1fee-e8f6-499f-8e08-ced3ac0e44ed.png | Bin 364 -> 0 bytes .../14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png | Bin 393 -> 0 bytes .../1a273649-ca60-449d-a85d-3f7e593de0a9.png | Bin 0 -> 668 bytes .../1b760aa5-ddad-4887-8b76-afac45a5813e.png | Bin 0 -> 707 bytes .../1e53ebf2-29bf-41dc-b447-5e8562f97a8b.png | Bin 441 -> 0 bytes .../20250051-8e02-49f1-9f88-bce8deb6921d.png | Bin 0 -> 910 bytes .../21c46e6e-dd05-45ae-ace3-961a2c7ec4b4.png | Bin 418 -> 0 bytes .../234b5f5a-880f-4017-8947-839b5bce1429.png | Bin 0 -> 257 bytes .../23ce296c-956e-4be9-a501-8856150ab04a.png | Bin 0 -> 694 bytes .../345984f9-d74c-48cf-bef8-b505952a75c9.png | Bin 0 -> 646 bytes .../35d40844-421f-4918-8295-9de8e21b8620.png | Bin 0 -> 567 bytes .../378def89-d34d-4405-a5f5-2d16dcb9c410.png | Bin 391 -> 0 bytes .../38ce098a-4d09-4dd3-a3db-068345b0f946.png | Bin 384 -> 0 bytes .../3bf63775-9706-483c-8c28-f52ba15484c9.png | Bin 277 -> 0 bytes .../3c40c312-4fe7-48ce-af63-68ea74b251df.png | Bin 470 -> 0 bytes .../46825d5d-002e-43e8-a62b-198caac29b0e.png | Bin 268 -> 0 bytes .../4c2de224-b6d3-4354-aef6-ac7e60089e89.png | Bin 312 -> 0 bytes .../4d040c5f-94b7-490f-b431-ee716688e91e.png | Bin 0 -> 692 bytes .../55ba8420-6cdf-4485-a29c-1794c2ac8d44.png | Bin 406 -> 0 bytes .../5ce4a932-e9fe-4f82-b19c-dc70efb8f81b.png | Bin 0 -> 873 bytes .../5d61bba5-940d-4d6b-ab20-f95f70f9df0f.png | Bin 0 -> 776 bytes .../5d961217-9db0-40f2-b1aa-5941cc4d117c.png | Bin 0 -> 746 bytes .../601451ee-0cf9-451a-a4c4-8b53708e5be5.png | Bin 0 -> 411 bytes .../61aabb78-a106-42cf-b5bd-028471e4074e.png | Bin 0 -> 363 bytes .../6accb369-5d73-48aa-9eb1-8918ccc62944.png | Bin 0 -> 387 bytes .../728ef579-ae8b-4a23-b96f-a15dbeaf267f.png | Bin 327 -> 0 bytes .../76ac0050-804b-4afc-80c1-928082ab51fc.png | Bin 0 -> 665 bytes .../778cb7be-b35a-431b-8b9c-85c7e8e65469.png | Bin 402 -> 0 bytes .../79be5d40-37bf-4f37-8c28-9bcafa325765.png | Bin 0 -> 633 bytes .../7b0982e9-9963-4382-96da-57646be7ac6e.png | Bin 0 -> 797 bytes .../7cc30889-2c67-4f9d-bd07-f797149cf177.png | Bin 0 -> 371 bytes ... 7fb25a3b-804b-46b6-8f88-3aeed7be26e8.png} | Bin .../8184b047-3992-4f30-9b53-ec835acf0e46.png | Bin 277 -> 0 bytes .../8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png | Bin 243 -> 0 bytes .../8ef19192-7161-41e6-8877-65db720af07e.png | Bin 392 -> 0 bytes .../96c128dd-327b-49ef-a16e-7dd36abdf3ea.png | Bin 0 -> 404 bytes .../a42742d6-70a2-462d-bb6b-66bdfdc30a0d.png | Bin 485 -> 0 bytes .../aa20fb47-8580-4242-af3e-c1859f0accfe.png | Bin 493 -> 0 bytes .../adcd5e12-8fe9-4f12-b63c-69e6cb230a47.png | Bin 408 -> 0 bytes .../b113d1ee-9737-4d59-a3e7-7a036b7c81ae.png | Bin 0 -> 319 bytes .../b72a8afd-72b9-4a76-8c2c-173286dacdc1.png | Bin 397 -> 0 bytes .../b952d932-78e5-4629-b113-8bee4d60d7ff.png | Bin 266 -> 0 bytes .../bd19f1fb-911d-4681-8a9a-aaf42c48082d.png | Bin 0 -> 749 bytes .../be39f173-9252-4116-8595-8ecee851a855.png | Bin 0 -> 390 bytes ... d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc.png} | Bin .../d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png | Bin 481 -> 0 bytes ... d7fc1536-1456-4261-81a7-568f91a2dee7.png} | Bin .../d902e3ba-b9f1-4509-8efc-1d10538fc9fe.png | Bin 0 -> 265 bytes .../d9c45cb1-d375-4850-ae88-ec098285b2a4.png | Bin 0 -> 358 bytes .../dd35adba-1568-4614-8b5d-3beb257ba943.png | Bin 418 -> 0 bytes .../e1e93e57-efbe-4698-aa84-b80f739992a0.png | Bin 0 -> 708 bytes .../e2fb0926-5dd1-4e21-ba04-27a0d35c57d6.png | Bin 287 -> 0 bytes .../e3d6124f-a72f-4abd-bb7c-1734c08ca471.png | Bin 398 -> 0 bytes .../e897ccd4-961c-4801-b6cb-27e1461572ea.png | Bin 0 -> 748 bytes .../e940e5dd-3db7-44ec-abbd-f58989166c6a.png | Bin 0 -> 340 bytes .../e99bb026-b4da-4b3f-ae51-3fe387b81757.png | Bin 386 -> 0 bytes .../e9b85064-3908-4967-95a8-3296b3bb2a10.png | Bin 0 -> 674 bytes .../ec92d6a7-2d39-4858-8a51-8c7c6ee5925d.png | Bin 443 -> 0 bytes ... f417d6a4-c1a5-443c-99af-5eaeb912c1da.png} | Bin .../fac8bf2b-317a-4d97-87aa-a82b1e367b54.png | Bin 331 -> 0 bytes .../face835c-3101-4ac5-8d77-497d75e97c76.png | Bin 412 -> 0 bytes .../fb39c2a5-7177-4fca-9744-3b95be5452c0.png | Bin 0 -> 372 bytes .../ffc96e9c-fbff-47c0-bfd2-ae47361135e5.png | Bin 481 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 680 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 364 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 396 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 668 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 707 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 441 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 910 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 425 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 257 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 694 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 646 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 567 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 393 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 387 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 277 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 470 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 268 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 312 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 692 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 406 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 873 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 776 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 746 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 411 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 363 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 387 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 332 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 665 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 402 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 633 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 797 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 371 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 277 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 252 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 392 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 404 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 490 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 492 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 410 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 319 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 397 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 268 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 749 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 390 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 481 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 265 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 358 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 421 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 708 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 293 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 398 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 748 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 340 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 397 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 674 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 446 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 331 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 412 -> 0 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 0 -> 372 bytes .../993fc71a-1863-4c01-93cb-615fa49362bc.png | Bin 482 -> 0 bytes .../spr_block_color_shape.yy | 340 +++++++++--------- ... 019a157e-f4c0-4766-ab25-99116600b97e.png} | Bin .../08c63e81-e63c-4c42-b40a-3df02b1faafb.png | Bin 0 -> 417 bytes .../0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png | Bin 289 -> 0 bytes ... 0bbf0642-10a8-4712-90e4-01da5e1cf06c.png} | Bin .../0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png | Bin 289 -> 0 bytes .../11c37464-9970-4820-b4b5-6ae7217198e9.png | Bin 0 -> 350 bytes .../162af071-a9db-456a-9833-3f5c9b681571.png | Bin 0 -> 378 bytes .../17257bc8-eeb1-453c-9fb9-895f52a759b3.png | Bin 0 -> 372 bytes .../1a3812af-5599-4a6f-aff6-6ee7d775a93d.png | Bin 437 -> 0 bytes .../203e1876-f5a1-4437-b46b-34d8e3d5d6a6.png | Bin 0 -> 398 bytes .../24d9d25c-8f41-4e40-91e0-fa38ee9bb241.png | Bin 503 -> 0 bytes .../31705630-56fc-4717-aa82-3b3db883bc2e.png | Bin 423 -> 0 bytes .../3b9fbc7c-6833-4d26-99f8-8991977ecab8.png | Bin 503 -> 0 bytes ... 3babfe63-cc51-4549-a8a0-a6c8acf5e964.png} | Bin .../3e0f9fbc-c529-48d4-8cbf-2ad84a9486cb.png | Bin 0 -> 381 bytes .../4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b.png | Bin 0 -> 411 bytes .../50b29239-7113-46da-8054-e463a6aa22d1.png | Bin 0 -> 399 bytes .../51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png | Bin 423 -> 0 bytes .../55834f3b-37f0-452d-81d3-6c1d80e5d2a4.png | Bin 0 -> 482 bytes .../68b88d16-6ec0-4340-897d-6f771813c1ba.png | Bin 0 -> 408 bytes .../69ebfe16-4cc5-4952-8977-5c510fce44ad.png | Bin 308 -> 0 bytes .../6f1767dd-2f23-4b95-a07a-0d38fe1f2251.png | Bin 0 -> 406 bytes ... 715c570d-6c7a-4c1b-9947-c7212590044e.png} | Bin .../74d5e0b3-8291-4bc6-9850-c7a8eac1981e.png | Bin 0 -> 278 bytes .../7aa82234-b4f3-4c06-b141-76ee7b3fcb59.png | Bin 0 -> 291 bytes .../7c2c4e2c-1c63-40a4-96de-8dd261a9afbb.png | Bin 420 -> 0 bytes .../81f77345-54c5-403d-bcac-7f47e44695c1.png | Bin 268 -> 0 bytes .../82937588-f8bb-4e02-9909-abbd6f25f0c8.png | Bin 420 -> 0 bytes .../8461fe77-496d-434a-8c33-d0651d31ab16.png | Bin 0 -> 411 bytes .../846d3d7a-f4ce-4ce0-9d9d-72decd05b498.png | Bin 408 -> 0 bytes ... 958d7747-c2d1-4a7c-a368-5f22e78829ae.png} | Bin .../96aaf357-560a-4523-b32c-255ab8e0fbb9.png | Bin 0 -> 398 bytes .../96fcb7e5-783c-4fbd-9f31-776290f79e14.png | Bin 308 -> 0 bytes .../a0330a31-3b35-4c70-99ee-3168b6fc3edc.png | Bin 364 -> 0 bytes .../a3328f14-825b-463a-bd47-5ab454815f2d.png | Bin 410 -> 0 bytes .../a55734bd-8015-4ef0-ad8f-a027cca650b5.png | Bin 0 -> 415 bytes .../a9aa837a-6955-43b0-9d76-1ba99a85a5e9.png | Bin 0 -> 349 bytes .../ad6ede62-3ff7-4d4a-8942-0f64740718b9.png | Bin 503 -> 0 bytes .../ae0bbb1b-460a-4348-a21f-d56dc3b5942e.png | Bin 420 -> 0 bytes .../aff4abf7-9702-4bb5-8318-bd0665453dc4.png | Bin 423 -> 0 bytes .../b20e7617-27aa-42d0-b20e-7b59e19d948a.png | Bin 406 -> 0 bytes .../b3f879ca-b3f8-4931-99d9-6368d1bb082d.png | Bin 410 -> 0 bytes .../bdbc320b-092c-458d-a428-a6c2a9cf0fb9.png | Bin 0 -> 449 bytes .../bf24468a-71df-461e-b733-02d2b326d01c.png | Bin 406 -> 0 bytes .../c2126a20-95e7-4112-9b46-d8c89d4e5175.png | Bin 0 -> 388 bytes .../c473b63b-fb0f-447a-91a9-f3e6c12d8177.png | Bin 0 -> 417 bytes .../c906526e-1ebc-49c4-bc1a-e4edf6f1b518.png | Bin 0 -> 346 bytes .../cb790ae3-7320-49c4-aa40-0b8ddb500698.png | Bin 503 -> 0 bytes .../d09e1112-0c63-4756-87f8-d1d2c19d7023.png | Bin 0 -> 376 bytes .../d271b6f3-517a-4adf-b528-4534e1b1e154.png | Bin 0 -> 375 bytes .../d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png | Bin 503 -> 0 bytes ... d527bbf0-dc21-4bf2-80ed-73402df5969d.png} | Bin .../d94f62d7-7120-4d56-9c64-8847b1145948.png | Bin 0 -> 394 bytes .../dcde0199-6d04-4886-99e3-cf3c97279881.png | Bin 0 -> 418 bytes .../e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54.png | Bin 0 -> 416 bytes .../e791ba50-55e5-4c7b-8d47-de1c7cc1658a.png | Bin 364 -> 0 bytes .../ebcf8ece-d170-46f5-a07e-65d5e93d80da.png | Bin 286 -> 0 bytes .../f07a1190-33bf-4050-819f-561b9725dcf3.png | Bin 418 -> 0 bytes .../f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a.png | Bin 423 -> 0 bytes .../fae1e21c-8265-4c14-8d90-cfe248fa2263.png | Bin 437 -> 0 bytes .../fb958f11-edf9-4a0e-b495-5de00d7db174.png | Bin 0 -> 388 bytes .../fc263faf-347c-48c9-9bc2-9d3d9319d981.png | Bin 0 -> 407 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 417 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 289 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 289 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 350 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 378 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 372 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 437 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 398 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 503 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 423 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 503 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 381 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 411 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 399 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 423 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 482 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 408 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 308 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 406 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 278 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 291 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 420 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 268 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 420 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 411 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 408 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 398 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 308 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 364 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 410 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 415 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 349 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 503 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 420 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 423 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 406 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 410 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 449 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 406 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 388 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 417 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 346 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 503 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 376 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 375 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 503 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 394 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 418 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 416 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 364 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 286 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 418 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 423 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 437 -> 0 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 388 bytes .../c2a23d00-710e-4725-ae3e-92724d4af847.png | Bin 0 -> 407 bytes sprites/spr_block_shape/spr_block_shape.yy | 340 +++++++++--------- 327 files changed, 430 insertions(+), 430 deletions(-) create mode 100644 sprites/spr_block_color/04e145c7-d721-476b-88df-32d820f451e4.png create mode 100644 sprites/spr_block_color/18c76dbc-4e67-4504-a32e-e5dc3a3a77f6.png create mode 100644 sprites/spr_block_color/1d31e489-0ae3-4422-8d41-44225335f9fb.png delete mode 100644 sprites/spr_block_color/28c2b399-0172-42ba-b68d-a6fd7b0c7e23.png create mode 100644 sprites/spr_block_color/2a920cf2-7095-4c6b-95d6-349e2579e858.png delete mode 100644 sprites/spr_block_color/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646.png delete mode 100644 sprites/spr_block_color/39b2852e-5bbf-46d2-928f-f7124dc5a782.png create mode 100644 sprites/spr_block_color/404ea627-7fa8-46b5-9d90-e8b234638792.png delete mode 100644 sprites/spr_block_color/406bd3f2-c153-40bd-9cb3-301370bbece3.png delete mode 100644 sprites/spr_block_color/4d49f0c2-f9ae-4a23-ae65-746ef0100cb3.png create mode 100644 sprites/spr_block_color/501156a2-ab03-4b98-af9b-dd96fe7678e9.png create mode 100644 sprites/spr_block_color/53b7e75b-121c-425d-bc1a-c3ea72ccd51f.png delete mode 100644 sprites/spr_block_color/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82.png delete mode 100644 sprites/spr_block_color/6672cac7-d619-4624-9693-64fa62a1fd5a.png create mode 100644 sprites/spr_block_color/6dc43c4b-a119-4321-90f2-dee306cd4ca0.png create mode 100644 sprites/spr_block_color/6fdb44d8-1398-4d7d-882b-160c2d526de6.png create mode 100644 sprites/spr_block_color/71cc1cad-3807-4b13-8298-5151069c3dbe.png create mode 100644 sprites/spr_block_color/76df8a47-d092-4c9b-a6cb-212df7a5a3f1.png create mode 100644 sprites/spr_block_color/8c46ec0b-056c-42c8-b960-994df24be0f5.png create mode 100644 sprites/spr_block_color/9aa8db6d-234b-475e-b6c3-42c3af3a7c7a.png delete mode 100644 sprites/spr_block_color/a4b7e245-a218-42c9-880d-00be2fff2c9c.png delete mode 100644 sprites/spr_block_color/a6acf370-1f09-42f8-a02a-710c2abe0173.png create mode 100644 sprites/spr_block_color/ac576e98-ff6f-45d1-b561-eaa23be13968.png delete mode 100644 sprites/spr_block_color/b190b1e0-8066-4abd-8c48-dd40876d3559.png delete mode 100644 sprites/spr_block_color/b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png create mode 100644 sprites/spr_block_color/c286e44d-7e67-4bf2-aa37-c59535e3cf15.png delete mode 100644 sprites/spr_block_color/ca062147-d4cf-4e89-81ee-e5ebe1d4b165.png delete mode 100644 sprites/spr_block_color/cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png delete mode 100644 sprites/spr_block_color/cce58db7-3b8b-4712-b6d4-1791b1a20e88.png delete mode 100644 sprites/spr_block_color/d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png create mode 100644 sprites/spr_block_color/d7207c61-5205-4ed0-923e-c1dccab90dc5.png delete mode 100644 sprites/spr_block_color/eca1b1bd-673a-46c5-902c-8bd4c795cf31.png create mode 100644 sprites/spr_block_color/f0342fcb-d589-4089-8f09-616756c59452.png delete mode 100644 sprites/spr_block_color/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c.png create mode 100644 sprites/spr_block_color/fa27ef49-70c5-4680-9be0-ba30ea05800f.png delete mode 100644 sprites/spr_block_color/ff1daf32-8dc0-408a-9d33-e4d74c14df8e.png create mode 100644 sprites/spr_block_color/layers/04e145c7-d721-476b-88df-32d820f451e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/18c76dbc-4e67-4504-a32e-e5dc3a3a77f6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/1d31e489-0ae3-4422-8d41-44225335f9fb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/28c2b399-0172-42ba-b68d-a6fd7b0c7e23/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/2a920cf2-7095-4c6b-95d6-349e2579e858/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/39b2852e-5bbf-46d2-928f-f7124dc5a782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/404ea627-7fa8-46b5-9d90-e8b234638792/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/406bd3f2-c153-40bd-9cb3-301370bbece3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/4d49f0c2-f9ae-4a23-ae65-746ef0100cb3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/501156a2-ab03-4b98-af9b-dd96fe7678e9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/53b7e75b-121c-425d-bc1a-c3ea72ccd51f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/6672cac7-d619-4624-9693-64fa62a1fd5a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/6dc43c4b-a119-4321-90f2-dee306cd4ca0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/6fdb44d8-1398-4d7d-882b-160c2d526de6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/71cc1cad-3807-4b13-8298-5151069c3dbe/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/76df8a47-d092-4c9b-a6cb-212df7a5a3f1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/8c46ec0b-056c-42c8-b960-994df24be0f5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/9aa8db6d-234b-475e-b6c3-42c3af3a7c7a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/a4b7e245-a218-42c9-880d-00be2fff2c9c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/a6acf370-1f09-42f8-a02a-710c2abe0173/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/ac576e98-ff6f-45d1-b561-eaa23be13968/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/b190b1e0-8066-4abd-8c48-dd40876d3559/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/b8c3d60c-33f4-450b-a94f-1cd51e0785d9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/c286e44d-7e67-4bf2-aa37-c59535e3cf15/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/ca062147-d4cf-4e89-81ee-e5ebe1d4b165/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/cc5e53a2-ec1a-457d-acd8-f69a2edcd397/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/cce58db7-3b8b-4712-b6d4-1791b1a20e88/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/d53f5a5e-1012-48ab-a444-ef8b434cc7e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/d7207c61-5205-4ed0-923e-c1dccab90dc5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/eca1b1bd-673a-46c5-902c-8bd4c795cf31/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/f0342fcb-d589-4089-8f09-616756c59452/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color/layers/fa27ef49-70c5-4680-9be0-ba30ea05800f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png delete mode 100644 sprites/spr_block_color/layers/ff1daf32-8dc0-408a-9d33-e4d74c14df8e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png create mode 100644 sprites/spr_block_color_shape/10c1cc73-5ebe-4b23-967a-d5cdfbcde838.png delete mode 100644 sprites/spr_block_color_shape/137e1fee-e8f6-499f-8e08-ced3ac0e44ed.png delete mode 100644 sprites/spr_block_color_shape/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png create mode 100644 sprites/spr_block_color_shape/1a273649-ca60-449d-a85d-3f7e593de0a9.png create mode 100644 sprites/spr_block_color_shape/1b760aa5-ddad-4887-8b76-afac45a5813e.png delete mode 100644 sprites/spr_block_color_shape/1e53ebf2-29bf-41dc-b447-5e8562f97a8b.png create mode 100644 sprites/spr_block_color_shape/20250051-8e02-49f1-9f88-bce8deb6921d.png delete mode 100644 sprites/spr_block_color_shape/21c46e6e-dd05-45ae-ace3-961a2c7ec4b4.png create mode 100644 sprites/spr_block_color_shape/234b5f5a-880f-4017-8947-839b5bce1429.png create mode 100644 sprites/spr_block_color_shape/23ce296c-956e-4be9-a501-8856150ab04a.png create mode 100644 sprites/spr_block_color_shape/345984f9-d74c-48cf-bef8-b505952a75c9.png create mode 100644 sprites/spr_block_color_shape/35d40844-421f-4918-8295-9de8e21b8620.png delete mode 100644 sprites/spr_block_color_shape/378def89-d34d-4405-a5f5-2d16dcb9c410.png delete mode 100644 sprites/spr_block_color_shape/38ce098a-4d09-4dd3-a3db-068345b0f946.png delete mode 100644 sprites/spr_block_color_shape/3bf63775-9706-483c-8c28-f52ba15484c9.png delete mode 100644 sprites/spr_block_color_shape/3c40c312-4fe7-48ce-af63-68ea74b251df.png delete mode 100644 sprites/spr_block_color_shape/46825d5d-002e-43e8-a62b-198caac29b0e.png delete mode 100644 sprites/spr_block_color_shape/4c2de224-b6d3-4354-aef6-ac7e60089e89.png create mode 100644 sprites/spr_block_color_shape/4d040c5f-94b7-490f-b431-ee716688e91e.png delete mode 100644 sprites/spr_block_color_shape/55ba8420-6cdf-4485-a29c-1794c2ac8d44.png create mode 100644 sprites/spr_block_color_shape/5ce4a932-e9fe-4f82-b19c-dc70efb8f81b.png create mode 100644 sprites/spr_block_color_shape/5d61bba5-940d-4d6b-ab20-f95f70f9df0f.png create mode 100644 sprites/spr_block_color_shape/5d961217-9db0-40f2-b1aa-5941cc4d117c.png create mode 100644 sprites/spr_block_color_shape/601451ee-0cf9-451a-a4c4-8b53708e5be5.png create mode 100644 sprites/spr_block_color_shape/61aabb78-a106-42cf-b5bd-028471e4074e.png create mode 100644 sprites/spr_block_color_shape/6accb369-5d73-48aa-9eb1-8918ccc62944.png delete mode 100644 sprites/spr_block_color_shape/728ef579-ae8b-4a23-b96f-a15dbeaf267f.png create mode 100644 sprites/spr_block_color_shape/76ac0050-804b-4afc-80c1-928082ab51fc.png delete mode 100644 sprites/spr_block_color_shape/778cb7be-b35a-431b-8b9c-85c7e8e65469.png create mode 100644 sprites/spr_block_color_shape/79be5d40-37bf-4f37-8c28-9bcafa325765.png create mode 100644 sprites/spr_block_color_shape/7b0982e9-9963-4382-96da-57646be7ac6e.png create mode 100644 sprites/spr_block_color_shape/7cc30889-2c67-4f9d-bd07-f797149cf177.png rename sprites/spr_block_color_shape/{a48d6d91-2e8d-4aff-a833-98d374d5e829.png => 7fb25a3b-804b-46b6-8f88-3aeed7be26e8.png} (100%) delete mode 100644 sprites/spr_block_color_shape/8184b047-3992-4f30-9b53-ec835acf0e46.png delete mode 100644 sprites/spr_block_color_shape/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png delete mode 100644 sprites/spr_block_color_shape/8ef19192-7161-41e6-8877-65db720af07e.png create mode 100644 sprites/spr_block_color_shape/96c128dd-327b-49ef-a16e-7dd36abdf3ea.png delete mode 100644 sprites/spr_block_color_shape/a42742d6-70a2-462d-bb6b-66bdfdc30a0d.png delete mode 100644 sprites/spr_block_color_shape/aa20fb47-8580-4242-af3e-c1859f0accfe.png delete mode 100644 sprites/spr_block_color_shape/adcd5e12-8fe9-4f12-b63c-69e6cb230a47.png create mode 100644 sprites/spr_block_color_shape/b113d1ee-9737-4d59-a3e7-7a036b7c81ae.png delete mode 100644 sprites/spr_block_color_shape/b72a8afd-72b9-4a76-8c2c-173286dacdc1.png delete mode 100644 sprites/spr_block_color_shape/b952d932-78e5-4629-b113-8bee4d60d7ff.png create mode 100644 sprites/spr_block_color_shape/bd19f1fb-911d-4681-8a9a-aaf42c48082d.png create mode 100644 sprites/spr_block_color_shape/be39f173-9252-4116-8595-8ecee851a855.png rename sprites/spr_block_color_shape/{d1c859be-2b28-46ff-8289-fae7b22b7db4.png => d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc.png} (100%) delete mode 100644 sprites/spr_block_color_shape/d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png rename sprites/spr_block_color_shape/{3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b.png => d7fc1536-1456-4261-81a7-568f91a2dee7.png} (100%) create mode 100644 sprites/spr_block_color_shape/d902e3ba-b9f1-4509-8efc-1d10538fc9fe.png create mode 100644 sprites/spr_block_color_shape/d9c45cb1-d375-4850-ae88-ec098285b2a4.png delete mode 100644 sprites/spr_block_color_shape/dd35adba-1568-4614-8b5d-3beb257ba943.png create mode 100644 sprites/spr_block_color_shape/e1e93e57-efbe-4698-aa84-b80f739992a0.png delete mode 100644 sprites/spr_block_color_shape/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6.png delete mode 100644 sprites/spr_block_color_shape/e3d6124f-a72f-4abd-bb7c-1734c08ca471.png create mode 100644 sprites/spr_block_color_shape/e897ccd4-961c-4801-b6cb-27e1461572ea.png create mode 100644 sprites/spr_block_color_shape/e940e5dd-3db7-44ec-abbd-f58989166c6a.png delete mode 100644 sprites/spr_block_color_shape/e99bb026-b4da-4b3f-ae51-3fe387b81757.png create mode 100644 sprites/spr_block_color_shape/e9b85064-3908-4967-95a8-3296b3bb2a10.png delete mode 100644 sprites/spr_block_color_shape/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d.png rename sprites/spr_block_color_shape/{570118b1-123c-474b-9147-9560ccc537f7.png => f417d6a4-c1a5-443c-99af-5eaeb912c1da.png} (100%) delete mode 100644 sprites/spr_block_color_shape/fac8bf2b-317a-4d97-87aa-a82b1e367b54.png delete mode 100644 sprites/spr_block_color_shape/face835c-3101-4ac5-8d77-497d75e97c76.png create mode 100644 sprites/spr_block_color_shape/fb39c2a5-7177-4fca-9744-3b95be5452c0.png delete mode 100644 sprites/spr_block_color_shape/ffc96e9c-fbff-47c0-bfd2-ae47361135e5.png create mode 100644 sprites/spr_block_color_shape/layers/10c1cc73-5ebe-4b23-967a-d5cdfbcde838/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/137e1fee-e8f6-499f-8e08-ced3ac0e44ed/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/1a273649-ca60-449d-a85d-3f7e593de0a9/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/1b760aa5-ddad-4887-8b76-afac45a5813e/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/1e53ebf2-29bf-41dc-b447-5e8562f97a8b/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/20250051-8e02-49f1-9f88-bce8deb6921d/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/21c46e6e-dd05-45ae-ace3-961a2c7ec4b4/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/234b5f5a-880f-4017-8947-839b5bce1429/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/23ce296c-956e-4be9-a501-8856150ab04a/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/345984f9-d74c-48cf-bef8-b505952a75c9/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/35d40844-421f-4918-8295-9de8e21b8620/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/378def89-d34d-4405-a5f5-2d16dcb9c410/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/38ce098a-4d09-4dd3-a3db-068345b0f946/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/3bf63775-9706-483c-8c28-f52ba15484c9/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/3c40c312-4fe7-48ce-af63-68ea74b251df/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/46825d5d-002e-43e8-a62b-198caac29b0e/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/4c2de224-b6d3-4354-aef6-ac7e60089e89/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/4d040c5f-94b7-490f-b431-ee716688e91e/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/55ba8420-6cdf-4485-a29c-1794c2ac8d44/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/5ce4a932-e9fe-4f82-b19c-dc70efb8f81b/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/5d61bba5-940d-4d6b-ab20-f95f70f9df0f/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/5d961217-9db0-40f2-b1aa-5941cc4d117c/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/601451ee-0cf9-451a-a4c4-8b53708e5be5/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/61aabb78-a106-42cf-b5bd-028471e4074e/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/6accb369-5d73-48aa-9eb1-8918ccc62944/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/728ef579-ae8b-4a23-b96f-a15dbeaf267f/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/76ac0050-804b-4afc-80c1-928082ab51fc/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/778cb7be-b35a-431b-8b9c-85c7e8e65469/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/79be5d40-37bf-4f37-8c28-9bcafa325765/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/7b0982e9-9963-4382-96da-57646be7ac6e/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/7cc30889-2c67-4f9d-bd07-f797149cf177/993fc71a-1863-4c01-93cb-615fa49362bc.png rename sprites/spr_block_color_shape/layers/{a48d6d91-2e8d-4aff-a833-98d374d5e829 => 7fb25a3b-804b-46b6-8f88-3aeed7be26e8}/993fc71a-1863-4c01-93cb-615fa49362bc.png (100%) delete mode 100644 sprites/spr_block_color_shape/layers/8184b047-3992-4f30-9b53-ec835acf0e46/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/8ef19192-7161-41e6-8877-65db720af07e/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/96c128dd-327b-49ef-a16e-7dd36abdf3ea/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/a42742d6-70a2-462d-bb6b-66bdfdc30a0d/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/aa20fb47-8580-4242-af3e-c1859f0accfe/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/adcd5e12-8fe9-4f12-b63c-69e6cb230a47/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/b113d1ee-9737-4d59-a3e7-7a036b7c81ae/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/b72a8afd-72b9-4a76-8c2c-173286dacdc1/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/b952d932-78e5-4629-b113-8bee4d60d7ff/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/bd19f1fb-911d-4681-8a9a-aaf42c48082d/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/be39f173-9252-4116-8595-8ecee851a855/993fc71a-1863-4c01-93cb-615fa49362bc.png rename sprites/spr_block_color_shape/layers/{d1c859be-2b28-46ff-8289-fae7b22b7db4 => d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc}/993fc71a-1863-4c01-93cb-615fa49362bc.png (100%) delete mode 100644 sprites/spr_block_color_shape/layers/d7b3baf5-9f31-416b-ac0f-de9bca90d60e/993fc71a-1863-4c01-93cb-615fa49362bc.png rename sprites/spr_block_color_shape/layers/{3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b => d7fc1536-1456-4261-81a7-568f91a2dee7}/993fc71a-1863-4c01-93cb-615fa49362bc.png (100%) create mode 100644 sprites/spr_block_color_shape/layers/d902e3ba-b9f1-4509-8efc-1d10538fc9fe/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/d9c45cb1-d375-4850-ae88-ec098285b2a4/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/dd35adba-1568-4614-8b5d-3beb257ba943/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e1e93e57-efbe-4698-aa84-b80f739992a0/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/e2fb0926-5dd1-4e21-ba04-27a0d35c57d6/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/e3d6124f-a72f-4abd-bb7c-1734c08ca471/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e897ccd4-961c-4801-b6cb-27e1461572ea/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e940e5dd-3db7-44ec-abbd-f58989166c6a/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/e99bb026-b4da-4b3f-ae51-3fe387b81757/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/e9b85064-3908-4967-95a8-3296b3bb2a10/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/ec92d6a7-2d39-4858-8a51-8c7c6ee5925d/993fc71a-1863-4c01-93cb-615fa49362bc.png rename sprites/spr_block_color_shape/layers/{570118b1-123c-474b-9147-9560ccc537f7 => f417d6a4-c1a5-443c-99af-5eaeb912c1da}/993fc71a-1863-4c01-93cb-615fa49362bc.png (100%) delete mode 100644 sprites/spr_block_color_shape/layers/fac8bf2b-317a-4d97-87aa-a82b1e367b54/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/face835c-3101-4ac5-8d77-497d75e97c76/993fc71a-1863-4c01-93cb-615fa49362bc.png create mode 100644 sprites/spr_block_color_shape/layers/fb39c2a5-7177-4fca-9744-3b95be5452c0/993fc71a-1863-4c01-93cb-615fa49362bc.png delete mode 100644 sprites/spr_block_color_shape/layers/ffc96e9c-fbff-47c0-bfd2-ae47361135e5/993fc71a-1863-4c01-93cb-615fa49362bc.png rename sprites/spr_block_shape/{1c015f46-bb21-4d72-933a-fc000856c139.png => 019a157e-f4c0-4766-ab25-99116600b97e.png} (100%) create mode 100644 sprites/spr_block_shape/08c63e81-e63c-4c42-b40a-3df02b1faafb.png delete mode 100644 sprites/spr_block_shape/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png rename sprites/spr_block_shape/{2a66ba51-6191-4628-8a95-4f2dadb33b97.png => 0bbf0642-10a8-4712-90e4-01da5e1cf06c.png} (100%) delete mode 100644 sprites/spr_block_shape/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png create mode 100644 sprites/spr_block_shape/11c37464-9970-4820-b4b5-6ae7217198e9.png create mode 100644 sprites/spr_block_shape/162af071-a9db-456a-9833-3f5c9b681571.png create mode 100644 sprites/spr_block_shape/17257bc8-eeb1-453c-9fb9-895f52a759b3.png delete mode 100644 sprites/spr_block_shape/1a3812af-5599-4a6f-aff6-6ee7d775a93d.png create mode 100644 sprites/spr_block_shape/203e1876-f5a1-4437-b46b-34d8e3d5d6a6.png delete mode 100644 sprites/spr_block_shape/24d9d25c-8f41-4e40-91e0-fa38ee9bb241.png delete mode 100644 sprites/spr_block_shape/31705630-56fc-4717-aa82-3b3db883bc2e.png delete mode 100644 sprites/spr_block_shape/3b9fbc7c-6833-4d26-99f8-8991977ecab8.png rename sprites/spr_block_shape/{0489e482-a8bc-4db7-a76d-bfe130d123a3.png => 3babfe63-cc51-4549-a8a0-a6c8acf5e964.png} (100%) create mode 100644 sprites/spr_block_shape/3e0f9fbc-c529-48d4-8cbf-2ad84a9486cb.png create mode 100644 sprites/spr_block_shape/4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b.png create mode 100644 sprites/spr_block_shape/50b29239-7113-46da-8054-e463a6aa22d1.png delete mode 100644 sprites/spr_block_shape/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png create mode 100644 sprites/spr_block_shape/55834f3b-37f0-452d-81d3-6c1d80e5d2a4.png create mode 100644 sprites/spr_block_shape/68b88d16-6ec0-4340-897d-6f771813c1ba.png delete mode 100644 sprites/spr_block_shape/69ebfe16-4cc5-4952-8977-5c510fce44ad.png create mode 100644 sprites/spr_block_shape/6f1767dd-2f23-4b95-a07a-0d38fe1f2251.png rename sprites/spr_block_shape/{419a54b5-a831-4448-ae3a-925a6a2d63d7.png => 715c570d-6c7a-4c1b-9947-c7212590044e.png} (100%) create mode 100644 sprites/spr_block_shape/74d5e0b3-8291-4bc6-9850-c7a8eac1981e.png create mode 100644 sprites/spr_block_shape/7aa82234-b4f3-4c06-b141-76ee7b3fcb59.png delete mode 100644 sprites/spr_block_shape/7c2c4e2c-1c63-40a4-96de-8dd261a9afbb.png delete mode 100644 sprites/spr_block_shape/81f77345-54c5-403d-bcac-7f47e44695c1.png delete mode 100644 sprites/spr_block_shape/82937588-f8bb-4e02-9909-abbd6f25f0c8.png create mode 100644 sprites/spr_block_shape/8461fe77-496d-434a-8c33-d0651d31ab16.png delete mode 100644 sprites/spr_block_shape/846d3d7a-f4ce-4ce0-9d9d-72decd05b498.png rename sprites/spr_block_shape/{1191deec-4fa1-4663-af79-00b6177fd83e.png => 958d7747-c2d1-4a7c-a368-5f22e78829ae.png} (100%) create mode 100644 sprites/spr_block_shape/96aaf357-560a-4523-b32c-255ab8e0fbb9.png delete mode 100644 sprites/spr_block_shape/96fcb7e5-783c-4fbd-9f31-776290f79e14.png delete mode 100644 sprites/spr_block_shape/a0330a31-3b35-4c70-99ee-3168b6fc3edc.png delete mode 100644 sprites/spr_block_shape/a3328f14-825b-463a-bd47-5ab454815f2d.png create mode 100644 sprites/spr_block_shape/a55734bd-8015-4ef0-ad8f-a027cca650b5.png create mode 100644 sprites/spr_block_shape/a9aa837a-6955-43b0-9d76-1ba99a85a5e9.png delete mode 100644 sprites/spr_block_shape/ad6ede62-3ff7-4d4a-8942-0f64740718b9.png delete mode 100644 sprites/spr_block_shape/ae0bbb1b-460a-4348-a21f-d56dc3b5942e.png delete mode 100644 sprites/spr_block_shape/aff4abf7-9702-4bb5-8318-bd0665453dc4.png delete mode 100644 sprites/spr_block_shape/b20e7617-27aa-42d0-b20e-7b59e19d948a.png delete mode 100644 sprites/spr_block_shape/b3f879ca-b3f8-4931-99d9-6368d1bb082d.png create mode 100644 sprites/spr_block_shape/bdbc320b-092c-458d-a428-a6c2a9cf0fb9.png delete mode 100644 sprites/spr_block_shape/bf24468a-71df-461e-b733-02d2b326d01c.png create mode 100644 sprites/spr_block_shape/c2126a20-95e7-4112-9b46-d8c89d4e5175.png create mode 100644 sprites/spr_block_shape/c473b63b-fb0f-447a-91a9-f3e6c12d8177.png create mode 100644 sprites/spr_block_shape/c906526e-1ebc-49c4-bc1a-e4edf6f1b518.png delete mode 100644 sprites/spr_block_shape/cb790ae3-7320-49c4-aa40-0b8ddb500698.png create mode 100644 sprites/spr_block_shape/d09e1112-0c63-4756-87f8-d1d2c19d7023.png create mode 100644 sprites/spr_block_shape/d271b6f3-517a-4adf-b528-4534e1b1e154.png delete mode 100644 sprites/spr_block_shape/d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png rename sprites/spr_block_shape/{7518daa5-bf1d-4080-aee9-fb9957368a76.png => d527bbf0-dc21-4bf2-80ed-73402df5969d.png} (100%) create mode 100644 sprites/spr_block_shape/d94f62d7-7120-4d56-9c64-8847b1145948.png create mode 100644 sprites/spr_block_shape/dcde0199-6d04-4886-99e3-cf3c97279881.png create mode 100644 sprites/spr_block_shape/e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54.png delete mode 100644 sprites/spr_block_shape/e791ba50-55e5-4c7b-8d47-de1c7cc1658a.png delete mode 100644 sprites/spr_block_shape/ebcf8ece-d170-46f5-a07e-65d5e93d80da.png delete mode 100644 sprites/spr_block_shape/f07a1190-33bf-4050-819f-561b9725dcf3.png delete mode 100644 sprites/spr_block_shape/f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a.png delete mode 100644 sprites/spr_block_shape/fae1e21c-8265-4c14-8d90-cfe248fa2263.png create mode 100644 sprites/spr_block_shape/fb958f11-edf9-4a0e-b495-5de00d7db174.png create mode 100644 sprites/spr_block_shape/fc263faf-347c-48c9-9bc2-9d3d9319d981.png rename sprites/spr_block_shape/layers/{1c015f46-bb21-4d72-933a-fc000856c139 => 019a157e-f4c0-4766-ab25-99116600b97e}/c2a23d00-710e-4725-ae3e-92724d4af847.png (100%) create mode 100644 sprites/spr_block_shape/layers/08c63e81-e63c-4c42-b40a-3df02b1faafb/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff/c2a23d00-710e-4725-ae3e-92724d4af847.png rename sprites/spr_block_shape/layers/{2a66ba51-6191-4628-8a95-4f2dadb33b97 => 0bbf0642-10a8-4712-90e4-01da5e1cf06c}/c2a23d00-710e-4725-ae3e-92724d4af847.png (100%) delete mode 100644 sprites/spr_block_shape/layers/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/11c37464-9970-4820-b4b5-6ae7217198e9/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/162af071-a9db-456a-9833-3f5c9b681571/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/17257bc8-eeb1-453c-9fb9-895f52a759b3/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/1a3812af-5599-4a6f-aff6-6ee7d775a93d/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/203e1876-f5a1-4437-b46b-34d8e3d5d6a6/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/24d9d25c-8f41-4e40-91e0-fa38ee9bb241/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/31705630-56fc-4717-aa82-3b3db883bc2e/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/3b9fbc7c-6833-4d26-99f8-8991977ecab8/c2a23d00-710e-4725-ae3e-92724d4af847.png rename sprites/spr_block_shape/layers/{0489e482-a8bc-4db7-a76d-bfe130d123a3 => 3babfe63-cc51-4549-a8a0-a6c8acf5e964}/c2a23d00-710e-4725-ae3e-92724d4af847.png (100%) create mode 100644 sprites/spr_block_shape/layers/3e0f9fbc-c529-48d4-8cbf-2ad84a9486cb/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/50b29239-7113-46da-8054-e463a6aa22d1/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/55834f3b-37f0-452d-81d3-6c1d80e5d2a4/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/68b88d16-6ec0-4340-897d-6f771813c1ba/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/69ebfe16-4cc5-4952-8977-5c510fce44ad/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/6f1767dd-2f23-4b95-a07a-0d38fe1f2251/c2a23d00-710e-4725-ae3e-92724d4af847.png rename sprites/spr_block_shape/layers/{419a54b5-a831-4448-ae3a-925a6a2d63d7 => 715c570d-6c7a-4c1b-9947-c7212590044e}/c2a23d00-710e-4725-ae3e-92724d4af847.png (100%) create mode 100644 sprites/spr_block_shape/layers/74d5e0b3-8291-4bc6-9850-c7a8eac1981e/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/7aa82234-b4f3-4c06-b141-76ee7b3fcb59/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/7c2c4e2c-1c63-40a4-96de-8dd261a9afbb/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/81f77345-54c5-403d-bcac-7f47e44695c1/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/82937588-f8bb-4e02-9909-abbd6f25f0c8/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/8461fe77-496d-434a-8c33-d0651d31ab16/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/846d3d7a-f4ce-4ce0-9d9d-72decd05b498/c2a23d00-710e-4725-ae3e-92724d4af847.png rename sprites/spr_block_shape/layers/{1191deec-4fa1-4663-af79-00b6177fd83e => 958d7747-c2d1-4a7c-a368-5f22e78829ae}/c2a23d00-710e-4725-ae3e-92724d4af847.png (100%) create mode 100644 sprites/spr_block_shape/layers/96aaf357-560a-4523-b32c-255ab8e0fbb9/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/96fcb7e5-783c-4fbd-9f31-776290f79e14/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/a0330a31-3b35-4c70-99ee-3168b6fc3edc/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/a3328f14-825b-463a-bd47-5ab454815f2d/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/a55734bd-8015-4ef0-ad8f-a027cca650b5/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/a9aa837a-6955-43b0-9d76-1ba99a85a5e9/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/ad6ede62-3ff7-4d4a-8942-0f64740718b9/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/ae0bbb1b-460a-4348-a21f-d56dc3b5942e/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/aff4abf7-9702-4bb5-8318-bd0665453dc4/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/b20e7617-27aa-42d0-b20e-7b59e19d948a/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/b3f879ca-b3f8-4931-99d9-6368d1bb082d/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/bdbc320b-092c-458d-a428-a6c2a9cf0fb9/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/bf24468a-71df-461e-b733-02d2b326d01c/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/c2126a20-95e7-4112-9b46-d8c89d4e5175/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/c473b63b-fb0f-447a-91a9-f3e6c12d8177/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/c906526e-1ebc-49c4-bc1a-e4edf6f1b518/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/cb790ae3-7320-49c4-aa40-0b8ddb500698/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/d09e1112-0c63-4756-87f8-d1d2c19d7023/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/d271b6f3-517a-4adf-b528-4534e1b1e154/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/d44c2077-1a8a-4a9b-8051-1b4bd83d6988/c2a23d00-710e-4725-ae3e-92724d4af847.png rename sprites/spr_block_shape/layers/{7518daa5-bf1d-4080-aee9-fb9957368a76 => d527bbf0-dc21-4bf2-80ed-73402df5969d}/c2a23d00-710e-4725-ae3e-92724d4af847.png (100%) create mode 100644 sprites/spr_block_shape/layers/d94f62d7-7120-4d56-9c64-8847b1145948/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/dcde0199-6d04-4886-99e3-cf3c97279881/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/e791ba50-55e5-4c7b-8d47-de1c7cc1658a/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/ebcf8ece-d170-46f5-a07e-65d5e93d80da/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/f07a1190-33bf-4050-819f-561b9725dcf3/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a/c2a23d00-710e-4725-ae3e-92724d4af847.png delete mode 100644 sprites/spr_block_shape/layers/fae1e21c-8265-4c14-8d90-cfe248fa2263/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/fb958f11-edf9-4a0e-b495-5de00d7db174/c2a23d00-710e-4725-ae3e-92724d4af847.png create mode 100644 sprites/spr_block_shape/layers/fc263faf-347c-48c9-9bc2-9d3d9319d981/c2a23d00-710e-4725-ae3e-92724d4af847.png diff --git a/sprites/spr_block_color/04e145c7-d721-476b-88df-32d820f451e4.png b/sprites/spr_block_color/04e145c7-d721-476b-88df-32d820f451e4.png new file mode 100644 index 0000000000000000000000000000000000000000..c41959bbf0700e3ffe23155765d87e1bc0071bc0 GIT binary patch literal 797 zcmV+&1LFLNP)6}0^iUtXjM2QfD_;KfznrLD)_^0gJKg5eI7^7Yhh+crsKo*S) z29PDPmBHrb-27T$AFkD$=k1ctfnheT=jQ3@uRZ5|-uImL@M9-NR7(pR-^$5Z0Gj7hH;(pxLWwX9xgQ~be+b@?#w#2yJa#yD zk+TP-`%LfJ{Y;;i0!;6;`5W@-y8bhI{)+7$(-#%$+tF7zvt&TEAO)T6BGW(tPHqWs zGFuEX{dov4%&F+#AU;>eXNh0$1b?}!=K{^6&D;76Xlr1n4SLmq$RFmBiEBsDUzFiw z)H%g;`U`Ov_)-Dt?Brh^8Q)u&La_)w+ z`LF0#h%c1%e4&o7RxzH~HOaJK!+k}j01PzKRO1!8uy=_}2T7N+a56~FW)i6BWv^ey zj|*@%li8n#Gx!b+d+0l$1z@C`X4>yHfJLxnm6%4i5$X5}Nauvw zyhgfdrqy04b)LG3+=eEA(}+J6BxFGhon`2_KGJ>OWx?(&?`&I6{|1$2?E zNKErlMCv++NHbgde}fcp*EHL8g9@TE*F85_6a!2 zEd?5K$6ov`y?+t>M-1~gP4gYlPN&)`we@w00000NkvXXu0mjfU?GFF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/18c76dbc-4e67-4504-a32e-e5dc3a3a77f6.png b/sprites/spr_block_color/18c76dbc-4e67-4504-a32e-e5dc3a3a77f6.png new file mode 100644 index 0000000000000000000000000000000000000000..688e6cebf6db7a3ca434f72a651279c73945c4a3 GIT binary patch literal 836 zcmV-K1H1f*P)$1W2cfUXp-NrF>ympYii+zN>OQ?LuN3~bxk%Y_%=-kXgPz^*^(!eXVsbK5N z0C@F49{6B12(}buvY%D^5v`~GXGtp zCdlClj*Gy1p4Z@o+-C4` z_$^pr*#q8Ze_rF2{*IY9;K__bpn>iJ&SWaI3O)_F!4uYcaNry5fD-Thj=+1cGN~Hu z50V!f_*j3giSZEaBO=}?E1*=P@|-S=D*>Mb=|4M`d>j;l?(_1va`ru&^0N_&cMIAf zB{9GW=-gs8;8~)b>T_h86+O>;LNCChmQx%%*7u2x96LAgEj-UBP^22C2I#F=d4nmG z%2+9%jO4wmUiSMmL$F`bdXs7#?~0FO3m-PhcY*R{)RW%(pQkoR4g3L^99Yu#jVxXO O00006!Q5Ip>}^(|gBUQrWa&%AuKa z85{{PMg{nC{4B`pTp+VoXa;U1Cp5lZ*W3E^B;Bv{pl1Gh>^*3UbW;LbPCZLzW~O!g z$gev>7wk50$$tYZkgk#6^MJ-l*TH3>|MhQa{osAj(smJC?RiAH@LA*u#moMhGP86K z6qW7+zxi*12Rg2Ti=j?%C;LS+dLIh?3b>%tH+nmDdbdVbe8jc#l6f{UgVu#hc)^CE8UE5JBql9x(=-=lHR z!dAiM&|~nh=QNm9$j@UxHToe>E11&hYq5UN?y3Q;Yz|!DMyY_>10`iv!DHZr+y_>8 z$dCK)fi+S)I4Ot0VrMyx4+J#2I^U-1!64nw+YEBU^gue3boUh@Bqq+bbk5VNpoSxZ;@&;`2Qe_6^ zVbYmiuL1|;ghro@(fFgT5>P!C7_SE^%YK7JEFVlTdZrF1`L6=>UZ3~Xf)QD(zYIjc zb|3xY_38Am90Qv@bdoYo1(?WWC7A*TLP@aIZ3pAgDNyZ+cghE_!L@f&{jDs>yTSg~hN*yf787G%!H=V~ zkLQUMJr7ZDoO2g~T}o<8`UMZ^@llGy*)B>T%L~fb(x+l8r!!lvgHmTE?I+{d_*_Q1 zYU(&uw{mfvStx<+uVH(Z{xW*{V$XjKtX3xH75D=W5;VAkBK*U%P+Up{!5_LZtlGyC|N{o37$cH?Lok76ku%ikv1t|bm?#;&O`dDt$ z)twBL81qyU diff --git a/sprites/spr_block_color/2a920cf2-7095-4c6b-95d6-349e2579e858.png b/sprites/spr_block_color/2a920cf2-7095-4c6b-95d6-349e2579e858.png new file mode 100644 index 0000000000000000000000000000000000000000..ebd084ad41432beadc84a8b23c947efb23d4fd61 GIT binary patch literal 668 zcmV;N0%QG&P)J*l1#6jD+w9R2FPx!-|!t0SeUC zwgHJo<-=H@Qa~dTKB_S)hCd*;CGmZSW^SZWH#2AR+;iWV&beo1PLI`AUY52fG^@(R z5dgpcTeAZXrTJh%o;-4Miw~Soa5(!fZ~lq@QbnBx(Igp!P_mM{}p(?61+D8whR3w^|RE6!PYaN@saBs1og|n+BO*b023NATki&02>*3Pd|9A z4Gc%X;u7i)OnMY_xxo9J-&70kEP&NK0~6B>K(Sf(?(0eR1F?6YaR3bR4AeJ)k?=mc zSJp-CpIrt^%D@fw1zcBy42Uyus1S6rQW^80<22aY2ew@Y$AbT+KViSnz*9TynOa%`^BwYhvz}%J)h+|Jxsaj&6x%NNoaFWt&XC#w0000$L&E*_r0Ea2C$0_-`h zl}G|SL}ila5|8(7lFM@eTF9J&D7EZW&rz9+=W`(=Kns~3;1e&e=gyu;?}Cf~Em#3i zhI9L==h7U&&iHp1;5PjB9N_;e{MmuWEkzaP_1rxNXixaF1AGoZsnipwEHCfx8~~#8 z{WC%G%;l-XhxN*xPfweFa{%6il_E*tm0fH U5F#;pcK`qY07*qoM6N<$f>3a%YybcN diff --git a/sprites/spr_block_color/39b2852e-5bbf-46d2-928f-f7124dc5a782.png b/sprites/spr_block_color/39b2852e-5bbf-46d2-928f-f7124dc5a782.png deleted file mode 100644 index c4026e6e3288844fdfdb0d4154ea33fe1bc83be2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmV-!0g?WRP)Ut0lFad0H1hKYaYhqEszB0LLdOj zP@{Kiu9^ex%ooZ8>OTgS_lNeTj`FfC@%YjPx z9FUKOFpggnW8IHZ95(d7j`tf10M&S0h^35537FjU3h=IFz-IV7P!62}D#-};WOaa= zijY4^K5Fn$gHH=yn@5}1Iu&4i7B8GW25er!HI+jrfXc0VK*B!%%(b{hS_28{IzD3pN7 zO|Jm&b`tx5jrc?C5ZDZ?jb8<}o$(7^-r5DMhp)8oo#-d;0PTl%;LH}P03C*fH-Oqi z7U&q;4{XF9prCR8up#&~Qe`dA4E z478I^wea|)tBm7#$B~Ud#>+svpH9cSZz%zjn_dCu7B{dljg`>XEP?yjad<7Tc5}wy zr^xq^$MKA#SDw5A+6PzSIPJZ{a=SoY(*QE=LNZ#@Z5Wp>JOaAU;uDQcR>-?s__E;3 z(dWQLLHZ3?ZWpMZioo*37oaPMYgV87h&^ddYcX2W?Mwg5SMvp+moZAf_@=i$aY`v7aB>rVA<-Y-WuXaW3SIW=+m1msp%NA1t xCO5qT?Wq-bMf>7x;Q=kZ@%o?cBU$80_yea=DKIDDe3}3N002ovPDHLkV1jnhcJBZH literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/406bd3f2-c153-40bd-9cb3-301370bbece3.png b/sprites/spr_block_color/406bd3f2-c153-40bd-9cb3-301370bbece3.png deleted file mode 100644 index 5606976d1cad16eb52f6133635930d17cc79ca5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)WO@d#O!8df@qcw? z5#R~tDL`!MIV!X9d=3}_Ji+V%KJi>VxAC|O3;~{?1V9-)>gu^P2liWv;oSwe4Zl4H z*t;U29pEna44SKggfy;-7GE)j=Gzh(&3!;Gz(GDY-N@wQ3^15R2Ku^H8!3AJWBcfE*&AL3k z7iYWY0!%@gf>bfLs+uFSDxQ8%5?~5a59rSMt383cKoVdITmY24tLCabusLs;weK## zZTRUuK;ISioB+S2u(62p|Jwt_%cZ<0kXc>c-aP;$`H5MnW~3+T^1;I|rp>lJfZBv! xM+j)T2PpqLJwO5FP5DXz-v$?et~4gV6z)Pb<3OwV*|PRHC@Bo4IS*WsjMC(WBY|DX3?6>}BN^j^9$SZLX=UUzp z3!1Bm%dJ6Trj*1AwhNl8h)X72GwW@m23_ovrc&Zp){AvLvZn4n1AAGUCg$)yi@dM(5fC}xhO=BT3+%d^I>U@fI z^$&Vt7;l07BCs-o*UH$wli_F?|Mx@@8r zT_D;o2X=YDyaSoUFyC1P+b{3nqz&hA($^0c4EhV!{j9$-={*k+iNhz*7Zgc`1M7dL z^oITxtd1`e`@7=ABgc`g!2wiC>&w>|uDO&l9dq@{}?n{=1{-7YyGJn4Ft|6ez@O$2@e-+DxM T=@d3p00000NkvXXu0mjfXZwFG literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/53b7e75b-121c-425d-bc1a-c3ea72ccd51f.png b/sprites/spr_block_color/53b7e75b-121c-425d-bc1a-c3ea72ccd51f.png new file mode 100644 index 0000000000000000000000000000000000000000..b8dc21b886180119ccbcf34e41629fb7b878d965 GIT binary patch literal 711 zcmV;&0yzDNP)gt_MU4S>Dk;>eRcFrp$9e~DG*FoPZ@x_a8|KV8XXZ}QD>AuX2&i<($s++Y ze_SP8hULO}m>qfWEj~oXzVAz)*XMNn1doMXnFrATLMg2cum}ypEF*5k8R1dv7oJ0B zWbFILW1erpR^cUYd<99#z)yat#a!VrvCiN7S#!O8RYO z{T`DWt995e)Oo{aKx>g_58TCN;U*jw_HrfPSkqqCd@Z~CPKEvp3<#6c17o|uMYh;f z(W;&Md_9f``%J%EW!cTX-yh>QV25y+8K~zu(ubQafbm{Yr82v~MK%RF;UM2qdUD-n z4VQ2w&$v?cZ+ZT6&mS~vwVH!9LcJI0yx}vTJ&?kD;Z&YfTC-_bExd-4!kl^IJKyb= z>GZG1`1<=t=0;$(z}yI|lD7+rC*0SkpW%3NxNRk^XD?v*>>@xwT61?m3F9E`ae~QKkCR1D{x% z5?=BfSF`u*-Wu%U_(H@l(4RrS5aZWixA3$1XJD0_9?-kl2y0kn{vkN2<5p5)hN{>j t`n_uCAHMz`iMComjE4XK002ovPDHLkV1mstTrdCt literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82.png b/sprites/spr_block_color/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82.png deleted file mode 100644 index 5dfee8bfee394d79c316bf8a20ee158306c41a12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P)Omi~uNuM|VBf=D@N@Oz$qhZTRgu!0(E5RzQ2C#MgX7J c#|6Z~8=(@IYV;H$ivR!s07*qoM6N<$f=+mlEC2ui diff --git a/sprites/spr_block_color/6672cac7-d619-4624-9693-64fa62a1fd5a.png b/sprites/spr_block_color/6672cac7-d619-4624-9693-64fa62a1fd5a.png deleted file mode 100644 index 4a377d7dfa21c5cc293253242ef61b44da68ba90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? diff --git a/sprites/spr_block_color/6dc43c4b-a119-4321-90f2-dee306cd4ca0.png b/sprites/spr_block_color/6dc43c4b-a119-4321-90f2-dee306cd4ca0.png new file mode 100644 index 0000000000000000000000000000000000000000..6b44ae7a4bb142c8b4eae99201a100e236ba32ee GIT binary patch literal 774 zcmV+h1Nr=kP)mmB_wDYIT^ZqGwBT#z{62ize${MuL z)LKW){6S@iF8)}v_?~k&W>927n7Q-tnZx(oIp^Mc=H6Qt@40fI1=z}h4DLx_h%h+K|c?!$_cP3MYfxM4z^l1z%@Az#*9XA7gDP$qW`Ncr;(i0? z?P;*nqO)O9z9XI2d_&SmI#QjiPZg!_Iuu8QXdj?Va?TRiZ8n3mY1+G!)Drug*#ydS803K;f`5{ zYNU;IafF^YvOnDg)y#^}+zHkFeDqoD7}t|-A=wH40xRYymtooLk^lez07*qoM6N<$ Ef=>N-%K!iX literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/6fdb44d8-1398-4d7d-882b-160c2d526de6.png b/sprites/spr_block_color/6fdb44d8-1398-4d7d-882b-160c2d526de6.png new file mode 100644 index 0000000000000000000000000000000000000000..96a02896168ba3f2d4c7b8ba4716ee9b0550dace GIT binary patch literal 870 zcmV-s1DX7ZP)@bG;CBQ`AK_28C9)DFt3c|3EjbmXqGB zK*5TrdJdjqV2RN+GyTNs~GbC?BMFuAkfV{(3(>?o>L!TgeaP1j5zKnt@v&-?9l@Ygi7R z4_pAxE~)^p&bq*J<_gK{adqI56kiRn{~?nTbOk+9eA95B2`v0Gh1Sf9krh}In+Tr& zUJIU$KLK9*!OS%+0J==|;F*}?jHelEitMXmkAdzfuC->MUlYT5^m)Ty0nNY9k8@3{l8%Dz$tG~0b-V0W9HIaEL-IA_m%)QedAigo`e58QP!u#0DqvLcq2JO6 zwodv$)iMiS58MU!r|n?;sX_KL4YD5-K57PhuDt-aEYA_+zJl6k&Km(0FmX4oUKtIR zC)>fg;c3RHjB9$YfRz~z`Vsn~MBa2YLx1BYhoBbCHFbY!2AwwkW_bL(+cnESycpjx+YPFba}S72I;P)%<@Sx>Mc*CpRB;Jd z@0$WQr!EW0@7tIUsw4D!a?-(jPu?+sg@2~d+OJc<^O%=q1=|LhnHtTT%QM&xmTk=f zZ@v73-N-DzcU;41j5{Y0&9d;Q43PX>i_@%07*qoM6N<$g6UhPJOBUy literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/71cc1cad-3807-4b13-8298-5151069c3dbe.png b/sprites/spr_block_color/71cc1cad-3807-4b13-8298-5151069c3dbe.png new file mode 100644 index 0000000000000000000000000000000000000000..9322a4716bb12bbabaccc498eeffe36a1fcf78c7 GIT binary patch literal 723 zcmV;^0xbQBP)69uD zA_x+rQ4}eyx>n;-ksu-3jz6Nu$tLvV_;&qv6p{&i$njJ7W&)V_cgoMa8i-*Ic?3_$gD52vdJ{*n zCh(a&Fs443qc{8X80Kp0?>2y7&8vYSn5x`|DzXXp$^9rNPos})z(VPrgPKlSPTW9XB~+xSARLNPgnS=ze51`w=y zHBgB8ooEFV^PhE3rU&=csy>^dugT+teN5sR2j1c!6JJ3LWGgY#@{F z?VYt@HXG{PS|4#XtHwzYHIhjE>>1f`kRK0a>>{)BY%|FtioM-Ts ztaRsX)<(W7!qx@zP(qer204t!@|Th)aDm)~9prgjCCjCsl)lra+vn4`Le}b}!qf#O z7q4Kx2`}o#+k_gj!|hySCZ}olcF$S`s>!?39Z$cNqx+xl#%rw)OAXkmWao4oOUO3m ztOlD&M|XXx=6{=;<$Uyh`6X^Y7|YlIf;F!OdhnclrX1Ovwc|3m(VdINPyMCdsC~M~ zFx7yG#8z=!^WSg1`qKGV-JVRCZbB1Dd-T$O-Z~^F@EhA{*ZiD@x0V0^002ovPDHLk FV1ib3V`u;X literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/76df8a47-d092-4c9b-a6cb-212df7a5a3f1.png b/sprites/spr_block_color/76df8a47-d092-4c9b-a6cb-212df7a5a3f1.png new file mode 100644 index 0000000000000000000000000000000000000000..df163ca8438051dc7c20cc0f1629dd7372985408 GIT binary patch literal 678 zcmV;X0$KfuP)sAI=^`=A41|-$K2!xc*=mH}z{gO;*&OWT?{fH(c$_%#`=5HS);_pV6P6%EOzp1}p|R zJD2AKqN zk)BS$dyVWVxh4Dqc~f;B%%R!tA#gbtSjK$?&IZ5FTIm^kO5gvUYvKfA_KWat-8P)h z56{AP9z~_i`3hu5D&R<{vR@HtM+0IDmf^#m=b2f3az}iI?>BEJl=DEEA!V0K744|! zg)-MfGO;yJMEE}Ng?0FICHNOya^_SZw~7d7*(*8cXIGd>ovnEp*>B{vw&p{=qH~$Y z+RFfTA&Gw);i*`5zO<0YKgL|Kq;s`19u8yn0a*j12UGubVq5k2P~|(&VE~Bc0O$TZna@-k`>0wp1E?zu?e-Eygxb!Mtlx9kfg)^yx1(9QH~4T z>I5G*f|qWBfd^nE?MICX_HES;c)`*tFxU!~RDwfK>45n;m@DxdaHfMTx4_yPV30F0 zet{v{o`yB*Pe3bm=XOxW)gS`QfwUjs5_BZQH`iy5z*C5SYjFW&JGs7YEGFz-)=$Tya&8i1HSOHA=muPGw^g7_1DSi zW5b|Tn+V8>G&TyJI|4S}2kS0?odNLRojPkocpBxZRvNnKe85Fo?1v|hd-ro(} z$G-Q}GuEcJ_k!mOKz$-0C(`s3*ugcsm$;H(d8T%`3h=u60#!q z^Z`5AJ^)tjXG7lSMf`GV9ZXK2ngI`Q1iQomvokPT;yDnR20xPq8?^CUsNM&*g#S+W zQ2)UG^~nLb3*?*4wS^DlkC6?+QR|8-z(BJdk~ WrqtOAj9h#G0000fMgxGinN+%nMwF~Z$+;R*KrK4-iKQA+5%@6G4D`@H9z=Y7uep7+e<^EMj}8=K3{ zne_wkB)^cWF*)O;FApL@+CJG7Ae;(8>1BTQ@Y5(5xd+a&x}_%a?1!0|*_W!%(Vy$2A65NE64a&!%nYoj zz>C}!Cmw^Xcfo1S+<|F7~#A!a` zOOlzW>QnR)&NMNm`W0U9ObC?k0{v>>#8FV*RCAoc=|=GN5P16zIQ~lYZw7bvAJ~sv z0kz41Sp%DSa3Th_Tn1CqpzLN-tbu0EEJ^RN_)z2a=YO9s!q6rI=58p@zNQ)+XC~U) z!5RAc1~C4YKDG=todhS}G60)fX%#GF!KE*t?C0+|la4kp8v8eYlRlXNwW$H~t5~Wy zSgno_pUtY?sSa~w=RLjhXw0{G4Qz9&15BUx*0;B#JzpQh=lUtR`M zHwSnoj`F;B%EFE^Gvq9w*are^8N00009U5cJT4mMU5iJr?og%}?afCncgZIVd?xhBjB_RNj&d%BwkMuyU?yPInN6(eyqnj zWg`)QbL#ZE%mThLnddSd?~B*rYXQ0-oPt9@V_wfuSr*UF0YQK+2tB}0JXO!Lc-#eo z09{A~Kp8wL>bYzVM5`r<=G_Ij4Zl4H`2PxXb^voAUeg?&se1lDbKu#%={~mNzuR~D-{}D!P+pYJ6i_x20q9C?0(9XH XQy=2+hCu<*00000NkvXXu0mjfU(lVb diff --git a/sprites/spr_block_color/ac576e98-ff6f-45d1-b561-eaa23be13968.png b/sprites/spr_block_color/ac576e98-ff6f-45d1-b561-eaa23be13968.png new file mode 100644 index 0000000000000000000000000000000000000000..c64dda0367fb582eb865cb67785dca74c9681f3b GIT binary patch literal 844 zcmV-S1GD^zP)OHsGv|vTV$&FPA|!AfT$2Vck`RmZ%)s>-+jzXd|7H?SQf(; zAIswCKv+%&)O@W6bL2)aU6BbgdnUwDE|KZcjom*UcGG?GEG`}v--8{(1M0v!2e9t; z+X1@BP#Zu&A%NHYm%%30C9utZn~Ry=sJ;j`&tK*AcK;plnDR9EH1LpOHN~uM>>Usl zG;4|4MDWJU74U5G1+dk37hK%5NU@CKhUD|0$=AZ^rf>_Vch0qQI;$g!R989<%xh=C zQ<`(&O)t&q8GRGj{jCE$q^km(KVJhI^o^W;P*+L$9?Gv0YQdl{z||3FrRIP$!2vqH z+rY(y5NP(dg5|r8Q0$>NxH$+uVfxN$(!CUiBKhx@dcd5tJkY0%IN+0-1FBRdXiO~u zd)zOVu{@^X}cwQZ+?+`M;d+z2Hb$wDg*zGcd2eQgRR#!R>xZ;PwxAs2pXlV`j z!rldjB6I%y%QLW~s0{3P^zr&sCs=IUPyZLCJ3@n?bR1ZU6LI03r(Iwuqi4cnYa3Wm zaTxqC;0J|F9r(yqJwE~MHWe6f(41-w6kEDq zfkkz6q6IBznzK>c7|7<-)=zUPlx|;B z*G1{<92lLN0Hx=EUo%HP>{Wn67J7@-*V4WYS}9>mVI1k^we{gBea1{rN5Qxi47{Q9 zM>-C8+|yuioO&utAh^0{ZKRygP~7HSQBOWeBXgNn)>G;!-(#aX2?{NBU?WHKFKzkD zD5#`;E#F5k?Cf{eCP#kIMLt0u=I@(w&i;`eRz_C8f*gsx10pSYnW`h{zZRCvm(ee+ WZfGzNMF1iI0000!JZ6CY diff --git a/sprites/spr_block_color/b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png b/sprites/spr_block_color/b8c3d60c-33f4-450b-a94f-1cd51e0785d9.png deleted file mode 100644 index 46c9ecb4cd7055e59952d7a8e5bb66adab12e2e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmV-x0hIoUP)xUedMMeR}{@LDo)Ow(c$eVZY?(Z0!> zOyVtO^JmQ>Jewbv1nlEj#OQVt@scD`VyDrN)|96}KJu^*eP6^u5Xb^-Ar(L?pAJVN zE_YiI$GuQmQ=ZFTAEUQx_jZ7*d=mDhA7EXSr@iCO4gj2|sALr#jCgpSTR_!F1>l?x zg0_@EE8{%pc>Lc!zJ3;93(6@#%aR+*@;~=thWLUIJ9qP&JO6v;+p$yvZ1uGD5cJ4hU_So{^vRdWGxuBk2r#yW z2VK>{Xzn&x=eYqcTRosE=Ri~H2J1c7x!!Hl(^AhS{V6$ekseShz$EwUoCx?;0}QKI zz!~!{xToYAIG=qE)@mK#w0V!~S2yXWZ1%g{=fG7f!~J{*Q;vy%i}!@NK7+B`D5%O= zFrI%5Hu^ik*)-KPIrB$d*k=k6Fyz?}`ju61$uSXNF6v30*A0fGL*Qic6&UtWeb~4U zww7PA>D5|2IFT6B-r4kz2Ys`J2&(+*Ml~_t*ix{Nu|Jp z0m_N_Ecq*b1YE8>9>QK9IGLpNK+NfQVi4@8qTO;ZHeu7p5)rOb(#* z&jrG7@gpFzac`*w`ZX^&VbGj4l~H8+m*~Il3ek!-@J;C6-{@(Z{&M*vcp^wABxXA9 zFIbC$k(GJyOeM|Pi18H^b2=0s2it=I@YCwn^u_!f=$w^M?1nyt_UV1P3mk~ksrGyo zonVGn$e=YKgT0Ge(|Z?bcWm+d!6Cyb5fFdDv=swq6Vy|c0+%Vpzc+jK8Bq@OrON)VXQ!M8egK#4JiZ;$Be?(o002ovPDHLk FV1iOXluG~r literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/ca062147-d4cf-4e89-81ee-e5ebe1d4b165.png b/sprites/spr_block_color/ca062147-d4cf-4e89-81ee-e5ebe1d4b165.png deleted file mode 100644 index 60ec26937ce66c2d3fe58c5e32187b433c9c5138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmV-c0jd6pP)^kYRX|ulX-!DUC zmLF#VmSv&1t}DfT-&tW%6fBp#1nNope?J&^$#a<2Xj~@cgiVr{M(PoMLwZvNO$djmQ6C&Zq*c z;GF`*qn@L)5HII|C%_8c9*`3+*7FdLyTB7*1t$Q?;L%mjwK*`)GsX1o0^Ejo&jI<{907*qoM6N<$f|Wm-HUIzs diff --git a/sprites/spr_block_color/cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png b/sprites/spr_block_color/cc5e53a2-ec1a-457d-acd8-f69a2edcd397.png deleted file mode 100644 index 5b73f2c431d9e77de89c582b69e33018ed06b62c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL{LP)UYh9F$YA14Af=X4{smus>fq8mvZbXz3mJO}cThdAgt$r^f1DnJTK0Iz%+bdz5Etcn@6=}p0F$SvWVw&6czE9MJ`_+j zlmML5&~r!vugv7RiO2VC&e!(>q@bMwte<+0%JO(V2Q&dv(0YJRJX_E6c-#e=04XQ| zPzI06dTyEn>l5yR4iz8;?Kb@O9N_PY`s{%A!g+dT>-qo8f$Zh-x+hSXEnnX`0PHSl zFKC{zp0MTpe!9ciX{+0t5Z;V>^qiVrw?+Bi=>ZNXFU#i&s2WND{;P=zkir8R9^V8< S3y;$!WWbuUU1 zbKbT8nsqdmW87q^-GIyap`aQOPvuSRho8ocVY@7c2p>VATMhc%eD>@ip_D&J92r`gU&4U31{3 zYb@Qr;jiZae^;b)1K$^po>)3(p*i=?0r@X;z`R@>H34U#e7bW0c*?OBteml$2<5k8 z++eybxi=wlvlFyWxf8@w`TwZ_4k(|?dj%{FBY^ko;sRpf19LCfmt@Q9R{#J207*qo IM6N<$g5vF+4*&oF diff --git a/sprites/spr_block_color/d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png b/sprites/spr_block_color/d53f5a5e-1012-48ab-a444-ef8b434cc7e4.png deleted file mode 100644 index 13d0fe58a2b8da181699288a95786e99496ba652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)X|WUWZHD1R`{t9$B%9s# zITA!7`Eg4?b-rtxKeR0>>!3=N}2r$Lm`^!VGYcuTtv={vR z_}&8Z8h(2Y;9e0?25`dx<^MMaaC0GGWTAY#bAUj%!KoSaL@2L}kGCzJ3^e;X)QH<| uyYj!&0|-*ym-h-78f_0STkBu~r0@cQf8N#US6Daz00006%FZ diff --git a/sprites/spr_block_color/d7207c61-5205-4ed0-923e-c1dccab90dc5.png b/sprites/spr_block_color/d7207c61-5205-4ed0-923e-c1dccab90dc5.png new file mode 100644 index 0000000000000000000000000000000000000000..58380f700a6cae55c5880ab28fe55922adc73859 GIT binary patch literal 800 zcmV+*1K<3KP)9xO=!(bU?3WHc9YEIfNIcX82URm1S6a zqn@Gqa03Hw)(iX}`_8IpQ-ArKjbZ7@reK?fF|Ym#)X+nnM`pNrdxfF%x|8A7QhPhH+m`5cI^jDyUuY%+j!;KH{RH2-yPuCbWQ)J6wuf|XVd|u-ykpBYDx_jVL{65xo-~!fh{3TXLlMlK3S|#u8L-l8hP{12RtwrA& zMFClYXYKodscGB`tPn&>jo=gu_9_fNM)Fnih;VfpHRbi={O9)qS;A`2UjbeNExUov z4(!o$#UjJD4*2-~0jfE49yy(QgGgG5e@A@(Up#7JG6E$6r_tYdt3X{u?q{M%?x~aT z{M#%dQBWe%EakZSpvYURtCM~LqWlD!1}@Luc#pERQ=z;lsKA;L_G&IWov9tHLX;Q7b|`YH5*@n})x$yR9m z*aUF!IQaO2(Q1I-39TjMsFP}d|1ffX{<|jdm5uX04L4;iT1ED|gzy8A?2;v8F5hP#G%Z{N_mo%*=t8-bxY}?tLWSh<%-NQ9R z*Ye|I0YTzTVx-J1t(j*aKhoMu>{&n~BmrFcLE=f`p4QB3`4?qvuLD};13fXUHwg5ib~FfJUpK*pfZvGoYS5%xH8RijmP_fdkaGyh!p2~9%k}92POgZC; z=c&qXB+_X!)B$+2qYUkKyOjT(J;3lE;GB_s?p&wi8P116Dj#RnBPq^TA z-@i~EzsBsI|2g4X1H7kJ&xr(rwWye3IT0sS=HVOGm{fmui`3j3`TSoTTR@1E6a z46dfq%uoKv%_DFvw~WZ{loJTpyi;Izu@dI#F{xfqNUMh}JUNZBKOn8-c&5!6UKhLo zzt!|{tIwywl{tZc?J5Dx+!~)3bKF~WORe9!iUxc3H1Ohhi z6eun_nIvf#Ml9c~9J_eT}V$Pvi0j`1C-IMnRlBCG%a002ovPDHLkV1l7{YzhDX literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c.png b/sprites/spr_block_color/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c.png deleted file mode 100644 index 21930fc05b0efaec5bcd605c8392396283e090b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmV;30eAk1P)WStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED0000AcLe%!T z3P~$QYQX?C_zbe-X>21e z;90=8^>b6SZ^t_FvgO~vpdY|Yk0`8}48(Y`2=mFaxKEx!3wco@FQ8of5%T1J>enn? z`_X>g$-pnnCXZtec^(<^1a^|$QnOa1Lh1Xlk^CcL)qdQ|z#IG|2hEjd8u3*;CtJ}Z z{y;##f)^$Ae!M4Bs3j**NxGMTDpZp@gtw3re-qhZR<38quut@UvH>+@r_|imSBl<^ zN91m7Cf&(EK_VH&5ArU0$RjvNrqM@gP1ATvwqPrHC#0U2IZ<#X16qp_^S<(Ii>&J| zsrg|XA|IfatVMk&eY^R1_8YUv^=Kxuc# zd(BwG=tHuv)MG8F=K}3F`V16N#)~;fl1bUAv}Q@k%q8=l^Q;X=$v!i`!{}MuCYvNv zF6{%peZW_80QblZ*h}Wktnf_NagUsQYD^1XAF}j^CG}C66YlK;6Y`!;ppMK*%~Gzr63@B5sr^M86pN&O2xkyWA>WruVp10V5<9LHOg`27So$<;U@{`G0(wa%RoMnk)Q0?W7B-JKBx5kk!Rp9IF{eY T{7q`i00000NkvXXu0mjfd+SMj literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/ff1daf32-8dc0-408a-9d33-e4d74c14df8e.png b/sprites/spr_block_color/ff1daf32-8dc0-408a-9d33-e4d74c14df8e.png deleted file mode 100644 index bbbc228d2d3bc57bdcbe5b7b9a87f6b6d0c799a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmV-l0igbgP)L4#f2z>8*d==27<@+9^ODGUcikYiVIQPXdC(hnK-2J(}}*#5Z=(fnU_qG zEopHlMP!;kcLZ$dY~qeCCLZYKB#x-#tU1qteB@z0p`M9T>bnB8UfwQ?Y5orvZ6-btqefaEDES=Sym<>7f_0d2zyz&XY41bAhV z=MsJIbMmQDxY&6v7Q xg7mt5mH(YRzyam&@<9P@!wTT%wRHhncmVnlmOl^qIJp1-002ovPDHLkV1mQOpostg diff --git a/sprites/spr_block_color/layers/04e145c7-d721-476b-88df-32d820f451e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/04e145c7-d721-476b-88df-32d820f451e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..c41959bbf0700e3ffe23155765d87e1bc0071bc0 GIT binary patch literal 797 zcmV+&1LFLNP)6}0^iUtXjM2QfD_;KfznrLD)_^0gJKg5eI7^7Yhh+crsKo*S) z29PDPmBHrb-27T$AFkD$=k1ctfnheT=jQ3@uRZ5|-uImL@M9-NR7(pR-^$5Z0Gj7hH;(pxLWwX9xgQ~be+b@?#w#2yJa#yD zk+TP-`%LfJ{Y;;i0!;6;`5W@-y8bhI{)+7$(-#%$+tF7zvt&TEAO)T6BGW(tPHqWs zGFuEX{dov4%&F+#AU;>eXNh0$1b?}!=K{^6&D;76Xlr1n4SLmq$RFmBiEBsDUzFiw z)H%g;`U`Ov_)-Dt?Brh^8Q)u&La_)w+ z`LF0#h%c1%e4&o7RxzH~HOaJK!+k}j01PzKRO1!8uy=_}2T7N+a56~FW)i6BWv^ey zj|*@%li8n#Gx!b+d+0l$1z@C`X4>yHfJLxnm6%4i5$X5}Nauvw zyhgfdrqy04b)LG3+=eEA(}+J6BxFGhon`2_KGJ>OWx?(&?`&I6{|1$2?E zNKErlMCv++NHbgde}fcp*EHL8g9@TE*F85_6a!2 zEd?5K$6ov`y?+t>M-1~gP4gYlPN&)`we@w00000NkvXXu0mjfU?GFF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/18c76dbc-4e67-4504-a32e-e5dc3a3a77f6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/18c76dbc-4e67-4504-a32e-e5dc3a3a77f6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..688e6cebf6db7a3ca434f72a651279c73945c4a3 GIT binary patch literal 836 zcmV-K1H1f*P)$1W2cfUXp-NrF>ympYii+zN>OQ?LuN3~bxk%Y_%=-kXgPz^*^(!eXVsbK5N z0C@F49{6B12(}buvY%D^5v`~GXGtp zCdlClj*Gy1p4Z@o+-C4` z_$^pr*#q8Ze_rF2{*IY9;K__bpn>iJ&SWaI3O)_F!4uYcaNry5fD-Thj=+1cGN~Hu z50V!f_*j3giSZEaBO=}?E1*=P@|-S=D*>Mb=|4M`d>j;l?(_1va`ru&^0N_&cMIAf zB{9GW=-gs8;8~)b>T_h86+O>;LNCChmQx%%*7u2x96LAgEj-UBP^22C2I#F=d4nmG z%2+9%jO4wmUiSMmL$F`bdXs7#?~0FO3m-PhcY*R{)RW%(pQkoR4g3L^99Yu#jVxXO O00006!Q5Ip>}^(|gBUQrWa&%AuKa z85{{PMg{nC{4B`pTp+VoXa;U1Cp5lZ*W3E^B;Bv{pl1Gh>^*3UbW;LbPCZLzW~O!g z$gev>7wk50$$tYZkgk#6^MJ-l*TH3>|MhQa{osAj(smJC?RiAH@LA*u#moMhGP86K z6qW7+zxi*12Rg2Ti=j?%C;LS+dLIh?3b>%tH+nmDdbdVbe8jc#l6f{UgVu#hc)^CE8UE5JBql9x(=-=lHR z!dAiM&|~nh=QNm9$j@UxHToe>E11&hYq5UN?y3Q;Yz|!DMyY_>10`iv!DHZr+y_>8 z$dCK)fi+S)I4Ot0VrMyx4+J#2I^U-1!64nw+YEBU^gue3boUh@Bqq+bbk5VNpoSxZ;@&;`2Qe_6^ zVbYmiuL1|;ghro@(fFgT5>P!C7_SE^%YK7JEFVlTdZrF1`L6=>UZ3~Xf)QD(zYIjc zb|3xY_38Am90Qv@bdoYo1(?WWC7A*TLP@aIZ3pAgDNyZ+cghE_!L@f&{jDs>yTSg~hN*yf787G%!H=V~ zkLQUMJr7ZDoO2g~T}o<8`UMZ^@llGy*)B>T%L~fb(x+l8r!!lvgHmTE?I+{d_*_Q1 zYU(&uw{mfvStx<+uVH(Z{xW*{V$XjKtX3xH75D=W5;VAkBK*U%P+Up{!5_LZtlGyC|N{o37$cH?Lok76ku%ikv1t|bm?#;&O`dDt$ z)twBL81qyU diff --git a/sprites/spr_block_color/layers/2a920cf2-7095-4c6b-95d6-349e2579e858/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/2a920cf2-7095-4c6b-95d6-349e2579e858/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..ebd084ad41432beadc84a8b23c947efb23d4fd61 GIT binary patch literal 668 zcmV;N0%QG&P)J*l1#6jD+w9R2FPx!-|!t0SeUC zwgHJo<-=H@Qa~dTKB_S)hCd*;CGmZSW^SZWH#2AR+;iWV&beo1PLI`AUY52fG^@(R z5dgpcTeAZXrTJh%o;-4Miw~Soa5(!fZ~lq@QbnBx(Igp!P_mM{}p(?61+D8whR3w^|RE6!PYaN@saBs1og|n+BO*b023NATki&02>*3Pd|9A z4Gc%X;u7i)OnMY_xxo9J-&70kEP&NK0~6B>K(Sf(?(0eR1F?6YaR3bR4AeJ)k?=mc zSJp-CpIrt^%D@fw1zcBy42Uyus1S6rQW^80<22aY2ew@Y$AbT+KViSnz*9TynOa%`^BwYhvz}%J)h+|Jxsaj&6x%NNoaFWt&XC#w0000$L&E*_r0Ea2C$0_-`h zl}G|SL}ila5|8(7lFM@eTF9J&D7EZW&rz9+=W`(=Kns~3;1e&e=gyu;?}Cf~Em#3i zhI9L==h7U&&iHp1;5PjB9N_;e{MmuWEkzaP_1rxNXixaF1AGoZsnipwEHCfx8~~#8 z{WC%G%;l-XhxN*xPfweFa{%6il_E*tm0fH U5F#;pcK`qY07*qoM6N<$f>3a%YybcN diff --git a/sprites/spr_block_color/layers/39b2852e-5bbf-46d2-928f-f7124dc5a782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/39b2852e-5bbf-46d2-928f-f7124dc5a782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index c4026e6e3288844fdfdb0d4154ea33fe1bc83be2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmV-!0g?WRP)Ut0lFad0H1hKYaYhqEszB0LLdOj zP@{Kiu9^ex%ooZ8>OTgS_lNeTj`FfC@%YjPx z9FUKOFpggnW8IHZ95(d7j`tf10M&S0h^35537FjU3h=IFz-IV7P!62}D#-};WOaa= zijY4^K5Fn$gHH=yn@5}1Iu&4i7B8GW25er!HI+jrfXc0VK*B!%%(b{hS_28{IzD3pN7 zO|Jm&b`tx5jrc?C5ZDZ?jb8<}o$(7^-r5DMhp)8oo#-d;0PTl%;LH}P03C*fH-Oqi z7U&q;4{XF9prCR8up#&~Qe`dA4E z478I^wea|)tBm7#$B~Ud#>+svpH9cSZz%zjn_dCu7B{dljg`>XEP?yjad<7Tc5}wy zr^xq^$MKA#SDw5A+6PzSIPJZ{a=SoY(*QE=LNZ#@Z5Wp>JOaAU;uDQcR>-?s__E;3 z(dWQLLHZ3?ZWpMZioo*37oaPMYgV87h&^ddYcX2W?Mwg5SMvp+moZAf_@=i$aY`v7aB>rVA<-Y-WuXaW3SIW=+m1msp%NA1t xCO5qT?Wq-bMf>7x;Q=kZ@%o?cBU$80_yea=DKIDDe3}3N002ovPDHLkV1jnhcJBZH literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/406bd3f2-c153-40bd-9cb3-301370bbece3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/406bd3f2-c153-40bd-9cb3-301370bbece3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 5606976d1cad16eb52f6133635930d17cc79ca5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)WO@d#O!8df@qcw? z5#R~tDL`!MIV!X9d=3}_Ji+V%KJi>VxAC|O3;~{?1V9-)>gu^P2liWv;oSwe4Zl4H z*t;U29pEna44SKggfy;-7GE)j=Gzh(&3!;Gz(GDY-N@wQ3^15R2Ku^H8!3AJWBcfE*&AL3k z7iYWY0!%@gf>bfLs+uFSDxQ8%5?~5a59rSMt383cKoVdITmY24tLCabusLs;weK## zZTRUuK;ISioB+S2u(62p|Jwt_%cZ<0kXc>c-aP;$`H5MnW~3+T^1;I|rp>lJfZBv! xM+j)T2PpqLJwO5FP5DXz-v$?et~4gV6z)Pb<3OwV*|PRHC@Bo4IS*WsjMC(WBY|DX3?6>}BN^j^9$SZLX=UUzp z3!1Bm%dJ6Trj*1AwhNl8h)X72GwW@m23_ovrc&Zp){AvLvZn4n1AAGUCg$)yi@dM(5fC}xhO=BT3+%d^I>U@fI z^$&Vt7;l07BCs-o*UH$wli_F?|Mx@@8r zT_D;o2X=YDyaSoUFyC1P+b{3nqz&hA($^0c4EhV!{j9$-={*k+iNhz*7Zgc`1M7dL z^oITxtd1`e`@7=ABgc`g!2wiC>&w>|uDO&l9dq@{}?n{=1{-7YyGJn4Ft|6ez@O$2@e-+DxM T=@d3p00000NkvXXu0mjfXZwFG literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/53b7e75b-121c-425d-bc1a-c3ea72ccd51f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/53b7e75b-121c-425d-bc1a-c3ea72ccd51f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..b8dc21b886180119ccbcf34e41629fb7b878d965 GIT binary patch literal 711 zcmV;&0yzDNP)gt_MU4S>Dk;>eRcFrp$9e~DG*FoPZ@x_a8|KV8XXZ}QD>AuX2&i<($s++Y ze_SP8hULO}m>qfWEj~oXzVAz)*XMNn1doMXnFrATLMg2cum}ypEF*5k8R1dv7oJ0B zWbFILW1erpR^cUYd<99#z)yat#a!VrvCiN7S#!O8RYO z{T`DWt995e)Oo{aKx>g_58TCN;U*jw_HrfPSkqqCd@Z~CPKEvp3<#6c17o|uMYh;f z(W;&Md_9f``%J%EW!cTX-yh>QV25y+8K~zu(ubQafbm{Yr82v~MK%RF;UM2qdUD-n z4VQ2w&$v?cZ+ZT6&mS~vwVH!9LcJI0yx}vTJ&?kD;Z&YfTC-_bExd-4!kl^IJKyb= z>GZG1`1<=t=0;$(z}yI|lD7+rC*0SkpW%3NxNRk^XD?v*>>@xwT61?m3F9E`ae~QKkCR1D{x% z5?=BfSF`u*-Wu%U_(H@l(4RrS5aZWixA3$1XJD0_9?-kl2y0kn{vkN2<5p5)hN{>j t`n_uCAHMz`iMComjE4XK002ovPDHLkV1mstTrdCt literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 5dfee8bfee394d79c316bf8a20ee158306c41a12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P)Omi~uNuM|VBf=D@N@Oz$qhZTRgu!0(E5RzQ2C#MgX7J c#|6Z~8=(@IYV;H$ivR!s07*qoM6N<$f=+mlEC2ui diff --git a/sprites/spr_block_color/layers/6672cac7-d619-4624-9693-64fa62a1fd5a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/6672cac7-d619-4624-9693-64fa62a1fd5a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 4a377d7dfa21c5cc293253242ef61b44da68ba90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? diff --git a/sprites/spr_block_color/layers/6dc43c4b-a119-4321-90f2-dee306cd4ca0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/6dc43c4b-a119-4321-90f2-dee306cd4ca0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..6b44ae7a4bb142c8b4eae99201a100e236ba32ee GIT binary patch literal 774 zcmV+h1Nr=kP)mmB_wDYIT^ZqGwBT#z{62ize${MuL z)LKW){6S@iF8)}v_?~k&W>927n7Q-tnZx(oIp^Mc=H6Qt@40fI1=z}h4DLx_h%h+K|c?!$_cP3MYfxM4z^l1z%@Az#*9XA7gDP$qW`Ncr;(i0? z?P;*nqO)O9z9XI2d_&SmI#QjiPZg!_Iuu8QXdj?Va?TRiZ8n3mY1+G!)Drug*#ydS803K;f`5{ zYNU;IafF^YvOnDg)y#^}+zHkFeDqoD7}t|-A=wH40xRYymtooLk^lez07*qoM6N<$ Ef=>N-%K!iX literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/6fdb44d8-1398-4d7d-882b-160c2d526de6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/6fdb44d8-1398-4d7d-882b-160c2d526de6/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..96a02896168ba3f2d4c7b8ba4716ee9b0550dace GIT binary patch literal 870 zcmV-s1DX7ZP)@bG;CBQ`AK_28C9)DFt3c|3EjbmXqGB zK*5TrdJdjqV2RN+GyTNs~GbC?BMFuAkfV{(3(>?o>L!TgeaP1j5zKnt@v&-?9l@Ygi7R z4_pAxE~)^p&bq*J<_gK{adqI56kiRn{~?nTbOk+9eA95B2`v0Gh1Sf9krh}In+Tr& zUJIU$KLK9*!OS%+0J==|;F*}?jHelEitMXmkAdzfuC->MUlYT5^m)Ty0nNY9k8@3{l8%Dz$tG~0b-V0W9HIaEL-IA_m%)QedAigo`e58QP!u#0DqvLcq2JO6 zwodv$)iMiS58MU!r|n?;sX_KL4YD5-K57PhuDt-aEYA_+zJl6k&Km(0FmX4oUKtIR zC)>fg;c3RHjB9$YfRz~z`Vsn~MBa2YLx1BYhoBbCHFbY!2AwwkW_bL(+cnESycpjx+YPFba}S72I;P)%<@Sx>Mc*CpRB;Jd z@0$WQr!EW0@7tIUsw4D!a?-(jPu?+sg@2~d+OJc<^O%=q1=|LhnHtTT%QM&xmTk=f zZ@v73-N-DzcU;41j5{Y0&9d;Q43PX>i_@%07*qoM6N<$g6UhPJOBUy literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/71cc1cad-3807-4b13-8298-5151069c3dbe/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/71cc1cad-3807-4b13-8298-5151069c3dbe/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..9322a4716bb12bbabaccc498eeffe36a1fcf78c7 GIT binary patch literal 723 zcmV;^0xbQBP)69uD zA_x+rQ4}eyx>n;-ksu-3jz6Nu$tLvV_;&qv6p{&i$njJ7W&)V_cgoMa8i-*Ic?3_$gD52vdJ{*n zCh(a&Fs443qc{8X80Kp0?>2y7&8vYSn5x`|DzXXp$^9rNPos})z(VPrgPKlSPTW9XB~+xSARLNPgnS=ze51`w=y zHBgB8ooEFV^PhE3rU&=csy>^dugT+teN5sR2j1c!6JJ3LWGgY#@{F z?VYt@HXG{PS|4#XtHwzYHIhjE>>1f`kRK0a>>{)BY%|FtioM-Ts ztaRsX)<(W7!qx@zP(qer204t!@|Th)aDm)~9prgjCCjCsl)lra+vn4`Le}b}!qf#O z7q4Kx2`}o#+k_gj!|hySCZ}olcF$S`s>!?39Z$cNqx+xl#%rw)OAXkmWao4oOUO3m ztOlD&M|XXx=6{=;<$Uyh`6X^Y7|YlIf;F!OdhnclrX1Ovwc|3m(VdINPyMCdsC~M~ zFx7yG#8z=!^WSg1`qKGV-JVRCZbB1Dd-T$O-Z~^F@EhA{*ZiD@x0V0^002ovPDHLk FV1ib3V`u;X literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/76df8a47-d092-4c9b-a6cb-212df7a5a3f1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/76df8a47-d092-4c9b-a6cb-212df7a5a3f1/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..df163ca8438051dc7c20cc0f1629dd7372985408 GIT binary patch literal 678 zcmV;X0$KfuP)sAI=^`=A41|-$K2!xc*=mH}z{gO;*&OWT?{fH(c$_%#`=5HS);_pV6P6%EOzp1}p|R zJD2AKqN zk)BS$dyVWVxh4Dqc~f;B%%R!tA#gbtSjK$?&IZ5FTIm^kO5gvUYvKfA_KWat-8P)h z56{AP9z~_i`3hu5D&R<{vR@HtM+0IDmf^#m=b2f3az}iI?>BEJl=DEEA!V0K744|! zg)-MfGO;yJMEE}Ng?0FICHNOya^_SZw~7d7*(*8cXIGd>ovnEp*>B{vw&p{=qH~$Y z+RFfTA&Gw);i*`5zO<0YKgL|Kq;s`19u8yn0a*j12UGubVq5k2P~|(&VE~Bc0O$TZna@-k`>0wp1E?zu?e-Eygxb!Mtlx9kfg)^yx1(9QH~4T z>I5G*f|qWBfd^nE?MICX_HES;c)`*tFxU!~RDwfK>45n;m@DxdaHfMTx4_yPV30F0 zet{v{o`yB*Pe3bm=XOxW)gS`QfwUjs5_BZQH`iy5z*C5SYjFW&JGs7YEGFz-)=$Tya&8i1HSOHA=muPGw^g7_1DSi zW5b|Tn+V8>G&TyJI|4S}2kS0?odNLRojPkocpBxZRvNnKe85Fo?1v|hd-ro(} z$G-Q}GuEcJ_k!mOKz$-0C(`s3*ugcsm$;H(d8T%`3h=u60#!q z^Z`5AJ^)tjXG7lSMf`GV9ZXK2ngI`Q1iQomvokPT;yDnR20xPq8?^CUsNM&*g#S+W zQ2)UG^~nLb3*?*4wS^DlkC6?+QR|8-z(BJdk~ WrqtOAj9h#G0000fMgxGinN+%nMwF~Z$+;R*KrK4-iKQA+5%@6G4D`@H9z=Y7uep7+e<^EMj}8=K3{ zne_wkB)^cWF*)O;FApL@+CJG7Ae;(8>1BTQ@Y5(5xd+a&x}_%a?1!0|*_W!%(Vy$2A65NE64a&!%nYoj zz>C}!Cmw^Xcfo1S+<|F7~#A!a` zOOlzW>QnR)&NMNm`W0U9ObC?k0{v>>#8FV*RCAoc=|=GN5P16zIQ~lYZw7bvAJ~sv z0kz41Sp%DSa3Th_Tn1CqpzLN-tbu0EEJ^RN_)z2a=YO9s!q6rI=58p@zNQ)+XC~U) z!5RAc1~C4YKDG=todhS}G60)fX%#GF!KE*t?C0+|la4kp8v8eYlRlXNwW$H~t5~Wy zSgno_pUtY?sSa~w=RLjhXw0{G4Qz9&15BUx*0;B#JzpQh=lUtR`M zHwSnoj`F;B%EFE^Gvq9w*are^8N00009U5cJT4mMU5iJr?og%}?afCncgZIVd?xhBjB_RNj&d%BwkMuyU?yPInN6(eyqnj zWg`)QbL#ZE%mThLnddSd?~B*rYXQ0-oPt9@V_wfuSr*UF0YQK+2tB}0JXO!Lc-#eo z09{A~Kp8wL>bYzVM5`r<=G_Ij4Zl4H`2PxXb^voAUeg?&se1lDbKu#%={~mNzuR~D-{}D!P+pYJ6i_x20q9C?0(9XH XQy=2+hCu<*00000NkvXXu0mjfU(lVb diff --git a/sprites/spr_block_color/layers/ac576e98-ff6f-45d1-b561-eaa23be13968/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/ac576e98-ff6f-45d1-b561-eaa23be13968/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..c64dda0367fb582eb865cb67785dca74c9681f3b GIT binary patch literal 844 zcmV-S1GD^zP)OHsGv|vTV$&FPA|!AfT$2Vck`RmZ%)s>-+jzXd|7H?SQf(; zAIswCKv+%&)O@W6bL2)aU6BbgdnUwDE|KZcjom*UcGG?GEG`}v--8{(1M0v!2e9t; z+X1@BP#Zu&A%NHYm%%30C9utZn~Ry=sJ;j`&tK*AcK;plnDR9EH1LpOHN~uM>>Usl zG;4|4MDWJU74U5G1+dk37hK%5NU@CKhUD|0$=AZ^rf>_Vch0qQI;$g!R989<%xh=C zQ<`(&O)t&q8GRGj{jCE$q^km(KVJhI^o^W;P*+L$9?Gv0YQdl{z||3FrRIP$!2vqH z+rY(y5NP(dg5|r8Q0$>NxH$+uVfxN$(!CUiBKhx@dcd5tJkY0%IN+0-1FBRdXiO~u zd)zOVu{@^X}cwQZ+?+`M;d+z2Hb$wDg*zGcd2eQgRR#!R>xZ;PwxAs2pXlV`j z!rldjB6I%y%QLW~s0{3P^zr&sCs=IUPyZLCJ3@n?bR1ZU6LI03r(Iwuqi4cnYa3Wm zaTxqC;0J|F9r(yqJwE~MHWe6f(41-w6kEDq zfkkz6q6IBznzK>c7|7<-)=zUPlx|;B z*G1{<92lLN0Hx=EUo%HP>{Wn67J7@-*V4WYS}9>mVI1k^we{gBea1{rN5Qxi47{Q9 zM>-C8+|yuioO&utAh^0{ZKRygP~7HSQBOWeBXgNn)>G;!-(#aX2?{NBU?WHKFKzkD zD5#`;E#F5k?Cf{eCP#kIMLt0u=I@(w&i;`eRz_C8f*gsx10pSYnW`h{zZRCvm(ee+ WZfGzNMF1iI0000!JZ6CY diff --git a/sprites/spr_block_color/layers/b8c3d60c-33f4-450b-a94f-1cd51e0785d9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/b8c3d60c-33f4-450b-a94f-1cd51e0785d9/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 46c9ecb4cd7055e59952d7a8e5bb66adab12e2e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmV-x0hIoUP)xUedMMeR}{@LDo)Ow(c$eVZY?(Z0!> zOyVtO^JmQ>Jewbv1nlEj#OQVt@scD`VyDrN)|96}KJu^*eP6^u5Xb^-Ar(L?pAJVN zE_YiI$GuQmQ=ZFTAEUQx_jZ7*d=mDhA7EXSr@iCO4gj2|sALr#jCgpSTR_!F1>l?x zg0_@EE8{%pc>Lc!zJ3;93(6@#%aR+*@;~=thWLUIJ9qP&JO6v;+p$yvZ1uGD5cJ4hU_So{^vRdWGxuBk2r#yW z2VK>{Xzn&x=eYqcTRosE=Ri~H2J1c7x!!Hl(^AhS{V6$ekseShz$EwUoCx?;0}QKI zz!~!{xToYAIG=qE)@mK#w0V!~S2yXWZ1%g{=fG7f!~J{*Q;vy%i}!@NK7+B`D5%O= zFrI%5Hu^ik*)-KPIrB$d*k=k6Fyz?}`ju61$uSXNF6v30*A0fGL*Qic6&UtWeb~4U zww7PA>D5|2IFT6B-r4kz2Ys`J2&(+*Ml~_t*ix{Nu|Jp z0m_N_Ecq*b1YE8>9>QK9IGLpNK+NfQVi4@8qTO;ZHeu7p5)rOb(#* z&jrG7@gpFzac`*w`ZX^&VbGj4l~H8+m*~Il3ek!-@J;C6-{@(Z{&M*vcp^wABxXA9 zFIbC$k(GJyOeM|Pi18H^b2=0s2it=I@YCwn^u_!f=$w^M?1nyt_UV1P3mk~ksrGyo zonVGn$e=YKgT0Ge(|Z?bcWm+d!6Cyb5fFdDv=swq6Vy|c0+%Vpzc+jK8Bq@OrON)VXQ!M8egK#4JiZ;$Be?(o002ovPDHLk FV1iOXluG~r literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/ca062147-d4cf-4e89-81ee-e5ebe1d4b165/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/ca062147-d4cf-4e89-81ee-e5ebe1d4b165/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 60ec26937ce66c2d3fe58c5e32187b433c9c5138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmV-c0jd6pP)^kYRX|ulX-!DUC zmLF#VmSv&1t}DfT-&tW%6fBp#1nNope?J&^$#a<2Xj~@cgiVr{M(PoMLwZvNO$djmQ6C&Zq*c z;GF`*qn@L)5HII|C%_8c9*`3+*7FdLyTB7*1t$Q?;L%mjwK*`)GsX1o0^Ejo&jI<{907*qoM6N<$f|Wm-HUIzs diff --git a/sprites/spr_block_color/layers/cc5e53a2-ec1a-457d-acd8-f69a2edcd397/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/cc5e53a2-ec1a-457d-acd8-f69a2edcd397/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 5b73f2c431d9e77de89c582b69e33018ed06b62c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL{LP)UYh9F$YA14Af=X4{smus>fq8mvZbXz3mJO}cThdAgt$r^f1DnJTK0Iz%+bdz5Etcn@6=}p0F$SvWVw&6czE9MJ`_+j zlmML5&~r!vugv7RiO2VC&e!(>q@bMwte<+0%JO(V2Q&dv(0YJRJX_E6c-#e=04XQ| zPzI06dTyEn>l5yR4iz8;?Kb@O9N_PY`s{%A!g+dT>-qo8f$Zh-x+hSXEnnX`0PHSl zFKC{zp0MTpe!9ciX{+0t5Z;V>^qiVrw?+Bi=>ZNXFU#i&s2WND{;P=zkir8R9^V8< S3y;$!WWbuUU1 zbKbT8nsqdmW87q^-GIyap`aQOPvuSRho8ocVY@7c2p>VATMhc%eD>@ip_D&J92r`gU&4U31{3 zYb@Qr;jiZae^;b)1K$^po>)3(p*i=?0r@X;z`R@>H34U#e7bW0c*?OBteml$2<5k8 z++eybxi=wlvlFyWxf8@w`TwZ_4k(|?dj%{FBY^ko;sRpf19LCfmt@Q9R{#J207*qo IM6N<$g5vF+4*&oF diff --git a/sprites/spr_block_color/layers/d53f5a5e-1012-48ab-a444-ef8b434cc7e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/d53f5a5e-1012-48ab-a444-ef8b434cc7e4/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 13d0fe58a2b8da181699288a95786e99496ba652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)X|WUWZHD1R`{t9$B%9s# zITA!7`Eg4?b-rtxKeR0>>!3=N}2r$Lm`^!VGYcuTtv={vR z_}&8Z8h(2Y;9e0?25`dx<^MMaaC0GGWTAY#bAUj%!KoSaL@2L}kGCzJ3^e;X)QH<| uyYj!&0|-*ym-h-78f_0STkBu~r0@cQf8N#US6Daz00006%FZ diff --git a/sprites/spr_block_color/layers/d7207c61-5205-4ed0-923e-c1dccab90dc5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/d7207c61-5205-4ed0-923e-c1dccab90dc5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 0000000000000000000000000000000000000000..58380f700a6cae55c5880ab28fe55922adc73859 GIT binary patch literal 800 zcmV+*1K<3KP)9xO=!(bU?3WHc9YEIfNIcX82URm1S6a zqn@Gqa03Hw)(iX}`_8IpQ-ArKjbZ7@reK?fF|Ym#)X+nnM`pNrdxfF%x|8A7QhPhH+m`5cI^jDyUuY%+j!;KH{RH2-yPuCbWQ)J6wuf|XVd|u-ykpBYDx_jVL{65xo-~!fh{3TXLlMlK3S|#u8L-l8hP{12RtwrA& zMFClYXYKodscGB`tPn&>jo=gu_9_fNM)Fnih;VfpHRbi={O9)qS;A`2UjbeNExUov z4(!o$#UjJD4*2-~0jfE49yy(QgGgG5e@A@(Up#7JG6E$6r_tYdt3X{u?q{M%?x~aT z{M#%dQBWe%EakZSpvYURtCM~LqWlD!1}@Luc#pERQ=z;lsKA;L_G&IWov9tHLX;Q7b|`YH5*@n})x$yR9m z*aUF!IQaO2(Q1I-39TjMsFP}d|1ffX{<|jdm5uX04L4;iT1ED|gzy8A?2;v8F5hP#G%Z{N_mo%*=t8-bxY}?tLWSh<%-NQ9R z*Ye|I0YTzTVx-J1t(j*aKhoMu>{&n~BmrFcLE=f`p4QB3`4?qvuLD};13fXUHwg5ib~FfJUpK*pfZvGoYS5%xH8RijmP_fdkaGyh!p2~9%k}92POgZC; z=c&qXB+_X!)B$+2qYUkKyOjT(J;3lE;GB_s?p&wi8P116Dj#RnBPq^TA z-@i~EzsBsI|2g4X1H7kJ&xr(rwWye3IT0sS=HVOGm{fmui`3j3`TSoTTR@1E6a z46dfq%uoKv%_DFvw~WZ{loJTpyi;Izu@dI#F{xfqNUMh}JUNZBKOn8-c&5!6UKhLo zzt!|{tIwywl{tZc?J5Dx+!~)3bKF~WORe9!iUxc3H1Ohhi z6eun_nIvf#Ml9c~9J_eT}V$Pvi0j`1C-IMnRlBCG%a002ovPDHLkV1l7{YzhDX literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index 21930fc05b0efaec5bcd605c8392396283e090b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmV;30eAk1P)WStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED0000AcLe%!T z3P~$QYQX?C_zbe-X>21e z;90=8^>b6SZ^t_FvgO~vpdY|Yk0`8}48(Y`2=mFaxKEx!3wco@FQ8of5%T1J>enn? z`_X>g$-pnnCXZtec^(<^1a^|$QnOa1Lh1Xlk^CcL)qdQ|z#IG|2hEjd8u3*;CtJ}Z z{y;##f)^$Ae!M4Bs3j**NxGMTDpZp@gtw3re-qhZR<38quut@UvH>+@r_|imSBl<^ zN91m7Cf&(EK_VH&5ArU0$RjvNrqM@gP1ATvwqPrHC#0U2IZ<#X16qp_^S<(Ii>&J| zsrg|XA|IfatVMk&eY^R1_8YUv^=Kxuc# zd(BwG=tHuv)MG8F=K}3F`V16N#)~;fl1bUAv}Q@k%q8=l^Q;X=$v!i`!{}MuCYvNv zF6{%peZW_80QblZ*h}Wktnf_NagUsQYD^1XAF}j^CG}C66YlK;6Y`!;ppMK*%~Gzr63@B5sr^M86pN&O2xkyWA>WruVp10V5<9LHOg`27So$<;U@{`G0(wa%RoMnk)Q0?W7B-JKBx5kk!Rp9IF{eY T{7q`i00000NkvXXu0mjfd+SMj literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color/layers/ff1daf32-8dc0-408a-9d33-e4d74c14df8e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_block_color/layers/ff1daf32-8dc0-408a-9d33-e4d74c14df8e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png deleted file mode 100644 index bbbc228d2d3bc57bdcbe5b7b9a87f6b6d0c799a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmV-l0igbgP)L4#f2z>8*d==27<@+9^ODGUcikYiVIQPXdC(hnK-2J(}}*#5Z=(fnU_qG zEopHlMP!;kcLZ$dY~qeCCLZYKB#x-#tU1qteB@z0p`M9T>bnB8UfwQ?Y5orvZ6-btqefaEDES=Sym<>7f_0d2zyz&XY41bAhV z=MsJIbMmQDxY&6v7Q xg7mt5mH(YRzyam&@<9P@!wTT%wRHhncmVnlmOl^qIJp1-002ovPDHLkV1mQOpostg diff --git a/sprites/spr_block_color/spr_block_color.yy b/sprites/spr_block_color/spr_block_color.yy index d29a4f65a..89158e376 100644 --- a/sprites/spr_block_color/spr_block_color.yy +++ b/sprites/spr_block_color/spr_block_color.yy @@ -368,397 +368,397 @@ ] }, { - "id": "b190b1e0-8066-4abd-8c48-dd40876d3559", + "id": "76df8a47-d092-4c9b-a6cb-212df7a5a3f1", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "5b95eb9d-5de7-4763-99f2-ae2e3fe8e3d2", + "id": "d9ab5d50-9082-4e11-a0ff-9b2f2bca5f4c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b190b1e0-8066-4abd-8c48-dd40876d3559", + "FrameId": "76df8a47-d092-4c9b-a6cb-212df7a5a3f1", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8789be26-ac87-4ed2-8124-e42c3e92a2b8", + "id": "356f6ddc-5eaa-46a9-9974-2238dd97b3d3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b190b1e0-8066-4abd-8c48-dd40876d3559", + "FrameId": "76df8a47-d092-4c9b-a6cb-212df7a5a3f1", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "d53f5a5e-1012-48ab-a444-ef8b434cc7e4", + "id": "8c46ec0b-056c-42c8-b960-994df24be0f5", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "957b34d5-8d08-44e5-bd8a-4afbaf5bf30d", + "id": "ef3a47eb-8368-474a-a5ec-1f29ec6c900e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d53f5a5e-1012-48ab-a444-ef8b434cc7e4", + "FrameId": "8c46ec0b-056c-42c8-b960-994df24be0f5", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "cc7260cc-a6fc-402c-8f7c-5a5897ee0577", + "id": "f08cfdad-1400-46b3-b7fe-f20b45429929", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d53f5a5e-1012-48ab-a444-ef8b434cc7e4", + "FrameId": "8c46ec0b-056c-42c8-b960-994df24be0f5", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "b8c3d60c-33f4-450b-a94f-1cd51e0785d9", + "id": "d7207c61-5205-4ed0-923e-c1dccab90dc5", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "5240bd9b-c7df-478e-a351-f11cd1eaec76", + "id": "eaaa53a1-cd2a-49fa-8a60-864c57920db9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b8c3d60c-33f4-450b-a94f-1cd51e0785d9", + "FrameId": "d7207c61-5205-4ed0-923e-c1dccab90dc5", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "5b9452bd-48fa-496f-8b61-56b27e713d17", + "id": "cd0bf9a8-c52d-4d0d-9cad-adc7f5fc0cf7", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b8c3d60c-33f4-450b-a94f-1cd51e0785d9", + "FrameId": "d7207c61-5205-4ed0-923e-c1dccab90dc5", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82", + "id": "501156a2-ab03-4b98-af9b-dd96fe7678e9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "c4902b2a-1003-48be-a987-4d4e6605cd22", + "id": "f94c6689-4f44-469d-94ee-2a549b1114f4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82", + "FrameId": "501156a2-ab03-4b98-af9b-dd96fe7678e9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "a48f41e9-6658-4fbe-ab98-c23b27c9ba87", + "id": "8a2f4c48-5803-4858-a079-f2a4a3eb1585", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "61a3a0cd-dc5c-4a8e-aea9-e9296e2f7f82", + "FrameId": "501156a2-ab03-4b98-af9b-dd96fe7678e9", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "4d49f0c2-f9ae-4a23-ae65-746ef0100cb3", + "id": "6dc43c4b-a119-4321-90f2-dee306cd4ca0", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "7452e214-4fb8-46d0-ac34-100b7ab6f21a", + "id": "2d0f2614-9dd2-4148-b315-a52ed78e6425", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "4d49f0c2-f9ae-4a23-ae65-746ef0100cb3", + "FrameId": "6dc43c4b-a119-4321-90f2-dee306cd4ca0", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "1e74bcfb-e524-45bf-b56f-027fc814beba", + "id": "57d30e7d-d701-4777-93d1-75c4b8be82af", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "4d49f0c2-f9ae-4a23-ae65-746ef0100cb3", + "FrameId": "6dc43c4b-a119-4321-90f2-dee306cd4ca0", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646", + "id": "404ea627-7fa8-46b5-9d90-e8b234638792", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "c5be5830-b562-4311-9a22-024246fdbedf", + "id": "3661b7aa-9901-4577-b648-a12dd2b873d5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646", + "FrameId": "404ea627-7fa8-46b5-9d90-e8b234638792", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "65dc11a5-2e4e-46a5-aaa3-428886d0618e", + "id": "c1c304ca-f2ff-4400-a34a-6d1c7a7fb1eb", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "2d85cabb-6b5a-44ce-b1d6-cdf3dfdd7646", + "FrameId": "404ea627-7fa8-46b5-9d90-e8b234638792", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "39b2852e-5bbf-46d2-928f-f7124dc5a782", + "id": "9aa8db6d-234b-475e-b6c3-42c3af3a7c7a", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "a017ddaa-8959-4df6-b029-ccd8145d297f", + "id": "9a6f3845-5202-42c2-8e45-4128045f680b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "39b2852e-5bbf-46d2-928f-f7124dc5a782", + "FrameId": "9aa8db6d-234b-475e-b6c3-42c3af3a7c7a", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "ff1a1bef-53f9-4e97-af63-07d6cd6fa9a3", + "id": "a0748539-9307-4157-ab34-bbb8d0aeb484", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "39b2852e-5bbf-46d2-928f-f7124dc5a782", + "FrameId": "9aa8db6d-234b-475e-b6c3-42c3af3a7c7a", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "6672cac7-d619-4624-9693-64fa62a1fd5a", + "id": "04e145c7-d721-476b-88df-32d820f451e4", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "4707ed88-12cf-4166-a472-dea7d0015a94", + "id": "a0062cf0-0a7f-4f9b-a19e-6029e97aca75", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "6672cac7-d619-4624-9693-64fa62a1fd5a", + "FrameId": "04e145c7-d721-476b-88df-32d820f451e4", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "bf5820bb-d0b5-46ee-bddb-ca4b766c1a8c", + "id": "61a68d24-5fea-4175-b90f-ae5635df8b1a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "6672cac7-d619-4624-9693-64fa62a1fd5a", + "FrameId": "04e145c7-d721-476b-88df-32d820f451e4", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "a6acf370-1f09-42f8-a02a-710c2abe0173", + "id": "53b7e75b-121c-425d-bc1a-c3ea72ccd51f", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "83472bb8-f36c-4300-873a-6c2c33263de7", + "id": "fb6a99be-5bd7-4662-8efc-b2d160001116", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a6acf370-1f09-42f8-a02a-710c2abe0173", + "FrameId": "53b7e75b-121c-425d-bc1a-c3ea72ccd51f", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "9fb1c926-5564-42aa-9e09-cf86b2142263", + "id": "82d087ae-12bf-4037-b31e-6a216383c478", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a6acf370-1f09-42f8-a02a-710c2abe0173", + "FrameId": "53b7e75b-121c-425d-bc1a-c3ea72ccd51f", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "ca062147-d4cf-4e89-81ee-e5ebe1d4b165", + "id": "fa27ef49-70c5-4680-9be0-ba30ea05800f", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "89302324-dfbc-421f-b80e-9c4ba2a3ee8b", + "id": "03612404-db14-470c-9172-ccaf5b713703", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ca062147-d4cf-4e89-81ee-e5ebe1d4b165", + "FrameId": "fa27ef49-70c5-4680-9be0-ba30ea05800f", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0371cabd-2ede-4673-9bb3-f8959773411c", + "id": "d7d57ae8-9c3c-4a0b-b4e8-a1e20f49c6c1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ca062147-d4cf-4e89-81ee-e5ebe1d4b165", + "FrameId": "fa27ef49-70c5-4680-9be0-ba30ea05800f", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "406bd3f2-c153-40bd-9cb3-301370bbece3", + "id": "71cc1cad-3807-4b13-8298-5151069c3dbe", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "ee218cfe-7d64-4926-aa95-bc9d7981b042", + "id": "853bb9f6-4f22-4c31-8b0f-7ad7b57bdfb3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "406bd3f2-c153-40bd-9cb3-301370bbece3", + "FrameId": "71cc1cad-3807-4b13-8298-5151069c3dbe", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "d73590e2-8e6c-46e3-b306-d39258b0322c", + "id": "57b7c57f-9757-4291-bc11-5c61e0179f72", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "406bd3f2-c153-40bd-9cb3-301370bbece3", + "FrameId": "71cc1cad-3807-4b13-8298-5151069c3dbe", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "cce58db7-3b8b-4712-b6d4-1791b1a20e88", + "id": "f0342fcb-d589-4089-8f09-616756c59452", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "be5ad818-7012-410c-9ca5-81b7a2c3dbec", + "id": "89c9e8cb-42e0-400e-ae87-c3a21cc862b4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "cce58db7-3b8b-4712-b6d4-1791b1a20e88", + "FrameId": "f0342fcb-d589-4089-8f09-616756c59452", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "d8d02bc2-e685-4287-9560-b0bec080c753", + "id": "be49868e-8eeb-401a-bb02-f1df7dcd7f95", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "cce58db7-3b8b-4712-b6d4-1791b1a20e88", + "FrameId": "f0342fcb-d589-4089-8f09-616756c59452", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "cc5e53a2-ec1a-457d-acd8-f69a2edcd397", + "id": "c286e44d-7e67-4bf2-aa37-c59535e3cf15", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "ba257c14-257f-4292-b599-ff75a9a29e38", + "id": "66331d3c-0a12-488f-99ed-4769f61c214b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "cc5e53a2-ec1a-457d-acd8-f69a2edcd397", + "FrameId": "c286e44d-7e67-4bf2-aa37-c59535e3cf15", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "24193799-44ec-465d-98d1-f15e1c268d28", + "id": "01d86b5f-648b-48d0-8ca7-3545dfaa4ea3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "cc5e53a2-ec1a-457d-acd8-f69a2edcd397", + "FrameId": "c286e44d-7e67-4bf2-aa37-c59535e3cf15", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "eca1b1bd-673a-46c5-902c-8bd4c795cf31", + "id": "1d31e489-0ae3-4422-8d41-44225335f9fb", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "cc24cb4a-fb85-43ed-bdba-2fb4774dd8c3", + "id": "ae38a012-354a-4f5b-9746-935227de7ffd", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "eca1b1bd-673a-46c5-902c-8bd4c795cf31", + "FrameId": "1d31e489-0ae3-4422-8d41-44225335f9fb", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "04deb737-a08c-445a-90ce-74259a5ab503", + "id": "1be18d8d-d49d-4416-a548-dc4cd6c9dfb3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "eca1b1bd-673a-46c5-902c-8bd4c795cf31", + "FrameId": "1d31e489-0ae3-4422-8d41-44225335f9fb", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "ff1daf32-8dc0-408a-9d33-e4d74c14df8e", + "id": "6fdb44d8-1398-4d7d-882b-160c2d526de6", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "79aedbc1-6f38-4b8a-a1ff-83f367c81ec6", + "id": "4b466832-5567-45ee-81be-195eb9508c0e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ff1daf32-8dc0-408a-9d33-e4d74c14df8e", + "FrameId": "6fdb44d8-1398-4d7d-882b-160c2d526de6", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "249a75fc-8857-4966-9dc3-ac947d343048", + "id": "c6a5d856-a37e-451b-88ad-9147edb29073", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ff1daf32-8dc0-408a-9d33-e4d74c14df8e", + "FrameId": "6fdb44d8-1398-4d7d-882b-160c2d526de6", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "a4b7e245-a218-42c9-880d-00be2fff2c9c", + "id": "ac576e98-ff6f-45d1-b561-eaa23be13968", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "e2a4f552-b1d9-4f60-966d-4577a204a82f", + "id": "7c7b67c5-6142-4067-a193-5a33cd3e558d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a4b7e245-a218-42c9-880d-00be2fff2c9c", + "FrameId": "ac576e98-ff6f-45d1-b561-eaa23be13968", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "7e57a3f0-7412-49a7-8e7f-76b828178f54", + "id": "af7575d7-d4b3-49ae-b0aa-ce176fb41dfe", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a4b7e245-a218-42c9-880d-00be2fff2c9c", + "FrameId": "ac576e98-ff6f-45d1-b561-eaa23be13968", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c", + "id": "2a920cf2-7095-4c6b-95d6-349e2579e858", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "9ecd6921-5cfa-47ee-b57f-f9c7be8560de", + "id": "26a1ba73-0421-4ec0-83d2-9a0cb3d1846a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c", + "FrameId": "2a920cf2-7095-4c6b-95d6-349e2579e858", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e08401f5-7dde-4125-8a86-7e2b15f26f01", + "id": "93d91ff9-db0a-4f7e-8710-7cb802230126", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f920369a-c3d1-40a9-8de2-cfc1bd0e9c4c", + "FrameId": "2a920cf2-7095-4c6b-95d6-349e2579e858", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] }, { - "id": "28c2b399-0172-42ba-b68d-a6fd7b0c7e23", + "id": "18c76dbc-4e67-4504-a32e-e5dc3a3a77f6", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", "compositeImage": { - "id": "8a2e6af9-00c5-49a5-a683-2b2a4c0a4e03", + "id": "b42c7cf0-13ec-4294-9599-26a7b8687da3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "28c2b399-0172-42ba-b68d-a6fd7b0c7e23", + "FrameId": "18c76dbc-4e67-4504-a32e-e5dc3a3a77f6", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e39cda45-7c36-41e9-b79d-2a10e2e931c8", + "id": "df1faae8-bd19-449f-8054-c8f15bc8abf6", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "28c2b399-0172-42ba-b68d-a6fd7b0c7e23", + "FrameId": "18c76dbc-4e67-4504-a32e-e5dc3a3a77f6", "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" } ] diff --git a/sprites/spr_block_color_shape/10c1cc73-5ebe-4b23-967a-d5cdfbcde838.png b/sprites/spr_block_color_shape/10c1cc73-5ebe-4b23-967a-d5cdfbcde838.png new file mode 100644 index 0000000000000000000000000000000000000000..68fee813d0e1089c8a2d6fe894907f7cdc3b1373 GIT binary patch literal 680 zcmV;Z0$2TsP) z0^Jh&^nF?1V0b9bD+N?4{wl!9(g}l36b3QA=^zp!$HB4dpmh

I01v;3w+lDKN;t zn{@@SW|;!Y9m^Kr*mNR7Cw{%a_zY(t)^z3`XmRGBl|3;(3`X{W!hz}%1(YjF7T`?5 ziLePL!gDXZ@vN3Wg5D0MZ-DzRfa4EjeT=8U!X7I6eh;XT&CrP`otPcMcs+M_kckX_-i16$%C?*(h;6zJRKJ7ezrO*CFT0e9>HpZ0>M&n~SGv7a~s z`rd(1lf34xz6Fi9xXDztab~FzP^`Jo5VGVoce~G_G5P`AwHr(h zfSsMx3;)&!vS8~r@XfQO3n+Ii77%JyX1>)#<2h&2bqMTdU%c;Es-L8u!d=rpr$B3w zcl-3=4mm@7IZaN2R!kljF+qJNb@hu={JxH|e{Mv|Otj=+d7kVS2mSyNAj9JR2owAO O0000ayRN%r z132&dUbrXj9G!fSv4(<1NqxxPlS@Wwtf9jdRWO zJQw!wEx>EYbKq>vc@Ci0Gy$%l%>l+d&%&lxaV!4bIRK?_c=WHBd&=KA0K{=D%-wtx z-2J$1{>=f@1~tD5+*9xA0RXi+3glzwMgdPl2{`N2gsr^JPv8$bY{PfVxk?cL0000< KMNUMnLSTZ$y`m8S diff --git a/sprites/spr_block_color_shape/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png b/sprites/spr_block_color_shape/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3.png deleted file mode 100644 index 1053d08a3dd9a2b0836cd14d4b3eef50f105cedf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmV;40e1e0P)Kg)Ltp7C~bXuZ?sC8r=Dz{p?m<*oP8^}d(*IeIYnb05!DCCX7i zBY(ue*>}vH9pT>lR=>4>ij}il{Cf9LiTn!0A|F?g5Mxmy)z5o)Z+-=I!OAHk`KWT* z)Xy4dOyJU}3Gm$xap!H&$gG@Oex5hO_i+NbP!nLsqHUUUMi%pHUkC`~LQn(R@ltah z^AB))m_RPn1juaKQqHYD@QJmvd>!Q|FvrH(bN2zAE6P#8ns8Ecem#AFOs$$=WU2mg z`v9@nO>cWxIg91g^7kr*^|j?!fYT{wG)}LCMlzCjp6Z|A!P#=AV*XGibb?{^vPKj! nzeXMq$c2D_D$y2-{dfEi-F2(ZercLs00000NkvXXu0mjfj3T&r diff --git a/sprites/spr_block_color_shape/1a273649-ca60-449d-a85d-3f7e593de0a9.png b/sprites/spr_block_color_shape/1a273649-ca60-449d-a85d-3f7e593de0a9.png new file mode 100644 index 0000000000000000000000000000000000000000..2065015eee1df54f8f6939d4c7834ba46398386e GIT binary patch literal 668 zcmV;N0%QG&P)fLa6H)@7o~_%(;H$H1@r%zN!|a9KVi|5TZb%$@!jdEAWx z{=N2aLa#n`MG)iO(Gj$&DGSgEt)cy?Gv+Ax?dEIn-IG$FapUhmP@~Y+!9MdK_)(U? zw6O=QIk&+i`$8`us%WDF^xoDb?cqb_A#h2~gKAAEU+4uy6>WE*-=LkW?9kqxvq!*+ zTmZk!H=-#Zst8;_hoIG6FTMf0_?cJbb1-N2f%k4LL{mUi(e@fRZtez4auw`1c7Tta zXY5NxQ$SRq4;~o^cq*n2yp)UJu#o~Q#Sh@-K9B%|jvIdm)E+-^iM}YiYhZPb?&y?7 zcUms~01p`S3tz~;=X?+Niq9287L9j5U-#q-tWUDOevu0Z`;OWTT?l%%Z{6?Ur@1DW zV8d+wGkDsfv(YqbRrw6-G0xxd<%_JxE$ZA0mpUQDE{`v^*fGEnm7IqsP}vJM*1(-u;V}ZU+^2vyTz|C8ZEB?0000QmJAnYP!X7mRHbrlHRbt!3G1$EJl5JV%R zA5?-wH<4C`+EnJ2HD``RHOkUj&N?S}z6pCz(%g17=5zDmeZTL{p6~PSeGgM{1(v(o zDyEKAg*G5n-VI1QF1UeolHGtyYhgMTIT~6%nZOfDFL+LKK0gLBRn7)nx;n`o)3A4` z2lOTS!5LKqG*oD4nL?DuK(5NzfU~Afvd5%@2@lv&c>wHMxC9>Gb{G^AOW^O#i}bl) zSsIXAX$?3Gyrg3RG$*P-W2p{o*SCN-;`c$JGzkugFTs{78_kz}qvw1P)@C5z`o}=C z(X{G0=9AmOvwRzPGd2XeHF~fs+AFF5Wa`(W55bNtd+E8#VmSqkrdpR7L0f_IMCq zIUAVrN0~&d%{!3D+YjX!_gwn{cAi#)qk%XmD$3Y5RG!i4-Ru7(O3vkNF$_3BiN;|u<_^GSXfvoq)8#z1k}!tNG=c(O~fb@-^t86 z>>cF1&1;6`EqC+Y%zk;*=E*dd0v;~Um*ULx()f82L)*)dV!<;g514 z6i#S-rEy3RPJDh$uD;zcoN%WH0IkMQ7VOm$@x|H!#a`!@qU;HG9Kbpsb|2XUsZ6W6 z#^ZaM6Ye;GRgm|&5?jqT$~&=m>?6_%cN{_f&29W!`1*GOSs_XQnHA<#bMW}y zFgIHbo4ZwtqwX_LAS)QBVOskDczLgI$ARA)&a8&0S<;$oJd|Vo8wq3ubsvbjSLq2T zv-OPpF5up22&@K0iiQ)SCv3b{b9Zk<*a_dm9-APQ%38{^Bd&5IfvlkRfCL=Uc=<8{ j7UyMz(`jBBAcL4mMOKC0!7x!7UO~-CK_U*A)26x7eFt@7?*>I7cLSnYV_hk6CuHf z9!w}iae)vG8VQ>%7HomqmaRaLz0eX{2`2L1`{KtBd#p50vRlv|aO-Fs z=fTje&p@_}R(`>83mwuBDfq}y36=$21M3|%f;R6Biw^|8!SM_{7H}GTzx)cc zMjFA+(H@c103V54UWrV|XX7ExM_mHz7M_DEek;^ws9h3u5!5c!3cS`+EAUP84FZ4D z_bzxxenTWRpi!hEk}IJV)Dwn;Fi-8Yr)OnlV9V4y@L)s%ST*_(ERmH8{DFvknmWs!2Q#nK4Quv4JH(kGG{FqkQl8uke?5#qBQ;%Lrs@RP9_bgl0B$H@<1mL?bM zGIa?3L=%{~HyiBs@^Rq_pqmxTyFi_!MkF$MEIMMi81Rk09?Z)-41Vu%fKo*S_*$>s zz=sRwr>AFt%R@_`X`J2#rU8>kYQSWqNccUO_nU*@pY!%XdXAIw6G3B#QRvNISG}5i zyGh{tfBgWtG!ERE8pf=>-_~b9m70J^(#mLs3zLiBvWfOIR2>AiwtN9K#dM-MTj^{M zO$y$?FA2Q9wFi_;)0)kF10tybvwS+psWfNDrar>U z^XEYDK3cPqjTcD`C^RZW5?0QlW76tTSrI+gPCZQs%6vka+Afg)!QpF9BSeO~P0|#kO(TnsB9Xofa#0?N55(6j@NQ#_(mi)@Y4%o@U zw>&xTfq(B$?5K}kzYq;dHM#jkfbV>-?K-y$)0a=yn);~_k2tI+vU?q%ZmIchtrKy06n9baXsh!^u6~6s7wC< z=q$K;zRXWo{fUs)|2hHcmJGt6DtAH{9l$g%KrYI}m z>N)(}d(Q&ArkmQcw*Xu+6(UDEoe9iLaDZ5H0&wR7cMj0|{%(NSstkZ0 zeQ_?MDNucOr``MT>zoX_bL$w7-?4svF39d(In#w828p)U zOfko6?!W(eS%mSzr1#a|16eQF++pB307d_PF`nBMI{(1YtW7{aF?hQAxvXwjP4r;Ac=zDd#G41NdewdaXj?wEuZ~cnxWngbk!a!jEC*y`7miZ!?mhQ9Q2mHLbqe z5?z@VwfISmY^sOs8NfiFpJh(SC+~x@aFp{?(=|D7bL$oo!CfoSz7-hgALcU8tR4ru zrCu<-^?>Pjnf?egr^msn;|{ma!tzYrO0-`Eyob-S%&YiTQkOv4_=|L50(6_{tk<_D znEfwU6rO=Sn-9T!*FA3E@9|l#675p~-;tpmnfHUo4qgEhj(w_k(lUpeDP_>?LsyRG-@h z6<|FOHoT*M?1T@(bNXTB7x?~vwq+*!5*+Qh49;eX;Bvg%xe6$r;7 znkJV)j|ca5Rf#}X&wM^l_k6_Z1t$w}@JlqhPbMN&)UF+K(LC^etpNJ09bh0u_g=IZ z^a(&O(Ov;|TRv}m1O1LJFuX}~g4z?J;eb8?=p~v1Ft8rD;E=)B$tCcrvl|R$$Zw7L zH9Y{mq~Ti-NYR`ivt|#hlYZUR2?o>qw*oXcopRLAFj~$rKbt-Q=q1_%U_CHZuxj#a cegHbjKigK_7d!}Z8~^|S07*qoM6N<$f>nq{SpWb4 literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/345984f9-d74c-48cf-bef8-b505952a75c9.png b/sprites/spr_block_color_shape/345984f9-d74c-48cf-bef8-b505952a75c9.png new file mode 100644 index 0000000000000000000000000000000000000000..821aea82585d73e455bf97540839a529b785eaa4 GIT binary patch literal 646 zcmV;10(t$3P)P6Cp7FY@_YX?{MBGJ@1d_oYt{)KHQdmyWSNvSsLKw805oxE}-2t z5fMgW12SQ~ftKj=Vf7jKTzLX6`eNt%e~kJp5K45XbpsMlVD2V!Z{KOTS?=Q?=ZPZJ+^ zj>m)z42Xg2j0(;P#!FHD9)AQDjWk#vVJ7BHJaGY(8SpIGFVPA6Rn{H zI5$lb$?U(Gu-?E=v0g_Y3>rnA1K*vT-z>26nGknF=1a7r?osZ8jXh>!Hb4{G#^0H+ z-hjCaS`#YhaR)Tj#Hr>Mcwr_26RAw>P!l#VAO@wT z4px#p2hQH$ZYX9u-wk@2ou9tA+_NrE+yjSmFF{q9(EFIMfq|~?0ofM<3!5}C7NLo@ zNWHAG^FoaE(LVKRm6;gbXC?wFO&EHo3Hun>&+{Z~R`|A)hKaJqPCa+nY5C1+&$_!` zUAY2!ztO~0kS20zny}u0`BiMDSn`K@-dHoVL+kZF)GK1%n^@y*!6lfm-hi0_WovC9 g4{UXv29_K61tZznB@z`~ivR!s07*qoM6N<$f&jBD^#A|> literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/35d40844-421f-4918-8295-9de8e21b8620.png b/sprites/spr_block_color_shape/35d40844-421f-4918-8295-9de8e21b8620.png new file mode 100644 index 0000000000000000000000000000000000000000..e355bbd8068017a5fb8eb039fdc33751ce628124 GIT binary patch literal 567 zcmV-70?7S|P)V5d{&7wu1Lg!@(?Q70>yec=xigigw)gz4`2YpPlzS-yb_Wes~-SEB-@Y`@J?` zhGz!M%sn?yE~;)IE}6UOPpL`rfi>%mfl5&|13i*?LDshFBm;;*-*3DMTsL~2QYmr^ zX)=d1(DlZtz%`@iVHG6Tk#ThNlgCnl#+iYulKFR8-&ND(ODvK$`pD;)CvRXJ`uFR% z0x_fK9V$dFV~HHb82L&n@eMxmEq0(^SAP|_Vq~6FGh_w}WKgDk9?mTE;ue{g3fQ7IOq8O&Oo)Iq5)en zcY8jf9+B_ylx)KQ`2r8gIPQ^o(OX5|#1rx|lF-kq-3mmF%$rn{+>ss!FhuTQgLHrA zu7076{u!^KpIdtsh#1ozQuoP2$)s6&`T>tg3%AJ=`IkE<`mX4mqJO~w>HGC$aL!*T zZNTgJZ6IXy9IA`>DAU`H30cp{7o47EML#ckwv676JLD0zq2K59D{xUVci+*@s!{pm z?l_qo%k(xORzTI(JiS|q_zC-`kK%aCK$!pl002ovPDHLk FV1it<5w8FM literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/378def89-d34d-4405-a5f5-2d16dcb9c410.png b/sprites/spr_block_color_shape/378def89-d34d-4405-a5f5-2d16dcb9c410.png deleted file mode 100644 index 075e8189ba0f0418830ac4c7a001c64328a1f60d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)SeUIV*TmY8u?c^aedYt1-6Hxu)+!Q*1)&Ro+xbi)r zI42~JD=iGZ5P$(#eUBdJFg~s{fi6#|Tp0Ke0LG0JFkYUa$33n%C6p#`$-@A8T3`WL zP7R-s3oxPpJ>SE8f*$9@%EMYtxY`SYA`PI#y$~mahWQKzU_QYmk4yc#@2GrOZh+Z4 l@F9RMKyLe}2 zu%50GmsMcfHlzQpf*CIG(szCRSlT_6Owf)W5_ z=+R!!P2;@h<2VxgcNgF`TQ3+eX{ZSMV^V8-}1<;!$Nlx8B=P4n;6|^1zbT1@RU_G9>R>0j*0&FwY eVQ*dM6?g-kkD)d=a)2ZN000032s85wJLS-SPp|9WkOitg%$RiNPJ&eU9Ko*Om`@u7 z+MaGxpKq5~&ajv94&#O$m0!PVcQJXLW-R%+a5CEk#xqZ+oDwd9NQPJ@@JVPeFlc2o V>(qKhd;t2B!PC{xWt~$(6991?YzzPZ diff --git a/sprites/spr_block_color_shape/3c40c312-4fe7-48ce-af63-68ea74b251df.png b/sprites/spr_block_color_shape/3c40c312-4fe7-48ce-af63-68ea74b251df.png deleted file mode 100644 index 4f2123d32db5d80cd5a525dfc89624453c97308f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P)u@1T^JOcWHcb znd0tV2w$K1_YF??9pK6(I0+-_1f+6GFg~O)l;bn7KZNi;=FeB0uscA>t>7dY&4c(OC!jeYA(f%VrS*bxoq&cOCo0P81S~xo2I+^D=xK!e8#gK`@I%?Y~IIHVIs z6t2Nx9UaO|~3{r~^~ M07*qoM6N<$g4)i}ga7~l diff --git a/sprites/spr_block_color_shape/46825d5d-002e-43e8-a62b-198caac29b0e.png b/sprites/spr_block_color_shape/46825d5d-002e-43e8-a62b-198caac29b0e.png deleted file mode 100644 index 505777ad77bf68bcbc54270a18f646b7b62470f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdAr*7pPTk1cV!-2C9K^O@ zaigF_qvMPTnk!bUlwg!vapS?d4!cRR0cYlx_&vNIac%pg=SLXtm%e)|^3>E^ogq{- zDY7j>WXlJOjB~YmR~GaA+}65d9gl;zI>Y-K8Rwka0?%hYyR(0F{;bzF`-MG9`94mr zc=h?_$>%HzFXwvIK1ph*f6a2hI#w*I!2E2G{OhZwOb*@`wH>D1v$XR5S+kb|$m8+2 z|8u)>W4$Abf$tTGw(Li>|IZ#*w_v(3>3#M0Al3_a?lABi03!wN2L9{5DH}tX)^`HE O$KdJe=d#Wzp$PzCiEr%y diff --git a/sprites/spr_block_color_shape/4c2de224-b6d3-4354-aef6-ac7e60089e89.png b/sprites/spr_block_color_shape/4c2de224-b6d3-4354-aef6-ac7e60089e89.png deleted file mode 100644 index f93832a28dac7a969a303844e6a93227b1a762a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muG{P)42ygj;@n@45Ew{r9;qv#q`VtLcZOT1YX| zE-vQX+}XAVz!(>R$?o=ZE7W=EpC)2}1Wa4_P`h%CR@hshC2|!y+w0)(>)w7XN zc(U8eC9;&A;}S7W0%o-U^N%Fx4^y}2#m7+ZiC3|4*c zHg6Y~h;b6ADRdU}pZ7p{l&*jS;WIQA*P+Wt-JcoL>O)k|e6Js)?X`MO&+UWR&4%*JvsH@&49(KB^T_@vo&;}Z?qDpFrBODp^2%}8I;lDfa% aj=up{1>mAKd_|@J0000XE_)CC+@MYU;HkI+eRNW{Vr^0;9Lw^-V?*Xcom`6v62rqzm z8HchRia@qM=Sb<(I5)rV`AQ$cy7lh>9auzJCL zw;+MVsTcA!%`)kG*`}Gs;elx}_soo+BW>_VfjEb0!hA;kGNq9w<5HAkE~_bkBl zw68pS1wbdRrqmPgjCBB4(gJYz0(TG4@BR(oT7>~nWBfb*CTH1l@4a;Z+cE~AUZDSc zrsuvifGd>-K+SdUy)yt?DhxoqK*yZ}*wzQ&0%G6XhVE3;8UO$Q07*qoM6N<$f+(-L AIRF3v diff --git a/sprites/spr_block_color_shape/5ce4a932-e9fe-4f82-b19c-dc70efb8f81b.png b/sprites/spr_block_color_shape/5ce4a932-e9fe-4f82-b19c-dc70efb8f81b.png new file mode 100644 index 0000000000000000000000000000000000000000..6406bf62605d42b05db4846047a1e7457087ecb6 GIT binary patch literal 873 zcmV-v1D5=WP)Zh6~_o0+b-n|pD;;D5d;M%PPd&7Oz(&6#ug&YbTuqZF2qoNbA0 zDWAne-#4mQ%&uHX^3{-e1>~eBN#6M0sR?jsoIh3&Q{%!GO)UCXF=;-%$u8+g=yV`E zU4=^Tl>CIQ(YnEaHwvuRk$&l5GeHQplOmiQrbGrT_bR1URu@6PkN()^x}*y+~3Ci*W-HS9j&R$dy>FecO;paix(iX zC>ig7N=X$KsT09h_Rm2Biqsk4Bl9qr6}u6<`F;=-^UalqJwL$XTT>-|q0@oEF=Eq@ z30&|^dcT3%sTnZfrMYB2zDC$=(71q)&H) zbfTF8w11nvegO*;_mkUbJ81QgpDKb*x+AgFxfXi|CE{!1x`p&}@p+)uH3o{~%HIKT zHQtCj4O%=@VViG+ljg2%WLO%>H;KvT=Jt`GcJZWbwswORaYw;ht|wH$D!jysPm$@py7oO&ziSi>0!Pc1;&>Ty1F2)<@xWacxo!&Gx$B z{$`<;ZX$!n|8)WXOO{=L(f)B+Z}iU!_*e1^Y7$T8v-`bV00000NkvXXu0mjfCFH4c literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/5d61bba5-940d-4d6b-ab20-f95f70f9df0f.png b/sprites/spr_block_color_shape/5d61bba5-940d-4d6b-ab20-f95f70f9df0f.png new file mode 100644 index 0000000000000000000000000000000000000000..35931a26efbe6c6ba88a797e7bf8ca0abed375be GIT binary patch literal 776 zcmV+j1NZ!iP)W663*!clk~ASKamAS5@6LX-Y|D(q>_# zSvfdQ00yXg_Y;|?6w30IV$aYUv2E7P5qi!06$$Nvi|5S=SQ}|J1_xOAI&eiEG0}2? zC^a;q-EmWF8+rq8x0w3h!t-jp#DeC_7?A<$XdgoY7Kh=0ROleaTbhY-<8flb??X=( zB_z9jTtCY7R+HW;=&qCJxDKe#`EM~I289->sei|g09 ze%Pe%B<9th#Rz)kBLhO^sRS&J-wq_`2YWwGOgtTd!XkvE-%pflc0=#*bA49Sy?cnx z6MUcRl@AB!tUQ%~#bG!g71=pG#8}58bnuoDBUf$^Gfr0vy1coN=%~kfq2{Rh~+~;xN`gG=N=T zuf;cE_Ub*fn|45N*KorYC)d021b+X&Ctz_H4%jQQiLqWdq0f1&vzM58u$UORJ0|GU zRZEDD`(dK8X+13}H8{G+c7ePqMr2YJ$oQOZMO(Y{n3#QLBlJ5zxen*1CO;ALCo+jj zX$hPNj4hHkVe*|y{L%J-m{q%s7=7{WGD=*OkPsm%5rHTchAyRj;w%J-q5%n9gi&PD zl!#WQJSuT!)cFyanpDb#mW8+q`X#?}h4Xs;3{mf$%{S+sd(Qp7bKkr7O@={XmP67{ z<=AhV4=wIc8{f#bTPGu(qW{9y30M`3>u)WtVOO2R;&WScBHcRLcfjT)#>BfZ0LJ&* z;9tB6KhOvTV*YHHcS2bwD-U@qDfroT_{%9?NBa&48BLvFc-IfVrWq*r0QXoC|2PK) zcCY$V?kdH+qh~1p0nqpzc$wC@-hw(h=m6=s(F{f{?O=GP1LHN9fTKa+xdy~LTP0Sg zQ9PSODX?S}5%fVBUrEz^6k%M**;BgLr71?|E`U zuXlkk!SG-SI^p+2fjJwU7<7)27pk){G-mOZk zZemKWZ-LXrm6zs1fjbv|*F#_vop`}8&~4s4e%48Mhb*ymVo|-Egf1snZrcgQzJ2gR zNuZJTy#FOoUV4`y%qkz$niMh9;WOn*gSM@LO#n&fjOZgYFJR9g$y~ z54;-F+ZT~g;vofZN$Ke4XR6Ie9UnIiQxv=ki>>haDW}3$_ z%Q-V|_wAW#^xl6H5nwjxCr#F+qWJMJ@CD?`6{=bHg=*Syl!eFbR(a+;Fdq%6B3WG$ z_9VcaFFr<8U)vq3o9RS(<~*LOoi0_=B`4IUe7F2m7I0@$&m|u3lajC}0i1%gqdL*`JYTLE@t7k#340R29^ex% zY|nN4-do)l5Epy_P*!|U&%xt;yTtW06zUDC-^(vmKwJpihEdG{B*VWe>`CD73+Jj7 zJqz1&-5mHipY98Y3*sE`cdxJ~;LMcg&h5Jmfs9+C8c2fe2~%EjE(&-y0+aCIt(67b z>4u$iiPt#~2#5>f9^gPiI^NW|DB#)f1>kmi6#mV>;|tdbA>~$Rm}dY0002ovPDHLk FV1hiGxX%Cp literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/61aabb78-a106-42cf-b5bd-028471e4074e.png b/sprites/spr_block_color_shape/61aabb78-a106-42cf-b5bd-028471e4074e.png new file mode 100644 index 0000000000000000000000000000000000000000..0b8fe4566fd55e47a1670cb95497cd6b231ea1a4 GIT binary patch literal 363 zcmV-x0hIoUP)-A0iz{%qBaqH!wB$2|0JRXGf>w8Xi5Nkn)7#Mi2j?Lnlnz1OAE zr*Uq67AHy{!n)yifDT;BE|X(|Oe!Ug{x?&*c)^^t-`N4`1-+(SCRyBlVjG7C@}^PN z(Evh;1whScW?ap=I6e2)082>&pk6T5e7BAV<9XX(dlq1683AxFq#u4;Pr&uF0ep)E z(BFu)95>Y*aqiq(11u$L0IsIg6Yz|40ADf!aQ6at576&s1Nhcx0Mr=&j*q66E%)9# z2XHNG0O|$$&u4q?CjWB}CM^xk^|aHY`z)C+XnJAiBb0p5;c%C3Ng+R6X`002ov JPDHLkV1j}soI3yj literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/6accb369-5d73-48aa-9eb1-8918ccc62944.png b/sprites/spr_block_color_shape/6accb369-5d73-48aa-9eb1-8918ccc62944.png new file mode 100644 index 0000000000000000000000000000000000000000..62d9b8a36644db6a956d1e1eaced156c62ffa4d8 GIT binary patch literal 387 zcmV-}0et?6P)Nkl(f2cFW_0n`R0I{@bM!^fV3 zX11?{E2c}^@hwIUDSd32Gft9e1Y;&bIaff0hrHWE`BwzqnKF1}G z%jXyl7$|_@074-F^BD}FhXk=c$LRoi1Dp=P6%w#I10B44^$koD>vMt*pcf$M0Q8V} h^7JcF1`nCuF#zJx$P647(~$rG002ovPDHLkV1j$Ingaj; literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/728ef579-ae8b-4a23-b96f-a15dbeaf267f.png b/sprites/spr_block_color_shape/728ef579-ae8b-4a23-b96f-a15dbeaf267f.png deleted file mode 100644 index 66f536cc28906ec0f9f8e8b0eb3ba641f8b22e29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmV-N0l5B&P)ORS9EcLOAVy0M4=l+=TDOoeu|amK}iqD@F%! Z))NHwEoRh8yAS{X002ovPDHLkV1kk(hmHUM diff --git a/sprites/spr_block_color_shape/76ac0050-804b-4afc-80c1-928082ab51fc.png b/sprites/spr_block_color_shape/76ac0050-804b-4afc-80c1-928082ab51fc.png new file mode 100644 index 0000000000000000000000000000000000000000..1aac056ba70126eb81074bc4958a7eff4ca5cb1f GIT binary patch literal 665 zcmV;K0%rY*P)v$~RC$A?#N^zOQ zkO|D(9vC;#XfcU3kg)kc*H7Rb{?F?;4f*sVj`_elnEGSaC9mD*@xvv4!sy=u{+C@S zKs1^lky!_c<2%%zi(uti3~{lB3R+N8$Sk#N8iKzGCxf@IsRbn3hc}Kr~Gzu?Z6HBDLohu*PE3) zk=NrH40KRY-$s+Y7G2;Q#)2Z%LZxoLAhZ}EBpZpyAL zK(uy2BJ~_3!Vb0PoQLGK5N_2{57($3+v1V4eiuw?V*eXRB(oq9;rehSzfV+7Q6ZJ( zdD#QwCfYS7@d6}bI0e}r2)qexkT;a-bOcOlQxhQCUqIsNOT1&o`7Y>xM~CRVor3dB zbUrhQS46^y^C_6SI&hJR&L@yq-IhKw11InYUar(f2cFW_0n`R0I{@bM!^fV3 zX11?{E2c}^@hwke0Ir;t|A7DfQp)>*W84RF@1hGEH=>U2IoDRSh60jm09lU(? w4NMd3bAk?_7a-^W^pJS+^ea&Y51HOE0Apj$0FW7>f&c&j07*qoM6N<$g3dFcW&i*H diff --git a/sprites/spr_block_color_shape/79be5d40-37bf-4f37-8c28-9bcafa325765.png b/sprites/spr_block_color_shape/79be5d40-37bf-4f37-8c28-9bcafa325765.png new file mode 100644 index 0000000000000000000000000000000000000000..cd4910071717408b99f65ddc8640e13982163835 GIT binary patch literal 633 zcmV-<0*3vGP)^wK0z3+GLd7kq<&pCVN6kbok@lVL4 zQRO(mu;+6gWU`%v(^0VA5FS)0js0~(jcd=Rj{|b(qDe6v2hY-pRC!LQaY}hEFwYAX zP~j-`fa{nESyydRWPXFKp2AiS?l{!U>#Lc^Wx21B1Akb{z%>){UI^ENSHRF)@M;@4 z@&vrA^f%PosZW8|&x0SoGS3lEKL@`50+Wki?hqJ!2ljUH`Zbv6<_OMgufJacy{AF_ z9LV#NI1c*BX9-?&W+RWmJ2$NQnI`I!+v~wsU~dPQR|Ql!Nsg!Dcu037Z}RTUx*ee7*<2 zF^pySogj1U zblb~v=l&e&;9HHHdAh%G`Y*JcK&hc?bz3Bvm%5Od;REc#ZS+73WwtPa8tbX%`4RAD&eMF( zm#5blng-Sxt`5~Qy7!G?vrl9g8A9f^vs)y5LkDt5{ej;` zd~y`F`5bP_PuI~K$}3Pqwb#eKGmMS{JISBR{$8!?4%;9Pr7p;qDhIfl(nEyLF`c}Fk4nyDfbaCmVM1|F+L0j+?@ z?7M-9*#bimf(VJRRfgUk++@%FIhi~%%*>*v9Ij1R5XWiL3OHTLE5LievK?68R>Lq- z#Gj9?4KY3)MmPJ8qoy;DkcpM}C&c&t#-k^u{ZPVl81vP43JUL0`)2_Z_fQuie=~mCk31m0hxnIt&RtgU ze&Tz*WT(OJZ^AwBqO2ALcrB6%WSC0Ow}IYI27rAYL_Ri!c?NPY87NA5vJJF;VhVWd z0QhiRZ9Sl&NW^v2sGWL%{~B|Cp8k+HUpYAMH1l+NxQoYM?plXGTv zvoUJ9B3ZqD*3)&{<+#XMK*`Vx;LayYvwql^_bHS3g9Ie!$1U-ALEPyQKOg3EmLvjB zfIEl7Y)=g5xCVML@hvmY5t0Zn0jcM38qbLN3`lj$OazpGt>+W+H$De0$y> z>FW0jF`J115&(vCV#x{MI}=FcdSU_^!dC#MG){2~!Tzf9n&pY#%!`Xy@lmrKNh8|0G!Ff?YLnsQ+&P0|H^Y>io zTozC>WC2nV_^JUs38izpfSO~nHM6Ury=XwDZLoa|Q!QX#=U+DrW!W(ZixQNY_ R9(w=)002ovPDHLkV1oH_n*jg- literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/a48d6d91-2e8d-4aff-a833-98d374d5e829.png b/sprites/spr_block_color_shape/7fb25a3b-804b-46b6-8f88-3aeed7be26e8.png similarity index 100% rename from sprites/spr_block_color_shape/a48d6d91-2e8d-4aff-a833-98d374d5e829.png rename to sprites/spr_block_color_shape/7fb25a3b-804b-46b6-8f88-3aeed7be26e8.png diff --git a/sprites/spr_block_color_shape/8184b047-3992-4f30-9b53-ec835acf0e46.png b/sprites/spr_block_color_shape/8184b047-3992-4f30-9b53-ec835acf0e46.png deleted file mode 100644 index eba0e6990f4259f178e00b6d8475d952f3e5cfdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJDx6%Ar*7pPTk1cV!-2CEW~Qc z%PXyLF(7yov+^c(X@!l9yu8|XM6bDTYG%FT`CQ~*Z)&acyvG8Y3VGfqtTa0bKk@A z4*%BbpZBw}X2>*lRsa0w%<(h%%zvWU8TJLw@$)EKb~fhoN4q=5S`AYdt!Mc7?##uT zQ}y3BavbowC^^CW-sPF`KYxh3Fyx-@-Dj_U?(_Yc$`fzh4R{`=awY8C!EDh0Mh-#@ Z@{!yj`WLtLOa=Or!PC{xWt~$(6956FbN>JU diff --git a/sprites/spr_block_color_shape/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png b/sprites/spr_block_color_shape/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4.png deleted file mode 100644 index b1dcfbce8f5d08b2ec829768956058c186be25a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU7jwEAr*6y6D1N37`^s6BBO`F@##Ez9$HFz2niW{0 klqJBWStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED00005QQTMT4^yPf*`%hRec0~fAkUTRj!I47@N|Nwji{a0%*wqNX|F=l-z*%wQ;_8x|0D&swtezC;mlo)ZF{b z>H)MZ17O}$M#`N@HJ9S}z3J2A{{ULD-hyC2ow#ZaXRbK!0~UamtUbUx-la8n?uqIw zumH4V06>Ns-CA?056t~C9_J|q(2{i;Hr)sKcSUzHuue+SMObw#Mt-k8@a}c(G<-`w zdZ!C~9rH{`djiht#<_DmS3d)|aAkt;39GjYaml#_pd|~yl?gb5q_1C>a}l6zi2zb2 yqS5f|dYmP7ojU>Ak`sVu0{`ji-gh%V)A|EoDje(-9BVKD0000a_y|bl(`$@}XK~))M1KdUIIW3<6E*^x z@`F=cKi**c`fQ&ziob7g!tVfAF2P9{ktZOPLxH_xT$6J8O!#oB=Iwn2E9jxt^C`n2DG`uIHpo_PmrY%tYD&PtQxp%tVNo5j;JA zpV{*3Tk1@79jNJf3Cc`_Nd41oS_z?cCg!ap;|Z?Y+A9a3_+NpMSP|G*4#~?s#@e1! zo}Rb8RQ>jVu|ohZ%xC=+dBIN3u-KC{2S7r;IBI)N%E=jiY^%Ef_ABh$-@yJ!=Taah zi%3pz65gJt^1Qg|O*o_zigKNR=7fY)Mm09BcR?fO8-`HDEASNP5=q{+IA}U5zxTTj`1Y_-N6V*CuHIO b`0w}!z@yWX`Hu~*00000NkvXXu0mjfhX?7% diff --git a/sprites/spr_block_color_shape/aa20fb47-8580-4242-af3e-c1859f0accfe.png b/sprites/spr_block_color_shape/aa20fb47-8580-4242-af3e-c1859f0accfe.png deleted file mode 100644 index 45795975eadf4841292b518d66ba4885a0f649b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmVMu@8Vm)FdNo-YfqVN0W=Y07?P-b{l9e zrqMlzOkhMOC<$xLlW~$bu6S9N((@;1J0g*4W{3{|AAHB)k&7N4xlz5*#R)0+geG0 z>BGlfpzvw#0BQr09iXQp45nc|hw0IAh1v4B`}Ne%(@IHy`U@Z{+iF#Yn? zcQCE3DS*`iLI74>!}MRh{sBzONOOZ}M0S-$bpXs_m_isJ6z7EGVdlX?PDqdgMSk$) z0%Jo_FbxYr1_o4@09Q!B zifnWsF2)I_iS;=_2ha-;bO3rt$Vl@LW$=*c9RmQ4>812kD>Fs_0000P9Pv<@Vd|by1zKeVdOJFtcF(cr59NF1 zA2EXpM7~}>y`3}XGXpL6Rjl=P=>OgWR)zY&@++`W=6hw{9l%+3fG#(HvtIbpJ%m&U RZ@~Zn002ovPDHLkV1nuXitGRY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/b72a8afd-72b9-4a76-8c2c-173286dacdc1.png b/sprites/spr_block_color_shape/b72a8afd-72b9-4a76-8c2c-173286dacdc1.png deleted file mode 100644 index 04ec293dcbd0596142a23afbd6a31b36c3abf9cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doF{P)s$+ynch+&;>tpvcO; zojLPhti!+*qi;)B1#ehB9NVv7^N}j>44~()7&`l(_;S`yXr8>7=S%10Ud=>43~0~a zu@*T&U*rOXv(|d+{P_R=N7S5m$V7SuLY~jDbw1#_s=kz4@@{$t^oA8vdh&u!lzxm> zoB{X7!2s6nO4Yme%!;|C=Y0dCZ{))OI~L`+F{fuCz3vO10jc2SfbMv)F%RiC*c~?@ z6%Gc_GS=;-F}M1_Guk3q9r-ZOLqp`P`+%M+@?pT5aAIQ~?gMU46Or)a9veD!-vRxregk}MVylL1jFoQ rj%bAR+H=oz5J}NxA;Tm zJBBRgNwN!+mhdb~v}^zP@)?+4@ceG9LGL`a1VzOoC;g+@1EeR+WxMcm!vx8HPZ`cE zH<-Ww&nFq5{yjwuwkj_mS{me@E3cOkcs|kPVgEE{|f`Nhil zj8Z~}_sb|;k(2nR_~G4e_BD^3<{bJ`$gq`Bvb6EV0jq{v3=BMnJR}WkA{c?5WAJqK Kb6Mw<&;$VLDQt%T diff --git a/sprites/spr_block_color_shape/bd19f1fb-911d-4681-8a9a-aaf42c48082d.png b/sprites/spr_block_color_shape/bd19f1fb-911d-4681-8a9a-aaf42c48082d.png new file mode 100644 index 0000000000000000000000000000000000000000..8d40f1a3f31795fd9fce442faeb3dcf3c74580f8 GIT binary patch literal 749 zcmVF|9LK+w{ke6h@XOgMfXY~ehH5R$v_ZHtA*O_qwqhwTlotgvFZIe0>mdH)`W!gSkfyLxG z#K|+*MK zbM$3c3j6s*6FV@|_Sb=+3OFJ!)waj=*i3dv&FT>%&m%^j#2#1uAhwXdWvZW80DB&< zWS~-2I3nM!SCa4XiM)YlWId{7{Dd?SUB`1*y$|om5d7p1EQCFuS2AEcY1W4w!d>)| zyRntLXsz6=9m4_9`^fe1ku6g5T)jf{4m=|FVjJn545Y=A5qu{fpo?t6Au@^{($qAH z0kRf5$@_WgN$H8SXEI=Fk+SxytnH9>eOYRL1a@z9qMP)iJTE+m^%L=Mz?yvi3`Si{UX@gF3R?iZvg72ye)81WEHl08;`=cC7QkF1tVnR#bF11X*0GVrTPZU^n^3Wa_8IGMD% zB5P(HcgdHJPj<C z-q{T&6JF^-y6973W};JF;Q4^AoACNEydX;uAanmnj>*?@kxc3R3>bT@2k2_4s$x({ f6)Vux9?8HTV;|{2(18Kv00000NkvXXu0mjfO6YA` literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/be39f173-9252-4116-8595-8ecee851a855.png b/sprites/spr_block_color_shape/be39f173-9252-4116-8595-8ecee851a855.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d477bc9ef1c6c9ece9a27cf27c88fd6bf97408 GIT binary patch literal 390 zcmV;10eSw3P)gcIteaCj#<~Te*i5rp z*4VSN>&LYhnEoOm+9?YRxZNQGb*&{}KG%$njlUqB!gf*!E$^J{y8cR@fP6>0)xX07=Pw%$a;>Mqfq z(3;Qi=xly>0dK>mb3ijEKBcyVo&)->$VY+L3ny0dCDspreZDQJg!aV!odab0hMo5Z z&0K$1B^3Fd1H=$rXRVnlVoG$-a+bR-zjHv}>x4CPg(`8xkGD=hAQfr?x5`|hO6WTI kC_vmQ^Vq!lHJ)676R+~A#CP8nXaE2J07*qoM6N<$f?eURzW@LL literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/d1c859be-2b28-46ff-8289-fae7b22b7db4.png b/sprites/spr_block_color_shape/d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc.png similarity index 100% rename from sprites/spr_block_color_shape/d1c859be-2b28-46ff-8289-fae7b22b7db4.png rename to sprites/spr_block_color_shape/d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc.png diff --git a/sprites/spr_block_color_shape/d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png b/sprites/spr_block_color_shape/d7b3baf5-9f31-416b-ac0f-de9bca90d60e.png deleted file mode 100644 index 2f439ea5eb59baed472f05ca7ee837ccdf7a5378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P)k4CEvvzCcHl7a*wM33Pd9I-UR(5-*@ZH0h|R?&OsmEylZRLlWtx@dgJxGxoAc z9GyU(=fB+baU6fN&x+3wcqdc@sPg;$ZsOzd*yS}&oOS?<;~Gh5AtJyjZ`;$rvsXvhv1uu*k*>%^!#?aiSp~Z zvNLgT;7ZR!;ASGW)z@|HRD!rV6Iqr;^E{h1)P6Yt#lHoc#EZbPEGCv^Y2wwMV;-M3 zO_Pa5QJ8oj02hGSH(;NfF-#)P0g#|Wa<%8E9G$U?v%3KHE9~1(pzFHBwHTQ|L?>(# z+Mc`ec5%_0@SRR@%2@)O6BJY#_SltoDQ5|AxZ;FQxtD-sCWc`!k?wP;axVc68Yd*m zMFcn};8e3goscRQ5#RtXD%WoXjdB$M>I9IWuWhYz6#)+R*?|Yk8K?+QCure+`S17- X(!ExbF_PDl00000NkvXXu0mjfgT~ms diff --git a/sprites/spr_block_color_shape/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b.png b/sprites/spr_block_color_shape/d7fc1536-1456-4261-81a7-568f91a2dee7.png similarity index 100% rename from sprites/spr_block_color_shape/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b.png rename to sprites/spr_block_color_shape/d7fc1536-1456-4261-81a7-568f91a2dee7.png diff --git a/sprites/spr_block_color_shape/d902e3ba-b9f1-4509-8efc-1d10538fc9fe.png b/sprites/spr_block_color_shape/d902e3ba-b9f1-4509-8efc-1d10538fc9fe.png new file mode 100644 index 0000000000000000000000000000000000000000..346fd7097fd66e23bc1858ed1295aa196c65cbf6 GIT binary patch literal 265 zcmV+k0rvihP)ETQU@B`5;(4vDJb^zbNu`Sm=@bUu!cG#R5i$t#nn#$xe)|&* zgcB)10SZun0u-PCalm$!y+i?$iwA)9bVhx)59)haQcvQTI!jXOLy>oy&qw26;r;Cz z0;J*rkn%vjI~}PvizPL7`sp0sIH?LiDjtA4<5Ii{gzxOzdG4O|0I5^}i80hoch+{N zO>>-ZYKGJoYwH1h#{+OTg>%6Vd?)zsI{%+HzytZO^HxCL@c_I^F@RLwzJhNIf4I_c P00000NkvXXu0mjfm-TCV literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/d9c45cb1-d375-4850-ae88-ec098285b2a4.png b/sprites/spr_block_color_shape/d9c45cb1-d375-4850-ae88-ec098285b2a4.png new file mode 100644 index 0000000000000000000000000000000000000000..edad08535e061b477a9bd20ef35631f0a508ad85 GIT binary patch literal 358 zcmV-s0h#`ZP)VU5c`)HfC?I@sThHZDVUHcs2G6}pn-}F{-u)~2}cou010j^l-I@1IhT)`ruls= z(6;T@=68T?-RMZsJD>z)StgvOsc;;}!d=%nZBW;>@Vc(T^E?Yr)3g=f3rYYx@B99e z4d8qj2H~OC0%(5tgRJ$7ys@HCVFSEnZI)%AV?e}gx}Ws;t?v;Y7A07*qoM6N<$ Eg0>QxA^-pY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/dd35adba-1568-4614-8b5d-3beb257ba943.png b/sprites/spr_block_color_shape/dd35adba-1568-4614-8b5d-3beb257ba943.png deleted file mode 100644 index 90c65d8834c482a0a90bea05ca2bb99a4ba399b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTxyP)MLyQ5)qO+&xWh z{F}LD=I*|k*_+jP@cgum6cuZ}oB(`GK8>9&SH{lLH3_VhugIGFxe$*ytnVr%V;ju} z3ZNwmz%%dN-x!;GEsSkd%Vf>{QvCQkV(Zk{1_#iR1rRg8y(TwceXO7Fo%5*xB=$7( zkLN$R{OEZwK+&=Q_B$U9!__v%*w7rshB?rcvF`lZYr04+HH zzDn@j%qtO^xd>3SL;$H0_y@&>vm`WgFF;Z90`N-MGb8Z6lL7u)J7dn}qBW;t7XSbN M07*qoM6N<$g68MH*Z=?k diff --git a/sprites/spr_block_color_shape/e1e93e57-efbe-4698-aa84-b80f739992a0.png b/sprites/spr_block_color_shape/e1e93e57-efbe-4698-aa84-b80f739992a0.png new file mode 100644 index 0000000000000000000000000000000000000000..ee0e09efae2b5741d606c585e60c6d6bb79eb33d GIT binary patch literal 708 zcmV;#0z3VQP)GD7{8`ZT^G(b!XlpvQ_%KDIHpl8E{-R$>X!KNS!K{0MJ{v+!|f^F5+*0{ah# zabVx&fP?D|E`G(E4^4n~oMj~n%0QLZ?-@uV4ox$Y3&Bz}Cuvpn{2izLBs1mlB2PZ) z;#1D^6Der_%z&i9WSTu{MCJqIYo*wGj+OWUuJ2~g$@_HjoHy@iLM22F;o1S{*I#I$ zvibb|vMbQC4VhT8uAU~KjYjsATq^#N{D?QVX3=bYKX~RV_NDLcg76ye&l=S;_LO?y z183qWJexUaJ+uku`NK2NHx8oG{<#a(6Dh-2!q_)BZQloP);zS`^At0y4VJ~H`2YTU z5~}xsCR&Qkua;taEjJ3BiC|!39&qtp;Bza`r&gik96A3~V0sA-XV@!2hp|Ow64D%6 ztyq@4MssMJFFLupj@(HD6-eTrmi<;7-+}k^t9jfG@x9bp=-yBrbdJ2POrBL=V9G$1 qmpucCIefLsL-=+}rng2{y#ni)!gK6Dfb7`-0000^w`JYVcKjdMP}k?&nkP8P~*w*)O-t+c8|OdL$H3D(^XI z|F2i7Gp0R!%zk-#+&+fO>rS0o!PgMU6U@PE(3~ihSd;WL@!3HcwIe4xZCTj34#<9Z z_q%)zSAyR5so@NlcQnnJU{f_E!6IP+!yU#AI}T2*NMN{|zT{N*=MM?x2OJoA*!TSW zChGIJ%h;)~%X{AZW@aDdB5C;P&3 zq8)%9_b{J7`G8#=v1wuGga8bcGBPXC=S2{VEO*=LkNu?=Y-P4%dZqVfYt!R z0l4x#p*Y7Wk7h1P%By8r+H07*qoM6N<$f_l89Q2+n{ diff --git a/sprites/spr_block_color_shape/e897ccd4-961c-4801-b6cb-27e1461572ea.png b/sprites/spr_block_color_shape/e897ccd4-961c-4801-b6cb-27e1461572ea.png new file mode 100644 index 0000000000000000000000000000000000000000..ef6074ba973175e717bb3026d3a29434250655f6 GIT binary patch literal 748 zcmV@Tw$hhQVnjh;R5;dO5fq(t)`7>J6a@Vdg|1>!L6Qgd zp|A9@;lR0^(_FGz>T2QAZNYurkF;SQqipYc^5c1~=kt2*``!#T#aj|Td`s$Uo!G{& zazDd%ZuTdiK_|)%B<#u|>Ugid`KM0Ebw$N~+HoK^&`Pun#EA~2n}n1a{wpWsI^rk$ zXvcvDmzlWiE)wfwxOkJ|p#h6(q$(%mJbCl18{EzN6u7_k4(J8nxR?j8v=dX;qD0G# zp6F7#=*SD|)GwWo;{>m3zUoBl#RsC5_sOzedk16;)FnOlHd$+wshHxUjf z9pxpB*Xg|FESuk`Skb;chxN|eiF(b%z~)I3%f#uSG_m(`GunJ|QwcFqe;iI_M)hS2 z8C%wfX&&zl*od*gC7zEM%12g++H)W`l_e_u4aD$`S)%Wv1MML4*wwR>7@0@5_%1b} zJ(Oo1SrfjFnDO`#{R<^zh3C{R;-g_Wp&bX@?Kn$f0`)+?d3+Fg?DOv-P6jj3MPW-_ z4f1@hBbf<|KiF#_mgZK8+KYi!2iS1fNR08Dxw$=h6F2R@fSW$Mw_2t@VcpOA(+Yj; zE}S@a7Ii@{P)KXMwtzr>Ap7oj^>~ z-T@f{*5Wr}hZ}D*7Q)Hg?tsY=K%KPXADr)T=kXc~n%GcEfq4JO4Y&>6;E@9rIhYRWZ+zLo6hr!23$il zz>(Q%ZqpANI2)n?spe^#ZtCMW9y4$@cJBe^d-ufkGr*BbHD~>>fwS@d4u}Tct@-bL z2ZmuVI7cq&*UJF^Cm<5$eCM<2Jn#43h&XcGiaAn_OwutA?wFhj{~3^K4q!JYN%D~n m;M8DU{~6#8KG)6-xW)tY1l+-IbB4qK0000>8?>01@?Y8~#>X2R_F4{eag!>3&dfsble}G=pj(c#g`v~xYHK)>(c)8DIS2fV7 zy++{IPz3O917gaa*>Y~P<2jUxnnA)Z8PXt7CPUN@y0M8X3MSv$9V*Y=908DK)p>mqj?r$Fe z@EVMqQBCBv2U6$P<~{O~G2S$6i^Am9oH g0iz~91aH5NZ!s+Sqej*3+W-In07*qoM6N<$f?tiQ_y7O^ diff --git a/sprites/spr_block_color_shape/e9b85064-3908-4967-95a8-3296b3bb2a10.png b/sprites/spr_block_color_shape/e9b85064-3908-4967-95a8-3296b3bb2a10.png new file mode 100644 index 0000000000000000000000000000000000000000..e85b2c07bd90a3e83c0a452e086d7d3359610d6f GIT binary patch literal 674 zcmV;T0$u%yP)oz>(tK{({4q1EQ%L=c zErpzW0Wleg9AyD>c`>f<@k>}T(D(N~K9e2Tr0tQa{HIX8I><;C(V+DEAAAHq_vdP$=abAIrjphDvvAt6DZ;f*^WJAH=dE5I7mJ!zaM{M zn|=#A%@Zvl<8yZKznpskQ3k~s{#&pX8_8FY6D-j0eIE*BJNA<2%q<-%<8rnb$$5o< zWW(=)WmrwNVG%inH`-oLo;7!Li1g3fLS4?ifH;cOCBU78?;-z$kM+bmfc@l6b6dMg zzk7s(fFHdf~q0+J2C2TB+t)8>VyN&y#v#KzI{ej$i<7oN0%4ZH$&mWLY7cS z44x1`_qnK+A((!B?L3$kR8T?Tqs#yM{Tqc33lTygLAMa_U$E6;V}kbyoDRU{a{(n4 z6b&#wA^DdVPl0JzNHDRo9tVa7Mo0{vGyns*;uz+$5BKhnB>(pIbucZgstKmi)5PEj z0a!lgkq}2wfbKI~agIwKW*)AP7(5{W%LO0qL1<#*{L71%M9IU-5%iE4JRtx}1L!3l zsc}w7o>NE&y8{Laz#RZ{+4~37iF24d%sd_mh&`X5JOtBR!s4h77$|^I8`7#AfXSn` zD+W&pz{-IyFCctaoRJ#mxa46zhvk0^2MiRzSq>mlFZMJ6^BJKugKjPi48GbB27Y{k zw)30|0jI>d9`)<(B{e002ovPDHLkV1l1-ySM-V diff --git a/sprites/spr_block_color_shape/570118b1-123c-474b-9147-9560ccc537f7.png b/sprites/spr_block_color_shape/f417d6a4-c1a5-443c-99af-5eaeb912c1da.png similarity index 100% rename from sprites/spr_block_color_shape/570118b1-123c-474b-9147-9560ccc537f7.png rename to sprites/spr_block_color_shape/f417d6a4-c1a5-443c-99af-5eaeb912c1da.png diff --git a/sprites/spr_block_color_shape/fac8bf2b-317a-4d97-87aa-a82b1e367b54.png b/sprites/spr_block_color_shape/fac8bf2b-317a-4d97-87aa-a82b1e367b54.png deleted file mode 100644 index 4a377d7dfa21c5cc293253242ef61b44da68ba90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? diff --git a/sprites/spr_block_color_shape/face835c-3101-4ac5-8d77-497d75e97c76.png b/sprites/spr_block_color_shape/face835c-3101-4ac5-8d77-497d75e97c76.png deleted file mode 100644 index 7121a7183f9ffc8e5e4b8a4add08499a623afced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~A&P)gnG(Jgo4qOhG-$6H0ifxW*s+HlkvOk4ztPr zW@a;+)-)I#JVmuMHzxqIUO63iJH~D#k^e5S#m@^-qC+(vGr}0%*wqNRhv<6Y>D;|N8maxt|O`QcV#_IPx#@qvqaM zS`DCS836O0GEyFyRCCFX_l+O>=K-{2eFeidjl@-RMCS7IK41Z8$vOkP<6T;F=b8Au z3oHOF832%>M%UI{>I0!)`lBqN09rBtxSzee-ahcMqW=5I0AxBABfnK2;9KfvU>Sct z{7mq7{1%syKL;hbbT=Tfs{SpD75nOE025ax_?fVJyWp21w*a(c0k|^pcbYw7^S@tL zv5M=le-IvkO&u4QIg$EqNAH`n`*a-xx94Ws(CZx zDHmd5(yzTfpQkIQ80S6ZxCD~IpFm^+>^+}H%|iYZ0LI;_sLSJB)V<@SOCTv|6JYP> zJ6F_E#};+Az4`9xW+6Wc0PUJ3>dBRYAOpw*l=vBeq!CJhy&p6yqGIx1y(B6!!JiAu zg82#nwj~F_ju(>>g?xjZ{ZM*?b+^Gyl Si;Ext0000k4CEw)XerY`!wZn8P=1h-XHxP5M1{l)Xj1V7x;uF#N4v)C+K@!LX}sVB&y2ln z5=SR6&+{*LzpAPq?X%)D1l|c10jj*~IuqNrb@Cb~PCJ0bag8Lj5E0;%KOPUW?)%=v zZQG(WO`Xq6oKQPpE2pqYNZ}maXd;~fE-#shpaZ_1hai~=hk&o=sEqbJln>3sp#z$phv1uu*k*>%^n6(sQ9jEu zb|!WXTi5G!9&rO`B$;7KY$2>l- zEKBElM*waBvv0sYIb)baoC6?{B#HCkt35~M=!{*Q-372;Vc&iN_xpW!FGeO1(FvP` zw&zEAySV60_)aG{t^55|v Xb3r$hyks7e00000NkvXXu0mjfwI9 z0^Jh&^nF?1V0b9bD+N?4{wl!9(g}l36b3QA=^zp!$HB4dpmh

I01v;3w+lDKN;t zn{@@SW|;!Y9m^Kr*mNR7Cw{%a_zY(t)^z3`XmRGBl|3;(3`X{W!hz}%1(YjF7T`?5 ziLePL!gDXZ@vN3Wg5D0MZ-DzRfa4EjeT=8U!X7I6eh;XT&CrP`otPcMcs+M_kckX_-i16$%C?*(h;6zJRKJ7ezrO*CFT0e9>HpZ0>M&n~SGv7a~s z`rd(1lf34xz6Fi9xXDztab~FzP^`Jo5VGVoce~G_G5P`AwHr(h zfSsMx3;)&!vS8~r@XfQO3n+Ii77%JyX1>)#<2h&2bqMTdU%c;Es-L8u!d=rpr$B3w zcl-3=4mm@7IZaN2R!kljF+qJNb@hu={JxH|e{Mv|Otj=+d7kVS2mSyNAj9JR2owAO O0000ayRN%r z132&dUbrXj9G!fSv4(<1NqxxPlS@Wwtf9jdRWO zJQw!wEx>EYbKq>vc@Ci0Gy$%l%>l+d&%&lxaV!4bIRK?_c=WHBd&=KA0K{=D%-wtx z-2J$1{>=f@1~tD5+*9xA0RXi+3glzwMgdPl2{`N2gsr^JPv8$bY{PfVxk?cL0000< KMNUMnLSTZ$y`m8S diff --git a/sprites/spr_block_color_shape/layers/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index c5569ce2c714a3ef250440bb88242e018d5de907..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)3Z5FJ4Tu@FVD@dkp8wS}kfjGn>5!W#(U1w;@;u@FU&RYP7NlO3~>)dXKNZeB>< zd@_vHEXybl)530~U!;-qe=9H+}^8f|OHuveY>( z%A*Df3-~pR0KD5CHLMNXGb!g1kMlNkelH*vi~w{j*rGXyXFi_y1xG+EI5ogKUTDsJ ze3$C^0%E}kfU;FdIhXptnoi2%b)*x49bJ_Db|2t#MLH3XCY;cm|4$!)QmH23Sty@w z9{~2x>Fot6XTF?Dd{al5zqa@hFmt+|(J;LN+><_g=b`+NI?ARq72^jKVM^u`45}A3 q!r|k&=Z=6_a0Kv3l!avf9X|j@bhXnfLa6H)@7o~_%(;H$H1@r%zN!|a9KVi|5TZb%$@!jdEAWx z{=N2aLa#n`MG)iO(Gj$&DGSgEt)cy?Gv+Ax?dEIn-IG$FapUhmP@~Y+!9MdK_)(U? zw6O=QIk&+i`$8`us%WDF^xoDb?cqb_A#h2~gKAAEU+4uy6>WE*-=LkW?9kqxvq!*+ zTmZk!H=-#Zst8;_hoIG6FTMf0_?cJbb1-N2f%k4LL{mUi(e@fRZtez4auw`1c7Tta zXY5NxQ$SRq4;~o^cq*n2yp)UJu#o~Q#Sh@-K9B%|jvIdm)E+-^iM}YiYhZPb?&y?7 zcUms~01p`S3tz~;=X?+Niq9287L9j5U-#q-tWUDOevu0Z`;OWTT?l%%Z{6?Ur@1DW zV8d+wGkDsfv(YqbRrw6-G0xxd<%_JxE$ZA0mpUQDE{`v^*fGEnm7IqsP}vJM*1(-u;V}ZU+^2vyTz|C8ZEB?0000QmJAnYP!X7mRHbrlHRbt!3G1$EJl5JV%R zA5?-wH<4C`+EnJ2HD``RHOkUj&N?S}z6pCz(%g17=5zDmeZTL{p6~PSeGgM{1(v(o zDyEKAg*G5n-VI1QF1UeolHGtyYhgMTIT~6%nZOfDFL+LKK0gLBRn7)nx;n`o)3A4` z2lOTS!5LKqG*oD4nL?DuK(5NzfU~Afvd5%@2@lv&c>wHMxC9>Gb{G^AOW^O#i}bl) zSsIXAX$?3Gyrg3RG$*P-W2p{o*SCN-;`c$JGzkugFTs{78_kz}qvw1P)@C5z`o}=C z(X{G0=9AmOvwRzPGd2XeHF~fs+AFF5Wa`(W55bNtd+E8#VmSqkrdpR7L0f_IMCq zIUAVrN0~&d%{!3D+YjX!_gwn{cAi#)qk%XmD$3Y5RG!i4-Ru7(O3vkNF$_3BiN;|u<_^GSXfvoq)8#z1k}!tNG=c(O~fb@-^t86 z>>cF1&1;6`EqC+Y%zk;*=E*dd0v;~Um*ULx()f82L)*)dV!<;g514 z6i#S-rEy3RPJDh$uD;zcoN%WH0IkMQ7VOm$@x|H!#a`!@qU;HG9Kbpsb|2XUsZ6W6 z#^ZaM6Ye;GRgm|&5?jqT$~&=m>?6_%cN{_f&29W!`1*GOSs_XQnHA<#bMW}y zFgIHbo4ZwtqwX_LAS)QBVOskDczLgI$ARA)&a8&0S<;$oJd|Vo8wq3ubsvbjSLq2T zv-OPpF5up22&@K0iiQ)SCv3b{b9Zk<*a_dm9-APQ%38{^Bd&5IfvlkRfCL=Uc=<8{ j7UyMz(`jBBAcL4mMOKC0!7x!7UO~-CK_U*A)26x7eFt@7?*>I7cLSnYV_hk6CuHf z9!w}iae)vG8VQ>%7HomqmaRaLz0eX{2`2L1`{KtBd#p50vRlv|aO-Fs z=fTje&p@_}R(`>83mwuBDfq}y36=$21M3|%f;R6Biw^|8!SM_{7H}GTzx)cc zMjFA+(H@c103V54UWrV|XX7ExM_mHz7M_DEek;^ws9h3u5!5c!3cS`+EAUP84FZ4D z_bzxxenTWRpi!hEk}IJV)Dwn;Fi-8Yr)OnlV9V4y@L)s%ST*_(ERmH8{DFvknmWs!2Q#nK4Quv4JH(kGG{FqkQl8uke?5#qBQ;%Lrs@RP9_bgl0B$H@<1mL?bM zGIa?3L=%{~HyiBs@^Rq_pqmxTyFi_!MkF$MEIMMi81Rk09?Z)-41Vu%fKo*S_*$>s zz=sRwr>AFt%R@_`X`J2#rU8>kYQSWqNccUO_nU*@pY!%XdXAIw6G3B#QRvNISG}5i zyGh{tfBgWtG!ERE8pf=>-_~b9m70J^(#mLs3zLiBvWfOIR2>AiwtN9K#dM-MTj^{M zO$y$?FA2Q9wFi_;)0)kF10tybvwS+psWfNDrar>U z^XEYDK3cPqjTcD`C^RZW5?0QlW76tTSrI+gPCZQs%J5QdH8gym6%A`;>TNHo-xoPmQNaR^QVXP~4`gOnSfbU`4260*rI(JW)hKbhE@ z*t-pXGxE+P{^qgvnuo)Fsalk2bMv(T!{VFlTj3U_ulJla`cWLualF3N`386CaRkug>IiHg~?{u9t`la}h%AK|PEgbLLeg*KswaLgn$XBz6y zO1&OnRr=FaImX-Z?=Hie<1AoLIg^*gLe=q)memXlbmixLEI{;>YDxs)o?&KE&m}*; z_rU;7=??(Tg0JVV#d4!RQ`-4oFF@1s0`R#oQw7=3nHU7-W~1&7j(hjh&w0?VBFX|F zG0wtASyjN-bM{N`y$EnSeQ!K_2f!y=Avn@;CU|C|1Ei7{Kspzsa{%xAodHs-HURgS zza7tXhpcqpM+b_?MDNucOr``MT>zoX_bL$w7-?4svF39d(In#w828p)U zOfko6?!W(eS%mSzr1#a|16eQF++pB307d_PF`nBMI{(1YtW7{aF?hQAxvXwjP4r;Ac=zDd#G41NdewdaXj?wEuZ~cnxWngbk!a!jEC*y`7miZ!?mhQ9Q2mHLbqe z5?z@VwfISmY^sOs8NfiFpJh(SC+~x@aFp{?(=|D7bL$oo!CfoSz7-hgALcU8tR4ru zrCu<-^?>Pjnf?egr^msn;|{ma!tzYrO0-`Eyob-S%&YiTQkOv4_=|L50(6_{tk<_D znEfwU6rO=Sn-9T!*FA3E@9|l#675p~-;tpmnfHUo4qgEhj(w_k(lUpeDP_>?LsyRG-@h z6<|FOHoT*M?1T@(bNXTB7x?~vwq+*!5*+Qh49;eX;Bvg%xe6$r;7 znkJV)j|ca5Rf#}X&wM^l_k6_Z1t$w}@JlqhPbMN&)UF+K(LC^etpNJ09bh0u_g=IZ z^a(&O(Ov;|TRv}m1O1LJFuX}~g4z?J;eb8?=p~v1Ft8rD;E=)B$tCcrvl|R$$Zw7L zH9Y{mq~Ti-NYR`ivt|#hlYZUR2?o>qw*oXcopRLAFj~$rKbt-Q=q1_%U_CHZuxj#a cegHbjKigK_7d!}Z8~^|S07*qoM6N<$f>nq{SpWb4 literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/345984f9-d74c-48cf-bef8-b505952a75c9/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/345984f9-d74c-48cf-bef8-b505952a75c9/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..821aea82585d73e455bf97540839a529b785eaa4 GIT binary patch literal 646 zcmV;10(t$3P)P6Cp7FY@_YX?{MBGJ@1d_oYt{)KHQdmyWSNvSsLKw805oxE}-2t z5fMgW12SQ~ftKj=Vf7jKTzLX6`eNt%e~kJp5K45XbpsMlVD2V!Z{KOTS?=Q?=ZPZJ+^ zj>m)z42Xg2j0(;P#!FHD9)AQDjWk#vVJ7BHJaGY(8SpIGFVPA6Rn{H zI5$lb$?U(Gu-?E=v0g_Y3>rnA1K*vT-z>26nGknF=1a7r?osZ8jXh>!Hb4{G#^0H+ z-hjCaS`#YhaR)Tj#Hr>Mcwr_26RAw>P!l#VAO@wT z4px#p2hQH$ZYX9u-wk@2ou9tA+_NrE+yjSmFF{q9(EFIMfq|~?0ofM<3!5}C7NLo@ zNWHAG^FoaE(LVKRm6;gbXC?wFO&EHo3Hun>&+{Z~R`|A)hKaJqPCa+nY5C1+&$_!` zUAY2!ztO~0kS20zny}u0`BiMDSn`K@-dHoVL+kZF)GK1%n^@y*!6lfm-hi0_WovC9 g4{UXv29_K61tZznB@z`~ivR!s07*qoM6N<$f&jBD^#A|> literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/35d40844-421f-4918-8295-9de8e21b8620/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/35d40844-421f-4918-8295-9de8e21b8620/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..e355bbd8068017a5fb8eb039fdc33751ce628124 GIT binary patch literal 567 zcmV-70?7S|P)V5d{&7wu1Lg!@(?Q70>yec=xigigw)gz4`2YpPlzS-yb_Wes~-SEB-@Y`@J?` zhGz!M%sn?yE~;)IE}6UOPpL`rfi>%mfl5&|13i*?LDshFBm;;*-*3DMTsL~2QYmr^ zX)=d1(DlZtz%`@iVHG6Tk#ThNlgCnl#+iYulKFR8-&ND(ODvK$`pD;)CvRXJ`uFR% z0x_fK9V$dFV~HHb82L&n@eMxmEq0(^SAP|_Vq~6FGh_w}WKgDk9?mTE;ue{g3fQ7IOq8O&Oo)Iq5)en zcY8jf9+B_ylx)KQ`2r8gIPQ^o(OX5|#1rx|lF-kq-3mmF%$rn{+>ss!FhuTQgLHrA zu7076{u!^KpIdtsh#1ozQuoP2$)s6&`T>tg3%AJ=`IkE<`mX4mqJO~w>HGC$aL!*T zZNTgJZ6IXy9IA`>DAU`H30cp{7o47EML#ckwv676JLD0zq2K59D{xUVci+*@s!{pm z?l_qo%k(xORzTI(JiS|q_zC-`kK%aCK$!pl002ovPDHLk FV1it<5w8FM literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/378def89-d34d-4405-a5f5-2d16dcb9c410/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/378def89-d34d-4405-a5f5-2d16dcb9c410/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index b38acb83053bf01708ab01ba3d72b9478947f595..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmV;40e1e0P)`4vK=$N8n#5E>RTXJ0~SV#@`%1G-!p*~)hR|3$2Ws0H8- zfcX#x(BmFgoa0Ip=;q)`3vdVY9;3hSQ5=8^!1BGFJcLG%bDU`cs$ZO&LI=J($CW0~NklZ5C14y!;%Sv zlZ^xG=_+wr1=e*n`cIq!aF%7n+!Odl9GT&qZ^bbOgaB6%9?)e1;JfR(U2)t6LVznM z0Z@h>ZS~wV&U-!#1M&Ut0^Ejt4%qgb&jEN%2yg{42RPsj-L2^R{?|A>@PBgvN>PEm zuVU`0`_2Jio@ZiI!WM9U5Cp{hwB4ry=uH$whi;(rln~$wS`Pra7m_Kk9?x7W;A$uV hwwda%wXX9DyaBy4p*afc2(bVF002ovPDHLkV1m}+p-}(; diff --git a/sprites/spr_block_color_shape/layers/3bf63775-9706-483c-8c28-f52ba15484c9/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/3bf63775-9706-483c-8c28-f52ba15484c9/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index b1522c62e2dd297c468bda6ee8ae88960f595abf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJDx6%Ar*6y6D1N37`32s85wJLS-SPp|9WkOitg%$RiNPJ&eU9Ko*Om`@u7 z+MaGxpKq5~&ajv94&#O$m0!PVcQJXLW-R%+a5CEk#xqZ+oDwd9NQPJ@@JVPeFlc2o V>(qKhd;t2B!PC{xWt~$(6991?YzzPZ diff --git a/sprites/spr_block_color_shape/layers/3c40c312-4fe7-48ce-af63-68ea74b251df/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/3c40c312-4fe7-48ce-af63-68ea74b251df/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 4f2123d32db5d80cd5a525dfc89624453c97308f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P)u@1T^JOcWHcb znd0tV2w$K1_YF??9pK6(I0+-_1f+6GFg~O)l;bn7KZNi;=FeB0uscA>t>7dY&4c(OC!jeYA(f%VrS*bxoq&cOCo0P81S~xo2I+^D=xK!e8#gK`@I%?Y~IIHVIs z6t2Nx9UaO|~3{r~^~ M07*qoM6N<$g4)i}ga7~l diff --git a/sprites/spr_block_color_shape/layers/46825d5d-002e-43e8-a62b-198caac29b0e/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/46825d5d-002e-43e8-a62b-198caac29b0e/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 505777ad77bf68bcbc54270a18f646b7b62470f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdAr*7pPTk1cV!-2C9K^O@ zaigF_qvMPTnk!bUlwg!vapS?d4!cRR0cYlx_&vNIac%pg=SLXtm%e)|^3>E^ogq{- zDY7j>WXlJOjB~YmR~GaA+}65d9gl;zI>Y-K8Rwka0?%hYyR(0F{;bzF`-MG9`94mr zc=h?_$>%HzFXwvIK1ph*f6a2hI#w*I!2E2G{OhZwOb*@`wH>D1v$XR5S+kb|$m8+2 z|8u)>W4$Abf$tTGw(Li>|IZ#*w_v(3>3#M0Al3_a?lABi03!wN2L9{5DH}tX)^`HE O$KdJe=d#Wzp$PzCiEr%y diff --git a/sprites/spr_block_color_shape/layers/4c2de224-b6d3-4354-aef6-ac7e60089e89/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/4c2de224-b6d3-4354-aef6-ac7e60089e89/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index f93832a28dac7a969a303844e6a93227b1a762a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muG{P)42ygj;@n@45Ew{r9;qv#q`VtLcZOT1YX| zE-vQX+}XAVz!(>R$?o=ZE7W=EpC)2}1Wa4_P`h%CR@hshC2|!y+w0)(>)w7XN zc(U8eC9;&A;}S7W0%o-U^N%Fx4^y}2#m7+ZiC3|4*c zHg6Y~h;b6ADRdU}pZ7p{l&*jS;WIQA*P+Wt-JcoL>O)k|e6Js)?X`MO&+UWR&4%*JvsH@&49(KB^T_@vo&;}Z?qDpFrBODp^2%}8I;lDfa% aj=up{1>mAKd_|@J0000XE_)CC+@MYU;HkI+eRNW{Vr^0;9Lw^-V?*Xcom`6v62rqzm z8HchRia@qM=Sb<(I5)rV`AQ$cy7lh>9auzJCL zw;+MVsTcA!%`)kG*`}Gs;elx}_soo+BW>_VfjEb0!hA;kGNq9w<5HAkE~_bkBl zw68pS1wbdRrqmPgjCBB4(gJYz0(TG4@BR(oT7>~nWBfb*CTH1l@4a;Z+cE~AUZDSc zrsuvifGd>-K+SdUy)yt?DhxoqK*yZ}*wzQ&0%G6XhVE3;8UO$Q07*qoM6N<$f+(-L AIRF3v diff --git a/sprites/spr_block_color_shape/layers/5ce4a932-e9fe-4f82-b19c-dc70efb8f81b/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/5ce4a932-e9fe-4f82-b19c-dc70efb8f81b/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..6406bf62605d42b05db4846047a1e7457087ecb6 GIT binary patch literal 873 zcmV-v1D5=WP)Zh6~_o0+b-n|pD;;D5d;M%PPd&7Oz(&6#ug&YbTuqZF2qoNbA0 zDWAne-#4mQ%&uHX^3{-e1>~eBN#6M0sR?jsoIh3&Q{%!GO)UCXF=;-%$u8+g=yV`E zU4=^Tl>CIQ(YnEaHwvuRk$&l5GeHQplOmiQrbGrT_bR1URu@6PkN()^x}*y+~3Ci*W-HS9j&R$dy>FecO;paix(iX zC>ig7N=X$KsT09h_Rm2Biqsk4Bl9qr6}u6<`F;=-^UalqJwL$XTT>-|q0@oEF=Eq@ z30&|^dcT3%sTnZfrMYB2zDC$=(71q)&H) zbfTF8w11nvegO*;_mkUbJ81QgpDKb*x+AgFxfXi|CE{!1x`p&}@p+)uH3o{~%HIKT zHQtCj4O%=@VViG+ljg2%WLO%>H;KvT=Jt`GcJZWbwswORaYw;ht|wH$D!jysPm$@py7oO&ziSi>0!Pc1;&>Ty1F2)<@xWacxo!&Gx$B z{$`<;ZX$!n|8)WXOO{=L(f)B+Z}iU!_*e1^Y7$T8v-`bV00000NkvXXu0mjfCFH4c literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/5d61bba5-940d-4d6b-ab20-f95f70f9df0f/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/5d61bba5-940d-4d6b-ab20-f95f70f9df0f/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..35931a26efbe6c6ba88a797e7bf8ca0abed375be GIT binary patch literal 776 zcmV+j1NZ!iP)W663*!clk~ASKamAS5@6LX-Y|D(q>_# zSvfdQ00yXg_Y;|?6w30IV$aYUv2E7P5qi!06$$Nvi|5S=SQ}|J1_xOAI&eiEG0}2? zC^a;q-EmWF8+rq8x0w3h!t-jp#DeC_7?A<$XdgoY7Kh=0ROleaTbhY-<8flb??X=( zB_z9jTtCY7R+HW;=&qCJxDKe#`EM~I289->sei|g09 ze%Pe%B<9th#Rz)kBLhO^sRS&J-wq_`2YWwGOgtTd!XkvE-%pflc0=#*bA49Sy?cnx z6MUcRl@AB!tUQ%~#bG!g71=pG#8}58bnuoDBUf$^Gfr0vy1coN=%~kfq2{Rh~+~;xN`gG=N=T zuf;cE_Ub*fn|45N*KorYC)d021b+X&Ctz_H4%jQQiLqWdq0f1&vzM58u$UORJ0|GU zRZEDD`(dK8X+13}H8{G+c7ePqMr2YJ$oQOZMO(Y{n3#QLBlJ5zxen*1CO;ALCo+jj zX$hPNj4hHkVe*|y{L%J-m{q%s7=7{WGD=*OkPsm%5rHTchAyRj;w%J-q5%n9gi&PD zl!#WQJSuT!)cFyanpDb#mW8+q`X#?}h4Xs;3{mf$%{S+sd(Qp7bKkr7O@={XmP67{ z<=AhV4=wIc8{f#bTPGu(qW{9y30M`3>u)WtVOO2R;&WScBHcRLcfjT)#>BfZ0LJ&* z;9tB6KhOvTV*YHHcS2bwD-U@qDfroT_{%9?NBa&48BLvFc-IfVrWq*r0QXoC|2PK) zcCY$V?kdH+qh~1p0nqpzc$wC@-hw(h=m6=s(F{f{?O=GP1LHN9fTKa+xdy~LTP0Sg zQ9PSODX?S}5%fVBUrEz^6k%M**;BgLr71?|E`U zuXlkk!SG-SI^p+2fjJwU7<7)27pk){G-mOZk zZemKWZ-LXrm6zs1fjbv|*F#_vop`}8&~4s4e%48Mhb*ymVo|-Egf1snZrcgQzJ2gR zNuZJTy#FOoUV4`y%qkz$niMh9;WOn*gSM@LO#n&fjOZgYFJR9g$y~ z54;-F+ZT~g;vofZN$Ke4XR6Ie9UnIiQxv=ki>>haDW}3$_ z%Q-V|_wAW#^xl6H5nwjxCr#F+qWJMJ@CD?`6{=bHg=*Syl!eFbR(a+;Fdq%6B3WG$ z_9VcaFFr<8U)vq3o9RS(<~*LOoi0_=B`4IUe7F2m7I0@$&m|u3lajC}0i1%gqdL*`JYTLE@t7k#340R29^ex% zY|nN4-do)l5Epy_P*!|U&%xt;yTtW06zUDC-^(vmKwJpihEdG{B*VWe>`CD73+Jj7 zJqz1&-5mHipY98Y3*sE`cdxJ~;LMcg&h5Jmfs9+C8c2fe2~%EjE(&-y0+aCIt(67b z>4u$iiPt#~2#5>f9^gPiI^NW|DB#)f1>kmi6#mV>;|tdbA>~$Rm}dY0002ovPDHLk FV1hiGxX%Cp literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/61aabb78-a106-42cf-b5bd-028471e4074e/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/61aabb78-a106-42cf-b5bd-028471e4074e/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..0b8fe4566fd55e47a1670cb95497cd6b231ea1a4 GIT binary patch literal 363 zcmV-x0hIoUP)-A0iz{%qBaqH!wB$2|0JRXGf>w8Xi5Nkn)7#Mi2j?Lnlnz1OAE zr*Uq67AHy{!n)yifDT;BE|X(|Oe!Ug{x?&*c)^^t-`N4`1-+(SCRyBlVjG7C@}^PN z(Evh;1whScW?ap=I6e2)082>&pk6T5e7BAV<9XX(dlq1683AxFq#u4;Pr&uF0ep)E z(BFu)95>Y*aqiq(11u$L0IsIg6Yz|40ADf!aQ6at576&s1Nhcx0Mr=&j*q66E%)9# z2XHNG0O|$$&u4q?CjWB}CM^xk^|aHY`z)C+XnJAiBb0p5;c%C3Ng+R6X`002ov JPDHLkV1j}soI3yj literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/6accb369-5d73-48aa-9eb1-8918ccc62944/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/6accb369-5d73-48aa-9eb1-8918ccc62944/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..62d9b8a36644db6a956d1e1eaced156c62ffa4d8 GIT binary patch literal 387 zcmV-}0et?6P)Nkl(f2cFW_0n`R0I{@bM!^fV3 zX11?{E2c}^@hwIUDSd32Gft9e1Y;&bIaff0hrHWE`BwzqnKF1}G z%jXyl7$|_@074-F^BD}FhXk=c$LRoi1Dp=P6%w#I10B44^$koD>vMt*pcf$M0Q8V} h^7JcF1`nCuF#zJx$P647(~$rG002ovPDHLkV1j$Ingaj; literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/728ef579-ae8b-4a23-b96f-a15dbeaf267f/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/728ef579-ae8b-4a23-b96f-a15dbeaf267f/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 270496e2db9b6b5d9a555fd03b799eeb2ccb687b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmV-S0ki&zP)|5g~R+Qn&rzx<|7qZd0# zlZOx%8fE)T*O3%d4WM&awmW ef5q$o&Uyf2;WlPiK~~WK0000v$~RC$A?#N^zOQ zkO|D(9vC;#XfcU3kg)kc*H7Rb{?F?;4f*sVj`_elnEGSaC9mD*@xvv4!sy=u{+C@S zKs1^lky!_c<2%%zi(uti3~{lB3R+N8$Sk#N8iKzGCxf@IsRbn3hc}Kr~Gzu?Z6HBDLohu*PE3) zk=NrH40KRY-$s+Y7G2;Q#)2Z%LZxoLAhZ}EBpZpyAL zK(uy2BJ~_3!Vb0PoQLGK5N_2{57($3+v1V4eiuw?V*eXRB(oq9;rehSzfV+7Q6ZJ( zdD#QwCfYS7@d6}bI0e}r2)qexkT;a-bOcOlQxhQCUqIsNOT1&o`7Y>xM~CRVor3dB zbUrhQS46^y^C_6SI&hJR&L@yq-IhKw11InYUar(f2cFW_0n`R0I{@bM!^fV3 zX11?{E2c}^@hwke0Ir;t|A7DfQp)>*W84RF@1hGEH=>U2IoDRSh60jm09lU(? w4NMd3bAk?_7a-^W^pJS+^ea&Y51HOE0Apj$0FW7>f&c&j07*qoM6N<$g3dFcW&i*H diff --git a/sprites/spr_block_color_shape/layers/79be5d40-37bf-4f37-8c28-9bcafa325765/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/79be5d40-37bf-4f37-8c28-9bcafa325765/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..cd4910071717408b99f65ddc8640e13982163835 GIT binary patch literal 633 zcmV-<0*3vGP)^wK0z3+GLd7kq<&pCVN6kbok@lVL4 zQRO(mu;+6gWU`%v(^0VA5FS)0js0~(jcd=Rj{|b(qDe6v2hY-pRC!LQaY}hEFwYAX zP~j-`fa{nESyydRWPXFKp2AiS?l{!U>#Lc^Wx21B1Akb{z%>){UI^ENSHRF)@M;@4 z@&vrA^f%PosZW8|&x0SoGS3lEKL@`50+Wki?hqJ!2ljUH`Zbv6<_OMgufJacy{AF_ z9LV#NI1c*BX9-?&W+RWmJ2$NQnI`I!+v~wsU~dPQR|Ql!Nsg!Dcu037Z}RTUx*ee7*<2 zF^pySogj1U zblb~v=l&e&;9HHHdAh%G`Y*JcK&hc?bz3Bvm%5Od;REc#ZS+73WwtPa8tbX%`4RAD&eMF( zm#5blng-Sxt`5~Qy7!G?vrl9g8A9f^vs)y5LkDt5{ej;` zd~y`F`5bP_PuI~K$}3Pqwb#eKGmMS{JISBR{$8!?4%;9Pr7p;qDhIfl(nEyLF`c}Fk4nyDfbaCmVM1|F+L0j+?@ z?7M-9*#bimf(VJRRfgUk++@%FIhi~%%*>*v9Ij1R5XWiL3OHTLE5LievK?68R>Lq- z#Gj9?4KY3)MmPJ8qoy;DkcpM}C&c&t#-k^u{ZPVl81vP43JUL0`)2_Z_fQuie=~mCk31m0hxnIt&RtgU ze&Tz*WT(OJZ^AwBqO2ALcrB6%WSC0Ow}IYI27rAYL_Ri!c?NPY87NA5vJJF;VhVWd z0QhiRZ9Sl&NW^v2sGWL%{~B|Cp8k+HUpYAMH1l+NxQoYM?plXGTv zvoUJ9B3ZqD*3)&{<+#XMK*`Vx;LayYvwql^_bHS3g9Ie!$1U-ALEPyQKOg3EmLvjB zfIEl7Y)=g5xCVML@hvmY5t0Zn0jcM38qbLN3`lj$OazpGt>+W+H$De0$y> z>FW0jF`J115&(vCV#x{MI}=FcdSU_^!dC#MG){2~!Tzf9n&pY#%!`Xy@lmrKNh8|0G!Ff?YLnsQ+&P0|H^Y>io zTozC>WC2nV_^JUs38izpfSO~nHM6Ury=XwDZLoa|Q!QX#=U+DrW!W(ZixQNY_ R9(w=)002ovPDHLkV1oH_n*jg- literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/a48d6d91-2e8d-4aff-a833-98d374d5e829/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/7fb25a3b-804b-46b6-8f88-3aeed7be26e8/993fc71a-1863-4c01-93cb-615fa49362bc.png similarity index 100% rename from sprites/spr_block_color_shape/layers/a48d6d91-2e8d-4aff-a833-98d374d5e829/993fc71a-1863-4c01-93cb-615fa49362bc.png rename to sprites/spr_block_color_shape/layers/7fb25a3b-804b-46b6-8f88-3aeed7be26e8/993fc71a-1863-4c01-93cb-615fa49362bc.png diff --git a/sprites/spr_block_color_shape/layers/8184b047-3992-4f30-9b53-ec835acf0e46/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/8184b047-3992-4f30-9b53-ec835acf0e46/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 19309e45ec581724dfe3b00707102d3b574c000b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJDx6%Ar*7pPPOG~ao}l<-LPTX z#*b`Gy<3;2f9Se*SeoPBfn&$CceqwK8L`!inFT*FRowHUW@b;a70=0e5?Whh<}m7T zA1z(FBX^I%`AWT7%`1!fDgy&_ycrXgGCP#r+a_{+Vp8bGm|szUZRS7!__pC%W$b76 z3H!f3z1f-0u8_OzMarysKWF^RZK!|EaG<>FGUv&2TV`h4-D|IQW8Dz+K~&-1TuZCn zpPt$ZFhpotFn>B$ZS`4O{(lq0g3KKkOP?Q!{5D&kf9GG0Uv>XyFh%ISW8ixLMgpt{ Z#Lt}#)w$@_`X1;{22WQ%mvv4FO#lulctHRF diff --git a/sprites/spr_block_color_shape/layers/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 53ac2758bc63ace1438d29e84f52b0b88f50437c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ!=5gVAr*6yfBye(f7pR(8spa5 zD~yZzBuWpgV0Pe3SQBZv!1dvQc7{2nW#+4TCdswzE9Z2|zU}m4b$j5``!7Gu5@%xsrF1+w>8C4gMYz{sFG)zo@dX5C_-cNjcf{an^LB{Ts5_Z40o diff --git a/sprites/spr_block_color_shape/layers/8ef19192-7161-41e6-8877-65db720af07e/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/8ef19192-7161-41e6-8877-65db720af07e/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 21930fc05b0efaec5bcd605c8392396283e090b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmV;30eAk1P)WStdvxu_IpKAg(S6|p=bPzU*_u9gs+0cB-Q(!&T!S4ojVMG6_3$O(xfJQ#* zwS=84w!#iN70stSw|*w~SNzvN!2gt2wd33g09;P{lAo`Sx%k=Y zk`TL7HUULL2~hX6deaslhlq^JImcta<+=1;fGwnMK@=x`)|?|U6Hog>N`Nh-YJhgU zyg4`4gnSD;&$YJz%FwI7%{kWx=4-vrxN`z{4S(GS=v?8>2|OnpsZi!DZ_bT<05w4c z*aF)Jpp>f#M3$F#w+{fAjt8B@r}vo6seupW{asTX+Cb<=_i;vjJED00005QQTMT4^yPf*`%hRec0~fAkUTRj!I47@N|Nwji{a0%*wqNX|F=l-z*%wQ;_8x|0D&swtezC;mlo)ZF{b z>H)MZ17O}$M#`N@HJ9S}z3J2A{{ULD-hyC2ow#ZaXRbK!0~UamtUbUx-la8n?uqIw zumH4V06>Ns-CA?056t~C9_J|q(2{i;Hr)sKcSUzHuue+SMObw#Mt-k8@a}c(G<-`w zdZ!C~9rH{`djiht#<_DmS3d)|aAkt;39GjYaml#_pd|~yl?gb5q_1C>a}l6zi2zb2 yqS5f|dYmP7ojU>Ak`sVu0{`ji-gh%V)A|EoDje(-9BVKD0000HL4#=&5rT!4b~cuNf}h~m`3Zi4rH!3d3K9sS77+vs;mo+1%k1pz?o9R+ ze9dfb?rz?DGkbS&ZQC|h3@)z3i`vWcf%RU_T)k(Q2t>*su6;Z_3-T5x)^`Al<9bQL z3KaoS`N64QKi&BF^|`p)FgRc1gxvwEoP&_iB1<4r4h8m({Th|yZ^XxI(`@Yo*XNwj zI{?MCAS6l<35Y#MrO$Uh@)?lwikT=okn4E~ikS!qWP6Uvc+X4u!c3$cu=Koy%uG1S ztb?WJ?^9iVV_AP=OAuzl1?p$FX(fo-nV2se8BczePgc^E*-2gB_mvfgcQ@jqx9i*5`YdP8zG0XMaOI!(Pk!9HIuGI&Cw}b!CdWCFutG&Z zQr=un{k(f<{n&qWRXu5f-)o#OJ3y6lP!d{X32^0*z|Btl9F^lW;_LOj+BrT5*5{m1 zI{?YGpd?BV2}m_ZrK|aiA9)YN@rkM@iVoyzUV^440s^_3qcUFeQoPg?Ne3)7FCo_x zjxs}7YQA19Rq=XX?up2OF*Pqi>Ip~HcaLpS$*^E#Pk0|B^!i?=5)}B*atu&YLbyPAC&)yqshfx0HuI^yA3oK z)99Wf5+be0WyI;(@`@30000lkYXq;0LczGd;T?;e)s+dR(V$^S=u^)+JIySz|=nAA5nqr?~^D4M=u?o{lh>hWQ-Er<(()4M=vtr7Lg2GZ9sM! zK*D$^rC{Alm_?R-IRtpFLSal84fA#tYFfAj^4W<#P9Pv<@Vd|by1zKeVdOJFtcF(cr59NF1 zA2EXpM7~}>y`3}XGXpL6Rjl=P=>OgWR)zY&@++`W=6hw{9l%+3fG#(HvtIbpJ%m&U RZ@~Zn002ovPDHLkV1nuXitGRY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/b72a8afd-72b9-4a76-8c2c-173286dacdc1/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/b72a8afd-72b9-4a76-8c2c-173286dacdc1/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 04ec293dcbd0596142a23afbd6a31b36c3abf9cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doF{P)s$+ynch+&;>tpvcO; zojLPhti!+*qi;)B1#ehB9NVv7^N}j>44~()7&`l(_;S`yXr8>7=S%10Ud=>43~0~a zu@*T&U*rOXv(|d+{P_R=N7S5m$V7SuLY~jDbw1#_s=kz4@@{$t^oA8vdh&u!lzxm> zoB{X7!2s6nO4Yme%!;|C=Y0dCZ{))OI~L`+F{fuCz3vO10jc2SfbMv)F%RiC*c~?@ z6%Gc_GS=;-F}M1_Guk3q9r-ZOLqp`P`+%M+@?pT5aAIQ~?gMU46Or)a9veD!-vRxregk}MVylL1jFoQ rj%bAR+H=oF|9LK+w{ke6h@XOgMfXY~ehH5R$v_ZHtA*O_qwqhwTlotgvFZIe0>mdH)`W!gSkfyLxG z#K|+*MK zbM$3c3j6s*6FV@|_Sb=+3OFJ!)waj=*i3dv&FT>%&m%^j#2#1uAhwXdWvZW80DB&< zWS~-2I3nM!SCa4XiM)YlWId{7{Dd?SUB`1*y$|om5d7p1EQCFuS2AEcY1W4w!d>)| zyRntLXsz6=9m4_9`^fe1ku6g5T)jf{4m=|FVjJn545Y=A5qu{fpo?t6Au@^{($qAH z0kRf5$@_WgN$H8SXEI=Fk+SxytnH9>eOYRL1a@z9qMP)iJTE+m^%L=Mz?yvi3`Si{UX@gF3R?iZvg72ye)81WEHl08;`=cC7QkF1tVnR#bF11X*0GVrTPZU^n^3Wa_8IGMD% zB5P(HcgdHJPj<C z-q{T&6JF^-y6973W};JF;Q4^AoACNEydX;uAanmnj>*?@kxc3R3>bT@2k2_4s$x({ f6)Vux9?8HTV;|{2(18Kv00000NkvXXu0mjfO6YA` literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/be39f173-9252-4116-8595-8ecee851a855/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/be39f173-9252-4116-8595-8ecee851a855/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d477bc9ef1c6c9ece9a27cf27c88fd6bf97408 GIT binary patch literal 390 zcmV;10eSw3P)gcIteaCj#<~Te*i5rp z*4VSN>&LYhnEoOm+9?YRxZNQGb*&{}KG%$njlUqB!gf*!E$^J{y8cR@fP6>0)xX07=Pw%$a;>Mqfq z(3;Qi=xly>0dK>mb3ijEKBcyVo&)->$VY+L3ny0dCDspreZDQJg!aV!odab0hMo5Z z&0K$1B^3Fd1H=$rXRVnlVoG$-a+bR-zjHv}>x4CPg(`8xkGD=hAQfr?x5`|hO6WTI kC_vmQ^Vq!lHJ)676R+~A#CP8nXaE2J07*qoM6N<$f?eURzW@LL literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/d1c859be-2b28-46ff-8289-fae7b22b7db4/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc/993fc71a-1863-4c01-93cb-615fa49362bc.png similarity index 100% rename from sprites/spr_block_color_shape/layers/d1c859be-2b28-46ff-8289-fae7b22b7db4/993fc71a-1863-4c01-93cb-615fa49362bc.png rename to sprites/spr_block_color_shape/layers/d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc/993fc71a-1863-4c01-93cb-615fa49362bc.png diff --git a/sprites/spr_block_color_shape/layers/d7b3baf5-9f31-416b-ac0f-de9bca90d60e/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/d7b3baf5-9f31-416b-ac0f-de9bca90d60e/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 2f439ea5eb59baed472f05ca7ee837ccdf7a5378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P)k4CEvvzCcHl7a*wM33Pd9I-UR(5-*@ZH0h|R?&OsmEylZRLlWtx@dgJxGxoAc z9GyU(=fB+baU6fN&x+3wcqdc@sPg;$ZsOzd*yS}&oOS?<;~Gh5AtJyjZ`;$rvsXvhv1uu*k*>%^!#?aiSp~Z zvNLgT;7ZR!;ASGW)z@|HRD!rV6Iqr;^E{h1)P6Yt#lHoc#EZbPEGCv^Y2wwMV;-M3 zO_Pa5QJ8oj02hGSH(;NfF-#)P0g#|Wa<%8E9G$U?v%3KHE9~1(pzFHBwHTQ|L?>(# z+Mc`ec5%_0@SRR@%2@)O6BJY#_SltoDQ5|AxZ;FQxtD-sCWc`!k?wP;axVc68Yd*m zMFcn};8e3goscRQ5#RtXD%WoXjdB$M>I9IWuWhYz6#)+R*?|Yk8K?+QCure+`S17- X(!ExbF_PDl00000NkvXXu0mjfgT~ms diff --git a/sprites/spr_block_color_shape/layers/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/d7fc1536-1456-4261-81a7-568f91a2dee7/993fc71a-1863-4c01-93cb-615fa49362bc.png similarity index 100% rename from sprites/spr_block_color_shape/layers/3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b/993fc71a-1863-4c01-93cb-615fa49362bc.png rename to sprites/spr_block_color_shape/layers/d7fc1536-1456-4261-81a7-568f91a2dee7/993fc71a-1863-4c01-93cb-615fa49362bc.png diff --git a/sprites/spr_block_color_shape/layers/d902e3ba-b9f1-4509-8efc-1d10538fc9fe/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/d902e3ba-b9f1-4509-8efc-1d10538fc9fe/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..346fd7097fd66e23bc1858ed1295aa196c65cbf6 GIT binary patch literal 265 zcmV+k0rvihP)ETQU@B`5;(4vDJb^zbNu`Sm=@bUu!cG#R5i$t#nn#$xe)|&* zgcB)10SZun0u-PCalm$!y+i?$iwA)9bVhx)59)haQcvQTI!jXOLy>oy&qw26;r;Cz z0;J*rkn%vjI~}PvizPL7`sp0sIH?LiDjtA4<5Ii{gzxOzdG4O|0I5^}i80hoch+{N zO>>-ZYKGJoYwH1h#{+OTg>%6Vd?)zsI{%+HzytZO^HxCL@c_I^F@RLwzJhNIf4I_c P00000NkvXXu0mjfm-TCV literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/d9c45cb1-d375-4850-ae88-ec098285b2a4/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/d9c45cb1-d375-4850-ae88-ec098285b2a4/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..edad08535e061b477a9bd20ef35631f0a508ad85 GIT binary patch literal 358 zcmV-s0h#`ZP)VU5c`)HfC?I@sThHZDVUHcs2G6}pn-}F{-u)~2}cou010j^l-I@1IhT)`ruls= z(6;T@=68T?-RMZsJD>z)StgvOsc;;}!d=%nZBW;>@Vc(T^E?Yr)3g=f3rYYx@B99e z4d8qj2H~OC0%(5tgRJ$7ys@HCVFSEnZI)%AV?e}gx}Ws;t?v;Y7A07*qoM6N<$ Eg0>QxA^-pY literal 0 HcmV?d00001 diff --git a/sprites/spr_block_color_shape/layers/dd35adba-1568-4614-8b5d-3beb257ba943/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/dd35adba-1568-4614-8b5d-3beb257ba943/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 18271e6a9146359b0ac6041a3436cbcd62b42b92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fvP)T}^SZ8EA62M9hK+XK9&Thc^w|=>IcBcZ6+SA-W ze*Y}wN6(`H%9aCg-)VJ^1)zt>OzXMk$MdF()n))Id0)XSZ&_^5ky*$u=Yj`dC2tSN ziC47e!99_m1s;Hv9017h-EP}+Z4RI^yLT4gd`?Ca7Vy_|;I4c5Gk}#m06DRW_B=EP zf&gVJZFO%e-xn{#KK(lGU0sl4@bE}hI~$N$tiRcAvpBrhz5=)iRRZ#7d$!T9W$po3 z$pZ*gLhfc+iP+3lfU>0mXqCV}C@GvJv6%+}%2E(OR>GYbk@sy4@Zb6ZZ3f;G@o$KH P00000NkvXXu0mjfJvzlC diff --git a/sprites/spr_block_color_shape/layers/e1e93e57-efbe-4698-aa84-b80f739992a0/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e1e93e57-efbe-4698-aa84-b80f739992a0/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..ee0e09efae2b5741d606c585e60c6d6bb79eb33d GIT binary patch literal 708 zcmV;#0z3VQP)GD7{8`ZT^G(b!XlpvQ_%KDIHpl8E{-R$>X!KNS!K{0MJ{v+!|f^F5+*0{ah# zabVx&fP?D|E`G(E4^4n~oMj~n%0QLZ?-@uV4ox$Y3&Bz}Cuvpn{2izLBs1mlB2PZ) z;#1D^6Der_%z&i9WSTu{MCJqIYo*wGj+OWUuJ2~g$@_HjoHy@iLM22F;o1S{*I#I$ zvibb|vMbQC4VhT8uAU~KjYjsATq^#N{D?QVX3=bYKX~RV_NDLcg76ye&l=S;_LO?y z183qWJexUaJ+uku`NK2NHx8oG{<#a(6Dh-2!q_)BZQloP);zS`^At0y4VJ~H`2YTU z5~}xsCR&Qkua;taEjJ3BiC|!39&qtp;Bza`r&gik96A3~V0sA-XV@!2hp|Ow64D%6 ztyq@4MssMJFFLupj@(HD6-eTrmi<;7-+}k^t9jfG@x9bp=-yBrbdJ2POrBL=V9G$1 qmpucCIefLsL-=+}rng2{y#ni)!gK6Dfb7`-0000e4anJ(+^uVK7=E9p_fuMdaW6QcZM zm{z@0_WTqcznA5*QO%!(UzbjcC)^5+l)TDl(4EMY$dG2>quk@a#^#L8jKeJ!mK)m- zI56&DzE}IdFO>1j(`}!)5~RW>2v2hF7vf>(5oxey5HsH)#Lu(fcTY%Vp`6?sJ_(J6 zhYjZU_cdk46uN2n6`uTDT+oo|lK1%VJBBLe9n1-Z%7>2jE@HT=ZeX|ble0SS0_GW~ nHK(e-fXJ>aIv`^Zz`!6kz3``N@nR;RzZpDT{an^LB{Ts5u*z`* diff --git a/sprites/spr_block_color_shape/layers/e3d6124f-a72f-4abd-bb7c-1734c08ca471/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e3d6124f-a72f-4abd-bb7c-1734c08ca471/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 770b1ad693c1ae1cb1389be6175325092f260531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P);P&3 zq8)%9_b{J7`G8#=v1wuGga8bcGBPXC=S2{VEO*=LkNu?=Y-P4%dZqVfYt!R z0l4x#p*Y7Wk7h1P%By8r+H07*qoM6N<$f_l89Q2+n{ diff --git a/sprites/spr_block_color_shape/layers/e897ccd4-961c-4801-b6cb-27e1461572ea/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e897ccd4-961c-4801-b6cb-27e1461572ea/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..ef6074ba973175e717bb3026d3a29434250655f6 GIT binary patch literal 748 zcmV@Tw$hhQVnjh;R5;dO5fq(t)`7>J6a@Vdg|1>!L6Qgd zp|A9@;lR0^(_FGz>T2QAZNYurkF;SQqipYc^5c1~=kt2*``!#T#aj|Td`s$Uo!G{& zazDd%ZuTdiK_|)%B<#u|>Ugid`KM0Ebw$N~+HoK^&`Pun#EA~2n}n1a{wpWsI^rk$ zXvcvDmzlWiE)wfwxOkJ|p#h6(q$(%mJbCl18{EzN6u7_k4(J8nxR?j8v=dX;qD0G# zp6F7#=*SD|)GwWo;{>m3zUoBl#RsC5_sOzedk16;)FnOlHd$+wshHxUjf z9pxpB*Xg|FESuk`Skb;chxN|eiF(b%z~)I3%f#uSG_m(`GunJ|QwcFqe;iI_M)hS2 z8C%wfX&&zl*od*gC7zEM%12g++H)W`l_e_u4aD$`S)%Wv1MML4*wwR>7@0@5_%1b} zJ(Oo1SrfjFnDO`#{R<^zh3C{R;-g_Wp&bX@?Kn$f0`)+?d3+Fg?DOv-P6jj3MPW-_ z4f1@hBbf<|KiF#_mgZK8+KYi!2iS1fNR08Dxw$=h6F2R@fSW$Mw_2t@VcpOA(+Yj; zE}S@a7Ii@{P)KXMwtzr>Ap7oj^>~ z-T@f{*5Wr}hZ}D*7Q)Hg?tsY=K%KPXADr)T=kXc~n%GcEfq4JO4Y&>6;E@9rIhYRWZ+zLo6hr!23$il zz>(Q%ZqpANI2)n?spe^#ZtCMW9y4$@cJBe^d-ufkGr*BbHD~>>fwS@d4u}Tct@-bL z2ZmuVI7cq&*UJF^Cm<5$eCM<2Jn#43h&XcGiaAn_OwutA?wFhj{~3^K4q!JYN%D~n m;M8DU{~6#8KG)6-xW)tY1l+-IbB4qK00003@;Ta)iM@Xg*0CzUy^pM(**Y2oSmFB z`OZ%cXL-{!nGdVSd%s~Mp4JZ+zV-Z+myCf!0G^l6@7B7Q2}_ri>^vCzv2T^N=W-;{ zi2!?EEN_%7Up|z)x}91&+e7>7?Pq&|JXrT267eI@>-pWx`T+V^JMKYE#E$?k1aqoA zsW;UiyQzWsQ(B z@rLHSw{IiGXH?9Q`)up*~Q*ezkV3rxO8L?v?!OKEQKDLJ{BzhnSyV9{|%( zO_-bxw5Qt#0K5h#XH*kI?LzDP+Tuq5(&Os@cY0)4c7ajj%JQ!##+Na!h(ejv*!+hSa1k%Bu<57{~dn=`r-OrW66a@00000NkvXXu0mjfvqrHp diff --git a/sprites/spr_block_color_shape/layers/e9b85064-3908-4967-95a8-3296b3bb2a10/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/e9b85064-3908-4967-95a8-3296b3bb2a10/993fc71a-1863-4c01-93cb-615fa49362bc.png new file mode 100644 index 0000000000000000000000000000000000000000..e85b2c07bd90a3e83c0a452e086d7d3359610d6f GIT binary patch literal 674 zcmV;T0$u%yP)oz>(tK{({4q1EQ%L=c zErpzW0Wleg9AyD>c`>f<@k>}T(D(N~K9e2Tr0tQa{HIX8I><;C(V+DEAAAHq_vdP$=abAIrjphDvvAt6DZ;f*^WJAH=dE5I7mJ!zaM{M zn|=#A%@Zvl<8yZKznpskQ3k~s{#&pX8_8FY6D-j0eIE*BJNA<2%q<-%<8rnb$$5o< zWW(=)WmrwNVG%inH`-oLo;7!Li1g3fLS4?ifH;cOCBU78?;-z$kM+bmfc@l6b6dMg zzk7s(fFHdf~q0+J2C2TB+t)8>Vye)UnXQa#8@?0pH%f1k>N&y#v#KzI{ej$i<7oN0%4ZH$&kEE!zza zSwbN(ctQZ(=b~DMVEXm7^I%#~K?Q}6F8}ZMZxlW(L;Wmp6@m?ozIsli? z1(Z}!G{E?TJq1*Tyk!NkgX92goHAu)K;01V)YW0=oA+`B`P{M*~t!L+cdCYVM~ z6N4uNVELR!LL5Z_y3cUMIWBpadALGi@Pq&?7ksz}p^1(2FE3saB@Zh{&_iPIga9lJ zpqF^0#yKH*P9Y)e4j3o^cL2;~?;lVn&SCN}^LQj6_I!Tw5KMCki=#SVpa4c~NUL%H zCXe2(7(5{WD+j*3fbd~)Mrxenl85;mmj5vvFi-$zIe#voX7DN5_ZtYfEU4l&in`oCrH>s@mR;L`4{NZxV;sy zGCx2u9M6sGz0=ML5UZxlS@X#TY7-3boN{*(otag0E6)F8pD_)1k(>hlPOUjJ z%f)pcNDO$9>;c{JN^72r^DamXco7WH8Edq(=2joLLPC3Y0dK=^_W}K`XlDhi7fxx- z|ECY=mkZIEmB!oc1LOe-R?TuXwc;yC(5J1P6<}>PP>l7uog4q1J)oiUrSYtR+5`jo dyjC~h#T!+fm}-TEOtt_3002ovPDHLkV1g{>lnnp? diff --git a/sprites/spr_block_color_shape/layers/face835c-3101-4ac5-8d77-497d75e97c76/993fc71a-1863-4c01-93cb-615fa49362bc.png b/sprites/spr_block_color_shape/layers/face835c-3101-4ac5-8d77-497d75e97c76/993fc71a-1863-4c01-93cb-615fa49362bc.png deleted file mode 100644 index 7121a7183f9ffc8e5e4b8a4add08499a623afced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~A&P)gnG(Jgo4qOhG-$6H0ifxW*s+HlkvOk4ztPr zW@a;+)-)I#JVmuMHzxqIUO63iJH~D#k^e5S#m@^-qC+(vGr}0%*wqNRhv<6Y>D;|N8maxt|O`QcV#_IPx#@qvqaM zS`DCS836O0GEyFyRCCFX_l+O>=K-{2eFeidjl@-RMCS7IK41Z8$vOkP<6T;F=b8Au z3oHOF832%>M%UI{>I0!)`lBqN09rBtxSzee-ahcMqW=5I0AxBABfnK2;9KfvU>Sct z{7mq7{1%syKL;hbbT=Tfs{SpD75nOE025ax_?fVJyWp21w*a(c0k|^pcbYw7^S@tL zv5M=le-IvkO&u4QIg$EqNAH`n`*a-xx94Ws(CZx zDHmd5(yzTfpQkIQ80S6ZxCD~IpFm^+>^+}H%|iYZ0LI;_sLSJB)V<@SOCTv|6JYP> zJ6F_E#};+Az4`9xW+6Wc0PUJ3>dBRYAOpw*l=vBeq!CJhy&p6yqGIx1y(B6!!JiAu zg82#nwj~F_ju(>>g?xjZ{ZM*?b+^Gyl Si;Ext0000k4CEw)Xenu+;R6&@h#ye$OiF%$s8a9&npAv&j+0k%v>3B%hg_ta#()9OjJ<3U z?)x5SG0!vmP+68g+INNO>K}%R09D@iy@_4d9r79{-gW?s<1v!ZLPUU5-nOkd9)`ih zZQFu4jt}=soKQPpE2pqYNZ}+vl|zBLuFWwj$8*HGu0finhv!{Rh#i39QrIMXUwv50K1gQbK)}^=R7QL5%ll^H(g97+eQ?c0Xfs1-dcG`+D4!$= zI};}d?)2OTZYDxo{Wy-7N)UHv;`w|Ad7hhNsQq#Pihm0>i5Gz^%S?Pc9wy%HIp*(# z+MZwK?c$;@;U}Hol(PglCn%^g?D19pN;yk_!yPAF%AEuxGf`EQiFBPyl{*P=&^RGc zE+W7=0lS(F>V#CehyVxJ&8~hcXq2l6P$z%{{cLNMs|awg_YT}x-hqk$b%GZDm;a7` Y0cnytlm-RVs{jB107*qoM6N<$g0u0|82|tP diff --git a/sprites/spr_block_color_shape/spr_block_color_shape.yy b/sprites/spr_block_color_shape/spr_block_color_shape.yy index 89e3a6287..22972762a 100644 --- a/sprites/spr_block_color_shape/spr_block_color_shape.yy +++ b/sprites/spr_block_color_shape/spr_block_color_shape.yy @@ -16,749 +16,749 @@ "edgeFiltering": false, "frames": [ { - "id": "3c40c312-4fe7-48ce-af63-68ea74b251df", + "id": "7cc30889-2c67-4f9d-bd07-f797149cf177", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "d30ea133-2837-443a-b0db-237267106d7e", + "id": "00a124e3-d3e8-4c0c-8022-b59b89d31037", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3c40c312-4fe7-48ce-af63-68ea74b251df", + "FrameId": "7cc30889-2c67-4f9d-bd07-f797149cf177", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "91d06aed-0260-4e91-a723-d6ccc27e0826", + "id": "5fab1214-6ee9-4be1-ac03-360c915a7d8b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3c40c312-4fe7-48ce-af63-68ea74b251df", + "FrameId": "7cc30889-2c67-4f9d-bd07-f797149cf177", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "570118b1-123c-474b-9147-9560ccc537f7", + "id": "f417d6a4-c1a5-443c-99af-5eaeb912c1da", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "37a74ffc-318a-4517-928e-27d5ba85c81d", + "id": "38318af7-f08b-42ff-8180-e2660bdc27f5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "570118b1-123c-474b-9147-9560ccc537f7", + "FrameId": "f417d6a4-c1a5-443c-99af-5eaeb912c1da", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "cb1db3ec-3979-46ca-bb72-b6cf695854ac", + "id": "fec26006-ddcb-4762-bc06-149513c9c4da", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "570118b1-123c-474b-9147-9560ccc537f7", + "FrameId": "f417d6a4-c1a5-443c-99af-5eaeb912c1da", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "3bf63775-9706-483c-8c28-f52ba15484c9", + "id": "d902e3ba-b9f1-4509-8efc-1d10538fc9fe", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "7ae04598-3564-49c8-8de7-8e0295371f38", + "id": "20ad5f5b-4dd2-4fa9-b0f0-f31c796786f0", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3bf63775-9706-483c-8c28-f52ba15484c9", + "FrameId": "d902e3ba-b9f1-4509-8efc-1d10538fc9fe", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "20396424-a361-4dc3-83ce-af3007c79baf", + "id": "727b0965-cb9d-402d-9563-02b901f713dc", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3bf63775-9706-483c-8c28-f52ba15484c9", + "FrameId": "d902e3ba-b9f1-4509-8efc-1d10538fc9fe", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "46825d5d-002e-43e8-a62b-198caac29b0e", + "id": "234b5f5a-880f-4017-8947-839b5bce1429", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "9a08146b-d591-4c25-b206-1e5f0f5c4932", + "id": "46a75c7a-703d-4641-8ebc-fb0fd446cf53", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "46825d5d-002e-43e8-a62b-198caac29b0e", + "FrameId": "234b5f5a-880f-4017-8947-839b5bce1429", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "81709677-7a55-4160-a4f0-60c6e32b8912", + "id": "b5df2201-1c80-4a74-ac53-db2ef2724bee", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "46825d5d-002e-43e8-a62b-198caac29b0e", + "FrameId": "234b5f5a-880f-4017-8947-839b5bce1429", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "d1c859be-2b28-46ff-8289-fae7b22b7db4", + "id": "d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "48631ace-aedb-47df-87ee-73aebcf2b874", + "id": "e47fdb39-bc64-4c68-9850-1322b2857da1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d1c859be-2b28-46ff-8289-fae7b22b7db4", + "FrameId": "d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "00c4c9c1-8459-4aeb-9640-0c17d9508e28", + "id": "9be05e81-0c5c-4935-b97a-640e7ed3d98e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d1c859be-2b28-46ff-8289-fae7b22b7db4", + "FrameId": "d54dc2f8-a9eb-4c2a-b469-dba4df93fcbc", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "face835c-3101-4ac5-8d77-497d75e97c76", + "id": "96c128dd-327b-49ef-a16e-7dd36abdf3ea", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "20d95152-ae95-48fb-bb34-cdc1f425538c", + "id": "eb59450b-f77f-46c7-b614-24a91c61f12d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "face835c-3101-4ac5-8d77-497d75e97c76", + "FrameId": "96c128dd-327b-49ef-a16e-7dd36abdf3ea", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "7676a47b-1452-4514-99f3-db1249d2e1cf", + "id": "5078cfc4-ffec-428e-ad42-96c496defbe0", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "face835c-3101-4ac5-8d77-497d75e97c76", + "FrameId": "96c128dd-327b-49ef-a16e-7dd36abdf3ea", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "778cb7be-b35a-431b-8b9c-85c7e8e65469", + "id": "6accb369-5d73-48aa-9eb1-8918ccc62944", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "d2538ebd-e2ce-4755-ba0a-2bf2e254be00", + "id": "6ccf5ff2-6927-452c-810e-e83dfb69f8c8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "778cb7be-b35a-431b-8b9c-85c7e8e65469", + "FrameId": "6accb369-5d73-48aa-9eb1-8918ccc62944", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "2a094ca6-8c36-4851-a1dc-bfbb7db157e6", + "id": "72089892-6036-4f8d-b9f9-5af320e606a6", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "778cb7be-b35a-431b-8b9c-85c7e8e65469", + "FrameId": "6accb369-5d73-48aa-9eb1-8918ccc62944", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "a48d6d91-2e8d-4aff-a833-98d374d5e829", + "id": "7fb25a3b-804b-46b6-8f88-3aeed7be26e8", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "657834c6-564c-48cd-90f3-0a654e0ecad0", + "id": "32a456c0-496f-4af8-8df7-5e905c83c8da", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a48d6d91-2e8d-4aff-a833-98d374d5e829", + "FrameId": "7fb25a3b-804b-46b6-8f88-3aeed7be26e8", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "f13c233e-6eea-421b-be68-88c25a9e0f02", + "id": "56b81b2a-22dc-4250-a2fc-5da9fc6aadc9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a48d6d91-2e8d-4aff-a833-98d374d5e829", + "FrameId": "7fb25a3b-804b-46b6-8f88-3aeed7be26e8", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "1e53ebf2-29bf-41dc-b447-5e8562f97a8b", + "id": "601451ee-0cf9-451a-a4c4-8b53708e5be5", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "5f92c141-8fef-48a9-9f8e-c73e985146b8", + "id": "8120bc22-53c4-44bc-9516-ff181b2a8886", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1e53ebf2-29bf-41dc-b447-5e8562f97a8b", + "FrameId": "601451ee-0cf9-451a-a4c4-8b53708e5be5", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "70936ffe-604f-4a52-af3f-b8adf0502941", + "id": "beafc1ed-2d42-4734-98e9-402991c550a6", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1e53ebf2-29bf-41dc-b447-5e8562f97a8b", + "FrameId": "601451ee-0cf9-451a-a4c4-8b53708e5be5", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "137e1fee-e8f6-499f-8e08-ced3ac0e44ed", + "id": "d9c45cb1-d375-4850-ae88-ec098285b2a4", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "9f52e505-e179-41be-a66f-7540bd746933", + "id": "57ec8859-9989-4416-83c9-03fcd2070ad4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "137e1fee-e8f6-499f-8e08-ced3ac0e44ed", + "FrameId": "d9c45cb1-d375-4850-ae88-ec098285b2a4", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "9e7d6291-d8a6-45aa-8fec-6c97eef3bb2b", + "id": "0d5d5067-0298-490e-9209-5cd7d32ee255", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "137e1fee-e8f6-499f-8e08-ced3ac0e44ed", + "FrameId": "d9c45cb1-d375-4850-ae88-ec098285b2a4", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b", + "id": "d7fc1536-1456-4261-81a7-568f91a2dee7", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "0740e753-f526-471f-a5c4-9882ec858bb1", + "id": "56eac9d7-6fd2-4548-b168-5d36fc6a6656", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b", + "FrameId": "d7fc1536-1456-4261-81a7-568f91a2dee7", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "582fc4b3-b3da-43bf-b7d2-d729e2d5616c", + "id": "a7f99821-c42e-4d2b-baf5-44f482937bbe", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3c35f618-082f-4e7e-b4bd-0dd1af4fcb3b", + "FrameId": "d7fc1536-1456-4261-81a7-568f91a2dee7", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "55ba8420-6cdf-4485-a29c-1794c2ac8d44", + "id": "61aabb78-a106-42cf-b5bd-028471e4074e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "a0a5e0a7-ab4e-4bd9-a5aa-47795583e1f9", + "id": "74bfd476-db61-4b73-bbd8-b02dd1d75e04", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "55ba8420-6cdf-4485-a29c-1794c2ac8d44", + "FrameId": "61aabb78-a106-42cf-b5bd-028471e4074e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "a931fe62-d1bb-4661-af0e-2367dff6f79e", + "id": "06bdeba6-eceb-4034-adf1-a5687a1da1d5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "55ba8420-6cdf-4485-a29c-1794c2ac8d44", + "FrameId": "61aabb78-a106-42cf-b5bd-028471e4074e", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "e3d6124f-a72f-4abd-bb7c-1734c08ca471", + "id": "fb39c2a5-7177-4fca-9744-3b95be5452c0", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "165ff8f9-7347-4cb1-b22e-48cf404958b5", + "id": "6bfda34c-30d6-4ba0-819e-da11aed8f638", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e3d6124f-a72f-4abd-bb7c-1734c08ca471", + "FrameId": "fb39c2a5-7177-4fca-9744-3b95be5452c0", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "70367dda-c5f3-4c6e-acfd-bc50d7e8f743", + "id": "b57186d3-c9bb-4176-be37-a5e441082c82", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e3d6124f-a72f-4abd-bb7c-1734c08ca471", + "FrameId": "fb39c2a5-7177-4fca-9744-3b95be5452c0", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "4c2de224-b6d3-4354-aef6-ac7e60089e89", + "id": "b113d1ee-9737-4d59-a3e7-7a036b7c81ae", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "b1f36ff1-f322-435e-bc49-64a4d7311e38", + "id": "f858d06d-d124-4a3a-98b9-d829469020b5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "4c2de224-b6d3-4354-aef6-ac7e60089e89", + "FrameId": "b113d1ee-9737-4d59-a3e7-7a036b7c81ae", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "dbfa433c-79e8-43a0-96e0-fcee6f270248", + "id": "b32fac25-2e04-4635-a3c2-979ac813a9af", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "4c2de224-b6d3-4354-aef6-ac7e60089e89", + "FrameId": "b113d1ee-9737-4d59-a3e7-7a036b7c81ae", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "b72a8afd-72b9-4a76-8c2c-173286dacdc1", + "id": "be39f173-9252-4116-8595-8ecee851a855", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "076969dd-b24f-4824-8e9e-6be8f65815da", + "id": "34c0fe0b-92ca-44af-9118-66ce51e43474", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b72a8afd-72b9-4a76-8c2c-173286dacdc1", + "FrameId": "be39f173-9252-4116-8595-8ecee851a855", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "540cc0eb-ff97-474f-a9d8-9dcff64497c8", + "id": "71a84554-8135-4e0b-b685-a8e444982903", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b72a8afd-72b9-4a76-8c2c-173286dacdc1", + "FrameId": "be39f173-9252-4116-8595-8ecee851a855", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "d7b3baf5-9f31-416b-ac0f-de9bca90d60e", + "id": "e940e5dd-3db7-44ec-abbd-f58989166c6a", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "1660f58d-4ec4-4f4e-a0cd-521d7ef88479", + "id": "f95c36cb-60ed-4f9c-a403-bf5fa8087e69", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d7b3baf5-9f31-416b-ac0f-de9bca90d60e", + "FrameId": "e940e5dd-3db7-44ec-abbd-f58989166c6a", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0a5c61fe-8d75-48c1-b046-0e9c1a87ead0", + "id": "2b343c25-552a-44c8-b2fa-5937d7a91f30", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d7b3baf5-9f31-416b-ac0f-de9bca90d60e", + "FrameId": "e940e5dd-3db7-44ec-abbd-f58989166c6a", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "a42742d6-70a2-462d-bb6b-66bdfdc30a0d", + "id": "e1e93e57-efbe-4698-aa84-b80f739992a0", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "c8ab37aa-a65a-44be-a550-ba5149453351", + "id": "25b4ae54-6d69-4774-809f-a48495524add", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a42742d6-70a2-462d-bb6b-66bdfdc30a0d", + "FrameId": "e1e93e57-efbe-4698-aa84-b80f739992a0", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "437948ba-9b31-42d8-885f-6e2b1b1bc17c", + "id": "29c2b493-03c6-4516-a5fe-e671bac0a514", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a42742d6-70a2-462d-bb6b-66bdfdc30a0d", + "FrameId": "e1e93e57-efbe-4698-aa84-b80f739992a0", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "e99bb026-b4da-4b3f-ae51-3fe387b81757", + "id": "5d961217-9db0-40f2-b1aa-5941cc4d117c", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "05af8e3a-7a08-4b79-aa26-cfc1f2544da6", + "id": "53983a20-68ec-45d0-999d-61b5edeb9c95", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e99bb026-b4da-4b3f-ae51-3fe387b81757", + "FrameId": "5d961217-9db0-40f2-b1aa-5941cc4d117c", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "bc661fe9-22de-4b32-8fd5-5a8e6512ae6f", + "id": "4c09d4b9-e0e7-4f89-8731-d7f7c20067cd", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e99bb026-b4da-4b3f-ae51-3fe387b81757", + "FrameId": "5d961217-9db0-40f2-b1aa-5941cc4d117c", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "e2fb0926-5dd1-4e21-ba04-27a0d35c57d6", + "id": "7b0982e9-9963-4382-96da-57646be7ac6e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "adc8c0db-15be-41ce-94e1-d12f7b25c005", + "id": "4ca33859-54c3-4635-8374-03e1f264d6d8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e2fb0926-5dd1-4e21-ba04-27a0d35c57d6", + "FrameId": "7b0982e9-9963-4382-96da-57646be7ac6e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0a293e6d-2ba7-4e3c-bfc7-9b3f9c688191", + "id": "d714d52f-6b13-460c-9791-595df7db414e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e2fb0926-5dd1-4e21-ba04-27a0d35c57d6", + "FrameId": "7b0982e9-9963-4382-96da-57646be7ac6e", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "8184b047-3992-4f30-9b53-ec835acf0e46", + "id": "e897ccd4-961c-4801-b6cb-27e1461572ea", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "6429e9a4-b07c-4f8c-a9e5-dee3793b0504", + "id": "858ad2cb-2cee-4a01-b016-bcfc3c1df098", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8184b047-3992-4f30-9b53-ec835acf0e46", + "FrameId": "e897ccd4-961c-4801-b6cb-27e1461572ea", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "c395246f-0fdb-43e1-91f8-675d5f2d9d8e", + "id": "36d1ef72-38a4-443c-aa05-37d0060e7081", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8184b047-3992-4f30-9b53-ec835acf0e46", + "FrameId": "e897ccd4-961c-4801-b6cb-27e1461572ea", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "b952d932-78e5-4629-b113-8bee4d60d7ff", + "id": "1a273649-ca60-449d-a85d-3f7e593de0a9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "5e5198aa-d702-4528-8f7d-fff04656eb57", + "id": "411a006e-37da-4706-87e3-1eb9a0460d50", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b952d932-78e5-4629-b113-8bee4d60d7ff", + "FrameId": "1a273649-ca60-449d-a85d-3f7e593de0a9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "3c06b713-ad1a-4844-8a9f-c5db1af1137f", + "id": "f5767b75-920a-445a-a0e1-feafbc06b057", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b952d932-78e5-4629-b113-8bee4d60d7ff", + "FrameId": "1a273649-ca60-449d-a85d-3f7e593de0a9", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "dd35adba-1568-4614-8b5d-3beb257ba943", + "id": "5d61bba5-940d-4d6b-ab20-f95f70f9df0f", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "72ed70cc-0282-4353-a550-e5c36b9f8cb0", + "id": "63dad088-6c57-484e-a9cd-99e2ca0fe9f4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "dd35adba-1568-4614-8b5d-3beb257ba943", + "FrameId": "5d61bba5-940d-4d6b-ab20-f95f70f9df0f", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "503021db-108f-41e0-8097-e00835463d2c", + "id": "e2aecbab-e9cb-4c11-aa61-cba9fb8dac34", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "dd35adba-1568-4614-8b5d-3beb257ba943", + "FrameId": "5d61bba5-940d-4d6b-ab20-f95f70f9df0f", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "adcd5e12-8fe9-4f12-b63c-69e6cb230a47", + "id": "10c1cc73-5ebe-4b23-967a-d5cdfbcde838", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "b7fb577f-3c4a-42ef-9887-3cd219207ef6", + "id": "0072685f-f060-4622-a521-8c419f831ac1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "adcd5e12-8fe9-4f12-b63c-69e6cb230a47", + "FrameId": "10c1cc73-5ebe-4b23-967a-d5cdfbcde838", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "eff6d425-b860-41c7-ac1f-787aa6e1ad75", + "id": "db4d3205-fd23-4a63-99e4-ca3670cf93f6", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "adcd5e12-8fe9-4f12-b63c-69e6cb230a47", + "FrameId": "10c1cc73-5ebe-4b23-967a-d5cdfbcde838", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "fac8bf2b-317a-4d97-87aa-a82b1e367b54", + "id": "345984f9-d74c-48cf-bef8-b505952a75c9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "d27cf762-35dd-4872-8764-bbc92650107e", + "id": "ca4ec801-4a80-4653-adc8-d8037f5a6fbc", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "fac8bf2b-317a-4d97-87aa-a82b1e367b54", + "FrameId": "345984f9-d74c-48cf-bef8-b505952a75c9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "7cefd69c-af1f-4112-9834-8efa049e6010", + "id": "4cfeb5e2-87d2-4edd-bc9a-1841b4185b0f", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "fac8bf2b-317a-4d97-87aa-a82b1e367b54", + "FrameId": "345984f9-d74c-48cf-bef8-b505952a75c9", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "ec92d6a7-2d39-4858-8a51-8c7c6ee5925d", + "id": "35d40844-421f-4918-8295-9de8e21b8620", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "85c573b1-033e-4633-99cc-cf847a9c830e", + "id": "05f9e1fc-88e0-4059-9af9-5077e5ad52a0", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ec92d6a7-2d39-4858-8a51-8c7c6ee5925d", + "FrameId": "35d40844-421f-4918-8295-9de8e21b8620", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8fa53254-4aae-4820-8e9d-59e99c6e91c3", + "id": "9f0ceee8-3651-410e-9c84-ab69460acb1d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ec92d6a7-2d39-4858-8a51-8c7c6ee5925d", + "FrameId": "35d40844-421f-4918-8295-9de8e21b8620", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "38ce098a-4d09-4dd3-a3db-068345b0f946", + "id": "bd19f1fb-911d-4681-8a9a-aaf42c48082d", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "4395a2a0-0eb9-45db-b41c-4bc5afdd24ec", + "id": "c6bc52e0-c2da-4c5f-8515-0a7bf5407d0d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "38ce098a-4d09-4dd3-a3db-068345b0f946", + "FrameId": "bd19f1fb-911d-4681-8a9a-aaf42c48082d", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "807c807a-5b36-42af-94f6-280879926ca1", + "id": "ba911ded-aa9e-4900-a248-4d4ed291ee1e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "38ce098a-4d09-4dd3-a3db-068345b0f946", + "FrameId": "bd19f1fb-911d-4681-8a9a-aaf42c48082d", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4", + "id": "e9b85064-3908-4967-95a8-3296b3bb2a10", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "e85739a2-91a2-4e64-aa89-e5bfe98840f2", + "id": "b4c18152-dce2-4570-addd-4dbf77551eef", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4", + "FrameId": "e9b85064-3908-4967-95a8-3296b3bb2a10", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "3f3fcc21-fd9a-4306-a871-48b2f415a410", + "id": "fe1f0158-c6cf-4642-b16a-466ba7c3a154", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8c1b3e1f-63dc-40ce-ba58-be8c78f7e7d4", + "FrameId": "e9b85064-3908-4967-95a8-3296b3bb2a10", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "21c46e6e-dd05-45ae-ace3-961a2c7ec4b4", + "id": "76ac0050-804b-4afc-80c1-928082ab51fc", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "cc3c2ed0-f06d-4f25-8ff1-e55e104eae4c", + "id": "cb851381-3494-43a8-8b66-f4fde5a1ab24", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "21c46e6e-dd05-45ae-ace3-961a2c7ec4b4", + "FrameId": "76ac0050-804b-4afc-80c1-928082ab51fc", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "49f9b28b-8fab-440c-b94a-0df1564146f6", + "id": "6bb653da-d3ad-473f-b9e8-0153a49c08c0", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "21c46e6e-dd05-45ae-ace3-961a2c7ec4b4", + "FrameId": "76ac0050-804b-4afc-80c1-928082ab51fc", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "378def89-d34d-4405-a5f5-2d16dcb9c410", + "id": "23ce296c-956e-4be9-a501-8856150ab04a", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "6cf3d316-ca53-4a3a-8839-c1ddefdf43f1", + "id": "93f0e5a8-f333-4e70-a55a-19bea62c614a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "378def89-d34d-4405-a5f5-2d16dcb9c410", + "FrameId": "23ce296c-956e-4be9-a501-8856150ab04a", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e131ef98-a2da-4ce0-ba0e-c172cbe06aa2", + "id": "89c18a0b-b951-4154-bf5a-b3a21c89aaa9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "378def89-d34d-4405-a5f5-2d16dcb9c410", + "FrameId": "23ce296c-956e-4be9-a501-8856150ab04a", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "728ef579-ae8b-4a23-b96f-a15dbeaf267f", + "id": "4d040c5f-94b7-490f-b431-ee716688e91e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "08ed0962-e12c-49fb-81b3-7e3edf21b0b8", + "id": "2155d35f-4e70-49c3-b29b-56963a679a5a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "728ef579-ae8b-4a23-b96f-a15dbeaf267f", + "FrameId": "4d040c5f-94b7-490f-b431-ee716688e91e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "7ff10d51-7155-414a-ac37-c7cc3c1d8f6c", + "id": "897337b5-ad9f-4dda-aff2-a5d4fae42f7b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "728ef579-ae8b-4a23-b96f-a15dbeaf267f", + "FrameId": "4d040c5f-94b7-490f-b431-ee716688e91e", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3", + "id": "1b760aa5-ddad-4887-8b76-afac45a5813e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "f8fbe72b-b9a8-4c2d-b921-ebd6e766fa32", + "id": "e993929b-4d26-47f4-83a9-bd1cbcf39e27", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3", + "FrameId": "1b760aa5-ddad-4887-8b76-afac45a5813e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "3d43c6ac-d5f8-474e-bf05-ae9ab804cd89", + "id": "c9987f83-843b-4e30-bf8d-2310bdf4b85a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "14e13feb-4f88-4e9d-bf57-7d7fc34f1fb3", + "FrameId": "1b760aa5-ddad-4887-8b76-afac45a5813e", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "ffc96e9c-fbff-47c0-bfd2-ae47361135e5", + "id": "20250051-8e02-49f1-9f88-bce8deb6921d", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "6cef3c9d-0b15-40db-9fcb-26cf75452f83", + "id": "d3979813-d8b6-48ab-8639-f37d5a78f36a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ffc96e9c-fbff-47c0-bfd2-ae47361135e5", + "FrameId": "20250051-8e02-49f1-9f88-bce8deb6921d", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "1e6b770f-d23d-42a8-9723-d6330a6e6d0b", + "id": "f9d3d26a-0dc4-4a08-ba30-9f78c11962ab", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ffc96e9c-fbff-47c0-bfd2-ae47361135e5", + "FrameId": "20250051-8e02-49f1-9f88-bce8deb6921d", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "8ef19192-7161-41e6-8877-65db720af07e", + "id": "79be5d40-37bf-4f37-8c28-9bcafa325765", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "64ef6c8f-8186-4748-9c2b-3a7526b41273", + "id": "35643d58-dddf-41a8-bdf9-500f51cf42de", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8ef19192-7161-41e6-8877-65db720af07e", + "FrameId": "79be5d40-37bf-4f37-8c28-9bcafa325765", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "302be5d1-c1d4-4000-942c-0867cdae535c", + "id": "e8dbb75f-6b8c-448b-a73d-7a9a47eec49a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8ef19192-7161-41e6-8877-65db720af07e", + "FrameId": "79be5d40-37bf-4f37-8c28-9bcafa325765", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] }, { - "id": "aa20fb47-8580-4242-af3e-c1859f0accfe", + "id": "5ce4a932-e9fe-4f82-b19c-dc70efb8f81b", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "e75662af-0378-424e-9585-ecaa16921eab", "compositeImage": { - "id": "7b928b36-2ed1-4d2e-8a62-9f135ed98027", + "id": "59d645ba-c582-4591-971a-b9a2f8b4263a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "aa20fb47-8580-4242-af3e-c1859f0accfe", + "FrameId": "5ce4a932-e9fe-4f82-b19c-dc70efb8f81b", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "030c6a4c-c19a-4d0f-a3bf-867628618b39", + "id": "c1d74a7d-c121-4e3c-8ff0-824d378066d2", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "aa20fb47-8580-4242-af3e-c1859f0accfe", + "FrameId": "5ce4a932-e9fe-4f82-b19c-dc70efb8f81b", "LayerId": "993fc71a-1863-4c01-93cb-615fa49362bc" } ] diff --git a/sprites/spr_block_shape/1c015f46-bb21-4d72-933a-fc000856c139.png b/sprites/spr_block_shape/019a157e-f4c0-4766-ab25-99116600b97e.png similarity index 100% rename from sprites/spr_block_shape/1c015f46-bb21-4d72-933a-fc000856c139.png rename to sprites/spr_block_shape/019a157e-f4c0-4766-ab25-99116600b97e.png diff --git a/sprites/spr_block_shape/08c63e81-e63c-4c42-b40a-3df02b1faafb.png b/sprites/spr_block_shape/08c63e81-e63c-4c42-b40a-3df02b1faafb.png new file mode 100644 index 0000000000000000000000000000000000000000..3b602b46ad9d6887895940f8141b7468f6d7ab31 GIT binary patch literal 417 zcmV;S0bc%zP)(DU2}_+F7t2HYuy zjz!E_dD}f-9Q(LiA``qO{$C#e)5lKMl$G=UoC$ADB-;movbeQ&s&Yms6Z0{S-Im^+ zkniijROJlL#A}v|c{~DIa0Je!oZ+nrnkStM0OwL3dM|&Ct7qT~8gKn59pd)S00000 LNkvXXu0mjf%9+9A literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png b/sprites/spr_block_shape/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff.png deleted file mode 100644 index dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL diff --git a/sprites/spr_block_shape/2a66ba51-6191-4628-8a95-4f2dadb33b97.png b/sprites/spr_block_shape/0bbf0642-10a8-4712-90e4-01da5e1cf06c.png similarity index 100% rename from sprites/spr_block_shape/2a66ba51-6191-4628-8a95-4f2dadb33b97.png rename to sprites/spr_block_shape/0bbf0642-10a8-4712-90e4-01da5e1cf06c.png diff --git a/sprites/spr_block_shape/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png b/sprites/spr_block_shape/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311.png deleted file mode 100644 index dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL diff --git a/sprites/spr_block_shape/11c37464-9970-4820-b4b5-6ae7217198e9.png b/sprites/spr_block_shape/11c37464-9970-4820-b4b5-6ae7217198e9.png new file mode 100644 index 0000000000000000000000000000000000000000..05eb0a00c0bd236c9d725e70ee5d519da0ab390e GIT binary patch literal 350 zcmV-k0iphhP)=pZO`IdJf{c64y*YxrzFhCYT%2gi0h2cb&`!9h2L&^yS*&=#(je+eNe z{r={fcAjUuZz8C<se`?CGE&*qo9`41o^2jDwDmlee0 zA%}Ra4a)sG*I#5BqVK$_?=u7-B?rJduME1t=0oeJ64$MB0w5&62if2NE*?XU;dwlU9>ax!5jGr5V3)y7Bk-H_!J`FRaPVKs>ucy& z-rpA6_cl*!LfKPJ-U_hyoU(P6bD=-GKZKa(sW2Yn5TBE*8(?hNadMr#AK(QLpTf9o zgRNh-mn0Qpn&-yvJXeSGn9@-dO=omckOiM^Fn;D6ku#g0dOv? z>R8niQK1RIv{-<~9kHl(g{J31>K>LjY=++^Sw`~Uy| literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/17257bc8-eeb1-453c-9fb9-895f52a759b3.png b/sprites/spr_block_shape/17257bc8-eeb1-453c-9fb9-895f52a759b3.png new file mode 100644 index 0000000000000000000000000000000000000000..cf9164fbf196c6e7c208124fb57e26eff9de33ab GIT binary patch literal 372 zcmV-)0gL{LP)ua8oW>lknz&OuI#3yVo{uP0y|PMRG@?+5V0 zKFe9bC7khg9kLi_w3P1->DL_2M}c3P_eTMEz)GA6pIw~N(hng2bZS_~-sz750IWoE znN!iZzwpcm*n*OP$`jC;%o9+@ zdqA5&*U%;)^#pRa(i7raU`(JZ7!xq{1l|LY@3NQ_v>Ac6(U^d)C-5G?_ln^v0MPZs z@b`cU+MXEv9#BE1ge&U)e8yt`?u2bacE|jG4`5V0A!culfC|*kl_W99LPMK S#-~XD0000%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr diff --git a/sprites/spr_block_shape/203e1876-f5a1-4437-b46b-34d8e3d5d6a6.png b/sprites/spr_block_shape/203e1876-f5a1-4437-b46b-34d8e3d5d6a6.png new file mode 100644 index 0000000000000000000000000000000000000000..c9494e985e9f5857122026567f0b5a2d8805128a GIT binary patch literal 398 zcmV;90df9`P)CY5T)XmwO@=ul1lMg7`Mh)zwuo0b6)`Gn$G|xoQYhNwF}}@`T^oEryBk>lzE&} z6JQE80i21AU)B)L5Z7w1;6;^5cCHjKG_(TPnX2Y0{$T-qLn}a6bNAV4<@3{n0{TYh zJHT<*I}wHLcVhe*V5hp8Gmm%R*8=*+|2v=+aBt23-aC-)-dN|p}Ph2jhX=d zp8zMKa*CLHJ{6C50Q-)&BVy<1irMM6Gtr61KDih;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9pWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT diff --git a/sprites/spr_block_shape/3b9fbc7c-6833-4d26-99f8-8991977ecab8.png b/sprites/spr_block_shape/3b9fbc7c-6833-4d26-99f8-8991977ecab8.png deleted file mode 100644 index c83bf3b27a27ba305396b595e6c62e479a9363df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9&2NO+LNE~E?(ZPk!&~NiI^fO!>7-7S~1P2mLB+*TilSk6(MNYvw_?A-I zJKk$A&0z=r_-YBlmi#y&FmZaydd@&ux8Eg++37-j9_K(l^5CcWQQ0UzQvy<`2yo@g zO|0yE8YsI?QsVQtE4Rm9IdYY&&%lF)?*L56j9xdEI^GD`2_+N}=2vxys^9px3PtXd1=@c+dHnXq`aQ zFeboz&ga0sXqiCMFeZ@hGUDszKx+h=#(xgjrnh3QoSzAx?!NLBz{AWh6_vNvEI%lV zI~NrEY!UF-<89q$}^H1Y1349wB0sN_m b5s<|N00000NkvXXu0mjf8ds_i literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b.png b/sprites/spr_block_shape/4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb1142eb870c44603a0928af800fa967b8f1296 GIT binary patch literal 411 zcmV;M0c8G(P)1p=5LCcLQUqd9k%JVuPAXlv(KDQ9_&s?>@{BYtTuR-g2*`!NffRA)z(ymuRhBz} zWNoHdmOV=|b9<}vBF`Sr$pk2?_p6w7iz!|{1Ra4@dPC8scNER-wYRYTI(a#-1J650 z5zdC3(BlAC{<146KCN?#ZhMq_S`<0s5<5d?+HB) zpa=NG8@lJgo@hS*CNLK|0$^5TQ%~oZ@vFWB{o{*=wXQqX8(#>jlKB0Oy}|3%TxjbdYWUT#E(ZraE0fPtiH{93`~# z>@}SR;9Cy>oa0SdsEAI{8TOny-*u2*XMzFRocP@tSdw|L4jzj`*J^k;w zxd*B&QL!1s-vFT$x845f_5sdBAHn_J)<9~`1d8psu?OVO`5wU5fvp|@sES}EP;0#b z=f4NI7pRIfdM`Bk&nD65rgLF@1?RH|C~>!@*Oie*&oR$dOBI{pG!4MDtO2-+;NS1N tuEhLjfD=^_tb})fvGNW;RU{Yyr(f%Oun2vzmizz!002ovPDHLkV1f*gw^slF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png b/sprites/spr_block_shape/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca.png deleted file mode 100644 index dd41c341635d40a55504a20727a2817f43adad0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmV;Y0a*TtP)h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY diff --git a/sprites/spr_block_shape/55834f3b-37f0-452d-81d3-6c1d80e5d2a4.png b/sprites/spr_block_shape/55834f3b-37f0-452d-81d3-6c1d80e5d2a4.png new file mode 100644 index 0000000000000000000000000000000000000000..6837f4dc3c5c2180af20e7bc28c96ac3735f89d4 GIT binary patch literal 482 zcmV<80UiE{P)1XtN@)^x%bjiR78yzaakRehdwOcFUdq6&pF?}TV zS&VZXbI*Mon?!j~%gUvaP9$D zB+4TDk-d}}P;Z@HFZPXeNB9Wf0e#zwr@hjBzS&U@9XSW{X}$jcw$b~o^K{;UP#7J6 zvZcbLV&(!c1@r7qGn;hdv_e7$#+qOULcywmQL$W1gn4z8AEaiMqTL@(I}i#9G#RHB zYd81#$XtN=!;OwuDK)`4M|V~Gk711GEa3B>b%6UEI?x?;&7@#X-2t!;R5HhV!$$xQ zeDi^)$g!;pntAWB1AIR~Wa5bc>i~O-sx9b7gM}euvYDY$7&3II6gH6TJS1PZ*j57e zTQ1f)&U^39b`s%`BQP5 zO;dB^v7Y#?^*CLrSTxck5DGT}sEIhY#)Ppomz{Drga3veflx?rB4J0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000DX*}(-|*Y~4E+q7E3QnsSRBM6a0d$7DNOb)%&cQJBF_4n z$1)T0-puSIi+Xwe;S8~`d^r=aDo%*2;+(iVJ7$Uf%R4*ExCHW%hx0?*e=WcYL4b6A zziEhXZ))Plwqs`**YelPidZ^t+NUEXzzRWt>b&XL130I~?>0OR=aB#_L;}>FdS~mp zN{UZ8R|Whvf&kppZpWupI@5YS*Lfts3ehbnh102?S63zRT<4JhD?~FOH{NgeToqu2 zAfOu##Ms?aJxAQR@4t%40;~{y4d?EG)#=FF*OBpu_5W@`_`~r%cD@p_=h{s4{`Nfk znMkcfJ{6FA0JlM#2{@PWxigVZ1%R@+AeNPoGcgrUor!!ZfKAvBdzK)b;+z`4bmMGk zmB^<80A@e}75Zu1Zx^>6-iT3&d@2BCW&*763769A@(Y+Upa1{>07*qoM6N<$f|p;o AasU7T literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/419a54b5-a831-4448-ae3a-925a6a2d63d7.png b/sprites/spr_block_shape/715c570d-6c7a-4c1b-9947-c7212590044e.png similarity index 100% rename from sprites/spr_block_shape/419a54b5-a831-4448-ae3a-925a6a2d63d7.png rename to sprites/spr_block_shape/715c570d-6c7a-4c1b-9947-c7212590044e.png diff --git a/sprites/spr_block_shape/74d5e0b3-8291-4bc6-9850-c7a8eac1981e.png b/sprites/spr_block_shape/74d5e0b3-8291-4bc6-9850-c7a8eac1981e.png new file mode 100644 index 0000000000000000000000000000000000000000..4331ab13390c1f312222af4ea1224318fbb3a418 GIT binary patch literal 278 zcmV+x0qOpUP)A48v0AES$dW4m<`ZYd~K&`sgm3nUF_EA$ZVUw*ShtN9E&OEq?0RHNp4t(=XI zCAa{tSb$oz(ukzppCI|+RABG7DK?$-+j(BL>&)mdfGZXNO?zj)l->lzKiSZERo}t@ zuJiyZSz-6?%zG0<=g_Tnvcx{uk1$~BSODD()K}*N|0J{?JO7_I;D_YD&OZXCjs?)G cWCL*J4K&hoEEDmSX#fBK07*qoM6N<$f>!Z!^#A|> literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/7aa82234-b4f3-4c06-b141-76ee7b3fcb59.png b/sprites/spr_block_shape/7aa82234-b4f3-4c06-b141-76ee7b3fcb59.png new file mode 100644 index 0000000000000000000000000000000000000000..3455aa80ac32a10757affd7744c4b16ac5529527 GIT binary patch literal 291 zcmV+;0o?wHP)0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3cwvO_4IwL3eLmDIk2ibf8#kx^6PG(rm=w!f$KLOFb=2#2Ga6T p2aGyk)B&Ro75dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000(UT9zV1Hz<*-=-AGa=F-~2Km*jJ>|Rnn8=|FPOd zPu7|!JX^c_qs&!CX4VIM75{#+&p7r}Si*r{GU)01{XZM-g2fwl@`$;&Jem_xIir%t zU!gE>sRrY+^ZR%91Fc~yVAts4Xn6TMVEQ43qlJ8?{9;BMwzNG2%N+Qm%2d#BQaoN^ z&*$augVp*I?Pf8vaczj%|FNOaLDpcxw0@AQ7xPJ!GH@_3JmSgh6LER@4d^`vPgg&e IbxsLQ0MvbHE&u=k diff --git a/sprites/spr_block_shape/82937588-f8bb-4e02-9909-abbd6f25f0c8.png b/sprites/spr_block_shape/82937588-f8bb-4e02-9909-abbd6f25f0c8.png deleted file mode 100644 index ab8a6c5e2cb260a54eb7999b85aab3773a506ad9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000M{9&i9+ z$pBzigVgt&pF9)8yTAd6B?AC5^ysfW=k`D?mMU(0X#>QP0T7ED6(!kNQ||%Hngb9^ z2H>UDr1;{=2>Jir15NvO@%sbs1X>AhCgAMYe7bwUR|z^3PES4gZaCvpY9A$ag|stZbz?&v%-@P1~`|z0JIXA-m?MBtsenRyU4%TBa)K@)Ho$$JX`5YLI{lB^epvu%u>mmi zr){h4Ls?kkBynd(3_x0JfVv%PjG1G6HUMd{0jff2OVSs<98js9UTt+!dLTyIS-KcXYmO@ETy5RSM+u|bGl}r|9dL-^>*y@zjq$szJQt2 zF*4y>?P37Z;{O+{ubublS8g!?X|VyC;XN*Zw7vlOA+2Vw|Hldd0000r8Tvc*XSg^x!iIy14h$v^x@kOlB-gVZeo@|1nihDk zJ$gqw3ddJZ5N*kq8w4hPS6k)xwGDb5BXNJa7(R_tARl?~v;3&-CO?}5q)-x|$`|WI z+xaxoc9mv^PvcyE9IB^&^D4k9Pcq{M_@Bn<+G$P&0Jf)vk~mUt#nE$bx35N^Zj=Pd z@02j5%DA3$aXe3rg4YD3V0{GvQR3=3l)2(`4p;=FV66c<@!svZb4?U`fki+HB>^x) zkG}0WHwR)h)OM3+CIKl}yWzj*06kYUrvl6L!E_cD6N@na)f_l@P1_BVblbXL;B-tY z!L11>s~V@u@m~1~;KEf2x+bjI&cr$876B<(1YDJXGJre%x|Fj7>IO@ItHi_~Jk7^m sQdPN=KwWSWpq0QMP1XCpCh%|E0GPNKHJU|{`v3p{07*qoM6N<$f{%)*6#xJL literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/96fcb7e5-783c-4fbd-9f31-776290f79e14.png b/sprites/spr_block_shape/96fcb7e5-783c-4fbd-9f31-776290f79e14.png deleted file mode 100644 index 8c03e3be314960a3bd0f39bc296b258bc73524a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmV-40n7f0P)0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~h}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^x4@$>Xb+4y!sw&%=t z3xvkw(*VtUldjBZWnBdGEWIB6A>a6bfH&2NFdzVRE=FK(d;=`==jdY3l<)um002ov JPDHLkV1m%bychrg literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/a9aa837a-6955-43b0-9d76-1ba99a85a5e9.png b/sprites/spr_block_shape/a9aa837a-6955-43b0-9d76-1ba99a85a5e9.png new file mode 100644 index 0000000000000000000000000000000000000000..991783f877450de32e21d5037319760f8f75dfb0 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFsgXEIEGZrIXi75*C7KDSLKp| zfPfbX2M*@FeevMZ`3vu_oPY7?!p6I=6pk!huwcRLL*9Bf8n)apt1aKz!ZK@4`R5>g zuJHViOLgpfTbwKP?5|}oD?I9Ak!QLcFiF11^&N;=WTh70A^y|#Md5vw9|8?!vpZ_) z&z$(JcCfu+*Xvv2>7kJu=4JTH-`WinVaRLjVfv(^eInU7%r>=&pD{(@!LIqg`O>fQ3bGyXO!nG57xU~gHu(Lg2O^FAY> z1$WsCr0Y_d)boFreNbfZtoO^Cyumoo{Jsg$um!@aK1D?)%olmQ>~rb=88sXZCmM7G tewE)V5uZ5Czi7e(X9jEO9A@X2%x_=q)<|5?qz()=22WQ%mvv4FO#q_$lF|SG literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/ad6ede62-3ff7-4d4a-8942-0f64740718b9.png b/sprites/spr_block_shape/ad6ede62-3ff7-4d4a-8942-0f64740718b9.png deleted file mode 100644 index c83bf3b27a27ba305396b595e6c62e479a9363df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP95dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY diff --git a/sprites/spr_block_shape/b20e7617-27aa-42d0-b20e-7b59e19d948a.png b/sprites/spr_block_shape/b20e7617-27aa-42d0-b20e-7b59e19d948a.png deleted file mode 100644 index b5d50bfeb2077c30fcba2c990d61549b1141c511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)0nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^xaX{5ZfKKi(&%ecJ9EyHAO+>x5T8 z^7wgM*|9dQPYGUUp-!f4-cHW=MNOUm!z+LeGtVvaP1Q1&7%WgdB=fJ=s57#oKR%L@Z1=?+_OfpN*MUo+;{exqu5eP! zr8>cPN4%#%Vm>tHl0CEb!sbN$FCxS)S+y}mEeH6VBip%7KpD)B|3&nWT91#frrp#w zhIF5Eg#*A0G3WV>9b+HlL_7)#;Yna5KH&|wBcnKQ<&6I_8W0ZSkZw&ng700000NkvXXu0mjfS?0>E literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/bf24468a-71df-461e-b733-02d2b326d01c.png b/sprites/spr_block_shape/bf24468a-71df-461e-b733-02d2b326d01c.png deleted file mode 100644 index b5d50bfeb2077c30fcba2c990d61549b1141c511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)0nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F#gP_nwaIjlDI=J*R^xOOl{R|fe$9AiOPzMJ=K{v(3CwM00B59+(mMu8n|eSQAK-NJQELaAJ3=n1E}1+yitCXV!l|2cQ(nqk)`^ zzdHwPpK`S3x;el-*S`a}7=>*Sqp&ODGFMMLT63CDA9?&fjipn?wv_9Kb9icgj{{H+ zrhuvDraaDrbLH`(Cg2NC0*hQS#T!pRnCoiJ&7&uFWKQ^Z0B^6jZ>bZyo`5oLo+`)x z`gZ^qCMRf5(ED7M*C~G^;0tdAOin-z zF>ZrE5JfiV{K8|^HF z0D`fU-;BNo<2TGOm`GTq$>ZmD%!}jIoIVoFia@fA7xgFBZ&%9LCn1bqC(`(x^)%mg zJoOG>imLj^0jT)a#7y0r`23QaxLu{A{5q+x%)Tf+zbmv4z$FJDZ>~)Q`NmeV&r9zM z@I&+XodAGK0l@|7*aL1RC;*p&831Y5eLi?5s`q99E;#^@p+{qT-nIwutT|Mr55T41X*l&B zz^nxTTnhGpz{Vov|8Ea~v~4C(S>OES?g2=~cP0isBQw!AudT=3cBszH0COwYgt~h3 z4xp9556xfh44@}VI|Dzyeq+M_`0@EgGXR$y0Nz>!d5fLevtNNPPy$almWo`f00000 LNkvXXu0mjfJ$=6~ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/c906526e-1ebc-49c4-bc1a-e4edf6f1b518.png b/sprites/spr_block_shape/c906526e-1ebc-49c4-bc1a-e4edf6f1b518.png new file mode 100644 index 0000000000000000000000000000000000000000..4304ca2b6ee6a31ad393f4f999af225ba0b0a7a2 GIT binary patch literal 346 zcmV-g0j2(lP)Zmm8NfJmbPiOv#tgufqyV~^@8hU<{(t9y zEOT&%Z#mg~{O5q|J{M*xnOAMk`~|OBeeVaL)*C>WIdTF$NOwNIJ%F8W{aO1o`+5<` s1Ap23A=P;YKpEAMIsmXce+EFUC(h;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9QS3x5K&2~h9pdEG3GPXXZQ*}VEu!fW{GnLu06 zCP2ME2NACa&*e1?66rnNER071U^^>nDm+I9kcpE}qB8<*qmlsie&@>Rx7RCPkqO48 z((kIWV7>ytlD&Av WZ>4xYr-{)30000 literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/d271b6f3-517a-4adf-b528-4534e1b1e154.png b/sprites/spr_block_shape/d271b6f3-517a-4adf-b528-4534e1b1e154.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c1b6adf109a1dcd2187005ddd7d60b5607e30a GIT binary patch literal 375 zcmV--0f_#IP)U0z(D`y56VJy1 zaTqHlqLa!iTM>5@0A{*#D1mFCm6!w`aakU5M}h2kAx^iMkr1-ZaXklB@HPay6M)&9tm)QH=9#2p3Tfsl2APJtp%@c4Xe#)~}Sjsj_ZAfEVkXKowE z|3!&8T~7sk3-)hQbz#b6#424$0_RKN&9KW*(`5u6Ki#&n3 z=I;L8ry(HwJz}l|I^CVj{Qr3)!Y0h}J+bW^msY^Ha4#Ur&-z!(NT|=35m39Y;~TG- V$BoabBVzyn002ovPDHLkV1gkFq~QPn literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png b/sprites/spr_block_shape/d44c2077-1a8a-4a9b-8051-1b4bd83d6988.png deleted file mode 100644 index c83bf3b27a27ba305396b595e6c62e479a9363df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP95d*40a`kL`sKB3`NQiHW(SQ@EGl5^m%xUiQU=&k_3l2@b8;$> zs#vNQV|^y)pYI&w#nI|Q6G&0+AHK9V#o^z@LnNrgOB5&|c$`^|^|`fdj&p%O{9sqd zlXfuYOq~7W(~q+85_@V0Ubkmd63~gxbb(`0Y7>yS5cO z2fEFNMgITh0N9HjLU?9Fak+B%bf#!Cxp1R+p)OZ?}CnQGAzcuPixE`1Dmj6Pd=j4lirlPwID%n+$aRDunpn;eVW8{?+5 zaeJ1d$g%z1AKy`$+<&WI%8S=4bwcs`MyI@N9|-^u9y=2}axcKpasZEsCVwt0`LQy= zBj@*=PX_eOn0%(b$lp}`eP||laz z#7Q5nYtMGI`!eCHInFb8`fq?(60bm~hJ2lu$-}UpI1CX9h$VJUqPxM{K z+`wzgs?TnKp(Q4vt+uTncqI5fbp3LAfD7dRT@L~bEeC+Ej0O-(KXnV{<#7IuJ^%m! M07*qoM6N<$g4l+<7ytkO literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54.png b/sprites/spr_block_shape/e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54.png new file mode 100644 index 0000000000000000000000000000000000000000..88626497bb6e56a437cdbe9871e8fe4279bdbe5f GIT binary patch literal 416 zcmV;R0bl-!P)vCHs{BwXRe|;2@okYwlp$y8A1IV*Y#G}axe;m;DJWW)k zX(E)-8PL_YvB*Daru+_^aPNR^&!J4$b6vgp6w0wbs1xoTzyqchu7HLa6YXJ`fGbD>V3x+y^c;13FX(PV8m)LN+eRhe3X(vyeBu%J7MN-e zz!}V1kAN#k0`ebD$21_!r`iK@CMW?{(Cz^+)y)Kyjjj8;2Y_(-%ww--WG2SeS(oFs zmF@R1fqSF330eE49H2^&Ut0e^Ge806*Vc^$?hQ!*Q|XL=EBpa)iwj6T(l9ar0000< KMNUMnLSTXb2gIiU literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/e791ba50-55e5-4c7b-8d47-de1c7cc1658a.png b/sprites/spr_block_shape/e791ba50-55e5-4c7b-8d47-de1c7cc1658a.png deleted file mode 100644 index 80f42a19b3c520dc8c305a2b81b5cbc97132fed4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmV-y0h9iTP)lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~hQKD35iG&xo!zSh?6P1HoRP@=yey&{p{_-`(D{Ly(49`AqUB15gWkRs8h#fQY zw+RbpF|XkDC_Aw6^#qHypEAdm&j#}wrY=*O;pWf0VM4{n)?<7N%oMD77ko}sEUvpT zo!Maip_+9X%$kz!ah45oLM6ovTNzLCIrM*?7|wU6{*z3reH35Mog#*3#a~Pui`fID zC&co}>}K@+D>cF7AOmmb!+5>}HGSvWTaWydUb3`vp*YhdrKX6Z@Av<7kO!%L)9^We eAO9MlLl{iw#)j!NEieRnn8DN4&t;ucLK6VcXl@Ar diff --git a/sprites/spr_block_shape/f07a1190-33bf-4050-819f-561b9725dcf3.png b/sprites/spr_block_shape/f07a1190-33bf-4050-819f-561b9725dcf3.png deleted file mode 100644 index bd78e35642a120ceea9db28395580b534ad0067e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTxyP)PChlCd?=zIKB%?ok9% zK@ouGQ`JCmm)j2!2`_E=SoB>RFAhn5l96l0A|S1Sk6QBoO9O=RdGww^zD#9DyY{`&VlHh zi#dQ=Qv^~$&4GoO-R9FCjd~UB|A!HMb+&VWHpWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT diff --git a/sprites/spr_block_shape/fae1e21c-8265-4c14-8d90-cfe248fa2263.png b/sprites/spr_block_shape/fae1e21c-8265-4c14-8d90-cfe248fa2263.png deleted file mode 100644 index f87fc85521d85f5211fc2c7bfe824142be081202..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmV;m0ZRUfP)%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr diff --git a/sprites/spr_block_shape/fb958f11-edf9-4a0e-b495-5de00d7db174.png b/sprites/spr_block_shape/fb958f11-edf9-4a0e-b495-5de00d7db174.png new file mode 100644 index 0000000000000000000000000000000000000000..b6126272c6854d76ac2c3d1f24297c2fc3ce3b1c GIT binary patch literal 388 zcmV-~0ek+5P)z zv1)`s5QaBkktT2l7A~ZSojyPsA0v6r++)~WVX2)d0$NxE61eLUnDzJ08NE|ZUE%&_ z7#4QEnVlV1Ck$Tx)S1%k^Fhrh9?zLG*boT-5KdhQo_R08(rN(S0!?<86=bKX1kaqu zSx*J@(<50=9m$r;_v2}^SNDVfuqDw0Amy1rH}^#K-3?$% z4FJe+Mz@|hp98AC4UzAWO{%;NU`q{v?{3J>JqOTh0>GBU98j28jQsxQK;Ku4XEt_y zy>kH4?v^axY$ur>DSwTZj9m9>i`$k|hi-tSB_<)rps8NPcw?@&2d2)P?}JM4IP0kZ iG}qrTuS74v()tHno9T!iO}JzL0000e&`1ohC1VGcd`9{i`5rz4K7)lJW4xsUQWzL26{+2d$mM}@vSqun zo3w8^E_T9u@6MM*!V+n+__p19MJ3-RHv1x%hlYTW09T$TaU0{=gL40RU-#}aIWb-b zxbkQ5)kY}a?5j4uuF_s!bh)h)<8y#3f0HQC!7~TQfnnRhc=DPLzK*}*cxD&%WfFI~uz_#Ygd2F@5la%wG z7>@(Z2X#G|n$G!;d*bx2CNLCk1W*$pXx3wb-9gtgL(R+X^pu+WkEc&HfuRuDe!1Y> z;#>o~=1~5BzKA$@ck?-bS_dQG8_oo{a^4fc3HXLH0Y2NaZnlfgiQ_pi0pD=%0a+_^ zI8jQsp7?tX#7~dP>-;SjjDT-A6DZl+?AHnS#s$=L#Qp~s!W#ep002ovPDHLkV1i=e By^{a{ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/1c015f46-bb21-4d72-933a-fc000856c139/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/019a157e-f4c0-4766-ab25-99116600b97e/c2a23d00-710e-4725-ae3e-92724d4af847.png similarity index 100% rename from sprites/spr_block_shape/layers/1c015f46-bb21-4d72-933a-fc000856c139/c2a23d00-710e-4725-ae3e-92724d4af847.png rename to sprites/spr_block_shape/layers/019a157e-f4c0-4766-ab25-99116600b97e/c2a23d00-710e-4725-ae3e-92724d4af847.png diff --git a/sprites/spr_block_shape/layers/08c63e81-e63c-4c42-b40a-3df02b1faafb/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/08c63e81-e63c-4c42-b40a-3df02b1faafb/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..3b602b46ad9d6887895940f8141b7468f6d7ab31 GIT binary patch literal 417 zcmV;S0bc%zP)(DU2}_+F7t2HYuy zjz!E_dD}f-9Q(LiA``qO{$C#e)5lKMl$G=UoC$ADB-;movbeQ&s&Yms6Z0{S-Im^+ zkniijROJlL#A}v|c{~DIa0Je!oZ+nrnkStM0OwL3dM|&Ct7qT~8gKn59pd)S00000 LNkvXXu0mjf%9+9A literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/0ac53d40-d867-4137-bcc9-aa0bae9cf8ff/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL diff --git a/sprites/spr_block_shape/layers/2a66ba51-6191-4628-8a95-4f2dadb33b97/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/0bbf0642-10a8-4712-90e4-01da5e1cf06c/c2a23d00-710e-4725-ae3e-92724d4af847.png similarity index 100% rename from sprites/spr_block_shape/layers/2a66ba51-6191-4628-8a95-4f2dadb33b97/c2a23d00-710e-4725-ae3e-92724d4af847.png rename to sprites/spr_block_shape/layers/0bbf0642-10a8-4712-90e4-01da5e1cf06c/c2a23d00-710e-4725-ae3e-92724d4af847.png diff --git a/sprites/spr_block_shape/layers/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/0d6a16ba-5b3e-4cff-b54c-4fa2351f5311/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index dfb5c7d98e81d5ccfeb8acbf515e5d45e0491211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)VQ!Pj5=V{0izBWb-<_tG&L0d52ynM(sC3B7>aO$X+;qMFn#RCeJ~wtstMs= zhwv3;BuSFD(oh7`_n$n6@HHX)si*IwIsj%dOd$-w42Efh@rjj(nFn*&^Upu9hrmDq zxC114IUo$EOBv8yzV`HWFpVq73CW{J35Ej(3cwuziyK^t2L{l6MymY%Hy^M&V4who z10+QR!8Askp`{5@<)1_Ou-tb3&3Eh$pf`X!02VjT-@HdrfbJ6*pIrH&lLpWM%;l8I n6LbK*0o(zwR5@S{7$^V$#N>wMSSCWL00000NkvXXu0mjfqIhqL diff --git a/sprites/spr_block_shape/layers/11c37464-9970-4820-b4b5-6ae7217198e9/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/11c37464-9970-4820-b4b5-6ae7217198e9/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..05eb0a00c0bd236c9d725e70ee5d519da0ab390e GIT binary patch literal 350 zcmV-k0iphhP)=pZO`IdJf{c64y*YxrzFhCYT%2gi0h2cb&`!9h2L&^yS*&=#(je+eNe z{r={fcAjUuZz8C<se`?CGE&*qo9`41o^2jDwDmlee0 zA%}Ra4a)sG*I#5BqVK$_?=u7-B?rJduME1t=0oeJ64$MB0w5&62if2NE*?XU;dwlU9>ax!5jGr5V3)y7Bk-H_!J`FRaPVKs>ucy& z-rpA6_cl*!LfKPJ-U_hyoU(P6bD=-GKZKa(sW2Yn5TBE*8(?hNadMr#AK(QLpTf9o zgRNh-mn0Qpn&-yvJXeSGn9@-dO=omckOiM^Fn;D6ku#g0dOv? z>R8niQK1RIv{-<~9kHl(g{J31>K>LjY=++^Sw`~Uy| literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/17257bc8-eeb1-453c-9fb9-895f52a759b3/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/17257bc8-eeb1-453c-9fb9-895f52a759b3/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..cf9164fbf196c6e7c208124fb57e26eff9de33ab GIT binary patch literal 372 zcmV-)0gL{LP)ua8oW>lknz&OuI#3yVo{uP0y|PMRG@?+5V0 zKFe9bC7khg9kLi_w3P1->DL_2M}c3P_eTMEz)GA6pIw~N(hng2bZS_~-sz750IWoE znN!iZzwpcm*n*OP$`jC;%o9+@ zdqA5&*U%;)^#pRa(i7raU`(JZ7!xq{1l|LY@3NQ_v>Ac6(U^d)C-5G?_ln^v0MPZs z@b`cU+MXEv9#BE1ge&U)e8yt`?u2bacE|jG4`5V0A!culfC|*kl_W99LPMK S#-~XD0000%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr diff --git a/sprites/spr_block_shape/layers/203e1876-f5a1-4437-b46b-34d8e3d5d6a6/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/203e1876-f5a1-4437-b46b-34d8e3d5d6a6/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..c9494e985e9f5857122026567f0b5a2d8805128a GIT binary patch literal 398 zcmV;90df9`P)CY5T)XmwO@=ul1lMg7`Mh)zwuo0b6)`Gn$G|xoQYhNwF}}@`T^oEryBk>lzE&} z6JQE80i21AU)B)L5Z7w1;6;^5cCHjKG_(TPnX2Y0{$T-qLn}a6bNAV4<@3{n0{TYh zJHT<*I}wHLcVhe*V5hp8Gmm%R*8=*+|2v=+aBt23-aC-)-dN|p}Ph2jhX=d zp8zMKa*CLHJ{6C50Q-)&BVy<1irMM6Gtr61KDih;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9pWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT diff --git a/sprites/spr_block_shape/layers/3b9fbc7c-6833-4d26-99f8-8991977ecab8/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/3b9fbc7c-6833-4d26-99f8-8991977ecab8/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index c83bf3b27a27ba305396b595e6c62e479a9363df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9&2NO+LNE~E?(ZPk!&~NiI^fO!>7-7S~1P2mLB+*TilSk6(MNYvw_?A-I zJKk$A&0z=r_-YBlmi#y&FmZaydd@&ux8Eg++37-j9_K(l^5CcWQQ0UzQvy<`2yo@g zO|0yE8YsI?QsVQtE4Rm9IdYY&&%lF)?*L56j9xdEI^GD`2_+N}=2vxys^9px3PtXd1=@c+dHnXq`aQ zFeboz&ga0sXqiCMFeZ@hGUDszKx+h=#(xgjrnh3QoSzAx?!NLBz{AWh6_vNvEI%lV zI~NrEY!UF-<89q$}^H1Y1349wB0sN_m b5s<|N00000NkvXXu0mjf8ds_i literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb1142eb870c44603a0928af800fa967b8f1296 GIT binary patch literal 411 zcmV;M0c8G(P)1p=5LCcLQUqd9k%JVuPAXlv(KDQ9_&s?>@{BYtTuR-g2*`!NffRA)z(ymuRhBz} zWNoHdmOV=|b9<}vBF`Sr$pk2?_p6w7iz!|{1Ra4@dPC8scNER-wYRYTI(a#-1J650 z5zdC3(BlAC{<146KCN?#ZhMq_S`<0s5<5d?+HB) zpa=NG8@lJgo@hS*CNLK|0$^5TQ%~oZ@vFWB{o{*=wXQqX8(#>jlKB0Oy}|3%TxjbdYWUT#E(ZraE0fPtiH{93`~# z>@}SR;9Cy>oa0SdsEAI{8TOny-*u2*XMzFRocP@tSdw|L4jzj`*J^k;w zxd*B&QL!1s-vFT$x845f_5sdBAHn_J)<9~`1d8psu?OVO`5wU5fvp|@sES}EP;0#b z=f4NI7pRIfdM`Bk&nD65rgLF@1?RH|C~>!@*Oie*&oR$dOBI{pG!4MDtO2-+;NS1N tuEhLjfD=^_tb})fvGNW;RU{Yyr(f%Oun2vzmizz!002ovPDHLkV1f*gw^slF literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index dd41c341635d40a55504a20727a2817f43adad0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmV;Y0a*TtP)h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY diff --git a/sprites/spr_block_shape/layers/55834f3b-37f0-452d-81d3-6c1d80e5d2a4/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/55834f3b-37f0-452d-81d3-6c1d80e5d2a4/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..6837f4dc3c5c2180af20e7bc28c96ac3735f89d4 GIT binary patch literal 482 zcmV<80UiE{P)1XtN@)^x%bjiR78yzaakRehdwOcFUdq6&pF?}TV zS&VZXbI*Mon?!j~%gUvaP9$D zB+4TDk-d}}P;Z@HFZPXeNB9Wf0e#zwr@hjBzS&U@9XSW{X}$jcw$b~o^K{;UP#7J6 zvZcbLV&(!c1@r7qGn;hdv_e7$#+qOULcywmQL$W1gn4z8AEaiMqTL@(I}i#9G#RHB zYd81#$XtN=!;OwuDK)`4M|V~Gk711GEa3B>b%6UEI?x?;&7@#X-2t!;R5HhV!$$xQ zeDi^)$g!;pntAWB1AIR~Wa5bc>i~O-sx9b7gM}euvYDY$7&3II6gH6TJS1PZ*j57e zTQ1f)&U^39b`s%`BQP5 zO;dB^v7Y#?^*CLrSTxck5DGT}sEIhY#)Ppomz{Drga3veflx?rB4J0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000DX*}(-|*Y~4E+q7E3QnsSRBM6a0d$7DNOb)%&cQJBF_4n z$1)T0-puSIi+Xwe;S8~`d^r=aDo%*2;+(iVJ7$Uf%R4*ExCHW%hx0?*e=WcYL4b6A zziEhXZ))Plwqs`**YelPidZ^t+NUEXzzRWt>b&XL130I~?>0OR=aB#_L;}>FdS~mp zN{UZ8R|Whvf&kppZpWupI@5YS*Lfts3ehbnh102?S63zRT<4JhD?~FOH{NgeToqu2 zAfOu##Ms?aJxAQR@4t%40;~{y4d?EG)#=FF*OBpu_5W@`_`~r%cD@p_=h{s4{`Nfk znMkcfJ{6FA0JlM#2{@PWxigVZ1%R@+AeNPoGcgrUor!!ZfKAvBdzK)b;+z`4bmMGk zmB^<80A@e}75Zu1Zx^>6-iT3&d@2BCW&*763769A@(Y+Upa1{>07*qoM6N<$f|p;o AasU7T literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/419a54b5-a831-4448-ae3a-925a6a2d63d7/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/715c570d-6c7a-4c1b-9947-c7212590044e/c2a23d00-710e-4725-ae3e-92724d4af847.png similarity index 100% rename from sprites/spr_block_shape/layers/419a54b5-a831-4448-ae3a-925a6a2d63d7/c2a23d00-710e-4725-ae3e-92724d4af847.png rename to sprites/spr_block_shape/layers/715c570d-6c7a-4c1b-9947-c7212590044e/c2a23d00-710e-4725-ae3e-92724d4af847.png diff --git a/sprites/spr_block_shape/layers/74d5e0b3-8291-4bc6-9850-c7a8eac1981e/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/74d5e0b3-8291-4bc6-9850-c7a8eac1981e/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..4331ab13390c1f312222af4ea1224318fbb3a418 GIT binary patch literal 278 zcmV+x0qOpUP)A48v0AES$dW4m<`ZYd~K&`sgm3nUF_EA$ZVUw*ShtN9E&OEq?0RHNp4t(=XI zCAa{tSb$oz(ukzppCI|+RABG7DK?$-+j(BL>&)mdfGZXNO?zj)l->lzKiSZERo}t@ zuJiyZSz-6?%zG0<=g_Tnvcx{uk1$~BSODD()K}*N|0J{?JO7_I;D_YD&OZXCjs?)G cWCL*J4K&hoEEDmSX#fBK07*qoM6N<$f>!Z!^#A|> literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/7aa82234-b4f3-4c06-b141-76ee7b3fcb59/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/7aa82234-b4f3-4c06-b141-76ee7b3fcb59/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..3455aa80ac32a10757affd7744c4b16ac5529527 GIT binary patch literal 291 zcmV+;0o?wHP)0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3cwvO_4IwL3eLmDIk2ibf8#kx^6PG(rm=w!f$KLOFb=2#2Ga6T p2aGyk)B&Ro75dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000(UT9zV1Hz<*-=-AGa=F-~2Km*jJ>|Rnn8=|FPOd zPu7|!JX^c_qs&!CX4VIM75{#+&p7r}Si*r{GU)01{XZM-g2fwl@`$;&Jem_xIir%t zU!gE>sRrY+^ZR%91Fc~yVAts4Xn6TMVEQ43qlJ8?{9;BMwzNG2%N+Qm%2d#BQaoN^ z&*$augVp*I?Pf8vaczj%|FNOaLDpcxw0@AQ7xPJ!GH@_3JmSgh6LER@4d^`vPgg&e IbxsLQ0MvbHE&u=k diff --git a/sprites/spr_block_shape/layers/82937588-f8bb-4e02-9909-abbd6f25f0c8/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/82937588-f8bb-4e02-9909-abbd6f25f0c8/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index ab8a6c5e2cb260a54eb7999b85aab3773a506ad9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)5dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000M{9&i9+ z$pBzigVgt&pF9)8yTAd6B?AC5^ysfW=k`D?mMU(0X#>QP0T7ED6(!kNQ||%Hngb9^ z2H>UDr1;{=2>Jir15NvO@%sbs1X>AhCgAMYe7bwUR|z^3PES4gZaCvpY9A$ag|stZbz?&v%-@P1~`|z0JIXA-m?MBtsenRyU4%TBa)K@)Ho$$JX`5YLI{lB^epvu%u>mmi zr){h4Ls?kkBynd(3_x0JfVv%PjG1G6HUMd{0jff2OVSs<98js9UTt+!dLTyIS-KcXYmO@ETy5RSM+u|bGl}r|9dL-^>*y@zjq$szJQt2 zF*4y>?P37Z;{O+{ubublS8g!?X|VyC;XN*Zw7vlOA+2Vw|Hldd0000r8Tvc*XSg^x!iIy14h$v^x@kOlB-gVZeo@|1nihDk zJ$gqw3ddJZ5N*kq8w4hPS6k)xwGDb5BXNJa7(R_tARl?~v;3&-CO?}5q)-x|$`|WI z+xaxoc9mv^PvcyE9IB^&^D4k9Pcq{M_@Bn<+G$P&0Jf)vk~mUt#nE$bx35N^Zj=Pd z@02j5%DA3$aXe3rg4YD3V0{GvQR3=3l)2(`4p;=FV66c<@!svZb4?U`fki+HB>^x) zkG}0WHwR)h)OM3+CIKl}yWzj*06kYUrvl6L!E_cD6N@na)f_l@P1_BVblbXL;B-tY z!L11>s~V@u@m~1~;KEf2x+bjI&cr$876B<(1YDJXGJre%x|Fj7>IO@ItHi_~Jk7^m sQdPN=KwWSWpq0QMP1XCpCh%|E0GPNKHJU|{`v3p{07*qoM6N<$f{%)*6#xJL literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/96fcb7e5-783c-4fbd-9f31-776290f79e14/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/96fcb7e5-783c-4fbd-9f31-776290f79e14/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index 8c03e3be314960a3bd0f39bc296b258bc73524a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmV-40n7f0P)0>wUqwvw?ajCb`P{hg~d?A3-=hyF}Xn^s_l}ArIgC_)F z0B4*+ePX4lNRm7(&KaIOC(Z%%25<+!^C_B3(S3$1&T+}Z%u|$+#P5KC0vNeK63r)s z;vD8PLh|V40EPnw3SguG^b(KMI477UpmhO;1J>PuB|b=0Og)XN5hniP3xs!`TzO~_ zjNyQR0xZ{WJYXD92Mna;qYfB#z^DU89Wd&EQ3nhP2LJ$3@Rw!J91Hyb0000lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~h}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^x4@$>Xb+4y!sw&%=t z3xvkw(*VtUldjBZWnBdGEWIB6A>a6bfH&2NFdzVRE=FK(d;=`==jdY3l<)um002ov JPDHLkV1m%bychrg literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/a9aa837a-6955-43b0-9d76-1ba99a85a5e9/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/a9aa837a-6955-43b0-9d76-1ba99a85a5e9/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..991783f877450de32e21d5037319760f8f75dfb0 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFsgXEIEGZrIXi75*C7KDSLKp| zfPfbX2M*@FeevMZ`3vu_oPY7?!p6I=6pk!huwcRLL*9Bf8n)apt1aKz!ZK@4`R5>g zuJHViOLgpfTbwKP?5|}oD?I9Ak!QLcFiF11^&N;=WTh70A^y|#Md5vw9|8?!vpZ_) z&z$(JcCfu+*Xvv2>7kJu=4JTH-`WinVaRLjVfv(^eInU7%r>=&pD{(@!LIqg`O>fQ3bGyXO!nG57xU~gHu(Lg2O^FAY> z1$WsCr0Y_d)boFreNbfZtoO^Cyumoo{Jsg$um!@aK1D?)%olmQ>~rb=88sXZCmM7G tewE)V5uZ5Czi7e(X9jEO9A@X2%x_=q)<|5?qz()=22WQ%mvv4FO#q_$lF|SG literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/ad6ede62-3ff7-4d4a-8942-0f64740718b9/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/ad6ede62-3ff7-4d4a-8942-0f64740718b9/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index c83bf3b27a27ba305396b595e6c62e479a9363df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP95dr5OySnbg0xy3_dswE*dC3%51mOA0Iycta&u>G|?&pICV?Xx2 z3L($sNW>EX_WbR=l5(>yq}K!!w_q z`+`Lv6s#KHjyE>v-kRu+{RBcm696;h=(jm{^?@>9NV)GClRzkF0(tr%jPlwstI^D)*f#k0J8K^N-Jkn6JzbI(($$JyRUu%w?=~LbgO1GJ-sTh zC(x(bxAi4b@l3^d(0?pyN?xUR#zs^xYJ}mlv*#9pP_PJaB(8;M|Blbn9vl@e!y!Td O0000h6K$VKy5(K z0qAjWrHPvQ6=fvBG%QUpFmRygBa{{fe+a;U1j7$74f8pANWcIrjSyQdz#UL#&A`@m zl;Ib#4x$!-J3xXLRRTTkC3zrmiyr5&asWL|oWJoL#T;B|0q%gJ9rX7-iUV)~Se)XD zb6jZxmS$c+a|PKBpf$j70D9aL8|S#>UwlC|7dLgP`*3ZlI=_flmV%Wxj|YR)zQ9e4vUv48ZIi_z*xBIREDRz&e25004_#upxLO R+>`(S002ovPDHLkV1kbpv2XwY diff --git a/sprites/spr_block_shape/layers/b20e7617-27aa-42d0-b20e-7b59e19d948a/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/b20e7617-27aa-42d0-b20e-7b59e19d948a/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index b5d50bfeb2077c30fcba2c990d61549b1141c511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)0nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F}GH=cKy z{LQ$`Ci(u^&1`I^$?GK$R9o`l7QiU%su+haDn`AIHL*OLtuf70VLs+zTx@qLer``T zfRqdXbv|EZD$d?h6_b)FU01sMM}Pxnr9Dgd!-s-29}_@O-3 zJoqlF0n{x6VBS+gN}X|Q&gF5xco5wOkdpHjM8t`2&Ed?Kr+vTykdm_pXvceW&Aod< zp9KzplnlUP{iWjMZK&e2YtHq7-u|ec*s=knWB}m2wmy)THh`22z=tN9CYqFx|5YFO z37U2qX8A^KM|>UAN^pAu&Z_3Ab39kR0{G#p1lixJrz|{>}L~<*GXO0@Nih0IdZ6(Nw+eX@LLM6?CT-9r-DY>i_@%07*qoM6N<$ Ef_^xaX{5ZfKKi(&%ecJ9EyHAO+>x5T8 z^7wgM*|9dQPYGUUp-!f4-cHW=MNOUm!z+LeGtVvaP1Q1&7%WgdB=fJ=s57#oKR%L@Z1=?+_OfpN*MUo+;{exqu5eP! zr8>cPN4%#%Vm>tHl0CEb!sbN$FCxS)S+y}mEeH6VBip%7KpD)B|3&nWT91#frrp#w zhIF5Eg#*A0G3WV>9b+HlL_7)#;Yna5KH&|wBcnKQ<&6I_8W0ZSkZw&ng700000NkvXXu0mjfS?0>E literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/bf24468a-71df-461e-b733-02d2b326d01c/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/bf24468a-71df-461e-b733-02d2b326d01c/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index b5d50bfeb2077c30fcba2c990d61549b1141c511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)0nb$6g~q3_K=~P1E>v1cEGXgkT{0<9LA@c1E>v1c7TI@rA|?pf(^o z4WRR3A#;A%mjf`L!hEhM11T9tUO9js5@b7o)M}PkK&-hWhX8t`2@6ybzeAR+)U z@CJEBF08tS>9^8=MAiK#&mnwh)WNE4xC3Ao!xX{*p*SZb4>J!Ia?d~iK#?CjxnSK5 zh)ZEX$bjZ@TyajUJS<9Hpp_E?9|Ew}D=gcfhXk%P0rMHL^5{N?**owd0As{?KM=0$ zWq5}xB+%0YdN#u)kIUy64ggtBxqnCp7*RkdO~8Bx1Lz?^tj}>efZhP718{|ep@<+> z_4nU=0Mo?!oS*~f1qeC-JtWS*`A(F#gP_nwaIjlDI=J*R^xOOl{R|fe$9AiOPzMJ=K{v(3CwM00B59+(mMu8n|eSQAK-NJQELaAJ3=n1E}1+yitCXV!l|2cQ(nqk)`^ zzdHwPpK`S3x;el-*S`a}7=>*Sqp&ODGFMMLT63CDA9?&fjipn?wv_9Kb9icgj{{H+ zrhuvDraaDrbLH`(Cg2NC0*hQS#T!pRnCoiJ&7&uFWKQ^Z0B^6jZ>bZyo`5oLo+`)x z`gZ^qCMRf5(ED7M*C~G^;0tdAOin-z zF>ZrE5JfiV{K8|^HF z0D`fU-;BNo<2TGOm`GTq$>ZmD%!}jIoIVoFia@fA7xgFBZ&%9LCn1bqC(`(x^)%mg zJoOG>imLj^0jT)a#7y0r`23QaxLu{A{5q+x%)Tf+zbmv4z$FJDZ>~)Q`NmeV&r9zM z@I&+XodAGK0l@|7*aL1RC;*p&831Y5eLi?5s`q99E;#^@p+{qT-nIwutT|Mr55T41X*l&B zz^nxTTnhGpz{Vov|8Ea~v~4C(S>OES?g2=~cP0isBQw!AudT=3cBszH0COwYgt~h3 z4xp9556xfh44@}VI|Dzyeq+M_`0@EgGXR$y0Nz>!d5fLevtNNPPy$almWo`f00000 LNkvXXu0mjfJ$=6~ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/c906526e-1ebc-49c4-bc1a-e4edf6f1b518/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/c906526e-1ebc-49c4-bc1a-e4edf6f1b518/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..4304ca2b6ee6a31ad393f4f999af225ba0b0a7a2 GIT binary patch literal 346 zcmV-g0j2(lP)Zmm8NfJmbPiOv#tgufqyV~^@8hU<{(t9y zEOT&%Z#mg~{O5q|J{M*xnOAMk`~|OBeeVaL)*C>WIdTF$NOwNIJ%F8W{aO1o`+5<` s1Ap23A=P;YKpEAMIsmXce+EFUC(h;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP9QS3x5K&2~h9pdEG3GPXXZQ*}VEu!fW{GnLu06 zCP2ME2NACa&*e1?66rnNER071U^^>nDm+I9kcpE}qB8<*qmlsie&@>Rx7RCPkqO48 z((kIWV7>ytlD&Av WZ>4xYr-{)30000 literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/d271b6f3-517a-4adf-b528-4534e1b1e154/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/d271b6f3-517a-4adf-b528-4534e1b1e154/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c1b6adf109a1dcd2187005ddd7d60b5607e30a GIT binary patch literal 375 zcmV--0f_#IP)U0z(D`y56VJy1 zaTqHlqLa!iTM>5@0A{*#D1mFCm6!w`aakU5M}h2kAx^iMkr1-ZaXklB@HPay6M)&9tm)QH=9#2p3Tfsl2APJtp%@c4Xe#)~}Sjsj_ZAfEVkXKowE z|3!&8T~7sk3-)hQbz#b6#424$0_RKN&9KW*(`5u6Ki#&n3 z=I;L8ry(HwJz}l|I^CVj{Qr3)!Y0h}J+bW^msY^Ha4#Ur&-z!(NT|=35m39Y;~TG- V$BoabBVzyn002ovPDHLkV1gkFq~QPn literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/d44c2077-1a8a-4a9b-8051-1b4bd83d6988/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/d44c2077-1a8a-4a9b-8051-1b4bd83d6988/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index c83bf3b27a27ba305396b595e6c62e479a9363df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVh;HZvfFAp-+ay8(83k$t(?cS)$k zTb$(D+UvebT}bbxrw~{YA_7?X(9*)bfHQ#W&2OEPiKGLunWwJ~%yA;7 zJW7C*iCuk4KicP95d*40a`kL`sKB3`NQiHW(SQ@EGl5^m%xUiQU=&k_3l2@b8;$> zs#vNQV|^y)pYI&w#nI|Q6G&0+AHK9V#o^z@LnNrgOB5&|c$`^|^|`fdj&p%O{9sqd zlXfuYOq~7W(~q+85_@V0Ubkmd63~gxbb(`0Y7>yS5cO z2fEFNMgITh0N9HjLU?9Fak+B%bf#!Cxp1R+p)OZ?}CnQGAzcuPixE`1Dmj6Pd=j4lirlPwID%n+$aRDunpn;eVW8{?+5 zaeJ1d$g%z1AKy`$+<&WI%8S=4bwcs`MyI@N9|-^u9y=2}axcKpasZEsCVwt0`LQy= zBj@*=PX_eOn0%(b$lp}`eP||laz z#7Q5nYtMGI`!eCHInFb8`fq?(60bm~hJ2lu$-}UpI1CX9h$VJUqPxM{K z+`wzgs?TnKp(Q4vt+uTncqI5fbp3LAfD7dRT@L~bEeC+Ej0O-(KXnV{<#7IuJ^%m! M07*qoM6N<$g4l+<7ytkO literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..88626497bb6e56a437cdbe9871e8fe4279bdbe5f GIT binary patch literal 416 zcmV;R0bl-!P)vCHs{BwXRe|;2@okYwlp$y8A1IV*Y#G}axe;m;DJWW)k zX(E)-8PL_YvB*Daru+_^aPNR^&!J4$b6vgp6w0wbs1xoTzyqchu7HLa6YXJ`fGbD>V3x+y^c;13FX(PV8m)LN+eRhe3X(vyeBu%J7MN-e zz!}V1kAN#k0`ebD$21_!r`iK@CMW?{(Cz^+)y)Kyjjj8;2Y_(-%ww--WG2SeS(oFs zmF@R1fqSF330eE49H2^&Ut0e^Ge806*Vc^$?hQ!*Q|XL=EBpa)iwj6T(l9ar0000< KMNUMnLSTXb2gIiU literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/layers/e791ba50-55e5-4c7b-8d47-de1c7cc1658a/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/e791ba50-55e5-4c7b-8d47-de1c7cc1658a/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index 80f42a19b3c520dc8c305a2b81b5cbc97132fed4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmV-y0h9iTP)lE(ZQv^;dlBQE)E^*mPP1NP;k&qA@l`uG1j)&i};q~c+tMg zyIc~b$?7p;M8x@VOTapw=qTfvj$%5t7M9n$l~bMq>#+{GsxCU_)y)>b1tWk~zB?2; zZa1lp`=hdQ%KO%5iF}!dw*%hF3uXNPc~_qHPB=RNcs;Ev$x_*hhv%bH`I&&BVFZ|S zN|e&de4hJw{GVKk_X4=!oB}~AY4RMEHSu%~I0Crf^Z=cBZ9Q-7iTW;Z1aQF!fHHX0 z*K^+-$mBxDyi&FRE;zU0x90$TSA??z=9a?5BFg`74nV1|Cs0{iKHNC~hQKD35iG&xo!zSh?6P1HoRP@=yey&{p{_-`(D{Ly(49`AqUB15gWkRs8h#fQY zw+RbpF|XkDC_Aw6^#qHypEAdm&j#}wrY=*O;pWf0VM4{n)?<7N%oMD77ko}sEUvpT zo!Maip_+9X%$kz!ah45oLM6ovTNzLCIrM*?7|wU6{*z3reH35Mog#*3#a~Pui`fID zC&co}>}K@+D>cF7AOmmb!+5>}HGSvWTaWydUb3`vp*YhdrKX6Z@Av<7kO!%L)9^We eAO9MlLl{iw#)j!NEieRnn8DN4&t;ucLK6VcXl@Ar diff --git a/sprites/spr_block_shape/layers/f07a1190-33bf-4050-819f-561b9725dcf3/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/f07a1190-33bf-4050-819f-561b9725dcf3/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index bd78e35642a120ceea9db28395580b534ad0067e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTxyP)PChlCd?=zIKB%?ok9% zK@ouGQ`JCmm)j2!2`_E=SoB>RFAhn5l96l0A|S1Sk6QBoO9O=RdGww^zD#9DyY{`&VlHh zi#dQ=Qv^~$&4GoO-R9FCjd~UB|A!HMb+&VWHpWj^6?F1}xWaJYWPd zU}*v7;-SOQ zVfyJT&#g?14Lg z>Ruud;B){i&d_~^E6#Drqvv~~9Y8OD;Q;isKq$@?WhC*+zxaY`Ewvz9ke-WpRdI0W#m;e5uNMO_vJdj*LD9&N>xbi(t2Xz1ZN_XF* zIDim<$LSN)e2tzaU}=Wx4xkkv=m1>h03d?P#cUo0052K(TO<9 RDR2M)002ovPDHLkV1kT;xwrrT diff --git a/sprites/spr_block_shape/layers/fae1e21c-8265-4c14-8d90-cfe248fa2263/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/fae1e21c-8265-4c14-8d90-cfe248fa2263/c2a23d00-710e-4725-ae3e-92724d4af847.png deleted file mode 100644 index f87fc85521d85f5211fc2c7bfe824142be081202..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmV;m0ZRUfP)%G8C z95#V`>`gNaZ`r(gGdsJPB=O0&>cO)7d9TU3Ngp3?V-FaEE8YN&9QETV~+5i2uA_*0H1hmYwqod^5cI3V_8K2%+k1gLG-xc8~P`z-rOci6^)f{+J^d%LJ0(=gjd!?R0W=(OPd3d)W zOh-q~b0v6BG{vRNMFK-xZ4wscJ6XUpMeM_Unb!!6WnvF-gF+IH`&~86TqH2GRRmV$ fSEn2A%-``3twR^c`Rb}T00000NkvXXu0mjf0=dcr diff --git a/sprites/spr_block_shape/layers/fb958f11-edf9-4a0e-b495-5de00d7db174/c2a23d00-710e-4725-ae3e-92724d4af847.png b/sprites/spr_block_shape/layers/fb958f11-edf9-4a0e-b495-5de00d7db174/c2a23d00-710e-4725-ae3e-92724d4af847.png new file mode 100644 index 0000000000000000000000000000000000000000..b6126272c6854d76ac2c3d1f24297c2fc3ce3b1c GIT binary patch literal 388 zcmV-~0ek+5P)z zv1)`s5QaBkktT2l7A~ZSojyPsA0v6r++)~WVX2)d0$NxE61eLUnDzJ08NE|ZUE%&_ z7#4QEnVlV1Ck$Tx)S1%k^Fhrh9?zLG*boT-5KdhQo_R08(rN(S0!?<86=bKX1kaqu zSx*J@(<50=9m$r;_v2}^SNDVfuqDw0Amy1rH}^#K-3?$% z4FJe+Mz@|hp98AC4UzAWO{%;NU`q{v?{3J>JqOTh0>GBU98j28jQsxQK;Ku4XEt_y zy>kH4?v^axY$ur>DSwTZj9m9>i`$k|hi-tSB_<)rps8NPcw?@&2d2)P?}JM4IP0kZ iG}qrTuS74v()tHno9T!iO}JzL0000e&`1ohC1VGcd`9{i`5rz4K7)lJW4xsUQWzL26{+2d$mM}@vSqun zo3w8^E_T9u@6MM*!V+n+__p19MJ3-RHv1x%hlYTW09T$TaU0{=gL40RU-#}aIWb-b zxbkQ5)kY}a?5j4uuF_s!bh)h)<8y#3f0HQC!7~TQfnnRhc=DPLzK*}*cxD&%WfFI~uz_#Ygd2F@5la%wG z7>@(Z2X#G|n$G!;d*bx2CNLCk1W*$pXx3wb-9gtgL(R+X^pu+WkEc&HfuRuDe!1Y> z;#>o~=1~5BzKA$@ck?-bS_dQG8_oo{a^4fc3HXLH0Y2NaZnlfgiQ_pi0pD=%0a+_^ zI8jQsp7?tX#7~dP>-;SjjDT-A6DZl+?AHnS#s$=L#Qp~s!W#ep002ovPDHLkV1i=e By^{a{ literal 0 HcmV?d00001 diff --git a/sprites/spr_block_shape/spr_block_shape.yy b/sprites/spr_block_shape/spr_block_shape.yy index 306d13a09..62e7deced 100644 --- a/sprites/spr_block_shape/spr_block_shape.yy +++ b/sprites/spr_block_shape/spr_block_shape.yy @@ -16,749 +16,749 @@ "edgeFiltering": false, "frames": [ { - "id": "d44c2077-1a8a-4a9b-8051-1b4bd83d6988", + "id": "68b88d16-6ec0-4340-897d-6f771813c1ba", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "0e698723-5a10-4ec6-abf6-1da2f4b6834d", + "id": "6f919487-c7c3-4744-adc9-666819d74d71", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d44c2077-1a8a-4a9b-8051-1b4bd83d6988", + "FrameId": "68b88d16-6ec0-4340-897d-6f771813c1ba", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e222da84-f1eb-465b-9c46-1cd3794260b8", + "id": "325db92b-ca91-4be7-924f-4283da58aea7", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d44c2077-1a8a-4a9b-8051-1b4bd83d6988", + "FrameId": "68b88d16-6ec0-4340-897d-6f771813c1ba", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "82937588-f8bb-4e02-9909-abbd6f25f0c8", + "id": "715c570d-6c7a-4c1b-9947-c7212590044e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "7cfa7c20-cea4-47c1-a893-744f6726ca6c", + "id": "77620688-fe50-4b72-9f5b-79b995197dd9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "82937588-f8bb-4e02-9909-abbd6f25f0c8", + "FrameId": "715c570d-6c7a-4c1b-9947-c7212590044e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "877ddf1f-a33a-4dc8-a1b0-37f0043ed1c7", + "id": "5f07f180-5c62-41ce-a190-4f07c7869737", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "82937588-f8bb-4e02-9909-abbd6f25f0c8", + "FrameId": "715c570d-6c7a-4c1b-9947-c7212590044e", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "0ac53d40-d867-4137-bcc9-aa0bae9cf8ff", + "id": "74d5e0b3-8291-4bc6-9850-c7a8eac1981e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "27df5f43-b452-41a1-a3fe-09f6cc65913b", + "id": "945b436c-8363-4396-8939-f37cb57ee71e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0ac53d40-d867-4137-bcc9-aa0bae9cf8ff", + "FrameId": "74d5e0b3-8291-4bc6-9850-c7a8eac1981e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "a435bbf8-e924-4b57-96fe-a565fd088642", + "id": "e39afd44-0bc4-4b92-a43e-52c6a7ae0a8e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0ac53d40-d867-4137-bcc9-aa0bae9cf8ff", + "FrameId": "74d5e0b3-8291-4bc6-9850-c7a8eac1981e", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "96fcb7e5-783c-4fbd-9f31-776290f79e14", + "id": "7aa82234-b4f3-4c06-b141-76ee7b3fcb59", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "f7e861e3-bb0e-409a-bcc6-b271fa006443", + "id": "a9cc604d-3f1e-434e-bdea-805a770accd1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "96fcb7e5-783c-4fbd-9f31-776290f79e14", + "FrameId": "7aa82234-b4f3-4c06-b141-76ee7b3fcb59", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "b0ca09a1-9d92-41fb-ae35-4394c1edb03b", + "id": "863ced69-8961-42d2-8c01-75a1ccb96cc9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "96fcb7e5-783c-4fbd-9f31-776290f79e14", + "FrameId": "7aa82234-b4f3-4c06-b141-76ee7b3fcb59", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "2a66ba51-6191-4628-8a95-4f2dadb33b97", + "id": "0bbf0642-10a8-4712-90e4-01da5e1cf06c", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "1fb9e3d1-b72f-45cf-950e-1f08c37891e8", + "id": "a1666dfe-17b5-448c-ac2b-9831c391ac78", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "2a66ba51-6191-4628-8a95-4f2dadb33b97", + "FrameId": "0bbf0642-10a8-4712-90e4-01da5e1cf06c", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "2ebde10d-4aff-4c32-9ce5-9e53b2bb2d70", + "id": "90b72245-096f-407a-9b8a-59baf3d54952", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "2a66ba51-6191-4628-8a95-4f2dadb33b97", + "FrameId": "0bbf0642-10a8-4712-90e4-01da5e1cf06c", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "a3328f14-825b-463a-bd47-5ab454815f2d", + "id": "96aaf357-560a-4523-b32c-255ab8e0fbb9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "39e511dc-3b03-4267-b0c2-df272408c2ff", + "id": "73993d84-ac1e-4aab-8e0d-e9020bfca33d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a3328f14-825b-463a-bd47-5ab454815f2d", + "FrameId": "96aaf357-560a-4523-b32c-255ab8e0fbb9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "13368a1b-8635-4c34-ade3-676249fbed83", + "id": "31c1c946-8003-46d5-9e00-77845b471ef5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a3328f14-825b-463a-bd47-5ab454815f2d", + "FrameId": "96aaf357-560a-4523-b32c-255ab8e0fbb9", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "b20e7617-27aa-42d0-b20e-7b59e19d948a", + "id": "c2126a20-95e7-4112-9b46-d8c89d4e5175", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "af790356-edfa-4c2c-b61b-9d2fdd411075", + "id": "f7ae2674-4141-4b00-bb86-6770532d428b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b20e7617-27aa-42d0-b20e-7b59e19d948a", + "FrameId": "c2126a20-95e7-4112-9b46-d8c89d4e5175", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e8a0c918-9688-4d35-8b48-d733a90a2386", + "id": "5d8cfe87-0982-4f53-a1e1-5d01c2f9bdb9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b20e7617-27aa-42d0-b20e-7b59e19d948a", + "FrameId": "c2126a20-95e7-4112-9b46-d8c89d4e5175", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "a0330a31-3b35-4c70-99ee-3168b6fc3edc", + "id": "958d7747-c2d1-4a7c-a368-5f22e78829ae", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "90974923-a6c8-41ad-a82f-990a22c8427c", + "id": "86929c18-0561-43cb-b9b4-261c0f3ee7f5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a0330a31-3b35-4c70-99ee-3168b6fc3edc", + "FrameId": "958d7747-c2d1-4a7c-a368-5f22e78829ae", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e7721bab-2c62-4dca-a66f-28269b0a2383", + "id": "80b9675a-650f-4dbf-8186-dad2f80567b9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a0330a31-3b35-4c70-99ee-3168b6fc3edc", + "FrameId": "958d7747-c2d1-4a7c-a368-5f22e78829ae", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "1a3812af-5599-4a6f-aff6-6ee7d775a93d", + "id": "4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "e57ef317-6ea2-4d5d-906f-0edac39e41e0", + "id": "426493a8-5bd3-4002-91bc-60fe4e80e88b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1a3812af-5599-4a6f-aff6-6ee7d775a93d", + "FrameId": "4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0233aa43-b129-409f-8e60-4a716287d6c3", + "id": "b13e4974-7d06-4890-8d7b-3badb00a8412", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1a3812af-5599-4a6f-aff6-6ee7d775a93d", + "FrameId": "4bd3e40d-d1e4-4a4d-96b6-2ffd1b9b438b", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "0489e482-a8bc-4db7-a76d-bfe130d123a3", + "id": "3babfe63-cc51-4549-a8a0-a6c8acf5e964", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "773f24ee-0458-47dc-8cb7-6a8f822160bd", + "id": "2200f0a7-04fd-483b-9e07-7643dc698c06", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0489e482-a8bc-4db7-a76d-bfe130d123a3", + "FrameId": "3babfe63-cc51-4549-a8a0-a6c8acf5e964", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "7179d5b4-6850-4b44-887e-a329b27a3f52", + "id": "7b882f00-dc6e-4d69-b526-405eb96203f2", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0489e482-a8bc-4db7-a76d-bfe130d123a3", + "FrameId": "3babfe63-cc51-4549-a8a0-a6c8acf5e964", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "1c015f46-bb21-4d72-933a-fc000856c139", + "id": "019a157e-f4c0-4766-ab25-99116600b97e", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "8b424668-ca7e-401c-a1e2-0dacce1e8aac", + "id": "fbf25437-3d7a-4bc8-8dc6-c6929c2fd82c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1c015f46-bb21-4d72-933a-fc000856c139", + "FrameId": "019a157e-f4c0-4766-ab25-99116600b97e", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0af22de0-4470-4469-888e-7f6e77da14e0", + "id": "5c8339f3-5ba3-4bf1-9d21-4d6dee92a1d0", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1c015f46-bb21-4d72-933a-fc000856c139", + "FrameId": "019a157e-f4c0-4766-ab25-99116600b97e", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a", + "id": "162af071-a9db-456a-9833-3f5c9b681571", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "d8b7d45a-93ce-4235-8af1-db02b0fa5630", + "id": "8fb15657-8dd5-4303-bd48-436fcc768fdf", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a", + "FrameId": "162af071-a9db-456a-9833-3f5c9b681571", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "6ddeb638-f96a-4972-830b-6db9713c231d", + "id": "55da3509-9a25-4bfd-95f9-a85bfa0ca03a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f1453ef6-7662-4d5a-b5f9-e4b1a4c3f99a", + "FrameId": "162af071-a9db-456a-9833-3f5c9b681571", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "aff4abf7-9702-4bb5-8318-bd0665453dc4", + "id": "d09e1112-0c63-4756-87f8-d1d2c19d7023", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "835b8676-58ff-4c25-9ab9-ade6a7dc7170", + "id": "889ab4c7-3251-42af-9989-b8fb8b77fa70", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "aff4abf7-9702-4bb5-8318-bd0665453dc4", + "FrameId": "d09e1112-0c63-4756-87f8-d1d2c19d7023", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "03e1f625-ac92-4a82-bf9a-b6c847c30e32", + "id": "11e78124-9ef3-4459-95f0-04fc072f5792", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "aff4abf7-9702-4bb5-8318-bd0665453dc4", + "FrameId": "d09e1112-0c63-4756-87f8-d1d2c19d7023", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "7518daa5-bf1d-4080-aee9-fb9957368a76", + "id": "d527bbf0-dc21-4bf2-80ed-73402df5969d", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "d517f530-6a1e-4e87-b9f5-5687713fafe9", + "id": "ca70a87d-0446-4f10-a0e3-e8e9e369db19", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "7518daa5-bf1d-4080-aee9-fb9957368a76", + "FrameId": "d527bbf0-dc21-4bf2-80ed-73402df5969d", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "dbdb7a57-4d95-4c60-9d51-90bfe3b1f5dc", + "id": "181a155e-54c9-405b-9e0e-df6092b8c9b1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "7518daa5-bf1d-4080-aee9-fb9957368a76", + "FrameId": "d527bbf0-dc21-4bf2-80ed-73402df5969d", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "ae0bbb1b-460a-4348-a21f-d56dc3b5942e", + "id": "08c63e81-e63c-4c42-b40a-3df02b1faafb", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "709290db-9199-4e78-8708-5da077b4f0b8", + "id": "43ef7034-9b20-463a-852e-cafea87a3e26", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ae0bbb1b-460a-4348-a21f-d56dc3b5942e", + "FrameId": "08c63e81-e63c-4c42-b40a-3df02b1faafb", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "d6c9ff9a-04bc-410e-8cad-405f3b2dd61b", + "id": "dd2f000c-76b3-45fb-83d1-8d1d2dca9c9e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ae0bbb1b-460a-4348-a21f-d56dc3b5942e", + "FrameId": "08c63e81-e63c-4c42-b40a-3df02b1faafb", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "cb790ae3-7320-49c4-aa40-0b8ddb500698", + "id": "203e1876-f5a1-4437-b46b-34d8e3d5d6a6", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "8a54c6ac-aecc-4225-a86a-fd09ff344f2b", + "id": "85054c17-b3d4-4d4a-93a6-b240a0b936c8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "cb790ae3-7320-49c4-aa40-0b8ddb500698", + "FrameId": "203e1876-f5a1-4437-b46b-34d8e3d5d6a6", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "811facf8-df4f-4e85-8b30-6b070bff33ae", + "id": "caca0e9b-1c1f-4e81-8c6d-630361e54e8d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "cb790ae3-7320-49c4-aa40-0b8ddb500698", + "FrameId": "203e1876-f5a1-4437-b46b-34d8e3d5d6a6", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "ad6ede62-3ff7-4d4a-8942-0f64740718b9", + "id": "c473b63b-fb0f-447a-91a9-f3e6c12d8177", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "e890ca37-fbad-4c2c-a992-28ecf6a60342", + "id": "225eff42-737c-44c2-9f57-4579e0d54f9f", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ad6ede62-3ff7-4d4a-8942-0f64740718b9", + "FrameId": "c473b63b-fb0f-447a-91a9-f3e6c12d8177", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "45001d84-0b56-4f1f-9d03-3807a1350bf6", + "id": "4eaca52f-5e08-4a20-a1cb-870db64297a1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ad6ede62-3ff7-4d4a-8942-0f64740718b9", + "FrameId": "c473b63b-fb0f-447a-91a9-f3e6c12d8177", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "419a54b5-a831-4448-ae3a-925a6a2d63d7", + "id": "bdbc320b-092c-458d-a428-a6c2a9cf0fb9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "28752b5d-3fe1-47b6-b222-b41c6eced1e9", + "id": "24df011f-5bea-4712-9954-aba1a5c5d36e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "419a54b5-a831-4448-ae3a-925a6a2d63d7", + "FrameId": "bdbc320b-092c-458d-a428-a6c2a9cf0fb9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "434bedcd-747f-4792-9ea4-eff9a1d533d5", + "id": "c7096719-7272-49e0-ab47-128f4df7c9a4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "419a54b5-a831-4448-ae3a-925a6a2d63d7", + "FrameId": "bdbc320b-092c-458d-a428-a6c2a9cf0fb9", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "0d6a16ba-5b3e-4cff-b54c-4fa2351f5311", + "id": "e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "f6c9e193-743a-4bd1-bee9-5337e7f12363", + "id": "5dead81a-4aab-4e3f-8736-cd8aa85fd4c7", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0d6a16ba-5b3e-4cff-b54c-4fa2351f5311", + "FrameId": "e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "4920fae9-9ddf-44b0-aad4-194c65ca1d92", + "id": "1dd108b6-5ee0-4023-b0ce-8be7ff7ce3fb", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0d6a16ba-5b3e-4cff-b54c-4fa2351f5311", + "FrameId": "e4a8e62a-6e9d-4e83-ab06-58e2d9b99b54", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "69ebfe16-4cc5-4952-8977-5c510fce44ad", + "id": "dcde0199-6d04-4886-99e3-cf3c97279881", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "c94ae503-23ef-446d-98d5-44919a183e97", + "id": "b5886b2b-8bc2-4397-8eb9-9cbd5115733e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "69ebfe16-4cc5-4952-8977-5c510fce44ad", + "FrameId": "dcde0199-6d04-4886-99e3-cf3c97279881", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "c472a275-bf06-4c28-ae31-adc0e3d64e19", + "id": "24ba2b86-04e9-4e17-980f-c635b89d2c55", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "69ebfe16-4cc5-4952-8977-5c510fce44ad", + "FrameId": "dcde0199-6d04-4886-99e3-cf3c97279881", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "ebcf8ece-d170-46f5-a07e-65d5e93d80da", + "id": "3e0f9fbc-c529-48d4-8cbf-2ad84a9486cb", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "b3515dfb-8618-451e-8450-baa872184d0b", + "id": "2a36a66f-34a1-452c-9ec2-e0f03cde5ce2", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ebcf8ece-d170-46f5-a07e-65d5e93d80da", + "FrameId": "3e0f9fbc-c529-48d4-8cbf-2ad84a9486cb", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "92116b7f-49a5-45d5-88d5-b381251947c5", + "id": "83e881a5-5b9e-44ab-9dd7-67da63013723", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "ebcf8ece-d170-46f5-a07e-65d5e93d80da", + "FrameId": "3e0f9fbc-c529-48d4-8cbf-2ad84a9486cb", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "b3f879ca-b3f8-4931-99d9-6368d1bb082d", + "id": "6f1767dd-2f23-4b95-a07a-0d38fe1f2251", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "a5123cda-d894-4625-a49a-54a091cb264f", + "id": "1325b091-5eea-4322-8c97-261ad78cab57", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b3f879ca-b3f8-4931-99d9-6368d1bb082d", + "FrameId": "6f1767dd-2f23-4b95-a07a-0d38fe1f2251", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "82306b7c-d4fb-4221-900d-c10209ad6ea7", + "id": "b5903212-9633-4caa-b994-115c56697fc7", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "b3f879ca-b3f8-4931-99d9-6368d1bb082d", + "FrameId": "6f1767dd-2f23-4b95-a07a-0d38fe1f2251", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "bf24468a-71df-461e-b733-02d2b326d01c", + "id": "a55734bd-8015-4ef0-ad8f-a027cca650b5", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "dea9d278-b4e4-4e8b-be8b-b41d0ce09150", + "id": "d5d96c6d-5e32-4321-9198-f31eba077500", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "bf24468a-71df-461e-b733-02d2b326d01c", + "FrameId": "a55734bd-8015-4ef0-ad8f-a027cca650b5", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "19a93ee8-32cc-4b6e-8a08-2364ea1b3bf8", + "id": "0053940f-891b-405a-a3a1-ee5e3f255705", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "bf24468a-71df-461e-b733-02d2b326d01c", + "FrameId": "a55734bd-8015-4ef0-ad8f-a027cca650b5", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "e791ba50-55e5-4c7b-8d47-de1c7cc1658a", + "id": "a9aa837a-6955-43b0-9d76-1ba99a85a5e9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "ca3b2fa8-316e-430f-81ae-f0dedfd59472", + "id": "d7b1aacb-6c73-44cd-97d6-241405cb4ec8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e791ba50-55e5-4c7b-8d47-de1c7cc1658a", + "FrameId": "a9aa837a-6955-43b0-9d76-1ba99a85a5e9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "eef24ec9-f0dd-45f9-b3c3-ba8be98b5065", + "id": "7582d1a3-e3d3-4a2b-9f7f-49da8ef275cf", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e791ba50-55e5-4c7b-8d47-de1c7cc1658a", + "FrameId": "a9aa837a-6955-43b0-9d76-1ba99a85a5e9", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "fae1e21c-8265-4c14-8d90-cfe248fa2263", + "id": "c906526e-1ebc-49c4-bc1a-e4edf6f1b518", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "ee56aeb7-d28d-4576-9e54-0627f1feb726", + "id": "f73774d5-98b9-434d-b7d2-275c9e3cdc05", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "fae1e21c-8265-4c14-8d90-cfe248fa2263", + "FrameId": "c906526e-1ebc-49c4-bc1a-e4edf6f1b518", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "136477f8-2c75-46eb-b267-f16365f35582", + "id": "658b26ed-df7d-438f-92c6-af2c492c945e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "fae1e21c-8265-4c14-8d90-cfe248fa2263", + "FrameId": "c906526e-1ebc-49c4-bc1a-e4edf6f1b518", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "f07a1190-33bf-4050-819f-561b9725dcf3", + "id": "8461fe77-496d-434a-8c33-d0651d31ab16", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "e1f698e3-b958-4ad6-8a00-c909a95cb4c4", + "id": "a5076189-e854-42a7-840b-39871cd57280", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f07a1190-33bf-4050-819f-561b9725dcf3", + "FrameId": "8461fe77-496d-434a-8c33-d0651d31ab16", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "ce1d0ff9-b120-4a1c-8e64-63932ec148d4", + "id": "5e1b8caf-248f-428f-a2b3-c477fbd6feae", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f07a1190-33bf-4050-819f-561b9725dcf3", + "FrameId": "8461fe77-496d-434a-8c33-d0651d31ab16", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "81f77345-54c5-403d-bcac-7f47e44695c1", + "id": "11c37464-9970-4820-b4b5-6ae7217198e9", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "24a7c0c8-c9de-4be9-af1f-8054e00dee50", + "id": "8442598e-0ce7-44ae-b832-a14914dca625", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "81f77345-54c5-403d-bcac-7f47e44695c1", + "FrameId": "11c37464-9970-4820-b4b5-6ae7217198e9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e5bc198e-733f-409b-ab2c-2da7d2c2405c", + "id": "dd726897-11d5-45fb-ad7f-c39899400f8c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "81f77345-54c5-403d-bcac-7f47e44695c1", + "FrameId": "11c37464-9970-4820-b4b5-6ae7217198e9", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "31705630-56fc-4717-aa82-3b3db883bc2e", + "id": "17257bc8-eeb1-453c-9fb9-895f52a759b3", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "01ab0240-913a-4d44-860f-919bea2f7bb3", + "id": "6d371419-90e2-494a-9351-e905942ad222", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "31705630-56fc-4717-aa82-3b3db883bc2e", + "FrameId": "17257bc8-eeb1-453c-9fb9-895f52a759b3", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "0b506a69-bf46-4a20-8369-e4b12ad4dc25", + "id": "9c8736e3-e9fd-4f51-b479-ab4b89f9bfd9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "31705630-56fc-4717-aa82-3b3db883bc2e", + "FrameId": "17257bc8-eeb1-453c-9fb9-895f52a759b3", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca", + "id": "fc263faf-347c-48c9-9bc2-9d3d9319d981", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "f4073ff2-5607-4f9c-9c9c-708d3f3ecf16", + "id": "ba383851-acc0-4c61-b0f6-2c6dc733fbd1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca", + "FrameId": "fc263faf-347c-48c9-9bc2-9d3d9319d981", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "5c7ad329-f5b3-401d-bf14-ffa369c0a197", + "id": "de147747-b3da-47f1-9562-3e734dbab854", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "51c20d9a-cd4f-4e65-ac93-ff93b7ce76ca", + "FrameId": "fc263faf-347c-48c9-9bc2-9d3d9319d981", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "846d3d7a-f4ce-4ce0-9d9d-72decd05b498", + "id": "d271b6f3-517a-4adf-b528-4534e1b1e154", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "0027711c-65cb-47e9-8c28-b0e5e3806bc3", + "id": "48084adf-d91c-44e3-ae0f-8218ca017ac8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "846d3d7a-f4ce-4ce0-9d9d-72decd05b498", + "FrameId": "d271b6f3-517a-4adf-b528-4534e1b1e154", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "22a1ce43-310a-4723-b5a0-f36267228202", + "id": "d68b1200-dc54-4935-8f1b-3172d9833793", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "846d3d7a-f4ce-4ce0-9d9d-72decd05b498", + "FrameId": "d271b6f3-517a-4adf-b528-4534e1b1e154", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "7c2c4e2c-1c63-40a4-96de-8dd261a9afbb", + "id": "50b29239-7113-46da-8054-e463a6aa22d1", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "81af8b6c-ca77-42f3-bb63-1ebaab81b347", + "id": "15237a89-a8a7-4c12-9b4a-042804a8665e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "7c2c4e2c-1c63-40a4-96de-8dd261a9afbb", + "FrameId": "50b29239-7113-46da-8054-e463a6aa22d1", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "2ae1ae74-d74a-4651-b342-f42254a2e77f", + "id": "ba5626ff-8322-423b-bff5-625f880d6ea4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "7c2c4e2c-1c63-40a4-96de-8dd261a9afbb", + "FrameId": "50b29239-7113-46da-8054-e463a6aa22d1", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "24d9d25c-8f41-4e40-91e0-fa38ee9bb241", + "id": "d94f62d7-7120-4d56-9c64-8847b1145948", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "85fce888-61a4-4608-a2c0-167120b8d1ef", + "id": "035e92b2-c110-4e1c-9128-26d7547b62c1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "24d9d25c-8f41-4e40-91e0-fa38ee9bb241", + "FrameId": "d94f62d7-7120-4d56-9c64-8847b1145948", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "f9c1e922-5c31-41ae-9602-6999bc14a041", + "id": "2fdc3842-c0f7-4c94-9c30-c21c804783b3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "24d9d25c-8f41-4e40-91e0-fa38ee9bb241", + "FrameId": "d94f62d7-7120-4d56-9c64-8847b1145948", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "1191deec-4fa1-4663-af79-00b6177fd83e", + "id": "fb958f11-edf9-4a0e-b495-5de00d7db174", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "64191ede-84a3-4ce9-9404-397ce35a176c", + "id": "4aa65cf4-8967-47e4-b568-dd6f6abf2467", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1191deec-4fa1-4663-af79-00b6177fd83e", + "FrameId": "fb958f11-edf9-4a0e-b495-5de00d7db174", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "cf71ef4e-2a9a-46d3-8e5e-4fe6221e4e96", + "id": "d383e78b-bc04-48e1-a724-bd56f2869bfa", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1191deec-4fa1-4663-af79-00b6177fd83e", + "FrameId": "fb958f11-edf9-4a0e-b495-5de00d7db174", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] }, { - "id": "3b9fbc7c-6833-4d26-99f8-8991977ecab8", + "id": "55834f3b-37f0-452d-81d3-6c1d80e5d2a4", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "bd9644ee-a5d9-438b-ade9-63a01bd686b1", "compositeImage": { - "id": "a8633dad-04ea-44bd-83c7-1774b5bb5392", + "id": "4989821e-fed7-462b-8466-165405140ed5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3b9fbc7c-6833-4d26-99f8-8991977ecab8", + "FrameId": "55834f3b-37f0-452d-81d3-6c1d80e5d2a4", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "203d8a0a-d5e0-41e5-8394-7cc3a86669c1", + "id": "34a04354-15e1-4895-9c56-e596bd0004f4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3b9fbc7c-6833-4d26-99f8-8991977ecab8", + "FrameId": "55834f3b-37f0-452d-81d3-6c1d80e5d2a4", "LayerId": "c2a23d00-710e-4725-ae3e-92724d4af847" } ] From 40f56e120321bd45a25c6ebc7042989ddbd7cccb Mon Sep 17 00:00:00 2001 From: Bentroen Date: Thu, 2 Jul 2020 08:16:23 -0300 Subject: [PATCH 86/86] 3.8.0 --- datafiles/Data/changelog.txt | 65 ++++++++++++++++++++++++++++++++++++ scripts/macros/macros.gml | 4 +-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/datafiles/Data/changelog.txt b/datafiles/Data/changelog.txt index 717a7a225..59cb1d082 100644 --- a/datafiles/Data/changelog.txt +++ b/datafiles/Data/changelog.txt @@ -1,3 +1,68 @@ +Changes in v3.8.0 (2020.07.02): +* Massive performance improvements! Songs should now rarely slow down, +skip notes, or cut off when too many sounds are playing at once. +* Added an option to expand the workspace to cover the whole screen, +accessible from the button at the lower right corner of the workspace or by +pressing F11. +* Added a blackout mode, which makes the workspace completely black so +you can key it out in your video editor when recording the screen. +It's acessible from the Preferences or by pressing F10. +* Added a sound count display to the status bar. It will turn red when too many +sounds are playing at once, meaning sounds may be skipped. +* Added a preference to display the number of right-clicks on piano keys +inside the 2-octave range. +* Added a preference toggle for the red outline on incompatible blocks. +* Added a preference toggle for the red tint on out-of-range piano keys. +* Changed the note block display modes to three individual toggles, so you +can control them independently. +* Added colors and shapes to custom instruments. +* It's now possible to select lower and higher out-of-range notes separately +in the Compatibility window. +* Added an uninstall function to data packs, which will remove all tags and +objectives pertinent to the song and disable the data pack. +* Added an 'Enable looping' checkbox to Song properties, which must be +ticked to enable looping persistently in a song. +* The loop button in the toolbar will now only control looping for the current +session. +* The 'Save options' setting was moved from Settings to the File menu. +* The song will now be marked as having unsaved changes when you edit a +layer, change the song properties, or rename a custom instrument. +* Instruments in the toolbar will now collapse into a box when there are too +many to fit the screen width. +* Bugfixes and improvements: + * The marker will no longer skip notes during a slowdown, or when playing +at faster playback rates. + * The song playback will no longer slow down when the performance isn't +optimal. + * The amount of sounds that can be played concurrently was increased, +meaning you can now have many more notes playing at once before they +begin to cut off. + * The macro bar will no longer overlap with the workspace when the piano +or the layer boxes are hidden. + * The key that must be held to select multiple layers was changed from Shift +to Control. + * Fixed loaded sound files not being copied to the Sounds folder when picked +from a different location. + * Fixed piano keys not emitting sounds when played with the keyboard +during the song playback. + * Fixed data packs containing functions from previously exported ones. + * Fixed data pack visualizer allowing spawn heights up to 256 instead of 255. + * Data pack commands related to the visualizer will now only be included +when it's enabled. + * Fixed a double minus sign being added to some data pack commands, +preventing them from loading properly in-game. + * Fixed being able to create a data pack with no alphanumeric characters in +the name. + * Updated the included resource packs to pack format 5. + * Fixed a crash when entering non-numeric values in the Arpeggio and +Stagger macros. + * Fixed custom instruments in the Song stats window having the wrong icons. + * Fixed the pattern export dialog adding the wrong extension to the file name. + * Fixed being able to rename some of the default instruments. + * Changed the Open Note Block Studio's website URL in the greeting window. + * Improved layout of the Preferences window. + * Fixed typos and improved wording across various places. + Changes in v3.7.2 (2020.02.27): * Auto-saving will now wait until you pause the song to prevent stuttering. * Fixed notes in the first tick of a song not playing when selected. diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index d22c7278e..d05c27d18 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -1,6 +1,6 @@ #macro gm_runtime_version "2.2.3.344" -#macro version_date "2020.02.27" -#macro version "3.7.2" +#macro version_date "2020.07.02" +#macro version "3.8.0" #macro nbs_version 4 #macro pat_version 1