AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed weekData from variable to function

Browse Source
This commit is contained in:
Lucky56 2021-06-19 11:45:07 +02:00
parent 62742a9f04
commit 858c0ce8f7
No known key found for this signature in database
GPG Key ID: 19E3875EAD1F8B8F
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/StoryMenuState.hx
View File

@ -23,7 +23,9 @@ class StoryMenuState extends MusicBeatState
{ {
var scoreText:FlxText; var scoreText:FlxText;
var weekData:Array<Dynamic> = [ static function weekData():Array<Dynamic>
{
return [
['Tutorial'], ['Tutorial'],
['Bopeebo', 'Fresh', 'Dad Battle'], ['Bopeebo', 'Fresh', 'Dad Battle'],
['Spookeez', 'South', "Monster"], ['Spookeez', 'South', "Monster"],
@ -32,6 +34,7 @@ class StoryMenuState extends MusicBeatState
['Cocoa', 'Eggnog', 'Winter Horrorland'], ['Cocoa', 'Eggnog', 'Winter Horrorland'],
['Senpai', 'Roses', 'Thorns'] ['Senpai', 'Roses', 'Thorns']
]; ];
}
var curDifficulty:Int = 1; var curDifficulty:Int = 1;
public static var weekUnlocked:Array<Bool> = []; public static var weekUnlocked:Array<Bool> = [];
@ -132,7 +135,7 @@ class StoryMenuState extends MusicBeatState
trace("Line 70"); trace("Line 70");
for (i in 0...weekData.length) for (i in 0...weekData().length)
{ {
var weekThing:MenuItem = new MenuItem(0, yellowBG.y + yellowBG.height + 10, i); var weekThing:MenuItem = new MenuItem(0, yellowBG.y + yellowBG.height + 10, i);
weekThing.y += ((weekThing.height + 20) * i); weekThing.y += ((weekThing.height + 20) * i);
@ -295,7 +298,7 @@ class StoryMenuState extends MusicBeatState
stopspamming = true; stopspamming = true;
} }
PlayState.storyPlaylist = weekData[curWeek]; PlayState.storyPlaylist = weekData()[curWeek];
PlayState.isStoryMode = true; PlayState.isStoryMode = true;
selectedWeek = true; selectedWeek = true;
@ -365,10 +368,10 @@ class StoryMenuState extends MusicBeatState
{ {
curWeek += change; curWeek += change;
if (curWeek >= weekData.length) if (curWeek >= weekData().length)
curWeek = 0; curWeek = 0;
if (curWeek < 0) if (curWeek < 0)
curWeek = weekData.length - 1; curWeek = weekData().length - 1;
var bullShit:Int = 0; var bullShit:Int = 0;
@ -394,7 +397,7 @@ class StoryMenuState extends MusicBeatState
grpWeekCharacters.members[2].setCharacter(weekCharacters[curWeek][2]); grpWeekCharacters.members[2].setCharacter(weekCharacters[curWeek][2]);
txtTracklist.text = "Tracks\n"; txtTracklist.text = "Tracks\n";
var stringThing:Array<String> = weekData[curWeek]; var stringThing:Array<String> = weekData()[curWeek];
for (i in stringThing) for (i in stringThing)
txtTracklist.text += "\n" + i; txtTracklist.text += "\n" + i;
@ -413,18 +416,7 @@ class StoryMenuState extends MusicBeatState
public static function unlockNextWeek(week:Int):Void public static function unlockNextWeek(week:Int):Void
{ {
// TODO: get the weekData from class (but making it static makes it dissapear when beating the week) if(week <= weekData().length - 1 && FlxG.save.data.weekUnlocked == week)
var weekData:Array<Dynamic> = [
['Tutorial'],
['Bopeebo', 'Fresh', 'Dad Battle'],
['Spookeez', 'South', "Monster"],
['Pico', 'Philly Nice', "Blammed"],
['Satin Panties', "High", "Milf"],
['Cocoa', 'Eggnog', 'Winter Horrorland'],
['Senpai', 'Roses', 'Thorns']
];
if(week <= weekData.length - 1 && FlxG.save.data.weekUnlocked == week)
{ {
weekUnlocked.push(true); weekUnlocked.push(true);
trace('Week ' + week + ' beat (Week ' + (week + 1) + ' unlocked)'); trace('Week ' + week + ' beat (Week ' + (week + 1) + ' unlocked)');