diff --git a/Bloble.yyp b/Bloble.yyp index 2f0863e..0239810 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -158,6 +158,14 @@ "resourceType": "GMObject" } }, + { + "Key": "1bb3e34d-ba39-4818-9467-69909d03a7e9", + "Value": { + "id": "e7ef868c-0ded-456e-a4df-5d6d8d3eec9f", + "resourcePath": "objects\\obj_gameover_return\\obj_gameover_return.yy", + "resourceType": "GMObject" + } + }, { "Key": "1c0beb1b-c82c-495d-9f8b-30f5f73e5fe5", "Value": { @@ -294,6 +302,14 @@ "resourceType": "GMObject" } }, + { + "Key": "4bf948ee-f585-4f83-aeb5-10883b042c91", + "Value": { + "id": "a2b6663f-1633-4fb9-a607-03417ac5bc42", + "resourcePath": "objects\\obj_bloblehop_death\\obj_bloblehop_death.yy", + "resourceType": "GMObject" + } + }, { "Key": "4f9a3a1d-0f47-45d2-8454-3dd6a604ada9", "Value": { @@ -318,6 +334,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "56aac3d2-64a6-4733-9a6c-c1637bb4bc60", + "Value": { + "id": "85d854cd-3cdc-4de2-b120-0ab0a7b47f98", + "resourcePath": "sprites\\spr_gameover_return\\spr_gameover_return.yy", + "resourceType": "GMSprite" + } + }, { "Key": "58b602c0-8f98-4f17-a1c7-fa569efeb87f", "Value": { @@ -382,6 +406,22 @@ "resourceType": "GMFont" } }, + { + "Key": "7d91797a-c1cb-4814-80fa-07ab4f6e9324", + "Value": { + "id": "b4c5d135-46dd-40f8-a0b9-7c187ed78ed4", + "resourcePath": "sprites\\spr_gameover_title\\spr_gameover_title.yy", + "resourceType": "GMSprite" + } + }, + { + "Key": "7e610280-d300-469a-8691-5331d9150b6f", + "Value": { + "id": "5f055047-4763-4aa6-981d-666a318cd02c", + "resourcePath": "objects\\obj_gameover_title\\obj_gameover_title.yy", + "resourceType": "GMObject" + } + }, { "Key": "7f09a9ce-0b47-41f5-aeed-6d4c33602c04", "Value": { @@ -758,6 +798,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "ea9b4683-0d5a-41f7-b0d3-479636b3507e", + "Value": { + "id": "0f6e2612-5ec8-468a-a3ef-8a9c67a018be", + "resourcePath": "rooms\\rm_Gameover\\rm_Gameover.yy", + "resourceType": "GMRoom" + } + }, { "Key": "ee46e014-5001-4550-bb4f-c6f6dc79dc00", "Value": { diff --git a/objects/obj_bloblehop_death/Collision_21edaab1-ae07-4170-8e04-e09da770c82a.gml b/objects/obj_bloblehop_death/Collision_21edaab1-ae07-4170-8e04-e09da770c82a.gml new file mode 100644 index 0000000..3045a25 --- /dev/null +++ b/objects/obj_bloblehop_death/Collision_21edaab1-ae07-4170-8e04-e09da770c82a.gml @@ -0,0 +1,2 @@ +global.roomset = rm_Gameover; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_bloblehop_death/Step_0.gml b/objects/obj_bloblehop_death/Step_0.gml new file mode 100644 index 0000000..0903679 --- /dev/null +++ b/objects/obj_bloblehop_death/Step_0.gml @@ -0,0 +1,4 @@ +x = camera_get_view_x(view_camera[0]) ; +y = camera_get_view_y(view_camera[0]) + 1950; + + \ No newline at end of file diff --git a/objects/obj_bloblehop_death/obj_bloblehop_death.yy b/objects/obj_bloblehop_death/obj_bloblehop_death.yy new file mode 100644 index 0000000..80901c7 --- /dev/null +++ b/objects/obj_bloblehop_death/obj_bloblehop_death.yy @@ -0,0 +1,48 @@ +{ + "id": "4bf948ee-f585-4f83-aeb5-10883b042c91", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_bloblehop_death", + "eventList": [ + { + "id": "8536bb53-74e7-4b20-a6d5-a4f8ccc79fe3", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "4bf948ee-f585-4f83-aeb5-10883b042c91" + }, + { + "id": "21edaab1-ae07-4170-8e04-e09da770c82a", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "148a5ef3-ef25-44c8-98b5-dc18305bdc90", + "enumb": 0, + "eventtype": 4, + "m_owner": "4bf948ee-f585-4f83-aeb5-10883b042c91" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "7f09a9ce-0b47-41f5-aeed-6d4c33602c04", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_bloblehop_generator/Create_0.gml b/objects/obj_bloblehop_generator/Create_0.gml index 8bda1c9..9c0de31 100644 --- a/objects/obj_bloblehop_generator/Create_0.gml +++ b/objects/obj_bloblehop_generator/Create_0.gml @@ -1,6 +1,6 @@ xlim = 0; xlimh = 960; -ystep = 300; -ylim = 16000; -ygen = 0; +ystep = 350; +ylim = 0; +ygen = 16000; randomize() \ No newline at end of file diff --git a/objects/obj_bloblehop_generator/Step_0.gml b/objects/obj_bloblehop_generator/Step_0.gml index 79cfba2..a6ce726 100644 --- a/objects/obj_bloblehop_generator/Step_0.gml +++ b/objects/obj_bloblehop_generator/Step_0.gml @@ -1,4 +1,4 @@ -if ygen <= ylim +if ygen >= ylim { inst =instance_create_depth((irandom_range(xlim, xlimh)), ygen, -2, obj_bloblehop_platform) @@ -7,13 +7,12 @@ if ygen <= ylim image_xscale=xscale image_yscale=yscale } - ygen += ystep - + ygen -= ystep } else { - inst= instance_create_depth(500,500,-10, obj_bloblehop_player) + inst= instance_create_depth(540,15500,-10, obj_bloblehop_player) view_set_visible(0, obj_bloblehop_player) with inst { @@ -21,4 +20,6 @@ else image_yscale = 5 } instance_destroy() -} \ No newline at end of file +} + +ystep += 4 \ No newline at end of file diff --git a/objects/obj_bloblehop_left/Step_0.gml b/objects/obj_bloblehop_left/Step_0.gml index 0e7ee41..16e2782 100644 --- a/objects/obj_bloblehop_left/Step_0.gml +++ b/objects/obj_bloblehop_left/Step_0.gml @@ -1,15 +1,25 @@ x = camera_get_view_x(view_camera[0]) ; -y = camera_get_view_y(view_camera[0]) ; +y = camera_get_view_y(view_camera[0]) + 1650; if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) { with obj_bloblehop_player { - if hsp > -5 + if hsp > -maxhsp { hsp += -movespeed } } } +if keyboard_check(vk_left) +{ + with obj_bloblehop_player + { + if hsp > -maxhsp + { + hsp += -movespeed + } + } +} \ No newline at end of file diff --git a/objects/obj_bloblehop_platform/Create_0.gml b/objects/obj_bloblehop_platform/Create_0.gml index 0c25b1d..90a7fa0 100644 --- a/objects/obj_bloblehop_platform/Create_0.gml +++ b/objects/obj_bloblehop_platform/Create_0.gml @@ -1,3 +1,3 @@ image_speed = 0 -xscale=10 -yscale=10 \ No newline at end of file +xscale=5 +yscale=5 \ No newline at end of file diff --git a/objects/obj_bloblehop_player/Create_0.gml b/objects/obj_bloblehop_player/Create_0.gml index 1220de9..4a48629 100644 --- a/objects/obj_bloblehop_player/Create_0.gml +++ b/objects/obj_bloblehop_player/Create_0.gml @@ -1,6 +1,6 @@ grav= .4 movespeed = .4 -maxvsp = 15 +maxvsp = 20 maxhsp = 15 jumpspeed = 20 vsp = 0 diff --git a/objects/obj_bloblehop_player/Step_0.gml b/objects/obj_bloblehop_player/Step_0.gml index 4f3b9e3..08f9262 100644 --- a/objects/obj_bloblehop_player/Step_0.gml +++ b/objects/obj_bloblehop_player/Step_0.gml @@ -4,7 +4,7 @@ if vsp < maxvsp vsp = (vsp + grav) } -if (place_meeting(x+1,y,obj_bloblehop_wall)) || (place_meeting(x-1,y,obj_bloblehop_wall)) hsp = 0 +if (place_meeting(x+1+hsp,y,obj_bloblehop_wall)) || (place_meeting(x-1+hsp,y,obj_bloblehop_wall)) hsp = 0 x += hsp diff --git a/objects/obj_bloblehop_right/Step_0.gml b/objects/obj_bloblehop_right/Step_0.gml index 9c6ad31..96ed877 100644 --- a/objects/obj_bloblehop_right/Step_0.gml +++ b/objects/obj_bloblehop_right/Step_0.gml @@ -1,15 +1,25 @@ x = camera_get_view_x(view_camera[0]) + 900; -y = camera_get_view_y(view_camera[0]) ; +y = camera_get_view_y(view_camera[0]) + 1650 ; - - if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) { with obj_bloblehop_player { - if hsp < 5 + if hsp < maxhsp { hsp += movespeed } } } + + +if keyboard_check(vk_right) +{ + with obj_bloblehop_player + { + if hsp > -maxhsp + { + hsp += movespeed + } + } +} \ No newline at end of file diff --git a/objects/obj_gameover_return/Gesture_0.gml b/objects/obj_gameover_return/Gesture_0.gml new file mode 100644 index 0000000..6c495eb --- /dev/null +++ b/objects/obj_gameover_return/Gesture_0.gml @@ -0,0 +1,2 @@ +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_gameover_return/obj_gameover_return.yy b/objects/obj_gameover_return/obj_gameover_return.yy new file mode 100644 index 0000000..9c74978 --- /dev/null +++ b/objects/obj_gameover_return/obj_gameover_return.yy @@ -0,0 +1,38 @@ +{ + "id": "1bb3e34d-ba39-4818-9467-69909d03a7e9", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_gameover_return", + "eventList": [ + { + "id": "a2113925-ce72-4914-a769-dd2bb00d5c16", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "1bb3e34d-ba39-4818-9467-69909d03a7e9" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "56aac3d2-64a6-4733-9a6c-c1637bb4bc60", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_gameover_title/obj_gameover_title.yy b/objects/obj_gameover_title/obj_gameover_title.yy new file mode 100644 index 0000000..265eae2 --- /dev/null +++ b/objects/obj_gameover_title/obj_gameover_title.yy @@ -0,0 +1,29 @@ +{ + "id": "7e610280-d300-469a-8691-5331d9150b6f", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_gameover_title", + "eventList": [ + + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "7d91797a-c1cb-4814-80fa-07ab4f6e9324", + "visible": true +} \ No newline at end of file diff --git a/rooms/rm_Gameover/rm_Gameover.yy b/rooms/rm_Gameover/rm_Gameover.yy new file mode 100644 index 0000000..dfe5150 --- /dev/null +++ b/rooms/rm_Gameover/rm_Gameover.yy @@ -0,0 +1,119 @@ + +{ + "name": "rm_Gameover", + "id": "ea9b4683-0d5a-41f7-b0d3-479636b3507e", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrderIDs": [ + "72d73c53-653c-43da-a0f8-0b2e132a6317", + "1ff47231-2ce1-4ff8-8c33-430482b1d637" + ], + "IsDnD": false, + "layers": [ + { + "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", + "name": "Instances", + "id": "1d4f401f-2a62-4c53-9b1d-f2b3f0621b77", + "depth": 0, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "instances": [ +{"name": "inst_373FE965","id": "72d73c53-653c-43da-a0f8-0b2e132a6317","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_373FE965","objId": "7e610280-d300-469a-8691-5331d9150b6f","properties": null,"rotation": 0,"scaleX": 1.5,"scaleY": 1.5,"mvc": "1.1","x": 64,"y": 192}, +{"name": "inst_1EF027DC","id": "1ff47231-2ce1-4ff8-8c33-430482b1d637","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_1EF027DC","objId": "1bb3e34d-ba39-4818-9467-69909d03a7e9","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 320,"y": 1696} + ], + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRInstanceLayer", + "mvc": "1.0", + "userdefined_depth": false, + "visible": true + }, + { + "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", + "name": "Background", + "id": "822149f5-ed6d-4d9d-881e-d72282c4e42c", + "animationFPS": 15, + "animationSpeedType": "0", + "colour": { "Value": 4294961408 }, + "depth": 100, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "hspeed": 0, + "htiled": false, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRBackgroundLayer", + "mvc": "1.0", + "spriteId": "00000000-0000-0000-0000-000000000000", + "stretch": false, + "userdefined_animFPS": false, + "userdefined_depth": false, + "visible": true, + "vspeed": 0, + "vtiled": false, + "x": 0, + "y": 0 + } + ], + "modelName": "GMRoom", + "parentId": "00000000-0000-0000-0000-000000000000", + "physicsSettings": { + "id": "5f9cdc59-7e63-43c5-9bf5-ddbe5845ef56", + "inheritPhysicsSettings": false, + "modelName": "GMRoomPhysicsSettings", + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0, + "PhysicsWorldGravityY": 10, + "PhysicsWorldPixToMeters": 0.1, + "mvc": "1.0" + }, + "roomSettings": { + "id": "d1556cce-64b2-42e4-a99d-b421bb633314", + "Height": 1920, + "inheritRoomSettings": false, + "modelName": "GMRoomSettings", + "persistent": false, + "mvc": "1.0", + "Width": 1080 + }, + "mvc": "1.0", + "views": [ +{"id": "9a493c45-3058-4b06-9539-8bd0734c2c75","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "eba37e9b-ae6d-449d-a4e2-be03bff486e9","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "08566ac9-b2e5-487e-a6bf-b24dff4aec48","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "802fcebe-6b18-43ad-93a6-4d575765bfd5","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "55b11ebc-5d79-4b63-9f78-6c3a6a5ee63f","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "9588b119-f79f-49d5-91a6-1d25e295c976","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "b9a54b72-ff4f-42e7-bb93-659004b24e95","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "c096e739-e1bd-4082-b6f6-5d9ad76a666f","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} + ], + "viewSettings": { + "id": "497b9875-5c7d-42f3-85a8-71001e127ad0", + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + "modelName": "GMRoomViewSettings", + "mvc": "1.0" + } +} \ No newline at end of file diff --git a/rooms/rm_bloblehop/rm_bloblehop.yy b/rooms/rm_bloblehop/rm_bloblehop.yy index 26950f1..a0a3e62 100644 --- a/rooms/rm_bloblehop/rm_bloblehop.yy +++ b/rooms/rm_bloblehop/rm_bloblehop.yy @@ -9,7 +9,15 @@ "instanceCreationOrderIDs": [ "77a7c7ee-a031-4dc6-b63b-4f27698e6deb", "0b470992-c68b-4f4f-b02c-7f88c0ebacd2", - "9fb3f7d6-a1c0-433b-940d-9334ebf307c0" + "9fb3f7d6-a1c0-433b-940d-9334ebf307c0", + "63079be7-73a0-4416-a77e-c6f18801f2c9", + "7115f50e-2b1d-41f1-993d-68817cdd8853", + "499e5f7e-135e-469b-b03a-0aafaac87882", + "46efa497-5cbf-4fa7-a99c-4c735f29afdd", + "77622a70-2bdd-4b74-8894-ed37e4aa7aed", + "3cc4b562-cad0-4167-bec9-a4d13b622f40", + "152b6ec3-8628-488f-832a-7f211856bed6", + "881749b2-4c53-45e3-874e-58d6e424f48a" ], "IsDnD": false, "layers": [ @@ -29,7 +37,15 @@ "instances": [ {"name": "inst_3B95BA53","id": "77a7c7ee-a031-4dc6-b63b-4f27698e6deb","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_3B95BA53","objId": "dd407344-817e-4959-94e8-424e1b3fd5d1","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 0,"y": 1664}, {"name": "inst_7DCD1B88","id": "0b470992-c68b-4f4f-b02c-7f88c0ebacd2","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_7DCD1B88","objId": "cc590dd9-e5d2-4e10-9bb9-0c53db6a36c6","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 832,"y": 1664}, -{"name": "inst_3ECF466B","id": "9fb3f7d6-a1c0-433b-940d-9334ebf307c0","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_3ECF466B","objId": "1c0beb1b-c82c-495d-9f8b-30f5f73e5fe5","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 0,"y": 1888} +{"name": "inst_3ECF466B","id": "9fb3f7d6-a1c0-433b-940d-9334ebf307c0","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_3ECF466B","objId": "1c0beb1b-c82c-495d-9f8b-30f5f73e5fe5","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 0,"y": 1888}, +{"name": "inst_69EDCBFC","id": "63079be7-73a0-4416-a77e-c6f18801f2c9","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_69EDCBFC","objId": "159ead98-6403-450c-8c75-f0095110279e","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 480,"y": 15968}, +{"name": "inst_403C33EC","id": "7115f50e-2b1d-41f1-993d-68817cdd8853","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_403C33EC","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 83.5,"mvc": "1.1","x": 1120,"y": 12160}, +{"name": "inst_1A80603B","id": "499e5f7e-135e-469b-b03a-0aafaac87882","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_1A80603B","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 83.5,"mvc": "1.1","x": -64,"y": 12160}, +{"name": "inst_774D2153","id": "46efa497-5cbf-4fa7-a99c-4c735f29afdd","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_774D2153","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 83.5,"mvc": "1.1","x": 1120,"y": 6816}, +{"name": "inst_28CDB22D","id": "77622a70-2bdd-4b74-8894-ed37e4aa7aed","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_28CDB22D","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 83.5,"mvc": "1.1","x": -64,"y": 6816}, +{"name": "inst_4E856E15","id": "3cc4b562-cad0-4167-bec9-a4d13b622f40","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_4E856E15","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 83.5,"mvc": "1.1","x": 1120,"y": 1472}, +{"name": "inst_46C1C087","id": "152b6ec3-8628-488f-832a-7f211856bed6","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_46C1C087","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 83.5,"mvc": "1.1","x": -64,"y": 1472}, +{"name": "inst_79C7DD8A","id": "881749b2-4c53-45e3-874e-58d6e424f48a","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_79C7DD8A","objId": "4bf948ee-f585-4f83-aeb5-10883b042c91","properties": null,"rotation": 0,"scaleX": 19,"scaleY": 1.5,"mvc": "1.1","x": 256,"y": 16096} ], "layers": [ @@ -47,7 +63,7 @@ "id": "fea68416-509a-47b9-bc5d-24abae546f9b", "animationFPS": 15, "animationSpeedType": "0", - "colour": { "Value": 4294954245 }, + "colour": { "Value": 4294959205 }, "depth": 100, "grid_x": 32, "grid_y": 32, @@ -100,7 +116,7 @@ }, "mvc": "1.0", "views": [ -{"id": "f4b11756-b64e-4765-a31c-f0d1ce24492f","hborder": 32,"hport": 960,"hspeed": -1,"hview": 1920,"inherit": false,"modelName": "GMRView","objId": "148a5ef3-ef25-44c8-98b5-dc18305bdc90","mvc": "1.0","vborder": 32,"visible": true,"vspeed": -1,"wport": 540,"wview": 1080,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "f4b11756-b64e-4765-a31c-f0d1ce24492f","hborder": 32,"hport": 960,"hspeed": 5,"hview": 1920,"inherit": false,"modelName": "GMRView","objId": "148a5ef3-ef25-44c8-98b5-dc18305bdc90","mvc": "1.0","vborder": 500,"visible": true,"vspeed": 5,"wport": 540,"wview": 1080,"xport": 0,"xview": 0,"yport": 0,"yview": 14100}, {"id": "de4d0cc9-2037-4ef3-8e48-30c11efc36fa","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, {"id": "b0bd37de-8f28-4c02-892b-e87d186e554a","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, {"id": "82988d08-7ac7-420f-9fa1-d2c07b8915bf","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, diff --git a/sprites/spr_gameover_return/0191e6c5-8e85-4482-96d9-b0d84b7d6f52.png b/sprites/spr_gameover_return/0191e6c5-8e85-4482-96d9-b0d84b7d6f52.png new file mode 100644 index 0000000..a9ca6b2 Binary files /dev/null and b/sprites/spr_gameover_return/0191e6c5-8e85-4482-96d9-b0d84b7d6f52.png differ diff --git a/sprites/spr_gameover_return/layers/0191e6c5-8e85-4482-96d9-b0d84b7d6f52/7d1973df-5264-4a43-b799-be2f5cdfa79d.png b/sprites/spr_gameover_return/layers/0191e6c5-8e85-4482-96d9-b0d84b7d6f52/7d1973df-5264-4a43-b799-be2f5cdfa79d.png new file mode 100644 index 0000000..53b0d9e Binary files /dev/null and b/sprites/spr_gameover_return/layers/0191e6c5-8e85-4482-96d9-b0d84b7d6f52/7d1973df-5264-4a43-b799-be2f5cdfa79d.png differ diff --git a/sprites/spr_gameover_return/spr_gameover_return.yy b/sprites/spr_gameover_return/spr_gameover_return.yy new file mode 100644 index 0000000..f1469e1 --- /dev/null +++ b/sprites/spr_gameover_return/spr_gameover_return.yy @@ -0,0 +1,70 @@ +{ + "id": "56aac3d2-64a6-4733-9a6c-c1637bb4bc60", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_gameover_return", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 90, + "bbox_left": 4, + "bbox_right": 434, + "bbox_top": 3, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "0191e6c5-8e85-4482-96d9-b0d84b7d6f52", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "56aac3d2-64a6-4733-9a6c-c1637bb4bc60", + "compositeImage": { + "id": "afd852c5-30a1-46c1-85f8-fbba2d07e45f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0191e6c5-8e85-4482-96d9-b0d84b7d6f52", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "5e647bde-f5d4-4954-9e04-5e98f9d22a9e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0191e6c5-8e85-4482-96d9-b0d84b7d6f52", + "LayerId": "7d1973df-5264-4a43-b799-be2f5cdfa79d" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 94, + "layers": [ + { + "id": "7d1973df-5264-4a43-b799-be2f5cdfa79d", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "56aac3d2-64a6-4733-9a6c-c1637bb4bc60", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 439, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_gameover_title/9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a.png b/sprites/spr_gameover_title/9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a.png new file mode 100644 index 0000000..04e2f3a Binary files /dev/null and b/sprites/spr_gameover_title/9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a.png differ diff --git a/sprites/spr_gameover_title/layers/9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a/46d885be-7eba-42c5-82be-7c5aec0c7b88.png b/sprites/spr_gameover_title/layers/9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a/46d885be-7eba-42c5-82be-7c5aec0c7b88.png new file mode 100644 index 0000000..369877c Binary files /dev/null and b/sprites/spr_gameover_title/layers/9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a/46d885be-7eba-42c5-82be-7c5aec0c7b88.png differ diff --git a/sprites/spr_gameover_title/spr_gameover_title.yy b/sprites/spr_gameover_title/spr_gameover_title.yy new file mode 100644 index 0000000..2b22535 --- /dev/null +++ b/sprites/spr_gameover_title/spr_gameover_title.yy @@ -0,0 +1,70 @@ +{ + "id": "7d91797a-c1cb-4814-80fa-07ab4f6e9324", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_gameover_title", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 90, + "bbox_left": 4, + "bbox_right": 619, + "bbox_top": 3, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "7d91797a-c1cb-4814-80fa-07ab4f6e9324", + "compositeImage": { + "id": "f5cd15c4-443e-4b70-b447-d0938f0163f8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "1dbf2c06-db30-4700-83c2-9fbad6e8f817", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9f98f9bf-46aa-4b92-b0b8-ff240dd31c3a", + "LayerId": "46d885be-7eba-42c5-82be-7c5aec0c7b88" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 94, + "layers": [ + { + "id": "46d885be-7eba-42c5-82be-7c5aec0c7b88", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "7d91797a-c1cb-4814-80fa-07ab4f6e9324", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 9, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 624, + "xorig": -10, + "yorig": 27 +} \ No newline at end of file diff --git a/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy b/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy index 1527c7f..3c61b75 100644 --- a/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy +++ b/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy @@ -29,7 +29,9 @@ "1c0db5c3-eeb2-47b5-accd-224c7a593234", "454b66d4-7202-4d15-ae18-888e04f5c863", "3dc8e5d1-48fe-47f0-99f7-849b43d64ad4", - "7f09a9ce-0b47-41f5-aeed-6d4c33602c04" + "7f09a9ce-0b47-41f5-aeed-6d4c33602c04", + "7d91797a-c1cb-4814-80fa-07ab4f6e9324", + "56aac3d2-64a6-4733-9a6c-c1637bb4bc60" ], "filterType": "GMSprite", "folderName": "sprites", diff --git a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index 3e9a26f..3fe0fa1 100644 --- a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -35,7 +35,10 @@ "1c0beb1b-c82c-495d-9f8b-30f5f73e5fe5", "dd407344-817e-4959-94e8-424e1b3fd5d1", "cc590dd9-e5d2-4e10-9bb9-0c53db6a36c6", - "e4e0439f-5f0c-4408-bbf9-849653b96df0" + "e4e0439f-5f0c-4408-bbf9-849653b96df0", + "7e610280-d300-469a-8691-5331d9150b6f", + "1bb3e34d-ba39-4818-9467-69909d03a7e9", + "4bf948ee-f585-4f83-aeb5-10883b042c91" ], "filterType": "GMObject", "folderName": "objects", diff --git a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy index 7506e0f..1c1c67f 100644 --- a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy +++ b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy @@ -8,7 +8,8 @@ "fd613f09-8df2-4dd4-84ff-22313f8fc3b2", "1a58794f-af6e-43bd-ad13-85dfa879bf65", "96c3096d-469f-400d-afbe-272414346072", - "b5752279-c416-4f7b-b59f-80ebef7c0983" + "b5752279-c416-4f7b-b59f-80ebef7c0983", + "ea9b4683-0d5a-41f7-b0d3-479636b3507e" ], "filterType": "GMRoom", "folderName": "rooms",