nah no lane underlays for now

The-Powder-Team · Feb 4, 2024 · 5f44716 · 5f44716
1 parent d027637
commit 5f44716
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    // WHO THE FUCK PUTS COMMENTS ON JSON FILES?!?!?!?
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "HXCPP",
+            "type": "hxcpp",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/PlanFForFunkin.exe"
+        }
+    ]
+}
diff --git a/source/backend/ClientPrefs.hx b/source/backend/ClientPrefs.hx
@@ -20,7 +20,7 @@ import states.TitleState;
 	public var splashAlpha:Float = 0.6;
 	public var fullscreen:Bool = false;
 	public var fpsRainbow:Bool = false; // kadedev
-	public var laneUnderlay:Float = 0;
+	//public var laneUnderlay:Float = 0;
 	public var coloredHealthBar = true;
 	public var showMsText:Bool = true;
 	public var lowQuality:Bool = false;

diff --git a/source/options/VisualsUISubState.hx b/source/options/VisualsUISubState.hx
@@ -61,7 +61,7 @@ class VisualsUISubState extends BaseOptionsMenu
 		}
 
 		var option:Option = new Option('Note Splash Opacity',
-			'How much transparent should the Note Splashes be.',
+			'How much transparency should the Note Splashes be?',
 			'splashAlpha',
 			'percent');
 		option.scrollSpeed = 1.6;
@@ -72,7 +72,7 @@ class VisualsUISubState extends BaseOptionsMenu
 		addOption(option);
 
 		var option:Option = new Option('Hide HUD',
-			'If checked, hides most HUD elements.',
+			'If checked, hides most HUD elements.\nNot the strums or notes though.',
 			'hideHud',
 			'bool');
 		addOption(option);
@@ -84,7 +84,7 @@ class VisualsUISubState extends BaseOptionsMenu
 			['Time Left', 'Time Elapsed', 'Song Name', 'Disabled']);
 		addOption(option);
 
-		var option:Option = new Option('Icon Colored Health Bar',
+		var option:Option = new Option('Icon Based Health Colors',
 		"If unchecked, the health bar will have the colors from Vanilla FNF\nrather than colors based on the icons.",
 		'coloredHealthBar',
 		'bool');
@@ -114,7 +114,7 @@ class VisualsUISubState extends BaseOptionsMenu
 		addOption(option);
 
 		var option:Option = new Option('Health Bar Opacity',
-			'How much transparent should the health bar and icons be.',
+			'How much transparency should the health bar and icons be?',
 			'healthBarAlpha',
 			'percent');
 		option.scrollSpeed = 1.6;
@@ -126,7 +126,7 @@ class VisualsUISubState extends BaseOptionsMenu
 
 		#if !mobile
 		var option:Option = new Option('FPS Counter',
-			'If unchecked, hides FPS Counter.',
+			'If unchecked, hides the FPS Counter.',
 			'showFPS',
 			'bool');
 		addOption(option);
@@ -157,14 +157,14 @@ class VisualsUISubState extends BaseOptionsMenu
 
 		#if DISCORD_ALLOWED
 		var option:Option = new Option('Discord Rich Presence',
-			"Uncheck this to prevent accidental leaks, it will hide the Application from your \"Playing\" box on Discord",
+			"Uncheck this to prevent accidental leaks, it will hide the Application from your \"Playing\" box on Discord.",
 			'discordRPC',
 			'bool');
 		addOption(option);
 		#end
 
 		var option:Option = new Option('Combo Stacking',
-			"If unchecked, Ratings and Combo won't stack, saving on System Memory and making them easier to read",
+			"If unchecked, Ratings and Combo won't stack, saving on System Memory and making them easier to read.",
 			'comboStacking',
 			'bool');
 		addOption(option);

diff --git a/source/states/LoadingState.hx b/source/states/LoadingState.hx
@@ -165,7 +165,6 @@ class LoadingState extends MusicBeatState
 
 		if (!loaded)
 			return new LoadingState(target, stopMusic, directory);
-		#end
 		if (stopMusic && FlxG.sound.music != null)
 			FlxG.sound.music.stop();
 
@@ -182,7 +181,6 @@ class LoadingState extends MusicBeatState
 	{
 		return Assets.getLibrary(library) != null;
 	}
-	#end
 
 	override function destroy()
 	{

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -167,7 +167,7 @@ class PlayState extends MusicBeatState
 	public var camZoomingDecay:Float = 1;
 	private var curSong:String = "";
 
-	public var lane:FlxSprite;
+	//public var lane:FlxSprite;
 
 	public var gfSpeed:Int = 1;
 	public var health(default, set):Float = 1;
@@ -264,7 +264,6 @@ class PlayState extends MusicBeatState
 
 	override public function create()
 	{
-		//trace('Playback Rate: ' + playbackRate);
 		Paths.clearStoredMemory();
 
 		startCallback = startCountdown;
@@ -463,8 +462,8 @@ class PlayState extends MusicBeatState
 		}
 		stagesFunc(function(stage:BaseStage) stage.createPost());
 
-		if(ClientPrefs.data.laneUnderlay > 0){
-		    for(i in 0...2)
+		/*if (ClientPrefs.data.laneUnderlay > 0) {
+		    for (i in 0...2)
 		    {
 				lane = new FlxSprite(42 + 50 + (FlxG.width / 2 * i) - 10, 0).makeGraphic(Std.int(42 + Note.swagWidth * 3 + 90), FlxG.height);
 				lane.color = FlxColor.BLACK;
@@ -473,8 +472,9 @@ class PlayState extends MusicBeatState
 				lane.cameras = [camHUD];
 			}
 		}
+
 		laneGroup = new FlxSpriteGroup();
-		add(laneGroup);
+		add(laneGroup);*/
 		comboGroup = new FlxSpriteGroup();
 		add(comboGroup);
 		noteGroup = new FlxTypedGroup<FlxBasic>();
@@ -585,7 +585,7 @@ class PlayState extends MusicBeatState
 		if(ClientPrefs.data.downScroll)
 			botplayTxt.y = timeBar.y - 78;
 
-		laneGroup.cameras = [camHUD];
+		//laneGroup.cameras = [camHUD];
 		uiGroup.cameras = [camHUD];
 		noteGroup.cameras = [camHUD];
 		comboGroup.cameras = [camHUD];
@@ -2459,7 +2459,7 @@ class PlayState extends MusicBeatState
 	public var showRating:Bool = true;
 
     // Stores Lane Objects in a Group
-    public var laneGroup:FlxTypedGroup<FlxBasic>;
+    //public var laneGroup:FlxTypedGroup<FlxBasic>;
 	// Stores Ratings and Combo Sprites in a group
 	public var comboGroup:FlxSpriteGroup;
 	// Stores HUD Objects in a Group