gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge issues

Browse Source
This commit is contained in:
EliteMasterEric
2023-11-29 16:53:08 -05:00
parent eebb2e874f
commit 8ef380e0b2
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/debug/charting/ChartEditorState.hx
+1 -1
View File
@@ -4613,7 +4613,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
var prevDifficulty = availableDifficulties[availableDifficulties.length - 1];
selectedDifficulty = prevDifficulty;
Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
Conductor.mapTimeChanges(this.currentSongMetadata.timeChanges);
refreshDifficultyTreeSelection();
refreshMetadataToolbox();
source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
+9 -2
View File
@@ -1,5 +1,7 @@
package funkin.ui.debug.charting.commands;
import funkin.data.song.SongData.SongTimeChange;
/**
* A command which changes the starting BPM of the song.
*/
@@ -22,12 +24,12 @@ class ChangeStartingBPMCommand implements ChartEditorCommand
if (timeChanges == null || timeChanges.length == 0)
{
previousBPM = 100;
timeChanges = [new SongTimeChange(0, event.value)];
timeChanges = [new SongTimeChange(0, targetBPM)];
}
else
{
previousBPM = timeChanges[0].bpm;
timeChanges[0].bpm = event.value;
timeChanges[0].bpm = targetBPM;
}
state.currentSongMetadata.timeChanges = timeChanges;
@@ -51,4 +53,9 @@ class ChangeStartingBPMCommand implements ChartEditorCommand
Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
}
public function toString():String
{
return 'Change Starting BPM to ${targetBPM}';
}
}
source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
+6 -1
View File
@@ -11,6 +11,7 @@ import funkin.play.character.BaseCharacter.CharacterType;
import funkin.play.event.SongEvent;
import funkin.data.event.SongEventData;
import funkin.data.song.SongData.SongTimeChange;
import funkin.ui.debug.charting.commands.ChangeStartingBPMCommand;
import funkin.play.character.BaseCharacter.CharacterType;
import funkin.play.character.CharacterData;
import funkin.play.character.CharacterData.CharacterDataParser;
@@ -611,7 +612,11 @@ class ChartEditorToolboxHandler
if (event.value == null || event.value <= 0) return;
// Use a command so we can undo/redo this action.
state.performCommand(new ChangeStartingBPMCommand(event.value));
var startingBPM = state.currentSongMetadata.timeChanges[0].bpm;
if (event.value != startingBPM)
{
state.performCommand(new ChangeStartingBPMCommand(event.value));
}
};
inputBPM.value = state.currentSongMetadata.timeChanges[0].bpm;