diff --git a/assets/preload/data/songs/tutorial/tutorial-easy.json b/assets/preload/data/songs/tutorial/tutorial-easy.json index 081b62078f..bd768e2615 100644 --- a/assets/preload/data/songs/tutorial/tutorial-easy.json +++ b/assets/preload/data/songs/tutorial/tutorial-easy.json @@ -241,7 +241,7 @@ ], "bpm": 100, "sections": 0, - "needsVoices": false, + "needsVoices": true, "player1": "bf", "player2": "gf", "sectionLengths": [], diff --git a/assets/preload/data/songs/tutorial/tutorial-hard.json b/assets/preload/data/songs/tutorial/tutorial-hard.json index 5345eb9de9..c4a2b5993a 100644 --- a/assets/preload/data/songs/tutorial/tutorial-hard.json +++ b/assets/preload/data/songs/tutorial/tutorial-hard.json @@ -266,7 +266,7 @@ ], "bpm": 100, "sections": 0, - "needsVoices": false, + "needsVoices": true, "player1": "bf", "player2": "gf", "sectionLengths": [], diff --git a/assets/preload/data/songs/tutorial/tutorial.json b/assets/preload/data/songs/tutorial/tutorial.json index 081b62078f..bd768e2615 100644 --- a/assets/preload/data/songs/tutorial/tutorial.json +++ b/assets/preload/data/songs/tutorial/tutorial.json @@ -241,7 +241,7 @@ ], "bpm": 100, "sections": 0, - "needsVoices": false, + "needsVoices": true, "player1": "bf", "player2": "gf", "sectionLengths": [], diff --git a/assets/songs/test/Inst.mp3 b/assets/songs/test/Inst.mp3 new file mode 100644 index 0000000000..5b521c0934 Binary files /dev/null and b/assets/songs/test/Inst.mp3 differ diff --git a/assets/songs/tutorial/Inst.mp3 b/assets/songs/tutorial/Inst.mp3 index 473f008ca4..318c4ed164 100644 Binary files a/assets/songs/tutorial/Inst.mp3 and b/assets/songs/tutorial/Inst.mp3 differ diff --git a/assets/songs/tutorial/Inst.ogg b/assets/songs/tutorial/Inst.ogg index 0da44906a7..d0abcb7355 100644 Binary files a/assets/songs/tutorial/Inst.ogg and b/assets/songs/tutorial/Inst.ogg differ diff --git a/assets/songs/tutorial/Voices.mp3 b/assets/songs/tutorial/Voices.mp3 new file mode 100644 index 0000000000..78328401e7 Binary files /dev/null and b/assets/songs/tutorial/Voices.mp3 differ diff --git a/assets/songs/tutorial/Voices.ogg b/assets/songs/tutorial/Voices.ogg new file mode 100644 index 0000000000..c28aa8cc0d Binary files /dev/null and b/assets/songs/tutorial/Voices.ogg differ diff --git a/source/PlayState.hx b/source/PlayState.hx index 1f9ed9f556..4618c4fe16 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4494,8 +4494,16 @@ class PlayState extends MusicBeatState if (curBeat % 16 == 15 && SONG.songId == 'tutorial' && dad.curCharacter == 'gf' && curBeat > 16 && curBeat < 48) { - boyfriend.playAnim('hey', true); - dad.playAnim('cheer', true); + if (vocals.volume != 0) + { + boyfriend.playAnim('hey', true); + dad.playAnim('cheer', true); + } + else + { + dad.playAnim('sad', true); + FlxG.sound.play(Paths.soundRandom('GF_', 1, 4, 'shared'), 0.3); + } } if (PlayStateChangeables.Optimize)