cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-25 15:24:44 +00:00
Code Issues Releases Wiki Activity

dynamic chart difficulties in progress

Browse source
This commit is contained in:
Cameron Taylor 2022-01-31 14:16:28 -05:00
parent fc209188f2
commit 9f3a11a01a
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Main.hx
View file

@ -19,7 +19,7 @@ class Main extends Sprite
var framerate:Int = 60; // How many frames per second the game should run at. var framerate:Int = 60; // How many frames per second the game should run at.
#else #else
// TODO: This should probably be in the options menu? // TODO: This should probably be in the options menu?
var framerate:Int = 300; // How many frames per second the game should run at. var framerate:Int = 144; // How many frames per second the game should run at.
#end #end
var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode. var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode.
var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets

20
source/SongLoad.hx
View file

@ -12,6 +12,8 @@ typedef SwagSong =
{ {
var song:String; var song:String;
var notes:FunnyNotes; var notes:FunnyNotes;
var difficulties:Array<String>;
var noteMap:Map<String, Array<SwagSection>>;
var bpm:Float; var bpm:Float;
var needsVoices:Bool; var needsVoices:Bool;
var voiceList:Array<String>; var voiceList:Array<String>;
@ -119,6 +121,8 @@ class SongLoad
return { return {
song: 'Test', song: 'Test',
notes: {easy: [], normal: [], hard: []}, notes: {easy: [], normal: [], hard: []},
difficulties: ["easy", "normal", "hard"],
noteMap: new Map(),
bpm: 150, bpm: 150,
needsVoices: true, needsVoices: true,
player1: 'bf', player1: 'bf',
@ -210,10 +214,16 @@ class SongLoad
public static function parseJSONshit(rawJson:String):SwagSong public static function parseJSONshit(rawJson:String):SwagSong
{ {
var swagShit:SwagSong = cast Json.parse(rawJson).song; var songParsed:Dynamic = Json.parse(rawJson);
var swagShit:SwagSong = cast songParsed.song;
for (diff in Reflect.fields(Json.parse(rawJson).song.notes)) swagShit.difficulties = []; // reset it to default before load
swagShit.noteMap = new Map();
for (diff in Reflect.fields(songParsed.song.notes))
{ {
swagShit.difficulties.push(diff);
swagShit.noteMap[diff] = cast Reflect.field(songParsed.song.notes, diff);
castArrayToNoteData(swagShit.noteMap[diff]);
switch (diff) switch (diff)
{ {
case "easy": case "easy":
@ -224,9 +234,11 @@ class SongLoad
case "hard": case "hard":
castArrayToNoteData(swagShit.notes.hard); castArrayToNoteData(swagShit.notes.hard);
} }
trace(diff);
} }
trace(swagShit.noteMap.toString());
trace('that was just notemap string lol');
swagShit.validScore = true; swagShit.validScore = true;
trace("SONG SHIT ABOUTTA WEEK AGOOO"); trace("SONG SHIT ABOUTTA WEEK AGOOO");

2
source/modding/PolymodHandler.hx
View file

@ -182,7 +182,7 @@ class PolymodHandler
} }
#end #end
public static function getAllMods():Array<ModMetadata> public static function getAllMods():Array<#if cpp ModMetadata #else Dynamic #end> // this is shitty but ModMetadata isn't imported on HTML5! And I'm too lazy to actually do it properly!
{ {
#if cpp #if cpp
trace('Scanning the mods folder...'); trace('Scanning the mods folder...');