diff --git a/objects/obj_blobleshoot_balloon/Alarm_0.gml b/objects/obj_blobleshoot_balloon/Alarm_0.gml new file mode 100644 index 0000000..e624fe4 --- /dev/null +++ b/objects/obj_blobleshoot_balloon/Alarm_0.gml @@ -0,0 +1,2 @@ +stick = 0; +instance_destroy() \ No newline at end of file diff --git a/objects/obj_blobleshoot_balloon/Collision_9a0d71f7-80e8-4fa4-a5a4-511b3fc8c8e4.gml b/objects/obj_blobleshoot_balloon/Collision_9a0d71f7-80e8-4fa4-a5a4-511b3fc8c8e4.gml new file mode 100644 index 0000000..39217f6 --- /dev/null +++ b/objects/obj_blobleshoot_balloon/Collision_9a0d71f7-80e8-4fa4-a5a4-511b3fc8c8e4.gml @@ -0,0 +1,7 @@ +stick = 1; +if !alarm[0] +{ + alarm[0] = 120 + + +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_balloon/Create_0.gml b/objects/obj_blobleshoot_balloon/Create_0.gml index fb1ef78..dba1bac 100644 --- a/objects/obj_blobleshoot_balloon/Create_0.gml +++ b/objects/obj_blobleshoot_balloon/Create_0.gml @@ -1,2 +1,5 @@ +image_speed = 0; +image_index = (irandom_range(0,3)) image_xscale = 5; -image_yscale = 5; \ No newline at end of file +image_yscale = 5; +stick = 0; \ No newline at end of file diff --git a/objects/obj_blobleshoot_balloon/Step_0.gml b/objects/obj_blobleshoot_balloon/Step_0.gml new file mode 100644 index 0000000..dfc2980 --- /dev/null +++ b/objects/obj_blobleshoot_balloon/Step_0.gml @@ -0,0 +1,12 @@ +if stick = 1 +{ + x = (obj_blobleshoot_player.x) + y = (obj_blobleshoot_player.y - 200) + + with obj_blobleshoot_player + { + launchspeedy -= .25 + launchspeedx += .05 + + } +} \ 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 index 5f79289..7d81600 100644 --- a/objects/obj_blobleshoot_balloon/obj_blobleshoot_balloon.yy +++ b/objects/obj_blobleshoot_balloon/obj_blobleshoot_balloon.yy @@ -13,6 +13,36 @@ "enumb": 0, "eventtype": 0, "m_owner": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613" + }, + { + "id": "9a0d71f7-80e8-4fa4-a5a4-511b3fc8c8e4", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "01e9e370-a056-45e3-ac57-bd2cedd9a804", + "enumb": 0, + "eventtype": 4, + "m_owner": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613" + }, + { + "id": "8d4df4a7-92c3-4e8f-8687-f137fe870c93", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613" + }, + { + "id": "5b3216db-cc23-4a17-9fb7-4d15ff927d91", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 2, + "m_owner": "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613" } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", @@ -33,6 +63,6 @@ "physicsStartAwake": true, "properties": null, "solid": false, - "spriteId": "00000000-0000-0000-0000-000000000000", + "spriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", "visible": true } \ 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 6fd9eed..f84bd1f 100644 --- a/objects/obj_blobleshoot_generator/Create_0.gml +++ b/objects/obj_blobleshoot_generator/Create_0.gml @@ -2,9 +2,18 @@ xlim = 100000 ylim = 4900 -gen_coin_limit = (xlim/4000) +gen_coin_limit = (xlim/200) gen_pool_limit = 20 + + + gen_balloon_limit = 20 +gen_balloon_lowlim = 2000 +gen_balloon_highlim = 4000 + + + + gen_trampoline_limit = (xlim / 4000) gen_cloud_limit = (xlim / 10000) diff --git a/objects/obj_blobleshoot_generator/Step_0.gml b/objects/obj_blobleshoot_generator/Step_0.gml index e677219..b802427 100644 --- a/objects/obj_blobleshoot_generator/Step_0.gml +++ b/objects/obj_blobleshoot_generator/Step_0.gml @@ -2,11 +2,14 @@ if gen_balloon < gen_balloon_limit { - inst = instance_create_depth((irandom_range(2000, xlim)), 100, -3, obj_blobleshoot_balloon) - { - - - } + inst = instance_create_depth((irandom_range(2000, xlim)), (irandom_range(gen_balloon_lowlim, gen_balloon_highlim)), -2, obj_blobleshoot_balloon) + with inst + { + if (place_meeting(x,y,obj_blobleshoot_balloon)) + { + instance_destroy() + } + } gen_balloon +=1 } diff --git a/objects/obj_blobleshoot_player/Step_0.gml b/objects/obj_blobleshoot_player/Step_0.gml index 67e6813..a443422 100644 --- a/objects/obj_blobleshoot_player/Step_0.gml +++ b/objects/obj_blobleshoot_player/Step_0.gml @@ -9,6 +9,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) - 5) +launchspeedx = (launchspeedx * 1.1) } diff --git a/sprites/spr_blobleshoot_balloon/12025809-5af9-4449-9da7-5c10fc6b2333.png b/sprites/spr_blobleshoot_balloon/12025809-5af9-4449-9da7-5c10fc6b2333.png new file mode 100644 index 0000000..d8930f3 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/12025809-5af9-4449-9da7-5c10fc6b2333.png differ diff --git a/sprites/spr_blobleshoot_balloon/5791b07f-2017-41b2-bd25-a37944086600.png b/sprites/spr_blobleshoot_balloon/5791b07f-2017-41b2-bd25-a37944086600.png new file mode 100644 index 0000000..760f6e9 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/5791b07f-2017-41b2-bd25-a37944086600.png differ diff --git a/sprites/spr_blobleshoot_balloon/8f73374a-4351-4584-9294-233bbc439fed.png b/sprites/spr_blobleshoot_balloon/8f73374a-4351-4584-9294-233bbc439fed.png new file mode 100644 index 0000000..3a43310 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/8f73374a-4351-4584-9294-233bbc439fed.png differ diff --git a/sprites/spr_blobleshoot_balloon/a13504c4-2f10-4573-a5f1-9ba4b4e0b032.png b/sprites/spr_blobleshoot_balloon/a13504c4-2f10-4573-a5f1-9ba4b4e0b032.png deleted file mode 100644 index e3f2170..0000000 Binary files a/sprites/spr_blobleshoot_balloon/a13504c4-2f10-4573-a5f1-9ba4b4e0b032.png and /dev/null differ diff --git a/sprites/spr_blobleshoot_balloon/eb094d7c-7c46-4c2f-ac50-845aeeff25ae.png b/sprites/spr_blobleshoot_balloon/eb094d7c-7c46-4c2f-ac50-845aeeff25ae.png new file mode 100644 index 0000000..4e0fc6e Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/eb094d7c-7c46-4c2f-ac50-845aeeff25ae.png differ diff --git a/sprites/spr_blobleshoot_balloon/layers/12025809-5af9-4449-9da7-5c10fc6b2333/02622141-e140-4990-973e-863b2f30c166.png b/sprites/spr_blobleshoot_balloon/layers/12025809-5af9-4449-9da7-5c10fc6b2333/02622141-e140-4990-973e-863b2f30c166.png new file mode 100644 index 0000000..09d51c1 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/layers/12025809-5af9-4449-9da7-5c10fc6b2333/02622141-e140-4990-973e-863b2f30c166.png differ diff --git a/sprites/spr_blobleshoot_balloon/layers/5791b07f-2017-41b2-bd25-a37944086600/02622141-e140-4990-973e-863b2f30c166.png b/sprites/spr_blobleshoot_balloon/layers/5791b07f-2017-41b2-bd25-a37944086600/02622141-e140-4990-973e-863b2f30c166.png new file mode 100644 index 0000000..22ca355 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/layers/5791b07f-2017-41b2-bd25-a37944086600/02622141-e140-4990-973e-863b2f30c166.png differ diff --git a/sprites/spr_blobleshoot_balloon/layers/8f73374a-4351-4584-9294-233bbc439fed/02622141-e140-4990-973e-863b2f30c166.png b/sprites/spr_blobleshoot_balloon/layers/8f73374a-4351-4584-9294-233bbc439fed/02622141-e140-4990-973e-863b2f30c166.png new file mode 100644 index 0000000..24a66ee Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/layers/8f73374a-4351-4584-9294-233bbc439fed/02622141-e140-4990-973e-863b2f30c166.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 deleted file mode 100644 index e3f2170..0000000 Binary files a/sprites/spr_blobleshoot_balloon/layers/a13504c4-2f10-4573-a5f1-9ba4b4e0b032/ffe8397b-da8e-4ecb-b582-07da7ce293b2.png and /dev/null differ diff --git a/sprites/spr_blobleshoot_balloon/layers/eb094d7c-7c46-4c2f-ac50-845aeeff25ae/02622141-e140-4990-973e-863b2f30c166.png b/sprites/spr_blobleshoot_balloon/layers/eb094d7c-7c46-4c2f-ac50-845aeeff25ae/02622141-e140-4990-973e-863b2f30c166.png new file mode 100644 index 0000000..7ca2552 Binary files /dev/null and b/sprites/spr_blobleshoot_balloon/layers/eb094d7c-7c46-4c2f-ac50-845aeeff25ae/02622141-e140-4990-973e-863b2f30c166.png differ diff --git a/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy b/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy index a5ad335..bf2f99c 100644 --- a/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy +++ b/sprites/spr_blobleshoot_balloon/spr_blobleshoot_balloon.yy @@ -6,9 +6,9 @@ "For3D": false, "HTile": false, "VTile": false, - "bbox_bottom": 0, - "bbox_left": 0, - "bbox_right": 0, + "bbox_bottom": 63, + "bbox_left": 4, + "bbox_right": 28, "bbox_top": 0, "bboxmode": 0, "colkind": 1, @@ -16,24 +16,90 @@ "edgeFiltering": false, "frames": [ { - "id": "a13504c4-2f10-4573-a5f1-9ba4b4e0b032", + "id": "8f73374a-4351-4584-9294-233bbc439fed", "modelName": "GMSpriteFrame", "mvc": "1.0", "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", "compositeImage": { - "id": "ddafedf5-19ee-4ef2-9c2d-e8e63571b026", + "id": "9a2337df-17c7-4cc6-b25f-d09f3816370e", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a13504c4-2f10-4573-a5f1-9ba4b4e0b032", + "FrameId": "8f73374a-4351-4584-9294-233bbc439fed", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "b9ded536-4eec-4301-881b-a5f738a0924f", + "id": "16537729-e390-419a-850f-a3ded3027a94", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "a13504c4-2f10-4573-a5f1-9ba4b4e0b032", - "LayerId": "ffe8397b-da8e-4ecb-b582-07da7ce293b2" + "FrameId": "8f73374a-4351-4584-9294-233bbc439fed", + "LayerId": "02622141-e140-4990-973e-863b2f30c166" + } + ] + }, + { + "id": "eb094d7c-7c46-4c2f-ac50-845aeeff25ae", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "compositeImage": { + "id": "8eaa1ebf-8531-4764-9e8e-cb5ee1cf4d91", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "eb094d7c-7c46-4c2f-ac50-845aeeff25ae", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "b83b5b27-4643-4bec-9753-9f74f0894ef4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "eb094d7c-7c46-4c2f-ac50-845aeeff25ae", + "LayerId": "02622141-e140-4990-973e-863b2f30c166" + } + ] + }, + { + "id": "5791b07f-2017-41b2-bd25-a37944086600", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "compositeImage": { + "id": "8ceb8353-ecba-4470-9c2b-b384eac7797b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5791b07f-2017-41b2-bd25-a37944086600", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "717d572d-0f73-4576-ae98-d03527d50448", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "5791b07f-2017-41b2-bd25-a37944086600", + "LayerId": "02622141-e140-4990-973e-863b2f30c166" + } + ] + }, + { + "id": "12025809-5af9-4449-9da7-5c10fc6b2333", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "compositeImage": { + "id": "854225e1-5777-4678-a716-2e6c3972dcdc", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "12025809-5af9-4449-9da7-5c10fc6b2333", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0a41a1e5-310d-4b39-9885-de97ee7b3896", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "12025809-5af9-4449-9da7-5c10fc6b2333", + "LayerId": "02622141-e140-4990-973e-863b2f30c166" } ] } @@ -43,7 +109,7 @@ "height": 64, "layers": [ { - "id": "ffe8397b-da8e-4ecb-b582-07da7ce293b2", + "id": "02622141-e140-4990-973e-863b2f30c166", "modelName": "GMImageLayer", "mvc": "1.0", "SpriteId": "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", @@ -64,7 +130,7 @@ "swfPrecision": 2.525, "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", "type": 0, - "width": 64, + "width": 32, "xorig": 0, "yorig": 0 } \ No newline at end of file