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

Merge pull request #1471 from toxichead/patch-2

Browse Source 
gf fix + ability to disable new system for bf
This commit is contained in:
Kade M 2021-07-27 22:18:41 -07:00 committed by GitHub
commit 13e2e97773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/PlayState.hx
View File

@ -3999,7 +3999,7 @@ class PlayState extends MusicBeatState
FlxG.stage.window.onFocusIn.add(focusIn); FlxG.stage.window.onFocusIn.add(focusIn);
var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm"; var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm";
WebmPlayer.SKIP_STEP_LIMIT = 90; //WebmPlayer.SKIP_STEP_LIMIT = 90;
var str1:String = "WEBM SHIT"; var str1:String = "WEBM SHIT";
webmHandler = new WebmHandler(); webmHandler = new WebmHandler();
webmHandler.source(ourSource); webmHandler.source(ourSource);
@ -4462,13 +4462,13 @@ class PlayState extends MusicBeatState
if (curSong == 'Tutorial' && dad.curCharacter == 'gf') 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(); dad.dance();
else else
{ {
if (curStep % 2 == 0 && dad.animOffsets.exists('danceLeft')) if (curBeat == 73 || curBeat % 4 == 0 || curBeat % 4 == 1)
dad.playAnim('danceLeft', true); dad.playAnim('danceLeft', true);
else if (curStep % 2 == 1 && dad.animOffsets.exists('danceRight')) else
dad.playAnim('danceRight', true); dad.playAnim('danceRight', true);
} }
} }
@ -4480,7 +4480,7 @@ class PlayState extends MusicBeatState
// Dad doesnt interupt his own notes // Dad doesnt interupt his own notes
if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
if (curBeat % idleBeat == 0 || dad.curCharacter == "spooky") if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky")
dad.dance(idleToBeat); dad.dance(idleToBeat);
} }
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
@ -4513,7 +4513,7 @@ class PlayState extends MusicBeatState
gf.dance(); gf.dance();
} }
if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0) if (!boyfriend.animation.curAnim.name.startsWith("sing") && (curBeat % idleBeat == 0 || !idleToBeat))
{ {
boyfriend.playAnim('idle', idleToBeat); boyfriend.playAnim('idle', idleToBeat);
} }