diff --git a/Bloble.yyp b/Bloble.yyp index 4d4a555..a6f65b1 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -198,6 +198,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "165fb270-bcb0-4ebc-991f-73f37d902679", + "Value": { + "id": "1fad5dae-11ad-47cb-a671-49a96e3578cb", + "resourcePath": "objects\\obj_blobleshoot_play\\obj_blobleshoot_play.yy", + "resourceType": "GMObject" + } + }, { "Key": "18773e4a-059c-4a6d-906b-cd4ede88fee1", "Value": { @@ -390,6 +398,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613", + "Value": { + "id": "c9c831bf-a565-4fac-8202-040d1b348224", + "resourcePath": "objects\\obj_blobleshoot_balloon\\obj_blobleshoot_balloon.yy", + "resourceType": "GMObject" + } + }, { "Key": "3cd88392-6024-4e5c-840f-57fe4d7925e0", "Value": { @@ -446,6 +462,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "Value": { + "id": "b4a67512-cda0-45fa-af40-2245329014e5", + "resourcePath": "sprites\\spr_blobleshoot_balloon\\spr_blobleshoot_balloon.yy", + "resourceType": "GMSprite" + } + }, { "Key": "459fd507-8dd1-4a9a-ad84-99f965b5e2bb", "Value": { @@ -694,6 +718,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", + "Value": { + "id": "f071c5d4-9bdb-4e69-9c59-667bc2ddad28", + "resourcePath": "sprites\\spr_blobleshoot_grass\\spr_blobleshoot_grass.yy", + "resourceType": "GMSprite" + } + }, { "Key": "8a6b0b4e-a38d-45c8-be04-42d47bf2c539", "Value": { @@ -830,6 +862,14 @@ "resourceType": "GMObject" } }, + { + "Key": "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", + "Value": { + "id": "afa087bd-75df-4d7f-83f6-457e78c229e3", + "resourcePath": "sprites\\spr_blobleshoot_trampoline\\spr_blobleshoot_trampoline.yy", + "resourceType": "GMSprite" + } + }, { "Key": "a921ddd8-7b15-4577-b3c4-a81e4805c762", "Value": { @@ -854,6 +894,14 @@ "resourceType": "GMObject" } }, + { + "Key": "acb981df-54e3-400b-a20f-6db7ddd1e137", + "Value": { + "id": "76d5b5ac-7b8b-49cd-b6fd-48b0ddf4ac0d", + "resourcePath": "objects\\obj_blobleshoot_generator\\obj_blobleshoot_generator.yy", + "resourceType": "GMObject" + } + }, { "Key": "adc2e71c-d722-44c0-aa2e-31bf3e74c897", "Value": { @@ -894,6 +942,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "b04c640b-4db6-44a9-8ebb-abd28e184f44", + "Value": { + "id": "42d22f0d-022c-4bce-8fb2-50353f441b85", + "resourcePath": "sprites\\spr_blobleshoot_pool\\spr_blobleshoot_pool.yy", + "resourceType": "GMSprite" + } + }, { "Key": "b0de0c96-c280-40b4-9764-f06c71d5c832", "Value": { @@ -934,6 +990,14 @@ "resourceType": "GMRoom" } }, + { + "Key": "b5912476-edd5-4a1e-9b9f-fbc6b00ed3c7", + "Value": { + "id": "71aa78d0-2d8c-45ba-8421-d4ae06e4009a", + "resourcePath": "objects\\obj_blobleshoot_pool\\obj_blobleshoot_pool.yy", + "resourceType": "GMObject" + } + }, { "Key": "b591c284-ba70-4648-bd8f-9d6798e1488c", "Value": { @@ -950,6 +1014,14 @@ "resourceType": "GMRoom" } }, + { + "Key": "b8503791-3810-49af-b46d-772cf2566358", + "Value": { + "id": "2e7471dd-e69f-4845-b596-b346d5c2e645", + "resourcePath": "objects\\obj_blobleshoot_grass\\obj_blobleshoot_grass.yy", + "resourceType": "GMObject" + } + }, { "Key": "b95eb217-65ae-4a0d-afa7-92e5e827d112", "Value": { @@ -1222,6 +1294,14 @@ "resourceType": "GMRoom" } }, + { + "Key": "edfb5c17-344a-472b-844b-3120b065fd30", + "Value": { + "id": "f5586739-6c51-46c5-af50-bfd0582c94a2", + "resourcePath": "objects\\obj_blobleshoot_trampoline\\obj_blobleshoot_trampoline.yy", + "resourceType": "GMObject" + } + }, { "Key": "ee46e014-5001-4550-bb4f-c6f6dc79dc00", "Value": { diff --git a/objects/obj_bloblehop_player/Draw_64.gml b/objects/obj_bloblehop_player/Draw_64.gml index c26d666..c69d1f8 100644 --- a/objects/obj_bloblehop_player/Draw_64.gml +++ b/objects/obj_bloblehop_player/Draw_64.gml @@ -1,4 +1,4 @@ draw_set_font(fnt_Title) draw_set_halign(fa_left) draw_text(25,25,"Coins " + string(global.minigamecoin)) -draw_text(400,25,"Level " + string(global.minigamelevel)) +draw_text(550,25,"Level " + string(global.minigamelevel)) diff --git a/objects/obj_blobleshoot_balloon/Create_0.gml b/objects/obj_blobleshoot_balloon/Create_0.gml new file mode 100644 index 0000000..fb1ef78 --- /dev/null +++ b/objects/obj_blobleshoot_balloon/Create_0.gml @@ -0,0 +1,2 @@ +image_xscale = 5; +image_yscale = 5; \ No newline at end of file diff --git a/objects/obj_blobleshoot_balloon/obj_blobleshoot_balloon.yy b/objects/obj_blobleshoot_balloon/obj_blobleshoot_balloon.yy new file mode 100644 index 0000000..5f79289 --- /dev/null +++ b/objects/obj_blobleshoot_balloon/obj_blobleshoot_balloon.yy @@ -0,0 +1,38 @@ +{ + "id": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_balloon", + "eventList": [ + { + "id": "e9f0a4c0-e76e-4037-8c6c-351fd03f1098", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613" + } + ], + "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": "00000000-0000-0000-0000-000000000000", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_down/Create_0.gml b/objects/obj_blobleshoot_down/Create_0.gml index 5628f05..a215c0d 100644 --- a/objects/obj_blobleshoot_down/Create_0.gml +++ b/objects/obj_blobleshoot_down/Create_0.gml @@ -1,22 +1,3 @@ image_speed = 0 image_index = 0 -if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) -{ - with obj_blobleshoot_launchertube - { - - image_angle -=1 - - } -} - -if keyboard_check(vk_down) -{ - with obj_blobleshoot_launchertube - { - - image_angle -=1 - - } -} \ No newline at end of file diff --git a/objects/obj_blobleshoot_down/Step_0.gml b/objects/obj_blobleshoot_down/Step_0.gml new file mode 100644 index 0000000..943a6c7 --- /dev/null +++ b/objects/obj_blobleshoot_down/Step_0.gml @@ -0,0 +1,19 @@ +if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) +{ + with obj_blobleshoot_launchertube + { + + image_angle -=1 + + } +} + +if keyboard_check(vk_down) +{ + with obj_blobleshoot_launchertube + { + + image_angle -=1 + + } +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_down/obj_blobleshoot_down.yy b/objects/obj_blobleshoot_down/obj_blobleshoot_down.yy index 018a42a..bdb5b92 100644 --- a/objects/obj_blobleshoot_down/obj_blobleshoot_down.yy +++ b/objects/obj_blobleshoot_down/obj_blobleshoot_down.yy @@ -13,6 +13,16 @@ "enumb": 0, "eventtype": 0, "m_owner": "45393652-d094-4d3b-9865-bc3d5f651def" + }, + { + "id": "cd8bd4c9-87e6-4271-9705-0cc05afeb463", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "45393652-d094-4d3b-9865-bc3d5f651def" } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", diff --git a/objects/obj_blobleshoot_generator/Create_0.gml b/objects/obj_blobleshoot_generator/Create_0.gml new file mode 100644 index 0000000..ddd6c5a --- /dev/null +++ b/objects/obj_blobleshoot_generator/Create_0.gml @@ -0,0 +1,10 @@ +xlim = 100000 +ylim = 5000 + +gen_pool_limit = 20 +gen_balloon_limit = 20 +gen_trampoline_limit = (xlim / 2000) + +gen_pool = 0 +gen_balloon = 0 +gen_trampoline = 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 new file mode 100644 index 0000000..4baf969 --- /dev/null +++ b/objects/obj_blobleshoot_generator/Step_0.gml @@ -0,0 +1,37 @@ + + +if gen_balloon < gen_balloon_limit +{ + inst = instance_create_depth((irandom_range(2000, xlim)), 100, -3, obj_blobleshoot_balloon) + { + + + } + gen_balloon +=1 +} + +if gen_pool < gen_pool_limit +{ + inst = instance_create_depth((irandom_range(2000, xlim)), 100, -3, obj_blobleshoot_pool) + { + + + } + gen_pool +=1 +} + +if gen_trampoline < gen_trampoline_limit +{ + inst = instance_create_depth((irandom_range(2000, xlim)), 4904, -3, obj_blobleshoot_trampoline) + { + with inst + { + if (place_meeting(x,y,obj_blobleshoot_trampoline)) + { + instance_destroy() + + } + } + } + gen_trampoline +=1 +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_generator/obj_blobleshoot_generator.yy b/objects/obj_blobleshoot_generator/obj_blobleshoot_generator.yy new file mode 100644 index 0000000..d78b696 --- /dev/null +++ b/objects/obj_blobleshoot_generator/obj_blobleshoot_generator.yy @@ -0,0 +1,48 @@ +{ + "id": "acb981df-54e3-400b-a20f-6db7ddd1e137", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_generator", + "eventList": [ + { + "id": "974d9ba6-cab4-40a4-af54-72210ded6fd5", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "acb981df-54e3-400b-a20f-6db7ddd1e137" + }, + { + "id": "99bd98a5-e1ec-4847-a728-0f9fbe1dd844", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "acb981df-54e3-400b-a20f-6db7ddd1e137" + } + ], + "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": "00000000-0000-0000-0000-000000000000", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_grass/obj_blobleshoot_grass.yy b/objects/obj_blobleshoot_grass/obj_blobleshoot_grass.yy new file mode 100644 index 0000000..d5b997d --- /dev/null +++ b/objects/obj_blobleshoot_grass/obj_blobleshoot_grass.yy @@ -0,0 +1,29 @@ +{ + "id": "b8503791-3810-49af-b46d-772cf2566358", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_grass", + "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": "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_launch/Gesture_0.gml b/objects/obj_blobleshoot_launch/Gesture_0.gml index cadb44f..cfd5632 100644 --- a/objects/obj_blobleshoot_launch/Gesture_0.gml +++ b/objects/obj_blobleshoot_launch/Gesture_0.gml @@ -1,8 +1,22 @@ if launched = 0 { launched = 1 - instance_create_layer(x,y,1,obj_blobleshoot_player) - + inst = instance_create_depth(obj_blobleshoot_launchertube.x-100,obj_blobleshoot_launchertube.y-200,3,obj_blobleshoot_player) + + with inst + { + image_xscale=5 + image_yscale=5 + } + with obj_blobleshoot_down + { + instance_destroy() + } + with obj_blobleshoot_up + { + instance_destroy() + } + instance_destroy() } \ No newline at end of file diff --git a/objects/obj_blobleshoot_launch/Step_0.gml b/objects/obj_blobleshoot_launch/Step_0.gml new file mode 100644 index 0000000..541603f --- /dev/null +++ b/objects/obj_blobleshoot_launch/Step_0.gml @@ -0,0 +1,25 @@ +if keyboard_check(vk_enter) +{ +if launched = 0 +{ + launched = 1 + inst = instance_create_depth(obj_blobleshoot_launchertube.x-100,obj_blobleshoot_launchertube.y-200,3,obj_blobleshoot_player) + + with inst + { + image_xscale=5 + image_yscale=5 + } + with obj_blobleshoot_down + { + instance_destroy() + } + with obj_blobleshoot_up + { + instance_destroy() + } + + + instance_destroy() +} +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_launch/obj_blobleshoot_launch.yy b/objects/obj_blobleshoot_launch/obj_blobleshoot_launch.yy index 328ed7b..77fe819 100644 --- a/objects/obj_blobleshoot_launch/obj_blobleshoot_launch.yy +++ b/objects/obj_blobleshoot_launch/obj_blobleshoot_launch.yy @@ -23,6 +23,16 @@ "enumb": 0, "eventtype": 0, "m_owner": "56829151-9e7c-44b1-b60e-f4cf2962381c" + }, + { + "id": "39358e81-bf9d-43c3-8688-5e7ffbd028aa", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "56829151-9e7c-44b1-b60e-f4cf2962381c" } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", diff --git a/objects/obj_blobleshoot_launcher/Create_0.gml b/objects/obj_blobleshoot_launcher/Create_0.gml index 7cc784d..f149135 100644 --- a/objects/obj_blobleshoot_launcher/Create_0.gml +++ b/objects/obj_blobleshoot_launcher/Create_0.gml @@ -1 +1 @@ -inst = instance_create_layer(x,y,-1,obj_blobleshoot_launchertube) \ No newline at end of file +instance_create_depth(x+200,y+200,2,obj_blobleshoot_launchertube) \ No newline at end of file diff --git a/objects/obj_blobleshoot_launchertube/Create_0.gml b/objects/obj_blobleshoot_launchertube/Create_0.gml new file mode 100644 index 0000000..470e008 --- /dev/null +++ b/objects/obj_blobleshoot_launchertube/Create_0.gml @@ -0,0 +1,2 @@ +image_xscale = 10 +image_yscale = 10 \ No newline at end of file diff --git a/objects/obj_blobleshoot_launchertube/obj_blobleshoot_launchertube.yy b/objects/obj_blobleshoot_launchertube/obj_blobleshoot_launchertube.yy index ee6ff1c..9d7d549 100644 --- a/objects/obj_blobleshoot_launchertube/obj_blobleshoot_launchertube.yy +++ b/objects/obj_blobleshoot_launchertube/obj_blobleshoot_launchertube.yy @@ -4,7 +4,16 @@ "mvc": "1.0", "name": "obj_blobleshoot_launchertube", "eventList": [ - + { + "id": "1995ca2e-6f1d-445f-9b27-bf4c55207d2b", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "cb8c5787-d2bb-4d10-9d5d-b7d4ee612f0c" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/objects/obj_blobleshoot_play/Gesture_0.gml b/objects/obj_blobleshoot_play/Gesture_0.gml new file mode 100644 index 0000000..a10ab47 --- /dev/null +++ b/objects/obj_blobleshoot_play/Gesture_0.gml @@ -0,0 +1,7 @@ +global.roomset = rm_Blobleshoot; +instance_create_depth(1,1,-1, obj_fade) +global.minigamecoin = 0 +global.minigamehappiness = 2 +global.minigameenergy = 1 + +global.minigamelevel = 0 \ No newline at end of file diff --git a/objects/obj_blobleshoot_play/obj_blobleshoot_play.yy b/objects/obj_blobleshoot_play/obj_blobleshoot_play.yy new file mode 100644 index 0000000..fbb1674 --- /dev/null +++ b/objects/obj_blobleshoot_play/obj_blobleshoot_play.yy @@ -0,0 +1,38 @@ +{ + "id": "165fb270-bcb0-4ebc-991f-73f37d902679", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_play", + "eventList": [ + { + "id": "e807ab91-7c13-4354-b095-19a7d804e3a0", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "165fb270-bcb0-4ebc-991f-73f37d902679" + } + ], + "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_blobleshoot_player/Create_0.gml b/objects/obj_blobleshoot_player/Create_0.gml new file mode 100644 index 0000000..9a8117f --- /dev/null +++ b/objects/obj_blobleshoot_player/Create_0.gml @@ -0,0 +1,7 @@ +image_angle = (obj_blobleshoot_launchertube.image_angle) + + +launchspeed = 60; + +launchspeedx = (launchspeed * -dsin(image_angle)) +launchspeedy = (launchspeed * -dcos(image_angle)) \ No newline at end of file diff --git a/objects/obj_blobleshoot_player/Step_0.gml b/objects/obj_blobleshoot_player/Step_0.gml new file mode 100644 index 0000000..4304877 --- /dev/null +++ b/objects/obj_blobleshoot_player/Step_0.gml @@ -0,0 +1,32 @@ + +if (place_meeting(x,y-1+launchspeedy,obj_blobleshoot_grass)) || (place_meeting(x,y+1+launchspeedy,obj_blobleshoot_grass)) +{ +launchspeedx = (launchspeedx *.8) +launchspeedy = (-launchspeedy * .8) +} + + +if (place_meeting(x,y+launchspeedy,obj_blobleshoot_trampoline)) || (place_meeting(x,y+launchspeedy,obj_blobleshoot_trampoline)) +{ +launchspeedy = (-launchspeedy * 1.2) +} + + + + +if launchspeedx > 0 && launchspeedx < 1 +{ + global.roomset = rm_Gameover; +instance_create_depth(1,1,-1, obj_fade) +} + +//if launchspeedy > 0 && launchspeedy < 1 +//{ +// launchspeedy = 0 +//} + +launchspeedy = (launchspeedy + .5) + + +x += launchspeedx +y += launchspeedy \ No newline at end of file diff --git a/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy b/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy index a11180c..57777e0 100644 --- a/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy +++ b/objects/obj_blobleshoot_player/obj_blobleshoot_player.yy @@ -4,7 +4,26 @@ "mvc": "1.0", "name": "obj_blobleshoot_player", "eventList": [ - + { + "id": "ed0812dd-a42f-4776-a6be-7b1349d8e77c", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "01e9e370-a056-45e3-ac57-bd2cedd9a804" + }, + { + "id": "60922bf2-50ec-49a1-85bc-6cc5ce8f61f5", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "01e9e370-a056-45e3-ac57-bd2cedd9a804" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/objects/obj_blobleshoot_pool/Create_0.gml b/objects/obj_blobleshoot_pool/Create_0.gml new file mode 100644 index 0000000..fb1ef78 --- /dev/null +++ b/objects/obj_blobleshoot_pool/Create_0.gml @@ -0,0 +1,2 @@ +image_xscale = 5; +image_yscale = 5; \ No newline at end of file diff --git a/objects/obj_blobleshoot_pool/obj_blobleshoot_pool.yy b/objects/obj_blobleshoot_pool/obj_blobleshoot_pool.yy new file mode 100644 index 0000000..acb5144 --- /dev/null +++ b/objects/obj_blobleshoot_pool/obj_blobleshoot_pool.yy @@ -0,0 +1,38 @@ +{ + "id": "b5912476-edd5-4a1e-9b9f-fbc6b00ed3c7", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_pool", + "eventList": [ + { + "id": "064bcc72-f3a5-44bb-8b2e-51d9b9db7239", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "b5912476-edd5-4a1e-9b9f-fbc6b00ed3c7" + } + ], + "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": "00000000-0000-0000-0000-000000000000", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_trampoline/Create_0.gml b/objects/obj_blobleshoot_trampoline/Create_0.gml new file mode 100644 index 0000000..3d35298 --- /dev/null +++ b/objects/obj_blobleshoot_trampoline/Create_0.gml @@ -0,0 +1,2 @@ +image_xscale = 10; +image_yscale = 10; \ No newline at end of file diff --git a/objects/obj_blobleshoot_trampoline/obj_blobleshoot_trampoline.yy b/objects/obj_blobleshoot_trampoline/obj_blobleshoot_trampoline.yy new file mode 100644 index 0000000..618f30e --- /dev/null +++ b/objects/obj_blobleshoot_trampoline/obj_blobleshoot_trampoline.yy @@ -0,0 +1,38 @@ +{ + "id": "edfb5c17-344a-472b-844b-3120b065fd30", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_trampoline", + "eventList": [ + { + "id": "efa07c8e-cc53-43dd-b504-e98136e266da", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "edfb5c17-344a-472b-844b-3120b065fd30" + } + ], + "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": "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_up/Create_0.gml b/objects/obj_blobleshoot_up/Create_0.gml index f40e7f5..2799ffe 100644 --- a/objects/obj_blobleshoot_up/Create_0.gml +++ b/objects/obj_blobleshoot_up/Create_0.gml @@ -2,22 +2,3 @@ image_speed = 0 image_index = 1 -if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) -{ - with obj_blobleshoot_launchertube - { - - image_angle +=1 - - } -} - -if keyboard_check(vk_up) -{ - with obj_blobleshoot_launchertube - { - - image_angle +=1 - - } -} \ No newline at end of file diff --git a/objects/obj_blobleshoot_up/Step_0.gml b/objects/obj_blobleshoot_up/Step_0.gml new file mode 100644 index 0000000..1a6c97f --- /dev/null +++ b/objects/obj_blobleshoot_up/Step_0.gml @@ -0,0 +1,20 @@ +if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) +{ + with obj_blobleshoot_launchertube + { + + image_angle +=1 + + } +} + +if keyboard_check(vk_up) +{ + with obj_blobleshoot_launchertube + { + + image_angle +=1 + + } +} + diff --git a/objects/obj_blobleshoot_up/obj_blobleshoot_up.yy b/objects/obj_blobleshoot_up/obj_blobleshoot_up.yy index d77ce66..c05f20b 100644 --- a/objects/obj_blobleshoot_up/obj_blobleshoot_up.yy +++ b/objects/obj_blobleshoot_up/obj_blobleshoot_up.yy @@ -13,6 +13,16 @@ "enumb": 0, "eventtype": 0, "m_owner": "41832551-071e-4da9-9556-79d594c92528" + }, + { + "id": "6836d282-7639-44e4-918e-84e5f018dee9", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "41832551-071e-4da9-9556-79d594c92528" } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", diff --git a/objects/obj_gameover_title/Draw_64.gml b/objects/obj_gameover_title/Draw_64.gml index 29486e6..9139dc0 100644 --- a/objects/obj_gameover_title/Draw_64.gml +++ b/objects/obj_gameover_title/Draw_64.gml @@ -1,6 +1,11 @@ draw_set_font(fnt_sizesmall) draw_set_halign(fa_center) -draw_text(540,900,"You Reached Level " + string(global.minigamelevel)) + +if global.minigamelevel > 0 +{ + draw_text(540,900,"You Reached Level " + string(global.minigamelevel)) +} + draw_text(540,1000,"You Earned " + string(global.minigamecoin) + " Coins") draw_text(540,1100,"Your Bloble Gained " + string(global.minigamehappiness)+ " Happiness") draw_text(540,1200,"Your Bloble Lost " + string(global.minigameenergy)+ " Energy") \ No newline at end of file diff --git a/rooms/rm_Blobleshoot/rm_Blobleshoot.yy b/rooms/rm_Blobleshoot/rm_Blobleshoot.yy index 96c674c..b91b066 100644 --- a/rooms/rm_Blobleshoot/rm_Blobleshoot.yy +++ b/rooms/rm_Blobleshoot/rm_Blobleshoot.yy @@ -7,7 +7,13 @@ "inheritCreationOrder": false, "inheritLayers": false, "instanceCreationOrderIDs": [ - + "0aeb492d-5c3e-433e-8f8d-07d965093f65", + "5d17eb8d-0a99-4b19-9694-e0277e0e2546", + "d53998eb-36ab-4145-930f-4b8ebd160d5c", + "c4ea0d4c-8f43-4ece-b88a-82796f34d4c1", + "f330eca7-f592-4833-94e3-4b72cf744e7c", + "0b42bbd4-fa44-4e2f-9a7a-371c2fb97046", + "9bebdcda-e2da-4806-9d3a-59093f5990f7" ], "IsDnD": false, "layers": [ @@ -25,7 +31,13 @@ "inheritSubLayers": false, "inheritVisibility": false, "instances": [ - +{"name": "inst_553B107B","id": "f330eca7-f592-4833-94e3-4b72cf744e7c","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_553B107B","objId": "b8503791-3810-49af-b46d-772cf2566358","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 0,"y": 4928}, +{"name": "inst_1CE365EB","id": "0aeb492d-5c3e-433e-8f8d-07d965093f65","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_1CE365EB","objId": "aac12ae0-2a97-4c42-a4a3-6f22194ddd07","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 0,"y": 4518}, +{"name": "inst_23745EB2","id": "5d17eb8d-0a99-4b19-9694-e0277e0e2546","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_23745EB2","objId": "41832551-071e-4da9-9556-79d594c92528","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 32,"y": 3136}, +{"name": "inst_5B665668","id": "d53998eb-36ab-4145-930f-4b8ebd160d5c","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_5B665668","objId": "45393652-d094-4d3b-9865-bc3d5f651def","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 32,"y": 3424}, +{"name": "inst_348D69CD","id": "c4ea0d4c-8f43-4ece-b88a-82796f34d4c1","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_348D69CD","objId": "56829151-9e7c-44b1-b60e-f4cf2962381c","properties": null,"rotation": 0,"scaleX": 2,"scaleY": 2,"mvc": "1.1","x": 384,"y": 3392}, +{"name": "inst_3B98C5E0","id": "0b42bbd4-fa44-4e2f-9a7a-371c2fb97046","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_3B98C5E0","objId": "acb981df-54e3-400b-a20f-6db7ddd1e137","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 32,"y": 4416}, +{"name": "inst_36A8E4F9","id": "9bebdcda-e2da-4806-9d3a-59093f5990f7","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_36A8E4F9","objId": "b8503791-3810-49af-b46d-772cf2566358","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 49984,"y": 4928} ], "layers": [ @@ -43,7 +55,7 @@ "id": "50f112d9-873e-46a4-8665-592e7c11f99a", "animationFPS": 15, "animationSpeedType": "0", - "colour": { "Value": 4294967295 }, + "colour": { "Value": 4294959205 }, "depth": 100, "grid_x": 32, "grid_y": 32, @@ -92,11 +104,11 @@ "modelName": "GMRoomSettings", "persistent": false, "mvc": "1.0", - "Width": 10000 + "Width": 100000 }, "mvc": "1.0", "views": [ -{"id": "81262c9b-e759-4b32-a3fc-1dd7f9cf2cd8","hborder": 32,"hport": 1920,"hspeed": -1,"hview": 1920,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": true,"vspeed": -1,"wport": 1080,"wview": 1080,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "81262c9b-e759-4b32-a3fc-1dd7f9cf2cd8","hborder": 600,"hport": 1920,"hspeed": -1,"hview": 1920,"inherit": false,"modelName": "GMRView","objId": "01e9e370-a056-45e3-ac57-bd2cedd9a804","mvc": "1.0","vborder": 600,"visible": true,"vspeed": -1,"wport": 1080,"wview": 1080,"xport": 0,"xview": 0,"yport": 0,"yview": 3080}, {"id": "4974e3dd-2240-4e2f-a92a-684f6034df7d","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": "6cf64eda-0849-4307-9e6d-14b8fd50b931","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": "748d2741-ce2b-4a36-992c-010defc8f3c4","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/rooms/rm_Gameover/rm_Gameover.yy b/rooms/rm_Gameover/rm_Gameover.yy index dfe5150..7825ca5 100644 --- a/rooms/rm_Gameover/rm_Gameover.yy +++ b/rooms/rm_Gameover/rm_Gameover.yy @@ -45,7 +45,7 @@ "id": "822149f5-ed6d-4d9d-881e-d72282c4e42c", "animationFPS": 15, "animationSpeedType": "0", - "colour": { "Value": 4294961408 }, + "colour": { "Value": 4294959205 }, "depth": 100, "grid_x": 32, "grid_y": 32, diff --git a/rooms/rm_Player/rm_Player.yy b/rooms/rm_Player/rm_Player.yy index db83177..a2099e8 100644 --- a/rooms/rm_Player/rm_Player.yy +++ b/rooms/rm_Player/rm_Player.yy @@ -17,7 +17,8 @@ "8f37131f-578c-4c30-899e-31590ecdfa99", "ec0a0f1c-388b-4684-95de-207f7a19743d", "b7733ed9-ac7b-4fba-8e31-f45dfd1e9c2e", - "17db89b3-ffda-4607-83d9-fdfc63282072" + "17db89b3-ffda-4607-83d9-fdfc63282072", + "5b7a6137-13c3-42fb-99d6-a2c61f24290a" ], "IsDnD": false, "layers": [ @@ -45,7 +46,8 @@ {"name": "inst_7D6637A0","id": "8f37131f-578c-4c30-899e-31590ecdfa99","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_7D6637A0","objId": "b591c284-ba70-4648-bd8f-9d6798e1488c","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 32,"y": 352}, {"name": "inst_45A8D973","id": "ec0a0f1c-388b-4684-95de-207f7a19743d","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_45A8D973","objId": "1d707680-ea07-4150-b623-2483d81a1612","properties": null,"rotation": 0,"scaleX": 5,"scaleY": 5,"mvc": "1.1","x": 0,"y": 1632}, {"name": "inst_723E4FBE","id": "b7733ed9-ac7b-4fba-8e31-f45dfd1e9c2e","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_723E4FBE","objId": "a697327e-b597-427c-9535-6594b2e50c02","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 0,"y": 1120}, -{"name": "inst_144600D9","id": "17db89b3-ffda-4607-83d9-fdfc63282072","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_144600D9","objId": "96a0de7d-2eab-448e-8b4a-9bf97d3d5953","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 960,"y": 992} +{"name": "inst_144600D9","id": "17db89b3-ffda-4607-83d9-fdfc63282072","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_144600D9","objId": "96a0de7d-2eab-448e-8b4a-9bf97d3d5953","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 960,"y": 992}, +{"name": "inst_6B203E9C","id": "5b7a6137-13c3-42fb-99d6-a2c61f24290a","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_6B203E9C","objId": "165fb270-bcb0-4ebc-991f-73f37d902679","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 64,"y": 1600} ], "layers": [ diff --git a/sprites/spr_blobleshoot_balloon/a13504c4-2f10-4573-a5f1-9ba4b4e0b032.png b/sprites/spr_blobleshoot_balloon/a13504c4-2f10-4573-a5f1-9ba4b4e0b032.png new file mode 100644 index 0000000..e3f2170 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/a13504c4-2f10-4573-a5f1-9ba4b4e0b032.png differ diff --git a/sprites/spr_blobleshoot_balloon/layers/a13504c4-2f10-4573-a5f1-9ba4b4e0b032/ffe8397b-da8e-4ecb-b582-07da7ce293b2.png b/sprites/spr_blobleshoot_balloon/layers/a13504c4-2f10-4573-a5f1-9ba4b4e0b032/ffe8397b-da8e-4ecb-b582-07da7ce293b2.png new file mode 100644 index 0000000..e3f2170 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/layers/a13504c4-2f10-4573-a5f1-9ba4b4e0b032/ffe8397b-da8e-4ecb-b582-07da7ce293b2.png differ diff --git a/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy b/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy new file mode 100644 index 0000000..a5ad335 --- /dev/null +++ b/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy @@ -0,0 +1,70 @@ +{ + "id": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_blobleshoot_balloon", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "a13504c4-2f10-4573-a5f1-9ba4b4e0b032", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "compositeImage": { + "id": "ddafedf5-19ee-4ef2-9c2d-e8e63571b026", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a13504c4-2f10-4573-a5f1-9ba4b4e0b032", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "b9ded536-4eec-4301-881b-a5f738a0924f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "a13504c4-2f10-4573-a5f1-9ba4b4e0b032", + "LayerId": "ffe8397b-da8e-4ecb-b582-07da7ce293b2" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "layers": [ + { + "id": "ffe8397b-da8e-4ecb-b582-07da7ce293b2", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "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": 64, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_blobleshoot_grass/150a6c46-20a6-47b5-a4ae-fc14b6cf908c.png b/sprites/spr_blobleshoot_grass/150a6c46-20a6-47b5-a4ae-fc14b6cf908c.png new file mode 100644 index 0000000..f55ca13 Binary files /dev/null and b/sprites/spr_blobleshoot_grass/150a6c46-20a6-47b5-a4ae-fc14b6cf908c.png differ diff --git a/sprites/spr_blobleshoot_grass/layers/150a6c46-20a6-47b5-a4ae-fc14b6cf908c/644e2de5-3c56-4dbb-8947-978c52b8fac2.png b/sprites/spr_blobleshoot_grass/layers/150a6c46-20a6-47b5-a4ae-fc14b6cf908c/644e2de5-3c56-4dbb-8947-978c52b8fac2.png new file mode 100644 index 0000000..c9d33d2 Binary files /dev/null and b/sprites/spr_blobleshoot_grass/layers/150a6c46-20a6-47b5-a4ae-fc14b6cf908c/644e2de5-3c56-4dbb-8947-978c52b8fac2.png differ diff --git a/sprites/spr_blobleshoot_grass/spr_blobleshoot_grass.yy b/sprites/spr_blobleshoot_grass/spr_blobleshoot_grass.yy new file mode 100644 index 0000000..4f37fbe --- /dev/null +++ b/sprites/spr_blobleshoot_grass/spr_blobleshoot_grass.yy @@ -0,0 +1,70 @@ +{ + "id": "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_blobleshoot_grass", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 31, + "bbox_left": 0, + "bbox_right": 4999, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "150a6c46-20a6-47b5-a4ae-fc14b6cf908c", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", + "compositeImage": { + "id": "ef1c13ef-99eb-4eb5-8573-704d8823be09", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "150a6c46-20a6-47b5-a4ae-fc14b6cf908c", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "98c7cef8-31b7-4dcf-bf99-400e2c5351a5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "150a6c46-20a6-47b5-a4ae-fc14b6cf908c", + "LayerId": "644e2de5-3c56-4dbb-8947-978c52b8fac2" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 32, + "layers": [ + { + "id": "644e2de5-3c56-4dbb-8947-978c52b8fac2", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", + "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": 5000, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_blobleshoot_launchertube/spr_blobleshoot_launchertube.yy b/sprites/spr_blobleshoot_launchertube/spr_blobleshoot_launchertube.yy index 0b08fc4..61e1e38 100644 --- a/sprites/spr_blobleshoot_launchertube/spr_blobleshoot_launchertube.yy +++ b/sprites/spr_blobleshoot_launchertube/spr_blobleshoot_launchertube.yy @@ -54,7 +54,7 @@ "visible": true } ], - "origin": 0, + "origin": 9, "originLocked": false, "playbackSpeed": 15, "playbackSpeedType": 0, @@ -65,6 +65,6 @@ "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", "type": 0, "width": 20, - "xorig": 0, - "yorig": 0 + "xorig": 10, + "yorig": 58 } \ No newline at end of file diff --git a/sprites/spr_blobleshoot_pool/0c31c5fb-1797-440c-b8e3-dea92e5e43a9.png b/sprites/spr_blobleshoot_pool/0c31c5fb-1797-440c-b8e3-dea92e5e43a9.png new file mode 100644 index 0000000..e3f2170 Binary files /dev/null and b/sprites/spr_blobleshoot_pool/0c31c5fb-1797-440c-b8e3-dea92e5e43a9.png differ diff --git a/sprites/spr_blobleshoot_pool/layers/0c31c5fb-1797-440c-b8e3-dea92e5e43a9/9697ddd3-a600-4c9e-9d6c-f537de9c90c2.png b/sprites/spr_blobleshoot_pool/layers/0c31c5fb-1797-440c-b8e3-dea92e5e43a9/9697ddd3-a600-4c9e-9d6c-f537de9c90c2.png new file mode 100644 index 0000000..e3f2170 Binary files /dev/null and b/sprites/spr_blobleshoot_pool/layers/0c31c5fb-1797-440c-b8e3-dea92e5e43a9/9697ddd3-a600-4c9e-9d6c-f537de9c90c2.png differ diff --git a/sprites/spr_blobleshoot_pool/spr_blobleshoot_pool.yy b/sprites/spr_blobleshoot_pool/spr_blobleshoot_pool.yy new file mode 100644 index 0000000..2951f86 --- /dev/null +++ b/sprites/spr_blobleshoot_pool/spr_blobleshoot_pool.yy @@ -0,0 +1,70 @@ +{ + "id": "b04c640b-4db6-44a9-8ebb-abd28e184f44", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_blobleshoot_pool", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "0c31c5fb-1797-440c-b8e3-dea92e5e43a9", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "b04c640b-4db6-44a9-8ebb-abd28e184f44", + "compositeImage": { + "id": "aeb67ea9-d02f-46cd-8562-908690f6995e", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0c31c5fb-1797-440c-b8e3-dea92e5e43a9", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "4677a879-288f-4660-be0f-1b5536cafd7f", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0c31c5fb-1797-440c-b8e3-dea92e5e43a9", + "LayerId": "9697ddd3-a600-4c9e-9d6c-f537de9c90c2" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "layers": [ + { + "id": "9697ddd3-a600-4c9e-9d6c-f537de9c90c2", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "b04c640b-4db6-44a9-8ebb-abd28e184f44", + "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": 64, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_blobleshoot_trampoline/86e2a6b2-608e-4eb5-92bd-4e9670737b36.png b/sprites/spr_blobleshoot_trampoline/86e2a6b2-608e-4eb5-92bd-4e9670737b36.png new file mode 100644 index 0000000..1e6f79c Binary files /dev/null and b/sprites/spr_blobleshoot_trampoline/86e2a6b2-608e-4eb5-92bd-4e9670737b36.png differ diff --git a/sprites/spr_blobleshoot_trampoline/layers/86e2a6b2-608e-4eb5-92bd-4e9670737b36/e5bec3fc-500a-49c5-bb18-58cae86393a5.png b/sprites/spr_blobleshoot_trampoline/layers/86e2a6b2-608e-4eb5-92bd-4e9670737b36/e5bec3fc-500a-49c5-bb18-58cae86393a5.png new file mode 100644 index 0000000..a9957e1 Binary files /dev/null and b/sprites/spr_blobleshoot_trampoline/layers/86e2a6b2-608e-4eb5-92bd-4e9670737b36/e5bec3fc-500a-49c5-bb18-58cae86393a5.png differ diff --git a/sprites/spr_blobleshoot_trampoline/spr_blobleshoot_trampoline.yy b/sprites/spr_blobleshoot_trampoline/spr_blobleshoot_trampoline.yy new file mode 100644 index 0000000..078508e --- /dev/null +++ b/sprites/spr_blobleshoot_trampoline/spr_blobleshoot_trampoline.yy @@ -0,0 +1,70 @@ +{ + "id": "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_blobleshoot_trampoline", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 6, + "bbox_left": 0, + "bbox_right": 39, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "86e2a6b2-608e-4eb5-92bd-4e9670737b36", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", + "compositeImage": { + "id": "092acbc0-cd0e-4682-aa8a-83e2a9fc51df", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "86e2a6b2-608e-4eb5-92bd-4e9670737b36", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0dec4a99-47c3-4f3d-acbe-d36aae280ead", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "86e2a6b2-608e-4eb5-92bd-4e9670737b36", + "LayerId": "e5bec3fc-500a-49c5-bb18-58cae86393a5" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 7, + "layers": [ + { + "id": "e5bec3fc-500a-49c5-bb18-58cae86393a5", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 6, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 40, + "xorig": 0, + "yorig": 6 +} \ 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 fb6cc91..beb72fc 100644 --- a/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy +++ b/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy @@ -47,7 +47,11 @@ "52a734c4-a365-4f1b-b009-1ee33664b6d8", "10bc5507-197c-4751-91d5-01423ae82ce2", "0fc4dd10-f8e8-4dd7-99e4-b5c2464502a6", - "6c3bc499-570c-4025-9c3b-f75a51f4874b" + "6c3bc499-570c-4025-9c3b-f75a51f4874b", + "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", + "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", + "b04c640b-4db6-44a9-8ebb-abd28e184f44", + "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68" ], "filterType": "GMSprite", "folderName": "sprites", diff --git a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index eb85436..a7e587d 100644 --- a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -35,7 +35,13 @@ "41832551-071e-4da9-9556-79d594c92528", "45393652-d094-4d3b-9865-bc3d5f651def", "56829151-9e7c-44b1-b60e-f4cf2962381c", - "01e9e370-a056-45e3-ac57-bd2cedd9a804" + "01e9e370-a056-45e3-ac57-bd2cedd9a804", + "b8503791-3810-49af-b46d-772cf2566358", + "165fb270-bcb0-4ebc-991f-73f37d902679", + "edfb5c17-344a-472b-844b-3120b065fd30", + "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613", + "b5912476-edd5-4a1e-9b9f-fbc6b00ed3c7", + "acb981df-54e3-400b-a20f-6db7ddd1e137" ], "filterType": "GMObject", "folderName": "objects", diff --git a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy index 671ea2c..747e0e2 100644 --- a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy +++ b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy @@ -10,13 +10,13 @@ "96c3096d-469f-400d-afbe-272414346072", "b5752279-c416-4f7b-b59f-80ebef7c0983", "adc2e71c-d722-44c0-aa2e-31bf3e74c897", + "b2626494-bc1e-42af-a7c9-ffa7497eaa64", "ea9b4683-0d5a-41f7-b0d3-479636b3507e", "dd30ee2a-7fad-4905-9a51-999207f4804a", "b678606e-2787-4353-b3b1-3bbe71a6aaf3", "00ff2b8a-65e1-412b-b046-f6aff462dd90", "c7865271-2823-4ff2-8aab-5303a189c38f", - "d81ba1dc-478e-4772-9503-ee6dcfde9825", - "b2626494-bc1e-42af-a7c9-ffa7497eaa64" + "d81ba1dc-478e-4772-9503-ee6dcfde9825" ], "filterType": "GMRoom", "folderName": "rooms",