Skip to content

Commit 0fdfece

Browse files
committed
v5.0h3
1 parent f35bd3e commit 0fdfece

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed
8.8 KB
Binary file not shown.
23.3 KB
Binary file not shown.
21.5 KB
Binary file not shown.
5.97 KB
Binary file not shown.

source/FreeplayState.hx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class FreeplayState extends MusicBeatState
111111
DiscordClient.changePresence("Freeplay Menu", null);
112112
#end
113113

114+
//trace(StoryMenuState.weekCompleted);
114115
for (i in 0...WeekData.weeksList.length) {
115116
if(weekIsLocked(WeekData.weeksList[i])) continue;
116117

@@ -227,23 +228,23 @@ class FreeplayState extends MusicBeatState
227228
Paths.currentModDirectory = songs[i].folder;
228229

229230
var iconName = songs[i].songCharacter;
230-
var iconHasShader = false;
231+
/*var iconHasShader = false;
231232
if (ClientPrefs.shaders && (iconName.endsWith('FlipnoteRed') || iconName.endsWith('FlipnoteBlue')))
232233
{
233234
iconName = PlayState.getFlipnoteShaderString(iconName);
234235
iconHasShader = true;
235236
}
236237
else if (!ClientPrefs.shaders && (iconName.endsWith('FlipnoteShader')))
237-
iconName = PlayState.getFlipnoteRedString(iconName);
238+
iconName = PlayState.getFlipnoteRedString(iconName);*/
238239

239240
var icon:HealthIcon;
240241
if (!HealthIcon.hasWinningIcon(iconName))
241242
icon = new HealthIcon(iconName);
242243
else
243244
icon = new CoolIcon(iconName);
244245
icon.sprTracker = songText;
245-
if (iconHasShader)
246-
icon.shader = new FlipnoteDither.FlipnoteDitherShader();
246+
//if (iconHasShader)
247+
//icon.shader = new FlipnoteDither.FlipnoteDitherShader();
247248
//trace(icon.x + ', ' + icon.y);
248249
//icon.forceUpdate();
249250
//trace(icon.x + ', ' + icon.y);
@@ -445,6 +446,7 @@ class FreeplayState extends MusicBeatState
445446
}
446447
//trace(finaleSatisfied);
447448
}
449+
//trace(leWeek.fileName + ' locked? ' + ((!leWeek.startUnlocked && leWeek.weekBefore.length > 0 && (!StoryMenuState.weekCompleted.exists(leWeek.weekBefore) || !StoryMenuState.weekCompleted.get(leWeek.weekBefore))) && ((isFinale && !finaleSatisfied) || !isFinale)) + ', ' + !StoryMenuState.weekCompleted.exists(leWeek.weekBefore) + ', ' + !StoryMenuState.weekCompleted.get(leWeek.weekBefore) + ', ' + ((isFinale && !finaleSatisfied) || !isFinale));
448450
return (!leWeek.startUnlocked && leWeek.weekBefore.length > 0 && (!StoryMenuState.weekCompleted.exists(leWeek.weekBefore) || !StoryMenuState.weekCompleted.get(leWeek.weekBefore))) && ((isFinale && !finaleSatisfied) || !isFinale);
449451
}
450452

source/PlayState.hx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6194,7 +6194,11 @@ class PlayState extends MusicBeatState
61946194

61956195
// if ()
61966196
if(!ClientPrefs.getGameplaySetting('practice', false) && !ClientPrefs.getGameplaySetting('botplay', false)) {
6197+
WeekData.reloadWeekFiles(true);
6198+
//trace(StoryMenuState.weekCompleted);
6199+
//trace(WeekData.weeksList);
61976200
StoryMenuState.weekCompleted.set(WeekData.weeksList[storyWeek], true);
6201+
//trace(StoryMenuState.weekCompleted);
61986202

61996203
if (SONG.validScore)
62006204
{

0 commit comments

Comments
 (0)