cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-29 00:08:11 +00:00
Code Issues Releases Wiki Activity

song icon formatting

Browse source
This commit is contained in:
Cameron Taylor 2021-03-01 16:46:08 -05:00
parent b1b3df25b5
commit 15a57a34af
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/FreeplayState.hx
View file

@ -34,7 +34,7 @@ class FreeplayState extends MusicBeatState
for (i in 0...initSonglist.length) for (i in 0...initSonglist.length)
{ {
songs.push(new SongMetadata(initSonglist[i], 1)); songs.push(new SongMetadata(initSonglist[i], 1, 'dad'));
} }
/* /*
@ -52,19 +52,19 @@ class FreeplayState extends MusicBeatState
#end #end
if (StoryMenuState.weekUnlocked[2] || isDebug) if (StoryMenuState.weekUnlocked[2] || isDebug)
addWeek(['Spookeez', 'South', 'Monster'], 2); addWeek(['Spookeez', 'South', 'Monster'], 2, ['spooky']);
if (StoryMenuState.weekUnlocked[3] || isDebug) if (StoryMenuState.weekUnlocked[3] || isDebug)
addWeek(['Pico', 'Philly', 'Blammed'], 3); addWeek(['Pico', 'Philly', 'Blammed'], 3, ['pico']);
if (StoryMenuState.weekUnlocked[4] || isDebug) if (StoryMenuState.weekUnlocked[4] || isDebug)
addWeek(['Satin-Panties', 'High', 'Milf'], 4); addWeek(['Satin-Panties', 'High', 'Milf'], 4, ['mom']);
if (StoryMenuState.weekUnlocked[5] || isDebug) if (StoryMenuState.weekUnlocked[5] || isDebug)
addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 5); addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 5, ['parents-christmas', 'parents-christmas', 'monster-christmas']);
if (StoryMenuState.weekUnlocked[6] || isDebug) if (StoryMenuState.weekUnlocked[6] || isDebug)
addWeek(['Senpai', 'Roses', 'Thorns'], 6); addWeek(['Senpai', 'Roses', 'Thorns'], 6, ['senpai', 'senpai', 'spirit']);
// LOAD MUSIC // LOAD MUSIC
@ -135,16 +135,23 @@ class FreeplayState extends MusicBeatState
super.create(); super.create();
} }
public function addSong(songName:String, weekNum:Int) public function addSong(songName:String, weekNum:Int, songCharacter:String)
{ {
songs.push(new SongMetadata(songName, weekNum)); songs.push(new SongMetadata(songName, weekNum, songCharacter));
} }
public function addWeek(songs:Array<String>, weekNum:Int) public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>)
{ {
if (songCharacters == null)
songCharacters = ['bf'];
var num:Int = 0;
for (song in songs) for (song in songs)
{ {
addSong(song, weekNum); addSong(song, weekNum, songCharacters[num]);
if (songCharacters.length != 1)
num++;
} }
} }
@ -277,10 +284,12 @@ class SongMetadata
{ {
public var songName:String = ""; public var songName:String = "";
public var week:Int = 0; public var week:Int = 0;
public var songCharacter:String = "";
public function new(song:String, week:Int) public function new(song:String, week:Int, songCharacter:String)
{ {
this.songName = song; this.songName = song;
this.week = week; this.week = week;
this.songCharacter = songCharacter;
} }
} }