fix animation shit

This commit is contained in:
KadeDeveloper 2021-08-07 19:14:10 -07:00
parent a9365239f0
commit b2bed6bcf0

View File

@ -3030,38 +3030,77 @@ class PlayState extends MusicBeatState
} }
// Accessing the animation name directly to play it // Accessing the animation name directly to play it
var singData:Int = Std.int(Math.abs(daNote.noteData)); if (!daNote.isParent && daNote.parent != null)
dad.playAnim('sing' + dataSuffix[singData] + altAnim, true);
if (FlxG.save.data.cpuStrums)
{ {
cpuStrums.forEach(function(spr:FlxSprite) if (daNote.spotInLine != daNote.parent.children.length - 1)
{ {
if (Math.abs(daNote.noteData) == spr.ID) var singData:Int = Std.int(Math.abs(daNote.noteData));
dad.playAnim('sing' + dataSuffix[singData] + altAnim, true);
if (FlxG.save.data.cpuStrums)
{ {
spr.animation.play('confirm', true); cpuStrums.forEach(function(spr:FlxSprite)
{
if (Math.abs(daNote.noteData) == spr.ID)
{
spr.animation.play('confirm', true);
}
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
{
spr.centerOffsets();
spr.offset.x -= 13;
spr.offset.y -= 13;
}
else
spr.centerOffsets();
});
} }
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
{ #if windows
spr.centerOffsets(); if (luaModchart != null)
spr.offset.x -= 13; luaModchart.executeState('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
spr.offset.y -= 13; #end
}
else dad.holdTimer = 0;
spr.centerOffsets();
}); if (SONG.needsVoices)
vocals.volume = 1;
}
} }
else
{
var singData:Int = Std.int(Math.abs(daNote.noteData));
dad.playAnim('sing' + dataSuffix[singData] + altAnim, true);
#if windows if (FlxG.save.data.cpuStrums)
if (luaModchart != null) {
luaModchart.executeState('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]); cpuStrums.forEach(function(spr:FlxSprite)
#end {
if (Math.abs(daNote.noteData) == spr.ID)
{
spr.animation.play('confirm', true);
}
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
{
spr.centerOffsets();
spr.offset.x -= 13;
spr.offset.y -= 13;
}
else
spr.centerOffsets();
});
}
dad.holdTimer = 0; #if windows
if (luaModchart != null)
luaModchart.executeState('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
#end
if (SONG.needsVoices) dad.holdTimer = 0;
vocals.volume = 1;
if (SONG.needsVoices)
vocals.volume = 1;
}
daNote.active = false; daNote.active = false;
daNote.kill(); daNote.kill();