Merge branch 'main' into base-fnf-port-remake

README.md

@@ -12,8 +12,8 @@ Also, the command `.\cne test` uses the source assets folder instead of the expo
 ## Codename Engine
 
 Codename Engine is a new Friday Night Funkin' Engine aimed at simplifying modding, along with extensiblity and ease of use.<br>
-Make sure to read the wiki and join the Discord server linked there!<br>
+### Before making issues or need help with something, check our website [HERE](https://fnf-cne-devs.github.io/) (it contains a wiki of how to mod with EXAMPLES, an api, lists of mods made with Codename Engine and more)!!!
-#### It includes many new features, as seen [here](FEATURES.md)<br>
+#### The Engine includes many new features, as seen [here](FEATURES.md)<br>
 #### Wanna see the new features added in the most recent update? Click [here](PATCHNOTES.md)<br>
 
 ## How to download

assets/data/config/credits.xml

@@ -1,7 +0,0 @@
-<!DOCTYPE codename-mod-credits>
-<!-- TEMPLATE FOR CUSTOM CREDITS!!! -->
-<menu name="Mod Credits" desc="Modify mod credits here">
-	<!-- \/ You can also set the portrait shader as false as you can see below in the github one -->
-	<credit name="Credit Example" desc="Click me to know more about me!" icon="credit icon example" size="130" url="https://youtu.be/fugtxz1znVw"/>
-	<github user="NexIsDumb" customName="Nex is Dumb" desc="The bitch who made these credits menus" size="100" portrait="false" color="#808080"/>
-</menu>

assets/data/config/options.xml

@@ -1,15 +0,0 @@
-<!DOCTYPE codename-mod-options>
-<!-- TEMPLATE FOR CUSTOM OPTIONS!!! -->
-<menu name="Mod Options" desc="Modify mod options here">
-	<checkbox id="checkboxExample" name="Checkbox example" />
-	<number id="numberExample" name="Number example" min="0" max="10" change="1"/>
-	<choice id="choiceExample" name="Choice Example">
-		<value name="Disabled" value="disabled"/>
-		<value name="This only" value="thisOnly"/>
-		<value name="All" value="all"/>
-	</choice>
-
-	<menu name="Submenu Example" desc="Submenu test">
-		<checkbox id="levelOfIdk2" name="Level of idk" />
-	</menu>
-</menu>

assets/data/titlescreen/titlescreen.xml

@@ -7,7 +7,7 @@
 			<anim name="danceRight" anim="gfDance" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
 
-		<titleEnter sprite="titleEnter" x="-150" y="-100" />
+		<!-- <titleEnter sprite="titleEnter" x="100" y="576" /> --> <!-- FlxG.height * 0.8 -->
 	</sprites>
 
 	<intro length="16">

assets/shaders/engine/editorBlur.frag

@@ -3,19 +3,17 @@
 
 // Used for editors
 
-int steps = 16;
+const int steps = 16;
-int stepsInside = 2;
+const int stepsInside = 2;
-float strength = 0.0075;
+const float strength = 0.0075;
+
 vec4 getColor(vec2 pos) {
-	vec2 ps = (pos);
+	pos = clamp(pos, vec2(0.0), vec2(1.0));//1.0 - (1.0 / openfl_TextureSize.xy));
-	ps = clamp(ps, vec2(0.0), 1.0 - (1.0 / openfl_TextureSize.xy));
+	return flixel_texture2D(bitmap, pos);
-	return flixel_texture2D(bitmap, (ps));
 }
