From d2da9469308a87335ead95950c1a0f494bb18376 Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Sun, 25 Feb 2024 22:14:26 -0700 Subject: [PATCH] fix actions builds (HOPEFULLY) --- commandline/commands/Update.hx | 10 ++--- libs.xml | 2 +- source/funkin/editors/charter/Charter.hx | 48 ++---------------------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/commandline/commands/Update.hx b/commandline/commands/Update.hx index 82a412a7..c354aca8 100644 --- a/commandline/commands/Update.hx +++ b/commandline/commands/Update.hx @@ -34,18 +34,14 @@ class Update { } for(lib in libs) { - // install libs - var globalism = lib.global == "true" ? "--global" : ""; + var globalism:Null = lib.global == "true" ? "--global" : null; switch(lib.type) { case "lib": prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}"...'); - Sys.command('haxelib $globalism install ${lib.name} ${lib.version != null ? " " + lib.version : " "}'); + Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}${globalism != null ? ' $globalism' : ''} --always'); case "git": prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}" from git url "${lib.url}"'); - if (lib.ref != null) - Sys.command('haxelib $globalism git ${lib.name} ${lib.url} ${lib.ref}'); - else - Sys.command('haxelib $globalism git ${lib.name} ${lib.url}'); + Sys.command('haxelib git ${lib.name} ${lib.url}${lib.ref != null ? ' ${lib.ref}' : ''}${globalism != null ? ' $globalism' : ''} --always'); default: prettyPrint('Cannot resolve library of type "${lib.type}"'); } diff --git a/libs.xml b/libs.xml index c9d647c9..50ebe3b9 100644 --- a/libs.xml +++ b/libs.xml @@ -9,7 +9,7 @@ - + diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index ced3a21a..5c1efe3d 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -529,48 +529,10 @@ class Charter extends UIState { buildNoteTypesUI(); refreshBPMSensitive(); + // Undo Stuffs :D __relinkSelection(); __relinkUndos(); __applyPlaytestInfo(); - - /* - var analyzer:AudioAnalyzer = new AudioAnalyzer(FlxG.sound.music); - var waveFormDetail:Int = 40; // min 1, max 40 - - var beatHeight:Float = Conductor.stepsPerBeat*40; - var measureHeight:Float = beatHeight*Conductor.beatsPerMeasure; - for (measure in 0...Std.int(Conductor.getMeasuresLength())) { - for (beat in 0...Std.int(Conductor.beatsPerMeasure)) { - var startTime:Float = Conductor.getTimeForStep((measure*Conductor.getMeasureLength()) + (beat*Conductor.stepsPerBeat)); - var endTime:Float = Conductor.getTimeForStep((measure*Conductor.getMeasureLength()) + ((beat+1)*Conductor.stepsPerBeat)); - - var anlyzedData:Array = [ - for (i in 0...Std.int(Conductor.stepsPerBeat*waveFormDetail)) - analyzer.analyze( - startTime + ((endTime-startTime)*(i/Std.int(Conductor.stepsPerBeat*waveFormDetail))), - startTime + ((endTime-startTime)*((i+1)/Std.int(Conductor.stepsPerBeat*waveFormDetail))) - ) - ]; - - var sprite:FlxSprite = new FlxSprite(0, (measureHeight*measure) + (beatHeight*beat)).makeGraphic( - 160, Std.int(Conductor.stepsPerBeat*40), 0, true - ); - sprite.cameras = [charterCamera]; - add(sprite); - - sprite.pixels.lock(); - for (i=>segement in anlyzedData) { - var w:Float = (160)*segement; - var x:Float = ((40*4) / 2) - (w / 2); - var h:Float = beatHeight/anlyzedData.length; - var y:Float = (beatHeight/Std.int(Conductor.stepsPerBeat*waveFormDetail))*i; - - sprite.pixels.fillRect(new Rectangle(x, y, w, h), 0xFFFFFFFF); - } - sprite.pixels.unlock(); - } - } - */ } public var __endStep:Float = 0; @@ -611,12 +573,8 @@ class Charter extends UIState { selection.push(cast n); else if (FlxG.keys.pressed.SHIFT) selection.remove(cast n); - else { - if (n is CharterNote) - deleteSingleSelection(n); - else - selection = [cast n]; - } + else + selection = [cast n]; } if (FlxG.mouse.justReleasedRight) {