reverting things and leaving gf fix

Spel0 · Jul 26, 2021 · be4e80b · be4e80b
1 parent 32040d5
commit be4e80b
Showing 1 changed file with 12 additions and 27 deletions.
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -188,6 +188,8 @@ class PlayState extends MusicBeatState
 
 	var notesHitArray:Array<Date> = [];
 	var currentFrames:Int = 0;
+	var idleToBeat:Bool = true; // change if bf and dad would idle to the beat of the song
+	var idleBeat:Int = 4; // how frequently bf and dad would play their idle animation(1 - every beat, 2 - every 2 beats and so on)
 
 	public var dialogue:Array<String> = ['dad:blah blah blah', 'bf:coolswag'];
 
@@ -3984,7 +3986,7 @@ class PlayState extends MusicBeatState
 		FlxG.stage.window.onFocusIn.add(focusIn);
 
 		var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm";
-		WebmPlayer.SKIP_STEP_LIMIT = 90;
+		//WebmPlayer.SKIP_STEP_LIMIT = 90;
 		var str1:String = "WEBM SHIT";
 		webmHandler = new WebmHandler();
 		webmHandler.source(ourSource);
@@ -4447,13 +4449,13 @@ class PlayState extends MusicBeatState
 
 		if (curSong == 'Tutorial' && dad.curCharacter == 'gf')
 		{
-			if (curStep < 64 || SONG.notes[Math.floor(curStep / 16)].mustHitSection)
+			if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
 				dad.dance();
 			else
 			{
-				if (curStep % 2 == 0 && dad.animOffsets.exists('danceLeft'))
+				if (curBeat == 73 || curBeat % 4 == 0 || curBeat % 4 == 1)
 					dad.playAnim('danceLeft', true);
-				else if (curStep % 2 == 1 && dad.animOffsets.exists('danceRight'))
+				else
 					dad.playAnim('danceRight', true);
 			}
 		}
@@ -4462,28 +4464,11 @@ class PlayState extends MusicBeatState
 		{
 			// else
 			// Conductor.changeBPM(SONG.bpm);
-	
+
 			// Dad doesnt interupt his own notes
-			if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && (dad.curCharacter != 'gf' || dad.curCharacter != 'spooky')) 
-				dad.dance();
-			//SPOOKY BOIS AND GF FIX
-			switch (dad.curCharacter) {
-				case 'spooky':
-					if (curBeat % 128 == 0) //lol it works
-						dad.dance();
-				case 'gf':
-				{
-					if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
-						dad.dance();
-					else
-					{
-						if (curBeat == 73 || curBeat % 4 == 0 || curBeat % 4 == 1)
-							dad.playAnim('danceLeft', true);
-						else
-							dad.playAnim('danceRight', true);
-					}
-				}
-			}
+			if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
+				if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky")
+					dad.dance(idleToBeat);
 		}
 		// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
 		wiggleShit.update(Conductor.crochet);
@@ -4515,9 +4500,9 @@ class PlayState extends MusicBeatState
 			gf.dance();
 		}
 
-		if (!boyfriend.animation.curAnim.name.startsWith("sing"))
+		if (!boyfriend.animation.curAnim.name.startsWith("sing") && (curBeat % idleBeat == 0 || !idleToBeat))
 		{
-			boyfriend.playAnim('idle');
+			boyfriend.playAnim('idle', idleToBeat);
 		}
 
 		/*if (!dad.animation.curAnim.name.startsWith("sing"))