From 07bb873b1cf83595fdd89cc782517318fe6fd976 Mon Sep 17 00:00:00 2001 From: codeeater_ <55358751+toxichead@users.noreply.github.com> Date: Mon, 26 Jul 2021 12:21:03 +0300 Subject: [PATCH 1/5] slow bf fix and again tutorial (yay i downloaded orig code and now can test not only on my fork) --- source/PlayState.hx | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index b19a3d1..be43c79 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -188,8 +188,6 @@ class PlayState extends MusicBeatState var notesHitArray:Array = []; 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 = ['dad:blah blah blah', 'bf:coolswag']; @@ -3986,7 +3984,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); @@ -4464,11 +4462,40 @@ class PlayState extends MusicBeatState { // else // Conductor.changeBPM(SONG.bpm); - + // Dad doesnt interupt his own notes - if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') - if (curBeat % idleBeat == 0 || dad.curCharacter == "spooky") - dad.dance(idleToBeat); + if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && (dad.curCharacter != 'gf' || dad.curCharacter != 'spooky' || dad.curCharacter != 'tankman')) + dad.dance(); + //SPOOKY BOIS AND GF FIX + switch (dad.curCharacter) { + case 'spooky': + var commandToDance = false; + var commandCompleted = false; + if (SONG.notes[Math.floor(curStep / 16)].mustHitSection) + { + commandToDance = true; + commandCompleted = false; + } + + if (commandToDance && !commandCompleted) + { + dad.dance(); + commandToDance = false; + commandCompleted = true; + } + 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); + } + } + } } // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); wiggleShit.update(Conductor.crochet); @@ -4500,9 +4527,9 @@ class PlayState extends MusicBeatState gf.dance(); } - if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0) + if (!boyfriend.animation.curAnim.name.startsWith("sing")) { - boyfriend.playAnim('idle', idleToBeat); + boyfriend.playAnim('idle'); } /*if (!dad.animation.curAnim.name.startsWith("sing")) From d800c0af12f77c34e5d0a3a2c8f39415ff77f82e Mon Sep 17 00:00:00 2001 From: codeeater_ <55358751+toxichead@users.noreply.github.com> Date: Mon, 26 Jul 2021 12:22:53 +0300 Subject: [PATCH 2/5] oops uncomment moment --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index be43c79..8aaa3d4 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3984,7 +3984,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); From 92af60e8857cce854e5031b1f42664f3e9413598 Mon Sep 17 00:00:00 2001 From: codeeater_ <55358751+toxichead@users.noreply.github.com> Date: Mon, 26 Jul 2021 12:27:16 +0300 Subject: [PATCH 3/5] holy shit you havent this character delete this --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 8aaa3d4..d27dbd3 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4464,7 +4464,7 @@ class PlayState extends MusicBeatState // 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.curCharacter != 'tankman')) + if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && (dad.curCharacter != 'gf' || dad.curCharacter != 'spooky')) dad.dance(); //SPOOKY BOIS AND GF FIX switch (dad.curCharacter) { From 32040d50074c9c682029e40b1015be23ac678dbe Mon Sep 17 00:00:00 2001 From: codeeater_ <55358751+toxichead@users.noreply.github.com> Date: Mon, 26 Jul 2021 12:50:16 +0300 Subject: [PATCH 4/5] final fix for spooky bois --- source/PlayState.hx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index d27dbd3..d6379df 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4469,20 +4469,8 @@ class PlayState extends MusicBeatState //SPOOKY BOIS AND GF FIX switch (dad.curCharacter) { case 'spooky': - var commandToDance = false; - var commandCompleted = false; - if (SONG.notes[Math.floor(curStep / 16)].mustHitSection) - { - commandToDance = true; - commandCompleted = false; - } - - if (commandToDance && !commandCompleted) - { + if (curBeat % 128 == 0) //lol it works dad.dance(); - commandToDance = false; - commandCompleted = true; - } case 'gf': { if (SONG.notes[Math.floor(curStep / 16)].mustHitSection) From be4e80b3c6de337b69b8abd2e3a0b0f0991e0bb0 Mon Sep 17 00:00:00 2001 From: codeeater_ <55358751+toxichead@users.noreply.github.com> Date: Tue, 27 Jul 2021 02:27:36 +0300 Subject: [PATCH 5/5] reverting things and leaving gf fix --- source/PlayState.hx | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index d6379df..b47dab8 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -188,6 +188,8 @@ class PlayState extends MusicBeatState var notesHitArray:Array = []; 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 = ['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"))