cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-20 13:53:13 +00:00
Code Issues Releases Wiki Activity

Fixes to Erect/Nightmare only

Browse source
This commit is contained in:
EliteMasterEric 2023-12-19 01:25:15 -05:00
parent 4ff5bd21df
commit 328bb7b938
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/funkin/input/Cursor.hx
View file

@ -34,6 +34,18 @@ class Cursor
Cursor.cursorMode = null; Cursor.cursorMode = null;
} }
public static inline function toggle():Void
{
if (FlxG.mouse.visible)
{
hide();
}
else
{
show();
}
}
public static final CURSOR_DEFAULT_PARAMS:CursorParams = public static final CURSOR_DEFAULT_PARAMS:CursorParams =
{ {
graphic: "assets/images/cursor/cursor-default.png", graphic: "assets/images/cursor/cursor-default.png",

1
source/funkin/play/stage/StageData.hx
View file

@ -164,6 +164,7 @@ class StageDataParser
try try
{ {
var parser = new json2object.JsonParser<StageData>(); var parser = new json2object.JsonParser<StageData>();
parser.ignoreUnknownVariables = false;
parser.fromJson(rawJson, '$stageId.json'); parser.fromJson(rawJson, '$stageId.json');
if (parser.errors.length > 0) if (parser.errors.length > 0)

6
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -1010,7 +1010,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
function get_availableDifficulties():Array<String> function get_availableDifficulties():Array<String>
{ {
var m:Null<SongMetadata> = songMetadata.get(selectedVariation); var m:Null<SongMetadata> = songMetadata.get(selectedVariation);
return m?.playData?.difficulties ?? []; return m?.playData?.difficulties ?? [Constants.DEFAULT_DIFFICULTY];
} }
/** /**
@ -1069,7 +1069,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
var result:Null<SongChartData> = songChartData.get(selectedVariation); var result:Null<SongChartData> = songChartData.get(selectedVariation);
if (result == null) if (result == null)
{ {
result = new SongChartData(["normal" => 1.0], [], ["normal" => []]); result = new SongChartData([Constants.DEFAULT_DIFFICULTY => 1.0], [], [Constants.DEFAULT_DIFFICULTY => []]);
songChartData.set(selectedVariation, result); songChartData.set(selectedVariation, result);
} }
return result; return result;
@ -1293,6 +1293,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
function set_selectedDifficulty(value:String):String function set_selectedDifficulty(value:String):String
{ {
if (value == null) value = availableDifficulties[0] ?? Constants.DEFAULT_DIFFICULTY;
selectedDifficulty = value; selectedDifficulty = value;
// Make sure view is updated when the difficulty changes. // Make sure view is updated when the difficulty changes.

3
source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
View file

@ -687,6 +687,9 @@ class ChartEditorDialogHandler
Conductor.instrumentalOffset = state.currentInstrumentalOffset; // Loads from the metadata. Conductor.instrumentalOffset = state.currentInstrumentalOffset; // Loads from the metadata.
Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges); Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
state.selectedVariation = Constants.DEFAULT_VARIATION;
state.selectedDifficulty = state.availableDifficulties[0];
state.difficultySelectDirty = true; state.difficultySelectDirty = true;
dialog.hideDialog(DialogButton.APPLY); dialog.hideDialog(DialogButton.APPLY);