Skip to content

Commit 4848352

Browse files
merge main into mobile
2 parents 2020c5b + 83e8485 commit 4848352

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

source/ClientPrefs.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y
203203
public static var JSEngineRecharts:Bool = false;
204204
public static var alwaysTriggerCutscene:Bool = false;
205205
public static var disableSplash:Bool = false;
206+
public static var rainbowTime:Float = 5.0;
206207

207208
//Gameplay Modifiers
208209
public static var gameplaySettings:Map<String, Dynamic> = [

source/MainMenuState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ using StringTools;
2323

2424
class MainMenuState extends MusicBeatState
2525
{
26-
public static var psychEngineJSVersion:String = '1.43.0'; //This is also used for Discord RPC
26+
public static var psychEngineJSVersion:String = '1.44.0'; //This is also used for Discord RPC
2727
public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
2828
public static var curSelected:Int = 0;
2929

source/Note.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ class Note extends FlxSprite
533533
{
534534
case 'Rainbow':
535535
superCoolColor = new FlxColor(0xFFFF0000);
536-
superCoolColor.hue = (strumTime / 5000 * 360) % 360;
536+
superCoolColor.hue = (strumTime / (ClientPrefs.rainbowTime * 1000) * 360) % 360;
537537
rgbShader.r = superCoolColor;
538538
rgbShader.g = FlxColor.WHITE;
539539
rgbShader.b = superCoolColor.getDarkened(0.7);

source/options/MiscSettingsSubState.hx

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class MiscSettingsSubState extends BaseOptionsMenu
3232
rpcTitle = 'Miscellaneous Settings Menu'; //for Discord Rich Presence
3333

3434
var option:Option = new Option('Use JS Engine Recharts', //Name
35-
'If checked, the base game charts will use the JS Engine specific recharts.', //Description
35+
'If checked, songs will have an optional "JSHard" difficulty (if available.)\nUse this difficulty for the JSE-specific recharts.', //Description
3636
'JSEngineRecharts', //Save data variable name
3737
'bool', //Variable type
3838
false); //Default value
@@ -52,8 +52,22 @@ class MiscSettingsSubState extends BaseOptionsMenu
5252
false); //Default value
5353
addOption(option);
5454

55-
cameras = [FlxG.cameras.list[FlxG.cameras.list.length-1]];
55+
//credit to Nael2xd for the idea
56+
var option:Option = new Option('Rainbow Note Shift Speed', //Name
57+
'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
58+
'rainbowTime', //Save data variable name
59+
'float', //Variable type
60+
5.0); //Default value
61+
option.scrollSpeed = 4;
62+
option.minValue = 0.01;
63+
option.maxValue = 100;
64+
option.changeValue = 0.01;
65+
option.decimals = 2; //lol
66+
option.displayFormat = '%vs';
67+
addOption(option);
5668

69+
cameras = [FlxG.cameras.list[FlxG.cameras.list.length-1]];
70+
5771
super();
5872
}
5973
}

0 commit comments

Comments
 (0)