diff --git a/Bloble.yyp b/Bloble.yyp index fd1cecf..0892689 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -54,6 +54,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "0471d9c5-2ff5-4772-b6b3-9a1c529e91e4", + "Value": { + "id": "6f2fb4d9-2513-4c38-b3d6-5d09848c299a", + "resourcePath": "sounds\\sound_gameover\\sound_gameover.yy", + "resourceType": "GMSound" + } + }, { "Key": "05d20e71-992a-46a3-beac-15c2c8240e3d", "Value": { @@ -62,6 +70,14 @@ "resourceType": "GMObject" } }, + { + "Key": "07851d98-73c1-485a-86c9-0503adac634c", + "Value": { + "id": "1a0c160c-9866-4595-ac08-83051a5f9833", + "resourcePath": "sounds\\sound_song1\\sound_song1.yy", + "resourceType": "GMSound" + } + }, { "Key": "0a863007-6c98-45cf-a3c1-f1e7f0bd895f", "Value": { @@ -334,6 +350,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "2eaa48dc-d3b5-41a3-b68f-44ab5cd09786", + "Value": { + "id": "c3d82bf8-6fe8-419a-b615-f92440b3ec01", + "resourcePath": "sounds\\sound_song2\\sound_song2.yy", + "resourceType": "GMSound" + } + }, { "Key": "308073ec-a9a4-48ff-8fb6-62099f7db756", "Value": { @@ -374,6 +398,14 @@ "resourceType": "GMObject" } }, + { + "Key": "359956e4-ddbc-4158-a721-1200e575e524", + "Value": { + "id": "7b356762-eb4a-4fec-ae86-b8779184ce81", + "resourcePath": "sounds\\sound_song3\\sound_song3.yy", + "resourceType": "GMSound" + } + }, { "Key": "363ab772-8f74-40b5-a5f3-1d7163f1c73b", "Value": { @@ -862,6 +894,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "9b53f102-1cbf-4645-aaad-7c9ef4c4faa2", + "Value": { + "id": "f4e69f0b-9fec-4fc7-a711-63db4eb8b777", + "resourcePath": "sounds\\sound_death\\sound_death.yy", + "resourceType": "GMSound" + } + }, { "Key": "9bffbd38-1bac-4d3b-8e64-478507273d36", "Value": { @@ -1086,6 +1126,14 @@ "resourceType": "GMRoom" } }, + { + "Key": "bc68cea7-aac3-4068-9222-0833694ae476", + "Value": { + "id": "4a424efa-c976-4dcd-9ba0-120d3c21c08d", + "resourcePath": "sounds\\sound_notenoughmoney\\sound_notenoughmoney.yy", + "resourceType": "GMSound" + } + }, { "Key": "bf3ea1e2-d45b-4968-a512-ecb81f432617", "Value": { @@ -1102,6 +1150,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "c33c7703-a50e-4267-9268-77ed4451b020", + "Value": { + "id": "285044aa-5030-4c7f-b1b5-f3bc1d31dbe8", + "resourcePath": "sounds\\sound_danger\\sound_danger.yy", + "resourceType": "GMSound" + } + }, { "Key": "c3602bdb-c350-4be2-bb1b-8e49a608ca8a", "Value": { @@ -1206,6 +1262,14 @@ "resourceType": "GMWindowsOptions" } }, + { + "Key": "cdc6f998-c09e-479b-a689-4e393dc26846", + "Value": { + "id": "26981017-e83e-4793-8fb5-9d541588bf6f", + "resourcePath": "sounds\\sound_song4gameover\\sound_song4gameover.yy", + "resourceType": "GMSound" + } + }, { "Key": "d10d1d38-fd16-4dd4-8a53-691a6c358088", "Value": { diff --git a/objects/obj_Player/Create_0.gml b/objects/obj_Player/Create_0.gml index e69de29..43b743d 100644 --- a/objects/obj_Player/Create_0.gml +++ b/objects/obj_Player/Create_0.gml @@ -0,0 +1,4 @@ +if audio_is_playing(sound_song2) +{ + audio_stop_all() +} diff --git a/objects/obj_TitleBloble/Create_0.gml b/objects/obj_TitleBloble/Create_0.gml new file mode 100644 index 0000000..978928a --- /dev/null +++ b/objects/obj_TitleBloble/Create_0.gml @@ -0,0 +1,4 @@ +if !audio_is_playing(sound_song2) +{ + audio_play_sound(sound_song2, 1, 1) +} \ No newline at end of file diff --git a/objects/obj_TitleBloble/obj_TitleBloble.yy b/objects/obj_TitleBloble/obj_TitleBloble.yy index eccdabc..86cead3 100644 --- a/objects/obj_TitleBloble/obj_TitleBloble.yy +++ b/objects/obj_TitleBloble/obj_TitleBloble.yy @@ -4,7 +4,16 @@ "mvc": "1.0", "name": "obj_TitleBloble", "eventList": [ - + { + "id": "a73a1980-efa2-4ea6-800f-15180edd34bd", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "1b2b931d-4277-45e3-8636-1647f9927755" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/objects/obj_bloblehop_player/Create_0.gml b/objects/obj_bloblehop_player/Create_0.gml index f9694a8..26c420e 100644 --- a/objects/obj_bloblehop_player/Create_0.gml +++ b/objects/obj_bloblehop_player/Create_0.gml @@ -1,6 +1,7 @@ image_xscale = 5; image_yscale = 5; + grav= 1 movespeed = .8 maxvsp = 40 diff --git a/objects/obj_flappybloble_player/Create_0.gml b/objects/obj_flappybloble_player/Create_0.gml index 357ed81..d245d6a 100644 --- a/objects/obj_flappybloble_player/Create_0.gml +++ b/objects/obj_flappybloble_player/Create_0.gml @@ -1,4 +1,4 @@ -grav = .4; +grav = .8; xspeed = 10; yspeed = 0; -yspeedmax = 10; +yspeedmax = 30; diff --git a/objects/obj_flappybloble_player/Step_0.gml b/objects/obj_flappybloble_player/Step_0.gml index 8fb6a8c..8cf5ad4 100644 --- a/objects/obj_flappybloble_player/Step_0.gml +++ b/objects/obj_flappybloble_player/Step_0.gml @@ -2,6 +2,6 @@ yspeed += grav -if yspeed > 10 {yspeed = 10} +if yspeed > yspeedmax {yspeed = yspeedmax} x += xspeed; y += yspeed \ No newline at end of file diff --git a/objects/obj_flappybloble_screentap/Gesture_0.gml b/objects/obj_flappybloble_screentap/Gesture_0.gml index 65c95a7..97b8620 100644 --- a/objects/obj_flappybloble_screentap/Gesture_0.gml +++ b/objects/obj_flappybloble_screentap/Gesture_0.gml @@ -1,6 +1,6 @@ with obj_flappybloble_player { - yspeed = -10 + yspeed = -25 diff --git a/sounds/sound_danger/sound_danger b/sounds/sound_danger/sound_danger new file mode 100644 index 0000000..41bc53c Binary files /dev/null and b/sounds/sound_danger/sound_danger differ diff --git a/sounds/sound_danger/sound_danger.yy b/sounds/sound_danger/sound_danger.yy new file mode 100644 index 0000000..2a12c87 --- /dev/null +++ b/sounds/sound_danger/sound_danger.yy @@ -0,0 +1,14 @@ +{ + "id": "c33c7703-a50e-4267-9268-77ed4451b020", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_danger", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 1, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_death/sound_death b/sounds/sound_death/sound_death new file mode 100644 index 0000000..dc803f1 Binary files /dev/null and b/sounds/sound_death/sound_death differ diff --git a/sounds/sound_death/sound_death.yy b/sounds/sound_death/sound_death.yy new file mode 100644 index 0000000..cddbf20 --- /dev/null +++ b/sounds/sound_death/sound_death.yy @@ -0,0 +1,14 @@ +{ + "id": "9b53f102-1cbf-4645-aaad-7c9ef4c4faa2", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_death", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 1, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_gameover/sound_gameover b/sounds/sound_gameover/sound_gameover new file mode 100644 index 0000000..05871b4 Binary files /dev/null and b/sounds/sound_gameover/sound_gameover differ diff --git a/sounds/sound_gameover/sound_gameover.yy b/sounds/sound_gameover/sound_gameover.yy new file mode 100644 index 0000000..aa4832c --- /dev/null +++ b/sounds/sound_gameover/sound_gameover.yy @@ -0,0 +1,14 @@ +{ + "id": "0471d9c5-2ff5-4772-b6b3-9a1c529e91e4", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_gameover", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 0, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_notenoughmoney/sound_notenoughmoney b/sounds/sound_notenoughmoney/sound_notenoughmoney new file mode 100644 index 0000000..6c0237a Binary files /dev/null and b/sounds/sound_notenoughmoney/sound_notenoughmoney differ diff --git a/sounds/sound_notenoughmoney/sound_notenoughmoney.yy b/sounds/sound_notenoughmoney/sound_notenoughmoney.yy new file mode 100644 index 0000000..0818831 --- /dev/null +++ b/sounds/sound_notenoughmoney/sound_notenoughmoney.yy @@ -0,0 +1,14 @@ +{ + "id": "bc68cea7-aac3-4068-9222-0833694ae476", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_notenoughmoney", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 1, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_song1/sound_song1 b/sounds/sound_song1/sound_song1 new file mode 100644 index 0000000..70f9e7e Binary files /dev/null and b/sounds/sound_song1/sound_song1 differ diff --git a/sounds/sound_song1/sound_song1.yy b/sounds/sound_song1/sound_song1.yy new file mode 100644 index 0000000..d9bec4f --- /dev/null +++ b/sounds/sound_song1/sound_song1.yy @@ -0,0 +1,14 @@ +{ + "id": "07851d98-73c1-485a-86c9-0503adac634c", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_song1", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 0, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_song2/sound_song2 b/sounds/sound_song2/sound_song2 new file mode 100644 index 0000000..f6bdbe3 Binary files /dev/null and b/sounds/sound_song2/sound_song2 differ diff --git a/sounds/sound_song2/sound_song2.yy b/sounds/sound_song2/sound_song2.yy new file mode 100644 index 0000000..b48a542 --- /dev/null +++ b/sounds/sound_song2/sound_song2.yy @@ -0,0 +1,14 @@ +{ + "id": "2eaa48dc-d3b5-41a3-b68f-44ab5cd09786", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_song2", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 0, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_song3/sound_song3 b/sounds/sound_song3/sound_song3 new file mode 100644 index 0000000..46f76b8 Binary files /dev/null and b/sounds/sound_song3/sound_song3 differ diff --git a/sounds/sound_song3/sound_song3.yy b/sounds/sound_song3/sound_song3.yy new file mode 100644 index 0000000..f7c2abf --- /dev/null +++ b/sounds/sound_song3/sound_song3.yy @@ -0,0 +1,14 @@ +{ + "id": "359956e4-ddbc-4158-a721-1200e575e524", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_song3", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 0, + "volume": 1 +} \ No newline at end of file diff --git a/sounds/sound_song4gameover/sound_song4gameover b/sounds/sound_song4gameover/sound_song4gameover new file mode 100644 index 0000000..978ea0a Binary files /dev/null and b/sounds/sound_song4gameover/sound_song4gameover differ diff --git a/sounds/sound_song4gameover/sound_song4gameover.yy b/sounds/sound_song4gameover/sound_song4gameover.yy new file mode 100644 index 0000000..5af0f63 --- /dev/null +++ b/sounds/sound_song4gameover/sound_song4gameover.yy @@ -0,0 +1,14 @@ +{ + "id": "cdc6f998-c09e-479b-a689-4e393dc26846", + "modelName": "GMSound", + "mvc": "1.0", + "name": "sound_song4gameover", + "audioGroupGuid": "7b2c4976-1e09-44e5-8256-c527145e03bb", + "bitDepth": 1, + "bitRate": 128, + "kind": 0, + "preload": false, + "sampleRate": 44100, + "type": 1, + "volume": 1 +} \ No newline at end of file diff --git a/views/c741ea92-6fcf-4b3f-8d34-f099ccd7392c.yy b/views/c741ea92-6fcf-4b3f-8d34-f099ccd7392c.yy index f7619dc..ee4a942 100644 --- a/views/c741ea92-6fcf-4b3f-8d34-f099ccd7392c.yy +++ b/views/c741ea92-6fcf-4b3f-8d34-f099ccd7392c.yy @@ -4,7 +4,14 @@ "mvc": "1.1", "name": "c741ea92-6fcf-4b3f-8d34-f099ccd7392c", "children": [ - + "cdc6f998-c09e-479b-a689-4e393dc26846", + "c33c7703-a50e-4267-9268-77ed4451b020", + "9b53f102-1cbf-4645-aaad-7c9ef4c4faa2", + "0471d9c5-2ff5-4772-b6b3-9a1c529e91e4", + "bc68cea7-aac3-4068-9222-0833694ae476", + "07851d98-73c1-485a-86c9-0503adac634c", + "2eaa48dc-d3b5-41a3-b68f-44ab5cd09786", + "359956e4-ddbc-4158-a721-1200e575e524" ], "filterType": "GMSound", "folderName": "sounds", diff --git a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy index b90e1fa..5f63afc 100644 --- a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy +++ b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy @@ -4,7 +4,6 @@ "mvc": "1.1", "name": "e397fd61-3040-4d63-a320-7d2e697fa442", "children": [ - "5b4fb71e-b4f0-4596-b85c-852416d46fa1", "fd613f09-8df2-4dd4-84ff-22313f8fc3b2", "1a58794f-af6e-43bd-ad13-85dfa879bf65", "b95eb217-65ae-4a0d-afa7-92e5e827d112", @@ -12,6 +11,7 @@ "b5752279-c416-4f7b-b59f-80ebef7c0983", "adc2e71c-d722-44c0-aa2e-31bf3e74c897", "b2626494-bc1e-42af-a7c9-ffa7497eaa64", + "5b4fb71e-b4f0-4596-b85c-852416d46fa1", "ea9b4683-0d5a-41f7-b0d3-479636b3507e", "dd30ee2a-7fad-4905-9a51-999207f4804a", "b678606e-2787-4353-b3b1-3bbe71a6aaf3",