AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "lots of stuff""

Browse Source 
This reverts commit 3d01f74c10.
This commit is contained in:
Spel0
2021-07-14 05:45:28 +03:00
parent 69dd73a898
commit 3184e0bacb
5 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/PlayState.hx
View File

@ -171,6 +171,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 = 1; // 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'];
@ -4173,8 +4175,9 @@ 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.dance();
if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
if (curBeat % idleBeat == 0)
dad.dance(idleToBeat);
}
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet);
@ -4206,9 +4209,9 @@ class PlayState extends MusicBeatState
gf.dance();
}
if (!boyfriend.animation.curAnim.name.startsWith("sing"))
if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0)
{
boyfriend.playAnim('idle');
boyfriend.playAnim('idle', idleToBeat);
}
/*if (!dad.animation.curAnim.name.startsWith("sing"))