Skip to content

[BUGFIX] Chart Editor - Variation fallback & chartdata only difficulties in difficulty toolbox #5215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[BUGFIX] Chart Editor - Variation fallback & chartdata only difficulties in difficulty toolbox #5215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,16 @@ class ChartEditorImportExportHandler
state.songMetadata = newSongMetadata;
state.songChartData = newSongChartData;

if (!state.songMetadata.exists(state.selectedVariation))
var variationMetadata:Null<SongMetadata> = state.songMetadata.get(state.selectedVariation);
if (variationMetadata == null)
{
state.selectedVariation = Constants.DEFAULT_VARIATION;
// Use the default variation, or the first available variation if that doesn't exist for some reason.
if (state.availableDifficulties.indexOf(Constants.DEFAULT_VARIATION) < 0) state.selectedVariation = state.availableVariations[0];
else state.selectedVariation = Constants.DEFAULT_VARIATION;

variationMetadata = state.songMetadata.get(state.selectedVariation);
}

// Use the first available difficulty as a fallback if the currently selected one cannot be found.
if (state.availableDifficulties.indexOf(state.selectedDifficulty) < 0) state.selectedDifficulty = state.availableDifficulties[0];

Expand Down
11 changes: 10 additions & 1 deletion source/funkin/ui/debug/charting/toolboxes/ChartEditorDifficultyToolbox.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import funkin.data.song.SongRegistry;
import haxe.ui.components.Button;
import haxe.ui.containers.dialogs.Dialogs;
import haxe.ui.containers.dialogs.Dialog.DialogButton;
import funkin.data.song.SongData.SongMetadata;
import haxe.ui.components.DropDown;
import haxe.ui.components.HorizontalSlider;
import funkin.util.VersionUtil;
Expand Down Expand Up @@ -215,6 +214,16 @@ class ChartEditorDifficultyToolbox extends ChartEditorBaseToolbox

var difficultyList:Array<String> = variationMetadata.playData.difficulties;

var variationChartdata:Null<SongChartData> = chartEditorState.songChartData.get(curVariation);
if(variationChartdata != null)
{
var keys:Array<String> = [for (x in variationChartdata.notes.keys()) x];
for (key in keys)
{
difficultyList.pushUnique(key);
}
}

for (difficulty in difficultyList)
{
var _treeDifficulty:TreeViewNode = treeVariation.addNode(
Expand Down