diff --git a/objects/obj_bloblehop_generator/Create_0.gml b/objects/obj_bloblehop_generator/Create_0.gml index f2490de..8bda1c9 100644 --- a/objects/obj_bloblehop_generator/Create_0.gml +++ b/objects/obj_bloblehop_generator/Create_0.gml @@ -1,5 +1,5 @@ xlim = 0; -xlimh = 8; +xlimh = 960; ystep = 300; ylim = 16000; ygen = 0; diff --git a/objects/obj_bloblehop_generator/Step_0.gml b/objects/obj_bloblehop_generator/Step_0.gml index 03aed19..79cfba2 100644 --- a/objects/obj_bloblehop_generator/Step_0.gml +++ b/objects/obj_bloblehop_generator/Step_0.gml @@ -13,5 +13,12 @@ if ygen <= ylim else { + inst= instance_create_depth(500,500,-10, obj_bloblehop_player) + view_set_visible(0, obj_bloblehop_player) + with inst + { + image_xscale = 5 + image_yscale = 5 + } instance_destroy() } \ No newline at end of file diff --git a/objects/obj_bloblehop_left/Draw_64.gml b/objects/obj_bloblehop_left/Draw_64.gml new file mode 100644 index 0000000..4c9aeca --- /dev/null +++ b/objects/obj_bloblehop_left/Draw_64.gml @@ -0,0 +1 @@ +draw_sprite(spr_arrow, 0, 0, 100) \ No newline at end of file diff --git a/objects/obj_bloblehop_left/Mouse_4.gml b/objects/obj_bloblehop_left/Mouse_4.gml deleted file mode 100644 index ce6dee5..0000000 --- a/objects/obj_bloblehop_left/Mouse_4.gml +++ /dev/null @@ -1,4 +0,0 @@ -with obj_bloblehop_player -{ - hsp = -1 -} \ No newline at end of file diff --git a/objects/obj_bloblehop_left/Step_0.gml b/objects/obj_bloblehop_left/Step_0.gml new file mode 100644 index 0000000..0e7ee41 --- /dev/null +++ b/objects/obj_bloblehop_left/Step_0.gml @@ -0,0 +1,15 @@ +x = camera_get_view_x(view_camera[0]) ; +y = camera_get_view_y(view_camera[0]) ; + + +if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) +{ + with obj_bloblehop_player + { + if hsp > -5 + { + hsp += -movespeed + } + } +} + diff --git a/objects/obj_bloblehop_left/obj_bloblehop_left.yy b/objects/obj_bloblehop_left/obj_bloblehop_left.yy index 5f203b9..059dfd2 100644 --- a/objects/obj_bloblehop_left/obj_bloblehop_left.yy +++ b/objects/obj_bloblehop_left/obj_bloblehop_left.yy @@ -15,13 +15,23 @@ "m_owner": "dd407344-817e-4959-94e8-424e1b3fd5d1" }, { - "id": "46458c95-ce09-47ba-b8c8-f0bc7f7771b7", + "id": "9dbc6e30-e93d-4bb1-8f33-695328ed073d", "modelName": "GMEvent", "mvc": "1.0", "IsDnD": false, "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 4, - "eventtype": 6, + "enumb": 0, + "eventtype": 3, + "m_owner": "dd407344-817e-4959-94e8-424e1b3fd5d1" + }, + { + "id": "82d12cd3-ad4b-4cd9-bea8-4242ca30b61c", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 64, + "eventtype": 8, "m_owner": "dd407344-817e-4959-94e8-424e1b3fd5d1" } ], diff --git a/objects/obj_bloblehop_player/Create_0.gml b/objects/obj_bloblehop_player/Create_0.gml index c744b8e..1220de9 100644 --- a/objects/obj_bloblehop_player/Create_0.gml +++ b/objects/obj_bloblehop_player/Create_0.gml @@ -1,5 +1,7 @@ -grav = .2 -hsp = 0; -vsp = 0; -jumpspeed = 7; -movespeed = 4; +grav= .4 +movespeed = .4 +maxvsp = 15 +maxhsp = 15 +jumpspeed = 20 +vsp = 0 +hsp = 0 \ No newline at end of file diff --git a/objects/obj_bloblehop_player/Step_0.gml b/objects/obj_bloblehop_player/Step_0.gml index 6c6a841..4f3b9e3 100644 --- a/objects/obj_bloblehop_player/Step_0.gml +++ b/objects/obj_bloblehop_player/Step_0.gml @@ -1 +1,16 @@ -x += hsp \ No newline at end of file +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 + +x += hsp + +if vsp >0 +{ +if (place_meeting(x,y+1,obj_bloblehop_platform)) || (place_meeting(x,y-1,obj_bloblehop_platform)){ vsp = -jumpspeed} + +} +y += vsp \ No newline at end of file diff --git a/objects/obj_bloblehop_right/Mouse_4.gml b/objects/obj_bloblehop_right/Mouse_4.gml deleted file mode 100644 index 53c9ad4..0000000 --- a/objects/obj_bloblehop_right/Mouse_4.gml +++ /dev/null @@ -1,4 +0,0 @@ -with obj_bloblehop_player -{ - hsp = 1 -} \ No newline at end of file diff --git a/objects/obj_bloblehop_right/Step_0.gml b/objects/obj_bloblehop_right/Step_0.gml new file mode 100644 index 0000000..9c6ad31 --- /dev/null +++ b/objects/obj_bloblehop_right/Step_0.gml @@ -0,0 +1,15 @@ +x = camera_get_view_x(view_camera[0]) + 900; +y = camera_get_view_y(view_camera[0]) ; + + + +if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) +{ + with obj_bloblehop_player + { + if hsp < 5 + { + hsp += movespeed + } + } +} diff --git a/objects/obj_bloblehop_right/obj_bloblehop_right.yy b/objects/obj_bloblehop_right/obj_bloblehop_right.yy index f515566..cd965de 100644 --- a/objects/obj_bloblehop_right/obj_bloblehop_right.yy +++ b/objects/obj_bloblehop_right/obj_bloblehop_right.yy @@ -15,13 +15,13 @@ "m_owner": "cc590dd9-e5d2-4e10-9bb9-0c53db6a36c6" }, { - "id": "fd17f044-bd07-4f7a-853c-c74c3df8a023", + "id": "eebbfa27-0d08-4bc1-b919-f3bd8f2ac2c1", "modelName": "GMEvent", "mvc": "1.0", "IsDnD": false, "collisionObjectId": "00000000-0000-0000-0000-000000000000", - "enumb": 4, - "eventtype": 6, + "enumb": 0, + "eventtype": 3, "m_owner": "cc590dd9-e5d2-4e10-9bb9-0c53db6a36c6" } ], diff --git a/rooms/rm_bloblehop/rm_bloblehop.yy b/rooms/rm_bloblehop/rm_bloblehop.yy index 42a4cbc..26950f1 100644 --- a/rooms/rm_bloblehop/rm_bloblehop.yy +++ b/rooms/rm_bloblehop/rm_bloblehop.yy @@ -7,11 +7,9 @@ "inheritCreationOrder": false, "inheritLayers": false, "instanceCreationOrderIDs": [ - "6ea27723-4b7a-42c2-886c-642f2d0efe81", - "387ea999-e18e-49bd-9058-ff926123fd25", - "b11ff1f4-55f4-4275-86e9-ade4f7d14fd1", "77a7c7ee-a031-4dc6-b63b-4f27698e6deb", - "0b470992-c68b-4f4f-b02c-7f88c0ebacd2" + "0b470992-c68b-4f4f-b02c-7f88c0ebacd2", + "9fb3f7d6-a1c0-433b-940d-9334ebf307c0" ], "IsDnD": false, "layers": [ @@ -29,11 +27,9 @@ "inheritSubLayers": false, "inheritVisibility": false, "instances": [ -{"name": "inst_22CB915B","id": "6ea27723-4b7a-42c2-886c-642f2d0efe81","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_22CB915B","objId": "148a5ef3-ef25-44c8-98b5-dc18305bdc90","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 320,"y": 1024}, -{"name": "inst_28E88F46","id": "387ea999-e18e-49bd-9058-ff926123fd25","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_28E88F46","objId": "159ead98-6403-450c-8c75-f0095110279e","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 320,"y": 1344}, -{"name": "inst_3C78FDBD","id": "b11ff1f4-55f4-4275-86e9-ade4f7d14fd1","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_3C78FDBD","objId": "e4e0439f-5f0c-4408-bbf9-849653b96df0","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 5,"mvc": "1.1","x": 640,"y": 1160}, {"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_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} ], "layers": [ @@ -95,7 +91,7 @@ }, "roomSettings": { "id": "93a60c61-be8d-41e0-a545-511e23e4363f", - "Height": 1920, + "Height": 16000, "inheritRoomSettings": false, "modelName": "GMRoomSettings", "persistent": false, @@ -104,7 +100,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": false,"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": -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": "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}, @@ -117,7 +113,7 @@ "id": "d86308c9-ac8c-44ed-8e1e-49486e39adb5", "clearDisplayBuffer": true, "clearViewBackground": false, - "enableViews": false, + "enableViews": true, "inheritViewSettings": false, "modelName": "GMRoomViewSettings", "mvc": "1.0"