diff --git a/objects/obj_bloblehop_cloud/Create_0.gml b/objects/obj_bloblehop_cloud/Create_0.gml new file mode 100644 index 0000000..d8b6be6 --- /dev/null +++ b/objects/obj_bloblehop_cloud/Create_0.gml @@ -0,0 +1,4 @@ +image_xscale = 5 +image_yscale = 5 +image_speed = 0 +image_index = (irandom_range(0,2)) \ No newline at end of file diff --git a/objects/obj_bloblehop_cloud/obj_bloblehop_cloud.yy b/objects/obj_bloblehop_cloud/obj_bloblehop_cloud.yy index 0a7955b..44f2afa 100644 --- a/objects/obj_bloblehop_cloud/obj_bloblehop_cloud.yy +++ b/objects/obj_bloblehop_cloud/obj_bloblehop_cloud.yy @@ -4,7 +4,16 @@ "mvc": "1.0", "name": "obj_bloblehop_cloud", "eventList": [ - + { + "id": "656a677d-b659-40cf-bce0-bc07412c5f54", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "0d1e570d-af3c-4ae4-858a-2dc0e473c432" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/objects/obj_bloblehop_coin/Collision_d2e7b6df-1c06-423c-8d20-f211dbabffe8.gml b/objects/obj_bloblehop_coin/Collision_d2e7b6df-1c06-423c-8d20-f211dbabffe8.gml new file mode 100644 index 0000000..ef3cdbd --- /dev/null +++ b/objects/obj_bloblehop_coin/Collision_d2e7b6df-1c06-423c-8d20-f211dbabffe8.gml @@ -0,0 +1,4 @@ +global.minigamecoin += 1; + + +instance_destroy() \ No newline at end of file diff --git a/objects/obj_bloblehop_coin/Create_0.gml b/objects/obj_bloblehop_coin/Create_0.gml index 7264718..c3c1e4e 100644 --- a/objects/obj_bloblehop_coin/Create_0.gml +++ b/objects/obj_bloblehop_coin/Create_0.gml @@ -1,2 +1,2 @@ -xscale = 5; -yscale = 5; +image_xscale = 5; +image_yscale = 5; diff --git a/objects/obj_bloblehop_coin/obj_bloblehop_coin.yy b/objects/obj_bloblehop_coin/obj_bloblehop_coin.yy index 31b74ec..1487069 100644 --- a/objects/obj_bloblehop_coin/obj_bloblehop_coin.yy +++ b/objects/obj_bloblehop_coin/obj_bloblehop_coin.yy @@ -23,6 +23,16 @@ "enumb": 0, "eventtype": 0, "m_owner": "24b00e9f-0c54-451a-b97e-a9bfe4596ba2" + }, + { + "id": "d2e7b6df-1c06-423c-8d20-f211dbabffe8", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "01e9e370-a056-45e3-ac57-bd2cedd9a804", + "enumb": 0, + "eventtype": 4, + "m_owner": "24b00e9f-0c54-451a-b97e-a9bfe4596ba2" } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", diff --git a/objects/obj_bloblehop_generator/Create_0.gml b/objects/obj_bloblehop_generator/Create_0.gml index 7c9ed03..001c7ea 100644 --- a/objects/obj_bloblehop_generator/Create_0.gml +++ b/objects/obj_bloblehop_generator/Create_0.gml @@ -1,7 +1,9 @@ +randomize() xlim = 0; xlimh = 960; ylim = 0; ygen = 16000; coingenlim = 15; coingen = 0; -randomize() \ No newline at end of file +cloudgen = 0; +cloudgenlim = 12; diff --git a/objects/obj_bloblehop_generator/Step_0.gml b/objects/obj_bloblehop_generator/Step_0.gml index 9eed42d..96b9885 100644 --- a/objects/obj_bloblehop_generator/Step_0.gml +++ b/objects/obj_bloblehop_generator/Step_0.gml @@ -2,15 +2,30 @@ if coingen < coingenlim { inst =instance_create_depth((irandom_range(xlim, xlimh)), irandom_range(0,16000), -3, obj_bloblehop_coin) - with inst - { - image_xscale=xscale - image_yscale=yscale - - } coingen +=1 } +if cloudgen < cloudgenlim +{ + inst =instance_create_depth((irandom_range(xlim, xlimh)), irandom_range(0,16000), -2, obj_bloblehop_cloud) + with inst + { + if (place_meeting(x,y,obj_bloblehop_cloud)) + { + instance_destroy() + } + if (place_meeting(x,y,obj_bloblehop_platform)) + { + instance_destroy() + } + if (place_meeting(x,y,obj_bloblehop_platformboost)) + { + instance_destroy() + } + } + cloudgen +=1 +} + @@ -20,16 +35,11 @@ if ygen >= ylim inst =instance_create_depth((irandom_range(xlim, xlimh)), ygen, -2, obj_bloblehop_platform) with inst { - image_xscale=xscale - image_yscale=yscale + if irandom_range(1,30) = 4 { inst = instance_create_depth(x,y,-2,obj_bloblehop_platformboost) - with inst - { - image_xscale=xscale - image_yscale=yscale - } + instance_destroy() } } @@ -40,11 +50,7 @@ else { inst= instance_create_depth(540,15500,-10, obj_bloblehop_player) view_set_visible(0, obj_bloblehop_player) - with inst - { - image_xscale = 5 - image_yscale = 5 - } + instance_destroy() } diff --git a/objects/obj_bloblehop_platform/Create_0.gml b/objects/obj_bloblehop_platform/Create_0.gml index b7f2f00..9db71e2 100644 --- a/objects/obj_bloblehop_platform/Create_0.gml +++ b/objects/obj_bloblehop_platform/Create_0.gml @@ -1,4 +1,4 @@ image_speed = 0; image_index = 0; -xscale=5 -yscale=5 \ No newline at end of file +image_xscale=5 +image_yscale=5 \ No newline at end of file diff --git a/objects/obj_bloblehop_platformboost/Create_0.gml b/objects/obj_bloblehop_platformboost/Create_0.gml index d0e9eba..d3a5256 100644 --- a/objects/obj_bloblehop_platformboost/Create_0.gml +++ b/objects/obj_bloblehop_platformboost/Create_0.gml @@ -1,4 +1,4 @@ image_speed = 0; image_index = 1; -xscale=5 -yscale=5 \ No newline at end of file +image_xscale=5 +image_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 d98f59e..f9694a8 100644 --- a/objects/obj_bloblehop_player/Create_0.gml +++ b/objects/obj_bloblehop_player/Create_0.gml @@ -1,3 +1,5 @@ +image_xscale = 5; +image_yscale = 5; grav= 1 movespeed = .8 diff --git a/objects/obj_bloblehop_player/Step_0.gml b/objects/obj_bloblehop_player/Step_0.gml index 0ab3781..ed72cff 100644 --- a/objects/obj_bloblehop_player/Step_0.gml +++ b/objects/obj_bloblehop_player/Step_0.gml @@ -34,8 +34,6 @@ y += vsp if y > (camera_get_view_y(view_camera[0]) + 1800) { - //global.stathappiness += global.minigamehappiness - //global.statenergy -= global.minigameenergy - + room_goto(rm_Gameover) } \ No newline at end of file diff --git a/objects/obj_blobleshoot_generator/Create_0.gml b/objects/obj_blobleshoot_generator/Create_0.gml index ddd6c5a..6fd9eed 100644 --- a/objects/obj_blobleshoot_generator/Create_0.gml +++ b/objects/obj_blobleshoot_generator/Create_0.gml @@ -1,10 +1,15 @@ xlim = 100000 -ylim = 5000 +ylim = 4900 + +gen_coin_limit = (xlim/4000) gen_pool_limit = 20 gen_balloon_limit = 20 -gen_trampoline_limit = (xlim / 2000) +gen_trampoline_limit = (xlim / 4000) +gen_cloud_limit = (xlim / 10000) +gen_coin = 0 gen_pool = 0 gen_balloon = 0 -gen_trampoline = 0 \ No newline at end of file +gen_trampoline = 0 +gen_cloud = 0 \ No newline at end of file diff --git a/objects/obj_blobleshoot_generator/Step_0.gml b/objects/obj_blobleshoot_generator/Step_0.gml index 4baf969..e677219 100644 --- a/objects/obj_blobleshoot_generator/Step_0.gml +++ b/objects/obj_blobleshoot_generator/Step_0.gml @@ -29,9 +29,26 @@ if gen_trampoline < gen_trampoline_limit if (place_meeting(x,y,obj_blobleshoot_trampoline)) { instance_destroy() - } } } gen_trampoline +=1 +} + + + +if gen_coin < gen_coin_limit +{ + inst = instance_create_depth((irandom_range(2000, xlim)), (irandom_range(0, ylim)), -3, obj_bloblehop_coin) + + gen_coin +=1 +} + + + +if gen_cloud < gen_cloud_limit +{ + inst = instance_create_depth((irandom_range(2000, xlim)), (irandom_range(0, ylim)), -3, obj_bloblehop_cloud) + + gen_cloud +=1 } \ No newline at end of file diff --git a/objects/obj_blobleshoot_player/Draw_64.gml b/objects/obj_blobleshoot_player/Draw_64.gml new file mode 100644 index 0000000..5aed4eb --- /dev/null +++ b/objects/obj_blobleshoot_player/Draw_64.gml @@ -0,0 +1,6 @@ +draw_set_font(fnt_sizesmall) +draw_set_halign(fa_left) + + +draw_text(50,100,"Distance " + string(round(x/100))) +draw_text(700,100,"Coins " + string(global.minigamecoin)) diff --git a/objects/obj_blobleshoot_player/Step_0.gml b/objects/obj_blobleshoot_player/Step_0.gml index 4304877..67e6813 100644 --- a/objects/obj_blobleshoot_player/Step_0.gml +++ b/objects/obj_blobleshoot_player/Step_0.gml @@ -8,7 +8,7 @@ launchspeedy = (-launchspeedy * .8) if (place_meeting(x,y+launchspeedy,obj_blobleshoot_trampoline)) || (place_meeting(x,y+launchspeedy,obj_blobleshoot_trampoline)) { -launchspeedy = (-launchspeedy * 1.2) +launchspeedy = ((-launchspeedy * 1.2) - 5) } diff --git a/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy b/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy index 57777e0..7cf01b4 100644 --- a/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy +++ b/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy @@ -23,6 +23,16 @@ "enumb": 0, "eventtype": 3, "m_owner": "01e9e370-a056-45e3-ac57-bd2cedd9a804" + }, + { + "id": "e914748a-2418-417f-929e-f6d429f13fc2", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 64, + "eventtype": 8, + "m_owner": "01e9e370-a056-45e3-ac57-bd2cedd9a804" } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", diff --git a/rooms/rm_bloblehop/rm_bloblehop.yy b/rooms/rm_bloblehop/rm_bloblehop.yy index cf91481..a30d32a 100644 --- a/rooms/rm_bloblehop/rm_bloblehop.yy +++ b/rooms/rm_bloblehop/rm_bloblehop.yy @@ -116,7 +116,7 @@ }, "mvc": "1.0", "views": [ -{"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": 450,"visible": true,"vspeed": 12,"wport": 540,"wview": 1080,"xport": 0,"xview": 0,"yport": 0,"yview": 14100}, +{"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": 475,"visible": true,"vspeed": 12,"wport": 540,"wview": 1080,"xport": 0,"xview": 0,"yport": 0,"yview": 14100}, {"id": "de4d0cc9-2037-4ef3-8e48-30c11efc36fa","hborder": 32,"hport": 960,"hspeed": -1,"hview": 1920,"inherit": false,"modelName": "GMRView","objId": "148a5ef3-ef25-44c8-98b5-dc18305bdc90","mvc": "1.0","vborder": 200,"visible": false,"vspeed": -1,"wport": 540,"wview": 1080,"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},