From 0fe726cefa926b2e4de6963acc0284090e2fed99 Mon Sep 17 00:00:00 2001 From: lemz Date: Sat, 22 Jun 2024 15:38:04 +0200 Subject: [PATCH] fix min, max --- source/funkin/play/notes/notekind/NoteKind.hx | 58 +++---------------- .../toolboxes/ChartEditorNoteDataToolbox.hx | 14 ++++- 2 files changed, 18 insertions(+), 54 deletions(-) diff --git a/source/funkin/play/notes/notekind/NoteKind.hx b/source/funkin/play/notes/notekind/NoteKind.hx index f2a44dc8a..7efa93de6 100644 --- a/source/funkin/play/notes/notekind/NoteKind.hx +++ b/source/funkin/play/notes/notekind/NoteKind.hx @@ -42,50 +42,6 @@ class NoteKind implements INoteScriptedClass return noteKind; } - /** - * Retrieve the value of the param with the given name - * If there exists no param with the given name then `null` is returned - * @param name Name of the param - * @return Null - */ - public function getParam(name:String):Null - { - for (param in params) - { - if (param.name == name) - { - return param.data.value; - } - } - - return null; - } - - /** - * Set the value of the param with the given name - * @param name Name of the param - * @param value New value - */ - public function setParam(name:String, value:Dynamic):Void - { - for (param in params) - { - if (param.name == name) - { - if (param.type == NoteKindParamType.INT || param.type == NoteKindParamType.FLOAT) - { - param.data.value = FlxMath.bound(value, param.data.min, param.data.max); - } - else - { - param.data.value = value; - } - - break; - } - } - } - /** * Retrieve all notes of this kind * @return Array @@ -131,14 +87,14 @@ typedef NoteKindParamData = /** * If `min` is null, there is no minimum */ - var min:Null; + ?min:Null, /** * If `max` is null, there is no maximum */ - var max:Null; + ?max:Null, - var value:Dynamic; + defaultValue:Dynamic } /** @@ -146,8 +102,8 @@ typedef NoteKindParamData = */ typedef NoteKindParam = { - var name:String; - var description:String; - var type:NoteKindParamType; - var data:NoteKindParamData; + name:String, + description:String, + type:NoteKindParamType, + data:NoteKindParamData } diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorNoteDataToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorNoteDataToolbox.hx index 278fc1fd6..751af5dff 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorNoteDataToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorNoteDataToolbox.hx @@ -82,13 +82,21 @@ class ChartEditorNoteDataToolbox extends ChartEditorBaseToolbox paramLabel.horizontalAlign = "right"; var paramStepper:NumberStepper = new NumberStepper(); - paramStepper.min = param.data.min; - paramStepper.max = param.data.max; - paramStepper.value = param.data.value; + paramStepper.value = param.data.defaultValue; paramStepper.precision = 1; paramStepper.step = 0.1; paramStepper.percentWidth = 100; + // this check should be unnecessary but for some reason even when min or max is null it will set it to 0 + if (param.data.min != null) + { + paramStepper.min = param.data.min; + } + if (param.data.max != null) + { + paramStepper.max = param.data.max; + } + addNoteKindParam(paramLabel, paramStepper); } }