diff --git a/objects/obj_ev_add_statue_window/Create_0.gml b/objects/obj_ev_add_statue_window/Create_0.gml index 8b9b531..d7112ea 100644 --- a/objects/obj_ev_add_statue_window/Create_0.gml +++ b/objects/obj_ev_add_statue_window/Create_0.gml @@ -78,7 +78,7 @@ function create_base_buttons(mode) { empty_text : "Branefuck Program", txt : add_properties.pgm, allow_alphanumeric : false, - exceptions : ".+-[]> grube.y) + continue; + if (abs(arr[i].y - grube.y) < 12) + continue; + if (arr[i].death_timer != -1) + continue; + above_grube = arr[i] + } + + + } + + if above_grube == noone || above_grube.y > grube.y { + ds_map_add(cache, grube, 0) + return 0; + } + + var above_above_value = find_grubes_above(above_grube, cache); + ds_map_add(cache, grube, above_above_value + 1) + return above_above_value + 1; + } + return ds_map_find_value(cache, grube); + +} +max_stack = 0 +for (var i = 0; i < array_length(grubes); i++) { + var grube = grubes[i]; + if !instance_exists(grube) { + array_delete(grubes, i, 1) + i--; + continue; + } + var value = find_grubes_above(grube, cache) + 1 + if value > max_stack + max_stack = value; +} + + +ds_map_destroy(cache); + +dense_check_timer--; +if dense_check_timer <= 0 && array_length(grubes) != 0 { + dense_check_timer = dense_check_timer_max; + var random_grube = grubes[irandom_range(0, array_length(grubes) - 1)] + if random_grube.death_timer == -1 { + + var max_close_grubes = 8; + var close_dist = 30; + var close_grubes = 0; + + for (var i = 0; i < array_length(grubes); i++) { + var grube = grubes[i] + if grube == random_grube + continue; + if point_distance(grube.x, grube.y, random_grube.x, random_grube.y) < close_dist + close_grubes++; + } + if close_grubes >= max_close_grubes { + for (var i = 0; i < array_length(grubes); i++) { + if grubes[i] == random_grube { + array_delete(grubes, i, 1) + break; + } + } + random_grube.die() + } + } +} + +if max_stack > highest_stack && max_stack > potential_new_highest_stack { + potential_new_highest_stack = max_stack + timer_hold_highest_stack = timer_hold_highest_stack_max; +} +if potential_new_highest_stack != 0 { + timer_hold_highest_stack--; + if timer_hold_highest_stack <= 0 { + highest_stack = potential_new_highest_stack; + potential_new_highest_stack = 0; + } + if max_stack < potential_new_highest_stack { + potential_new_highest_stack = 0; + timer_hold_highest_stack = 0; + } + +} + diff --git a/objects/obj_ev_credits/obj_ev_credits.yy b/objects/obj_ev_credits/obj_ev_credits.yy new file mode 100644 index 0000000..fbb69cf --- /dev/null +++ b/objects/obj_ev_credits/obj_ev_credits.yy @@ -0,0 +1,42 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_ev_credits", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":5,"eventType":7,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_window","path":"objects/obj_ev_window/obj_ev_window.yy",},"propertyId":{"name":"add_x","path":"objects/obj_ev_window/obj_ev_window.yy",},"value":"False",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_window","path":"objects/obj_ev_window/obj_ev_window.yy",},"propertyId":{"name":"layer_num","path":"objects/obj_ev_window/obj_ev_window.yy",},"value":"0",}, + ], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": { + "name": "obj_ev_window", + "path": "objects/obj_ev_window/obj_ev_window.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_ev_editor/Create_0.gml b/objects/obj_ev_editor/Create_0.gml index fb0981f..b66e4be 100644 --- a/objects/obj_ev_editor/Create_0.gml +++ b/objects/obj_ev_editor/Create_0.gml @@ -16,9 +16,10 @@ if (!global.compiled_for_merge) { global.debug = false; global.pause = false; global.music = -4; + } -window_set_fullscreen(true) + #macro level_extension "vsl" diff --git a/objects/obj_ev_editor/Draw_0.gml b/objects/obj_ev_editor/Draw_0.gml index 3b4c537..1935e33 100644 --- a/objects/obj_ev_editor/Draw_0.gml +++ b/objects/obj_ev_editor/Draw_0.gml @@ -95,7 +95,7 @@ if (room == asset_get_index("rm_ev_menu")) { draw_set_font(global.ev_font) draw_set_halign(fa_center) draw_set_valign(fa_middle) - draw_text_transformed(112, 72 + 50, "Packs coming whenever..", 0.5, 0.5, 0) + if global.there_is_a_newer_version draw_text_transformed(112, 72 + 64, "THERE IS A NEWER VERSION!!!" + "\nYou are on " + global.ev_version + ", latest is " + global.newest_version, 0.5, 0.5, 0) diff --git a/objects/obj_ev_editor/KeyPress_83.gml b/objects/obj_ev_editor/KeyPress_83.gml index 2481c60..633f171 100644 --- a/objects/obj_ev_editor/KeyPress_83.gml +++ b/objects/obj_ev_editor/KeyPress_83.gml @@ -1,5 +1,5 @@ -/// @description export level as a gameboy save -// You can write your code in this editor +if room != global.editor_room + exit if global.mouse_layer != 0 exit @@ -25,10 +25,6 @@ var entities = []; // why do x and y not work as vars here? for(var i=0; i < 14; i++) { for(var j=0; j < 9; j++) { - - - - var tile = global.level.tiles[j][i].tile.tile_id; // wtf is noone? var entity = global.level.objects[j][i] == noone ? "em" : global.level.objects[j][i].tile.tile_id; diff --git a/objects/obj_ev_editor/Other_4.gml b/objects/obj_ev_editor/Other_4.gml index d5340a3..7b18c8c 100644 --- a/objects/obj_ev_editor/Other_4.gml +++ b/objects/obj_ev_editor/Other_4.gml @@ -1,6 +1,8 @@ global.mouse_layer = 0 global.mouse_held = false; global.mouse_pressed = false; + + if room == asset_get_index("rm_ev_menu") || room == asset_get_index("rm_ev_level_select") { history = [] var music = global.menu_music; diff --git a/objects/obj_ev_grube/CleanUp_0.gml b/objects/obj_ev_grube/CleanUp_0.gml new file mode 100644 index 0000000..2b8dbea --- /dev/null +++ b/objects/obj_ev_grube/CleanUp_0.gml @@ -0,0 +1,2 @@ +if audio_is_playing(death_sound) + audio_stop_sound(death_sound) \ No newline at end of file diff --git a/objects/obj_ev_grube/Create_0.gml b/objects/obj_ev_grube/Create_0.gml new file mode 100644 index 0000000..b8bda45 --- /dev/null +++ b/objects/obj_ev_grube/Create_0.gml @@ -0,0 +1,22 @@ +spin_time_h = 0 +spin_time_v = 0 +follow = false +history_size = 3 +position_history = array_create(history_size * 2) + +for (var i = 0; i < array_length(position_history) - 1; i += 2) { + position_history[i] = x; + position_history[i + 1] = y; +} + +last_y_ind = history_size * 2 - 1; +last_x_ind = history_size * 2 - 2; + +death_sound = noone +death_timer = -1; +function die() { + phy_active = false; + death_timer = 0 + layer = layer_get_id("Explosion") + death_sound = audio_play_sound(asset_get_index("snd_ex_vacuumcomes"), 10, false, 1.3, 0, 1.2) +} \ No newline at end of file diff --git a/objects/obj_ev_grube/Destroy_0.gml b/objects/obj_ev_grube/Destroy_0.gml new file mode 100644 index 0000000..e69de29 diff --git a/objects/obj_ev_grube/Draw_0.gml b/objects/obj_ev_grube/Draw_0.gml new file mode 100644 index 0000000..046c26e --- /dev/null +++ b/objects/obj_ev_grube/Draw_0.gml @@ -0,0 +1,32 @@ +spin_time_h += 0.45 + random_range(-0.05, 0.05) +spin_time_v += 0.38 + random_range(-0.05, 0.05) + +var offset_x = 0 + +if death_timer != -1 + offset_x = sin(death_timer * 10) * (death_timer / 40) + + +var spin_h = (dsin(spin_time_h) + 1) / 2; +var spin_v = (dcos(spin_time_v) + 1) / 2; +ev_draw_cube(global.editor_instance.object_player.spr_ind, 0, phy_position_x + offset_x, phy_position_y, 10, spin_h + image_angle / 360, spin_v + image_angle / 360) + +if death_timer != -1 { + gpu_set_fog(true, c_white, 0, 1) + draw_set_alpha(min(1, death_timer / 100)) + ev_draw_cube(global.editor_instance.object_player.spr_ind, 0, phy_position_x + offset_x, phy_position_y, 10, spin_h + image_angle / 360, spin_v + image_angle / 360) +} + +if death_timer != -1 { + gpu_set_fog(false, c_white, 0, 1) + draw_set_alpha(1) +} +/* +for (var i = 0; i < array_length(position_history) - 1; i += 2) { + var xpos = position_history[i] + var ypos = position_history[i + 1] + draw_text(x, y - 80 + i * 10, "(" + string(xpos) + ", " + string(ypos) + ")") +} + + + diff --git a/objects/obj_ev_grube/Step_0.gml b/objects/obj_ev_grube/Step_0.gml new file mode 100644 index 0000000..7bff6fd --- /dev/null +++ b/objects/obj_ev_grube/Step_0.gml @@ -0,0 +1,77 @@ +if death_timer != -1 { + death_timer++ + + if death_timer > 140 || !audio_is_playing(death_sound) { + audio_stop_sound(death_sound) + audio_play_sound(asset_get_index("snd_ex_enemyexplosion_009"), 0, false) + for (var i = 0; i < array_length(window.grubes); i++) { + var grube = window.grubes[i] + if !instance_exists(grube) + continue; + if grube == id + continue; + + var diff_x = grube.x - x; + var diff_y = grube.y - y; + + var length = diff_x * diff_x + diff_y * diff_y; + + grube.phy_speed_x = (diff_x / length) * 120 + grube.phy_speed_y = (diff_y / length) * 120 + + } + instance_create_layer(x, y, "Explosion", asset_get_index("obj_ev_after_erase"), { + grube : true + }) + instance_destroy(id) + } + + return; +} + +if ev_is_mouse_on_me() { + if ev_mouse_pressed() { + follow = true + if instance_exists(asset_get_index("obj_ev_plucker")) { + audio_play_sound(asset_get_index("snd_ev_pluck"), 10, false) + } + } + if ev_mouse_right_pressed() { + die() + death_timer = 50 + } +} +if ev_mouse_released() && follow { + follow = false; + var previousest_x = position_history[last_x_ind] + var previousest_y = position_history[last_y_ind] + + phy_speed_x = (mouse_x - previousest_x) / history_size + phy_speed_y = (mouse_y - previousest_y) / history_size + +} + +if follow { + phy_speed_x = 0 + phy_speed_y = 0 + + phy_speed_x = mouse_x - phy_position_x + phy_speed_y = mouse_y - phy_position_y + + +} + +if x < 0 || x > room_width || y > room_height + instance_destroy(id) + +for (var i = array_length(position_history) - 1; i > 1; i -= 2) { + position_history[i - 1] = position_history[i - 3] + position_history[i] = position_history[i - 2]; +} + +if follow { + position_history[0] = mouse_x; + position_history[1] = mouse_y; +} +position_history[0] = phy_position_x; +position_history[1] = phy_position_y; diff --git a/objects/obj_ev_grube/obj_ev_grube.yy b/objects/obj_ev_grube/obj_ev_grube.yy new file mode 100644 index 0000000..8f5b8b5 --- /dev/null +++ b/objects/obj_ev_grube/obj_ev_grube.yy @@ -0,0 +1,47 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_ev_grube", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": true, + "physicsRestitution": 0.6, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [ + {"x":0.0,"y":0.0,}, + {"x":16.0,"y":0.0,}, + {"x":16.0,"y":16.0,}, + {"x":0.0,"y":16.0,}, + ], + "physicsStartAwake": true, + "properties": [ + {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"layer_num","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"0","varType":0,}, + ], + "solid": true, + "spriteId": { + "name": "spr_ev_delete_level", + "path": "sprites/spr_ev_delete_level/spr_ev_delete_level.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_ev_grubesolid/obj_ev_grubesolid.yy b/objects/obj_ev_grubesolid/obj_ev_grubesolid.yy new file mode 100644 index 0000000..147060c --- /dev/null +++ b/objects/obj_ev_grubesolid/obj_ev_grubesolid.yy @@ -0,0 +1,39 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_ev_grubesolid", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.0, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": true, + "physicsLinearDamping": 0.1, + "physicsObject": true, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [ + {"x":0.0,"y":0.0,}, + {"x":1.0,"y":0.0,}, + {"x":1.0,"y":1.0,}, + {"x":0.0,"y":1.0,}, + ], + "physicsStartAwake": true, + "properties": [], + "solid": true, + "spriteId": { + "name": "spr_ev_the_pixel", + "path": "sprites/spr_ev_the_pixel/spr_ev_the_pixel.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_ev_level_select/Step_0.gml b/objects/obj_ev_level_select/Step_0.gml new file mode 100644 index 0000000..4c7523c --- /dev/null +++ b/objects/obj_ev_level_select/Step_0.gml @@ -0,0 +1,23 @@ +event_inherited(); + +if keyboard_check(vk_control) && keyboard_check_pressed(ord("V")) && !global.online_mode { + var str = clipboard_get_text(); + var version = read_string_until(str, 1, "|").substr + if !string_is_uint(version) || int64_safe(version) > global.latest_lvl_format + exit; + + try { + var file = file_text_open_write(global.levels_directory + generate_level_save_name() + "." + level_extension) + file_text_write_string(file, str); + file_text_close(file) + ev_notify("Level pasted!") + } + catch (e) { + show_debug_message(e) + ev_notify("Couldn't paste level!") + } + + + on_level_update(); +} + diff --git a/objects/obj_ev_level_select/obj_ev_level_select.yy b/objects/obj_ev_level_select/obj_ev_level_select.yy index e45a470..bc583a6 100644 --- a/objects/obj_ev_level_select/obj_ev_level_select.yy +++ b/objects/obj_ev_level_select/obj_ev_level_select.yy @@ -5,6 +5,7 @@ "eventList": [ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, ], "managed": true, "overriddenProperties": [ diff --git a/objects/obj_ev_plucker/Step_0.gml b/objects/obj_ev_plucker/Step_0.gml new file mode 100644 index 0000000..f8332f3 --- /dev/null +++ b/objects/obj_ev_plucker/Step_0.gml @@ -0,0 +1,2 @@ +x = mouse_x +y = mouse_y \ No newline at end of file diff --git a/objects/obj_ev_plucker/obj_ev_plucker.yy b/objects/obj_ev_plucker/obj_ev_plucker.yy new file mode 100644 index 0000000..3cb5e60 --- /dev/null +++ b/objects/obj_ev_plucker/obj_ev_plucker.yy @@ -0,0 +1,39 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_ev_plucker", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_ev_tools", + "path": "sprites/spr_ev_tools/spr_ev_tools.yy", + }, + "spriteMaskId": { + "name": "spr_ev_nothing", + "path": "sprites/spr_ev_nothing/spr_ev_nothing.yy", + }, + "visible": true, +} \ No newline at end of file diff --git a/patches/gml_Object_obj_game_Draw_77.gml b/patches/gml_Object_obj_game_Draw_77.gml index ed03c18..3c0f2a0 100644 --- a/patches/gml_Object_obj_game_Draw_77.gml +++ b/patches/gml_Object_obj_game_Draw_77.gml @@ -7,4 +7,7 @@ if (global.clear_black != -1) { global.clear_black-- draw_clear(c_black) -} \ No newline at end of file +} +// TARGET: LINENUMBER_REPLACE +// 4 +if (false) \ No newline at end of file diff --git a/patches/gml_Object_obj_game_Other_4.gml b/patches/gml_Object_obj_game_Other_4.gml index 6842338..b89c9cb 100644 --- a/patches/gml_Object_obj_game_Other_4.gml +++ b/patches/gml_Object_obj_game_Other_4.gml @@ -7,8 +7,6 @@ if (string_pos("rm_ev_", room_get_name(room)) != 0 && room != rm_ev_level) { surface_resize(surface_final, 224 * ratio, 144 * ratio) } global.clear_black = 2 - if (room == rm_ev_editor) - global.is_in_editor = true; } else { if surface_get_width(application_surface) != 224 { @@ -17,6 +15,4 @@ else { surface_resize(surface_final, 224, 144) } global.clear_black = 2 - if (room != rm_ev_editor) - global.is_in_editor = false; } \ No newline at end of file diff --git a/rooms/rm_ev_after_erase/rm_ev_after_erase.yy b/rooms/rm_ev_after_erase/rm_ev_after_erase.yy index aa52710..3ad32e3 100644 --- a/rooms/rm_ev_after_erase/rm_ev_after_erase.yy +++ b/rooms/rm_ev_after_erase/rm_ev_after_erase.yy @@ -12,7 +12,7 @@ "isDnd": false, "layers": [ {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":8,"gridY":8,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4C70267A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_after_erase","path":"objects/obj_ev_after_erase/obj_ev_after_erase.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":104.0,"y":24.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4C70267A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_after_erase","path":"objects/obj_ev_after_erase/obj_ev_after_erase.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":112.0,"y":72.0,}, ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], diff --git a/rooms/rm_ev_credits/rm_ev_credits.yy b/rooms/rm_ev_credits/rm_ev_credits.yy new file mode 100644 index 0000000..d75552f --- /dev/null +++ b/rooms/rm_ev_credits/rm_ev_credits.yy @@ -0,0 +1,79 @@ +{ + "resourceType": "GMRoom", + "resourceVersion": "1.0", + "name": "rm_ev_credits", + "creationCodeFile": "rooms/rm_ev_credits/RoomCreationCode.gml", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrder": [ + {"name":"inst_97B1D47_1","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + {"name":"inst_5032722D","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + {"name":"inst_F927641","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + {"name":"inst_72E2366F","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + {"name":"inst_1E9D2143","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + {"name":"inst_5EC6668A","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + {"name":"inst_6BA67A6C","path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, + ], + "isDnd": false, + "layers": [ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"EditorObject","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Plucker","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Explosion","depth":200,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Grube","depth":300,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Textbox","depth":400,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"WindowElements","depth":500,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Credits","depth":600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6BA67A6C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_credits","path":"objects/obj_ev_credits/obj_ev_credits.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":-72.0,"y":0.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":700,"effectEnabled":true,"effectType":null,"gridX":8,"gridY":8,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_97B1D47_1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"properties":[ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_x","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"1",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_executing_button","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"propertyId":{"name":"txt","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"value":"Back",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"propertyId":{"name":"room_name","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"value":"rm_ev_menu",}, + ],"rotation":0.0,"scaleX":1.0,"scaleY":0.75,"x":200.0,"y":112.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_5032722D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_grubesolid","path":"objects/obj_ev_grubesolid/obj_ev_grubesolid.yy",},"properties":[],"rotation":0.0,"scaleX":304.0,"scaleY":40.0,"x":-40.0,"y":144.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_F927641","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_grubesolid","path":"objects/obj_ev_grubesolid/obj_ev_grubesolid.yy",},"properties":[],"rotation":0.0,"scaleX":40.0,"scaleY":5824.0,"x":224.0,"y":-5680.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_72E2366F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_grubesolid","path":"objects/obj_ev_grubesolid/obj_ev_grubesolid.yy",},"properties":[],"rotation":0.0,"scaleX":40.0,"scaleY":5824.0,"x":-40.0,"y":-5680.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_1E9D2143","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_man","path":"objects/obj_ev_man/obj_ev_man.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":8.0,"y":-5672.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_5EC6668A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_grubesolid","path":"objects/obj_ev_grubesolid/obj_ev_grubesolid.yy",},"properties":[],"rotation":0.0,"scaleX":304.0,"scaleY":40.0,"x":-40.0,"y":-5720.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4283190348,"depth":800,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + ], + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "parentRoom": null, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": true, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 16.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "roomSettings": { + "Height": 144, + "inheritRoomSettings": false, + "persistent": false, + "Width": 224, + }, + "sequenceId": null, + "views": [ + {"hborder":32,"hport":144,"hspeed":-1,"hview":144,"inherit":false,"objectId":null,"vborder":32,"visible":true,"vspeed":-1,"wport":224,"wview":224,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + ], + "viewSettings": { + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": true, + "inheritViewSettings": false, + }, + "volume": 1.0, +} \ No newline at end of file diff --git a/rooms/rm_ev_info/rm_ev_info.yy b/rooms/rm_ev_info/rm_ev_info.yy index c697be3..b443acc 100644 --- a/rooms/rm_ev_info/rm_ev_info.yy +++ b/rooms/rm_ev_info/rm_ev_info.yy @@ -21,9 +21,9 @@ {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_x","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"1",}, {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_executing_button","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"propertyId":{"name":"txt","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"value":"Back",}, {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"propertyId":{"name":"room_name","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"value":"rm_ev_menu",}, - ],"rotation":0.0,"scaleX":1.0,"scaleY":0.75,"x":200.0,"y":120.0,}, + ],"rotation":0.0,"scaleX":1.0,"scaleY":0.75,"x":200.0,"y":112.0,}, ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4281545523,"depth":300,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4283190348,"depth":300,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], "parent": { "name": "Rooms", diff --git a/rooms/rm_ev_menu/rm_ev_menu.yy b/rooms/rm_ev_menu/rm_ev_menu.yy index f7128dc..0ba9ffd 100644 --- a/rooms/rm_ev_menu/rm_ev_menu.yy +++ b/rooms/rm_ev_menu/rm_ev_menu.yy @@ -10,15 +10,16 @@ {"name":"inst_707B58F7","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, {"name":"inst_20C310F8","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, {"name":"inst_7707FCB7","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, - {"name":"inst_2FAE0212","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, - {"name":"inst_437FF52","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, + {"name":"inst_496862","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, + {"name":"inst_3F2EF690","path":"rooms/rm_ev_menu/rm_ev_menu.yy",}, ], "isDnd": false, "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"EditorObject","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_437FF52","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_brainfucker","path":"objects/obj_ev_brainfucker/obj_ev_brainfucker.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":192.0,"y":64.0,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"EditorObject","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Logo","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_3F2EF690","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_logo","path":"objects/obj_ev_logo/obj_ev_logo.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":44.0,"y":0.0,}, ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":100,"effectEnabled":true,"effectType":null,"gridX":8,"gridY":8,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":200,"effectEnabled":true,"effectType":null,"gridX":8,"gridY":8,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_707B58F7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"properties":[ {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"propertyId":{"name":"room_name","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"value":"rm_ev_level_select",}, {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_executing_button","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"propertyId":{"name":"txt","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"value":"Levels",}, @@ -26,16 +27,21 @@ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_20C310F8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"properties":[ {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"propertyId":{"name":"room_name","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"value":"rm_ev_options",}, {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_executing_button","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"propertyId":{"name":"txt","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"value":"Options",}, - {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_x","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"1.4",}, - ],"rotation":0.0,"scaleX":1.4,"scaleY":0.75,"x":192.0,"y":128.0,}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_x","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"1.6",}, + ],"rotation":0.0,"scaleX":1.4,"scaleY":0.75,"x":112.0,"y":112.0,}, {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_7707FCB7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"properties":[ {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"propertyId":{"name":"room_name","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"value":"rm_ev_info",}, {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_executing_button","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"propertyId":{"name":"txt","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"value":"Info",}, {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_x","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"1",}, + ],"rotation":0.0,"scaleX":1.4,"scaleY":0.75,"x":192.0,"y":128.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_496862","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"properties":[ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_main_menu_button","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"propertyId":{"name":"room_name","path":"objects/obj_ev_main_menu_button/obj_ev_main_menu_button.yy",},"value":"rm_ev_credits",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_executing_button","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"propertyId":{"name":"txt","path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},"value":"Credits",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_x","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"1.4",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},"propertyId":{"name":"base_scale_y","path":"objects/obj_ev_button/obj_ev_button.yy",},"value":"0.7",}, ],"rotation":0.0,"scaleX":1.4,"scaleY":0.75,"x":32.0,"y":128.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_2FAE0212","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ev_logo","path":"objects/obj_ev_logo/obj_ev_logo.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":44.0,"y":0.0,}, ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":200,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":300,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], "parent": { "name": "Rooms", diff --git a/scripts/ev_draw_cube/ev_draw_cube.gml b/scripts/ev_draw_cube/ev_draw_cube.gml index 59b8739..0179891 100644 --- a/scripts/ev_draw_cube/ev_draw_cube.gml +++ b/scripts/ev_draw_cube/ev_draw_cube.gml @@ -68,7 +68,7 @@ function ev_draw_cube_multisprite(sprites, subimgs, draw_x, draw_y, size, spin_h function ev_draw_face(draw_x, draw_y, size, face) { draw_sprite_pos(face.sprite, face.subimg, draw_x + (face.p2[0] * size), draw_y + (face.p2[1] * size), draw_x + (face.p1[0] * size), draw_y + (face.p1[1] * size), - draw_x + (face.p3[0] * size), draw_y + (face.p3[1] * size), draw_x + (face.p4[0] * size), draw_y + (face.p4[1] * size), 1) + draw_x + (face.p3[0] * size), draw_y + (face.p3[1] * size), draw_x + (face.p4[0] * size), draw_y + (face.p4[1] * size), draw_get_alpha()) } function ev_cube_face(p1, p2, p3, p4, sprite, subimg) constructor { diff --git a/scripts/ev_input/ev_input.gml b/scripts/ev_input/ev_input.gml index d763fe4..d6a5f00 100644 --- a/scripts/ev_input/ev_input.gml +++ b/scripts/ev_input/ev_input.gml @@ -64,6 +64,13 @@ function ev_get_horizontal_pressed() { function ev_get_vertical_pressed() { return keyboard_check_pressed(vk_down) - keyboard_check_pressed(vk_up) } +function ev_get_horizontal_held() { + return keyboard_check(vk_right) - keyboard_check(vk_left) +} +function ev_get_vertical_held() { + return keyboard_check(vk_down) - keyboard_check(vk_up) +} + function ev_is_leave_key_pressed() { return keyboard_check_pressed(vk_backspace) } diff --git a/scripts/ev_save/ev_save.gml b/scripts/ev_save/ev_save.gml index d9e5744..a2cef74 100644 --- a/scripts/ev_save/ev_save.gml +++ b/scripts/ev_save/ev_save.gml @@ -9,6 +9,9 @@ function ev_save(){ ini_write_string("options", "memory", global.memory_style) ini_write_string("options", "wings", global.wings_style) ini_write_string("options", "blade", global.blade_style) + + ini_write_string("stats", "grube", global.highest_grube_stack) + ini_close() } function ev_load() { @@ -20,6 +23,8 @@ function ev_load() { global.memory_style = ini_read_real("options", "memory", 0) global.wings_style = ini_read_real("options", "wings", 0) global.blade_style = ini_read_real("options", "blade", 0) + + global.highest_grube_stack = ini_read_real("stats", "grube", 0) ini_close() ev_update_vars() } diff --git a/scripts/ev_util/ev_util.gml b/scripts/ev_util/ev_util.gml index 12b44fd..cacc322 100644 --- a/scripts/ev_util/ev_util.gml +++ b/scripts/ev_util/ev_util.gml @@ -123,4 +123,13 @@ function real_safe(value, failsafe = 0) { function num_to_string(num, length) { return string_replace(string_format(num, length, 0), " ", 0) +} + +function ds_list_to_array(list) { + var size = ds_list_size(list); + var arr = array_create(size) + for (var i = 0; i < size; i++) { + arr[i] = list[| i]; + } + return arr; } \ No newline at end of file diff --git a/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.ogg b/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.ogg index a6efd65..94099ac 100644 Binary files a/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.ogg and b/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.ogg differ diff --git a/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.yy b/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.yy index fb1c9b9..1f1e4c1 100644 --- a/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.yy +++ b/sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.yy @@ -10,7 +10,7 @@ "bitRate": 128, "compression": 1, "conversionMode": 0, - "duration": 52.65431, + "duration": 51.017097, "parent": { "name": "Sounds", "path": "folders/Sounds.yy", @@ -19,5 +19,5 @@ "sampleRate": 44100, "soundFile": "snd_ev_music_gooeyPhantasm.ogg", "type": 1, - "volume": 0.8, + "volume": 1.0, } \ No newline at end of file diff --git a/sounds/snd_ex_enemyexplosion_009/snd_ex_enemyexplosion_009.yy b/sounds/snd_ex_enemyexplosion_009/snd_ex_enemyexplosion_009.yy new file mode 100644 index 0000000..9b6a69e --- /dev/null +++ b/sounds/snd_ex_enemyexplosion_009/snd_ex_enemyexplosion_009.yy @@ -0,0 +1,23 @@ +{ + "resourceType": "GMSound", + "resourceVersion": "1.0", + "name": "snd_ex_enemyexplosion_009", + "audioGroupId": { + "name": "VoidStrangerAudio", + "path": "audiogroups/VoidStrangerAudio", + }, + "bitDepth": 1, + "bitRate": 128, + "compression": 0, + "conversionMode": 0, + "duration": 1.499887, + "parent": { + "name": "Sounds", + "path": "folders/Sounds.yy", + }, + "preload": false, + "sampleRate": 44100, + "soundFile": "snd_ex_enemyexplosion_009.wav", + "type": 0, + "volume": 1.0, +} \ No newline at end of file diff --git a/sprites/spr_ev_nothing/0766e19f-0682-48bd-bb8a-45aebc057ae9.png b/sprites/spr_ev_nothing/0766e19f-0682-48bd-bb8a-45aebc057ae9.png new file mode 100644 index 0000000..0228fca Binary files /dev/null and b/sprites/spr_ev_nothing/0766e19f-0682-48bd-bb8a-45aebc057ae9.png differ diff --git a/sprites/spr_ev_nothing/layers/0766e19f-0682-48bd-bb8a-45aebc057ae9/3bae3130-d6c0-4cce-8a33-b4297d42c765.png b/sprites/spr_ev_nothing/layers/0766e19f-0682-48bd-bb8a-45aebc057ae9/3bae3130-d6c0-4cce-8a33-b4297d42c765.png new file mode 100644 index 0000000..0228fca Binary files /dev/null and b/sprites/spr_ev_nothing/layers/0766e19f-0682-48bd-bb8a-45aebc057ae9/3bae3130-d6c0-4cce-8a33-b4297d42c765.png differ diff --git a/sprites/spr_ev_nothing/spr_ev_nothing.yy b/sprites/spr_ev_nothing/spr_ev_nothing.yy new file mode 100644 index 0000000..6aa0d8a --- /dev/null +++ b/sprites/spr_ev_nothing/spr_ev_nothing.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ev_nothing", + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxMode": 2, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0766e19f-0682-48bd-bb8a-45aebc057ae9",}, + ], + "gridX": 0, + "gridY": 0, + "height": 16, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3bae3130-d6c0-4cce-8a33-b4297d42c765","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ev_nothing", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0766e19f-0682-48bd-bb8a-45aebc057ae9","path":"sprites/spr_ev_nothing/spr_ev_nothing.yy",},},},"Disabled":false,"id":"aecda96a-5dea-4be2-8cf8-ffad03d075d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 8, + "yorigin": 8, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 16, +} \ No newline at end of file diff --git a/void-stranger-endless-void.resource_order b/void-stranger-endless-void.resource_order index bd97a1e..31e6855 100644 --- a/void-stranger-endless-void.resource_order +++ b/void-stranger-endless-void.resource_order @@ -1,14 +1,14 @@ { "FolderOrderSettings": [ - {"name":"Unused","order":49,"path":"folders/Objects/Unused.yy",}, + {"name":"Unused","order":50,"path":"folders/Objects/Unused.yy",}, {"name":"Bee","order":3,"path":"folders/Sprites/Bee.yy",}, - {"name":"Items","order":43,"path":"folders/Sprites/Items.yy",}, + {"name":"Items","order":44,"path":"folders/Sprites/Items.yy",}, {"name":"TilesetSprites","order":1,"path":"folders/Sprites/TilesetSprites.yy",}, {"name":"Void Stranger Sprites","order":2,"path":"folders/Sprites/Void Stranger Sprites.yy",}, ], "ResourceOrderSettings": [ {"name":"obj_ev_executing_button","order":5,"path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",}, - {"name":"snd_ev_zed","order":8,"path":"sounds/snd_ev_zed/snd_ev_zed.yy",}, + {"name":"snd_ev_zed","order":10,"path":"sounds/snd_ev_zed/snd_ev_zed.yy",}, {"name":"spr_floor","order":12,"path":"sprites/spr_floor/spr_floor.yy",}, {"name":"spr_ev_bee_right","order":6,"path":"sprites/spr_ev_bee_right/spr_ev_bee_right.yy",}, {"name":"spr_chest_regular","order":41,"path":"sprites/spr_chest_regular/spr_chest_regular.yy",}, @@ -18,9 +18,9 @@ {"name":"spr_ev_edit_level","order":31,"path":"sprites/spr_ev_edit_level/spr_ev_edit_level.yy",}, {"name":"spr_cm_up1","order":21,"path":"sprites/spr_cm_up1/spr_cm_up1.yy",}, {"name":"spr_ev_play","order":17,"path":"sprites/spr_ev_play/spr_ev_play.yy",}, - {"name":"snd_ev_paint_brand","order":20,"path":"sounds/snd_ev_paint_brand/snd_ev_paint_brand.yy",}, + {"name":"snd_ev_paint_brand","order":22,"path":"sounds/snd_ev_paint_brand/snd_ev_paint_brand.yy",}, {"name":"obj_ev_play_button","order":31,"path":"objects/obj_ev_play_button/obj_ev_play_button.yy",}, - {"name":"snd_ev_music_astra_jam","order":19,"path":"sounds/snd_ev_music_astra_jam/snd_ev_music_astra_jam.yy",}, + {"name":"snd_ev_music_astra_jam","order":21,"path":"sounds/snd_ev_music_astra_jam/snd_ev_music_astra_jam.yy",}, {"name":"tile_edges","order":1,"path":"tilesets/tile_edges/tile_edges.yy",}, {"name":"spr_ev_bee_attack_l","order":1,"path":"sprites/spr_ev_bee_attack_l/spr_ev_bee_attack_l.yy",}, {"name":"obj_ev_burden_toggle","order":24,"path":"objects/obj_ev_burden_toggle/obj_ev_burden_toggle.yy",}, @@ -32,7 +32,7 @@ {"name":"spr_ev_lily_gblink_u","order":7,"path":"sprites/spr_ev_lily_gblink_u/spr_ev_lily_gblink_u.yy",}, {"name":"obj_ev_upload_button","order":36,"path":"objects/obj_ev_upload_button/obj_ev_upload_button.yy",}, {"name":"tile_bg_void","order":2,"path":"tilesets/tile_bg_void/tile_bg_void.yy",}, - {"name":"snd_ev_select","order":7,"path":"sounds/snd_ev_select/snd_ev_select.yy",}, + {"name":"snd_ev_select","order":9,"path":"sounds/snd_ev_select/snd_ev_select.yy",}, {"name":"ev_level_management","order":2,"path":"scripts/ev_level_management/ev_level_management.yy",}, {"name":"obj_ev_window_element","order":23,"path":"objects/obj_ev_window_element/obj_ev_window_element.yy",}, {"name":"spr_ev_refresh","order":33,"path":"sprites/spr_ev_refresh/spr_ev_refresh.yy",}, @@ -47,8 +47,8 @@ {"name":"ac_textbox_size","order":3,"path":"animcurves/ac_textbox_size/ac_textbox_size.yy",}, {"name":"spr_ev_tile_hitbox","order":8,"path":"sprites/spr_ev_tile_hitbox/spr_ev_tile_hitbox.yy",}, {"name":"spr_ev_lily_attack_d","order":3,"path":"sprites/spr_ev_lily_attack_d/spr_ev_lily_attack_d.yy",}, - {"name":"spr_ev_the_rectangle","order":41,"path":"sprites/spr_ev_the_rectangle/spr_ev_the_rectangle.yy",}, - {"name":"snd_ev_music_Teusday","order":18,"path":"sounds/snd_ev_music_Teusday/snd_ev_music_Teusday.yy",}, + {"name":"spr_ev_the_rectangle","order":42,"path":"sprites/spr_ev_the_rectangle/spr_ev_the_rectangle.yy",}, + {"name":"snd_ev_music_Teusday","order":20,"path":"sounds/snd_ev_music_Teusday/snd_ev_music_Teusday.yy",}, {"name":"spr_ev_copy","order":27,"path":"sprites/spr_ev_copy/spr_ev_copy.yy",}, {"name":"spr_ev_lily_attack_u","order":2,"path":"sprites/spr_ev_lily_attack_u/spr_ev_lily_attack_u.yy",}, {"name":"spr_ch","order":19,"path":"sprites/spr_ch/spr_ch.yy",}, @@ -61,7 +61,8 @@ {"name":"obj_ev_make_brand","order":39,"path":"objects/obj_ev_make_brand/obj_ev_make_brand.yy",}, {"name":"spr_stinklines","order":47,"path":"sprites/spr_stinklines/spr_stinklines.yy",}, {"name":"spr_glassfloor","order":8,"path":"sprites/spr_glassfloor/spr_glassfloor.yy",}, - {"name":"snd_ex_vacuumcomes","order":1,"path":"sounds/snd_ex_vacuumcomes/snd_ex_vacuumcomes.yy",}, + {"name":"obj_ev_grube","order":47,"path":"objects/obj_ev_grube/obj_ev_grube.yy",}, + {"name":"snd_ex_vacuumcomes","order":2,"path":"sounds/snd_ex_vacuumcomes/snd_ex_vacuumcomes.yy",}, {"name":"spr_ev_textbox","order":15,"path":"sprites/spr_ev_textbox/spr_ev_textbox.yy",}, {"name":"spr_ev_white_button","order":9,"path":"sprites/spr_ev_white_button/spr_ev_white_button.yy",}, {"name":"spr_ev_lily_down","order":11,"path":"sprites/spr_ev_lily_down/spr_ev_lily_down.yy",}, @@ -71,21 +72,22 @@ {"name":"spr_tile_bg_secret","order":4,"path":"sprites/spr_tile_bg_secret/spr_tile_bg_secret.yy",}, {"name":"ev_draw_rectangle","order":20,"path":"scripts/ev_draw_rectangle/ev_draw_rectangle.yy",}, {"name":"obj_ev_chest_window","order":17,"path":"objects/obj_ev_chest_window/obj_ev_chest_window.yy",}, - {"name":"snd_ev_pick","order":21,"path":"sounds/snd_ev_pick/snd_ev_pick.yy",}, + {"name":"snd_ev_pick","order":23,"path":"sounds/snd_ev_pick/snd_ev_pick.yy",}, {"name":"spr_cif_down","order":24,"path":"sprites/spr_cif_down/spr_cif_down.yy",}, {"name":"msc_escapewithfriend","order":16,"path":"sounds/msc_escapewithfriend/msc_escapewithfriend.yy",}, {"name":"spr_ev_void_sword_lev","order":12,"path":"sprites/spr_ev_void_sword_lev/spr_ev_void_sword_lev.yy",}, - {"name":"snd_ev_textbox_click","order":12,"path":"sounds/snd_ev_textbox_click/snd_ev_textbox_click.yy",}, + {"name":"snd_ev_textbox_click","order":14,"path":"sounds/snd_ev_textbox_click/snd_ev_textbox_click.yy",}, {"name":"spr_ev_bee_down","order":4,"path":"sprites/spr_ev_bee_down/spr_ev_bee_down.yy",}, {"name":"spr_greeder","order":30,"path":"sprites/spr_greeder/spr_greeder.yy",}, {"name":"spr_ev_eggtext","order":24,"path":"sprites/spr_ev_eggtext/spr_ev_eggtext.yy",}, - {"name":"snd_ev_select_favorite","order":10,"path":"sounds/snd_ev_select_favorite/snd_ev_select_favorite.yy",}, + {"name":"obj_ev_grubesolid","order":48,"path":"objects/obj_ev_grubesolid/obj_ev_grubesolid.yy",}, + {"name":"snd_ev_select_favorite","order":12,"path":"sounds/snd_ev_select_favorite/snd_ev_select_favorite.yy",}, {"name":"spr_lil_down","order":10,"path":"sprites/spr_lil_down/spr_lil_down.yy",}, {"name":"spr_ev_items_one","order":15,"path":"sprites/spr_ev_items_one/spr_ev_items_one.yy",}, {"name":"spr_tile_edges_true","order":3,"path":"sprites/spr_tile_edges_true/spr_tile_edges_true.yy",}, {"name":"spr_copyfloor","order":18,"path":"sprites/spr_copyfloor/spr_copyfloor.yy",}, {"name":"spr_question_black","order":38,"path":"sprites/spr_question_black/spr_question_black.yy",}, - {"name":"snd_ev_pluck","order":11,"path":"sounds/snd_ev_pluck/snd_ev_pluck.yy",}, + {"name":"snd_ev_pluck","order":13,"path":"sounds/snd_ev_pluck/snd_ev_pluck.yy",}, {"name":"spr_stairs","order":11,"path":"sprites/spr_stairs/spr_stairs.yy",}, {"name":"spr_ev_tools","order":6,"path":"sprites/spr_ev_tools/spr_ev_tools.yy",}, {"name":"obj_ev_edit_button","order":32,"path":"objects/obj_ev_edit_button/obj_ev_edit_button.yy",}, @@ -103,7 +105,7 @@ {"name":"spr_ev_upload","order":28,"path":"sprites/spr_ev_upload/spr_ev_upload.yy",}, {"name":"ac_unhover_curve","order":1,"path":"animcurves/ac_unhover_curve/ac_unhover_curve.yy",}, {"name":"spr_ct_right","order":25,"path":"sprites/spr_ct_right/spr_ct_right.yy",}, - {"name":"snd_ev_music_stealie_feelies","order":14,"path":"sounds/snd_ev_music_stealie_feelies/snd_ev_music_stealie_feelies.yy",}, + {"name":"snd_ev_music_stealie_feelies","order":16,"path":"sounds/snd_ev_music_stealie_feelies/snd_ev_music_stealie_feelies.yy",}, {"name":"spr_killer","order":31,"path":"sprites/spr_killer/spr_killer.yy",}, {"name":"rm_ev_level","order":5,"path":"rooms/rm_ev_level/rm_ev_level.yy",}, {"name":"msc_levcircle","order":6,"path":"sounds/msc_levcircle/msc_levcircle.yy",}, @@ -129,8 +131,9 @@ {"name":"obj_ev_change_blade","order":2,"path":"objects/obj_ev_change_blade/obj_ev_change_blade.yy",}, {"name":"obj_ev_refresh","order":40,"path":"objects/obj_ev_refresh/obj_ev_refresh.yy",}, {"name":"ev_draw_cube","order":21,"path":"scripts/ev_draw_cube/ev_draw_cube.yy",}, + {"name":"obj_ev_credits","order":46,"path":"objects/obj_ev_credits/obj_ev_credits.yy",}, {"name":"spr_ev_menu_continue_bee","order":39,"path":"sprites/spr_ev_menu_continue_bee/spr_ev_menu_continue_bee.yy",}, - {"name":"snd_ev_music_monsday","order":15,"path":"sounds/snd_ev_music_monsday/snd_ev_music_monsday.yy",}, + {"name":"snd_ev_music_monsday","order":17,"path":"sounds/snd_ev_music_monsday/snd_ev_music_monsday.yy",}, {"name":"obj_ev_textbox","order":22,"path":"objects/obj_ev_textbox/obj_ev_textbox.yy",}, {"name":"obj_ev_egg_window","order":15,"path":"objects/obj_ev_egg_window/obj_ev_egg_window.yy",}, {"name":"spr_ev_lily_gblink_d","order":6,"path":"sprites/spr_ev_lily_gblink_d/spr_ev_lily_gblink_d.yy",}, @@ -144,14 +147,14 @@ {"name":"spr_ev_display","order":7,"path":"sprites/spr_ev_display/spr_ev_display.yy",}, {"name":"tile_bg_secret","order":4,"path":"tilesets/tile_bg_secret/tile_bg_secret.yy",}, {"name":"msc_gorcircle_lo","order":5,"path":"sounds/msc_gorcircle_lo/msc_gorcircle_lo.yy",}, - {"name":"snd_ev_drag","order":4,"path":"sounds/snd_ev_drag/snd_ev_drag.yy",}, + {"name":"snd_ev_drag","order":6,"path":"sounds/snd_ev_drag/snd_ev_drag.yy",}, {"name":"spr_items_special","order":50,"path":"sprites/spr_items_special/spr_items_special.yy",}, {"name":"spr_ev_void_sword_two","order":9,"path":"sprites/spr_ev_void_sword_two/spr_ev_void_sword_two.yy",}, {"name":"obj_ev_save_button","order":7,"path":"objects/obj_ev_save_button/obj_ev_save_button.yy",}, {"name":"spr_ee_enemy_reaper","order":45,"path":"sprites/spr_ee_enemy_reaper/spr_ee_enemy_reaper.yy",}, {"name":"spr_ev_display_border","order":21,"path":"sprites/spr_ev_display_border/spr_ev_display_border.yy",}, {"name":"spr_ev_base_ui","order":14,"path":"sprites/spr_ev_base_ui/spr_ev_base_ui.yy",}, - {"name":"snd_ev_erase","order":6,"path":"sounds/snd_ev_erase/snd_ev_erase.yy",}, + {"name":"snd_ev_erase","order":8,"path":"sounds/snd_ev_erase/snd_ev_erase.yy",}, {"name":"ev_draw_pixel","order":19,"path":"scripts/ev_draw_pixel/ev_draw_pixel.yy",}, {"name":"obj_ev_window","order":12,"path":"objects/obj_ev_window/obj_ev_window.yy",}, {"name":"tile_bg_true","order":5,"path":"tilesets/tile_bg_true/tile_bg_true.yy",}, @@ -161,8 +164,9 @@ {"name":"spr_floor_white","order":16,"path":"sprites/spr_floor_white/spr_floor_white.yy",}, {"name":"spr_ev_bee_gblink_r","order":10,"path":"sprites/spr_ev_bee_gblink_r/spr_ev_bee_gblink_r.yy",}, {"name":"spr_slower","order":35,"path":"sprites/spr_slower/spr_slower.yy",}, - {"name":"snd_voidrod_place","order":3,"path":"sounds/snd_voidrod_place/snd_voidrod_place.yy",}, + {"name":"snd_voidrod_place","order":5,"path":"sounds/snd_voidrod_place/snd_voidrod_place.yy",}, {"name":"msc_beesong","order":7,"path":"sounds/msc_beesong/msc_beesong.yy",}, + {"name":"spr_ev_nothing","order":41,"path":"sprites/spr_ev_nothing/spr_ev_nothing.yy",}, {"name":"spr_floorswitch","order":17,"path":"sprites/spr_floorswitch/spr_floorswitch.yy",}, {"name":"spr_ev_ls_scroll","order":23,"path":"sprites/spr_ev_ls_scroll/spr_ev_ls_scroll.yy",}, {"name":"obj_ev_button","order":1,"path":"objects/obj_ev_button/obj_ev_button.yy",}, @@ -170,7 +174,7 @@ {"name":"obj_ev_claim_button","order":38,"path":"objects/obj_ev_claim_button/obj_ev_claim_button.yy",}, {"name":"spr_ev_void_wings_one","order":4,"path":"sprites/spr_ev_void_wings_one/spr_ev_void_wings_one.yy",}, {"name":"spr_atoner","order":29,"path":"sprites/spr_atoner/spr_atoner.yy",}, - {"name":"snd_ev_place","order":5,"path":"sounds/snd_ev_place/snd_ev_place.yy",}, + {"name":"snd_ev_place","order":7,"path":"sounds/snd_ev_place/snd_ev_place.yy",}, {"name":"obj_ev_editor","order":2,"path":"objects/obj_ev_editor/obj_ev_editor.yy",}, {"name":"rm_ev_after_erase","order":4,"path":"rooms/rm_ev_after_erase/rm_ev_after_erase.yy",}, {"name":"spr_soulstar_spark","order":46,"path":"sprites/spr_soulstar_spark/spr_soulstar_spark.yy",}, @@ -185,7 +189,7 @@ {"name":"spr_ev_brand_hitbox","order":30,"path":"sprites/spr_ev_brand_hitbox/spr_ev_brand_hitbox.yy",}, {"name":"msc_006","order":10,"path":"sounds/msc_006/msc_006.yy",}, {"name":"spr_ev_plus","order":11,"path":"sprites/spr_ev_plus/spr_ev_plus.yy",}, - {"name":"snd_ev_music_alsoGooeyPhantasm","order":17,"path":"sounds/snd_ev_music_alsoGooeyPhantasm/snd_ev_music_alsoGooeyPhantasm.yy",}, + {"name":"snd_ev_music_alsoGooeyPhantasm","order":19,"path":"sounds/snd_ev_music_alsoGooeyPhantasm/snd_ev_music_alsoGooeyPhantasm.yy",}, {"name":"spr_watcher","order":32,"path":"sprites/spr_watcher/spr_watcher.yy",}, {"name":"spr_ev_void_wings_dissipate_two","order":7,"path":"sprites/spr_ev_void_wings_dissipate_two/spr_ev_void_wings_dissipate_two.yy",}, {"name":"spr_ev_void_sword_flash_one","order":11,"path":"sprites/spr_ev_void_sword_flash_one/spr_ev_void_sword_flash_one.yy",}, @@ -196,7 +200,7 @@ {"name":"ev_draw_brand","order":12,"path":"scripts/ev_draw_brand/ev_draw_brand.yy",}, {"name":"msc_monstrail","order":8,"path":"sounds/msc_monstrail/msc_monstrail.yy",}, {"name":"msc_endless","order":13,"path":"sounds/msc_endless/msc_endless.yy",}, - {"name":"snd_ev_togglebox_click","order":13,"path":"sounds/snd_ev_togglebox_click/snd_ev_togglebox_click.yy",}, + {"name":"snd_ev_togglebox_click","order":15,"path":"sounds/snd_ev_togglebox_click/snd_ev_togglebox_click.yy",}, {"name":"obj_ev_display","order":4,"path":"objects/obj_ev_display/obj_ev_display.yy",}, {"name":"spr_ev_claim","order":29,"path":"sprites/spr_ev_claim/spr_ev_claim.yy",}, {"name":"rm_ev_info","order":7,"path":"rooms/rm_ev_info/rm_ev_info.yy",}, @@ -220,6 +224,7 @@ {"name":"spr_ev_online_switch","order":26,"path":"sprites/spr_ev_online_switch/spr_ev_online_switch.yy",}, {"name":"msc_gotstaff","order":11,"path":"sounds/msc_gotstaff/msc_gotstaff.yy",}, {"name":"obj_ev_wall_window","order":14,"path":"objects/obj_ev_wall_window/obj_ev_wall_window.yy",}, + {"name":"snd_reveal","order":1,"path":"sounds/snd_reveal/snd_reveal.yy",}, {"name":"spr_lamp","order":28,"path":"sprites/spr_lamp/spr_lamp.yy",}, {"name":"spr_ev_lily_gblink_l","order":9,"path":"sprites/spr_ev_lily_gblink_l/spr_ev_lily_gblink_l.yy",}, {"name":"ev_leave_level","order":15,"path":"scripts/ev_leave_level/ev_leave_level.yy",}, @@ -230,7 +235,8 @@ {"name":"msc_dungeongroove","order":3,"path":"sounds/msc_dungeongroove/msc_dungeongroove.yy",}, {"name":"spr_ev_ls_border","order":22,"path":"sprites/spr_ev_ls_border/spr_ev_ls_border.yy",}, {"name":"spr_jb","order":44,"path":"sprites/spr_jb/spr_jb.yy",}, - {"name":"snd_ev_start_level","order":9,"path":"sounds/snd_ev_start_level/snd_ev_start_level.yy",}, + {"name":"obj_ev_plucker","order":49,"path":"objects/obj_ev_plucker/obj_ev_plucker.yy",}, + {"name":"snd_ev_start_level","order":11,"path":"sounds/snd_ev_start_level/snd_ev_start_level.yy",}, {"name":"spr_ev_lily_attack_r","order":1,"path":"sprites/spr_ev_lily_attack_r/spr_ev_lily_attack_r.yy",}, {"name":"obj_ev_info","order":42,"path":"objects/obj_ev_info/obj_ev_info.yy",}, {"name":"spr_ev_void_sword_flash_two","order":10,"path":"sprites/spr_ev_void_sword_flash_two/spr_ev_void_sword_flash_two.yy",}, @@ -238,8 +244,8 @@ {"name":"spr_deathfloor","order":26,"path":"sprites/spr_deathfloor/spr_deathfloor.yy",}, {"name":"spr_ev_toggle","order":19,"path":"sprites/spr_ev_toggle/spr_ev_toggle.yy",}, {"name":"spr_ev_delete_level","order":32,"path":"sprites/spr_ev_delete_level/spr_ev_delete_level.yy",}, - {"name":"spr_ev_secret_exit_arrow","order":42,"path":"sprites/spr_ev_secret_exit_arrow/spr_ev_secret_exit_arrow.yy",}, - {"name":"snd_ev_music_gooeyPhantasm","order":16,"path":"sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.yy",}, + {"name":"spr_ev_secret_exit_arrow","order":43,"path":"sprites/spr_ev_secret_exit_arrow/spr_ev_secret_exit_arrow.yy",}, + {"name":"snd_ev_music_gooeyPhantasm","order":18,"path":"sounds/snd_ev_music_gooeyPhantasm/snd_ev_music_gooeyPhantasm.yy",}, {"name":"ev_place_level_instances","order":7,"path":"scripts/ev_place_level_instances/ev_place_level_instances.yy",}, {"name":"spr_cv","order":5,"path":"sprites/spr_cv/spr_cv.yy",}, {"name":"spr_tile_bg_void","order":2,"path":"sprites/spr_tile_bg_void/spr_tile_bg_void.yy",}, @@ -253,16 +259,18 @@ {"name":"obj_ev_plus","order":9,"path":"objects/obj_ev_plus/obj_ev_plus.yy",}, {"name":"obj_ev_delete_button","order":33,"path":"objects/obj_ev_delete_button/obj_ev_delete_button.yy",}, {"name":"rm_ev_options","order":6,"path":"rooms/rm_ev_options/rm_ev_options.yy",}, + {"name":"rm_ev_credits","order":8,"path":"rooms/rm_ev_credits/rm_ev_credits.yy",}, {"name":"spr_sweat","order":37,"path":"sprites/spr_sweat/spr_sweat.yy",}, {"name":"spr_ev_lily_hit","order":10,"path":"sprites/spr_ev_lily_hit/spr_ev_lily_hit.yy",}, {"name":"spr_locust_idol","order":42,"path":"sprites/spr_locust_idol/spr_locust_idol.yy",}, {"name":"spr_ev_blackfloor","order":5,"path":"sprites/spr_ev_blackfloor/spr_ev_blackfloor.yy",}, {"name":"obj_ev_brainfucker","order":45,"path":"objects/obj_ev_brainfucker/obj_ev_brainfucker.yy",}, + {"name":"snd_ex_enemyexplosion_009","order":4,"path":"sounds/snd_ex_enemyexplosion_009/snd_ex_enemyexplosion_009.yy",}, {"name":"tile_edges_true","order":3,"path":"tilesets/tile_edges_true/tile_edges_true.yy",}, {"name":"ac_play_transition","order":2,"path":"animcurves/ac_play_transition/ac_play_transition.yy",}, {"name":"ev_get_stranger_down_sprite","order":16,"path":"scripts/ev_get_stranger_down_sprite/ev_get_stranger_down_sprite.yy",}, {"name":"spr_voidrod_icon2","order":15,"path":"sprites/spr_voidrod_icon2/spr_voidrod_icon2.yy",}, - {"name":"snd_ex_vacuumgoes","order":2,"path":"sounds/snd_ex_vacuumgoes/snd_ex_vacuumgoes.yy",}, + {"name":"snd_ex_vacuumgoes","order":3,"path":"sounds/snd_ex_vacuumgoes/snd_ex_vacuumgoes.yy",}, {"name":"ev_tile_with_state","order":1,"path":"scripts/ev_tile_with_state/ev_tile_with_state.yy",}, ], } \ No newline at end of file diff --git a/void-stranger-endless-void.yyp b/void-stranger-endless-void.yyp index 53d899f..b0cb57b 100644 --- a/void-stranger-endless-void.yyp +++ b/void-stranger-endless-void.yyp @@ -95,6 +95,7 @@ {"id":{"name":"obj_ev_make_brand","path":"objects/obj_ev_make_brand/obj_ev_make_brand.yy",},}, {"id":{"name":"spr_stinklines","path":"sprites/spr_stinklines/spr_stinklines.yy",},}, {"id":{"name":"spr_glassfloor","path":"sprites/spr_glassfloor/spr_glassfloor.yy",},}, + {"id":{"name":"obj_ev_grube","path":"objects/obj_ev_grube/obj_ev_grube.yy",},}, {"id":{"name":"snd_ex_vacuumcomes","path":"sounds/snd_ex_vacuumcomes/snd_ex_vacuumcomes.yy",},}, {"id":{"name":"spr_ev_textbox","path":"sprites/spr_ev_textbox/spr_ev_textbox.yy",},}, {"id":{"name":"spr_ev_white_button","path":"sprites/spr_ev_white_button/spr_ev_white_button.yy",},}, @@ -115,6 +116,7 @@ {"id":{"name":"spr_ev_bee_down","path":"sprites/spr_ev_bee_down/spr_ev_bee_down.yy",},}, {"id":{"name":"spr_greeder","path":"sprites/spr_greeder/spr_greeder.yy",},}, {"id":{"name":"spr_ev_eggtext","path":"sprites/spr_ev_eggtext/spr_ev_eggtext.yy",},}, + {"id":{"name":"obj_ev_grubesolid","path":"objects/obj_ev_grubesolid/obj_ev_grubesolid.yy",},}, {"id":{"name":"snd_ev_select_favorite","path":"sounds/snd_ev_select_favorite/snd_ev_select_favorite.yy",},}, {"id":{"name":"spr_lil_down","path":"sprites/spr_lil_down/spr_lil_down.yy",},}, {"id":{"name":"spr_ev_items_one","path":"sprites/spr_ev_items_one/spr_ev_items_one.yy",},}, @@ -167,6 +169,7 @@ {"id":{"name":"obj_ev_change_blade","path":"objects/obj_ev_change_blade/obj_ev_change_blade.yy",},}, {"id":{"name":"obj_ev_refresh","path":"objects/obj_ev_refresh/obj_ev_refresh.yy",},}, {"id":{"name":"ev_draw_cube","path":"scripts/ev_draw_cube/ev_draw_cube.yy",},}, + {"id":{"name":"obj_ev_credits","path":"objects/obj_ev_credits/obj_ev_credits.yy",},}, {"id":{"name":"spr_ev_menu_continue_bee","path":"sprites/spr_ev_menu_continue_bee/spr_ev_menu_continue_bee.yy",},}, {"id":{"name":"snd_ev_music_monsday","path":"sounds/snd_ev_music_monsday/snd_ev_music_monsday.yy",},}, {"id":{"name":"obj_ev_textbox","path":"objects/obj_ev_textbox/obj_ev_textbox.yy",},}, @@ -205,6 +208,7 @@ {"id":{"name":"spr_slower","path":"sprites/spr_slower/spr_slower.yy",},}, {"id":{"name":"snd_voidrod_place","path":"sounds/snd_voidrod_place/snd_voidrod_place.yy",},}, {"id":{"name":"msc_beesong","path":"sounds/msc_beesong/msc_beesong.yy",},}, + {"id":{"name":"spr_ev_nothing","path":"sprites/spr_ev_nothing/spr_ev_nothing.yy",},}, {"id":{"name":"spr_floorswitch","path":"sprites/spr_floorswitch/spr_floorswitch.yy",},}, {"id":{"name":"spr_ev_ls_scroll","path":"sprites/spr_ev_ls_scroll/spr_ev_ls_scroll.yy",},}, {"id":{"name":"obj_ev_button","path":"objects/obj_ev_button/obj_ev_button.yy",},}, @@ -276,6 +280,7 @@ {"id":{"name":"msc_dungeongroove","path":"sounds/msc_dungeongroove/msc_dungeongroove.yy",},}, {"id":{"name":"spr_ev_ls_border","path":"sprites/spr_ev_ls_border/spr_ev_ls_border.yy",},}, {"id":{"name":"spr_jb","path":"sprites/spr_jb/spr_jb.yy",},}, + {"id":{"name":"obj_ev_plucker","path":"objects/obj_ev_plucker/obj_ev_plucker.yy",},}, {"id":{"name":"snd_ev_start_level","path":"sounds/snd_ev_start_level/snd_ev_start_level.yy",},}, {"id":{"name":"spr_ev_lily_attack_r","path":"sprites/spr_ev_lily_attack_r/spr_ev_lily_attack_r.yy",},}, {"id":{"name":"obj_ev_info","path":"objects/obj_ev_info/obj_ev_info.yy",},}, @@ -300,11 +305,13 @@ {"id":{"name":"obj_ev_plus","path":"objects/obj_ev_plus/obj_ev_plus.yy",},}, {"id":{"name":"obj_ev_delete_button","path":"objects/obj_ev_delete_button/obj_ev_delete_button.yy",},}, {"id":{"name":"rm_ev_options","path":"rooms/rm_ev_options/rm_ev_options.yy",},}, + {"id":{"name":"rm_ev_credits","path":"rooms/rm_ev_credits/rm_ev_credits.yy",},}, {"id":{"name":"spr_sweat","path":"sprites/spr_sweat/spr_sweat.yy",},}, {"id":{"name":"spr_ev_lily_hit","path":"sprites/spr_ev_lily_hit/spr_ev_lily_hit.yy",},}, {"id":{"name":"spr_locust_idol","path":"sprites/spr_locust_idol/spr_locust_idol.yy",},}, {"id":{"name":"spr_ev_blackfloor","path":"sprites/spr_ev_blackfloor/spr_ev_blackfloor.yy",},}, {"id":{"name":"obj_ev_brainfucker","path":"objects/obj_ev_brainfucker/obj_ev_brainfucker.yy",},}, + {"id":{"name":"snd_ex_enemyexplosion_009","path":"sounds/snd_ex_enemyexplosion_009/snd_ex_enemyexplosion_009.yy",},}, {"id":{"name":"tile_edges_true","path":"tilesets/tile_edges_true/tile_edges_true.yy",},}, {"id":{"name":"ac_play_transition","path":"animcurves/ac_play_transition/ac_play_transition.yy",},}, {"id":{"name":"ev_get_stranger_down_sprite","path":"scripts/ev_get_stranger_down_sprite/ev_get_stranger_down_sprite.yy",},}, @@ -321,6 +328,7 @@ {"roomId":{"name":"rm_ev_level_select","path":"rooms/rm_ev_level_select/rm_ev_level_select.yy",},}, {"roomId":{"name":"rm_ev_options","path":"rooms/rm_ev_options/rm_ev_options.yy",},}, {"roomId":{"name":"rm_ev_info","path":"rooms/rm_ev_info/rm_ev_info.yy",},}, + {"roomId":{"name":"rm_ev_credits","path":"rooms/rm_ev_credits/rm_ev_credits.yy",},}, ], "TextureGroups": [ {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"targets":-1,},