Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-17 04:11:23 -05:00
Code Issues Projects Releases Packages Wiki Activity

Note cover now only plays splash on player

Browse source
This commit is contained in:
EliteMasterEric 2024-04-03 04:52:28 -04:00
parent e9d8546737
commit 1759f5c388
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/play/PlayState.hx
View file

@ -2224,8 +2224,8 @@ class PlayState extends MusicBeatSubState
holdNote.handledMiss = true; holdNote.handledMiss = true;
// Mute vocals and play miss animation, but don't penalize. // Mute vocals and play miss animation, but don't penalize.
vocals.playerVolume = 0; // vocals.playerVolume = 0;
if (currentStage != null && currentStage.getBoyfriend() != null) currentStage.getBoyfriend().playSingAnimation(holdNote.noteData.getDirection(), true); // if (currentStage != null && currentStage.getBoyfriend() != null) currentStage.getBoyfriend().playSingAnimation(holdNote.noteData.getDirection(), true);
} }
} }
} }

7
source/funkin/play/notes/NoteHoldCover.hx
View file

@ -77,13 +77,6 @@ class NoteHoldCover extends FlxTypedSpriteGroup<FlxSprite>
public override function update(elapsed):Void public override function update(elapsed):Void
{ {
super.update(elapsed); super.update(elapsed);
if ((!holdNote.alive || holdNote.missedNote) && !glow.animation.curAnim.name.startsWith('holdCoverEnd'))
{
// If alive is false, the hold note was held to completion.
// If missedNote is true, the hold note was "dropped".
playEnd();
}
} }
public function playStart():Void public function playStart():Void

17
source/funkin/play/notes/Strumline.hx
View file

@ -370,8 +370,6 @@ class Strumline extends FlxSpriteGroup
// Hold note is offscreen, kill it. // Hold note is offscreen, kill it.
holdNote.visible = false; holdNote.visible = false;
holdNote.kill(); // Do not destroy! Recycling is faster. holdNote.kill(); // Do not destroy! Recycling is faster.
// The cover will see this and clean itself up.
} }
else if (holdNote.hitNote && holdNote.sustainLength <= 0) else if (holdNote.hitNote && holdNote.sustainLength <= 0)
{ {
@ -385,10 +383,16 @@ class Strumline extends FlxSpriteGroup
playStatic(holdNote.noteDirection); playStatic(holdNote.noteDirection);
} }
if (holdNote.cover != null) if (holdNote.cover != null && isPlayer)
{ {
holdNote.cover.playEnd(); holdNote.cover.playEnd();
} }
else if (holdNote.cover != null)
{
// *lightning* *zap* *crackle*
holdNote.cover.visible = false;
holdNote.cover.kill();
}
holdNote.visible = false; holdNote.visible = false;
holdNote.kill(); holdNote.kill();
@ -410,6 +414,13 @@ class Strumline extends FlxSpriteGroup
{ {
holdNote.y = this.y - INITIAL_OFFSET + calculateNoteYPos(holdNote.strumTime, vwoosh) + yOffset + STRUMLINE_SIZE / 2; holdNote.y = this.y - INITIAL_OFFSET + calculateNoteYPos(holdNote.strumTime, vwoosh) + yOffset + STRUMLINE_SIZE / 2;
} }
// Clean up the cover.
if (holdNote.cover != null)
{
holdNote.cover.visible = false;
holdNote.cover.kill();
}
} }
else if (Conductor.instance.songPosition > holdNote.strumTime && holdNote.hitNote) else if (Conductor.instance.songPosition > holdNote.strumTime && holdNote.hitNote)
{ {