diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx index d3d212e8..b0002c51 100644 --- a/source/funkin/editors/charter/CharterSelection.hx +++ b/source/funkin/editors/charter/CharterSelection.hx @@ -46,30 +46,4 @@ class CharterSelection extends EditorTreeMenu { var idk:OptionsScreen = optionsTree.members.last(); if (idk.members.length > 0) idk.changeSelection(1); } - - public override function update(elapsed:Float) { - super.update(elapsed); - - bg.colorTransform.redOffset = lerp(bg.colorTransform.redOffset, 0, 0.0625); - bg.colorTransform.greenOffset = lerp(bg.colorTransform.greenOffset, 0, 0.0625); - bg.colorTransform.blueOffset = lerp(bg.colorTransform.blueOffset, 0, 0.0625); - bg.colorTransform.redMultiplier = lerp(bg.colorTransform.redMultiplier, 1, 0.0625); - bg.colorTransform.greenMultiplier = lerp(bg.colorTransform.greenMultiplier, 1, 0.0625); - bg.colorTransform.blueMultiplier = lerp(bg.colorTransform.blueMultiplier, 1, 0.0625); - } - - public override function onMenuChange() { - super.onMenuChange(); - if (optionsTree.members.length > 1) { // selected a song - // small flashbang - var color:FlxColor = freeplayList.songs[main.curSelected].parsedColor.getDefault(0xFFFFFFFF); - - bg.colorTransform.redOffset = 0.25 * color.red; - bg.colorTransform.greenOffset = 0.25 * color.green; - bg.colorTransform.blueOffset = 0.25 * color.blue; - bg.colorTransform.redMultiplier = FlxMath.lerp(1, color.redFloat, 0.25); - bg.colorTransform.greenMultiplier = FlxMath.lerp(1, color.greenFloat, 0.25); - bg.colorTransform.blueMultiplier = FlxMath.lerp(1, color.blueFloat, 0.25); - } - } } \ No newline at end of file diff --git a/source/funkin/editors/charter/MetaDataScreen.hx b/source/funkin/editors/charter/MetaDataScreen.hx index 9c38a2d6..ab5073c3 100644 --- a/source/funkin/editors/charter/MetaDataScreen.hx +++ b/source/funkin/editors/charter/MetaDataScreen.hx @@ -12,8 +12,8 @@ class MetaDataScreen extends UISubstateWindow { public var songNameTextBox:UITextBox; public var bpmStepper:UINumericStepper; - public var stepsPerBeatStepper:UINumericStepper; public var beatsPerMesureStepper:UINumericStepper; + public var stepsPerBeatStepper :UINumericStepper; public var needsVoicesCheckbox:UICheckbox; public var displayNameTextBox:UITextBox; @@ -53,16 +53,16 @@ class MetaDataScreen extends UISubstateWindow { add(bpmStepper); addLabelOn(bpmStepper, "BPM"); - stepsPerBeatStepper = new UINumericStepper(bpmStepper.x + 60 + 26, bpmStepper.y, metadata.stepsPerBeat, 1, 0, 1, null, 54); - add(stepsPerBeatStepper); - addLabelOn(stepsPerBeatStepper, "Time Signature"); - - add(new UIText(stepsPerBeatStepper.x + 30, stepsPerBeatStepper.y + 3, 0, "/", 22)); - - beatsPerMesureStepper = new UINumericStepper(stepsPerBeatStepper.x + 30 + 24, stepsPerBeatStepper.y, metadata.beatsPerMesure, 1, 0, 1, null, 54); + beatsPerMesureStepper = new UINumericStepper(bpmStepper.x + 60 + 26, bpmStepper.y, metadata.stepsPerBeat, 1, 0, 1, null, 54); add(beatsPerMesureStepper); + addLabelOn(beatsPerMesureStepper, "Time Signature"); - needsVoicesCheckbox = new UICheckbox(beatsPerMesureStepper.x + 80 + 26, beatsPerMesureStepper.y, "Voices", metadata.needsVoices); + add(new UIText(beatsPerMesureStepper.x + 30, beatsPerMesureStepper.y + 3, 0, "/", 22)); + + stepsPerBeatStepper = new UINumericStepper(beatsPerMesureStepper.x + 30 + 24, beatsPerMesureStepper.y, metadata.beatsPerMesure, 1, 0, 1, null, 54); + add(stepsPerBeatStepper); + + needsVoicesCheckbox = new UICheckbox(stepsPerBeatStepper.x + 80 + 26, stepsPerBeatStepper.y, "Voices", metadata.needsVoices); add(needsVoicesCheckbox); addLabelOn(needsVoicesCheckbox, "Needs Voices"); needsVoicesCheckbox.y += 6; needsVoicesCheckbox.x += 4; @@ -135,14 +135,14 @@ class MetaDataScreen extends UISubstateWindow { } public function saveMeta() { - for (stepper in [bpmStepper, stepsPerBeatStepper, beatsPerMesureStepper]) + for (stepper in [bpmStepper, beatsPerMesureStepper, stepsPerBeatStepper]) @:privateAccess stepper.__onChange(stepper.label.text); PlayState.SONG.meta = { name: songNameTextBox.label.text, bpm: bpmStepper.value, - stepsPerBeat: Std.int(stepsPerBeatStepper.value), beatsPerMesure: Std.int(beatsPerMesureStepper.value), + stepsPerBeat: Std.int(stepsPerBeatStepper.value), needsVoices: needsVoicesCheckbox.checked, displayName: displayNameTextBox.label.text, icon: iconTextBox.label.text, diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index acf7e6cf..9b31525b 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -925,7 +925,7 @@ class PlayState extends MusicBeatState camZoomingInterval = cast songData.meta.beatsPerMesure.getDefault(4); - Conductor.changeBPM(songData.meta.bpm); + Conductor.changeBPM(songData.meta.bpm, cast songData.meta.beatsPerMesure.getDefault(4), cast songData.meta.stepsPerBeat.getDefault(4)); curSong = songData.meta.name.toLowerCase();