v5.0h2

dombomb64 · dombomb64 · commit f35bd3e89b11 · 2023-04-17T18:53:11.000-04:00
diff --git a/assets/preload/weeks/weekList.txt b/assets/preload/weeks/weekList.txt
@@ -1,8 +1,29 @@
-tutorial
-week1
-week2
-week3
-week4
-week5
-week6
-week7
+sss1
+sss1freeplay
+sss2
+sss2freeplay1
+sss2freeplay2
+sss3
+sss3freeplay1
+sss3freeplay2
+sss3freeplay3
+sss4
+sss4freeplay1
+sss4freeplay2
+sss4freeplay3
+sss4freeplay4
+sss5
+sss5freeplay1
+sss5freeplay2
+sss5freeplay3
+sss5freeplay4
+sss5freeplay5
+wwwfinale
+zzzJoke
+zzzJoke1
+zzzJoke2
+zzzJoke3
+zzzJoke4
+zzzJoke5
+zzzJoke6
+zzzJoke7
diff --git a/example_mods/Funkin in Sunny Side Skies/data/raveyard/raveyard.lua b/example_mods/Funkin in Sunny Side Skies/data/raveyard/raveyard.lua
@@ -32,7 +32,7 @@ end
 
 function onTimerCompleted(tag, loops, loopsLeft)
 	if tag == 'startDialogue' then -- Timer completed, play dialogue
-		startDialogue('frustration', 'chase');
+		startDialogue('dialogue', 'frustration');
 	end
 end
 
diff --git a/example_mods/Funkin in Sunny Side Skies/data/rematch-unfair/rematch-unfair.lua b/example_mods/Funkin in Sunny Side Skies/data/rematch-unfair/rematch-unfair.lua
@@ -1,5 +1,5 @@
 function onCreate()
-	makeAnimatedLuaSprite('chaseBg', 'characters/chaseBgNutshell', 600, 0);
+	makeAnimatedLuaSprite('chaseBg', 'songSprites/chaseRematch', 600, 0);
 	addLuaSprite('chaseBg', true);
 	setProperty('chaseBg.scale.x', 3);
 	setProperty('chaseBg.scale.y', 3);
diff --git a/example_mods/Funkin in Sunny Side Skies/data/rematch/rematch.lua b/example_mods/Funkin in Sunny Side Skies/data/rematch/rematch.lua
@@ -1,5 +1,5 @@
 function onCreate()
-	makeAnimatedLuaSprite('chaseBg', 'characters/chaseBgNutshell', 600, 0);
+	makeAnimatedLuaSprite('chaseBg', 'songSprites/chaseRematch', 600, 0);
 	addLuaSprite('chaseBg', true);
 	setProperty('chaseBg.scale.x', 3);
 	setProperty('chaseBg.scale.y', 3);
