cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-21 17:39:20 +00:00
Code Issues Releases Wiki Activity

charting editor init fix

Browse source
This commit is contained in:
Cameron Taylor 2022-01-20 22:55:19 -05:00
parent 7e1ea55ca9
commit 8df7eb4044
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/ChartingState.hx
View file

@ -130,18 +130,7 @@ class ChartingState extends MusicBeatState
_song = PlayState.SONG;
else
{
_song = {
song: 'Test',
notes: {easy: [], normal: [], hard: []},
bpm: 150,
needsVoices: true,
player1: 'bf',
player2: 'dad',
speed: {easy: 1, normal: 1, hard: 1},
validScore: false,
voiceList: ["BF", "BF-pixel"],
extraNotes: []
};
_song = SongLoad.songData = SongLoad.getDefaultSwagSong();
}
FlxG.mouse.visible = true;

34
source/SongLoad.hx
View file

@ -77,14 +77,18 @@ class SongLoad
diff = SongLoad.curDiff;
var songShit:Array<SwagSection> = [];
switch (diff)
if (songData != null)
{
case 'easy':
songShit = songData.notes.easy;
case 'normal':
songShit = songData.notes.normal;
case 'hard':
songShit = songData.notes.hard;
switch (diff)
{
case 'easy':
songShit = songData.notes.easy;
case 'normal':
songShit = songData.notes.normal;
case 'hard':
songShit = songData.notes.hard;
}
}
return songShit;
@ -109,6 +113,22 @@ class SongLoad
return speedShit;
}
public static function getDefaultSwagSong():SwagSong
{
return {
song: 'Test',
notes: {easy: [], normal: [], hard: []},
bpm: 150,
needsVoices: true,
player1: 'bf',
player2: 'dad',
speed: {easy: 1, normal: 1, hard: 1},
validScore: false,
voiceList: ["BF", "BF-pixel"],
extraNotes: []
};
}
public static function parseJSONshit(rawJson:String):SwagSong
{
var swagShit:SwagSong = cast Json.parse(rawJson).song;