+
 void main() {
-	// vec2 camPos = getCamPos(openfl_TextureCoordv);
 	vec2 camPos = openfl_TextureCoordv;
-	if (camPos.x < 0.0 || camPos.x > 1.0 || camPos.y < 0.0 || camPos.y > 1.0)
-		return;
 
 	vec4 color = getColor(camPos);
 	float fsteps = float(steps);

assets/shaders/engine/editorBlurFast.frag

@@ -2,58 +2,29 @@
 
 // Used for editors (faster)
 
-//#define iResolution _camSize
+const float uBlur = 0.015;
-#define getTexture textureCam
+const float uBrightness = 0.6;
-
-#define iResolution openfl_TextureSize
-//#define getTexture flixel_texture2D
-
-float uBlur = 0.015;
-float uBrightness = 0.6;
 
 vec4 getColor(vec2 pos) {
-	vec2 ps = (pos);
+	pos = clamp(pos, vec2(0.0), vec2(1.0));//1.0 - (1.0 / openfl_TextureSize.xy));
-	if (ps.x < 0.0) ps.x = 0.0;
+	return flixel_texture2D(bitmap, pos);
-	//else if (ps.x > 1.0 - (1.0 / iResolution.x)) ps.x = 1.0 - (1.0 / iResolution.x);
-	else if (ps.x > 1.0) return vec4(0.0);
-	if (ps.y < 0.0) ps.y = 0.0;
-	//else if (ps.y > 1.0 - (1.0 / iResolution.y)) return ps.y = 1.0 - (1.0 / iResolution.y);
-	else if (ps.y > 1.0) return vec4(0.0);
-	return flixel_texture2D(bitmap, (ps));
 }
 
-
+uniform sampler2D noiseTexture;
-vec2 fixvec2(float x, float y) { // makes an uv the same across sizes
+uniform vec2 noiseTextureSize;
-	vec2 val = vec2(x, y);
-	val.xy *= vec2(1280.0, 720.0);
-	val.xy /= iResolution.xy;
-	return val;
-}
-vec2 fixvec2(vec2 uv) { // makes an uv the same across sizes
-	vec2 val = uv;
-	val.xy *= vec2(1280.0, 720.0);
-	val.xy /= iResolution.xy;
-	return val;
-}
 
 vec2 random(vec2 p) {
-	p = vec2(dot(p,vec2(127.1,311.7)),dot(p,vec2(269.5,183.3)));
+	p *= openfl_TextureSize;
-	return fract(sin(p)*4375.5);
+    return texture2D(noiseTexture, p / noiseTextureSize).rg - vec2(0.5);
 }
 
 void main() {
-	vec2 camPos = (openfl_TextureCoordv);
+	vec2 camPos = openfl_TextureCoordv;
-	//vec2 camPos = openfl_TextureCoordv;
+	vec2 blur = vec2(uBlur) * vec2(1.0, openfl_TextureSize.x / openfl_TextureSize.y);
-	if (camPos.x < 0.0 || camPos.x > 1.0 || camPos.y < 0.0 || camPos.y > 1.0)
-		return;
 
-	//vec4 color = getColor(camPos);
+	vec4 a =	getColor(camPos+random(camPos)*blur);
-
+	a +=		getColor(camPos+random(camPos+0.1)*blur);
-	vec2 blur = vec2(uBlur) * vec2(1.0, iResolution.x / iResolution.y);
+	//a +=		getColor(camPos+random(camPos+0.2)*blur);
-
+	//a +=		getColor(camPos+random(camPos+0.3)*blur);
-	vec4 a = getColor(camPos+(random(camPos)*blur - blur / 2.0)) * uBrightness;
+	gl_FragColor = (a / 2.0) * uBrightness;
-	a += getColor(camPos+(random(camPos+0.1)*blur - blur / 2.0)) * uBrightness;
-	a += getColor(camPos+(random(camPos+0.2)*blur - blur / 2.0)) * uBrightness;
-	//a += getColor(camPos+(random(camPos+0.3)*blur - blur / 2.0)) * uBrightness;
-	gl_FragColor = a / 3.0;
 }

project.xml

@@ -118,9 +118,6 @@
 	<!-- Comment this out to disable multithreading !-->
 	<haxedef name="ALLOW_MULTITHREADING" unless="web || flash" />
 
-	<!-- Comment this out to disable titlescreen.xml !-->
-	<haxedef name="TITLESCREEN_XML" />
-
 	<!-- Comment this out to disable mods folder !-->
 	<haxedef name="MOD_SUPPORT" unless="web"/>
 

source/funkin/backend/assets/Paths.hx

@@ -255,58 +255,6 @@ class Paths
 				content[k] = '$key$e';
 		}
 		return content;
-		/*
-		if (!key.endsWith("/")) key = key + "/";
-
-		if (ModsFolder.currentModFolder == null && !scanSource)
-			return getFolderContent(key, false, addPath, true);
-
-		var folderPath:String = scanSource ? getAssetsPath(key) : getLibraryPathForce(key, 'mods/${ModsFolder.currentModFolder}');
-		var libThing = new LimeLibrarySymbol(folderPath);
-		var library = libThing.library;
-
-		if (library is openfl.utils.AssetLibrary) {
-			var lib = cast(libThing.library, openfl.utils.AssetLibrary);
-			@:privateAccess
-			if (lib.__proxy != null) library = lib.__proxy;
-		}
-
-		var content:Array<String> = [];
-		#if MOD_SUPPORT
-		if (library is funkin.backend.assets.IModsAssetLibrary) {
-			// easy task, can immediately scan for files!
-			var lib = cast(library, funkin.backend.assets.IModsAssetLibrary);
-			content = lib.getFiles(libThing.symbolName);
-			if (addPath)
-				for(i in 0...content.length)
-					content[i] = '$folderPath${content[i]}';
-		} else #end {
-			@:privateAccess
-			for(k=>e in library.paths) {
-				if (k.toLowerCase().startsWith(libThing.symbolName.toLowerCase())) {
-					if (addPath) {
-						if (libThing.libraryName != "")
-							content.push('${libThing.libraryName}:$k');
-						else
-							content.push(k);
-					} else {
-						var barebonesFileName = k.substr(libThing.symbolName.length);
-						if (!barebonesFileName.contains("/"))
-							content.push(barebonesFileName);
-					}
-				}
-			}
-		}
-
-		if (includeSource) {
-			var sourceResult = getFolderContent(key, false, addPath, true);
-			for(e in sourceResult)
-				if (!content.contains(e))
-					content.push(e);
-		}
-
-		return content;
-		*/
 	}
 
 	// Used in Script.hx

