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

Merge pull request #1717 from Spel0/fix-fixin-fixes

Browse Source 
Week 6 static arrows fix + alt anims for BF and Opponent
This commit is contained in:
Kade M
2021-08-13 18:44:20 -07:00
committed by GitHub
parent e3e37d9d3d 048e167ca8
commit 04247e9d58
6 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/PlayState.hx
View File

@ -3060,7 +3060,7 @@ class PlayState extends MusicBeatState
if (SONG.notes[Math.floor(curStep / 16)] != null)
{
if (SONG.notes[Math.floor(curStep / 16)].altAnim)
if (SONG.notes[Math.floor(curStep / 16)].p1AltAnim)
altAnim = '-alt';
}
@ -4382,17 +4382,14 @@ class PlayState extends MusicBeatState
else
totalNotesHit += 1;
switch (note.noteData)
{
case 2:
boyfriend.playAnim('singUP', true);
case 3:
boyfriend.playAnim('singRIGHT', true);
case 1:
boyfriend.playAnim('singDOWN', true);
case 0:
boyfriend.playAnim('singLEFT', true);
}
var altAnim:String = "";
if (note.isAlt)
{
altAnim = '-alt';
trace("Alt note on BF");
}
boyfriend.playAnim('sing' + dataSuffix[note.noteData] + altAnim, true);
#if windows
if (luaModchart != null)
@ -4621,7 +4618,7 @@ class PlayState extends MusicBeatState
// Dad doesnt interupt his own notes
if ((!dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky")
dad.dance(idleToBeat);
dad.dance(idleToBeat, SONG.notes[Math.floor(curStep / 16)].p1AltAnim);
}
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet);
@ -4655,7 +4652,7 @@ class PlayState extends MusicBeatState
if (!boyfriend.animation.curAnim.name.startsWith("sing") && (curBeat % idleBeat == 0 || !idleToBeat))
{
boyfriend.playAnim('idle', idleToBeat);
boyfriend.playAnim('idle' + ((SONG.notes[Math.floor(curStep / 16)].p2AltAnim && boyfriend.animation.getByName('idle-alt') != null) ? '-alt' : ''), idleToBeat);
}
/*if (!dad.animation.curAnim.name.startsWith("sing"))