diff --git a/Bloble.yyp b/Bloble.yyp index 0239810..cdf69d1 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -446,6 +446,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "8a6b0b4e-a38d-45c8-be04-42d47bf2c539", + "Value": { + "id": "e54ef7f6-dd96-4e5b-a714-d8f7a2a610c9", + "resourcePath": "objects\\obj_bloblehop_play\\obj_bloblehop_play.yy", + "resourceType": "GMObject" + } + }, { "Key": "8b2aa63e-59e6-43aa-8065-01bcff72cc7b", "Value": { @@ -454,6 +462,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "92c6cdd6-240a-4e23-8ca2-d0820f1a6cc9", + "Value": { + "id": "0244bba1-832c-445f-bdde-cd30eb804369", + "resourcePath": "objects\\obj_bloblehop_respawn\\obj_bloblehop_respawn.yy", + "resourceType": "GMObject" + } + }, { "Key": "92f24b35-1e2c-4d91-9449-08a7355beaf1", "Value": { diff --git a/objects/obj_Player/Create_0.gml b/objects/obj_Player/Create_0.gml new file mode 100644 index 0000000..e69de29 diff --git a/objects/obj_Player/obj_Player.yy b/objects/obj_Player/obj_Player.yy index f9931ba..8f9a787 100644 --- a/objects/obj_Player/obj_Player.yy +++ b/objects/obj_Player/obj_Player.yy @@ -4,7 +4,16 @@ "mvc": "1.0", "name": "obj_Player", "eventList": [ - + { + "id": "063ce468-0685-4727-8631-c7b306a6dc99", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "1facbb7e-adc5-4063-b037-5db69880dc8d" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/objects/obj_SelectBlue/Gesture_0.gml b/objects/obj_SelectBlue/Gesture_0.gml index 651f746..62afb40 100644 --- a/objects/obj_SelectBlue/Gesture_0.gml +++ b/objects/obj_SelectBlue/Gesture_0.gml @@ -1,3 +1,4 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobBlue) object_set_sprite(obj_Player, spr_BlobBlue) global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectGreen/Gesture_0.gml b/objects/obj_SelectGreen/Gesture_0.gml index 6b55106..d0ea9dc 100644 --- a/objects/obj_SelectGreen/Gesture_0.gml +++ b/objects/obj_SelectGreen/Gesture_0.gml @@ -1,3 +1,4 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobGreen) object_set_sprite(obj_Player, spr_BlobGreen) global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectOrange/Gesture_0.gml b/objects/obj_SelectOrange/Gesture_0.gml index 5b2ef0e..e334011 100644 --- a/objects/obj_SelectOrange/Gesture_0.gml +++ b/objects/obj_SelectOrange/Gesture_0.gml @@ -1,3 +1,4 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobOrange) object_set_sprite(obj_Player, spr_BlobOrange) global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectPink/Gesture_0.gml b/objects/obj_SelectPink/Gesture_0.gml index 2f3f20a..3df35cc 100644 --- a/objects/obj_SelectPink/Gesture_0.gml +++ b/objects/obj_SelectPink/Gesture_0.gml @@ -1,3 +1,4 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobPink) object_set_sprite(obj_Player, spr_BlobPink) global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectRainbow/Gesture_0.gml b/objects/obj_SelectRainbow/Gesture_0.gml index 5de95b3..3910555 100644 --- a/objects/obj_SelectRainbow/Gesture_0.gml +++ b/objects/obj_SelectRainbow/Gesture_0.gml @@ -1,3 +1,4 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobRainbow) object_set_sprite(obj_Player, spr_BlobRainbow) global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectRed/Gesture_0.gml b/objects/obj_SelectRed/Gesture_0.gml index 10e5271..8dd5b65 100644 --- a/objects/obj_SelectRed/Gesture_0.gml +++ b/objects/obj_SelectRed/Gesture_0.gml @@ -1,3 +1,5 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobRed) object_set_sprite(obj_Player, spr_BlobRed) + global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectYellow/Gesture_0.gml b/objects/obj_SelectYellow/Gesture_0.gml index b30614b..b8cadb0 100644 --- a/objects/obj_SelectYellow/Gesture_0.gml +++ b/objects/obj_SelectYellow/Gesture_0.gml @@ -1,3 +1,4 @@ +object_set_sprite(obj_bloblehop_player, spr_BlobYellow) object_set_sprite(obj_Player, spr_BlobYellow) global.roomset = rm_Player; instance_create_depth(1,1,-1, obj_fade) \ 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 9c0de31..b3b9651 100644 --- a/objects/obj_bloblehop_generator/Create_0.gml +++ b/objects/obj_bloblehop_generator/Create_0.gml @@ -1,6 +1,5 @@ xlim = 0; xlimh = 960; -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 a6ce726..3261005 100644 --- a/objects/obj_bloblehop_generator/Step_0.gml +++ b/objects/obj_bloblehop_generator/Step_0.gml @@ -7,7 +7,7 @@ if ygen >= ylim image_xscale=xscale image_yscale=yscale } - ygen -= ystep + ygen -= global.ystep } else @@ -22,4 +22,4 @@ else instance_destroy() } -ystep += 4 \ No newline at end of file +global.ystep += 3 \ No newline at end of file diff --git a/objects/obj_bloblehop_play/Gesture_0.gml b/objects/obj_bloblehop_play/Gesture_0.gml new file mode 100644 index 0000000..c24987d --- /dev/null +++ b/objects/obj_bloblehop_play/Gesture_0.gml @@ -0,0 +1,3 @@ +global.roomset = rm_bloblehop; +instance_create_depth(1,1,-1, obj_fade) +global.ystep = 350 \ No newline at end of file diff --git a/objects/obj_bloblehop_play/obj_bloblehop_play.yy b/objects/obj_bloblehop_play/obj_bloblehop_play.yy new file mode 100644 index 0000000..45efba0 --- /dev/null +++ b/objects/obj_bloblehop_play/obj_bloblehop_play.yy @@ -0,0 +1,38 @@ +{ + "id": "8a6b0b4e-a38d-45c8-be04-42d47bf2c539", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_bloblehop_play", + "eventList": [ + { + "id": "23a9d55c-6e32-4c45-a582-191b555ecf85", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "8a6b0b4e-a38d-45c8-be04-42d47bf2c539" + } + ], + "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_player/Create_0.gml b/objects/obj_bloblehop_player/Create_0.gml index 4a48629..4916ba7 100644 --- a/objects/obj_bloblehop_player/Create_0.gml +++ b/objects/obj_bloblehop_player/Create_0.gml @@ -1,3 +1,4 @@ + grav= .4 movespeed = .4 maxvsp = 20 diff --git a/objects/obj_bloblehop_respawn/Collision_cb879428-5183-4e1a-a0ca-d7ec2ae00bbd.gml b/objects/obj_bloblehop_respawn/Collision_cb879428-5183-4e1a-a0ca-d7ec2ae00bbd.gml new file mode 100644 index 0000000..b519e7a --- /dev/null +++ b/objects/obj_bloblehop_respawn/Collision_cb879428-5183-4e1a-a0ca-d7ec2ae00bbd.gml @@ -0,0 +1 @@ +room_restart() \ No newline at end of file diff --git a/objects/obj_bloblehop_respawn/obj_bloblehop_respawn.yy b/objects/obj_bloblehop_respawn/obj_bloblehop_respawn.yy new file mode 100644 index 0000000..758f361 --- /dev/null +++ b/objects/obj_bloblehop_respawn/obj_bloblehop_respawn.yy @@ -0,0 +1,38 @@ +{ + "id": "92c6cdd6-240a-4e23-8ca2-d0820f1a6cc9", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_bloblehop_respawn", + "eventList": [ + { + "id": "cb879428-5183-4e1a-a0ca-d7ec2ae00bbd", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "148a5ef3-ef25-44c8-98b5-dc18305bdc90", + "enumb": 0, + "eventtype": 4, + "m_owner": "92c6cdd6-240a-4e23-8ca2-d0820f1a6cc9" + } + ], + "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_right/Step_0.gml b/objects/obj_bloblehop_right/Step_0.gml index 96ed877..29f1b8a 100644 --- a/objects/obj_bloblehop_right/Step_0.gml +++ b/objects/obj_bloblehop_right/Step_0.gml @@ -1,4 +1,4 @@ -x = camera_get_view_x(view_camera[0]) + 900; +x = camera_get_view_x(view_camera[0]) + 830; y = camera_get_view_y(view_camera[0]) + 1650 ; if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) diff --git a/rooms/rm_Player/rm_Player.yy b/rooms/rm_Player/rm_Player.yy index 8b9417d..97af56f 100644 --- a/rooms/rm_Player/rm_Player.yy +++ b/rooms/rm_Player/rm_Player.yy @@ -12,7 +12,8 @@ "e009086d-510b-4858-b32c-ad5670c77b65", "21d26312-9914-4740-a1e6-52161a7eace9", "f2a73e2a-9bfa-4844-93ec-ebc9a17463e2", - "8c20cf63-5d91-460d-87b7-c55d2ce05231" + "8c20cf63-5d91-460d-87b7-c55d2ce05231", + "550b4d53-1bdc-4b67-a2e8-15112cb3847e" ], "IsDnD": false, "layers": [ @@ -35,7 +36,8 @@ {"name": "inst_61381B91","id": "e009086d-510b-4858-b32c-ad5670c77b65","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_61381B91","objId": "ee739527-7172-4028-8f39-2ef174a4ada5","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 544,"y": 32}, {"name": "inst_2CF35240","id": "21d26312-9914-4740-a1e6-52161a7eace9","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_2CF35240","objId": "faeb0e35-a972-46c1-9af4-f4936410ca5e","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 32,"y": 192}, {"name": "inst_21572DB0","id": "f2a73e2a-9bfa-4844-93ec-ebc9a17463e2","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_21572DB0","objId": "2d5d3f5e-5efc-4e76-80d4-c2ea839c96ba","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 544,"y": 192}, -{"name": "inst_4D21852E","id": "8c20cf63-5d91-460d-87b7-c55d2ce05231","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_4D21852E","objId": "334d75d0-c561-4e8d-8827-9ef8bae4ea2e","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 832,"y": 1664} +{"name": "inst_4D21852E","id": "8c20cf63-5d91-460d-87b7-c55d2ce05231","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_4D21852E","objId": "334d75d0-c561-4e8d-8827-9ef8bae4ea2e","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 832,"y": 1664}, +{"name": "inst_2AC1E6C5","id": "550b4d53-1bdc-4b67-a2e8-15112cb3847e","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_2AC1E6C5","objId": "8a6b0b4e-a38d-45c8-be04-42d47bf2c539","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 64,"y": 1632} ], "layers": [ diff --git a/rooms/rm_bloblehop/rm_bloblehop.yy b/rooms/rm_bloblehop/rm_bloblehop.yy index a0a3e62..192e849 100644 --- a/rooms/rm_bloblehop/rm_bloblehop.yy +++ b/rooms/rm_bloblehop/rm_bloblehop.yy @@ -17,7 +17,8 @@ "77622a70-2bdd-4b74-8894-ed37e4aa7aed", "3cc4b562-cad0-4167-bec9-a4d13b622f40", "152b6ec3-8628-488f-832a-7f211856bed6", - "881749b2-4c53-45e3-874e-58d6e424f48a" + "881749b2-4c53-45e3-874e-58d6e424f48a", + "adf0b2b4-4d5f-4964-a8f9-6ee1f1095118" ], "IsDnD": false, "layers": [ @@ -45,7 +46,8 @@ {"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} +{"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}, +{"name": "inst_1EF8787B","id": "adf0b2b4-4d5f-4964-a8f9-6ee1f1095118","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_1EF8787B","objId": "92c6cdd6-240a-4e23-8ca2-d0820f1a6cc9","properties": null,"rotation": 0,"scaleX": 18.5,"scaleY": 1,"mvc": "1.1","x": 272,"y": -96} ], "layers": [ diff --git a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index 3fe0fa1..03ccaa4 100644 --- a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -38,7 +38,9 @@ "e4e0439f-5f0c-4408-bbf9-849653b96df0", "7e610280-d300-469a-8691-5331d9150b6f", "1bb3e34d-ba39-4818-9467-69909d03a7e9", - "4bf948ee-f585-4f83-aeb5-10883b042c91" + "4bf948ee-f585-4f83-aeb5-10883b042c91", + "92c6cdd6-240a-4e23-8ca2-d0820f1a6cc9", + "8a6b0b4e-a38d-45c8-be04-42d47bf2c539" ], "filterType": "GMObject", "folderName": "objects", diff --git a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy index 1c1c67f..81d9c7a 100644 --- a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy +++ b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy @@ -4,11 +4,11 @@ "mvc": "1.1", "name": "e397fd61-3040-4d63-a320-7d2e697fa442", "children": [ - "adc2e71c-d722-44c0-aa2e-31bf3e74c897", "fd613f09-8df2-4dd4-84ff-22313f8fc3b2", "1a58794f-af6e-43bd-ad13-85dfa879bf65", "96c3096d-469f-400d-afbe-272414346072", "b5752279-c416-4f7b-b59f-80ebef7c0983", + "adc2e71c-d722-44c0-aa2e-31bf3e74c897", "ea9b4683-0d5a-41f7-b0d3-479636b3507e" ], "filterType": "GMRoom",