mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-12 05:07:06 +00:00
Clean up difficulty label behavior
This commit is contained in:
parent
43872bb213
commit
ddfecf2cfc
2
assets
2
assets
|
@ -1 +1 @@
|
||||||
Subproject commit 6f17eb051e2609d59a591d4e6eb78e37c6e90adb
|
Subproject commit 9ecc4d26fe6b26f31782cccfcd7331bd8a318ce1
|
|
@ -2422,6 +2422,23 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
|
||||||
this.refreshToolbox(CHART_EDITOR_TOOLBOX_METADATA_LAYOUT);
|
this.refreshToolbox(CHART_EDITOR_TOOLBOX_METADATA_LAYOUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
playbarDifficulty.onClick = _ -> {
|
||||||
|
if (FlxG.keys.pressed.CONTROL)
|
||||||
|
{
|
||||||
|
this.setToolboxState(CHART_EDITOR_TOOLBOX_DIFFICULTY_LAYOUT, true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
incrementDifficulty(-1);
|
||||||
|
this.refreshToolbox(CHART_EDITOR_TOOLBOX_DIFFICULTY_LAYOUT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
playbarDifficulty.onRightClick = _ -> {
|
||||||
|
incrementDifficulty(1);
|
||||||
|
this.refreshToolbox(CHART_EDITOR_TOOLBOX_DIFFICULTY_LAYOUT);
|
||||||
|
}
|
||||||
|
|
||||||
// Add functionality to the menu items.
|
// Add functionality to the menu items.
|
||||||
|
|
||||||
// File
|
// File
|
||||||
|
@ -2619,10 +2636,6 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
|
||||||
menubarLabelPlaybackSpeed.text = 'Playback Speed - ${pitchDisplay}x';
|
menubarLabelPlaybackSpeed.text = 'Playback Speed - ${pitchDisplay}x';
|
||||||
}
|
}
|
||||||
|
|
||||||
playbarDifficulty.onClick = _ -> {
|
|
||||||
this.setToolboxState(CHART_EDITOR_TOOLBOX_DIFFICULTY_LAYOUT, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
menubarItemToggleToolboxDifficulty.onChange = event -> this.setToolboxState(CHART_EDITOR_TOOLBOX_DIFFICULTY_LAYOUT, event.value);
|
menubarItemToggleToolboxDifficulty.onChange = event -> this.setToolboxState(CHART_EDITOR_TOOLBOX_DIFFICULTY_LAYOUT, event.value);
|
||||||
menubarItemToggleToolboxMetadata.onChange = event -> this.setToolboxState(CHART_EDITOR_TOOLBOX_METADATA_LAYOUT, event.value);
|
menubarItemToggleToolboxMetadata.onChange = event -> this.setToolboxState(CHART_EDITOR_TOOLBOX_METADATA_LAYOUT, event.value);
|
||||||
menubarItemToggleToolboxNotes.onChange = event -> this.setToolboxState(CHART_EDITOR_TOOLBOX_NOTEDATA_LAYOUT, event.value);
|
menubarItemToggleToolboxNotes.onChange = event -> this.setToolboxState(CHART_EDITOR_TOOLBOX_NOTEDATA_LAYOUT, event.value);
|
||||||
|
@ -4394,8 +4407,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
|
||||||
if (playbarSongRemaining.value != songRemainingString) playbarSongRemaining.value = songRemainingString;
|
if (playbarSongRemaining.value != songRemainingString) playbarSongRemaining.value = songRemainingString;
|
||||||
|
|
||||||
playbarNoteSnap.text = '1/${noteSnapQuant}';
|
playbarNoteSnap.text = '1/${noteSnapQuant}';
|
||||||
playbarDifficulty.text = "Difficulty: " + selectedDifficulty.toTitleCase();
|
playbarDifficulty.text = '${selectedDifficulty.toTitleCase()}';
|
||||||
playbarBPM.text = "BPM: " + (Conductor.currentTimeChange?.bpm ?? 0.0);
|
// playbarBPM.text = 'BPM: ${(Conductor.currentTimeChange?.bpm ?? 0.0)}';
|
||||||
}
|
}
|
||||||
|
|
||||||
function handlePlayhead():Void
|
function handlePlayhead():Void
|
||||||
|
@ -4750,16 +4763,16 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
|
||||||
{
|
{
|
||||||
super.handleQuickWatch();
|
super.handleQuickWatch();
|
||||||
|
|
||||||
FlxG.watch.addQuick('musicTime', audioInstTrack?.time ?? 0.0);
|
FlxG.watch.addQuick('musicTime', audioInstTrack?.time);
|
||||||
|
|
||||||
FlxG.watch.addQuick('scrollPosInPixels', scrollPositionInPixels);
|
FlxG.watch.addQuick('scrollPosInPixels', scrollPositionInPixels);
|
||||||
FlxG.watch.addQuick('playheadPosInPixels', playheadPositionInPixels);
|
FlxG.watch.addQuick('playheadPosInPixels', playheadPositionInPixels);
|
||||||
|
|
||||||
FlxG.watch.addQuick("tapNotesRendered", renderedNotes.members.length);
|
FlxG.watch.addQuick("tapNotesRendered", renderedNotes?.members?.length);
|
||||||
FlxG.watch.addQuick("holdNotesRendered", renderedHoldNotes.members.length);
|
FlxG.watch.addQuick("holdNotesRendered", renderedHoldNotes?.members?.length);
|
||||||
FlxG.watch.addQuick("eventsRendered", renderedEvents.members.length);
|
FlxG.watch.addQuick("eventsRendered", renderedEvents?.members?.length);
|
||||||
FlxG.watch.addQuick("notesSelected", currentNoteSelection.length);
|
FlxG.watch.addQuick("notesSelected", currentNoteSelection?.length);
|
||||||
FlxG.watch.addQuick("eventsSelected", currentEventSelection.length);
|
FlxG.watch.addQuick("eventsSelected", currentEventSelection?.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handlePostUpdate():Void
|
function handlePostUpdate():Void
|
||||||
|
@ -5124,7 +5137,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.success('Switch Difficulty', 'Switched difficulty to ${selectedDifficulty.toTitleCase()}');
|
// Removed this notification because you can see your difficulty in the playbar now.
|
||||||
|
// this.success('Switch Difficulty', 'Switched difficulty to ${selectedDifficulty.toTitleCase()}');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue