Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into scroll-speed-fix

Browse source
This commit is contained in:
Burgerballs 2024-05-24 17:23:45 +01:00 committed by GitHub
commit eb2b143a1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1746,12 +1746,7 @@ class PlayState extends MusicBeatSubState
*/ */
function initStrumlines():Void function initStrumlines():Void
{ {
var noteStyleId:String = switch (currentStageId) var noteStyleId:String = currentChart.noteStyle;
{
case 'school': 'pixel';
case 'schoolEvil': 'pixel';
default: Constants.DEFAULT_NOTE_STYLE;
}
var noteStyle:NoteStyle = NoteStyleRegistry.instance.fetchEntry(noteStyleId); var noteStyle:NoteStyle = NoteStyleRegistry.instance.fetchEntry(noteStyleId);
if (noteStyle == null) noteStyle = NoteStyleRegistry.instance.fetchDefault(); if (noteStyle == null) noteStyle = NoteStyleRegistry.instance.fetchDefault();

4
source/funkin/play/components/HealthIcon.hx
View file

@ -373,6 +373,10 @@ class HealthIcon extends FunkinSprite
// Don't flip BF's icon here! That's done later. // Don't flip BF's icon here! That's done later.
this.animation.add(Idle, [0], 0, false, false); this.animation.add(Idle, [0], 0, false, false);
this.animation.add(Losing, [1], 0, false, false); this.animation.add(Losing, [1], 0, false, false);
if (animation.numFrames >= 3)
{
this.animation.add(Winning, [2], 0, false, false);
}
} }
function correctCharacterId(charId:Null<String>):String function correctCharacterId(charId:Null<String>):String

2
source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx
View file

@ -104,6 +104,8 @@ class ChartEditorMetadataToolbox extends ChartEditorBaseToolbox
if (event.data?.id == null) return; if (event.data?.id == null) return;
chartEditorState.currentSongNoteStyle = event.data.id; chartEditorState.currentSongNoteStyle = event.data.id;
}; };
var startingValueNoteStyle = ChartEditorDropdowns.populateDropdownWithNoteStyles(inputNoteStyle, chartEditorState.currentSongMetadata.playData.noteStyle);
inputNoteStyle.value = startingValueNoteStyle;
inputBPM.onChange = function(event:UIEvent) { inputBPM.onChange = function(event:UIEvent) {
if (event.value == null || event.value <= 0) return; if (event.value == null || event.value <= 0) return;