From 8bd86a28b19017d83f30ce731423962a3a060f1d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 Jul 2019 21:20:59 -0600 Subject: [PATCH] blobleshoot powerbar added, difficulty fixed powerbar adds chalange to the blobleshoot game, difficulty bug fixed lol --- Bloble.yyp | 32 ++++++++ objects/obj_SelectBlue/Gesture_0.gml | 1 + objects/obj_SelectGreen/Gesture_0.gml | 1 + objects/obj_SelectOrange/Gesture_0.gml | 1 + objects/obj_SelectPink/Gesture_0.gml | 1 + objects/obj_SelectRainbow/Gesture_0.gml | 1 + objects/obj_SelectRed/Gesture_0.gml | 2 +- objects/obj_SelectYellow/Gesture_0.gml | 1 + objects/obj_bloblehop_generator/Step_0.gml | 45 +++++------ objects/obj_blobleshoot_balloon/Step_0.gml | 4 +- objects/obj_blobleshoot_down/Step_0.gml | 6 +- .../obj_blobleshoot_generator/Create_0.gml | 2 +- objects/obj_blobleshoot_generator/Step_0.gml | 2 +- objects/obj_blobleshoot_launch/Create_0.gml | 2 +- objects/obj_blobleshoot_launch/Gesture_0.gml | 18 ++--- objects/obj_blobleshoot_launch/Step_0.gml | 20 ++--- .../obj_blobleshoot_launchertube/Create_0.gml | 3 +- objects/obj_blobleshoot_player/Create_0.gml | 10 +-- objects/obj_blobleshoot_player/Step_0.gml | 23 +++--- objects/obj_blobleshoot_powerbar/Create_0.gml | 1 + .../obj_blobleshoot_powerbar.yy | 38 ++++++++++ .../Create_0.gml | 5 ++ .../obj_blobleshoot_powerbarpoint/Step_0.gml | 24 ++++++ .../obj_blobleshoot_powerbarpoint.yy | 48 ++++++++++++ objects/obj_blobleshoot_up/Step_0.gml | 6 +- objects/obj_difficulty_expert/Gesture_0.gml | 2 +- rooms/rm_Blobleshoot/rm_Blobleshoot.yy | 12 +-- .../fc3e5b55-e027-44ac-a167-c27547488219.png | Bin 0 -> 257 bytes .../fcd516be-163a-4254-aaa7-e3f674b5a8cb.png | Bin 0 -> 251 bytes .../spr_blobleshoot_powerbar.yy | 70 ++++++++++++++++++ .../13863f02-33fa-448c-becd-ac58b1d8a7f7.png | Bin 0 -> 79 bytes .../28a81451-d518-4f63-992e-6b9ee2c8c3b7.png | Bin 0 -> 79 bytes .../spr_blobleshoot_powerbarpoint.yy | 70 ++++++++++++++++++ views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy | 4 +- views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy | 4 +- 35 files changed, 379 insertions(+), 80 deletions(-) create mode 100644 objects/obj_blobleshoot_powerbar/Create_0.gml create mode 100644 objects/obj_blobleshoot_powerbar/obj_blobleshoot_powerbar.yy create mode 100644 objects/obj_blobleshoot_powerbarpoint/Create_0.gml create mode 100644 objects/obj_blobleshoot_powerbarpoint/Step_0.gml create mode 100644 objects/obj_blobleshoot_powerbarpoint/obj_blobleshoot_powerbarpoint.yy create mode 100644 sprites/spr_blobleshoot_powerbar/fc3e5b55-e027-44ac-a167-c27547488219.png create mode 100644 sprites/spr_blobleshoot_powerbar/layers/fc3e5b55-e027-44ac-a167-c27547488219/fcd516be-163a-4254-aaa7-e3f674b5a8cb.png create mode 100644 sprites/spr_blobleshoot_powerbar/spr_blobleshoot_powerbar.yy create mode 100644 sprites/spr_blobleshoot_powerbarpoint/13863f02-33fa-448c-becd-ac58b1d8a7f7.png create mode 100644 sprites/spr_blobleshoot_powerbarpoint/layers/13863f02-33fa-448c-becd-ac58b1d8a7f7/28a81451-d518-4f63-992e-6b9ee2c8c3b7.png create mode 100644 sprites/spr_blobleshoot_powerbarpoint/spr_blobleshoot_powerbarpoint.yy diff --git a/Bloble.yyp b/Bloble.yyp index a6f65b1..fe4b448 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -590,6 +590,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "63e337b4-f6ce-48e3-b4d3-c812cd8f296f", + "Value": { + "id": "c29bdac9-45ac-4083-bc6c-c00d7b65fe38", + "resourcePath": "objects\\obj_blobleshoot_powerbar\\obj_blobleshoot_powerbar.yy", + "resourceType": "GMObject" + } + }, { "Key": "63e45c47-2871-43a6-96da-06a9d230718b", "Value": { @@ -1150,6 +1158,22 @@ "resourceType": "GMWindowsOptions" } }, + { + "Key": "d10d1d38-fd16-4dd4-8a53-691a6c358088", + "Value": { + "id": "30743e5b-1cd0-4083-93e6-6d28976b1920", + "resourcePath": "objects\\obj_blobleshoot_powerbarpoint\\obj_blobleshoot_powerbarpoint.yy", + "resourceType": "GMObject" + } + }, + { + "Key": "d705e0bc-76e1-4943-92d6-a742e00b6852", + "Value": { + "id": "3f0934e3-4d90-4b2b-8933-837577924423", + "resourcePath": "sprites\\spr_blobleshoot_powerbar\\spr_blobleshoot_powerbar.yy", + "resourceType": "GMSprite" + } + }, { "Key": "d715bace-a603-48a9-8d69-b9b3f6ee3029", "Value": { @@ -1158,6 +1182,14 @@ "resourceType": "GMObject" } }, + { + "Key": "d79bcdc4-899f-45d5-8324-d07e1cfabdcb", + "Value": { + "id": "0e28ee94-ff8f-4929-9fa1-acb3d22bddad", + "resourcePath": "sprites\\spr_blobleshoot_powerbarpoint\\spr_blobleshoot_powerbarpoint.yy", + "resourceType": "GMSprite" + } + }, { "Key": "d81ba1dc-478e-4772-9503-ee6dcfde9825", "Value": { diff --git a/objects/obj_SelectBlue/Gesture_0.gml b/objects/obj_SelectBlue/Gesture_0.gml index 62afb40..4cfc0d5 100644 --- a/objects/obj_SelectBlue/Gesture_0.gml +++ b/objects/obj_SelectBlue/Gesture_0.gml @@ -1,4 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobBlue) object_set_sprite(obj_Player, spr_BlobBlue) +object_set_sprite(obj_blobleshoot_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 d0ea9dc..c5fe60c 100644 --- a/objects/obj_SelectGreen/Gesture_0.gml +++ b/objects/obj_SelectGreen/Gesture_0.gml @@ -1,4 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobGreen) object_set_sprite(obj_Player, spr_BlobGreen) +object_set_sprite(obj_blobleshoot_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_SelectOrange/Gesture_0.gml b/objects/obj_SelectOrange/Gesture_0.gml index e334011..387fb42 100644 --- a/objects/obj_SelectOrange/Gesture_0.gml +++ b/objects/obj_SelectOrange/Gesture_0.gml @@ -1,4 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobOrange) object_set_sprite(obj_Player, spr_BlobOrange) +object_set_sprite(obj_blobleshoot_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 3df35cc..6d259b9 100644 --- a/objects/obj_SelectPink/Gesture_0.gml +++ b/objects/obj_SelectPink/Gesture_0.gml @@ -1,4 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobPink) object_set_sprite(obj_Player, spr_BlobPink) +object_set_sprite(obj_blobleshoot_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 3910555..e201c31 100644 --- a/objects/obj_SelectRainbow/Gesture_0.gml +++ b/objects/obj_SelectRainbow/Gesture_0.gml @@ -1,4 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobRainbow) object_set_sprite(obj_Player, spr_BlobRainbow) +object_set_sprite(obj_blobleshoot_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 8dd5b65..260f5ff 100644 --- a/objects/obj_SelectRed/Gesture_0.gml +++ b/objects/obj_SelectRed/Gesture_0.gml @@ -1,5 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobRed) object_set_sprite(obj_Player, spr_BlobRed) - +object_set_sprite(obj_blobleshoot_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 b8cadb0..92c145a 100644 --- a/objects/obj_SelectYellow/Gesture_0.gml +++ b/objects/obj_SelectYellow/Gesture_0.gml @@ -1,4 +1,5 @@ object_set_sprite(obj_bloblehop_player, spr_BlobYellow) object_set_sprite(obj_Player, spr_BlobYellow) +object_set_sprite(obj_blobleshoot_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/Step_0.gml b/objects/obj_bloblehop_generator/Step_0.gml index 96b9885..d2f3114 100644 --- a/objects/obj_bloblehop_generator/Step_0.gml +++ b/objects/obj_bloblehop_generator/Step_0.gml @@ -5,27 +5,6 @@ if coingen < coingenlim 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 -} - @@ -54,4 +33,28 @@ else instance_destroy() } +if cloudgen < cloudgenlim +{ + inst =instance_create_depth((irandom_range(xlim, xlimh)), irandom_range(0,16000), -1, 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 +} + + + + global.ystep += 1 \ No newline at end of file diff --git a/objects/obj_blobleshoot_balloon/Step_0.gml b/objects/obj_blobleshoot_balloon/Step_0.gml index dfc2980..d791688 100644 --- a/objects/obj_blobleshoot_balloon/Step_0.gml +++ b/objects/obj_blobleshoot_balloon/Step_0.gml @@ -1,12 +1,12 @@ if stick = 1 { - x = (obj_blobleshoot_player.x) + x = (obj_blobleshoot_player.x-100) y = (obj_blobleshoot_player.y - 200) with obj_blobleshoot_player { launchspeedy -= .25 - launchspeedx += .05 + launchspeedx += .075 } } \ No newline at end of file diff --git a/objects/obj_blobleshoot_down/Step_0.gml b/objects/obj_blobleshoot_down/Step_0.gml index 943a6c7..5396cd2 100644 --- a/objects/obj_blobleshoot_down/Step_0.gml +++ b/objects/obj_blobleshoot_down/Step_0.gml @@ -4,7 +4,8 @@ if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) { image_angle -=1 - + if image_angle >= 360 {image_angle = 360} + if image_angle <= 270 {image_angle = 270} } } @@ -14,6 +15,7 @@ if keyboard_check(vk_down) { image_angle -=1 - + if image_angle >= 360 {image_angle = 360} + if image_angle <= 270 {image_angle = 270} } } \ 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 f84bd1f..8f542ae 100644 --- a/objects/obj_blobleshoot_generator/Create_0.gml +++ b/objects/obj_blobleshoot_generator/Create_0.gml @@ -2,7 +2,7 @@ xlim = 100000 ylim = 4900 -gen_coin_limit = (xlim/200) +gen_coin_limit = (xlim/100) gen_pool_limit = 20 diff --git a/objects/obj_blobleshoot_generator/Step_0.gml b/objects/obj_blobleshoot_generator/Step_0.gml index b802427..8ed745c 100644 --- a/objects/obj_blobleshoot_generator/Step_0.gml +++ b/objects/obj_blobleshoot_generator/Step_0.gml @@ -42,7 +42,7 @@ if gen_trampoline < gen_trampoline_limit if gen_coin < gen_coin_limit { - inst = instance_create_depth((irandom_range(2000, xlim)), (irandom_range(0, ylim)), -3, obj_bloblehop_coin) + inst = instance_create_depth((irandom_range(2000, xlim)), (irandom_range(-2000, ylim)), -3, obj_bloblehop_coin) gen_coin +=1 } diff --git a/objects/obj_blobleshoot_launch/Create_0.gml b/objects/obj_blobleshoot_launch/Create_0.gml index 85b6ef6..2d08955 100644 --- a/objects/obj_blobleshoot_launch/Create_0.gml +++ b/objects/obj_blobleshoot_launch/Create_0.gml @@ -1 +1 @@ -launched = 0 \ No newline at end of file +global.blobleshootlaunched = 0 \ 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 cfd5632..96c72e7 100644 --- a/objects/obj_blobleshoot_launch/Gesture_0.gml +++ b/objects/obj_blobleshoot_launch/Gesture_0.gml @@ -1,6 +1,6 @@ -if launched = 0 +if global.blobleshootlaunched = 0 { - launched = 1 + global.blobleshootlaunched = 1 inst = instance_create_depth(obj_blobleshoot_launchertube.x-100,obj_blobleshoot_launchertube.y-200,3,obj_blobleshoot_player) with inst @@ -8,15 +8,9 @@ if launched = 0 image_xscale=5 image_yscale=5 } - with obj_blobleshoot_down - { - instance_destroy() - } - with obj_blobleshoot_up - { - instance_destroy() - } - - + instance_destroy(obj_blobleshoot_down) + instance_destroy(obj_blobleshoot_up) + instance_destroy(obj_blobleshoot_powerbar) + instance_destroy(obj_blobleshoot_powerbarpoint) 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 index 541603f..b26adab 100644 --- a/objects/obj_blobleshoot_launch/Step_0.gml +++ b/objects/obj_blobleshoot_launch/Step_0.gml @@ -1,25 +1,19 @@ if keyboard_check(vk_enter) { -if launched = 0 +if global.blobleshootlaunched = 0 { - launched = 1 - inst = instance_create_depth(obj_blobleshoot_launchertube.x-100,obj_blobleshoot_launchertube.y-200,3,obj_blobleshoot_player) + global.blobleshootlaunched = 1 + inst = instance_create_depth(obj_blobleshoot_launchertube.x-25,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(obj_blobleshoot_down) + instance_destroy(obj_blobleshoot_up) + instance_destroy(obj_blobleshoot_powerbar) + instance_destroy(obj_blobleshoot_powerbarpoint) instance_destroy() } } \ No newline at end of file diff --git a/objects/obj_blobleshoot_launchertube/Create_0.gml b/objects/obj_blobleshoot_launchertube/Create_0.gml index 470e008..e8d929a 100644 --- a/objects/obj_blobleshoot_launchertube/Create_0.gml +++ b/objects/obj_blobleshoot_launchertube/Create_0.gml @@ -1,2 +1,3 @@ image_xscale = 10 -image_yscale = 10 \ No newline at end of file +image_yscale = 10 +image_angle = 270 \ No newline at end of file diff --git a/objects/obj_blobleshoot_player/Create_0.gml b/objects/obj_blobleshoot_player/Create_0.gml index 9a8117f..052e233 100644 --- a/objects/obj_blobleshoot_player/Create_0.gml +++ b/objects/obj_blobleshoot_player/Create_0.gml @@ -1,7 +1,7 @@ + +//change angle of bloble to the angle of the launch tube 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 +//sets the initial speed of the bloble in the x and y axis +launchspeedx = (global.blobleshootlaunchspeed * -dsin(image_angle)) +launchspeedy = (global.blobleshootlaunchspeed * -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 index a443422..8b4f384 100644 --- a/objects/obj_blobleshoot_player/Step_0.gml +++ b/objects/obj_blobleshoot_player/Step_0.gml @@ -1,33 +1,36 @@ +//checks collision with the grass and changes speeds if (place_meeting(x,y-1+launchspeedy,obj_blobleshoot_grass)) || (place_meeting(x,y+1+launchspeedy,obj_blobleshoot_grass)) { -launchspeedx = (launchspeedx *.8) +launchspeedx = (launchspeedx *.9) launchspeedy = (-launchspeedy * .8) } - -if (place_meeting(x,y+launchspeedy,obj_blobleshoot_trampoline)) || (place_meeting(x,y+launchspeedy,obj_blobleshoot_trampoline)) +//checks collision with the trampoline and changes speeds +if (place_meeting(x,y-1+launchspeedy,obj_blobleshoot_trampoline)) || (place_meeting(x,y+1+launchspeedy,obj_blobleshoot_trampoline)) { launchspeedy = ((-launchspeedy * 1.2) - 5) -launchspeedx = (launchspeedx * 1.1) +//launchspeedx = (launchspeedx * 1.05) } - +//checks if the bloble has stopped moving and will end the game if launchspeedx > 0 && launchspeedx < 1 { global.roomset = rm_Gameover; instance_create_depth(1,1,-1, obj_fade) } -//if launchspeedy > 0 && launchspeedy < 1 -//{ -// launchspeedy = 0 -//} - +//Gravity! launchspeedy = (launchspeedy + .5) +//speed limit +if launchspeedx > 100 +{ + launchspeedx = 100 +} + x += launchspeedx y += launchspeedy \ No newline at end of file diff --git a/objects/obj_blobleshoot_powerbar/Create_0.gml b/objects/obj_blobleshoot_powerbar/Create_0.gml new file mode 100644 index 0000000..e626f51 --- /dev/null +++ b/objects/obj_blobleshoot_powerbar/Create_0.gml @@ -0,0 +1 @@ +instance_create_depth(x,y,-4,obj_blobleshoot_powerbarpoint) \ No newline at end of file diff --git a/objects/obj_blobleshoot_powerbar/obj_blobleshoot_powerbar.yy b/objects/obj_blobleshoot_powerbar/obj_blobleshoot_powerbar.yy new file mode 100644 index 0000000..90a34c4 --- /dev/null +++ b/objects/obj_blobleshoot_powerbar/obj_blobleshoot_powerbar.yy @@ -0,0 +1,38 @@ +{ + "id": "63e337b4-f6ce-48e3-b4d3-c812cd8f296f", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_powerbar", + "eventList": [ + { + "id": "54fd7658-2841-4041-9e66-5e40eb33af3d", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "63e337b4-f6ce-48e3-b4d3-c812cd8f296f" + } + ], + "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": "d705e0bc-76e1-4943-92d6-a742e00b6852", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_powerbarpoint/Create_0.gml b/objects/obj_blobleshoot_powerbarpoint/Create_0.gml new file mode 100644 index 0000000..260d764 --- /dev/null +++ b/objects/obj_blobleshoot_powerbarpoint/Create_0.gml @@ -0,0 +1,5 @@ +image_xscale = 10 +image_yscale = 10 +powerbar = 0 +dir = 1 +y = obj_blobleshoot_powerbar.y - (1*image_yscale) \ No newline at end of file diff --git a/objects/obj_blobleshoot_powerbarpoint/Step_0.gml b/objects/obj_blobleshoot_powerbarpoint/Step_0.gml new file mode 100644 index 0000000..1edd9b2 --- /dev/null +++ b/objects/obj_blobleshoot_powerbarpoint/Step_0.gml @@ -0,0 +1,24 @@ +if dir = 1 +{ + powerbar += 3 +} + +if dir = -1 +{ + powerbar += -3 +} + +if powerbar >= 96 +{ + dir = (dir * -1) +} + +if powerbar <= 0 +{ + dir = (dir * -1) +} + +x = (obj_blobleshoot_powerbar.x + (powerbar * image_xscale)) + +global.blobleshootlaunchspeed = (powerbar * .85) + diff --git a/objects/obj_blobleshoot_powerbarpoint/obj_blobleshoot_powerbarpoint.yy b/objects/obj_blobleshoot_powerbarpoint/obj_blobleshoot_powerbarpoint.yy new file mode 100644 index 0000000..9669abf --- /dev/null +++ b/objects/obj_blobleshoot_powerbarpoint/obj_blobleshoot_powerbarpoint.yy @@ -0,0 +1,48 @@ +{ + "id": "d10d1d38-fd16-4dd4-8a53-691a6c358088", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_blobleshoot_powerbarpoint", + "eventList": [ + { + "id": "9472be67-de68-4140-bf3b-ca4343b231ab", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "d10d1d38-fd16-4dd4-8a53-691a6c358088" + }, + { + "id": "9021bd54-647b-4552-bee6-da32e4f56314", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 3, + "m_owner": "d10d1d38-fd16-4dd4-8a53-691a6c358088" + } + ], + "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": "d79bcdc4-899f-45d5-8324-d07e1cfabdcb", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_blobleshoot_up/Step_0.gml b/objects/obj_blobleshoot_up/Step_0.gml index 1a6c97f..21ea737 100644 --- a/objects/obj_blobleshoot_up/Step_0.gml +++ b/objects/obj_blobleshoot_up/Step_0.gml @@ -4,7 +4,8 @@ if mouse_check_button(mb_left) && position_meeting(mouse_x, mouse_y, id) { image_angle +=1 - + if image_angle >= 360 {image_angle = 360} + if image_angle <= 270 {image_angle = 270} } } @@ -14,7 +15,8 @@ if keyboard_check(vk_up) { image_angle +=1 - + if image_angle >= 360 {image_angle = 360} + if image_angle <= 270 {image_angle = 270} } } diff --git a/objects/obj_difficulty_expert/Gesture_0.gml b/objects/obj_difficulty_expert/Gesture_0.gml index 691d082..930caa1 100644 --- a/objects/obj_difficulty_expert/Gesture_0.gml +++ b/objects/obj_difficulty_expert/Gesture_0.gml @@ -1,4 +1,4 @@ -sglobal.difficulty = 2 +global.difficulty = 2 global.statenergy = 7 global.stathunger = 7 diff --git a/rooms/rm_Blobleshoot/rm_Blobleshoot.yy b/rooms/rm_Blobleshoot/rm_Blobleshoot.yy index b91b066..4914943 100644 --- a/rooms/rm_Blobleshoot/rm_Blobleshoot.yy +++ b/rooms/rm_Blobleshoot/rm_Blobleshoot.yy @@ -13,7 +13,8 @@ "c4ea0d4c-8f43-4ece-b88a-82796f34d4c1", "f330eca7-f592-4833-94e3-4b72cf744e7c", "0b42bbd4-fa44-4e2f-9a7a-371c2fb97046", - "9bebdcda-e2da-4806-9d3a-59093f5990f7" + "9bebdcda-e2da-4806-9d3a-59093f5990f7", + "70fa7e59-94b4-42a5-a352-8648a7aad948" ], "IsDnD": false, "layers": [ @@ -33,11 +34,12 @@ "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_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": 768,"y": 3520}, +{"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": 96,"y": 3520}, +{"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": 256,"y": 3520}, {"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} +{"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}, +{"name": "inst_27E1FFE6","id": "70fa7e59-94b4-42a5-a352-8648a7aad948","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_27E1FFE6","objId": "63e337b4-f6ce-48e3-b4d3-c812cd8f296f","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 32,"y": 3136} ], "layers": [ diff --git a/sprites/spr_blobleshoot_powerbar/fc3e5b55-e027-44ac-a167-c27547488219.png b/sprites/spr_blobleshoot_powerbar/fc3e5b55-e027-44ac-a167-c27547488219.png new file mode 100644 index 0000000000000000000000000000000000000000..35ce8e330f22a9d5e327d9f43e52628648d868a3 GIT binary patch literal 257 zcmV+c0sj7pP)nIBlMW;*L?-UDKj=%0l}Ld+AYdSeK;Qu9z$AraYzKM-{}3n# zn>fDdX}s16WweP)IrIE!oxS|!w)Xp1?o&PgJL5mvzxaI_riFm15K?0Y;Qlx#gazv@ zobFLd5JEs#FGF@KPMlvK%9}{HEI@I>j;a5$BEo*pOG0Xhu+RCbkQySaP7s2CH-d1= zVy0zbDvllJ6@pIpqz8T}E#i;7f$SbK71(p%@Em1jxv4(@$vd1tP&fsa00000NkvXX Hu0mjfw@+x- literal 0 HcmV?d00001 diff --git a/sprites/spr_blobleshoot_powerbar/layers/fc3e5b55-e027-44ac-a167-c27547488219/fcd516be-163a-4254-aaa7-e3f674b5a8cb.png b/sprites/spr_blobleshoot_powerbar/layers/fc3e5b55-e027-44ac-a167-c27547488219/fcd516be-163a-4254-aaa7-e3f674b5a8cb.png new file mode 100644 index 0000000000000000000000000000000000000000..9f638225cbe33c31e213f74d2224f03aa27cf97e GIT binary patch literal 251 zcmV+3UZ4ul@1W$JFlsljnbRe6h^$UZkMNuMpT91FB%~boFyt=akR{0KOX((f|Me literal 0 HcmV?d00001 diff --git a/sprites/spr_blobleshoot_powerbarpoint/layers/13863f02-33fa-448c-becd-ac58b1d8a7f7/28a81451-d518-4f63-992e-6b9ee2c8c3b7.png b/sprites/spr_blobleshoot_powerbarpoint/layers/13863f02-33fa-448c-becd-ac58b1d8a7f7/28a81451-d518-4f63-992e-6b9ee2c8c3b7.png new file mode 100644 index 0000000000000000000000000000000000000000..7e347edafdd3afaaeed1f1d0196bac318c3b558b GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^EFd-q8<6b#cYYg?67zI%45^rtoS2aC<9q{4gv5md c0%8md9}O5y>MpT91FB%~boFyt=akR{0KOX((f|Me literal 0 HcmV?d00001 diff --git a/sprites/spr_blobleshoot_powerbarpoint/spr_blobleshoot_powerbarpoint.yy b/sprites/spr_blobleshoot_powerbarpoint/spr_blobleshoot_powerbarpoint.yy new file mode 100644 index 0000000..e86d29d --- /dev/null +++ b/sprites/spr_blobleshoot_powerbarpoint/spr_blobleshoot_powerbarpoint.yy @@ -0,0 +1,70 @@ +{ + "id": "d79bcdc4-899f-45d5-8324-d07e1cfabdcb", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_blobleshoot_powerbarpoint", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 12, + "bbox_left": 0, + "bbox_right": 3, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "13863f02-33fa-448c-becd-ac58b1d8a7f7", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "d79bcdc4-899f-45d5-8324-d07e1cfabdcb", + "compositeImage": { + "id": "72adbbc9-ad49-4470-9bf2-9f428bd322d4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "13863f02-33fa-448c-becd-ac58b1d8a7f7", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "44953811-0191-452c-bf65-e26b2360f32c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "13863f02-33fa-448c-becd-ac58b1d8a7f7", + "LayerId": "28a81451-d518-4f63-992e-6b9ee2c8c3b7" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 13, + "layers": [ + { + "id": "28a81451-d518-4f63-992e-6b9ee2c8c3b7", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "d79bcdc4-899f-45d5-8324-d07e1cfabdcb", + "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": 4, + "xorig": 0, + "yorig": 0 +} \ 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 beb72fc..7b580e4 100644 --- a/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy +++ b/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy @@ -51,7 +51,9 @@ "89979744-ce9e-4a88-9cc4-deb8d76dd5ac", "a6c4b4ad-6424-4e67-9064-e340e39cf9d8", "b04c640b-4db6-44a9-8ebb-abd28e184f44", - "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68" + "458d7dfd-8492-4d29-96ef-d2a4d5d3fc68", + "d705e0bc-76e1-4943-92d6-a742e00b6852", + "d79bcdc4-899f-45d5-8324-d07e1cfabdcb" ], "filterType": "GMSprite", "folderName": "sprites", diff --git a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index a7e587d..37e60b8 100644 --- a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -41,7 +41,9 @@ "edfb5c17-344a-472b-844b-3120b065fd30", "3ccf6ec1-36d6-4ff1-9d21-4965ef1fa613", "b5912476-edd5-4a1e-9b9f-fbc6b00ed3c7", - "acb981df-54e3-400b-a20f-6db7ddd1e137" + "acb981df-54e3-400b-a20f-6db7ddd1e137", + "63e337b4-f6ce-48e3-b4d3-c812cd8f296f", + "d10d1d38-fd16-4dd4-8a53-691a6c358088" ], "filterType": "GMObject", "folderName": "objects",