Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 16:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite freeplay state to use correct week IDs.

Browse source
This commit is contained in:
EliteMasterEric 2023-06-09 18:25:21 -04:00
parent 4dcdca51ae
commit 109676522a
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
source/funkin/FreeplayState.hx
View file

@ -41,7 +41,7 @@ import lime.utils.Assets;
class FreeplayState extends MusicBeatSubState class FreeplayState extends MusicBeatSubState
{ {
var songs:Array<SongMetadata> = []; var songs:Array<FreeplaySongData> = [];
// var selector:FlxText; // var selector:FlxText;
var curSelected:Int = 0; var curSelected:Int = 0;
@ -114,15 +114,15 @@ class FreeplayState extends MusicBeatSubState
#if debug #if debug
isDebug = true; isDebug = true;
addSong('Test', 1, 'bf-pixel'); addSong('Test', 'tutorial', 'bf-pixel');
addSong('Pyro', 8, 'darnell'); addSong('Pyro', 'weekend1', 'darnell');
#end #end
var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist')); var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));
for (i in 0...initSonglist.length) for (i in 0...initSonglist.length)
{ {
songs.push(new SongMetadata(initSonglist[i], 1, 'gf')); songs.push(new FreeplaySongData(initSonglist[i], 'tutorial', 'gf'));
} }
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
@ -131,27 +131,27 @@ class FreeplayState extends MusicBeatSubState
} }
// if (StoryMenuState.weekUnlocked[2] || isDebug) // if (StoryMenuState.weekUnlocked[2] || isDebug)
addWeek(['Bopeebo', 'Fresh', 'Dadbattle'], 1, ['dad']); addWeek(['Bopeebo', 'Fresh', 'Dadbattle'], 'week1', ['dad']);
// if (StoryMenuState.weekUnlocked[2] || isDebug) // if (StoryMenuState.weekUnlocked[2] || isDebug)
addWeek(['Spookeez', 'South', 'Monster'], 2, ['spooky', 'spooky', 'monster']); addWeek(['Spookeez', 'South', 'Monster'], 'week2', ['spooky', 'spooky', 'monster']);
// if (StoryMenuState.weekUnlocked[3] || isDebug) // if (StoryMenuState.weekUnlocked[3] || isDebug)
addWeek(['Pico', 'Philly-Nice', 'Blammed'], 3, ['pico']); addWeek(['Pico', 'Philly-Nice', 'Blammed'], 'week3', ['pico']);
// if (StoryMenuState.weekUnlocked[4] || isDebug) // if (StoryMenuState.weekUnlocked[4] || isDebug)
addWeek(['Satin-Panties', 'High', 'MILF'], 4, ['mom']); addWeek(['Satin-Panties', 'High', 'MILF'], 'week4', ['mom']);
// if (StoryMenuState.weekUnlocked[5] || isDebug) // if (StoryMenuState.weekUnlocked[5] || isDebug)
addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 5, ['parents-christmas', 'parents-christmas', 'monster-christmas']); addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 'week5', ['parents-christmas', 'parents-christmas', 'monster-christmas']);
// if (StoryMenuState.weekUnlocked[6] || isDebug) // if (StoryMenuState.weekUnlocked[6] || isDebug)
addWeek(['Senpai', 'Roses', 'Thorns'], 6, ['senpai', 'senpai', 'spirit']); addWeek(['Senpai', 'Roses', 'Thorns'], 'week6', ['senpai', 'senpai', 'spirit']);
// if (StoryMenuState.weekUnlocked[7] || isDebug) // if (StoryMenuState.weekUnlocked[7] || isDebug)
addWeek(['Ugh', 'Guns', 'Stress'], 7, ['tankman']); addWeek(['Ugh', 'Guns', 'Stress'], 'week7', ['tankman']);
addWeek(["Darnell", "lit-up", "2hot", "blazin"], 8, ['darnell']); addWeek(["Darnell", "lit-up", "2hot", "blazin"], 'weekend1', ['darnell']);
// LOAD MUSIC // LOAD MUSIC
@ -472,7 +472,7 @@ class FreeplayState extends MusicBeatSubState
grpCapsules.clear(); grpCapsules.clear();
// var regexp:EReg = regexp; // var regexp:EReg = regexp;
var tempSongs:Array<SongMetadata> = songs; var tempSongs:Array<FreeplaySongData> = songs;
if (filterStuff != null) if (filterStuff != null)
{ {
@ -561,19 +561,19 @@ class FreeplayState extends MusicBeatSubState
changeDiff(); changeDiff();
} }
public function addSong(songName:String, weekNum:Int, songCharacter:String) public function addSong(songName:String, levelId:String, songCharacter:String)
{ {
songs.push(new SongMetadata(songName, weekNum, songCharacter)); songs.push(new FreeplaySongData(songName, levelId, songCharacter));
} }
public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>) public function addWeek(songs:Array<String>, levelId:String, ?songCharacters:Array<String>)
{ {
if (songCharacters == null) songCharacters = ['bf']; if (songCharacters == null) songCharacters = ['bf'];
var num:Int = 0; var num:Int = 0;
for (song in songs) for (song in songs)
{ {
addSong(song, weekNum, songCharacters[num]); addSong(song, levelId, songCharacters[num]);
if (songCharacters.length != 1) num++; if (songCharacters.length != 1) num++;
} }
@ -885,7 +885,7 @@ class FreeplayState extends MusicBeatSubState
targetCharacter = 'pico'; targetCharacter = 'pico';
} }
// PlayState.storyWeek = songs[curSelected].week; PlayStatePlaylist.campaignId = songs[curSelected].levelId;
// Visual and audio effects. // Visual and audio effects.
FlxG.sound.play(Paths.sound('confirmMenu')); FlxG.sound.play(Paths.sound('confirmMenu'));
@ -1047,17 +1047,17 @@ enum abstract FilterType(String)
var ALL; var ALL;
} }
class SongMetadata class FreeplaySongData
{ {
public var songName:String = ""; public var songName:String = "";
public var week:Int = 0; public var levelId:String = "";
public var songCharacter:String = ""; public var songCharacter:String = "";
public var isFav:Bool = false; public var isFav:Bool = false;
public function new(song:String, week:Int, songCharacter:String, ?isFav:Bool = false) public function new(song:String, levelId:String, songCharacter:String, ?isFav:Bool = false)
{ {
this.songName = song; this.songName = song;
this.week = week; this.levelId = levelId;
this.songCharacter = songCharacter; this.songCharacter = songCharacter;
this.isFav = isFav; this.isFav = isFav;
} }