source/funkin/backend/system/Logs.hx

@@ -11,8 +11,7 @@ class Logs {
 
 	public static var nativeTrace = Log.trace;
 	public static function init() {
-
+		Log.trace = function(v:Dynamic, ?infos:Null<haxe.PosInfos>) {
-		Log.trace = function(v : Dynamic, ?infos : Null<haxe.PosInfos>) {
 			var data = [
 				logText('${infos.fileName}:${infos.lineNumber}: ', CYAN),
 				logText(Std.string(v))
@@ -28,22 +27,48 @@ class Logs {
 			__showInConsole(prepareColoredTrace(data, TRACE));
 		};
 
-		LogFrontEnd.onLogs = function(Data, Style, FireOnce) {
+		LogFrontEnd.onLogs = function(data, style, fireOnce) {
 			var prefix = "[FLIXEL]";
 			var color:ConsoleColor = LIGHTGRAY;
 			var level:Level = INFO;
-			if (Style == LogStyle.CONSOLE)	{prefix = "> ";			color = WHITE;	level = INFO;	} else
+			if (style == LogStyle.CONSOLE)  // cant place a switch here as these arent inline values  - Nex
-			if (Style == LogStyle.ERROR)	{prefix = "[FLIXEL]";	color = RED;	level = ERROR;	} else
+			{
-			if (Style == LogStyle.NORMAL)	{prefix = "[FLIXEL]";	color = WHITE;	level = INFO;	} else
+				prefix = "> ";
-			if (Style == LogStyle.NOTICE)	{prefix = "[FLIXEL]";	color = GREEN;	level = VERBOSE;} else
+				color = WHITE;
-			if (Style == LogStyle.WARNING)	{prefix = "[FLIXEL]";	color = YELLOW;	level = WARNING;}
+				level = INFO;
+			}
+			else if (style == LogStyle.ERROR)
+			{
+				prefix = "[FLIXEL]";
+				color = RED;
+				level = ERROR;
+			}
+			else if (style == LogStyle.NORMAL)
+			{
+				prefix = "[FLIXEL]";
+				color = WHITE;
+				level = INFO;
+			}
+			else if (style == LogStyle.NOTICE)
+			{
+				prefix = "[FLIXEL]";
+				color = GREEN;
+				level = VERBOSE;
+			}
+			else if (style == LogStyle.WARNING)
+			{
+				prefix = "[FLIXEL]";
+				color = YELLOW;
+				level = WARNING;
+			}
 
-			var d:Dynamic = Data;
+			var d:Dynamic = data;
 			if (!(d is Array))
 				d = [d];
 			var a:Array<Dynamic> = d;
 			var strs = [for(e in a) Std.string(e)];
-			for(e in strs) {
+			for(e in strs)
+			{
 				Logs.trace('$prefix $e', level, color);
 			}
 		};
@@ -55,12 +80,18 @@ class Logs {
 			logText('[  '),
 			logText('${Std.string(time.getHours()).addZeros(2)}:${Std.string(time.getMinutes()).addZeros(2)}:${Std.string(time.getSeconds()).addZeros(2)}', DARKMAGENTA),
 			logText('  |'),
-			switch(level) {
+			switch (level)
-				case WARNING:	logText('   WARNING   ', DARKYELLOW);
+			{
-				case ERROR:		logText('    ERROR    ', DARKRED);
+				case WARNING:
-				case TRACE:		logText('    TRACE    ', GRAY);
+					logText('   WARNING   ', DARKYELLOW);
-				case VERBOSE:	logText('   VERBOSE   ', DARKMAGENTA);
+				case ERROR:
-				default:		logText(' INFORMATION ', CYAN);
+					logText('    ERROR    ', DARKRED);
+				case TRACE:
+					logText('    TRACE    ', GRAY);
+				case VERBOSE:
+					logText('   VERBOSE   ', DARKMAGENTA);
+				default:
+					logText(' INFORMATION ', CYAN);
 			},
 			logText('] ')
 		];
@@ -77,7 +108,7 @@ class Logs {
 	}
 
 	public static function __showInConsole(text:Array<LogText>) {
-		#if sys
+		#if (sys && !mobile)
 		while(__showing) {
 			Sys.sleep(0.05);
 		}
@@ -89,20 +120,30 @@ class Logs {
 		NativeAPI.setConsoleColors();
 		Sys.print("\r\n");
 		__showing = false;
+		#elseif mobile
+		while(__showing) {
+			Sys.sleep(0.05);
+		}
+		__showing = true;
+		@:privateAccess
+		Sys.print([for(t in text) t.text].join(""));
+		__showing = false;
 		#else
 		@:privateAccess
 		nativeTrace([for(t in text) t.text].join(""));
 		#end
 	}
 
-	public static function traceColored(text:Array<LogText>, level:Level = INFO) {
+	public static function traceColored(text:Array<LogText>, level:Level = INFO)
 		__showInConsole(prepareColoredTrace(text, level));
-	}
+
 	public static function trace(text:String, level:Level = INFO, color:ConsoleColor = LIGHTGRAY) {
-		traceColored([{
+		traceColored([
-			text: text,
+			{
-			color: color
+				text: text,
-		}], level);
+				color: color
+			}
+		], level);
 	}
 }
 
@@ -113,7 +154,8 @@ enum abstract Level(Int) {
 	var TRACE = 3;
 	var VERBOSE = 4;
 }
+
 typedef LogText = {
 	var text:String;
 	var color:ConsoleColor;
-}
+}

source/funkin/backend/utils/CoolUtil.hx

@@ -721,7 +721,10 @@ class CoolUtil
 	 */
 	@:noUsing public static inline function openURL(url:String) {
 		#if linux
-		Sys.command('/usr/bin/xdg-open', [url]);
+		// generally `xdg-open` should work in every distro
+		var cmd = Sys.command("xdg-open", [url]);
+		// run old command JUST IN CASE it fails, which it shouldn't
+		if (cmd != 0) cmd = Sys.command("/usr/bin/xdg-open", [url]);
 		#else
 		FlxG.openURL(url);
 		#end

source/funkin/backend/utils/MemoryUtil.hx

@@ -140,14 +140,16 @@ class MemoryUtil {
 		reg.match(process.stdout.readAll().toString());
 		if (process.exitCode() == 0) return reg.matched(1);
 		#elseif linux
-		var process = new HiddenProcess("sudo", ["dmidecode", "--type", "17"]);
+		/*var process = new HiddenProcess("sudo", ["dmidecode", "--type", "17"]);
 		if (process.exitCode() != 0) return "Unknown";
 		var lines = process.stdout.readAll().toString().split("\n");
 		for (line in lines) {
 			if (line.startsWith("Type:")) {
 				return line.substring("Type:".length).trim();
 			}
-		}
+		}*/
+		// TODO: sort of unsafe? also requires users to use `sudo`
+		// when launching the engine through the CLI, REIMPLEMENT LATER. 
 		#end
 		return "Unknown";
 	}

source/funkin/editors/character/CharacterSelection.hx

@@ -4,6 +4,7 @@ import funkin.game.Character;
 import funkin.options.OptionsScreen;
 import funkin.options.type.IconOption;
 import funkin.options.type.NewOption;
+import funkin.options.type.TextOption;
 import funkin.options.type.OptionType;
 
 class CharacterSelection extends EditorTreeMenu
@@ -13,21 +14,45 @@ class CharacterSelection extends EditorTreeMenu
 		bgType = "charter";
 		super.create();
 
-		var modsList:Array<String> = Character.getList(true);
+		var isMods:Bool = true;
+		var modsList:Array<String> = Character.getList(true, true);
 
-		var list:Array<OptionType> = [
+		if(modsList.length == 0) {
-			for (char in (modsList.length == 0 ? Character.getList(false) : modsList))
+			modsList = Character.getList(false, true);
-				new IconOption(char, "Press ACCEPT to edit this character.", Character.getIconFromCharName(char),
+			isMods = false;
-			 	function() {
+		}
-					FlxG.switchState(new CharacterEditor(char));
-				})
-		];
 
-		list.insert(0, new NewOption("New Character", "New Character", function() {
+		function generateList(modsList:Array<String>, isMods:Bool, folderPath:String = ""):Array<OptionType> {
-			openSubState(new UIWarningSubstate("New Character: Feature Not Implemented!", "This feature isnt implemented yet. Please wait for more cne updates to have this functional.\n\n\n- Codename Devs", [
+			var list:Array<OptionType> = [];
-				{label: "Ok", color: 0xFFFF0000, onClick: function(t) {}}
+
-			]));
+			for(char in modsList) {
-		}));
+				if(char.endsWith("/")) {
+					var folderName = CoolUtil.getFilename(char.substr(0, char.length-1));
+
+					list.push(new TextOption(folderName + " >", "Press ACCEPT to edit this folder.", function() {
+						var newModsList = Character.getList(isMods, true, char);
+						var newList:Array<OptionType> = generateList(newModsList, isMods, folderPath + folderName + "/");
+						optionsTree.add(new OptionsScreen(folderPath + folderName, "Select a character to edit in " + folderPath + folderName + "/", newList));
+					}));
+				} else {
+					list.push(new IconOption(char, "Press ACCEPT to edit this character.", Character.getIconFromCharName(folderPath + char, char),
+						function() {
+							FlxG.switchState(new CharacterEditor(folderPath + char));
+						})
+					);
+				}
+			}
+
+			list.insert(0, new NewOption("New Character", "New Character", function() {
+				openSubState(new UIWarningSubstate("New Character: Feature Not Implemented!", "This feature isnt implemented yet. Please wait for more cne updates to have this functional.\n\n\n- Codename Devs", [
+					{label: "Ok", color: 0xFFFF0000, onClick: function(t) {}}
+				]));
+			}));
+
+			return list;
+		}
+
+		var list = generateList(modsList, isMods);
 
 		main = new OptionsScreen("Character Editor", "Select a character to edit", list);
 

source/funkin/editors/charter/CharterEventScreen.hx

@@ -162,7 +162,11 @@ class CharterEventScreen extends UISubstateWindow {
 						colorWheel;
 					case TDropDown(options):
 						addLabel();
-						var dropdown = new UIDropDown(eventName.x, y, 320, 32, options, Std.int(Math.abs(options.indexOf(cast value))));
+						var optionIndex = options.indexOf(cast value);
+						if(optionIndex < 0) {
+							optionIndex = 0;
+						}
+						var dropdown = new UIDropDown(eventName.x, y, 320, 32, options, optionIndex);
 						paramsPanel.add(dropdown); paramsFields.push(dropdown);
 						dropdown;
 					case TCharacter:

source/funkin/editors/ui/UISubstateWindow.hx

@@ -1,5 +1,8 @@
 package funkin.editors.ui;
 
+import openfl.display.ShaderParameter;
+import openfl.display.ShaderInput;
+import openfl.filters.ShaderFilter;
 import flixel.tweens.FlxTween;
 import funkin.backend.shaders.CustomShader;
 import openfl.filters.ShaderFilter;
@@ -7,7 +10,17 @@ import openfl.filters.ShaderFilter;
 // TODO: make UIWarningSubstate extend this
 class UISubstateWindow extends MusicBeatSubstate {
 	var camShaders:Array<FlxCamera> = [];
-	var blurShader:CustomShader = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+	var blurShader:CustomShader = {
+		var _ = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+		if(!Options.intensiveBlur) {
+			var noiseTexture:ShaderInput<openfl.display.BitmapData> = _.data.noiseTexture;
+			noiseTexture.input = Assets.getBitmapData("assets/shaders/noise256.png");
+			noiseTexture.wrap = REPEAT;
+			var noiseTextureSize:ShaderParameter<Float> = _.data.noiseTextureSize;
+			noiseTextureSize.value = [noiseTexture.input.width, noiseTexture.input.height];
+		}
+		_;
+	};
 
 	var titleSpr:UIText;
 	var messageSpr:UIText;

source/funkin/editors/ui/UIWarningSubstate.hx

@@ -1,5 +1,8 @@
 package funkin.editors.ui;
 
+import openfl.display.ShaderParameter;
+import openfl.display.ShaderInput;
+import openfl.filters.ShaderFilter;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import funkin.backend.shaders.CustomShader;
@@ -7,7 +10,17 @@ import openfl.filters.ShaderFilter;
 
 class UIWarningSubstate extends MusicBeatSubstate {
 	var camShaders:Array<FlxCamera> = [];
-	var blurShader:CustomShader = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+	var blurShader:CustomShader = {
+		var _ = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+		if(!Options.intensiveBlur) {
+			var noiseTexture:ShaderInput<openfl.display.BitmapData> = _.data.noiseTexture;
+			noiseTexture.input = Assets.getBitmapData("assets/shaders/noise256.png");
+			noiseTexture.wrap = REPEAT;
+			var noiseTextureSize:ShaderParameter<Float> = _.data.noiseTextureSize;
+			noiseTextureSize.value = [noiseTexture.input.width, noiseTexture.input.height];
+		}
+		_;
+	};
 
 	var title:String;
 	var message:String;

source/funkin/game/Character.hx

@@ -538,9 +538,10 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		return xml;
 	}
 
-	public static function getIconFromCharName(?character:String) {
+	public static function getIconFromCharName(?character:String, ?defaultIcon:String = null) {
 		if(character == null) return Constants.DEFAULT_HEALTH_ICON;
-		var icon:String = character;
+		if(defaultIcon == null) defaultIcon = character;
+		var icon:String = defaultIcon;
 
 		var xml:Access = getXMLFromCharName(character);
 		if (xml != null && xml.x.exists("icon")) icon = xml.x.get("icon");
@@ -548,9 +549,17 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		return icon;
 	}
 
-	public static function getList(?mods:Bool = false):Array<String>
+	public static function getList(?mods:Bool = false, includeFolders:Bool = false, folder:String = 'data/characters/'):Array<String> {
-		return [
+		var list:Array<String> = [];
-			for (path in Paths.getFolderContent('data/characters/', true, mods ? MODS : BOTH))
+		if(includeFolders) {
-				if (Path.extension(path) == "xml") CoolUtil.getFilename(path)
+			for (path in Paths.getFolderDirectories(folder, true, mods ? MODS : BOTH)) {
-		];
+				if(!path.endsWith("/")) path += "/";
+				list.push(path);
+			}
+		}
+		for (path in Paths.getFolderContent(folder, true, mods ? MODS : BOTH))
+			if (Path.extension(path) == "xml")
+				list.push(CoolUtil.getFilename(path));
+		return list;
+	}
 }

source/funkin/game/HealthIcon.hx

@@ -90,11 +90,9 @@ class HealthIcon extends FlxSprite
 		if (animation.curAnim != null) {
 			var i:Int = -1;
 			var oldKey:Int = -1;
-			for(k=>icon in healthSteps) {
+			for (k=>icon in healthSteps) if (k > oldKey && k <= health * 100) {
-				if (k > oldKey && k < health * 100) {
+				oldKey = k;
-					oldKey = k;
+				i = icon;
-					i = icon;
-				}
 			}
 			if (i >= 0 && curAnimState != i) {
 				var event = EventManager.get(funkin.backend.scripting.events.HealthIconChangeEvent).recycle(i, this);

source/funkin/game/cutscenes/DialogueCutscene.hx

@@ -95,7 +95,7 @@ class DialogueCutscene extends ScriptedCutscene {
 					musicVolume: node.has.musicVolume ? (volume = Std.parseFloat(node.att.speed).getDefault(0.8)) : null,
 					changeMusic: node.has.changeMusic ? FlxG.sound.load(Paths.music(node.att.changeMusic), volume, true) : null,
 					playSound: node.has.playSound ? FlxG.sound.load(Paths.sound(node.att.playSound)) : null,
-					nextSound: node.has.nextSound ? FlxG.sound.load(Paths.music(node.att.nextSound)) : null,
+					nextSound: node.has.nextSound ? FlxG.sound.load(Paths.sound(node.att.nextSound)) : null,
 					textSound: null
 				};
 
@@ -218,4 +218,4 @@ typedef DialogueLine = {
 	var nextSound:FlxSound;
 	var textSound:FlxSound;
 	var changeDefAnim:String;
-}
+}

source/funkin/menus/MainMenuState.hx

@@ -158,7 +158,7 @@ class MainMenuState extends MusicBeatState
 
 			var event = event("onSelectItem", EventManager.get(NameEvent).recycle(daChoice));
 			if (event.cancelled) return;
-			switch (daChoice)
+			switch (event.name)
 			{
 				case 'story mode': FlxG.switchState(new StoryMenuState());
 				case 'freeplay': FlxG.switchState(new FreeplayState());

source/funkin/menus/PauseSubState.hx

@@ -14,6 +14,7 @@ import funkin.editors.charter.Charter;
 import funkin.menus.StoryMenuState;
 import funkin.options.OptionsMenu;
 import funkin.options.keybinds.KeybindsOptions;
+import funkin.options.TreeMenu;
 
 class PauseSubState extends MusicBeatSubstate
 {
@@ -154,9 +155,10 @@ class PauseSubState extends MusicBeatSubstate
 				persistentDraw = false;
 				openSubState(new KeybindsOptions());
 			case "Change Options":
+				TreeMenu.lastState = PlayState;
 				FlxG.switchState(new OptionsMenu());
 			case "Exit to charter":
-				FlxG.switchState(new funkin.editors.charter.Charter(PlayState.SONG.meta.name, PlayState.difficulty, false));
+				FlxG.switchState(new Charter(PlayState.SONG.meta.name, PlayState.difficulty, false));
 			case "Exit to menu":
 				if (PlayState.chartingMode && Charter.undos.unsaved)
 					game.saveWarn(false);
@@ -207,4 +209,4 @@ class PauseSubState extends MusicBeatSubstate
 				item.alpha = 0.6;
 		}
 	}
-}
+}

source/funkin/menus/StoryMenuState.hx

@@ -118,6 +118,13 @@ class StoryMenuState extends MusicBeatState {
 		}
 
 		interpColor = new FlxInterpolateColor(weekBG.color);
+
+		// default difficulty should be the middle difficulty in the array
+		// to be consistent with base game and whatnot, you know the drill
+		curDifficulty = Math.floor(weeks[0].difficulties.length * 0.5);
+		// debug stuff lol
+		Logs.trace('Middle Difficulty for Week 1 is ${weeks[0].difficulties[curDifficulty]} (ID: $curDifficulty)');
+
 		changeWeek(0, true);
 
 		DiscordUtil.call("onMenuLoaded", ["Story Menu"]);
@@ -170,6 +177,7 @@ class StoryMenuState extends MusicBeatState {
 		if (!force) CoolUtil.playMenuSFX();
 		for(k=>e in weekSprites.members) {
 			e.targetY = k - curWeek;
+			e.alpha = k == curWeek ? 1.0 : 0.6;
 		}
 		tracklist.text = 'TRACKS\n\n${[for(e in weeks[curWeek].songs) if (!e.hide) e.name].join('\n')}';
 		weekTitle.text = weeks[curWeek].name.getDefault("");
@@ -362,13 +370,13 @@ class StoryMenuState extends MusicBeatState {
 		if(characterSprites != null)
 			characterSprites.forEachAlive(function(spr) spr.playAnim("confirm", true, LOCK));
 
-		PlayState.loadWeek(weeks[curWeek], weeks[curWeek].difficulties[curDifficulty]);
+		PlayState.loadWeek(event.week, event.difficulty);
 
 		new FlxTimer().start(1, function(tmr:FlxTimer)
 		{
 			FlxG.switchState(new PlayState());
 		});
-		weekSprites.members[curWeek].startFlashing();
+		weekSprites.members[event.weekID].startFlashing();
 	}
 }
 

source/funkin/menus/TitleState.hx

@@ -25,8 +25,6 @@ class TitleState extends MusicBeatState
 	public var textGroup:FlxGroup;
 	public var ngSpr:FlxSprite;
 
-	public var wackyImage:FlxSprite;
-
 	override public function create():Void
 	{
 		curWacky = FlxG.random.getObject(getIntroTextShit());
@@ -40,9 +38,6 @@ class TitleState extends MusicBeatState
 		DiscordUtil.call("onMenuLoaded", ["Title Screen"]);
 	}
 
-	var logoBl:FlxSprite;
-	var gfDance:FlxSprite;
-	var danceLeft:Bool = false;
 	var titleText:FlxSprite;
 	var titleScreenSprites:MusicBeatGroup;
 
@@ -56,11 +51,9 @@ class TitleState extends MusicBeatState
 		var bg:FlxSprite = new FlxSprite().makeSolid(FlxG.width, FlxG.height, FlxColor.BLACK);
 		add(bg);
 
-		#if TITLESCREEN_XML
 		titleScreenSprites = new MusicBeatGroup();
 		add(titleScreenSprites);
 		loadXML();
-		#end
 
 		if (titleText == null) {
 			titleText = new FlxSprite(100, FlxG.height * 0.8);
@@ -78,16 +71,6 @@ class TitleState extends MusicBeatState
 		blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
 		add(blackScreen);
 
-		#if !TITLESCREEN_XML
-		ngSpr = new FlxSprite(0, FlxG.height * 0.52).loadAnimatedGraphic(Paths.image('newgrounds_logo'));
-		add(ngSpr);
-		ngSpr.visible = false;
-		ngSpr.setGraphicSize(Std.int(ngSpr.width * 0.8));
-		ngSpr.updateHitbox();
-		ngSpr.screenCenter(X);
-		ngSpr.antialiasing = true;
-		#end
-
 		FlxG.mouse.visible = false;
 
 		if (initialized)
@@ -217,7 +200,6 @@ class TitleState extends MusicBeatState
 	{
 		super.beatHit(curBeat);
 
-		#if TITLESCREEN_XML
 		if (curBeat >= titleLength || skippedIntro) {
 			if (!skippedIntro) skipIntro();
 			return;
@@ -225,27 +207,8 @@ class TitleState extends MusicBeatState
 		var introText = titleLines[curBeat];
 		if (introText != null)
 			introText.show();
-		#else
-		switch (curBeat)
-		{
-			case 1:		createCoolText(['ninjamuffin99', 'phantomArcade', 'kawaisprite', 'evilsk8er']);
-			case 3:		addMoreText('present');
-			case 4:		deleteCoolText();
-			case 5:		createCoolText(['In association', 'with']);
-			case 7:		addMoreText('newgrounds');	ngSpr.visible = true;
-			case 8:		deleteCoolText();			ngSpr.visible = false;
-			case 9:		createCoolText([curWacky[0]]);
-			case 11:	addMoreText(curWacky[1]);
-			case 12:	deleteCoolText();
-			case 13:	addMoreText('Friday');
-			case 14:	addMoreText('Night');
-			case 15:	addMoreText('Funkin');
-			case 16:	skipIntro();
-		}
-		#end
 	}
 
-	#if TITLESCREEN_XML
 	public var xml:Access;
 	public var titleLength:Int = 16;
 	public var titleLines:Map<Int, IntroText> = [
@@ -267,12 +230,14 @@ class TitleState extends MusicBeatState
 		15 => new IntroText(['Friday', 'Night', "Funkin'"]),
 	];
 
+	public var titleSprites:Map<String, FlxSprite> = [];
+
 	public function loadXML() {
 		try {
 			xml = new Access(Xml.parse(Assets.getText(Paths.xml('titlescreen/titlescreen'))).firstElement());
 			if (xml.hasNode.intro) {
 				titleLines = [];
-				if (xml.node.intro.has.length) titleLength = CoolUtil.getDefault(Std.parseInt(xml.node.intro.att.length), 16);
+				if (xml.node.intro.has.length) titleLength = Std.parseInt(xml.node.intro.att.length).getDefault(16);
 				for(node in xml.nodes.sprites) {
 					var parentFolder:String = node.getAtt("folder").getDefault("");
 					if (parentFolder != "" && !parentFolder.endsWith("/")) parentFolder += "/";
@@ -284,26 +249,28 @@ class TitleState extends MusicBeatState
 							default:
 								titleScreenSprites.add(spr);
 						}
+						if(node.has.name) titleSprites[node.att.name] = spr;
 					}
 				}
 				for(text in xml.node.intro.nodes.text) {
-					var beat:Int = CoolUtil.getDefault(text.has.beat ? Std.parseInt(text.att.beat) : null, 0);
+					var beat:Int = text.has.beat ? Std.parseInt(text.att.beat).getDefault(0) : 0;
 					var texts:Array<OneOfTwo<String, TitleStateImage>> = [];
-					for(e in text.elements) {
+					for(node in text.elements) {
-						switch(e.name) {
+						switch(node.name) {
 							case "line":
-								if (!e.has.text) continue;
+								if (!node.has.text) continue;
-								texts.push(e.att.text);
+								texts.push(node.att.text);
 							case "introtext":
-								if (!e.has.line) continue;
+								if (!node.has.line) continue;
-								texts.push('{introText${e.att.line}}');
+								texts.push('{introText${node.att.line}}');
 							case "sprite":
-								if (!e.has.path) continue;
+								if (!node.has.path) continue;
-								var name:String = e.has.name ? e.att.name : null;
+								var name:String = node.has.name ? node.att.name : null;
-								var path:String = e.att.path;
+								var path:String = node.att.path;
-								var flipX:Bool = e.has.flipX ? e.att.flipX == "true" : false;
+								var flipX:Bool = node.has.flipX ? node.att.flipX == "true" : false;
-								var flipY:Bool = e.has.flipY ? e.att.flipY == "true" : false;
+								var flipY:Bool = node.has.flipY ? node.att.flipY == "true" : false;
-								var scale:Float = e.has.scale ? CoolUtil.getDefault(Std.parseFloat(e.att.scale), 1) : 1;
+								var scale:Float = node.has.scale ? Std.parseFloat(node.att.scale).getDefault(1) : 1;
+
 								texts.push({
 									name: name,
 									path: path,
@@ -320,7 +287,6 @@ class TitleState extends MusicBeatState
 			Logs.trace('Failed to load titlescreen XML: $e', ERROR);
 		}
 	}
-	#end
 
 	var skippedIntro:Bool = false;
 
@@ -328,10 +294,6 @@ class TitleState extends MusicBeatState
 	{
 		if (!skippedIntro)
 		{
-			#if !TITLESCREEN_XML
-			remove(ngSpr);
-			#end
-
 			FlxG.camera.flash(FlxColor.WHITE, 4);
 			remove(blackScreen);
 			blackScreen.destroy();
@@ -361,7 +323,7 @@ class IntroText {
 				var image:TitleStateImage = e;
 				if (image.path == null) continue;
 
-				var scale:Float = CoolUtil.getDefault(image.scale, 1);
+				var scale:Float = image.scale.getDefault(1);
 
 				var yPos:Float = 200;
 				if(state.textGroup.members.length > 0) {
@@ -370,8 +332,8 @@ class IntroText {
 				}
 
 				var sprite = new FlxSprite(0, yPos).loadAnimatedGraphic(Paths.image(image.path));
-				sprite.flipX = CoolUtil.getDefault(image.flipX, false);
+				sprite.flipX = image.flipX.getDefault(false);
-				sprite.flipY = CoolUtil.getDefault(image.flipY, false);
+				sprite.flipY = image.flipY.getDefault(false);
 				sprite.scale.set(scale, scale);
 				sprite.updateHitbox();
 				sprite.screenCenter(X);

source/lime/system/System.hx

@@ -367,7 +367,10 @@ class System
 			#elseif mac
 			Sys.command("/usr/bin/open", [path]);
 			#elseif linux
-			Sys.command("/usr/bin/xdg-open", [path]);
+			// generally `xdg-open` should work in every distro
+			var cmd = Sys.command("xdg-open", [path, "&"]);
+			// run old command JUST IN CASE it fails, which it shouldn't
+			if (cmd != 0) cmd = Sys.command("/usr/bin/xdg-open", [path, "&"]);
 			#elseif (js && html5)
 			Browser.window.open(path, "_blank");
 			#elseif flash