diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index c295a78d8..4e61582f4 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -1698,7 +1698,7 @@ "Key": "91f6b839-aba4-422a-9992-a736e55fb77f", "Value": { "id": "dc3bb9e5-0340-483b-abd9-12a1b538269a", - "resourcePath": "sprites\\spr_block\\spr_block.yy", + "resourcePath": "sprites\\spr_altblock\\spr_altblock.yy", "resourceType": "GMSprite" } }, @@ -2494,6 +2494,14 @@ "resourceType": "GMScript" } }, + { + "Key": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "Value": { + "id": "b9906983-e8a9-4db8-b6ba-0cd34f9c1417", + "resourcePath": "sprites\\spr_stereo\\spr_stereo.yy", + "resourceType": "GMSprite" + } + }, { "Key": "d4189216-0a7f-4e01-8696-5601ff46b705", "Value": { @@ -2686,6 +2694,14 @@ "resourceType": "GMScript" } }, + { + "Key": "e2042df6-5acd-40cb-a75a-0c3be13b6145", + "Value": { + "id": "a1ffb581-28f1-4a26-a5fb-ec5c4d7f262b", + "resourcePath": "sprites\\spr_block\\spr_block.yy", + "resourceType": "GMSprite" + } + }, { "Key": "e3b90469-240b-4fd5-87e9-c1ea437721c2", "Value": { diff --git a/scripts/add_block_manual/add_block_manual.gml b/scripts/add_block_manual/add_block_manual.gml index ed98f796d..081376a80 100644 --- a/scripts/add_block_manual/add_block_manual.gml +++ b/scripts/add_block_manual/add_block_manual.gml @@ -56,6 +56,6 @@ if (yy > collast[xx]) collast[xx] = yy if (xx >= enda) enda = xx if (yy >= endb) endb = yy -if (ins.loaded) play_sound(ins, key, 1) +if (ins.loaded) play_sound(ins, key, 1,100) history_set(h_addblock, xx, yy, ins, key) return 1 diff --git a/scripts/change_block_manual/change_block_manual.gml b/scripts/change_block_manual/change_block_manual.gml index 6c8d973c3..6beba2706 100644 --- a/scripts/change_block_manual/change_block_manual.gml +++ b/scripts/change_block_manual/change_block_manual.gml @@ -10,7 +10,7 @@ pkey = song_key[xx, yy] song_ins[xx, yy] = ins song_key[xx, yy] = key -if (ins.loaded) play_sound(ins, key, 1) +if (ins.loaded) play_sound(ins, key, 1,100) history_set(h_changeblock, xx, yy, ins, key, pins, pkey) changed = 1 diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml index b6edadebd..774e42f52 100644 --- a/scripts/control_create/control_create.gml +++ b/scripts/control_create/control_create.gml @@ -19,6 +19,7 @@ window_set_min_height(100) cam_window = camera_create() view_set_camera(0, cam_window) window_background = c_white +window2 = 0 // Application update = 0 @@ -34,6 +35,7 @@ soundsystemuser = 0 menu_shown = "" songfolder = songs_directory icons_init() +modspeed=0 // File filename = "" @@ -50,6 +52,8 @@ for (a = 0; a < 11; a += 1) { timesignature = 4 // Playback +audio_listener_orientation(0,1,0, 0,0,1) +audio_listener_position(100,0,1) playing = 0 record = 0 tempo = 10 @@ -85,6 +89,7 @@ song_added[0, 0] = 0 block_outside = 0 block_custom = 0 midi_devices = 0 +fade = 1 colamount[0] = 0 rowamount[0] = 0 @@ -137,12 +142,16 @@ dragincyu = 0 // Layers realvolume = 1 +realstereo = 1 layername[0] = "" layerlock[0] = 0 layervol[0] = 100 +layerstereo[0] = 100 solostr = "" dragvolb = 0 dragvol = 0 +dragstereob = 0 +dragstereo = 0 // Piano show_keynames = 1 diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml index 28dec45e0..5481062b2 100644 --- a/scripts/control_draw/control_draw.gml +++ b/scripts/control_draw/control_draw.gml @@ -11,6 +11,7 @@ draw_set_alpha(1) draw_theme_color() draw_set_font(fnt_main) editline += 1 +if modspeed = 1 game_set_speed(60,gamespeed_fps) if (editline > 60) editline = 0 if (delay > 0) delay -= 1 / (room_speed / 20) if (delay < 0) delay = 0 @@ -67,7 +68,7 @@ if (min(keysmax, floor((rw - 32) / 39)) != keysshow) { } } keysshow = min(keysmax, floor((rw - 32) / 39)) -x1 = 176 +x1 = 192 y1 = 52 if ((window = 0 || select > 0) && playing = 0) { if (mouse_rectangle(x1 + 2, y1 + 34, totalcols * 32, totalrows * 32) || select > 0) { @@ -144,22 +145,22 @@ if (mousewheel = 1 && window = 0 && (exist = 0 || changepitch = 0)) { if (mouse_wheel_down() && insindex > 0) { insindex-- instrument = instrument_list[| insindex] - play_sound(instrument, selected_key, 1) + play_sound(instrument, selected_key, 1,100) } if (mouse_wheel_up() && insindex < ds_list_size(instrument_list) - 1) { insindex++ instrument = instrument_list[| insindex] - play_sound(instrument, selected_key, 1) + play_sound(instrument, selected_key, 1,100) } } if (mousewheel = 2 && window = 0 && (exist = 0 || changepitch = 0)) { if (mouse_wheel_down() && selected_key > 0) { selected_key -= 1 - play_sound(instrument, selected_key, 1) + play_sound(instrument, selected_key, 1,100) } if (mouse_wheel_up() && selected_key < 87) { selected_key += 1 - play_sound(instrument, selected_key, 1) + play_sound(instrument, selected_key, 1,100) } } @@ -190,13 +191,14 @@ for (a = 0; a < totalcols; a += 1) { if (startb + b >= colfirst[starta + a] && startb + b <= collast[starta + a]) { if (song_exists[starta + a, startb + b]) { s = 0 // Selected - c = 0.5 + if (fade=1) c = 0.5 + else c = 1 if (lockedlayer[startb + b] = 0) c += 0.5 * (1 - (min(1000, current_time - song_played[starta + a, startb + b]) / 1000)) if (playing = 0) { if (select = 1 && lockedlayer[startb + b] = 0) { s = (starta + a >= min(select_pressa, selbx) && starta + a <= max(select_pressa, selbx) && startb + b >= min(select_pressb, selby) && startb + b <= max(select_pressb, selby)) } - c += ((selbx = starta + a && selby = startb + b && select = 0 && window = 0 && cursmarker = 0) || s) * 0.5 + if (fade=1) c += ((selbx = starta + a && selby = startb + b && select = 0 && window = 0 && cursmarker = 0) || s) * 0.5 } draw_block(x1 + 2 + 32 * a, y1 + 34 + 32 * b, song_ins[starta + a, startb + b], song_key[starta + a, startb + b], c, s * 0.8) } @@ -224,7 +226,11 @@ if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && ( if (song_exists[xx, b]) { a = 1 c = 100 - if (b < endb2) c = layervol[b] + d = 100 + if (b < endb2) { + c = layervol[b] + d = layerstereo[b] + } if (solostr != "") { if (string_count("|" + string(b) + "|", solostr) = 0) { a = 0 @@ -240,7 +246,7 @@ if (floor(marker_pos) != floor(marker_prevpos) && floor(marker_pos) <= enda && ( 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 / 100) + if (song_ins[xx, b].loaded) play_sound(song_ins[xx, b], song_key[xx, b], c / 100,d) if (song_ins[xx, b].press) key_played[song_key[xx, b]] = current_time song_played[xx, b] = current_time } @@ -411,7 +417,7 @@ if (window = 0 && text_focus = -1) { for (a = 1; a <= 10; a++) { if (keyboard_check_pressed(ord(string(a % 10)))) { instrument = instrument_list[| a - 1] - play_sound(instrument, selected_key, 1) + play_sound(instrument, selected_key, 1,100) } } }else{ @@ -419,7 +425,7 @@ if (window = 0 && text_focus = -1) { for (a = 1; a <= 6; a++) { if (keyboard_check_pressed(ord(string(a % 10)))) { instrument = instrument_list[| a + 9] - play_sound(instrument, selected_key, 1) + play_sound(instrument, selected_key, 1,100) } } } @@ -618,6 +624,7 @@ for (b = 0; b < totalrows; b += 1) { layername[startb + b] = "" layerlock[startb + b] = 0 layervol[startb + b] = 100 + layerstereo[startb + b] = 100 rowamount[startb + b] = 0 endb2 = startb + b + 1 } @@ -656,17 +663,43 @@ for (b = 0; b < totalrows; b += 1) { } } } + // Stereo + if (realstereo) { + c = ((dragstereob = startb + b && window2 = w_dragstereo) || (mouse_rectangle(x1 + 108, y1 + 5, 16, 25) && window2 = 0)) + if (startb + b >= endb2) { + a = 100 + } else { + a = layerstereo[startb + b] + } + draw_sprite(spr_stereo, a / 50, x1 + 110, y1 + 11 - c * 5) + popup_set(x1 + 110, y1 + 5, 12, 17, "Stereo Pan: " + string(a) + "%\n(Click and drag to change)") + if (c) { + draw_set_font(fnt_small) + draw_set_halign(fa_center) + if a > 100 {draw_text(x1 + 120, y1 + 18, "R " + string(a-100))} + if a = 100 {draw_text(x1 + 120, y1 + 18, "MONO")} + if a < 100 {draw_text(x1 + 120, y1 + 18, "L " + string((a-100)*-1)) } + draw_set_halign(fa_left) + draw_set_font(fnt_main) + curs = cr_size_ns + if (mouse_check_button_pressed(mb_left)) { + window2 = w_dragstereo + dragstereob = startb + b + dragstereo = layerstereo[startb + b] + } + } + } // Lock button p = 0 if (startb + b < endb2) p = (layerlock[startb + b] = 1) - if (draw_layericon(0, x1 + 108-!realvolume * 10, y1 + 8, "Lock this layer", 0, p)) { + 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} } // Solo button p = 0 if (startb + b < endb2) p = (layerlock[startb + b] = 2) - if (draw_layericon(1, x1 + 126 - !realvolume * 10, y1 + 8, "Solo this layer", 0, p)) { + if (draw_layericon(1, x1 + 144 - !realvolume-!realstereo * 10, y1 + 8, "Solo this layer", 0, p)) { if (layerlock[startb + b] = 2) { layerlock[startb + b] = 0 solostr = string_replace_all(solostr, "|" + string(startb + b) + "|", "") @@ -675,7 +708,7 @@ for (b = 0; b < totalrows; b += 1) { solostr += "|" + string(startb + b) + "|" } } - if (draw_layericon(2, x1 + 144 - !realvolume * 10, y1 + 8, "Select all note blocks in this layer", 0, 0)) { + if (draw_layericon(2, x1 + 162 - !realvolume-!realstereo * 10, y1 + 8, "Select all note blocks in this layer", 0, 0)) { playing = 0 selection_place(0) selection_add(0, startb + b, enda, startb + b, 0, 0) @@ -689,6 +722,15 @@ if (window = w_dragvol) { window = w_releasemouse } } +if (window2 = w_dragstereo) { + dragstereo += (mouse_yprev - mouse_y) * 2 + dragstereo = median(0, dragstereo, 200) + layerstereo[dragstereob] = floor(dragstereo / 10) * 10 + if (!mouse_check_button(mb_left)) { + window2 = w_releasemouse + window2 = 0 + } +} // Tabs if (theme = 0) draw_sprite_ext(spr_tabbar, 0, 0, 0, rw, 1, 0, -1, 1) tab_x = 1 @@ -782,7 +824,7 @@ if (playing = 0) record = 0 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, 1) instrument = ins} xx += 25 + if (draw_icon(icons.INS_1 + a, xx, "Change instrument to " + ins.name, 0, instrument = ins)) {play_sound(ins, selected_key, 1,100) instrument = ins} xx += 25 } xx += 4 draw_separator(xx, 26) xx += 4 while (1) { @@ -924,7 +966,7 @@ if (a && window = 0) { if (window = w_dragtempo) { curs = cr_size_ns tempodrag += 0.25 * (mouse_yprev - mouse_y) / 3 - tempodrag = median(0.25, tempodrag, 20) + tempodrag = median(0.25, tempodrag, 30) a = tempo tempo = floor(tempodrag * 4) / 4 if (a != tempo) changed = 1 diff --git a/scripts/dat_generate/dat_generate.gml b/scripts/dat_generate/dat_generate.gml index 70a2cc9ad..e1b77f6ba 100644 --- a/scripts/dat_generate/dat_generate.gml +++ b/scripts/dat_generate/dat_generate.gml @@ -1,29 +1,33 @@ -//dat_generate(name) -//Returns: string -var o, objective, str, note, instrument, pitch, tick, source, name -o = obj_controller -objective = o.dat_obj -source = o.dat_source -name = argument0 -str = "scoreboard players add @s " + objective + " 1" + br -tick = 1 - -for (a = 0; a <= o.enda; a ++) { - if (o.colamount[a] > 0) { - for (b = 0; b <= o.collast[a]; b += 1) { - if (o.song_exists[a, b] && (o.lockedlayer[b] = 0 || o.dat_includelocked)) { - if (o.song_key[a, b] > 32 && o.song_key[a, b] < 58) { - instrument = dat_instrument(ds_list_find_index(other.instrument_list, o.song_ins[a, b])) - pitch = dat_pitch(o.song_key[a, b]) - - //Add command to result - if(o.dat_enableradius) str += "execute at @s[scores={"+objective+"="+string(tick)+"}] run playsound "+ instrument +" "+source+" @a ~ ~ ~ " + string(o.dat_radiusvalue) + " " + string(pitch) + br - else str += "playsound "+ instrument +" "+source+" @s[scores={"+objective+"="+string(tick)+"}] ~ ~ ~ 1 "+ string(pitch) + " 1" + br - } - } - } - } - tick += o.dat_tempo - } -str += "execute if score @s "+objective+" matches "+string(tick)+" run function "+ name +":stop" +//dat_generate(name) +//Returns: string +var o, s, objective, str, note, instrument, pitch, tick, source, name, blockvolume, blockposition +o = obj_controller +objective = o.dat_obj +source = o.dat_source +name = argument0 +str = "scoreboard players add @s " + objective + " 1" + br +tick = 1 +for (a = 0; a <= o.enda; a ++) { + if (o.colamount[a] > 0) { + for (b = 0; b <= o.collast[a]; b += 1) { + if (o.song_exists[a, b] && (o.lockedlayer[b] = 0 || o.dat_includelocked)) { + if (o.song_key[a, b] > 32 && o.song_key[a, b] < 58) { + instrument = dat_instrument(ds_list_find_index(other.instrument_list, o.song_ins[a, b])) + pitch = dat_pitch(o.song_key[a, b]) + blockvolume = o.layervol[b]/100 + s = o.layerstereo[b] // Stereo values to X coordinates + if s > 100 blockposition=(s-100)/-100 + if s = 100 blockposition=0 + if s < 100 blockposition=((s-100)*-1)/100 + + //Add command to result + if(o.dat_enableradius) str += "execute at @s[scores={"+objective+"="+string(tick)+"}] run playsound "+ instrument +" "+source+" @a ~ ~ ~ " + string(o.dat_radiusvalue) + " " + string(pitch) + br + else str += "playsound "+ instrument +" "+source+" @s[scores={"+objective+"="+string(tick)+"}] ^" + string(blockposition*2) + " ^ ^ "+string(blockvolume)+ " " + string(pitch) + " 1" + br + } + } + } + } + tick += o.dat_tempo + } +str += "execute if score @s "+objective+" matches "+string(tick)+" run function "+ name +":stop" return str \ No newline at end of file diff --git a/scripts/dat_generate/dat_generate.yy b/scripts/dat_generate/dat_generate.yy index 28f4cd674..334ed102e 100644 --- a/scripts/dat_generate/dat_generate.yy +++ b/scripts/dat_generate/dat_generate.yy @@ -1,8 +1,8 @@ -{ - "id": "c599906c-0b1d-4064-baf0-0ee5fb298c4f", - "modelName": "GMScript", - "mvc": "1.0", - "name": "dat_generate", - "IsCompatibility": false, - "IsDnD": false +{ + "id": "c599906c-0b1d-4064-baf0-0ee5fb298c4f", + "modelName": "GMScript", + "mvc": "1.0", + "name": "dat_generate", + "IsCompatibility": false, + "IsDnD": false } \ No newline at end of file diff --git a/scripts/dat_instrument/dat_instrument.gml b/scripts/dat_instrument/dat_instrument.gml index ed222447c..35a511911 100644 --- a/scripts/dat_instrument/dat_instrument.gml +++ b/scripts/dat_instrument/dat_instrument.gml @@ -1,40 +1,46 @@ //dat_instrument() //returns right minecraft id -var instrument = argument0 +var instrumentnumber = argument0 var str = "minecraft:block.note_block." - -switch (instrument) { - case 0: - return str + "harp" - case 1: - return str + "bass" - case 2: - return str + "basedrum" - case 3: - return str + "snare" - case 4: - return str + "hat" - case 5: - return str + "guitar" - case 6: - return str + "flute" - case 7: - return str + "bell" - case 8: - return str + "chime" - case 9: - return str + "xylophone" - case 10: - return str + "iron_xylophone" - case 11: - return str + "cow_bell" - case 12: - return str + "didgeridoo" - case 13: - return str + "bit" - case 14: - return str + "banjo" - case 15: - return str + "pling" +var ins +if instrumentnumber < 16 { + switch (instrumentnumber) { + case 0: + return str + "harp" + case 1: + return str + "bass" + case 2: + return str + "basedrum" + case 3: + return str + "snare" + case 4: + return str + "hat" + case 5: + return str + "guitar" + case 6: + return str + "flute" + case 7: + return str + "bell" + case 8: + return str + "chime" + case 9: + return str + "xylophone" + case 10: + return str + "iron_xylophone" + case 11: + return str + "cow_bell" + case 12: + return str + "didgeridoo" + case 13: + return str + "bit" + case 14: + return str + "banjo" + case 15: + return str + "pling" + } +} +if instrumentnumber >= 16 { + ins = ds_list_find_value(other.instrument_list,instrumentnumber) + return string("minecraft:"+ins.name) } \ No newline at end of file diff --git a/scripts/draw_block/draw_block.gml b/scripts/draw_block/draw_block.gml index 5ea3d8948..e2db04ff8 100644 --- a/scripts/draw_block/draw_block.gml +++ b/scripts/draw_block/draw_block.gml @@ -9,8 +9,9 @@ salpha = argument5 index = ds_list_find_index(instrument_list, ins) if (ins.user || !use_colored) - index += 16 -draw_sprite_ext(spr_block, index, xx, yy, 1, 1, 0, -1, alpha) + index = 32 +if(theme=2) draw_sprite_ext(spr_altblock, index, xx, yy, 1, 1, 0, -1, alpha) +else draw_sprite_ext(spr_block, index, xx, yy, 1, 1, 0, -1, alpha) if (ins.user || key < 33 || key > 57) { draw_set_color(c_red) draw_set_alpha(1) @@ -24,5 +25,6 @@ if (salpha > 0) { draw_set_alpha(alpha + 0.25) } if (show_numbers) draw_text(xx + 16 - 8 * !use_colored, yy + 16, condstr(key < 33, " < ") + condstr(key > 57, " > ") + condstr(key > 32 && key < 58, string(key - 33))) -draw_set_color(c_yellow) +if(theme=2) draw_set_color(c_white) +else draw_set_color(c_yellow) draw_text(xx + 16, yy + 4, get_keyname(key, show_octaves)) diff --git a/scripts/draw_piano/draw_piano.gml b/scripts/draw_piano/draw_piano.gml index 69cb6f64b..8c72c1a96 100644 --- a/scripts/draw_piano/draw_piano.gml +++ b/scripts/draw_piano/draw_piano.gml @@ -30,7 +30,7 @@ for (a = 0; a < k; a += 1) { key_click[c2] = (mouse_check_button(mb_left)) if (t = 0 && key_click[c2]) { selectedkey = c2 - play_sound(instrument, c2, 1) + play_sound(instrument, c2, 1,100) } if (a = k - 1) d = 1 if (a = 0) d = 0 @@ -47,7 +47,7 @@ for (a = 0; a < k; a += 1) { key_click[c1] = mouse_check_button(mb_left) if (t = 0 && key_click[c1]) { selectedkey = c1 - play_sound(instrument, c1, 1) + play_sound(instrument, c1, 1,100) } } else { key_click[c1] = 0 @@ -110,7 +110,7 @@ for (a = 0; a < k; a += 1) { key_click[c1] = mouse_check_button(mb_left) if (t = 0 && key_click[c1]) { selectedkey = c1 - play_sound(instrument, c1, 1) + play_sound(instrument, c1, 1,100) } if (a = k - 1) d = 1 if (a = 0) d = 0 @@ -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, 1) + if (playing = 0) play_sound(instrument, a, 1,100) if (playing = 0.25) toggle_playing(totalcols) if (playing && record) { b = 0 diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml index 4c70a8296..520b85efc 100644 --- a/scripts/draw_window_instruments/draw_window_instruments.gml +++ b/scripts/draw_window_instruments/draw_window_instruments.gml @@ -34,7 +34,7 @@ popup_set_window(x1 + 13, y1 + 67, 194, 20, "The name of this instrument.") draw_text(x1 + 18, y1 + 70, "Name") if (draw_button2(x1 + 12, y1 + 318, 80, "Import")) load_instruments("") c = 0 -if (draw_button2(x1 + 256, y1 + 318, 80, "Add", user_instruments >= 9) && wmenu = 0) { +if (draw_button2(x1 + 256, y1 + 318, 80, "Add", user_instruments >= 18) && wmenu = 0) { changed = true insselect = ds_list_size(instrument_list) ds_list_add(instrument_list, new_instrument("Custom instrument #" + string(user_instruments + 1), "", true)) diff --git a/scripts/draw_window_midi_import/draw_window_midi_import.gml b/scripts/draw_window_midi_import/draw_window_midi_import.gml index 673536c87..7bbc9dfa5 100644 --- a/scripts/draw_window_midi_import/draw_window_midi_import.gml +++ b/scripts/draw_window_midi_import/draw_window_midi_import.gml @@ -147,7 +147,7 @@ if (w_midi_tab = 0) { if (mouse_rectangle(x1 + 8 + tabw[0] + tabw[1] + tabw[2], y1 + 170 + 20 * a, tabw[3] - 20, 20) && wmenu = 0) { curs = cr_handpoint if (mouse_check_button_pressed(mb_left)) { - play_sound(instrument_list[| midi_channelins[b]], 45 + midi_channeloctave[b] * 12, 1) + play_sound(instrument_list[| midi_channelins[b]], 45 + midi_channeloctave[b] * 12, 1,100) } } } @@ -214,7 +214,7 @@ if (w_midi_tab = 0) { if (mouse_rectangle(x1 + 8 + tabw[0] + tabw[1], y1 + 170 + 20 * a, tabw[2] - 20, 20) && wmenu = 0) { curs = cr_handpoint if (mouse_check_button_pressed(mb_left)) { - play_sound(instrument_list[| midi_percins[b]], midi_percpitch[b], 1) + play_sound(instrument_list[| midi_percins[b]], midi_percpitch[b], 1,100) } } } else { diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml index fc91ca279..7b036dbab 100644 --- a/scripts/draw_window_preferences/draw_window_preferences.gml +++ b/scripts/draw_window_preferences/draw_window_preferences.gml @@ -67,7 +67,17 @@ 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_text(x1 + 22, y1 + 260, "Song folder: " + string_maxwidth(songfolder, 360) + condstr(string_width(songfolder) > 360, "...")) + draw_areaheader(x1+258,y1+164,220,60,"Room Speed (Experimental)") + if (draw_radiobox(x1+274,y1+164+16,!modspeed,"30FPS","Run the program at 30FPS.")) { + game_set_speed(30,gamespeed_fps) + modspeed=0 + } + if (draw_radiobox(x1+274,y1+164+16+20,modspeed,"60FPS","Run the program at 60FPS.")) { + game_set_speed(60,gamespeed_fps) + modspeed=1 + } + + draw_text(x1 + 22, y1 + 260, "Song folder: " + string_maxwidth(songfolder, 360) + condstr(string_width(songfolder) > 360, "...")) popup_set_window(x1 + 22, y1 + 260, 430, 18, songfolder) if (draw_button2(x1 + 22, y1 + 286, 76, "Open")) { if (!directory_exists_lib(songfolder)) { @@ -83,11 +93,12 @@ if (selected_tab = 0) { } if (draw_button2(x1 + 22 + 84 + 84, y1 + 286, 96, "Use default")) songfolder = songs_directory } else if (selected_tab = 1) { - draw_areaheader(x1 + 22, y1 + 74, 456, 120, "Note blocks") + draw_areaheader(x1 + 22, y1 + 74, 456, 140, "Note blocks") if (draw_radiobox(x1 + 40, y1 + 90, use_colored, "Use colored note blocks", "If the instruments of the note blocks\nshould be recognized by different colors.")) use_colored = 1 if (draw_radiobox(x1 + 40, y1 + 110, !use_colored, "Show instrument icons", "If the instruments of the note blocks should\nbe recognized by their respective icons.")) use_colored = 0 if (draw_checkbox(x1 + 40, y1 + 140, 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_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 + 180, fade, "Transparency", "Whether to use fading animations with note block sprites")) fade=!fade draw_areaheader(x1 + 22, y1 + 220, 456, 120, "Piano") if (draw_checkbox(x1 + 40, y1 + 236, show_keynames, "Show key names", "If the names of the keys should be shown.")) show_keynames=!show_keynames if (draw_checkbox(x1 + 40, y1 + 256, show_keyboard, "Show keyboard shortcuts", "Show the keyboard shortcuts of the keys.")) show_keyboard=!show_keyboard @@ -114,8 +125,9 @@ 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, 456, 45, "Playing") + draw_areaheader(x1 + 22, y1 + 224, 456, 65, "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, "Show layer stereo panning", "Whether to show the panning of layers.")) realstereo=!realstereo } if (draw_button2(x1 + 420, y1 + 368, 72, "OK")) window = 0 window_set_cursor(curs) diff --git a/scripts/icons_init/icons_init.gml b/scripts/icons_init/icons_init.gml index 6e4b6ad1d..2037d8567 100644 --- a/scripts/icons_init/icons_init.gml +++ b/scripts/icons_init/icons_init.gml @@ -37,6 +37,15 @@ enum icons { CUSTOM_INS_7, CUSTOM_INS_8, CUSTOM_INS_9, + CUSTOM_INS_10, + CUSTOM_INS_11, + CUSTOM_INS_12, + CUSTOM_INS_13, + CUSTOM_INS_14, + CUSTOM_INS_15, + CUSTOM_INS_16, + CUSTOM_INS_17, + CUSTOM_INS_18, UNDO_INACTIVE, UNDO, REDO_INACTIVE, diff --git a/scripts/load_settings/load_settings.gml b/scripts/load_settings/load_settings.gml index 72d2db460..754c6ede7 100644 --- a/scripts/load_settings/load_settings.gml +++ b/scripts/load_settings/load_settings.gml @@ -107,6 +107,9 @@ if (buffer_is_eof()) { } soundsystem = max(0, buffer_read_byte()) soundsystemuser = soundsystem +modspeed = buffer_read_byte() +realstereo = buffer_read_byte() +fade = buffer_read_byte() buffer_delete(buffer) return 1 diff --git a/scripts/load_song/load_song.gml b/scripts/load_song/load_song.gml index 951f36f9b..5250bc30e 100644 --- a/scripts/load_song/load_song.gml +++ b/scripts/load_song/load_song.gml @@ -30,6 +30,7 @@ if (file_ext = ".nbs") { song_first_custom_index = buffer_read_byte() custom_index_diff = first_custom_index - song_first_custom_index }else{ + message("Warning: You are opening an older NBS file. Saving this file will make it incompatible with older Note Block Studio versions.","Warning") song_nbt_version = 0 custom_index_diff = 0 song_first_custom_index = 0 @@ -47,7 +48,7 @@ if (file_ext = ".nbs") { // SONG DESCRIPTION song_desc = buffer_read_string_int() // TEMPO - tempo = median(0.25, floor((buffer_read_short() / 100) * 4) / 4, 20) + tempo = median(0.25, floor((buffer_read_short() / 100) * 4) / 4, 30) // AUTOSAVE a = buffer_read_byte() autosave = median(0, a, 1) @@ -107,6 +108,13 @@ if (file_ext = ".nbs") { if (layervol[b] = -1) layervol[b] = 100 layervol[b] = median(0, layervol[b], 100) if (layervol[b] < 100) realvolume = 1 + if song_nbt_version>=2 { + layerstereo[b] = buffer_read_byte() + } + else { + layerstereo[b] = 100 + } + if (layerstereo[b] < 100) realstereo = 1 endb2 += 1 } if (buffer_is_eof()) { // End? diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 604a42002..cac3ccc80 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -1,7 +1,7 @@ #macro gm_runtime_version "2.1.5.246" #macro version_date "2019.05.11" #macro version "3.4.0" -#macro nbt_version 1 +#macro nbt_version 2 #macro link_download "https://github.com/HielkeMinecraft/OpenNoteBlockStudio/releases/latest" #macro link_topic "https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-tools/2945101-open-minecraft-note-block-studio" @@ -26,6 +26,7 @@ #macro w_releasemouse 29 #macro w_mididevices 28 #macro w_dragvol 27 +#macro w_dragstereo 30 #macro w_dragsection_end 26 #macro w_dragsection_start 25 #macro w_dragselection 24 diff --git a/scripts/menu_draw/menu_draw.gml b/scripts/menu_draw/menu_draw.gml index 84535b4a0..c96e6044e 100644 --- a/scripts/menu_draw/menu_draw.gml +++ b/scripts/menu_draw/menu_draw.gml @@ -1,5 +1,5 @@ // menu_draw() -if (ani < 1) ani += 0.2 +if (ani < 1) ani += 0.1 var m, menux, menuy, noclick; menux[0] = sx menuy[0] = sy diff --git a/scripts/midi_input_set_key/midi_input_set_key.gml b/scripts/midi_input_set_key/midi_input_set_key.gml index 04e6232fc..2bad13de0 100644 --- a/scripts/midi_input_set_key/midi_input_set_key.gml +++ b/scripts/midi_input_set_key/midi_input_set_key.gml @@ -10,7 +10,7 @@ for (d = 0; d < midi_devices; d += 1) { var ins; ins = mididevice_instrument[d] if (ins < 0) ins = instrument - if (playing = 0) play_sound(ins, key, 1) + if (playing = 0) play_sound(ins, key, 1,100) if (select_lastpressed) selected_key = key if (playing = 0.25) toggle_playing(totalcols) if (playing && record) { diff --git a/scripts/play_sound/play_sound.gml b/scripts/play_sound/play_sound.gml index e29b5b8da..00291bc26 100644 --- a/scripts/play_sound/play_sound.gml +++ b/scripts/play_sound/play_sound.gml @@ -1,17 +1,19 @@ -/// @description play_sound(instrument, key, volume) +/// @description play_sound(instrument, key, volume, pan) /// @function play_sound /// @param instrument /// @param key /// @param volume -var ins, key, vol, index; +var ins, key, vol, pan; ins = argument0 key = argument1 vol = argument2 +pan = argument3 if (!ins.loaded) return 0 - -index = audio_play_sound(ins.sound, 0, 0) -audio_sound_pitch(index, 0.5 * power(1.06, (key + ins.key - 78))) -audio_sound_gain(index, vol, 0) +emitter=audio_emitter_create() +audio_emitter_pitch(emitter, 0.495 * power(1.06, (key + ins.key - 78))) +audio_emitter_gain(emitter, vol) +audio_emitter_position(emitter,pan,0,0) +audio_play_sound_on(emitter,ins.sound, 0, 0) \ No newline at end of file diff --git a/scripts/reset/reset.gml b/scripts/reset/reset.gml index 1920d43d6..6174f6227 100644 --- a/scripts/reset/reset.gml +++ b/scripts/reset/reset.gml @@ -4,6 +4,7 @@ for (a = 0; a <= endb2; a += 1) { layername[a] = "" layerlock[a] = 0 layervol[a] = 100 + layerstereo[a] = 100 } for (a = 0; a <= enda; a += 1) { colamount[a] = 0 @@ -33,6 +34,7 @@ tempo = 10 tempodrag = 10 marker_pos = 0 marker_prevpos = 0 +fade = 1 // Note blocks starta = 0 diff --git a/scripts/save_settings/save_settings.gml b/scripts/save_settings/save_settings.gml index fc56a5766..b2336bb0b 100644 --- a/scripts/save_settings/save_settings.gml +++ b/scripts/save_settings/save_settings.gml @@ -90,6 +90,10 @@ buffer_write_string_int(version) buffer_write_byte(sch_exp_minecraft_old) // 3.1.? buffer_write_byte(soundsystemuser) +// OpenNBS Features +buffer_write_byte(modspeed) +buffer_write_byte(realstereo) +buffer_write_byte(fade) buffer_export(buffer, data_directory + "settings.file") buffer_delete(buffer) diff --git a/scripts/save_song/save_song.gml b/scripts/save_song/save_song.gml index 9c7b24d99..284458acc 100644 --- a/scripts/save_song/save_song.gml +++ b/scripts/save_song/save_song.gml @@ -59,6 +59,7 @@ buffer_write_short(0) for (b = 0; b < endb2; b += 1) { buffer_write_string_int(layername[b]) buffer_write_byte(layervol[b]) + buffer_write_byte(layerstereo[b]) } // Custom instruments diff --git a/scripts/selection_draw/selection_draw.gml b/scripts/selection_draw/selection_draw.gml index 759355e9a..cd32d5993 100644 --- a/scripts/selection_draw/selection_draw.gml +++ b/scripts/selection_draw/selection_draw.gml @@ -1,6 +1,6 @@ // selection_draw(x, y, w, h) // Draws the selection. -var xs, ys, x1, y1, x2, y2, w, h, sa, sb, salpha, a, b, c, xx; +var xs, ys, x1, y1, x2, y2, w, h, sa, sb, salpha, a, b, c, d, xx; x1 = selection_x y1 = selection_y x2 = x1 + selection_l @@ -18,7 +18,9 @@ if (floor(marker_pos) != floor(marker_prevpos) && marker_pos >= selection_x && m if (selection_exists[xx, b]) { a = 1 c = 100 + d = 100 if (selection_y + b < endb2) c = layervol[selection_y + b] + if (selection_y + b < endb2) d = layerstereo[selection_y + b] if (solostr != "") { if (string_count("|" + string(selection_y + b) + "|", solostr) = 0) { a = 0 @@ -31,7 +33,7 @@ if (floor(marker_pos) != floor(marker_prevpos) && marker_pos >= selection_x && m } } if (a) { - if (selection_ins[xx, b].loaded) play_sound(selection_ins[xx, b], selection_key[xx, b], c / 100) + if (selection_ins[xx, b].loaded) play_sound(selection_ins[xx, b], selection_key[xx, b], c / 100, d) if (selection_ins[xx, b].press) key_played[selection_key[xx, b]] = current_time selection_played[xx, b] = current_time } diff --git a/scripts/toggle_playing/toggle_playing.gml b/scripts/toggle_playing/toggle_playing.gml index 822dc90b5..c94c360da 100644 --- a/scripts/toggle_playing/toggle_playing.gml +++ b/scripts/toggle_playing/toggle_playing.gml @@ -1,5 +1,5 @@ // toggle_playing(cols) -var xx, a, b, c; +var xx, a, b, c, d; playing=!playing if (playing = 1) { if (marker_pos = enda + argument0) marker_pos = 0 @@ -23,7 +23,11 @@ if (playing = 1) { if (song_exists[xx, b]) { a = 1 c = 100 - if (b < endb2) c = layervol[b] + d = 100 + if (b < endb2) { + c = layervol[b] + d = layerstereo[b] + } if (solostr != "") { if (string_count("|" + string(b) + "|", solostr) = 0) { a = 0 @@ -36,7 +40,7 @@ if (playing = 1) { } } if (a) { - if (song_ins[xx, b].loaded) play_sound(song_ins[xx, b], song_key[xx, b], c / 100) + if (song_ins[xx, b].loaded) play_sound(song_ins[xx, b], song_key[xx, b], c / 100, d) if (song_ins[xx, b].press) key_played[song_key[xx, b]] = current_time song_played[xx, b] = current_time } diff --git a/sprites/spr_block/e1050739-1074-4a52-80ef-46ab1fcdb13b.png b/sprites/spr_altblock/007cc264-be6a-47fe-bfd5-f2d0e5b55f58.png similarity index 100% rename from sprites/spr_block/e1050739-1074-4a52-80ef-46ab1fcdb13b.png rename to sprites/spr_altblock/007cc264-be6a-47fe-bfd5-f2d0e5b55f58.png diff --git a/sprites/spr_block/e219d74f-809b-48fa-a663-6ed4cee0bb2d.png b/sprites/spr_altblock/0cebcee4-6bcd-40a9-aaf4-d993e92a2938.png similarity index 100% rename from sprites/spr_block/e219d74f-809b-48fa-a663-6ed4cee0bb2d.png rename to sprites/spr_altblock/0cebcee4-6bcd-40a9-aaf4-d993e92a2938.png diff --git a/sprites/spr_block/60565bc3-2092-49fd-a191-db91fddac5db.png b/sprites/spr_altblock/18b92ef8-323e-485f-8c75-29b1ec74be2a.png similarity index 100% rename from sprites/spr_block/60565bc3-2092-49fd-a191-db91fddac5db.png rename to sprites/spr_altblock/18b92ef8-323e-485f-8c75-29b1ec74be2a.png diff --git a/sprites/spr_altblock/18c7fd69-d087-41eb-9502-ecc2cd0257bb.png b/sprites/spr_altblock/18c7fd69-d087-41eb-9502-ecc2cd0257bb.png new file mode 100644 index 000000000..a2acbafbb Binary files /dev/null and b/sprites/spr_altblock/18c7fd69-d087-41eb-9502-ecc2cd0257bb.png differ diff --git a/sprites/spr_altblock/19335820-513d-474b-b233-745be87d685f.png b/sprites/spr_altblock/19335820-513d-474b-b233-745be87d685f.png new file mode 100644 index 000000000..f93832a28 Binary files /dev/null and b/sprites/spr_altblock/19335820-513d-474b-b233-745be87d685f.png differ diff --git a/sprites/spr_block/24947421-e845-45fc-b74b-152418640e89.png b/sprites/spr_altblock/1cb849fe-336e-4765-9ad5-183d53ae6fa3.png similarity index 100% rename from sprites/spr_block/24947421-e845-45fc-b74b-152418640e89.png rename to sprites/spr_altblock/1cb849fe-336e-4765-9ad5-183d53ae6fa3.png diff --git a/sprites/spr_block/d3a761e8-5b80-4306-b0c1-7a4f569b425c.png b/sprites/spr_altblock/202ab7c9-c58b-4dd9-9874-a3a746c288a2.png similarity index 100% rename from sprites/spr_block/d3a761e8-5b80-4306-b0c1-7a4f569b425c.png rename to sprites/spr_altblock/202ab7c9-c58b-4dd9-9874-a3a746c288a2.png diff --git a/sprites/spr_altblock/226f5805-6666-425d-a3da-81e8258d6760.png b/sprites/spr_altblock/226f5805-6666-425d-a3da-81e8258d6760.png new file mode 100644 index 000000000..68cd27122 Binary files /dev/null and b/sprites/spr_altblock/226f5805-6666-425d-a3da-81e8258d6760.png differ diff --git a/sprites/spr_altblock/414aee85-134c-477d-8d63-03dc80025261.png b/sprites/spr_altblock/414aee85-134c-477d-8d63-03dc80025261.png new file mode 100644 index 000000000..b1522c62e Binary files /dev/null and b/sprites/spr_altblock/414aee85-134c-477d-8d63-03dc80025261.png differ diff --git a/sprites/spr_altblock/4b684896-78b9-4988-a053-c6be368ce171.png b/sprites/spr_altblock/4b684896-78b9-4988-a053-c6be368ce171.png new file mode 100644 index 000000000..973709bc4 Binary files /dev/null and b/sprites/spr_altblock/4b684896-78b9-4988-a053-c6be368ce171.png differ diff --git a/sprites/spr_altblock/59b179e8-0e5a-47ca-b102-ad27268ff03f.png b/sprites/spr_altblock/59b179e8-0e5a-47ca-b102-ad27268ff03f.png new file mode 100644 index 000000000..505777ad7 Binary files /dev/null and b/sprites/spr_altblock/59b179e8-0e5a-47ca-b102-ad27268ff03f.png differ diff --git a/sprites/spr_altblock/67baab46-6390-4fd7-86bf-7d6ed7eec433.png b/sprites/spr_altblock/67baab46-6390-4fd7-86bf-7d6ed7eec433.png new file mode 100644 index 000000000..546a43f4b Binary files /dev/null and b/sprites/spr_altblock/67baab46-6390-4fd7-86bf-7d6ed7eec433.png differ diff --git a/sprites/spr_altblock/686416e4-b8cf-4da7-a26d-15617dd80d03.png b/sprites/spr_altblock/686416e4-b8cf-4da7-a26d-15617dd80d03.png new file mode 100644 index 000000000..4f2123d32 Binary files /dev/null and b/sprites/spr_altblock/686416e4-b8cf-4da7-a26d-15617dd80d03.png differ diff --git a/sprites/spr_altblock/81d2e911-b418-467d-812e-c0395c06fe3c.png b/sprites/spr_altblock/81d2e911-b418-467d-812e-c0395c06fe3c.png new file mode 100644 index 000000000..97751d6a3 Binary files /dev/null and b/sprites/spr_altblock/81d2e911-b418-467d-812e-c0395c06fe3c.png differ diff --git a/sprites/spr_altblock/875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e.png b/sprites/spr_altblock/875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e.png new file mode 100644 index 000000000..2f439ea5e Binary files /dev/null and b/sprites/spr_altblock/875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e.png differ diff --git a/sprites/spr_altblock/8902712d-19f3-4ed1-b306-9ae1b4abd72a.png b/sprites/spr_altblock/8902712d-19f3-4ed1-b306-9ae1b4abd72a.png new file mode 100644 index 000000000..7121a7183 Binary files /dev/null and b/sprites/spr_altblock/8902712d-19f3-4ed1-b306-9ae1b4abd72a.png differ diff --git a/sprites/spr_block/daac478e-25eb-4b87-83a2-e20071e548c3.png b/sprites/spr_altblock/97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc.png similarity index 100% rename from sprites/spr_block/daac478e-25eb-4b87-83a2-e20071e548c3.png rename to sprites/spr_altblock/97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc.png diff --git a/sprites/spr_altblock/9a5bbba2-4f51-4846-ad74-d89f90c3e7da.png b/sprites/spr_altblock/9a5bbba2-4f51-4846-ad74-d89f90c3e7da.png new file mode 100644 index 000000000..c7e5ec945 Binary files /dev/null and b/sprites/spr_altblock/9a5bbba2-4f51-4846-ad74-d89f90c3e7da.png differ diff --git a/sprites/spr_altblock/a56bfda5-af1d-43c0-99f3-090f4da2d41a.png b/sprites/spr_altblock/a56bfda5-af1d-43c0-99f3-090f4da2d41a.png new file mode 100644 index 000000000..e3be545cc Binary files /dev/null and b/sprites/spr_altblock/a56bfda5-af1d-43c0-99f3-090f4da2d41a.png differ diff --git a/sprites/spr_altblock/bccc5864-7b1f-401f-ace0-5b5722572554.png b/sprites/spr_altblock/bccc5864-7b1f-401f-ace0-5b5722572554.png new file mode 100644 index 000000000..0cfcae33a Binary files /dev/null and b/sprites/spr_altblock/bccc5864-7b1f-401f-ace0-5b5722572554.png differ diff --git a/sprites/spr_block/729b6be6-cc4e-4693-95a0-85431b0e95ca.png b/sprites/spr_altblock/c4151e6a-4906-4ce7-9907-31fb8adc43a5.png similarity index 100% rename from sprites/spr_block/729b6be6-cc4e-4693-95a0-85431b0e95ca.png rename to sprites/spr_altblock/c4151e6a-4906-4ce7-9907-31fb8adc43a5.png diff --git a/sprites/spr_altblock/c84ebbbd-f2f1-44e2-b7b4-b84263f41277.png b/sprites/spr_altblock/c84ebbbd-f2f1-44e2-b7b4-b84263f41277.png new file mode 100644 index 000000000..cc8ec9553 Binary files /dev/null and b/sprites/spr_altblock/c84ebbbd-f2f1-44e2-b7b4-b84263f41277.png differ diff --git a/sprites/spr_block/1c4d3a53-1769-444f-b59c-54a25588399a.png b/sprites/spr_altblock/d231e946-b285-47be-a81d-5136674215be.png similarity index 100% rename from sprites/spr_block/1c4d3a53-1769-444f-b59c-54a25588399a.png rename to sprites/spr_altblock/d231e946-b285-47be-a81d-5136674215be.png diff --git a/sprites/spr_block/8385dfcd-a32d-4727-bdcb-660c117fc1a1.png b/sprites/spr_altblock/d72a7986-5f91-4bed-bba1-8e9f1b1f0782.png similarity index 100% rename from sprites/spr_block/8385dfcd-a32d-4727-bdcb-660c117fc1a1.png rename to sprites/spr_altblock/d72a7986-5f91-4bed-bba1-8e9f1b1f0782.png diff --git a/sprites/spr_block/05fe476f-982f-4a58-aa22-84af277946f7.png b/sprites/spr_altblock/df39f2d1-e8ef-4d9d-b6ff-420aeef16650.png similarity index 100% rename from sprites/spr_block/05fe476f-982f-4a58-aa22-84af277946f7.png rename to sprites/spr_altblock/df39f2d1-e8ef-4d9d-b6ff-420aeef16650.png diff --git a/sprites/spr_block/635d0401-6d03-4c66-ade5-9ad983ab9116.png b/sprites/spr_altblock/e093dc36-e954-4a72-8f38-ec9faf0fbd57.png similarity index 100% rename from sprites/spr_block/635d0401-6d03-4c66-ade5-9ad983ab9116.png rename to sprites/spr_altblock/e093dc36-e954-4a72-8f38-ec9faf0fbd57.png diff --git a/sprites/spr_altblock/e189d814-04d3-42a2-83b3-f221488d9144.png b/sprites/spr_altblock/e189d814-04d3-42a2-83b3-f221488d9144.png new file mode 100644 index 000000000..39d7352b7 Binary files /dev/null and b/sprites/spr_altblock/e189d814-04d3-42a2-83b3-f221488d9144.png differ diff --git a/sprites/spr_block/45281be7-bc90-4950-a7c8-612aa90ce020.png b/sprites/spr_altblock/e2f2e76d-4616-4ab8-bf84-75bdf705a2d7.png similarity index 100% rename from sprites/spr_block/45281be7-bc90-4950-a7c8-612aa90ce020.png rename to sprites/spr_altblock/e2f2e76d-4616-4ab8-bf84-75bdf705a2d7.png diff --git a/sprites/spr_altblock/e3f941c0-5046-49ef-80e5-4b1bd23f0d8d.png b/sprites/spr_altblock/e3f941c0-5046-49ef-80e5-4b1bd23f0d8d.png new file mode 100644 index 000000000..60d3ea9f9 Binary files /dev/null and b/sprites/spr_altblock/e3f941c0-5046-49ef-80e5-4b1bd23f0d8d.png differ diff --git a/sprites/spr_block/e1b0be72-6bc9-49b2-b2e1-80de4986c765.png b/sprites/spr_altblock/e45ada33-e4d6-47de-af58-a47b532b267a.png similarity index 100% rename from sprites/spr_block/e1b0be72-6bc9-49b2-b2e1-80de4986c765.png rename to sprites/spr_altblock/e45ada33-e4d6-47de-af58-a47b532b267a.png diff --git a/sprites/spr_block/0855eead-ead9-45ff-bdb9-1bcb0ae214f9.png b/sprites/spr_altblock/e6e99706-8eeb-4a5f-9235-c45b823858d0.png similarity index 100% rename from sprites/spr_block/0855eead-ead9-45ff-bdb9-1bcb0ae214f9.png rename to sprites/spr_altblock/e6e99706-8eeb-4a5f-9235-c45b823858d0.png diff --git a/sprites/spr_block/542f5c31-9926-4008-863f-d382d2c1fd9e.png b/sprites/spr_altblock/eb2d1b3d-0c2f-4010-87dc-05e7b40846fb.png similarity index 100% rename from sprites/spr_block/542f5c31-9926-4008-863f-d382d2c1fd9e.png rename to sprites/spr_altblock/eb2d1b3d-0c2f-4010-87dc-05e7b40846fb.png diff --git a/sprites/spr_block/9d7904c9-3aaa-4320-b3be-c36095ba5040.png b/sprites/spr_altblock/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a.png similarity index 100% rename from sprites/spr_block/9d7904c9-3aaa-4320-b3be-c36095ba5040.png rename to sprites/spr_altblock/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a.png diff --git a/sprites/spr_block/layers/e1050739-1074-4a52-80ef-46ab1fcdb13b/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/007cc264-be6a-47fe-bfd5-f2d0e5b55f58/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/e1050739-1074-4a52-80ef-46ab1fcdb13b/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/007cc264-be6a-47fe-bfd5-f2d0e5b55f58/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/e219d74f-809b-48fa-a663-6ed4cee0bb2d/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/0cebcee4-6bcd-40a9-aaf4-d993e92a2938/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/e219d74f-809b-48fa-a663-6ed4cee0bb2d/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/0cebcee4-6bcd-40a9-aaf4-d993e92a2938/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/60565bc3-2092-49fd-a191-db91fddac5db/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/18b92ef8-323e-485f-8c75-29b1ec74be2a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/60565bc3-2092-49fd-a191-db91fddac5db/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/18b92ef8-323e-485f-8c75-29b1ec74be2a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/layers/18c7fd69-d087-41eb-9502-ecc2cd0257bb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/18c7fd69-d087-41eb-9502-ecc2cd0257bb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..86a8a6efe Binary files /dev/null and b/sprites/spr_altblock/layers/18c7fd69-d087-41eb-9502-ecc2cd0257bb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/19335820-513d-474b-b233-745be87d685f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/19335820-513d-474b-b233-745be87d685f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..107012db1 Binary files /dev/null and b/sprites/spr_altblock/layers/19335820-513d-474b-b233-745be87d685f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_block/layers/24947421-e845-45fc-b74b-152418640e89/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/1cb849fe-336e-4765-9ad5-183d53ae6fa3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/24947421-e845-45fc-b74b-152418640e89/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/1cb849fe-336e-4765-9ad5-183d53ae6fa3/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/d3a761e8-5b80-4306-b0c1-7a4f569b425c/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/202ab7c9-c58b-4dd9-9874-a3a746c288a2/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/d3a761e8-5b80-4306-b0c1-7a4f569b425c/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/202ab7c9-c58b-4dd9-9874-a3a746c288a2/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/layers/226f5805-6666-425d-a3da-81e8258d6760/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/226f5805-6666-425d-a3da-81e8258d6760/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..0fe5506d3 Binary files /dev/null and b/sprites/spr_altblock/layers/226f5805-6666-425d-a3da-81e8258d6760/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/414aee85-134c-477d-8d63-03dc80025261/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/414aee85-134c-477d-8d63-03dc80025261/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..d61d2273c Binary files /dev/null and b/sprites/spr_altblock/layers/414aee85-134c-477d-8d63-03dc80025261/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/4b684896-78b9-4988-a053-c6be368ce171/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/4b684896-78b9-4988-a053-c6be368ce171/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..5181ac6d6 Binary files /dev/null and b/sprites/spr_altblock/layers/4b684896-78b9-4988-a053-c6be368ce171/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/59b179e8-0e5a-47ca-b102-ad27268ff03f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/59b179e8-0e5a-47ca-b102-ad27268ff03f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..7376c99d8 Binary files /dev/null and b/sprites/spr_altblock/layers/59b179e8-0e5a-47ca-b102-ad27268ff03f/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/67baab46-6390-4fd7-86bf-7d6ed7eec433/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/67baab46-6390-4fd7-86bf-7d6ed7eec433/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..546a43f4b Binary files /dev/null and b/sprites/spr_altblock/layers/67baab46-6390-4fd7-86bf-7d6ed7eec433/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/686416e4-b8cf-4da7-a26d-15617dd80d03/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/686416e4-b8cf-4da7-a26d-15617dd80d03/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..90f2ca757 Binary files /dev/null and b/sprites/spr_altblock/layers/686416e4-b8cf-4da7-a26d-15617dd80d03/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/81d2e911-b418-467d-812e-c0395c06fe3c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/81d2e911-b418-467d-812e-c0395c06fe3c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..f2b4e476a Binary files /dev/null and b/sprites/spr_altblock/layers/81d2e911-b418-467d-812e-c0395c06fe3c/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..3769e37af Binary files /dev/null and b/sprites/spr_altblock/layers/875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/8902712d-19f3-4ed1-b306-9ae1b4abd72a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/8902712d-19f3-4ed1-b306-9ae1b4abd72a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..19f03f80f Binary files /dev/null and b/sprites/spr_altblock/layers/8902712d-19f3-4ed1-b306-9ae1b4abd72a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_block/layers/daac478e-25eb-4b87-83a2-e20071e548c3/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/daac478e-25eb-4b87-83a2-e20071e548c3/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/layers/9a5bbba2-4f51-4846-ad74-d89f90c3e7da/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/9a5bbba2-4f51-4846-ad74-d89f90c3e7da/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..3ac3dac59 Binary files /dev/null and b/sprites/spr_altblock/layers/9a5bbba2-4f51-4846-ad74-d89f90c3e7da/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/a56bfda5-af1d-43c0-99f3-090f4da2d41a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/a56bfda5-af1d-43c0-99f3-090f4da2d41a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..f71fad1d0 Binary files /dev/null and b/sprites/spr_altblock/layers/a56bfda5-af1d-43c0-99f3-090f4da2d41a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_altblock/layers/bccc5864-7b1f-401f-ace0-5b5722572554/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/bccc5864-7b1f-401f-ace0-5b5722572554/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..10bb2691e Binary files /dev/null and b/sprites/spr_altblock/layers/bccc5864-7b1f-401f-ace0-5b5722572554/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_block/layers/729b6be6-cc4e-4693-95a0-85431b0e95ca/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/c4151e6a-4906-4ce7-9907-31fb8adc43a5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/729b6be6-cc4e-4693-95a0-85431b0e95ca/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/c4151e6a-4906-4ce7-9907-31fb8adc43a5/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/layers/c84ebbbd-f2f1-44e2-b7b4-b84263f41277/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/c84ebbbd-f2f1-44e2-b7b4-b84263f41277/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..8bbeed7c6 Binary files /dev/null and b/sprites/spr_altblock/layers/c84ebbbd-f2f1-44e2-b7b4-b84263f41277/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_block/layers/1c4d3a53-1769-444f-b59c-54a25588399a/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/d231e946-b285-47be-a81d-5136674215be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/1c4d3a53-1769-444f-b59c-54a25588399a/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/d231e946-b285-47be-a81d-5136674215be/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/8385dfcd-a32d-4727-bdcb-660c117fc1a1/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/d72a7986-5f91-4bed-bba1-8e9f1b1f0782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/8385dfcd-a32d-4727-bdcb-660c117fc1a1/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/d72a7986-5f91-4bed-bba1-8e9f1b1f0782/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/05fe476f-982f-4a58-aa22-84af277946f7/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/df39f2d1-e8ef-4d9d-b6ff-420aeef16650/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/05fe476f-982f-4a58-aa22-84af277946f7/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/df39f2d1-e8ef-4d9d-b6ff-420aeef16650/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/635d0401-6d03-4c66-ade5-9ad983ab9116/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/e093dc36-e954-4a72-8f38-ec9faf0fbd57/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/635d0401-6d03-4c66-ade5-9ad983ab9116/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/e093dc36-e954-4a72-8f38-ec9faf0fbd57/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/layers/e189d814-04d3-42a2-83b3-f221488d9144/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/e189d814-04d3-42a2-83b3-f221488d9144/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..05e0e785d Binary files /dev/null and b/sprites/spr_altblock/layers/e189d814-04d3-42a2-83b3-f221488d9144/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_block/layers/45281be7-bc90-4950-a7c8-612aa90ce020/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/e2f2e76d-4616-4ab8-bf84-75bdf705a2d7/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/45281be7-bc90-4950-a7c8-612aa90ce020/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/e2f2e76d-4616-4ab8-bf84-75bdf705a2d7/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/layers/e3f941c0-5046-49ef-80e5-4b1bd23f0d8d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png b/sprites/spr_altblock/layers/e3f941c0-5046-49ef-80e5-4b1bd23f0d8d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png new file mode 100644 index 000000000..672d4b974 Binary files /dev/null and b/sprites/spr_altblock/layers/e3f941c0-5046-49ef-80e5-4b1bd23f0d8d/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png differ diff --git a/sprites/spr_block/layers/e1b0be72-6bc9-49b2-b2e1-80de4986c765/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/e45ada33-e4d6-47de-af58-a47b532b267a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/e1b0be72-6bc9-49b2-b2e1-80de4986c765/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/e45ada33-e4d6-47de-af58-a47b532b267a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/0855eead-ead9-45ff-bdb9-1bcb0ae214f9/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/e6e99706-8eeb-4a5f-9235-c45b823858d0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/0855eead-ead9-45ff-bdb9-1bcb0ae214f9/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/e6e99706-8eeb-4a5f-9235-c45b823858d0/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/542f5c31-9926-4008-863f-d382d2c1fd9e/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/eb2d1b3d-0c2f-4010-87dc-05e7b40846fb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/542f5c31-9926-4008-863f-d382d2c1fd9e/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/eb2d1b3d-0c2f-4010-87dc-05e7b40846fb/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_block/layers/9d7904c9-3aaa-4320-b3be-c36095ba5040/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_altblock/layers/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png similarity index 100% rename from sprites/spr_block/layers/9d7904c9-3aaa-4320-b3be-c36095ba5040/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_altblock/layers/ecc58aa3-152b-42f8-b4ec-b0a325e43b6a/43ce33d3-56f7-4441-b17b-bf81479f6b4d.png diff --git a/sprites/spr_altblock/spr_altblock.yy b/sprites/spr_altblock/spr_altblock.yy new file mode 100644 index 000000000..ad94e4906 --- /dev/null +++ b/sprites/spr_altblock/spr_altblock.yy @@ -0,0 +1,774 @@ +{ + "id": "91f6b839-aba4-422a-9992-a736e55fb77f", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_altblock", + "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": "686416e4-b8cf-4da7-a26d-15617dd80d03", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "1a7d1a1d-2721-4d5a-9609-41e95212d8b7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "686416e4-b8cf-4da7-a26d-15617dd80d03", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d8cf1a41-f367-48a5-b736-4bff72a8745c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "686416e4-b8cf-4da7-a26d-15617dd80d03", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e3f941c0-5046-49ef-80e5-4b1bd23f0d8d", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "38954d77-7292-4e11-af3b-7821c645f086", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e3f941c0-5046-49ef-80e5-4b1bd23f0d8d", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "8f349d22-4841-4a6b-92fb-6bab09ea29aa", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e3f941c0-5046-49ef-80e5-4b1bd23f0d8d", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "414aee85-134c-477d-8d63-03dc80025261", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "41ea3e22-4918-44de-9c3d-54b4295a9054", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "414aee85-134c-477d-8d63-03dc80025261", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f08ffbb9-bf00-49cd-bb19-8c5a68b1c1dc", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "414aee85-134c-477d-8d63-03dc80025261", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "59b179e8-0e5a-47ca-b102-ad27268ff03f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "453d7f25-fa04-473f-a834-e1b1f453521a", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "59b179e8-0e5a-47ca-b102-ad27268ff03f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0e11eb52-bb1f-43be-acfb-2a43987bc5bf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "59b179e8-0e5a-47ca-b102-ad27268ff03f", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "4b684896-78b9-4988-a053-c6be368ce171", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "2de639bb-ba99-4804-939e-fe7d6e4dc06c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4b684896-78b9-4988-a053-c6be368ce171", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ef447362-ec3f-4fd5-8f70-5bdf56ed29d1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4b684896-78b9-4988-a053-c6be368ce171", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "8902712d-19f3-4ed1-b306-9ae1b4abd72a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "8edd87e4-b6c5-4a06-903f-f84dc81b0fb8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8902712d-19f3-4ed1-b306-9ae1b4abd72a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "58dc27fd-ea83-4a92-8a0c-442e69322e76", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "8902712d-19f3-4ed1-b306-9ae1b4abd72a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "67baab46-6390-4fd7-86bf-7d6ed7eec433", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "3a47d348-bf23-416f-bee7-cd78f16b9253", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "67baab46-6390-4fd7-86bf-7d6ed7eec433", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d4cc360f-7105-474e-8fe1-cedc79bea2c4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "67baab46-6390-4fd7-86bf-7d6ed7eec433", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "9a5bbba2-4f51-4846-ad74-d89f90c3e7da", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "ace3d4ee-daca-425e-a148-86e6b056c1c7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9a5bbba2-4f51-4846-ad74-d89f90c3e7da", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "9516eb94-eeb5-460a-b1f8-ec9a7700e239", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9a5bbba2-4f51-4846-ad74-d89f90c3e7da", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "81d2e911-b418-467d-812e-c0395c06fe3c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "0c7ddba6-2d35-481f-be00-e7cd5f7988e8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "81d2e911-b418-467d-812e-c0395c06fe3c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "13579f9f-0919-4f06-bf28-0a7df724aaa3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "81d2e911-b418-467d-812e-c0395c06fe3c", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "226f5805-6666-425d-a3da-81e8258d6760", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "e095035e-2d98-43bd-a10c-3b7b29aa7c45", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "226f5805-6666-425d-a3da-81e8258d6760", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "92667458-474c-4e87-8283-5c3fb458ce5f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "226f5805-6666-425d-a3da-81e8258d6760", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "a56bfda5-af1d-43c0-99f3-090f4da2d41a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "9c3d4777-d5d9-483d-8e04-6ec09aa25c80", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a56bfda5-af1d-43c0-99f3-090f4da2d41a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "6fa0b5fe-c7aa-4c4d-a429-77e47b7f7bd1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a56bfda5-af1d-43c0-99f3-090f4da2d41a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "c84ebbbd-f2f1-44e2-b7b4-b84263f41277", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "fa9af753-ef98-42b2-8131-f71ffb3415c8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c84ebbbd-f2f1-44e2-b7b4-b84263f41277", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "80b4b941-d347-459b-9a62-067a4f53d7c8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c84ebbbd-f2f1-44e2-b7b4-b84263f41277", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "bccc5864-7b1f-401f-ace0-5b5722572554", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "f43842ce-7467-456b-ada9-d88bcf4e9a1f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "bccc5864-7b1f-401f-ace0-5b5722572554", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "634571da-8c42-44f6-8078-1165f17b3e32", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "bccc5864-7b1f-401f-ace0-5b5722572554", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "19335820-513d-474b-b233-745be87d685f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "3d2df998-6afc-4cb4-a35b-39a2430f6749", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "19335820-513d-474b-b233-745be87d685f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "6f61a69c-c9cd-459f-847d-b89a8fae1cfd", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "19335820-513d-474b-b233-745be87d685f", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e189d814-04d3-42a2-83b3-f221488d9144", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "78faa5bd-548c-4f47-8a5f-a98116f210e4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e189d814-04d3-42a2-83b3-f221488d9144", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "07706d6f-4950-47b9-b767-5cec8c10f16b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e189d814-04d3-42a2-83b3-f221488d9144", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "15af844b-ed74-4fb0-8793-3851e7641d2a", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3479c455-3f20-437e-bb0d-8dcbb2f7de41", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "875ac4d1-8464-4e6e-a99a-ee2ab7ceb11e", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "202ab7c9-c58b-4dd9-9874-a3a746c288a2", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "bbabd343-9efc-4798-ae79-8b613a3344c1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "202ab7c9-c58b-4dd9-9874-a3a746c288a2", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d6a5383f-ac79-426e-a6d0-b44f5eb45c9d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "202ab7c9-c58b-4dd9-9874-a3a746c288a2", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "df39f2d1-e8ef-4d9d-b6ff-420aeef16650", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "e35a7507-a2dd-4752-9442-361fd32ce3e7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "df39f2d1-e8ef-4d9d-b6ff-420aeef16650", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "b6d0158b-e64a-464a-9540-0a40787937d8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "df39f2d1-e8ef-4d9d-b6ff-420aeef16650", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e2f2e76d-4616-4ab8-bf84-75bdf705a2d7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "265bc042-90ac-40b1-96db-128919442c59", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e2f2e76d-4616-4ab8-bf84-75bdf705a2d7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ce944c42-526e-486b-8930-d106cf922e46", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e2f2e76d-4616-4ab8-bf84-75bdf705a2d7", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e093dc36-e954-4a72-8f38-ec9faf0fbd57", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "c3ab0378-6993-4939-b5da-6bd302fe49fb", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e093dc36-e954-4a72-8f38-ec9faf0fbd57", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ffeb27aa-4a72-402a-a099-f30a64ebb364", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e093dc36-e954-4a72-8f38-ec9faf0fbd57", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "391b7673-a77f-4dea-aeb4-9e8954635ec5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ff5b134a-8e5e-46fc-a80b-de1539f3e23e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "97d6d8e4-d525-4d5a-a80d-63f1cf0c76bc", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "d231e946-b285-47be-a81d-5136674215be", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "caf12197-e538-4583-b0d6-4125a68bc582", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d231e946-b285-47be-a81d-5136674215be", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "383f6e45-e682-46d1-9cf2-b925daed512e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d231e946-b285-47be-a81d-5136674215be", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e45ada33-e4d6-47de-af58-a47b532b267a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "d41773e1-93a2-49d1-a347-7c5f3d4e3163", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e45ada33-e4d6-47de-af58-a47b532b267a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0907e7d5-9ac4-426b-b26c-6f6283c960ca", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e45ada33-e4d6-47de-af58-a47b532b267a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "18b92ef8-323e-485f-8c75-29b1ec74be2a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "93379271-e1b1-4943-a63d-6ac2a94c81d7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "18b92ef8-323e-485f-8c75-29b1ec74be2a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "338f2243-d16c-40e1-9d71-a021ab8b0820", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "18b92ef8-323e-485f-8c75-29b1ec74be2a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "c4151e6a-4906-4ce7-9907-31fb8adc43a5", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "7c9d84a5-1bcc-4cb7-ad96-bf556274827d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c4151e6a-4906-4ce7-9907-31fb8adc43a5", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f1aa5d69-1d06-40ef-9b0d-0689c972cf2e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "c4151e6a-4906-4ce7-9907-31fb8adc43a5", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "e6e99706-8eeb-4a5f-9235-c45b823858d0", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "3d9fd1b2-fbd0-4ca0-a4a8-4dfe2ecc9718", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e6e99706-8eeb-4a5f-9235-c45b823858d0", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "9d0dfca1-5284-44b8-82d5-4ef0f7a94ed7", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "e6e99706-8eeb-4a5f-9235-c45b823858d0", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "0cebcee4-6bcd-40a9-aaf4-d993e92a2938", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "beb4f977-7d83-4a9d-9d64-a9bc1ace10cd", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0cebcee4-6bcd-40a9-aaf4-d993e92a2938", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d5fb9698-bebf-4153-a52d-f4e5cc1309ca", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0cebcee4-6bcd-40a9-aaf4-d993e92a2938", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "d72a7986-5f91-4bed-bba1-8e9f1b1f0782", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "1f8ff00d-571d-4a2b-a7c2-d2f789f00196", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d72a7986-5f91-4bed-bba1-8e9f1b1f0782", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "edd408a8-9107-4e04-ae59-a06833c779af", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d72a7986-5f91-4bed-bba1-8e9f1b1f0782", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "1cb849fe-336e-4765-9ad5-183d53ae6fa3", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "eb7231e5-4a85-4657-9e5f-3a6a81559999", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1cb849fe-336e-4765-9ad5-183d53ae6fa3", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3e74d5eb-6bc0-4fe9-b2aa-0c2fa88387e4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "1cb849fe-336e-4765-9ad5-183d53ae6fa3", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "ecc58aa3-152b-42f8-b4ec-b0a325e43b6a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "1f409315-a991-40b6-a0ca-3488b290de97", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ecc58aa3-152b-42f8-b4ec-b0a325e43b6a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "79033fdb-875c-4d1c-8eeb-802f136cfffe", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ecc58aa3-152b-42f8-b4ec-b0a325e43b6a", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "007cc264-be6a-47fe-bfd5-f2d0e5b55f58", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "242acdbf-72cf-45eb-a1c1-cf84ada63b39", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "007cc264-be6a-47fe-bfd5-f2d0e5b55f58", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "9b7ffff5-04d9-4bf2-8df8-5ac9efcabd52", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "007cc264-be6a-47fe-bfd5-f2d0e5b55f58", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "eb2d1b3d-0c2f-4010-87dc-05e7b40846fb", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "3eabd186-7102-4db3-88f1-bd61db4f0d66", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "eb2d1b3d-0c2f-4010-87dc-05e7b40846fb", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "374cc3e6-1e6b-4bd9-b903-b95bc741655e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "eb2d1b3d-0c2f-4010-87dc-05e7b40846fb", + "LayerId": "43ce33d3-56f7-4441-b17b-bf81479f6b4d" + } + ] + }, + { + "id": "18c7fd69-d087-41eb-9502-ecc2cd0257bb", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "compositeImage": { + "id": "68a6975d-c6c5-4b1f-8417-656293f70d84", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "18c7fd69-d087-41eb-9502-ecc2cd0257bb", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "3c0dae83-b31f-4429-9243-ea3a29b61cd0", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "18c7fd69-d087-41eb-9502-ecc2cd0257bb", + "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/9c53824b-637b-491d-b4da-64ff9e43a729.png b/sprites/spr_block/012c27c4-9ed5-4a2a-93e5-0f0607c0733d.png similarity index 100% rename from sprites/spr_block/9c53824b-637b-491d-b4da-64ff9e43a729.png rename to sprites/spr_block/012c27c4-9ed5-4a2a-93e5-0f0607c0733d.png diff --git a/sprites/spr_block/05043338-f241-464b-90ea-6c3f3617eb92.png b/sprites/spr_block/05043338-f241-464b-90ea-6c3f3617eb92.png new file mode 100644 index 000000000..329d7b97e Binary files /dev/null and b/sprites/spr_block/05043338-f241-464b-90ea-6c3f3617eb92.png differ diff --git a/sprites/spr_block/204bb7c4-5777-481e-8717-b2c1a8e6a5e4.png b/sprites/spr_block/204bb7c4-5777-481e-8717-b2c1a8e6a5e4.png new file mode 100644 index 000000000..09d231d36 Binary files /dev/null and b/sprites/spr_block/204bb7c4-5777-481e-8717-b2c1a8e6a5e4.png differ diff --git a/sprites/spr_block/221bda60-7439-4109-885c-c14cd2da91ac.png b/sprites/spr_block/221bda60-7439-4109-885c-c14cd2da91ac.png new file mode 100644 index 000000000..da01b5617 Binary files /dev/null and b/sprites/spr_block/221bda60-7439-4109-885c-c14cd2da91ac.png differ diff --git a/sprites/spr_block/e903572e-bd50-44dc-b37f-80738af15125.png b/sprites/spr_block/24242d01-e08a-4f0e-8285-25826128d5e1.png similarity index 100% rename from sprites/spr_block/e903572e-bd50-44dc-b37f-80738af15125.png rename to sprites/spr_block/24242d01-e08a-4f0e-8285-25826128d5e1.png diff --git a/sprites/spr_block/27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec.png b/sprites/spr_block/27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec.png deleted file mode 100644 index 64671c810..000000000 Binary files a/sprites/spr_block/27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec.png and /dev/null differ diff --git a/sprites/spr_block/2cce8a29-4aae-4c9a-96db-e66bb5d32b98.png b/sprites/spr_block/2cce8a29-4aae-4c9a-96db-e66bb5d32b98.png deleted file mode 100644 index 3774cde87..000000000 Binary files a/sprites/spr_block/2cce8a29-4aae-4c9a-96db-e66bb5d32b98.png and /dev/null differ diff --git a/sprites/spr_block/2e81316b-dcf8-434c-87ed-489422c72a7d.png b/sprites/spr_block/2e81316b-dcf8-434c-87ed-489422c72a7d.png new file mode 100644 index 000000000..21ee2fd1c Binary files /dev/null and b/sprites/spr_block/2e81316b-dcf8-434c-87ed-489422c72a7d.png differ diff --git a/sprites/spr_block/328c1280-134c-46fd-9328-8cc8f88236d6.png b/sprites/spr_block/328c1280-134c-46fd-9328-8cc8f88236d6.png new file mode 100644 index 000000000..f26902578 Binary files /dev/null and b/sprites/spr_block/328c1280-134c-46fd-9328-8cc8f88236d6.png differ diff --git a/sprites/spr_block/3c862d66-74fc-49e4-b909-d8d0e8db0357.png b/sprites/spr_block/42f26e5b-61ac-4860-b00d-b724d0d706ab.png similarity index 100% rename from sprites/spr_block/3c862d66-74fc-49e4-b909-d8d0e8db0357.png rename to sprites/spr_block/42f26e5b-61ac-4860-b00d-b724d0d706ab.png diff --git a/sprites/spr_block/c1fa5ea5-343a-4a93-8a3b-f44344969bd9.png b/sprites/spr_block/49d694d4-3a95-4767-8722-fcb70105175b.png similarity index 100% rename from sprites/spr_block/c1fa5ea5-343a-4a93-8a3b-f44344969bd9.png rename to sprites/spr_block/49d694d4-3a95-4767-8722-fcb70105175b.png diff --git a/sprites/spr_block/561199f6-d38f-4455-8052-7fcaf3f356da.png b/sprites/spr_block/561199f6-d38f-4455-8052-7fcaf3f356da.png new file mode 100644 index 000000000..b3e7aa4ef Binary files /dev/null and b/sprites/spr_block/561199f6-d38f-4455-8052-7fcaf3f356da.png differ diff --git a/sprites/spr_block/623cd7b3-1922-4f4b-97d6-04cba3136062.png b/sprites/spr_block/623cd7b3-1922-4f4b-97d6-04cba3136062.png new file mode 100644 index 000000000..9950a3454 Binary files /dev/null and b/sprites/spr_block/623cd7b3-1922-4f4b-97d6-04cba3136062.png differ diff --git a/sprites/spr_block/1ef8fda2-f20f-45ef-b08e-dbe98d84d45b.png b/sprites/spr_block/65e388de-692d-4bab-9dba-2e9a329731dd.png similarity index 100% rename from sprites/spr_block/1ef8fda2-f20f-45ef-b08e-dbe98d84d45b.png rename to sprites/spr_block/65e388de-692d-4bab-9dba-2e9a329731dd.png diff --git a/sprites/spr_block/fe19abee-f7f8-47b4-8adc-d7d50b542eb1.png b/sprites/spr_block/666646d8-a288-43fe-83a3-4e40f41250ea.png similarity index 100% rename from sprites/spr_block/fe19abee-f7f8-47b4-8adc-d7d50b542eb1.png rename to sprites/spr_block/666646d8-a288-43fe-83a3-4e40f41250ea.png diff --git a/sprites/spr_block/75352c8e-8c31-4dce-90b1-b56212bd2438.png b/sprites/spr_block/68718c76-6af8-4d93-b4b3-bd15f1b07242.png similarity index 100% rename from sprites/spr_block/75352c8e-8c31-4dce-90b1-b56212bd2438.png rename to sprites/spr_block/68718c76-6af8-4d93-b4b3-bd15f1b07242.png diff --git a/sprites/spr_block/691954f8-b1d2-4694-bcc9-ea75e9d60b94.png b/sprites/spr_block/691954f8-b1d2-4694-bcc9-ea75e9d60b94.png deleted file mode 100644 index 96f14b0b4..000000000 Binary files a/sprites/spr_block/691954f8-b1d2-4694-bcc9-ea75e9d60b94.png and /dev/null differ diff --git a/sprites/spr_block/6ee20162-1600-4de9-a0c4-6d8e8daaacad.png b/sprites/spr_block/6ee20162-1600-4de9-a0c4-6d8e8daaacad.png new file mode 100644 index 000000000..e0ee98a61 Binary files /dev/null and b/sprites/spr_block/6ee20162-1600-4de9-a0c4-6d8e8daaacad.png differ diff --git a/sprites/spr_block/6f798f50-46de-4b6b-b539-77235a5a423e.png b/sprites/spr_block/6f798f50-46de-4b6b-b539-77235a5a423e.png deleted file mode 100644 index a8763a09d..000000000 Binary files a/sprites/spr_block/6f798f50-46de-4b6b-b539-77235a5a423e.png and /dev/null differ diff --git a/sprites/spr_block/734b13b9-d0fa-4a48-9f26-f40e90288eba.png b/sprites/spr_block/734b13b9-d0fa-4a48-9f26-f40e90288eba.png new file mode 100644 index 000000000..67ea95ce8 Binary files /dev/null and b/sprites/spr_block/734b13b9-d0fa-4a48-9f26-f40e90288eba.png differ diff --git a/sprites/spr_block/76871459-29d9-4450-8dd4-98e116bc563b.png b/sprites/spr_block/76871459-29d9-4450-8dd4-98e116bc563b.png new file mode 100644 index 000000000..3424bb984 Binary files /dev/null and b/sprites/spr_block/76871459-29d9-4450-8dd4-98e116bc563b.png differ diff --git a/sprites/spr_block/840224af-f930-4940-9008-2e7f4de6504d.png b/sprites/spr_block/840224af-f930-4940-9008-2e7f4de6504d.png deleted file mode 100644 index 3bbcef7c1..000000000 Binary files a/sprites/spr_block/840224af-f930-4940-9008-2e7f4de6504d.png and /dev/null differ diff --git a/sprites/spr_block/8f43cabf-5e5c-4afb-8250-84f940066b28.png b/sprites/spr_block/87dd7934-e3a7-4844-8f40-32e449d5b7dd.png similarity index 100% rename from sprites/spr_block/8f43cabf-5e5c-4afb-8250-84f940066b28.png rename to sprites/spr_block/87dd7934-e3a7-4844-8f40-32e449d5b7dd.png diff --git a/sprites/spr_block/8def9bc0-0b6d-4838-924b-ae410b10748b.png b/sprites/spr_block/8def9bc0-0b6d-4838-924b-ae410b10748b.png deleted file mode 100644 index 2c364c817..000000000 Binary files a/sprites/spr_block/8def9bc0-0b6d-4838-924b-ae410b10748b.png and /dev/null differ diff --git a/sprites/spr_block/8fc5f621-2ee9-4ba6-8535-f21246e7c531.png b/sprites/spr_block/8fc5f621-2ee9-4ba6-8535-f21246e7c531.png new file mode 100644 index 000000000..1ada911d3 Binary files /dev/null and b/sprites/spr_block/8fc5f621-2ee9-4ba6-8535-f21246e7c531.png differ diff --git a/sprites/spr_block/9aa15c08-2446-42fd-96e1-689bdf4256c9.png b/sprites/spr_block/9aa15c08-2446-42fd-96e1-689bdf4256c9.png new file mode 100644 index 000000000..4ef96abaa Binary files /dev/null and b/sprites/spr_block/9aa15c08-2446-42fd-96e1-689bdf4256c9.png differ diff --git a/sprites/spr_block/9b28ff3a-af56-4483-8096-f3c35a224189.png b/sprites/spr_block/9b28ff3a-af56-4483-8096-f3c35a224189.png new file mode 100644 index 000000000..af12874af Binary files /dev/null and b/sprites/spr_block/9b28ff3a-af56-4483-8096-f3c35a224189.png differ diff --git a/sprites/spr_block/36739f1b-b0e1-46ca-b9c0-18dab09687ac.png b/sprites/spr_block/a184eaeb-6182-4f60-9434-f992fe0ac3dd.png similarity index 100% rename from sprites/spr_block/36739f1b-b0e1-46ca-b9c0-18dab09687ac.png rename to sprites/spr_block/a184eaeb-6182-4f60-9434-f992fe0ac3dd.png diff --git a/sprites/spr_block/af1898e9-ee2f-4908-a774-0dd624ea0e08.png b/sprites/spr_block/af1898e9-ee2f-4908-a774-0dd624ea0e08.png deleted file mode 100644 index ebca60e59..000000000 Binary files a/sprites/spr_block/af1898e9-ee2f-4908-a774-0dd624ea0e08.png and /dev/null differ diff --git a/sprites/spr_block/c9a8f41a-aaec-4076-80fd-20c488b51796.png b/sprites/spr_block/b1d2a886-a75e-482b-93b4-6899decc166a.png similarity index 100% rename from sprites/spr_block/c9a8f41a-aaec-4076-80fd-20c488b51796.png rename to sprites/spr_block/b1d2a886-a75e-482b-93b4-6899decc166a.png diff --git a/sprites/spr_block/984c9871-7301-4720-beee-cfe06ed7bbe0.png b/sprites/spr_block/bc917779-b8e2-452a-8d85-1700deda2143.png similarity index 100% rename from sprites/spr_block/984c9871-7301-4720-beee-cfe06ed7bbe0.png rename to sprites/spr_block/bc917779-b8e2-452a-8d85-1700deda2143.png diff --git a/sprites/spr_block/0457a3e3-5af7-4762-b6d5-a502ce1e4ed0.png b/sprites/spr_block/c5ad516c-b4e1-4024-bff8-bd7a46dddf6c.png similarity index 100% rename from sprites/spr_block/0457a3e3-5af7-4762-b6d5-a502ce1e4ed0.png rename to sprites/spr_block/c5ad516c-b4e1-4024-bff8-bd7a46dddf6c.png diff --git a/sprites/spr_block/cc4f5404-9b73-451a-b7ab-314665599ef6.png b/sprites/spr_block/cc4f5404-9b73-451a-b7ab-314665599ef6.png deleted file mode 100644 index 0bcf1dc6d..000000000 Binary files a/sprites/spr_block/cc4f5404-9b73-451a-b7ab-314665599ef6.png and /dev/null differ diff --git a/sprites/spr_block/96c65259-385c-47b4-9229-e44b5f3a6621.png b/sprites/spr_block/ccb85e3e-bbd6-4699-a2f0-4158c0f8719a.png similarity index 100% rename from sprites/spr_block/96c65259-385c-47b4-9229-e44b5f3a6621.png rename to sprites/spr_block/ccb85e3e-bbd6-4699-a2f0-4158c0f8719a.png diff --git a/sprites/spr_block/d3187af7-c75c-42d7-b199-8dfe229c7214.png b/sprites/spr_block/d3187af7-c75c-42d7-b199-8dfe229c7214.png deleted file mode 100644 index a5d68b3ba..000000000 Binary files a/sprites/spr_block/d3187af7-c75c-42d7-b199-8dfe229c7214.png and /dev/null differ diff --git a/sprites/spr_block/7afafe51-354f-46dc-84d4-3090677de37b.png b/sprites/spr_block/d32cafb4-87f7-4326-ac88-4ac48c5de2cb.png similarity index 100% rename from sprites/spr_block/7afafe51-354f-46dc-84d4-3090677de37b.png rename to sprites/spr_block/d32cafb4-87f7-4326-ac88-4ac48c5de2cb.png diff --git a/sprites/spr_block/daf386da-b64a-408e-8dad-edc588b10778.png b/sprites/spr_block/daf386da-b64a-408e-8dad-edc588b10778.png new file mode 100644 index 000000000..ca724a384 Binary files /dev/null and b/sprites/spr_block/daf386da-b64a-408e-8dad-edc588b10778.png differ diff --git a/sprites/spr_block/dcf2b7fb-2b3d-4979-8d24-dc358309f208.png b/sprites/spr_block/dcf2b7fb-2b3d-4979-8d24-dc358309f208.png new file mode 100644 index 000000000..f0cd8f51f Binary files /dev/null and b/sprites/spr_block/dcf2b7fb-2b3d-4979-8d24-dc358309f208.png differ diff --git a/sprites/spr_block/3b696877-a551-4c01-a4c1-796e703abc53.png b/sprites/spr_block/e8d8db13-eb6f-462f-8069-eb34f184c079.png similarity index 100% rename from sprites/spr_block/3b696877-a551-4c01-a4c1-796e703abc53.png rename to sprites/spr_block/e8d8db13-eb6f-462f-8069-eb34f184c079.png diff --git a/sprites/spr_block/260b3c68-11ec-419f-bfe6-af55aff96cd3.png b/sprites/spr_block/f9431ee4-a74a-42fa-b13d-d33b6bdc9158.png similarity index 100% rename from sprites/spr_block/260b3c68-11ec-419f-bfe6-af55aff96cd3.png rename to sprites/spr_block/f9431ee4-a74a-42fa-b13d-d33b6bdc9158.png diff --git a/sprites/spr_block/fb466d77-04f0-44f5-91f5-3aba8dcb3806.png b/sprites/spr_block/fb466d77-04f0-44f5-91f5-3aba8dcb3806.png new file mode 100644 index 000000000..7e8758600 Binary files /dev/null and b/sprites/spr_block/fb466d77-04f0-44f5-91f5-3aba8dcb3806.png differ diff --git a/sprites/spr_block/fc30f068-17b3-4a71-889e-4fc4d9782379.png b/sprites/spr_block/fc30f068-17b3-4a71-889e-4fc4d9782379.png new file mode 100644 index 000000000..2ea8d305b Binary files /dev/null and b/sprites/spr_block/fc30f068-17b3-4a71-889e-4fc4d9782379.png differ diff --git a/sprites/spr_block/layers/9c53824b-637b-491d-b4da-64ff9e43a729/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/012c27c4-9ed5-4a2a-93e5-0f0607c0733d/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/9c53824b-637b-491d-b4da-64ff9e43a729/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/012c27c4-9ed5-4a2a-93e5-0f0607c0733d/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/05043338-f241-464b-90ea-6c3f3617eb92/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/05043338-f241-464b-90ea-6c3f3617eb92/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..329d7b97e Binary files /dev/null and b/sprites/spr_block/layers/05043338-f241-464b-90ea-6c3f3617eb92/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/204bb7c4-5777-481e-8717-b2c1a8e6a5e4/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/204bb7c4-5777-481e-8717-b2c1a8e6a5e4/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..09d231d36 Binary files /dev/null and b/sprites/spr_block/layers/204bb7c4-5777-481e-8717-b2c1a8e6a5e4/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/221bda60-7439-4109-885c-c14cd2da91ac/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/221bda60-7439-4109-885c-c14cd2da91ac/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..da01b5617 Binary files /dev/null and b/sprites/spr_block/layers/221bda60-7439-4109-885c-c14cd2da91ac/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/e903572e-bd50-44dc-b37f-80738af15125/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/24242d01-e08a-4f0e-8285-25826128d5e1/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/e903572e-bd50-44dc-b37f-80738af15125/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/24242d01-e08a-4f0e-8285-25826128d5e1/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index 64671c810..000000000 Binary files a/sprites/spr_block/layers/27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/2cce8a29-4aae-4c9a-96db-e66bb5d32b98/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/2cce8a29-4aae-4c9a-96db-e66bb5d32b98/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index 3774cde87..000000000 Binary files a/sprites/spr_block/layers/2cce8a29-4aae-4c9a-96db-e66bb5d32b98/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/2e81316b-dcf8-434c-87ed-489422c72a7d/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/2e81316b-dcf8-434c-87ed-489422c72a7d/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..21ee2fd1c Binary files /dev/null and b/sprites/spr_block/layers/2e81316b-dcf8-434c-87ed-489422c72a7d/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/328c1280-134c-46fd-9328-8cc8f88236d6/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/328c1280-134c-46fd-9328-8cc8f88236d6/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..f26902578 Binary files /dev/null and b/sprites/spr_block/layers/328c1280-134c-46fd-9328-8cc8f88236d6/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/3c862d66-74fc-49e4-b909-d8d0e8db0357/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/42f26e5b-61ac-4860-b00d-b724d0d706ab/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/3c862d66-74fc-49e4-b909-d8d0e8db0357/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/42f26e5b-61ac-4860-b00d-b724d0d706ab/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/c1fa5ea5-343a-4a93-8a3b-f44344969bd9/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/49d694d4-3a95-4767-8722-fcb70105175b/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/c1fa5ea5-343a-4a93-8a3b-f44344969bd9/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/49d694d4-3a95-4767-8722-fcb70105175b/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/561199f6-d38f-4455-8052-7fcaf3f356da/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/561199f6-d38f-4455-8052-7fcaf3f356da/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..b3e7aa4ef Binary files /dev/null and b/sprites/spr_block/layers/561199f6-d38f-4455-8052-7fcaf3f356da/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/623cd7b3-1922-4f4b-97d6-04cba3136062/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/623cd7b3-1922-4f4b-97d6-04cba3136062/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..9950a3454 Binary files /dev/null and b/sprites/spr_block/layers/623cd7b3-1922-4f4b-97d6-04cba3136062/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/1ef8fda2-f20f-45ef-b08e-dbe98d84d45b/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/65e388de-692d-4bab-9dba-2e9a329731dd/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/1ef8fda2-f20f-45ef-b08e-dbe98d84d45b/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/65e388de-692d-4bab-9dba-2e9a329731dd/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/fe19abee-f7f8-47b4-8adc-d7d50b542eb1/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/666646d8-a288-43fe-83a3-4e40f41250ea/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/fe19abee-f7f8-47b4-8adc-d7d50b542eb1/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/666646d8-a288-43fe-83a3-4e40f41250ea/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/75352c8e-8c31-4dce-90b1-b56212bd2438/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/68718c76-6af8-4d93-b4b3-bd15f1b07242/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/75352c8e-8c31-4dce-90b1-b56212bd2438/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/68718c76-6af8-4d93-b4b3-bd15f1b07242/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/691954f8-b1d2-4694-bcc9-ea75e9d60b94/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/691954f8-b1d2-4694-bcc9-ea75e9d60b94/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index 96f14b0b4..000000000 Binary files a/sprites/spr_block/layers/691954f8-b1d2-4694-bcc9-ea75e9d60b94/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/6ee20162-1600-4de9-a0c4-6d8e8daaacad/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/6ee20162-1600-4de9-a0c4-6d8e8daaacad/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..e0ee98a61 Binary files /dev/null and b/sprites/spr_block/layers/6ee20162-1600-4de9-a0c4-6d8e8daaacad/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/6f798f50-46de-4b6b-b539-77235a5a423e/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/6f798f50-46de-4b6b-b539-77235a5a423e/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index a8763a09d..000000000 Binary files a/sprites/spr_block/layers/6f798f50-46de-4b6b-b539-77235a5a423e/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/734b13b9-d0fa-4a48-9f26-f40e90288eba/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/734b13b9-d0fa-4a48-9f26-f40e90288eba/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..67ea95ce8 Binary files /dev/null and b/sprites/spr_block/layers/734b13b9-d0fa-4a48-9f26-f40e90288eba/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/76871459-29d9-4450-8dd4-98e116bc563b/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/76871459-29d9-4450-8dd4-98e116bc563b/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..3424bb984 Binary files /dev/null and b/sprites/spr_block/layers/76871459-29d9-4450-8dd4-98e116bc563b/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/840224af-f930-4940-9008-2e7f4de6504d/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/840224af-f930-4940-9008-2e7f4de6504d/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index 3bbcef7c1..000000000 Binary files a/sprites/spr_block/layers/840224af-f930-4940-9008-2e7f4de6504d/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/8f43cabf-5e5c-4afb-8250-84f940066b28/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/87dd7934-e3a7-4844-8f40-32e449d5b7dd/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/8f43cabf-5e5c-4afb-8250-84f940066b28/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/87dd7934-e3a7-4844-8f40-32e449d5b7dd/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/8def9bc0-0b6d-4838-924b-ae410b10748b/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/8def9bc0-0b6d-4838-924b-ae410b10748b/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index 2c364c817..000000000 Binary files a/sprites/spr_block/layers/8def9bc0-0b6d-4838-924b-ae410b10748b/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/8fc5f621-2ee9-4ba6-8535-f21246e7c531/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/8fc5f621-2ee9-4ba6-8535-f21246e7c531/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..1ada911d3 Binary files /dev/null and b/sprites/spr_block/layers/8fc5f621-2ee9-4ba6-8535-f21246e7c531/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/9aa15c08-2446-42fd-96e1-689bdf4256c9/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/9aa15c08-2446-42fd-96e1-689bdf4256c9/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..4ef96abaa Binary files /dev/null and b/sprites/spr_block/layers/9aa15c08-2446-42fd-96e1-689bdf4256c9/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/9b28ff3a-af56-4483-8096-f3c35a224189/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/9b28ff3a-af56-4483-8096-f3c35a224189/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..af12874af Binary files /dev/null and b/sprites/spr_block/layers/9b28ff3a-af56-4483-8096-f3c35a224189/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/36739f1b-b0e1-46ca-b9c0-18dab09687ac/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/a184eaeb-6182-4f60-9434-f992fe0ac3dd/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/36739f1b-b0e1-46ca-b9c0-18dab09687ac/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/a184eaeb-6182-4f60-9434-f992fe0ac3dd/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/af1898e9-ee2f-4908-a774-0dd624ea0e08/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/af1898e9-ee2f-4908-a774-0dd624ea0e08/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index ebca60e59..000000000 Binary files a/sprites/spr_block/layers/af1898e9-ee2f-4908-a774-0dd624ea0e08/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/c9a8f41a-aaec-4076-80fd-20c488b51796/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/b1d2a886-a75e-482b-93b4-6899decc166a/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/c9a8f41a-aaec-4076-80fd-20c488b51796/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/b1d2a886-a75e-482b-93b4-6899decc166a/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/984c9871-7301-4720-beee-cfe06ed7bbe0/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/bc917779-b8e2-452a-8d85-1700deda2143/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/984c9871-7301-4720-beee-cfe06ed7bbe0/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/bc917779-b8e2-452a-8d85-1700deda2143/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/0457a3e3-5af7-4762-b6d5-a502ce1e4ed0/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/c5ad516c-b4e1-4024-bff8-bd7a46dddf6c/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/0457a3e3-5af7-4762-b6d5-a502ce1e4ed0/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/c5ad516c-b4e1-4024-bff8-bd7a46dddf6c/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/cc4f5404-9b73-451a-b7ab-314665599ef6/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/cc4f5404-9b73-451a-b7ab-314665599ef6/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index 0bcf1dc6d..000000000 Binary files a/sprites/spr_block/layers/cc4f5404-9b73-451a-b7ab-314665599ef6/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/96c65259-385c-47b4-9229-e44b5f3a6621/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/ccb85e3e-bbd6-4699-a2f0-4158c0f8719a/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/96c65259-385c-47b4-9229-e44b5f3a6621/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/ccb85e3e-bbd6-4699-a2f0-4158c0f8719a/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/d3187af7-c75c-42d7-b199-8dfe229c7214/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/d3187af7-c75c-42d7-b199-8dfe229c7214/496f7f30-21df-4937-83b9-93d982ee05ed.png deleted file mode 100644 index a5d68b3ba..000000000 Binary files a/sprites/spr_block/layers/d3187af7-c75c-42d7-b199-8dfe229c7214/496f7f30-21df-4937-83b9-93d982ee05ed.png and /dev/null differ diff --git a/sprites/spr_block/layers/7afafe51-354f-46dc-84d4-3090677de37b/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/d32cafb4-87f7-4326-ac88-4ac48c5de2cb/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/7afafe51-354f-46dc-84d4-3090677de37b/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/d32cafb4-87f7-4326-ac88-4ac48c5de2cb/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/daf386da-b64a-408e-8dad-edc588b10778/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/daf386da-b64a-408e-8dad-edc588b10778/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..ca724a384 Binary files /dev/null and b/sprites/spr_block/layers/daf386da-b64a-408e-8dad-edc588b10778/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/dcf2b7fb-2b3d-4979-8d24-dc358309f208/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/dcf2b7fb-2b3d-4979-8d24-dc358309f208/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..f0cd8f51f Binary files /dev/null and b/sprites/spr_block/layers/dcf2b7fb-2b3d-4979-8d24-dc358309f208/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/3b696877-a551-4c01-a4c1-796e703abc53/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/e8d8db13-eb6f-462f-8069-eb34f184c079/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/3b696877-a551-4c01-a4c1-796e703abc53/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/e8d8db13-eb6f-462f-8069-eb34f184c079/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/260b3c68-11ec-419f-bfe6-af55aff96cd3/496f7f30-21df-4937-83b9-93d982ee05ed.png b/sprites/spr_block/layers/f9431ee4-a74a-42fa-b13d-d33b6bdc9158/26089ef7-f709-408f-8b36-5447ecbbde36.png similarity index 100% rename from sprites/spr_block/layers/260b3c68-11ec-419f-bfe6-af55aff96cd3/496f7f30-21df-4937-83b9-93d982ee05ed.png rename to sprites/spr_block/layers/f9431ee4-a74a-42fa-b13d-d33b6bdc9158/26089ef7-f709-408f-8b36-5447ecbbde36.png diff --git a/sprites/spr_block/layers/fb466d77-04f0-44f5-91f5-3aba8dcb3806/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/fb466d77-04f0-44f5-91f5-3aba8dcb3806/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..7e8758600 Binary files /dev/null and b/sprites/spr_block/layers/fb466d77-04f0-44f5-91f5-3aba8dcb3806/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/layers/fc30f068-17b3-4a71-889e-4fc4d9782379/26089ef7-f709-408f-8b36-5447ecbbde36.png b/sprites/spr_block/layers/fc30f068-17b3-4a71-889e-4fc4d9782379/26089ef7-f709-408f-8b36-5447ecbbde36.png new file mode 100644 index 000000000..2ea8d305b Binary files /dev/null and b/sprites/spr_block/layers/fc30f068-17b3-4a71-889e-4fc4d9782379/26089ef7-f709-408f-8b36-5447ecbbde36.png differ diff --git a/sprites/spr_block/spr_block.yy b/sprites/spr_block/spr_block.yy index 3d44f407f..f05f0408f 100644 --- a/sprites/spr_block/spr_block.yy +++ b/sprites/spr_block/spr_block.yy @@ -1,5 +1,5 @@ { - "id": "91f6b839-aba4-422a-9992-a736e55fb77f", + "id": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "modelName": "GMSprite", "mvc": "1.12", "name": "spr_block", @@ -16,904 +16,728 @@ "edgeFiltering": false, "frames": [ { - "id": "1ef8fda2-f20f-45ef-b08e-dbe98d84d45b", + "id": "65e388de-692d-4bab-9dba-2e9a329731dd", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "da60a11a-d071-4a96-865c-acc47f5a7255", + "id": "8166866f-08ad-4eb2-958f-41538910b347", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1ef8fda2-f20f-45ef-b08e-dbe98d84d45b", + "FrameId": "65e388de-692d-4bab-9dba-2e9a329731dd", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8f22d1a4-3929-4be8-8350-40a614d35dfb", + "id": "9361cd26-1477-41ab-94d8-670dc1c2d044", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1ef8fda2-f20f-45ef-b08e-dbe98d84d45b", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "65e388de-692d-4bab-9dba-2e9a329731dd", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "75352c8e-8c31-4dce-90b1-b56212bd2438", + "id": "68718c76-6af8-4d93-b4b3-bd15f1b07242", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "daebb671-3a92-4dc8-8c8b-66a01605e9bd", + "id": "ebabcbc4-3dc8-4a4d-9f5e-d3fd2e36e3de", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "75352c8e-8c31-4dce-90b1-b56212bd2438", + "FrameId": "68718c76-6af8-4d93-b4b3-bd15f1b07242", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "96e2badd-ed71-41ba-8e74-50c55c3fd2d2", + "id": "7e82a2e4-4fa0-48df-a693-fcedb1b4beb4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "75352c8e-8c31-4dce-90b1-b56212bd2438", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "68718c76-6af8-4d93-b4b3-bd15f1b07242", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "260b3c68-11ec-419f-bfe6-af55aff96cd3", + "id": "f9431ee4-a74a-42fa-b13d-d33b6bdc9158", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "ffe5d045-cfe9-43dd-96b0-21c20288c66a", + "id": "ce69264f-7c59-47ba-a514-8df1273a7c60", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "260b3c68-11ec-419f-bfe6-af55aff96cd3", + "FrameId": "f9431ee4-a74a-42fa-b13d-d33b6bdc9158", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8b3517a3-f5a4-431c-a691-96cd8db1ae4d", + "id": "0fa1ce13-0f7f-4375-a5c4-49af69311fb8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "260b3c68-11ec-419f-bfe6-af55aff96cd3", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "f9431ee4-a74a-42fa-b13d-d33b6bdc9158", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "7afafe51-354f-46dc-84d4-3090677de37b", + "id": "d32cafb4-87f7-4326-ac88-4ac48c5de2cb", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "b255129f-bcb3-4656-ad10-cb97ae294f25", + "id": "919af9b2-3e48-4085-9d6b-ed62c6047b31", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "7afafe51-354f-46dc-84d4-3090677de37b", + "FrameId": "d32cafb4-87f7-4326-ac88-4ac48c5de2cb", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "4b8b8c3e-e148-4865-b8ae-4638f2093d95", + "id": "e4d35c0f-71c3-4c58-9ec1-6cbd2f75dc7f", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "7afafe51-354f-46dc-84d4-3090677de37b", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "d32cafb4-87f7-4326-ac88-4ac48c5de2cb", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "9c53824b-637b-491d-b4da-64ff9e43a729", + "id": "012c27c4-9ed5-4a2a-93e5-0f0607c0733d", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "7cb04ca5-053d-43f4-a3f9-c1678a5b07f5", + "id": "bfaf9fee-7156-4d89-b9d5-600fc3adb2f1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "9c53824b-637b-491d-b4da-64ff9e43a729", + "FrameId": "012c27c4-9ed5-4a2a-93e5-0f0607c0733d", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "b39080a3-b4a9-47da-816b-ed8f6dc6af32", + "id": "a27ee30e-5efa-4660-a5c2-a0e937edf214", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "9c53824b-637b-491d-b4da-64ff9e43a729", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "012c27c4-9ed5-4a2a-93e5-0f0607c0733d", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "96c65259-385c-47b4-9229-e44b5f3a6621", + "id": "ccb85e3e-bbd6-4699-a2f0-4158c0f8719a", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "d71c2fa3-4955-491e-b70e-de6b1786f941", + "id": "ba07b3d8-8f5c-4331-9c5f-7a15fe75d17b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "96c65259-385c-47b4-9229-e44b5f3a6621", + "FrameId": "ccb85e3e-bbd6-4699-a2f0-4158c0f8719a", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "31ce3d71-16d4-4c76-ae9e-1b52fd5a09ab", + "id": "afcdebe7-d0ca-46de-92db-f3e1712cab8b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "96c65259-385c-47b4-9229-e44b5f3a6621", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "ccb85e3e-bbd6-4699-a2f0-4158c0f8719a", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "fe19abee-f7f8-47b4-8adc-d7d50b542eb1", + "id": "666646d8-a288-43fe-83a3-4e40f41250ea", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "ddc027e1-d8f6-4df2-b393-482d8c32fd32", + "id": "dbf5ec65-27fd-4097-89ac-336b33b7756d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "fe19abee-f7f8-47b4-8adc-d7d50b542eb1", + "FrameId": "666646d8-a288-43fe-83a3-4e40f41250ea", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e3997edf-86f3-4e48-8797-ac51a1970096", + "id": "f3c4b2d9-113b-418a-8f7c-ecd2d029d3d4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "fe19abee-f7f8-47b4-8adc-d7d50b542eb1", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "666646d8-a288-43fe-83a3-4e40f41250ea", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "984c9871-7301-4720-beee-cfe06ed7bbe0", + "id": "bc917779-b8e2-452a-8d85-1700deda2143", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "62967178-b0b5-48e5-baa6-b7a554dc58f4", + "id": "94406199-90d7-4785-aa5b-64877fa21707", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "984c9871-7301-4720-beee-cfe06ed7bbe0", + "FrameId": "bc917779-b8e2-452a-8d85-1700deda2143", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "f4fbb342-2167-4eb2-b31f-481af565eee7", + "id": "3f04a84f-7a45-4e9b-b567-44dfcb292029", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "984c9871-7301-4720-beee-cfe06ed7bbe0", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "bc917779-b8e2-452a-8d85-1700deda2143", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "36739f1b-b0e1-46ca-b9c0-18dab09687ac", + "id": "a184eaeb-6182-4f60-9434-f992fe0ac3dd", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "99f43012-1da5-4eb1-9976-58a55f644968", + "id": "95b11528-ba45-421b-94c4-c0a81b88c661", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "36739f1b-b0e1-46ca-b9c0-18dab09687ac", + "FrameId": "a184eaeb-6182-4f60-9434-f992fe0ac3dd", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "fcf24015-217d-41ce-b3ad-3958868740bb", + "id": "abe88acd-186c-4674-9450-5c5882335ca7", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "36739f1b-b0e1-46ca-b9c0-18dab09687ac", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "a184eaeb-6182-4f60-9434-f992fe0ac3dd", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "e903572e-bd50-44dc-b37f-80738af15125", + "id": "24242d01-e08a-4f0e-8285-25826128d5e1", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "62ccdefa-c782-406b-b89f-de99aa1b0c01", + "id": "e6578736-3771-4343-a37f-33da967e8263", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e903572e-bd50-44dc-b37f-80738af15125", + "FrameId": "24242d01-e08a-4f0e-8285-25826128d5e1", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "739e2bde-0fa1-4dc9-bb97-1f40618d27d0", + "id": "a46ad4fc-68cd-46f0-a232-fe97b090f00a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e903572e-bd50-44dc-b37f-80738af15125", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "24242d01-e08a-4f0e-8285-25826128d5e1", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "3c862d66-74fc-49e4-b909-d8d0e8db0357", + "id": "42f26e5b-61ac-4860-b00d-b724d0d706ab", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "cb949a3c-3758-43ce-9ef3-f7a05ef63fa3", + "id": "43dde187-fd69-4a18-934d-4cb3c2c2d10c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3c862d66-74fc-49e4-b909-d8d0e8db0357", + "FrameId": "42f26e5b-61ac-4860-b00d-b724d0d706ab", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "63f42fef-77fd-44f1-a81a-4aa3dbf226fa", + "id": "556fc331-73f4-46a0-a42f-17596f630330", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3c862d66-74fc-49e4-b909-d8d0e8db0357", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "42f26e5b-61ac-4860-b00d-b724d0d706ab", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "c9a8f41a-aaec-4076-80fd-20c488b51796", + "id": "b1d2a886-a75e-482b-93b4-6899decc166a", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "cca0b89c-0ab2-4c7b-b777-1922eb77b2e0", + "id": "20b060a8-8f6c-4f0e-aeac-b0109a4df05e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "c9a8f41a-aaec-4076-80fd-20c488b51796", + "FrameId": "b1d2a886-a75e-482b-93b4-6899decc166a", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "cff214ff-fae9-40fa-8924-6583b46b47eb", + "id": "a61f520f-5d93-4818-a74a-54a64d03d32d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "c9a8f41a-aaec-4076-80fd-20c488b51796", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "b1d2a886-a75e-482b-93b4-6899decc166a", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "8f43cabf-5e5c-4afb-8250-84f940066b28", + "id": "87dd7934-e3a7-4844-8f40-32e449d5b7dd", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "c93c81f9-24be-485a-81bd-87047bb31fb4", + "id": "f42da6fa-a35f-4038-a0a3-ee89bc54f64b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8f43cabf-5e5c-4afb-8250-84f940066b28", + "FrameId": "87dd7934-e3a7-4844-8f40-32e449d5b7dd", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "34c81f75-91df-461c-9f29-45fdb63493d8", + "id": "a2ed4036-00c8-41d2-96fc-311d73e780d9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8f43cabf-5e5c-4afb-8250-84f940066b28", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "87dd7934-e3a7-4844-8f40-32e449d5b7dd", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "3b696877-a551-4c01-a4c1-796e703abc53", + "id": "e8d8db13-eb6f-462f-8069-eb34f184c079", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "9c6ac9a5-cbc0-4e01-a7f4-993ffd05c727", + "id": "f620967b-028d-4f45-8383-6a57aa0724cb", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3b696877-a551-4c01-a4c1-796e703abc53", + "FrameId": "e8d8db13-eb6f-462f-8069-eb34f184c079", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "6ff82093-04cf-40d3-93d9-c26f1c51a59b", + "id": "83c327ee-2276-4a07-bcae-d02e3ac47eb2", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "3b696877-a551-4c01-a4c1-796e703abc53", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "e8d8db13-eb6f-462f-8069-eb34f184c079", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "c1fa5ea5-343a-4a93-8a3b-f44344969bd9", + "id": "49d694d4-3a95-4767-8722-fcb70105175b", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "0278b2ae-6852-47f3-942e-2e74126475d3", + "id": "71796f15-35df-4bfa-9d33-276174181d07", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "c1fa5ea5-343a-4a93-8a3b-f44344969bd9", + "FrameId": "49d694d4-3a95-4767-8722-fcb70105175b", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "c4d82f3a-5690-47af-9023-81aa6be6e9af", + "id": "eb163b24-ef76-4e06-84d0-b3b7bbba2053", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "c1fa5ea5-343a-4a93-8a3b-f44344969bd9", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "49d694d4-3a95-4767-8722-fcb70105175b", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "0457a3e3-5af7-4762-b6d5-a502ce1e4ed0", + "id": "c5ad516c-b4e1-4024-bff8-bd7a46dddf6c", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "844c4b8a-5aa0-4be2-8e8a-73f7f4e93bb1", + "id": "80db62db-7b05-4c6c-b9e5-e4bb97ccba23", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0457a3e3-5af7-4762-b6d5-a502ce1e4ed0", + "FrameId": "c5ad516c-b4e1-4024-bff8-bd7a46dddf6c", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "82737ed5-16be-42c9-a52e-87973ef0f584", + "id": "444f593f-7420-4897-af68-c5bc6d3f3ac9", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0457a3e3-5af7-4762-b6d5-a502ce1e4ed0", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "c5ad516c-b4e1-4024-bff8-bd7a46dddf6c", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "d3a761e8-5b80-4306-b0c1-7a4f569b425c", + "id": "2e81316b-dcf8-434c-87ed-489422c72a7d", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "d9a2b165-3fb9-4d48-a98c-572f85ee08ee", + "id": "f4bbb170-0f33-4176-850a-d299362604fb", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d3a761e8-5b80-4306-b0c1-7a4f569b425c", + "FrameId": "2e81316b-dcf8-434c-87ed-489422c72a7d", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "6d876572-2217-4c17-9194-209251be9816", + "id": "befaf430-6164-4bfe-9242-23cb62ee8fb4", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "d3a761e8-5b80-4306-b0c1-7a4f569b425c", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "2e81316b-dcf8-434c-87ed-489422c72a7d", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "05fe476f-982f-4a58-aa22-84af277946f7", + "id": "76871459-29d9-4450-8dd4-98e116bc563b", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "fd294dd5-3c16-4062-8f22-1b0df9a3f783", + "id": "45838fd5-2048-4811-a6f3-bf566096751b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "05fe476f-982f-4a58-aa22-84af277946f7", + "FrameId": "76871459-29d9-4450-8dd4-98e116bc563b", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8f9258de-6635-4f3c-bd9e-87df6ec8dd25", + "id": "d4d1162f-034d-4b86-b198-b1e161d3a696", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "05fe476f-982f-4a58-aa22-84af277946f7", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "76871459-29d9-4450-8dd4-98e116bc563b", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "45281be7-bc90-4950-a7c8-612aa90ce020", + "id": "9aa15c08-2446-42fd-96e1-689bdf4256c9", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "65563830-3925-4582-8cf2-712b4dccdccf", + "id": "56a60048-70aa-4298-9be2-7323594bd28f", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "45281be7-bc90-4950-a7c8-612aa90ce020", + "FrameId": "9aa15c08-2446-42fd-96e1-689bdf4256c9", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "7abfd856-c824-4c05-b6d2-e2723776e547", + "id": "1af92ca2-8d74-4208-a32e-8f56239092a3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "45281be7-bc90-4950-a7c8-612aa90ce020", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "9aa15c08-2446-42fd-96e1-689bdf4256c9", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "635d0401-6d03-4c66-ade5-9ad983ab9116", + "id": "204bb7c4-5777-481e-8717-b2c1a8e6a5e4", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "80f07781-b8cd-4373-8c21-b3081ba23041", + "id": "c2122a84-b526-4bef-83cc-dc7fb4c2ce34", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "635d0401-6d03-4c66-ade5-9ad983ab9116", + "FrameId": "204bb7c4-5777-481e-8717-b2c1a8e6a5e4", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "799714df-2d9e-4a43-9b0b-acb70f6b9d01", + "id": "ac891574-76c2-4f37-9315-b9f1b2183c21", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "635d0401-6d03-4c66-ade5-9ad983ab9116", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "204bb7c4-5777-481e-8717-b2c1a8e6a5e4", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "daac478e-25eb-4b87-83a2-e20071e548c3", + "id": "8fc5f621-2ee9-4ba6-8535-f21246e7c531", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "f1adb0e4-b4d7-47da-811f-3ee7f6365fe2", + "id": "c46665c2-7b10-4bef-9489-9364548cefa5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "daac478e-25eb-4b87-83a2-e20071e548c3", + "FrameId": "8fc5f621-2ee9-4ba6-8535-f21246e7c531", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "c5a20493-7c46-435e-80f6-a91517158c08", + "id": "58fe1c63-3594-4f11-91fd-ef01d75463f7", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "daac478e-25eb-4b87-83a2-e20071e548c3", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "8fc5f621-2ee9-4ba6-8535-f21246e7c531", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "1c4d3a53-1769-444f-b59c-54a25588399a", + "id": "fc30f068-17b3-4a71-889e-4fc4d9782379", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "5b8d4b6b-8c7d-4188-86f8-b347b7c52cf0", + "id": "54216f4f-0e63-4491-80d0-7ac010d40921", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1c4d3a53-1769-444f-b59c-54a25588399a", + "FrameId": "fc30f068-17b3-4a71-889e-4fc4d9782379", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "8c037763-1102-4d49-a8bb-b995463eef62", + "id": "1b98e006-8ad0-4f3e-8688-d2c0366a9374", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "1c4d3a53-1769-444f-b59c-54a25588399a", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "fc30f068-17b3-4a71-889e-4fc4d9782379", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "e1b0be72-6bc9-49b2-b2e1-80de4986c765", + "id": "221bda60-7439-4109-885c-c14cd2da91ac", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "29b06083-7c72-44c6-a117-37bbaadc88d5", + "id": "d08f5372-99d7-4a48-9ee9-7392ae1611ee", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e1b0be72-6bc9-49b2-b2e1-80de4986c765", + "FrameId": "221bda60-7439-4109-885c-c14cd2da91ac", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "e1918970-0e76-49f0-83d7-1394e88515a3", + "id": "6cf69ff2-beb0-4c22-96f8-395047e041a1", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e1b0be72-6bc9-49b2-b2e1-80de4986c765", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "221bda60-7439-4109-885c-c14cd2da91ac", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "60565bc3-2092-49fd-a191-db91fddac5db", + "id": "dcf2b7fb-2b3d-4979-8d24-dc358309f208", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "1499666e-a3f3-498c-855c-80f024063553", + "id": "c23043ed-cd38-487a-97d6-bfaadfb5852c", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "60565bc3-2092-49fd-a191-db91fddac5db", + "FrameId": "dcf2b7fb-2b3d-4979-8d24-dc358309f208", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "026a7649-4779-4a59-84a3-24ae9b09e097", + "id": "b7dc501b-b0fd-4aa6-808d-61f24e6774b5", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "60565bc3-2092-49fd-a191-db91fddac5db", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "dcf2b7fb-2b3d-4979-8d24-dc358309f208", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "729b6be6-cc4e-4693-95a0-85431b0e95ca", + "id": "328c1280-134c-46fd-9328-8cc8f88236d6", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "51f7ae21-695b-424f-87e8-140137ec64bd", + "id": "51a89192-2023-484a-94bd-ec876ca6f385", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "729b6be6-cc4e-4693-95a0-85431b0e95ca", + "FrameId": "328c1280-134c-46fd-9328-8cc8f88236d6", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "f8b94165-215d-4213-b38a-3975a922f196", + "id": "7792869f-e00d-48e6-a477-b7ed127d17ab", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "729b6be6-cc4e-4693-95a0-85431b0e95ca", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "328c1280-134c-46fd-9328-8cc8f88236d6", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "0855eead-ead9-45ff-bdb9-1bcb0ae214f9", + "id": "623cd7b3-1922-4f4b-97d6-04cba3136062", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "82d06045-f746-4fc2-a295-c8f8956974b1", + "id": "939e6b87-ddb1-40dd-bf99-287476be9016", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0855eead-ead9-45ff-bdb9-1bcb0ae214f9", + "FrameId": "623cd7b3-1922-4f4b-97d6-04cba3136062", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "bc00ff52-c079-4f34-b8e2-a47a678b1f11", + "id": "f5be6163-60f7-48d2-b90d-1161dc77435a", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "0855eead-ead9-45ff-bdb9-1bcb0ae214f9", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "623cd7b3-1922-4f4b-97d6-04cba3136062", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "e219d74f-809b-48fa-a663-6ed4cee0bb2d", + "id": "9b28ff3a-af56-4483-8096-f3c35a224189", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "1418421c-686f-4ff9-be73-2d90801055ac", + "id": "f41a339e-fc49-4291-b4c1-ce425e3723ad", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e219d74f-809b-48fa-a663-6ed4cee0bb2d", + "FrameId": "9b28ff3a-af56-4483-8096-f3c35a224189", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "44822356-f744-4cf1-9197-921958a97e26", + "id": "5a4514f1-26de-495f-a0e8-2720f55a03da", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e219d74f-809b-48fa-a663-6ed4cee0bb2d", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "9b28ff3a-af56-4483-8096-f3c35a224189", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "8385dfcd-a32d-4727-bdcb-660c117fc1a1", + "id": "daf386da-b64a-408e-8dad-edc588b10778", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "617e9641-6246-4db2-b777-505e544c4dd0", + "id": "f74d7f42-4c56-4f4c-808d-b4e3cf8c475f", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8385dfcd-a32d-4727-bdcb-660c117fc1a1", + "FrameId": "daf386da-b64a-408e-8dad-edc588b10778", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "c5af634f-9b09-4134-808e-5dd894f773d4", + "id": "90d13df2-876a-40d6-abfc-d508a21d4690", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "8385dfcd-a32d-4727-bdcb-660c117fc1a1", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "daf386da-b64a-408e-8dad-edc588b10778", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "24947421-e845-45fc-b74b-152418640e89", + "id": "fb466d77-04f0-44f5-91f5-3aba8dcb3806", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "d7220a1d-cf48-4481-ade2-e411024d9e54", + "id": "b514c3d1-4f60-4976-9878-a2a6c2b73e47", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "24947421-e845-45fc-b74b-152418640e89", + "FrameId": "fb466d77-04f0-44f5-91f5-3aba8dcb3806", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "b9d07b1a-ac08-4c9b-85f5-ac33704180a9", + "id": "24d40b59-3082-4c9c-8964-44c0e7f5ab13", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "24947421-e845-45fc-b74b-152418640e89", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "fb466d77-04f0-44f5-91f5-3aba8dcb3806", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "9d7904c9-3aaa-4320-b3be-c36095ba5040", + "id": "561199f6-d38f-4455-8052-7fcaf3f356da", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "57c9959a-ceff-42be-92e8-5169beadbdb9", + "id": "772158c6-cc23-43a4-b3bb-733c088d4a80", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "9d7904c9-3aaa-4320-b3be-c36095ba5040", + "FrameId": "561199f6-d38f-4455-8052-7fcaf3f356da", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "56035a45-7689-4f2a-a4c5-1771d7282c22", + "id": "5db0692e-476e-453b-afca-d97f8c744be3", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "9d7904c9-3aaa-4320-b3be-c36095ba5040", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "561199f6-d38f-4455-8052-7fcaf3f356da", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "e1050739-1074-4a52-80ef-46ab1fcdb13b", + "id": "734b13b9-d0fa-4a48-9f26-f40e90288eba", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "69bd89eb-b062-44a2-8102-3a1ede90d0a8", + "id": "3f7fc420-e620-45ae-9d1f-ebbd0dc98a98", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e1050739-1074-4a52-80ef-46ab1fcdb13b", + "FrameId": "734b13b9-d0fa-4a48-9f26-f40e90288eba", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "99187245-3380-41b4-b2e2-6dc9c2617914", + "id": "2a0faca1-8838-4a4e-b67b-9be588a64743", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "e1050739-1074-4a52-80ef-46ab1fcdb13b", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "734b13b9-d0fa-4a48-9f26-f40e90288eba", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "542f5c31-9926-4008-863f-d382d2c1fd9e", + "id": "6ee20162-1600-4de9-a0c4-6d8e8daaacad", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "563caee6-7133-47b5-bae3-9882b7354aa6", + "id": "4fe1d951-ba84-4c81-a148-b62c69821b7d", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "542f5c31-9926-4008-863f-d382d2c1fd9e", + "FrameId": "6ee20162-1600-4de9-a0c4-6d8e8daaacad", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "c76b27fe-aff6-4450-a60d-3b155de7e76d", + "id": "a3d4c708-244d-4519-9551-c51a33f6b464", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "542f5c31-9926-4008-863f-d382d2c1fd9e", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "6ee20162-1600-4de9-a0c4-6d8e8daaacad", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] }, { - "id": "27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec", + "id": "05043338-f241-464b-90ea-6c3f3617eb92", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "compositeImage": { - "id": "9b20cec4-548f-4865-8687-b9fd4252260a", + "id": "71b9db8c-99f4-4deb-b867-53c8466b56d6", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec", + "FrameId": "05043338-f241-464b-90ea-6c3f3617eb92", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "18fe5d05-9940-410c-8d5a-0f71c61a3012", + "id": "f88ce859-3277-4846-8d61-2e6150d585e8", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "27ce6b4c-ca09-4ef6-9ef3-52f2d9c761ec", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "691954f8-b1d2-4694-bcc9-ea75e9d60b94", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "d6f37068-f097-4bfa-a8da-09cfa8993da1", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "691954f8-b1d2-4694-bcc9-ea75e9d60b94", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "d4a22886-96df-4d75-8572-f5b3b789a27f", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "691954f8-b1d2-4694-bcc9-ea75e9d60b94", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "2cce8a29-4aae-4c9a-96db-e66bb5d32b98", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "20acdaa6-d539-4fcd-9fd3-664d8605b83c", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "2cce8a29-4aae-4c9a-96db-e66bb5d32b98", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "a831050b-446b-4010-80a2-523c2d852c5e", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "2cce8a29-4aae-4c9a-96db-e66bb5d32b98", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "840224af-f930-4940-9008-2e7f4de6504d", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "6156d299-3a6f-4245-b157-9a4ba3efd2ac", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "840224af-f930-4940-9008-2e7f4de6504d", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "3815612d-5e39-421e-a0cf-f99f404effcc", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "840224af-f930-4940-9008-2e7f4de6504d", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "cc4f5404-9b73-451a-b7ab-314665599ef6", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "59babe23-c1b0-4f9d-a598-ca1300090961", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "cc4f5404-9b73-451a-b7ab-314665599ef6", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "5ea7a395-d4a8-4675-9a4b-be4bf25b926a", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "cc4f5404-9b73-451a-b7ab-314665599ef6", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "6f798f50-46de-4b6b-b539-77235a5a423e", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "53269494-0eb5-4c56-9e2f-0f85fa9c62a8", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "6f798f50-46de-4b6b-b539-77235a5a423e", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "41b902ee-84d5-4703-9d31-6763ec627283", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "6f798f50-46de-4b6b-b539-77235a5a423e", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "af1898e9-ee2f-4908-a774-0dd624ea0e08", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "536bf37e-92aa-41e1-bb61-c4881a80b8ea", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "af1898e9-ee2f-4908-a774-0dd624ea0e08", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "3ef3c0e7-b770-4731-a9d1-7dfde9791668", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "af1898e9-ee2f-4908-a774-0dd624ea0e08", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "8def9bc0-0b6d-4838-924b-ae410b10748b", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "899ce6fa-7f21-4557-98a0-5af5eb168bbe", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "8def9bc0-0b6d-4838-924b-ae410b10748b", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "8c6a0ea1-f1f5-4f2e-8f2f-35f4dc264340", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "8def9bc0-0b6d-4838-924b-ae410b10748b", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" - } - ] - }, - { - "id": "d3187af7-c75c-42d7-b199-8dfe229c7214", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", - "compositeImage": { - "id": "58ca4ba5-5888-4b57-9959-c10598100a10", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "d3187af7-c75c-42d7-b199-8dfe229c7214", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "4ff45b04-562c-47e0-b9e6-54d1d0e099a5", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "d3187af7-c75c-42d7-b199-8dfe229c7214", - "LayerId": "496f7f30-21df-4937-83b9-93d982ee05ed" + "FrameId": "05043338-f241-464b-90ea-6c3f3617eb92", + "LayerId": "26089ef7-f709-408f-8b36-5447ecbbde36" } ] } @@ -923,10 +747,10 @@ "height": 32, "layers": [ { - "id": "496f7f30-21df-4937-83b9-93d982ee05ed", + "id": "26089ef7-f709-408f-8b36-5447ecbbde36", "modelName": "GMImageLayer", "mvc": "1.0", - "SpriteId": "91f6b839-aba4-422a-9992-a736e55fb77f", + "SpriteId": "e2042df6-5acd-40cb-a75a-0c3be13b6145", "blendMode": 0, "isLocked": false, "name": "default", diff --git a/sprites/spr_icons/017fb24b-e297-4bdc-b1d7-5214a372892f.png b/sprites/spr_icons/017fb24b-e297-4bdc-b1d7-5214a372892f.png index d9f1ed775..b421bfe89 100644 Binary files a/sprites/spr_icons/017fb24b-e297-4bdc-b1d7-5214a372892f.png and b/sprites/spr_icons/017fb24b-e297-4bdc-b1d7-5214a372892f.png differ diff --git a/sprites/spr_icons/08e3ac4a-5d8b-4a2f-99b5-872b483170cf.png b/sprites/spr_icons/08e3ac4a-5d8b-4a2f-99b5-872b483170cf.png index 874828ee3..2f48ad2ab 100644 Binary files a/sprites/spr_icons/08e3ac4a-5d8b-4a2f-99b5-872b483170cf.png and b/sprites/spr_icons/08e3ac4a-5d8b-4a2f-99b5-872b483170cf.png differ diff --git a/sprites/spr_icons/0d096d6d-be14-40ad-a96d-6639a8305d17.png b/sprites/spr_icons/0d096d6d-be14-40ad-a96d-6639a8305d17.png new file mode 100644 index 000000000..69a7efa38 Binary files /dev/null and b/sprites/spr_icons/0d096d6d-be14-40ad-a96d-6639a8305d17.png differ diff --git a/sprites/spr_icons/1a71e558-4310-48cc-b200-67e9f1fab56a.png b/sprites/spr_icons/1a71e558-4310-48cc-b200-67e9f1fab56a.png index f302fee1b..e8dab281c 100644 Binary files a/sprites/spr_icons/1a71e558-4310-48cc-b200-67e9f1fab56a.png and b/sprites/spr_icons/1a71e558-4310-48cc-b200-67e9f1fab56a.png differ diff --git a/sprites/spr_icons/3b2a063f-f041-46b2-b7fe-dec4bb085355.png b/sprites/spr_icons/3b2a063f-f041-46b2-b7fe-dec4bb085355.png new file mode 100644 index 000000000..16c2bb71b Binary files /dev/null and b/sprites/spr_icons/3b2a063f-f041-46b2-b7fe-dec4bb085355.png differ diff --git a/sprites/spr_icons/4105c864-ae13-4c42-be14-01a2cedfc4f7.png b/sprites/spr_icons/4105c864-ae13-4c42-be14-01a2cedfc4f7.png new file mode 100644 index 000000000..66cea34ff Binary files /dev/null and b/sprites/spr_icons/4105c864-ae13-4c42-be14-01a2cedfc4f7.png differ diff --git a/sprites/spr_icons/582bcf39-e098-49c5-bfdc-3b92f3975a05.png b/sprites/spr_icons/582bcf39-e098-49c5-bfdc-3b92f3975a05.png new file mode 100644 index 000000000..4ade06161 Binary files /dev/null and b/sprites/spr_icons/582bcf39-e098-49c5-bfdc-3b92f3975a05.png differ diff --git a/sprites/spr_icons/63b97949-c27b-4b4c-9073-4d019a66c6ee.png b/sprites/spr_icons/63b97949-c27b-4b4c-9073-4d019a66c6ee.png index ef5fc9204..90806a134 100644 Binary files a/sprites/spr_icons/63b97949-c27b-4b4c-9073-4d019a66c6ee.png and b/sprites/spr_icons/63b97949-c27b-4b4c-9073-4d019a66c6ee.png differ diff --git a/sprites/spr_icons/7dabc61f-2529-49c1-85bf-5a458b0b3315.png b/sprites/spr_icons/7dabc61f-2529-49c1-85bf-5a458b0b3315.png new file mode 100644 index 000000000..8f62ffbdb Binary files /dev/null and b/sprites/spr_icons/7dabc61f-2529-49c1-85bf-5a458b0b3315.png differ diff --git a/sprites/spr_icons/818957ed-e3e6-4852-ae8e-ff866c4474a8.png b/sprites/spr_icons/818957ed-e3e6-4852-ae8e-ff866c4474a8.png index 9e7460439..f36bd6c07 100644 Binary files a/sprites/spr_icons/818957ed-e3e6-4852-ae8e-ff866c4474a8.png and b/sprites/spr_icons/818957ed-e3e6-4852-ae8e-ff866c4474a8.png differ diff --git a/sprites/spr_icons/927f044d-4921-41a9-bab4-e68287934598.png b/sprites/spr_icons/927f044d-4921-41a9-bab4-e68287934598.png new file mode 100644 index 000000000..431168a6e Binary files /dev/null and b/sprites/spr_icons/927f044d-4921-41a9-bab4-e68287934598.png differ diff --git a/sprites/spr_icons/9c55de35-0757-4f59-b8b0-a1f6db1cd790.png b/sprites/spr_icons/9c55de35-0757-4f59-b8b0-a1f6db1cd790.png index 626b5bd96..25fd8d8ee 100644 Binary files a/sprites/spr_icons/9c55de35-0757-4f59-b8b0-a1f6db1cd790.png and b/sprites/spr_icons/9c55de35-0757-4f59-b8b0-a1f6db1cd790.png differ diff --git a/sprites/spr_icons/9d702906-84af-4052-b2da-fb62407109df.png b/sprites/spr_icons/9d702906-84af-4052-b2da-fb62407109df.png index 8f024c76f..890b6bae2 100644 Binary files a/sprites/spr_icons/9d702906-84af-4052-b2da-fb62407109df.png and b/sprites/spr_icons/9d702906-84af-4052-b2da-fb62407109df.png differ diff --git a/sprites/spr_icons/b2019627-9d13-49d1-ab90-ad7f0fffcf5e.png b/sprites/spr_icons/b2019627-9d13-49d1-ab90-ad7f0fffcf5e.png new file mode 100644 index 000000000..b6c99e8a1 Binary files /dev/null and b/sprites/spr_icons/b2019627-9d13-49d1-ab90-ad7f0fffcf5e.png differ diff --git a/sprites/spr_icons/bae1a29b-a572-4dcb-a56a-7941dfc9d977.png b/sprites/spr_icons/bae1a29b-a572-4dcb-a56a-7941dfc9d977.png index 69bf0d81e..01b9973bb 100644 Binary files a/sprites/spr_icons/bae1a29b-a572-4dcb-a56a-7941dfc9d977.png and b/sprites/spr_icons/bae1a29b-a572-4dcb-a56a-7941dfc9d977.png differ diff --git a/sprites/spr_icons/d0f12edf-2f85-41db-a695-7d66163490d9.png b/sprites/spr_icons/d0f12edf-2f85-41db-a695-7d66163490d9.png new file mode 100644 index 000000000..0eca14bcb Binary files /dev/null and b/sprites/spr_icons/d0f12edf-2f85-41db-a695-7d66163490d9.png differ diff --git a/sprites/spr_icons/e2bf5bc0-6809-4d8c-8204-19e46716e2a9.png b/sprites/spr_icons/e2bf5bc0-6809-4d8c-8204-19e46716e2a9.png index 0bbf784fd..9c61d6969 100644 Binary files a/sprites/spr_icons/e2bf5bc0-6809-4d8c-8204-19e46716e2a9.png and b/sprites/spr_icons/e2bf5bc0-6809-4d8c-8204-19e46716e2a9.png differ diff --git a/sprites/spr_icons/ebf062b4-fe61-44c1-bb9c-686e031be5c8.png b/sprites/spr_icons/ebf062b4-fe61-44c1-bb9c-686e031be5c8.png new file mode 100644 index 000000000..218af7bf1 Binary files /dev/null and b/sprites/spr_icons/ebf062b4-fe61-44c1-bb9c-686e031be5c8.png differ diff --git a/sprites/spr_icons/layers/017fb24b-e297-4bdc-b1d7-5214a372892f/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/017fb24b-e297-4bdc-b1d7-5214a372892f/1f31e358-720d-4ad3-9c86-68eea54f958b.png index d9f1ed775..b421bfe89 100644 Binary files a/sprites/spr_icons/layers/017fb24b-e297-4bdc-b1d7-5214a372892f/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/017fb24b-e297-4bdc-b1d7-5214a372892f/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/08e3ac4a-5d8b-4a2f-99b5-872b483170cf/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/08e3ac4a-5d8b-4a2f-99b5-872b483170cf/1f31e358-720d-4ad3-9c86-68eea54f958b.png index 874828ee3..2f48ad2ab 100644 Binary files a/sprites/spr_icons/layers/08e3ac4a-5d8b-4a2f-99b5-872b483170cf/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/08e3ac4a-5d8b-4a2f-99b5-872b483170cf/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/0d096d6d-be14-40ad-a96d-6639a8305d17/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/0d096d6d-be14-40ad-a96d-6639a8305d17/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..69a7efa38 Binary files /dev/null and b/sprites/spr_icons/layers/0d096d6d-be14-40ad-a96d-6639a8305d17/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/1a71e558-4310-48cc-b200-67e9f1fab56a/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/1a71e558-4310-48cc-b200-67e9f1fab56a/1f31e358-720d-4ad3-9c86-68eea54f958b.png index f302fee1b..e8dab281c 100644 Binary files a/sprites/spr_icons/layers/1a71e558-4310-48cc-b200-67e9f1fab56a/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/1a71e558-4310-48cc-b200-67e9f1fab56a/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/3b2a063f-f041-46b2-b7fe-dec4bb085355/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/3b2a063f-f041-46b2-b7fe-dec4bb085355/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..16c2bb71b Binary files /dev/null and b/sprites/spr_icons/layers/3b2a063f-f041-46b2-b7fe-dec4bb085355/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/4105c864-ae13-4c42-be14-01a2cedfc4f7/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/4105c864-ae13-4c42-be14-01a2cedfc4f7/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..66cea34ff Binary files /dev/null and b/sprites/spr_icons/layers/4105c864-ae13-4c42-be14-01a2cedfc4f7/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/582bcf39-e098-49c5-bfdc-3b92f3975a05/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/582bcf39-e098-49c5-bfdc-3b92f3975a05/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..4ade06161 Binary files /dev/null and b/sprites/spr_icons/layers/582bcf39-e098-49c5-bfdc-3b92f3975a05/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/63b97949-c27b-4b4c-9073-4d019a66c6ee/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/63b97949-c27b-4b4c-9073-4d019a66c6ee/1f31e358-720d-4ad3-9c86-68eea54f958b.png index ef5fc9204..90806a134 100644 Binary files a/sprites/spr_icons/layers/63b97949-c27b-4b4c-9073-4d019a66c6ee/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/63b97949-c27b-4b4c-9073-4d019a66c6ee/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/7dabc61f-2529-49c1-85bf-5a458b0b3315/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/7dabc61f-2529-49c1-85bf-5a458b0b3315/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..8f62ffbdb Binary files /dev/null and b/sprites/spr_icons/layers/7dabc61f-2529-49c1-85bf-5a458b0b3315/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/818957ed-e3e6-4852-ae8e-ff866c4474a8/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/818957ed-e3e6-4852-ae8e-ff866c4474a8/1f31e358-720d-4ad3-9c86-68eea54f958b.png index 9e7460439..f36bd6c07 100644 Binary files a/sprites/spr_icons/layers/818957ed-e3e6-4852-ae8e-ff866c4474a8/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/818957ed-e3e6-4852-ae8e-ff866c4474a8/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/927f044d-4921-41a9-bab4-e68287934598/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/927f044d-4921-41a9-bab4-e68287934598/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..431168a6e Binary files /dev/null and b/sprites/spr_icons/layers/927f044d-4921-41a9-bab4-e68287934598/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/9c55de35-0757-4f59-b8b0-a1f6db1cd790/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/9c55de35-0757-4f59-b8b0-a1f6db1cd790/1f31e358-720d-4ad3-9c86-68eea54f958b.png index 626b5bd96..25fd8d8ee 100644 Binary files a/sprites/spr_icons/layers/9c55de35-0757-4f59-b8b0-a1f6db1cd790/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/9c55de35-0757-4f59-b8b0-a1f6db1cd790/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/9d702906-84af-4052-b2da-fb62407109df/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/9d702906-84af-4052-b2da-fb62407109df/1f31e358-720d-4ad3-9c86-68eea54f958b.png index 8f024c76f..890b6bae2 100644 Binary files a/sprites/spr_icons/layers/9d702906-84af-4052-b2da-fb62407109df/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/9d702906-84af-4052-b2da-fb62407109df/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/b2019627-9d13-49d1-ab90-ad7f0fffcf5e/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/b2019627-9d13-49d1-ab90-ad7f0fffcf5e/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..b6c99e8a1 Binary files /dev/null and b/sprites/spr_icons/layers/b2019627-9d13-49d1-ab90-ad7f0fffcf5e/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/bae1a29b-a572-4dcb-a56a-7941dfc9d977/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/bae1a29b-a572-4dcb-a56a-7941dfc9d977/1f31e358-720d-4ad3-9c86-68eea54f958b.png index 69bf0d81e..01b9973bb 100644 Binary files a/sprites/spr_icons/layers/bae1a29b-a572-4dcb-a56a-7941dfc9d977/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/bae1a29b-a572-4dcb-a56a-7941dfc9d977/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/d0f12edf-2f85-41db-a695-7d66163490d9/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/d0f12edf-2f85-41db-a695-7d66163490d9/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..0eca14bcb Binary files /dev/null and b/sprites/spr_icons/layers/d0f12edf-2f85-41db-a695-7d66163490d9/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/e2bf5bc0-6809-4d8c-8204-19e46716e2a9/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/e2bf5bc0-6809-4d8c-8204-19e46716e2a9/1f31e358-720d-4ad3-9c86-68eea54f958b.png index 0bbf784fd..9c61d6969 100644 Binary files a/sprites/spr_icons/layers/e2bf5bc0-6809-4d8c-8204-19e46716e2a9/1f31e358-720d-4ad3-9c86-68eea54f958b.png and b/sprites/spr_icons/layers/e2bf5bc0-6809-4d8c-8204-19e46716e2a9/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/layers/ebf062b4-fe61-44c1-bb9c-686e031be5c8/1f31e358-720d-4ad3-9c86-68eea54f958b.png b/sprites/spr_icons/layers/ebf062b4-fe61-44c1-bb9c-686e031be5c8/1f31e358-720d-4ad3-9c86-68eea54f958b.png new file mode 100644 index 000000000..218af7bf1 Binary files /dev/null and b/sprites/spr_icons/layers/ebf062b4-fe61-44c1-bb9c-686e031be5c8/1f31e358-720d-4ad3-9c86-68eea54f958b.png differ diff --git a/sprites/spr_icons/spr_icons.yy b/sprites/spr_icons/spr_icons.yy index 210d85b9c..7b7fe7a2f 100644 --- a/sprites/spr_icons/spr_icons.yy +++ b/sprites/spr_icons/spr_icons.yy @@ -785,6 +785,204 @@ } ] }, + { + "id": "b2019627-9d13-49d1-ab90-ad7f0fffcf5e", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "96e79486-da8d-43f7-89de-66abc2421e23", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b2019627-9d13-49d1-ab90-ad7f0fffcf5e", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f91af177-b301-47bc-b921-672ce10bdd06", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b2019627-9d13-49d1-ab90-ad7f0fffcf5e", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "ebf062b4-fe61-44c1-bb9c-686e031be5c8", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "e7d41a50-18e1-4496-b4cc-5b3893fbb954", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ebf062b4-fe61-44c1-bb9c-686e031be5c8", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e34c8f5a-9b9f-4813-996e-b461d0a14ae1", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "ebf062b4-fe61-44c1-bb9c-686e031be5c8", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "0d096d6d-be14-40ad-a96d-6639a8305d17", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "f8a067e4-6170-4b9f-bde6-1d99aadec49f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0d096d6d-be14-40ad-a96d-6639a8305d17", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "e3718b0a-e96c-4171-867a-3f2cb71a5468", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0d096d6d-be14-40ad-a96d-6639a8305d17", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "7dabc61f-2529-49c1-85bf-5a458b0b3315", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "2891fef7-fb33-4b2f-a766-c58d65199fdc", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7dabc61f-2529-49c1-85bf-5a458b0b3315", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "df30434e-f4fd-4106-a847-c18742c0fe65", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "7dabc61f-2529-49c1-85bf-5a458b0b3315", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "4105c864-ae13-4c42-be14-01a2cedfc4f7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "687c620e-8800-4e28-9a94-97c927f5b7c3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4105c864-ae13-4c42-be14-01a2cedfc4f7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "f0be5e44-1bfb-4049-b9ff-17faac0212fc", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4105c864-ae13-4c42-be14-01a2cedfc4f7", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "d0f12edf-2f85-41db-a695-7d66163490d9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "1a9107b5-33aa-4284-866a-b88fad4c19f9", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d0f12edf-2f85-41db-a695-7d66163490d9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "b6ffea7c-2a7c-4145-af6c-85ad5b7e1feb", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d0f12edf-2f85-41db-a695-7d66163490d9", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "582bcf39-e098-49c5-bfdc-3b92f3975a05", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "a933c685-0689-4ff9-a10e-ff2d13a5664d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "582bcf39-e098-49c5-bfdc-3b92f3975a05", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "2b5c7933-4683-4c41-a93b-8c7ffd3078b3", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "582bcf39-e098-49c5-bfdc-3b92f3975a05", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "3b2a063f-f041-46b2-b7fe-dec4bb085355", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "01e5c944-1baa-4e92-bdd6-af70a3e15df9", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3b2a063f-f041-46b2-b7fe-dec4bb085355", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ebddf2ca-33c1-4c6f-85c5-d539239e57d9", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "3b2a063f-f041-46b2-b7fe-dec4bb085355", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, + { + "id": "927f044d-4921-41a9-bab4-e68287934598", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "aff09ff4-ce92-47ec-a5bd-44c9501d1fe2", + "compositeImage": { + "id": "e70e4550-7687-4346-8c92-6f8a43c39e46", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "927f044d-4921-41a9-bab4-e68287934598", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "d04c9c92-959f-4974-9198-f21f55d1361a", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "927f044d-4921-41a9-bab4-e68287934598", + "LayerId": "1f31e358-720d-4ad3-9c86-68eea54f958b" + } + ] + }, { "id": "43a06df6-5b89-400d-a0b9-33f468cd0f48", "modelName": "GMSpriteFrame", diff --git a/sprites/spr_layerbox/4dd59a77-82cb-47e7-abad-0636e667b161.png b/sprites/spr_layerbox/4dd59a77-82cb-47e7-abad-0636e667b161.png index b28892a15..4cfb90bf1 100644 Binary files a/sprites/spr_layerbox/4dd59a77-82cb-47e7-abad-0636e667b161.png and b/sprites/spr_layerbox/4dd59a77-82cb-47e7-abad-0636e667b161.png differ diff --git a/sprites/spr_layerbox/71d8521b-d076-46de-8e23-804d2703ea18.png b/sprites/spr_layerbox/71d8521b-d076-46de-8e23-804d2703ea18.png index 813caf0cb..243d26a47 100644 Binary files a/sprites/spr_layerbox/71d8521b-d076-46de-8e23-804d2703ea18.png and b/sprites/spr_layerbox/71d8521b-d076-46de-8e23-804d2703ea18.png differ diff --git a/sprites/spr_layerbox/layers/4dd59a77-82cb-47e7-abad-0636e667b161/c7f989de-ac00-4481-9382-12ca459c1862.png b/sprites/spr_layerbox/layers/4dd59a77-82cb-47e7-abad-0636e667b161/c7f989de-ac00-4481-9382-12ca459c1862.png index b28892a15..4cfb90bf1 100644 Binary files a/sprites/spr_layerbox/layers/4dd59a77-82cb-47e7-abad-0636e667b161/c7f989de-ac00-4481-9382-12ca459c1862.png and b/sprites/spr_layerbox/layers/4dd59a77-82cb-47e7-abad-0636e667b161/c7f989de-ac00-4481-9382-12ca459c1862.png differ diff --git a/sprites/spr_layerbox/layers/71d8521b-d076-46de-8e23-804d2703ea18/c7f989de-ac00-4481-9382-12ca459c1862.png b/sprites/spr_layerbox/layers/71d8521b-d076-46de-8e23-804d2703ea18/c7f989de-ac00-4481-9382-12ca459c1862.png index 813caf0cb..243d26a47 100644 Binary files a/sprites/spr_layerbox/layers/71d8521b-d076-46de-8e23-804d2703ea18/c7f989de-ac00-4481-9382-12ca459c1862.png and b/sprites/spr_layerbox/layers/71d8521b-d076-46de-8e23-804d2703ea18/c7f989de-ac00-4481-9382-12ca459c1862.png differ diff --git a/sprites/spr_layerbox/spr_layerbox.yy b/sprites/spr_layerbox/spr_layerbox.yy index fbce41fbe..1a9225ba5 100644 --- a/sprites/spr_layerbox/spr_layerbox.yy +++ b/sprites/spr_layerbox/spr_layerbox.yy @@ -8,7 +8,7 @@ "VTile": false, "bbox_bottom": 33, "bbox_left": 0, - "bbox_right": 167, + "bbox_right": 183, "bbox_top": 0, "bboxmode": 0, "colkind": 1, @@ -86,7 +86,7 @@ "swfPrecision": 2.525, "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", "type": 0, - "width": 168, + "width": 184, "xorig": 0, "yorig": 0 } \ No newline at end of file diff --git a/sprites/spr_stereo/41b02e81-57a8-4c33-85ec-0e15117201ed.png b/sprites/spr_stereo/41b02e81-57a8-4c33-85ec-0e15117201ed.png new file mode 100644 index 000000000..5266cc2e7 Binary files /dev/null and b/sprites/spr_stereo/41b02e81-57a8-4c33-85ec-0e15117201ed.png differ diff --git a/sprites/spr_stereo/4498222c-1ef9-4cb8-aeac-30da69a2f3fe.png b/sprites/spr_stereo/4498222c-1ef9-4cb8-aeac-30da69a2f3fe.png new file mode 100644 index 000000000..f2f2996e5 Binary files /dev/null and b/sprites/spr_stereo/4498222c-1ef9-4cb8-aeac-30da69a2f3fe.png differ diff --git a/sprites/spr_stereo/463e30f5-f38e-49aa-8346-09957682172f.png b/sprites/spr_stereo/463e30f5-f38e-49aa-8346-09957682172f.png new file mode 100644 index 000000000..e9248b633 Binary files /dev/null and b/sprites/spr_stereo/463e30f5-f38e-49aa-8346-09957682172f.png differ diff --git a/sprites/spr_stereo/91403b9b-7837-4ede-9a29-9d01710ca0ed.png b/sprites/spr_stereo/91403b9b-7837-4ede-9a29-9d01710ca0ed.png new file mode 100644 index 000000000..61b91500f Binary files /dev/null and b/sprites/spr_stereo/91403b9b-7837-4ede-9a29-9d01710ca0ed.png differ diff --git a/sprites/spr_stereo/94c328b2-e3ef-46e3-b370-6504194a66e6.png b/sprites/spr_stereo/94c328b2-e3ef-46e3-b370-6504194a66e6.png new file mode 100644 index 000000000..c997aa381 Binary files /dev/null and b/sprites/spr_stereo/94c328b2-e3ef-46e3-b370-6504194a66e6.png differ diff --git a/sprites/spr_stereo/layers/41b02e81-57a8-4c33-85ec-0e15117201ed/edb3892e-4058-4305-95a7-ace9a645bc4f.png b/sprites/spr_stereo/layers/41b02e81-57a8-4c33-85ec-0e15117201ed/edb3892e-4058-4305-95a7-ace9a645bc4f.png new file mode 100644 index 000000000..93c121ff3 Binary files /dev/null and b/sprites/spr_stereo/layers/41b02e81-57a8-4c33-85ec-0e15117201ed/edb3892e-4058-4305-95a7-ace9a645bc4f.png differ diff --git a/sprites/spr_stereo/layers/4498222c-1ef9-4cb8-aeac-30da69a2f3fe/edb3892e-4058-4305-95a7-ace9a645bc4f.png b/sprites/spr_stereo/layers/4498222c-1ef9-4cb8-aeac-30da69a2f3fe/edb3892e-4058-4305-95a7-ace9a645bc4f.png new file mode 100644 index 000000000..6e3ffd57c Binary files /dev/null and b/sprites/spr_stereo/layers/4498222c-1ef9-4cb8-aeac-30da69a2f3fe/edb3892e-4058-4305-95a7-ace9a645bc4f.png differ diff --git a/sprites/spr_stereo/layers/463e30f5-f38e-49aa-8346-09957682172f/edb3892e-4058-4305-95a7-ace9a645bc4f.png b/sprites/spr_stereo/layers/463e30f5-f38e-49aa-8346-09957682172f/edb3892e-4058-4305-95a7-ace9a645bc4f.png new file mode 100644 index 000000000..4a1294efc Binary files /dev/null and b/sprites/spr_stereo/layers/463e30f5-f38e-49aa-8346-09957682172f/edb3892e-4058-4305-95a7-ace9a645bc4f.png differ diff --git a/sprites/spr_stereo/layers/91403b9b-7837-4ede-9a29-9d01710ca0ed/edb3892e-4058-4305-95a7-ace9a645bc4f.png b/sprites/spr_stereo/layers/91403b9b-7837-4ede-9a29-9d01710ca0ed/edb3892e-4058-4305-95a7-ace9a645bc4f.png new file mode 100644 index 000000000..098d11ad3 Binary files /dev/null and b/sprites/spr_stereo/layers/91403b9b-7837-4ede-9a29-9d01710ca0ed/edb3892e-4058-4305-95a7-ace9a645bc4f.png differ diff --git a/sprites/spr_stereo/layers/94c328b2-e3ef-46e3-b370-6504194a66e6/edb3892e-4058-4305-95a7-ace9a645bc4f.png b/sprites/spr_stereo/layers/94c328b2-e3ef-46e3-b370-6504194a66e6/edb3892e-4058-4305-95a7-ace9a645bc4f.png new file mode 100644 index 000000000..f7057e222 Binary files /dev/null and b/sprites/spr_stereo/layers/94c328b2-e3ef-46e3-b370-6504194a66e6/edb3892e-4058-4305-95a7-ace9a645bc4f.png differ diff --git a/sprites/spr_stereo/spr_stereo.yy b/sprites/spr_stereo/spr_stereo.yy new file mode 100644 index 000000000..070ad32c9 --- /dev/null +++ b/sprites/spr_stereo/spr_stereo.yy @@ -0,0 +1,158 @@ +{ + "id": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_stereo", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 8, + "bbox_left": 0, + "bbox_right": 11, + "bbox_top": 1, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "463e30f5-f38e-49aa-8346-09957682172f", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "compositeImage": { + "id": "ed2c018d-ec9b-4936-9d63-2be7dd858b07", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "463e30f5-f38e-49aa-8346-09957682172f", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "a324d28c-cf74-4350-9c72-009e278d5091", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "463e30f5-f38e-49aa-8346-09957682172f", + "LayerId": "edb3892e-4058-4305-95a7-ace9a645bc4f" + } + ] + }, + { + "id": "91403b9b-7837-4ede-9a29-9d01710ca0ed", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "compositeImage": { + "id": "c6d9987f-1666-4072-8262-10bb18cad459", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "91403b9b-7837-4ede-9a29-9d01710ca0ed", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "818bfd03-9b10-4205-b90f-8e4a9b9a3f09", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "91403b9b-7837-4ede-9a29-9d01710ca0ed", + "LayerId": "edb3892e-4058-4305-95a7-ace9a645bc4f" + } + ] + }, + { + "id": "94c328b2-e3ef-46e3-b370-6504194a66e6", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "compositeImage": { + "id": "ec5902c6-7c69-4fc0-8047-339725e4cdaa", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "94c328b2-e3ef-46e3-b370-6504194a66e6", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "811306b3-faa3-46f5-adb8-41a8854ca286", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "94c328b2-e3ef-46e3-b370-6504194a66e6", + "LayerId": "edb3892e-4058-4305-95a7-ace9a645bc4f" + } + ] + }, + { + "id": "41b02e81-57a8-4c33-85ec-0e15117201ed", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "compositeImage": { + "id": "225ca628-eebf-4050-adf4-36199c23ec5d", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "41b02e81-57a8-4c33-85ec-0e15117201ed", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "9b287779-22dd-4c97-ab61-1e9613948464", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "41b02e81-57a8-4c33-85ec-0e15117201ed", + "LayerId": "edb3892e-4058-4305-95a7-ace9a645bc4f" + } + ] + }, + { + "id": "4498222c-1ef9-4cb8-aeac-30da69a2f3fe", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "compositeImage": { + "id": "3f46ec73-d549-418e-81c9-ebcfed1beace", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4498222c-1ef9-4cb8-aeac-30da69a2f3fe", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "a0f09904-9931-471f-a45d-921cc11fa6bf", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "4498222c-1ef9-4cb8-aeac-30da69a2f3fe", + "LayerId": "edb3892e-4058-4305-95a7-ace9a645bc4f" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 10, + "layers": [ + { + "id": "edb3892e-4058-4305-95a7-ace9a645bc4f", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "d19d6a31-a519-4cf1-807b-d508a603d6fc", + "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": 12, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/views/8f3727c3-c29a-4ab8-8a8d-e086a440d341.yy b/views/8f3727c3-c29a-4ab8-8a8d-e086a440d341.yy index d272f6ee5..fc23c447b 100644 --- a/views/8f3727c3-c29a-4ab8-8a8d-e086a440d341.yy +++ b/views/8f3727c3-c29a-4ab8-8a8d-e086a440d341.yy @@ -30,7 +30,8 @@ "5511aa0c-d877-4e6b-80ce-bd62ec6ab96e", "30a545d4-918d-4985-acd5-68f08bdcd6f9", "2d0aaf56-0e82-4857-ba3e-179f1b609dc8", - "4dc52a1c-bab8-4806-8808-9d37a275d6e1" + "4dc52a1c-bab8-4806-8808-9d37a275d6e1", + "d19d6a31-a519-4cf1-807b-d508a603d6fc" ], "filterType": "GMSprite", "folderName": "Interface", diff --git a/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy b/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy index e8d068f3c..9af6fd8bd 100644 --- a/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy +++ b/views/a06987e4-dfbe-495d-83c7-d42257967bb5.yy @@ -5,6 +5,7 @@ "name": "a06987e4-dfbe-495d-83c7-d42257967bb5", "children": [ "91f6b839-aba4-422a-9992-a736e55fb77f", + "e2042df6-5acd-40cb-a75a-0c3be13b6145", "f6c72d6f-a880-4b21-bb5f-f5fcf13b3af6", "a5ad8905-a99c-48c3-845b-3485c00b826d", "32085ef3-2e2d-4a86-b81d-cdd98cbc0d9d"