Add credits and bug fixes

devkcud · Apr 6, 2022 · 80e12ed · 80e12ed
1 parent ac977d5
commit 80e12ed
Show file tree

Hide file tree

Showing 26 changed files with 366 additions and 11 deletions.
diff --git a/Kubic.yyp b/Kubic.yyp
diff --git a/objects/oMuteMenu/Create_0.gml b/objects/oMuteMenu/Create_0.gml
@@ -0,0 +1,5 @@
+/// @desc ?
+
+image_speed = 0;
+muted = false;
+
diff --git a/objects/oMuteMenu/Draw_0.gml b/objects/oMuteMenu/Draw_0.gml
@@ -0,0 +1,7 @@
+/// @desc ?
+
+draw_self();
+
+image_index = muted;
+scribble("[fa_center][scale, 1.5]Mute[/]").draw(x, y + 32);
+
diff --git a/objects/oMuteMenu/Mouse_4.gml b/objects/oMuteMenu/Mouse_4.gml
@@ -0,0 +1,4 @@
+/// @desc ?
+
+muted = !muted;
+
diff --git a/objects/oMuteMenu/Step_0.gml b/objects/oMuteMenu/Step_0.gml
@@ -0,0 +1,5 @@
+/// @desc ?
+
+if (muted) {audio_sound_gain(global.fakeGameAudio, -1, 0);}
+if (!muted) {audio_sound_gain(global.fakeGameAudio, 1, 0);}
+
diff --git a/objects/oMuteMenu/oMuteMenu.yy b/objects/oMuteMenu/oMuteMenu.yy
diff --git a/objects/objCredits/Create_0.gml b/objects/objCredits/Create_0.gml
@@ -0,0 +1,5 @@
+/// @desc ?
+
+instance_deactivate_all(true);
+instance_activate_object(objShader);
+
diff --git a/objects/objCredits/Draw_0.gml b/objects/objCredits/Draw_0.gml
@@ -0,0 +1,5 @@
+/// @desc ?
+
+scribble("[fa_center][fntHeader][rainbow][wave]Obrigado por jogar![/wave][/rainbow]\n[fntScore]Criado por:\nAndré Luis (Programação & Arte)\nAndré Vitor (Level Design & Beta Tester)\nCarlos (SFX & Beta Tester)[/]").draw(room_width / 2, 128);
+scribble("[fa_center][fntScore]Aperte Esc para sair do jogo.[/]").draw(room_width / 2, room_height - 128);
+
diff --git a/objects/objCredits/Step_0.gml b/objects/objCredits/Step_0.gml
@@ -0,0 +1,4 @@
+/// @desc ?
+
+if (keyboard_check_pressed(vk_escape)) game_end();
+
diff --git a/objects/objCredits/objCredits.yy b/objects/objCredits/objCredits.yy
diff --git a/objects/objGame/Alarm_0.gml b/objects/objGame/Alarm_0.gml
@@ -1,5 +1,7 @@
 /// @desc Make sound
+
 if (room == rmMenu) {
-	audio_play_sound(sndWalk, 0, false);
+	global.fakeGameAudio = audio_play_sound(sndWalk, 0, false);
+
 	alarm[0] = 0.45 * room_speed;
 }
diff --git a/objects/objGame/Create_0.gml b/objects/objGame/Create_0.gml
@@ -8,3 +8,5 @@ scribble_font_set_default("fntScore");
 
 alarm[0] = 1.1 * room_speed;
 