diff --git a/example_mods/Funkin in Sunny Side Skies/sounds/cancelMenu.ogg b/example_mods/Funkin in Sunny Side Skies/sounds/cancelMenu.ogg
diff --git a/example_mods/Funkin in Sunny Side Skies/sounds/confirmMenu.ogg b/example_mods/Funkin in Sunny Side Skies/sounds/confirmMenu.ogg
diff --git a/example_mods/Funkin in Sunny Side Skies/sounds/playFreeplay.ogg b/example_mods/Funkin in Sunny Side Skies/sounds/playFreeplay.ogg
diff --git a/example_mods/Funkin in Sunny Side Skies/sounds/scrollMenu.ogg b/example_mods/Funkin in Sunny Side Skies/sounds/scrollMenu.ogg
diff --git a/source/ClientPrefs.hx b/source/ClientPrefs.hx
@@ -255,6 +255,7 @@ class ClientPrefs {
 				menuSoundSuffix = '';
 			else
 				menuSoundSuffix = 'LoFi';
+			//trace(menuMusic + ', ' + menuSoundSuffix);
 		//}
 		if(FlxG.save.data.gameplaySettings != null)
 		{
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -414,6 +414,7 @@ class FreeplayState extends MusicBeatState
 	}
 
 	public static function weekIsLocked(name:String):Bool {
+		//trace(WeekData.weeksLoaded);
 		var leWeek:WeekData = WeekData.weeksLoaded.get(name);
 		var isFinale:Bool = leWeek.finale;
 		var finaleSatisfied:Bool = true;
@@ -870,6 +871,7 @@ class FreeplayState extends MusicBeatState
 
 	function changeSelection(change:Int = 0, playSound:Bool = true)
 	{
+		//trace(ClientPrefs.menuSoundSuffix);
 		if (playSound) FlxG.sound.play(Paths.sound('scrollMenu' + ClientPrefs.menuSoundSuffix));
 
 		curSelected += change;
@@ -1164,8 +1166,10 @@ class FreeplayState extends MusicBeatState
 		icon.clipRect = new FlxRect(clipOffset.x, clipOffset.y, initSize.x, initSize.y); // Crop it like it's an image in that box
 	}
 
-	public static function loadSongs()
+	public static function loadSongs(isStoryMode:Bool = false)
 	{
+		WeekData.reloadWeekFiles(isStoryMode);
+		//trace(WeekData.weeksLoaded);
 		songs = [];
 		for (i in 0...WeekData.weeksList.length) {
 			if(weekIsLocked(WeekData.weeksList[i])) continue;
diff --git a/source/Highscore.hx b/source/Highscore.hx
@@ -74,6 +74,7 @@ class Highscore
 	public static function saveWeekScore(week:String, score:Int = 0, ?diff:Int = 0):Void
 	{
 		var daWeek:String = formatSong(week, diff);
+		//trace(daWeek);
 
 		if (weekScores.exists(daWeek))
 		{
@@ -175,6 +176,7 @@ class Highscore
 	public static function getWeekScore(week:String, diff:Int):Int
 	{
 		var daWeek:String = formatSong(week, diff);
+		//trace(daWeek);
 		if (!weekScores.exists(daWeek))
 			setWeekScore(daWeek, 0);
 
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -26,7 +26,7 @@ using StringTools;
 class MainMenuState extends MusicBeatState
 {
 	public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC // It still said 0.6.2, FTFY
-	public static var fsssVersion:String = '5.0';
+	public static var fsssVersion:String = '5.0h2';
 	public static var curSelected:Int = 0;
 
 	var menuItems:FlxTypedGroup<FlxSprite>;
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -5881,15 +5881,18 @@ class PlayState extends MusicBeatState
 						triggerEventNote('Change Character', 'boyfriend', getFlipnoteBlueString(boyfriend.curCharacter));
 
 						for (note in notes) {
+							//trace(note.texture);
 							//note.texture = note.texture.replace('FlipnoteRed', 'FlipnoteBlue');
-							note.texture = getFlipnoteBlueString(note.texture);
+							//note.texture = getFlipnoteBlueString(note.texture);
+							note.texture = 'noteAssetsFlipnoteBlue';
 							//note.noteSplashTexture = note.noteSplashTexture.replace('FlipnoteRed', 'FlipnoteBlue');
 							note.noteSplashTexture = getFlipnoteBlueString(note.noteSplashTexture);
 							note.multSpeed = note.multSpeed;
 						}
 						for (note in unspawnNotes) {
 							//note.texture = note.texture.replace('FlipnoteRed', 'FlipnoteBlue');
-							note.texture = getFlipnoteBlueString(note.texture);
+							//note.texture = getFlipnoteBlueString(note.texture);
+							note.texture = 'noteAssetsFlipnoteBlue';
 							//note.noteSplashTexture = note.noteSplashTexture.replace('FlipnoteRed', 'FlipnoteBlue');
 							note.noteSplashTexture = getFlipnoteBlueString(note.noteSplashTexture);
 							note.multSpeed = note.multSpeed;
@@ -5912,12 +5915,14 @@ class PlayState extends MusicBeatState
 						triggerEventNote('Change Character', 'boyfriend', getFlipnoteRedString(boyfriend.curCharacter));
 
 						for (note in notes) {
-							note.texture = getFlipnoteRedString(note.texture);
+							//note.texture = getFlipnoteRedString(note.texture);
+							note.texture = 'noteAssetsFlipnoteRed';
 							note.noteSplashTexture = getFlipnoteRedString(note.noteSplashTexture);
 							note.multSpeed = note.multSpeed;
 						}
 						for (note in unspawnNotes) {
-							note.texture = getFlipnoteRedString(note.texture);
+							//note.texture = getFlipnoteRedString(note.texture);
+							note.texture = 'noteAssetsFlipnoteRed';
 							note.noteSplashTexture = getFlipnoteRedString(note.noteSplashTexture);
 							note.multSpeed = note.multSpeed;
 						}
@@ -6172,6 +6177,8 @@ class PlayState extends MusicBeatState
 					ClientPrefs.playMenuMusic();
 
 					cancelMusicFadeTween();
+					//isStoryMode = false;
+					FreeplayState.loadSongs(false);
 					if(FlxTransitionableState.skipNextTransIn) {
 						CustomFadeTransition.nextCamera = null;
 					}
@@ -6183,13 +6190,16 @@ class PlayState extends MusicBeatState
 						if (FlxG.save.data.finaleCompleted == null)
 							FlxG.save.data.finaleCompleted = false;
 					}
+					//isStoryMode = true;
 
 					// if ()
 					if(!ClientPrefs.getGameplaySetting('practice', false) && !ClientPrefs.getGameplaySetting('botplay', false)) {
 						StoryMenuState.weekCompleted.set(WeekData.weeksList[storyWeek], true);
 
 						if (SONG.validScore)
 						{
+							//trace('Saving Week Score');
+							WeekData.reloadWeekFiles(true);
 							Highscore.saveWeekScore(WeekData.getWeekFileName(), campaignScore, storyDifficulty);
 						}
 
diff --git a/source/WeekData.hx b/source/WeekData.hx
@@ -89,7 +89,7 @@ class WeekData {
 		this.fileName = fileName;
 	}
 
-	public static function reloadWeekFiles(isStoryMode:Null<Bool> = false)
+	public static function reloadWeekFiles(isStoryMode:Null<Bool> = false/*, removeDuplicates:Bool = false*/)
 	{
 		weeksList = [];
 		weeksLoaded.clear();
@@ -138,6 +138,7 @@ class WeekData {
 
 		var sexList:Array<String> = CoolUtil.coolTextFile(Paths.getPreloadPath('weeks/weekList.txt'));
 		for (i in 0...sexList.length) {
+			//trace(sexList[i]);
 			for (j in 0...directories.length) {
 				var fileToCheck:String = directories[j] + 'weeks/' + sexList[i] + '.json';
 				if(!weeksLoaded.exists(sexList[i])) {
@@ -151,6 +152,7 @@ class WeekData {
 						}
 						#end
 
+						//trace(weekFile.fileName);
 						if(weekFile != null && (isStoryMode == null || (isStoryMode && !weekFile.hideStoryMode) || (!isStoryMode && !weekFile.hideFreeplay))) {
 							weeksLoaded.set(sexList[i], weekFile);
 							weeksList.push(sexList[i]);
@@ -170,7 +172,7 @@ class WeekData {
 					var path:String = directory + daWeek + '.json';
 					if(sys.FileSystem.exists(path))
 					{
-						addWeek(daWeek, path, directories[i], i, originalLength);
+						addWeek(daWeek, path, directories[i], i, originalLength, isStoryMode);
 					}
 				}
 
@@ -179,30 +181,39 @@ class WeekData {
 					var path = haxe.io.Path.join([directory, file]);
 					if (!sys.FileSystem.isDirectory(path) && file.endsWith('.json'))
 					{
-						addWeek(file.substr(0, file.length - 5), path, directories[i], i, originalLength);
+						addWeek(file.substr(0, file.length - 5), path, directories[i], i, originalLength, isStoryMode);
 					}
 				}
 			}
 		}
+
+		/*if (removeDuplicates) {
+			var i = 0;
+			for (week in weeksList) {
+				if (i % 2 == 0) {
+					weeksList.remove(week);
+					i--;
+				}
+				i++;
+			}
+		}*/
 		#end
 	}
 
-	private static function addWeek(weekToCheck:String, path:String, directory:String, i:Int, originalLength:Int)
+	private static function addWeek(weekToCheck:String, path:String, directory:String, i:Int, originalLength:Int, ?isStoryMode:Bool = null)
 	{
-		if(!weeksLoaded.exists(weekToCheck))
-		{
+		if (isStoryMode == null)
+			isStoryMode = PlayState.isStoryMode;
+		if (!weeksLoaded.exists(weekToCheck)) {
 			var week:WeekFile = getWeekFile(path);
-			if(week != null)
-			{
+			if (week != null) {
 				var weekFile:WeekData = new WeekData(week, weekToCheck);
-				if(i >= originalLength)
-				{
+				if (i >= originalLength) {
 					#if MODS_ALLOWED
 					weekFile.folder = directory.substring(Paths.mods().length, directory.length-1);
 					#end
 				}
-				if((PlayState.isStoryMode && !weekFile.hideStoryMode) || (!PlayState.isStoryMode && !weekFile.hideFreeplay))
-				{
+				if ((PlayState.isStoryMode && !weekFile.hideStoryMode) || (!PlayState.isStoryMode && !weekFile.hideFreeplay)) {
 					weeksLoaded.set(weekToCheck, weekFile);
 					weeksList.push(weekToCheck);
 				}

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ class ClientPrefs {`
`255`	`255`	`menuSoundSuffix = '';`
`256`	`256`	`else`
`257`	`257`	`menuSoundSuffix = 'LoFi';`
	`258`	`+ //trace(menuMusic + ', ' + menuSoundSuffix);`
`258`	`259`	`//}`
`259`	`260`	`if(FlxG.save.data.gameplaySettings != null)`
`260`	`261`	`{`
Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,7 @@ class FreeplayState extends MusicBeatState`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`public static function weekIsLocked(name:String):Bool {`
	`417`	`+ //trace(WeekData.weeksLoaded);`
`417`	`418`	`var leWeek:WeekData = WeekData.weeksLoaded.get(name);`
`418`	`419`	`var isFinale:Bool = leWeek.finale;`
`419`	`420`	`var finaleSatisfied:Bool = true;`
`@@ -870,6 +871,7 @@ class FreeplayState extends MusicBeatState`
`870`	`871`
`871`	`872`	`function changeSelection(change:Int = 0, playSound:Bool = true)`
`872`	`873`	`{`
	`874`	`+ //trace(ClientPrefs.menuSoundSuffix);`
`873`	`875`	`if (playSound) FlxG.sound.play(Paths.sound('scrollMenu' + ClientPrefs.menuSoundSuffix));`
`874`	`876`
`875`	`877`	`curSelected += change;`
`@@ -1164,8 +1166,10 @@ class FreeplayState extends MusicBeatState`
`1164`	`1166`	`icon.clipRect = new FlxRect(clipOffset.x, clipOffset.y, initSize.x, initSize.y); // Crop it like it's an image in that box`
`1165`	`1167`	`}`
`1166`	`1168`
`1167`		`- public static function loadSongs()`
	`1169`	`+ public static function loadSongs(isStoryMode:Bool = false)`
`1168`	`1170`	`{`
	`1171`	`+ WeekData.reloadWeekFiles(isStoryMode);`
	`1172`	`+ //trace(WeekData.weeksLoaded);`
`1169`	`1173`	`songs = [];`
`1170`	`1174`	`for (i in 0...WeekData.weeksList.length) {`
`1171`	`1175`	`if(weekIsLocked(WeekData.weeksList[i])) continue;`