Merge branch 'main' into translations-system

project.xml

@@ -64,6 +64,7 @@
 		<assets path="assets/"    rename="assets"	exclude="*.mp3" unless="web"/>
 	</section>
 
+	<!-- TODO: make it copy this manually, instead of using assets node, so it doesn't manually check for fonts -->
 	<assets path='mods' rename='mods' embed='false'/>
 	<assets path='art/readme.txt' rename='do NOT readme.txt' />
 
@@ -153,7 +154,7 @@
 	<!-- Comment this out to disable dark mode windows -->
 	<define name="DARK_MODE_WINDOW"/>
 
-	<haxedef name="analyzer-optimize" />
+	<haxedef name="analyzer-optimize" unless="debug" />
 
 	<haxedef name="VIDEO_CUTSCENES" if="VIDEO_CUTSCENES" />
 	<haxedef name="UPDATE_CHECKING" if="UPDATE_CHECKING" />

source/funkin/backend/chart/EventsData.hx

@@ -31,7 +31,7 @@ class EventsData {
 			{name: "Time (Steps)", type: TFloat(0.25, 9999, 0.25, 2), defValue: 4},
 			{name: "Camera", type: TDropDown(['camGame', 'camHUD']), defValue: "camHUD"}
 		],
-		"BPM Change" => [{name: "Target BPM", type: TFloat(1), defValue: 100}],
+		"BPM Change" => [{name: "Target BPM", type: TFloat(1.00, null, 0.001, 3), defValue: 100}],
 		"Scroll Speed Change" => [
 			{name: "Tween Speed?", type: TBool, defValue: true},
 			{name: "New Speed", type: TFloat(0.01, 99, 0.01, 2), defValue: 1.},

source/funkin/editors/EditorPicker.hx

@@ -6,44 +6,38 @@ import flixel.math.FlxPoint;
 class EditorPicker extends MusicBeatSubstate {
 	public var bg:FlxSprite;
 
-	// Name is for backwards compatability, dont use it, use id instead
+	// Name is for backwards compatibility, don't use it, use id instead
 	public var options:Array<Editor> = [
 		{
 			name: "Alphabet Editor",
-			id: "alphabetEditor",
-			iconID: -1,
+			id: "alphabet",
 			state: funkin.editors.alphabet.AlphabetSelection
 		},
 		{
 			name: "Chart Editor",
-			id: "charter",
-			iconID: 0,
+			id: "chart",
 			state: funkin.editors.charter.CharterSelection
 		},
 		{
 			name: "Character Editor",
-			id: "characterEditor",
-			iconID: 1,
+			id: "character",
 			state: funkin.editors.character.CharacterSelection
 		},
 		{
 			name: "Stage Editor",
-			id: "stageEditor",
-			iconID: 2,
+			id: "stage",
 			state: null
 		},
 		#if (debug || debug_ui)
 		{
 			name: "UI Debug State",
 			id: "uiDebug",
-			iconID: 3,
 			state: UIDebugState
 		},
 		#end
 		{
 			name: "Wiki",
 			id: "wiki",
-			iconID: 5,
 			state: null,
 			onClick: function() {
 				CoolUtil.openURL("https://codename-engine.com/");
@@ -52,7 +46,6 @@ class EditorPicker extends MusicBeatSubstate {
 		{
 			name: "Debug Options",
 			id: "debugOptions",
-			iconID: 4,
 			state: DebugOptions
 		}
 	];
@@ -87,8 +80,8 @@ class EditorPicker extends MusicBeatSubstate {
 
 		optionHeight = FlxG.height / options.length;
 		for(k=>o in options) {
-			var visualName = (o.id != null) ? TU.translate(o.id + ".name") : o.name;
-			var spr = new EditorPickerOption(visualName, o.iconID, optionHeight);
+			var visualName = (o.id != null) ? TU.translate("editor." + o.id + ".name") : o.name;
+			var spr = new EditorPickerOption(visualName, o.id, optionHeight);
 			spr.y = k * optionHeight;
 			add(spr);
 			sprites.push(spr);
@@ -170,7 +163,6 @@ class EditorPicker extends MusicBeatSubstate {
 typedef Editor = {
 	var name:String;
 	var id:String;
-	var iconID:Int;
 	var state:Class<MusicBeatState>;
 	var ?onClick:Void->Void;
 }
@@ -186,23 +178,17 @@ class EditorPickerOption extends FlxTypedSpriteGroup<FlxSprite> {
 	public var selectionLerp:Float = 0;
 
 	public var iconRotationCycle:Float = 0;
-	public function new(name:String, iconID:Int, height:Float) {
+	public function new(name:String, iconID:String, height:Float) {
 		super();
 
 		FlxG.mouse.visible = true;
 		iconSpr = new FlxSprite();
-		iconSpr.loadGraphic(Paths.image('editors/icons'), true, 128, 128);
-		if(iconID >= 0) {
-			iconSpr.animation.add("icon", [iconID], 24, true);
-			iconSpr.animation.play("icon");
-		} else {
+		if(iconID != null)
+			iconSpr.loadGraphic(Paths.image('editors/icons/$iconID'));
+		else
 			iconSpr.exists = false;
-		}
 		iconSpr.antialiasing = true;
-		if (height < 150) {
-			iconSpr.scale.set(height / 150, height / 150);
-			iconSpr.updateHitbox();
-		}
+		iconSpr.setUnstretchedGraphicSize(110, 110, false);
 		iconSpr.x = 25 + ((height - iconSpr.width) / 2);
 		iconSpr.y = (height - iconSpr.height) / 2;
 

source/funkin/game/StrumLine.hx

@@ -340,6 +340,7 @@ class StrumLine extends FlxTypedGroup<Strum> {
 		super.destroy();
 		if(startingPos != null)
 			startingPos.put();
+		notes = FlxDestroyUtil.destroy(notes);
 	}
 
 	/**

source/funkin/game/cutscenes/DialogueCutscene.hx

@@ -30,14 +30,14 @@ class DialogueCutscene extends ScriptedCutscene {
 	public static var cutscene:DialogueCutscene;
 	public var dialogueScript(get, set):Script;
 
-	public function set_curLine(val:DialogueLine) {
+	public inline function set_curLine(val:DialogueLine) {
 		lastLine = curLine;
 		return curLine = val;
 	}
 
 	// Backwards compat funcs  - Nex
-	public function set_dialogueScript(val:Script) return script = val;
-	public function get_dialogueScript() return script;
+	public inline function set_dialogueScript(val:Script) return script = val;
+	public inline function get_dialogueScript() return script;
 
 	public function new(dialoguePath:String, callback:Void->Void) {
 		super(this.dialoguePath = dialoguePath, callback);

source/funkin/menus/credits/CreditsMain.hx

@@ -13,7 +13,7 @@ class CreditsMain extends TreeMenu {
 	var items:Array<OptionType> = [];
 
 	public override function create() {
-		bg = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuBGBlue'));
+		bg = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue'));
 		// bg.scrollFactor.set();
 		bg.scale.set(1.15, 1.15);
 		bg.updateHitbox();

source/funkin/options/OptionsMenu.hx

@@ -45,6 +45,8 @@ class OptionsMenu extends TreeMenu {
 		}
 	];
 
+	var bg:FlxSprite;
+
 	public override function create() {
 		super.create();
 
@@ -52,7 +54,7 @@ class OptionsMenu extends TreeMenu {
 
 		DiscordUtil.call("onMenuLoaded", ["Options Menu"]);
 
-		var bg:FlxSprite = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue'));
+		bg = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue'));
 		// bg.scrollFactor.set();
 		bg.scale.set(1.15, 1.15);
 		bg.updateHitbox();