merge main into mobile

Author: JordanSantiagoYT

source/ClientPrefs.hx

@@ -203,6 +203,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y
 	public static var JSEngineRecharts:Bool = false;
 	public static var alwaysTriggerCutscene:Bool = false;
 	public static var disableSplash:Bool = false;
+	public static var rainbowTime:Float = 5.0;
 
 	//Gameplay Modifiers
 	public static var gameplaySettings:Map<String, Dynamic> = [

source/MainMenuState.hx

@@ -23,7 +23,7 @@ using StringTools;
 
 class MainMenuState extends MusicBeatState
 {
-	public static var psychEngineJSVersion:String = '1.43.0'; //This is also used for Discord RPC
+	public static var psychEngineJSVersion:String = '1.44.0'; //This is also used for Discord RPC
 	public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
 	public static var curSelected:Int = 0;
 

source/Note.hx

@@ -533,7 +533,7 @@ class Note extends FlxSprite
 		{
 			case 'Rainbow':
 			superCoolColor = new FlxColor(0xFFFF0000);
-			superCoolColor.hue = (strumTime / 5000 * 360) % 360;
+			superCoolColor.hue = (strumTime / (ClientPrefs.rainbowTime * 1000) * 360) % 360;
 			rgbShader.r = superCoolColor;
 			rgbShader.g = FlxColor.WHITE;
 			rgbShader.b = superCoolColor.getDarkened(0.7);

source/options/MiscSettingsSubState.hx

@@ -32,7 +32,7 @@ class MiscSettingsSubState extends BaseOptionsMenu
 		rpcTitle = 'Miscellaneous Settings Menu'; //for Discord Rich Presence
 
 		var option:Option = new Option('Use JS Engine Recharts', //Name
-			'If checked, the base game charts will use the JS Engine specific recharts.', //Description
+			'If checked, songs will have an optional "JSHard" difficulty (if available.)\nUse this difficulty for the JSE-specific recharts.', //Description
 			'JSEngineRecharts', //Save data variable name
 			'bool', //Variable type
 			false); //Default value
@@ -52,8 +52,22 @@ class MiscSettingsSubState extends BaseOptionsMenu
 			false); //Default value
 		addOption(option);
 
-		cameras = [FlxG.cameras.list[FlxG.cameras.list.length-1]];
+		//credit to Nael2xd for the idea
+		var option:Option = new Option('Rainbow Note Shift Speed', //Name
+			'Changes the amount of time between 1 cycle for Rainbow Notes.\n(Make sure you have your note colors set to "Rainbow" to see this in action!)', //Description
+			'rainbowTime', //Save data variable name
+			'float', //Variable type
+			5.0); //Default value
+		option.scrollSpeed = 4;
+		option.minValue = 0.01;
+		option.maxValue = 100;
+		option.changeValue = 0.01;
+		option.decimals = 2; //lol
+		option.displayFormat = '%vs';
+		addOption(option);
 
+		cameras = [FlxG.cameras.list[FlxG.cameras.list.length-1]];
+		
 		super();
 	}
 }