From 86a52c10c4a75c8e04eac9b453ade96fd1965043 Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:24:28 -0700 Subject: [PATCH] ok this is DONE --- .../funkin/editors/charter/ChartCreationScreen.hx | 14 ++++++++++++-- source/funkin/editors/charter/Charter.hx | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/source/funkin/editors/charter/ChartCreationScreen.hx b/source/funkin/editors/charter/ChartCreationScreen.hx index 259076ed..b37c3253 100644 --- a/source/funkin/editors/charter/ChartCreationScreen.hx +++ b/source/funkin/editors/charter/ChartCreationScreen.hx @@ -1,5 +1,7 @@ package funkin.editors.charter; +import flixel.text.FlxText.FlxTextFormat; +import flixel.text.FlxText.FlxTextFormatMarkerPair; import funkin.backend.shaders.CustomShader; import flixel.math.FlxRect; import funkin.game.Character; @@ -89,7 +91,9 @@ class ChartCreationScreen extends UISubstateWindow { strumLinePos: 0.75, }, strumLineList)); add(strumLineList); - addLabelOn(strumLineList, "Strumlines"); + addLabelOn(strumLineList, "Strumlines").applyMarkup( + "Strumlines $* Atleast 1 Strumline Required$", + [new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFAD1212), "$")]); strumLineList.dragCallback = (object:StrumLineButton, oldIndex:Int, newIndex:Int) -> {object.idText.text = 'Strumline - #${newIndex}';}; scrollSpeedTextBox.onChange(scrollSpeedTextBox.label.text); @@ -107,7 +111,13 @@ class ChartCreationScreen extends UISubstateWindow { closeButton.color = 0xFFFF0000; } - function createChart() { + public override function update(elapsed:Float) { + saveButton.selectable = strumLineList.buttons.members.length != 0; + saveButton.alpha = saveButton.field.alpha = saveButton.selectable ? 1 : 0.4; + super.update(elapsed); + } + + public function createChart() { scrollSpeedTextBox.onChange(scrollSpeedTextBox.label.text); var strumLines:Array = []; diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 636ac31b..5e957231 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -383,6 +383,7 @@ class Charter extends UIState { noteHoverer = new CharterNote(); noteHoverer.snappedToStrumline = noteHoverer.selectable = noteHoverer.autoAlpha = false; @:privateAccess noteHoverer.__animSpeed = 1.25; noteHoverer.typeText.visible = false; + noteHoverer.alpha = 0; // FUCK YOU NOTE HOVERER >:((( selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras = noteHoverer.cameras = [charterCamera];