Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-04-12 06:54:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 27321ab073 into d31ef12363

Browse source
This commit is contained in:
Lasercar 2025-04-05 05:35:36 +10:00 • committed by GitHub
commit d6eb4ab70f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
source/funkin
play/character
BaseCharacter.hx
ui/debug/charting/util
ChartEditorDropdowns.hx

17
source/funkin/play/character/BaseCharacter.hx
View file

@ -516,16 +516,29 @@ class BaseCharacter extends Bopper
// If another script cancelled the event, don't do anything.
if (event.eventCanceled) return;
var playSingAnimation = true;
if (event.note.params?.length > 0)
{
for (param in event.note.params)
{
if (param.name == "playSingAnimation" && param.value != null)
{
playSingAnimation = cast(param.value, Bool);
break;
}
}
}
if (event.note.noteData.getMustHitNote() && characterType == BF)
{
// If the note is from the same strumline, play the sing animation.
this.playSingAnimation(event.note.noteData.getDirection(), false);
if (playSingAnimation) this.playSingAnimation(event.note.noteData.getDirection(), false);
holdTimer = 0;
}
else if (!event.note.noteData.getMustHitNote() && characterType == DAD)
{
// If the note is from the same strumline, play the sing animation.
this.playSingAnimation(event.note.noteData.getDirection(), false);
if (playSingAnimation) this.playSingAnimation(event.note.noteData.getDirection(), false);
holdTimer = 0;
}
else if (characterType == GF && event.note.noteData.getMustHitNote())

1
source/funkin/ui/debug/charting/util/ChartEditorDropdowns.hx
View file

@ -157,6 +157,7 @@ class ChartEditorDropdowns
// Base
"" => "Default",
"~CUSTOM~" => "Custom",
// It'd be great if the rest of these were scripted notes instead!
// Weeks 1-7
"mom" => "Mom Sings (Week 5)",
"ugh" => "Ugh (Week 7)",