Merge pull request #2562 from ActualMandM/tutorialVoices

Use Voices track for Tutorial
KadeArchive · Oct 24, 2021 · a613271 · a613271
2 parents 4d53d7a + 3d4c135
commit a613271
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/assets/songs/tutorial/Inst.mp3 b/assets/songs/tutorial/Inst.mp3
diff --git a/assets/songs/tutorial/Inst.ogg b/assets/songs/tutorial/Inst.ogg
diff --git a/assets/songs/tutorial/Voices.mp3 b/assets/songs/tutorial/Voices.mp3
diff --git a/assets/songs/tutorial/Voices.ogg b/assets/songs/tutorial/Voices.ogg
diff --git 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)