+global.fakeGameAudio = 0;
+
diff --git a/objects/objGame/Draw_0.gml b/objects/objGame/Draw_0.gml
@@ -36,6 +36,6 @@ draw_text_scribble(round(room_width / 6), 128, "[wave][scale, 1.5][fntHeader][fa
 draw_text_scribble(round(room_width / 6), 128 + 64, "[fntScore][fa_middle][fa_center]Um jogo baseado em cubos[/]");
 
 draw_text_scribble(32, room_height / 2, "[fa_middle][fa_left][fntScore][rainbow][scale, 1.4]Enter[/scale][/rainbow] para iniciar.[/]");
-draw_text_scribble(32, room_height / 2 + 24, "[fa_middle][fa_left][fntScore][rainbow][scale, 1.4]X[/scale][/rainbow] para ir às configurações.[/]");
+// draw_text_scribble(32, room_height / 2 + 24, "[fa_middle][fa_left][fntScore][rainbow][scale, 1.4]X[/scale][/rainbow] para ir às configurações.[/]");
 draw_text_scribble(round(room_width / 6), room_height - 32, "[fa_center][fa_bottom][fntScore]Criado por\nAndré Luis, André Vitor & Carlos Daniel[/]");
 
diff --git a/objects/objPlacer/Step_0.gml b/objects/objPlacer/Step_0.gml
@@ -15,7 +15,7 @@ yy = clamp(round(mouse_y / GRID_WxH) * GRID_WxH, (GRID_BUFFER + GRID_WxH), room_
 if (keyboard_check_pressed(ord("D"))) imgAngle -= 90;
 if (keyboard_check_pressed(ord("A"))) imgAngle += 90;
 
-with (objCursor) { if (!place_free(x, y) || place_meeting(x, y, objPush) || place_meeting(x, y, objScore) || distance_to_object(objScore) < other.minDist) exit; }
+with (objCursor) { if (!place_free(x, y) || place_meeting(x, y, objPush) || place_meeting(x, y, objScore) || distance_to_object(objScore) < other.minDist || place_meeting(x, y, objSpike)) exit; }
 
 if (mouse_check_button_pressed(mb_left) && blocks[# placingIndex, 1] > 0) {
 	blocks[# placingIndex, 1] -= 1;

diff --git a/rooms/rmCredits/rmCredits.yy b/rooms/rmCredits/rmCredits.yy
diff --git a/rooms/rmDemo/rmDemo.yy b/rooms/rmDemo/rmDemo.yy
diff --git a/rooms/rmFifth/rmFifth.yy b/rooms/rmFifth/rmFifth.yy
diff --git a/rooms/rmFirst/InstanceCreationCode_inst_592347B1.gml b/rooms/rmFirst/InstanceCreationCode_inst_592347B1.gml
@@ -1,9 +1,10 @@
 tutorialStrings = [
-	"Olá, me chamo [wave][rainbow]Mr Tuto[/rainbow][/wave]! Seja bem-vindo a este guia.\nAqui você irá aprender as mecânicas básicas do jogo! (Enter para continuar)",
+	"Olá, me chamo [wave][rainbow]Mr Tuto[/rainbow][/wave] ! Seja bem-vindo a este guia.\nAqui você irá aprender as mecânicas básicas do jogo! (Enter para continuar)",
 	"Para começar, você pode colocar os [wave]blocos com setas verdes [scale, 0.8][sprPush][scale, 1.5][/wave] utilizando o [pulse]botão esquerdo do mouse[/pulse].\n(Para remove-los, utilize o [pulse]botão direito do mouse[/pulse]).",
 	"Antes de colocar os [wave]blocos com setas verdes [scale, 0.8][sprPush][scale, 1.5][/wave],\nvocê pode rotaciona-los utilizando as [pulse]teclas \"A\" e \"D\"[/pulse] de seu teclado.",
 	"Lembre-se, você [pulse]NÃO[/pulse] pode colocar mais [wave]blocos com setas verdes [scale, 0.8][sprPush][scale, 1.5][/wave] do que você tem.\nVeja a quantidade de [wave]blocos com setas verdes [scale, 0.8][sprPush][scale, 1.5][/wave] que você possui no canto superior esquerdo da tela!",
 	"Para iniciar o jogo, também conhecido como [rainbow]modo corrida[/rainbow], e ver seus [wave]blocos com setas verdes [scale, 0.8][sprPush][scale, 1.5][/wave] andarem,\npressione a [pulse]tecla \"P\"[/pulse].",
 	"Você deve coletar todos os [wave]blocos com números dentro[/wave] em ordem!",
 	"Quando o [rainbow]modo corrida[/rainbow] estiver ativo, você [pulse]NÃO[/pulse] pode colocar ou remover nenhum bloco. ;)"
-];
+];
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		/// @desc ?

		if (keyboard_check_pressed(vk_escape)) game_end();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,5 @@ scribble_font_set_default("fntScore");

		alarm[0] = 1.1 * room_speed;

		global.fakeGameAudio = 0;