cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

AUTOSAVE FOR NOTE EDITOR!

This commit is contained in:
Cameron Taylor 2020-12-25 04:09:14 -05:00
parent 3a60603ed4
commit 61326448af
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/ChartingState.hx
View File

@ -102,6 +102,9 @@ class ChartingState extends MusicBeatState
};
}
FlxG.mouse.visible = true;
FlxG.save.bind('funkin', 'ninjamuffin99');
tempBpm = _song.bpm;
addSection();
@ -175,6 +178,8 @@ class ChartingState extends MusicBeatState
loadJson(_song.song.toLowerCase());
});
var loadAutosaveBtn:FlxButton = new FlxButton(reloadSongJson.x, reloadSongJson.y + 60, 'load autosave', loadAutosave);
var stepperSpeed:FlxUINumericStepper = new FlxUINumericStepper(10, 80, 0.1, 1, 0.1, 10, 1);
stepperSpeed.value = _song.speed;
stepperSpeed.name = 'song_speed';
@ -206,6 +211,7 @@ class ChartingState extends MusicBeatState
tab_group_song.add(saveButton);
tab_group_song.add(reloadSong);
tab_group_song.add(reloadSongJson);
tab_group_song.add(loadAutosaveBtn);
tab_group_song.add(stepperBPM);
tab_group_song.add(stepperSpeed);
tab_group_song.add(player1DropDown);
@ -769,6 +775,8 @@ class ChartingState extends MusicBeatState
updateGrid();
updateNoteUI();
autosaveSong();
}
function getStrumTime(yPos:Float):Float
@ -829,11 +837,21 @@ class ChartingState extends MusicBeatState
FlxG.resetState();
}
var mp3File:Sound;
var waveForm:FlxSprite;
function drawWave():Void
function loadAutosave():Void
{
PlayState.SONG = Song.parseJSONshit(FlxG.save.data.autosave);
FlxG.resetState();
}
function autosaveSong():Void
{
FlxG.save.data.autosave = Json.stringify({
"song": _song,
"bpm": Conductor.bpm,
"sections": _song.notes.length,
'notes': _song.notes
});
FlxG.save.flush();
}
private function saveLevel()

11
source/Song.hx
View File

@ -58,10 +58,6 @@ class Song
// LOL GOING THROUGH THE BULLSHIT TO CLEAN IDK WHATS STRANGE
}
var swagShit:SwagSong = cast Json.parse(rawJson).song;
swagShit.validScore = true;
trace(swagShit.notes[0]);
// FIX THE CASTING ON WINDOWS/NATIVE
// Windows???
// trace(songData);
@ -80,6 +76,13 @@ class Song
daBpm = songData.bpm;
daSectionLengths = songData.sectionLengths; */
return parseJSONshit(rawJson);
}
public static function parseJSONshit(rawJson:String):SwagSong
{
var swagShit:SwagSong = cast Json.parse(rawJson).song;
swagShit.validScore = true;
return swagShit;
}
}