restarting AGAIN the branch

NexIsDumb · NexIsDumb · commit 72dfb7e52e0a · 2026-01-21T17:02:32.000+01:00
making plain road for furo and ralty, im way too burnt out rn
diff --git a/FEATURES.md b/FEATURES.md
@@ -71,11 +71,11 @@ _**QOL = Quality of Life**_
         - Characters are located in `data/weeks/characters`.
         - Weeks are located in `data/weeks/weeks/`
         - If you need to rearrange the weeks in-game, you can use the `data/weeks/weeks.txt` file.
-	- Editors for Charts and Characters (Stage coming soon)
+	- Editors for Charts and Characters
 		- Undos/Redos supported
 		- Warning on closing unsaved work
 		- Clean UI (for ocd freaks)
-		- Mature Chart editor (Character editor rework soon)
+		- Mature Chart editor
 		- Features not found in other editors!
     - Every single state & substate can be modified via HScript (`data/states/StateName.hx`)
 - **Instances launched via `lime test windows` will automatically use assets from source.**
diff --git a/assets/data/config/freeplaySonglist.txt b/assets/data/config/freeplaySonglist.txt
@@ -1,3 +1,6 @@
+# THIS FILE ISN'T NECESSARY,
+# BUT YOU CAN USE IT TO SORT AND WHITELIST FREEPLAY SONGS
+
 test
 tutorial
 
diff --git a/assets/data/config/gamemodesList.txt b/assets/data/config/gamemodesList.txt
@@ -0,0 +1,8 @@
+# THIS FILE ISN'T NECESSARY,
+# BUT YOU CAN USE IT TO SORT AND WHITELIST GAME MODES
+
+solo
+opponent
+coop
+coop-switched
+botplay
diff --git a/assets/data/config/weeks.txt b/assets/data/config/weeks.txt
@@ -1,5 +1,5 @@
 # THIS FILE ISN'T NECESSARY,
-# BUT YOU CAN USE IT TO SORT WEEKS
+# BUT YOU CAN USE IT TO SORT AND WHITELIST WEEKS
 
 tutorial
 week1
diff --git a/assets/data/gamemodes/botplay.xml b/assets/data/gamemodes/botplay.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE codename-engine-game-mode>
+<mode name="Botplay Mode" id="codename.botplay"/>
diff --git a/assets/data/gamemodes/coop-switched.xml b/assets/data/gamemodes/coop-switched.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE codename-engine-game-mode>
+<mode name="Co-Op Mode (Switched)" id="codename.coop-opponent">
+	<script>coop</script>
+	<script>opponent</script>
+
+	<!--
+	just a small example of what you could do with fields!!
+	<field name="switchStrums" type="bool" val="true"/>
+	<field name="strumSize" type="float" val="0.6"/>
+	-->
+</mode>
diff --git a/assets/data/gamemodes/coop.xml b/assets/data/gamemodes/coop.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE codename-engine-game-mode>
+<mode name="Co-Op Mode" id="codename.coop"/>
diff --git a/assets/data/gamemodes/opponent.xml b/assets/data/gamemodes/opponent.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE codename-engine-game-mode>
+<mode name="Opponent Mode" id="codename.opponent"/>
diff --git a/assets/data/gamemodes/solo.xml b/assets/data/gamemodes/solo.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE codename-engine-game-mode>
+<mode name="Solo Mode" id="codename.solo"/>
diff --git a/building/libs.xml b/building/libs.xml
@@ -18,6 +18,7 @@
 		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" skipDeps="true" />
 		<lib name="funkin-modchart" version="1.2.4" skipDeps="true" />
 		<lib name="hxvlc" version="1.9.3" skipDeps="true" />
+		<git name="bin-serializer" url="https://github.com/CodenameCrew/bin-serializer" />
 
 		<!-- Documentation and other features -->
 		<git name="away3d" url="https://github.com/CodenameCrew/away3d" />
diff --git a/project.xml b/project.xml
@@ -3,19 +3,16 @@
 	<!-- _________________________ Application Settings _________________________ -->
 	<app
 		title="Friday Night Funkin' - Codename Engine" main="funkin.backend.system.Main"
-		file="CodenameEngine" packageName="com.yoshman29.codenameengine"
-		package="com.yoshman29.codenameengine"
-		version="1.0.1" company="Yoshman29" />
+		file="CodenameEngine" packageName="com.codenamecrew.codenameengine"
+		package="com.codenamecrew.codenameengine"
+		version="1.0.1" company="CodenameCrew" />
 
 	<!--
-		CHANGE THE SAVE PATH & NAME FOR YOUR MOD HERE!
+		CHANGE THE SAVE PATH & NAME FOR YOUR HARDCODED MOD HERE!
 	-->
-	<haxedef name="SAVE_PATH" value="CodenameEngine"/>
+	<haxedef name="SAVE_PATH" value="CodenameCrew/CodenameEngine"/>
 	<haxedef name="SAVE_NAME" value="save-default"/>
 
-	<haxedef name="SAVE_OPTIONS_PATH" value="CodenameEngine"/>
-	<haxedef name="SAVE_OPTIONS_NAME" value="options"/>
-
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 
@@ -131,6 +128,7 @@
 	<haxelib name="away3d" if="THREE_D_SUPPORT" />
 	<haxelib name="format" />
 	<haxelib name="flxanimate" />
+	<haxelib name="bin-serializer" />
 	<haxelib name="nape-haxe4" if="NAPE_ENABLED"/>
 
 	<haxelib name="hscript-improved" />
diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx
@@ -13,7 +13,7 @@ import lime.utils.AssetType;
 /**
  * A class that reads the `flags.ini` file, allowing to read settable Flags (customs too).
  */
-@:build(funkin.backend.system.macros.FlagMacro.build())
+@:build(funkin.backend.system.macros.FlagMacro.build("onReset"))
 class Flags {
 	public static var overridenFlags:Map<String, Bool> = [];
 
@@ -157,7 +157,7 @@ class Flags {
 	public static var DEFAULT_HUD_ZOOM_LERP:Float = 0.05;
 
 	public static var USE_LEGACY_ZOOM_FACTOR:Null<Bool> = null;
-	
+
 	// Font configuration
 	public static var DEFAULT_FONT:String = "vcr.ttf";
 	public static var DEFAULT_FONT_SIZE:Int = 16;
@@ -312,6 +312,11 @@ class Flags {
 		if (SUSTAINS_AS_ONE_NOTE == null) SUSTAINS_AS_ONE_NOTE = MOD_API_VERSION >= 2;
 	}
 
+	private static function onReset() {
+		var currentModFolder = ModsFolder.currentModFolder;
+		if (currentModFolder != null) SAVE_NAME = currentModFolder;
+	}
+
 	public static function loadFromDatas(datas:Array<String>):Map<String, String> {
 		var flags:Map<String, String> = [];
 		for (data in datas) {
diff --git a/source/funkin/backend/system/macros/FlagMacro.macro.hx b/source/funkin/backend/system/macros/FlagMacro.macro.hx
@@ -19,7 +19,7 @@ class FlagMacro {
 		return false;
 	}
 
-	public static function build():Array<Field> {
+	public static function build(resetCallback:String):Array<Field> {
 		var fields = Context.getBuildFields();
 
 		var clRef = Context.getLocalClass();
@@ -248,7 +248,10 @@ class FlagMacro {
 			access: [APublic, AStatic],
 			kind: FFun({
 				args: [],
-				expr: macro $b{resetExprs},
+				expr: macro {
+					$b{resetExprs};
+					$i{resetCallback}();
+				},
 				ret: macro: Void
 			}),
 			pos: Context.currentPos(),
diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx
@@ -342,10 +342,17 @@ class StoryWeeklist {
 	public function new() {}
 
 	public function getWeeksFromSource(source:funkin.backend.assets.AssetSource, useTxt:Bool = true, loadCharactersData:Bool = true) {
-		var path:String = Paths.txt('weeks/weeks');
-		var weeksFound:Array<String> = useTxt && Paths.assetsTree.existsSpecific(path, "TEXT", source) ? CoolUtil.coolTextFile(path) :
-			[for (c in Paths.getFolderContent('data/weeks/weeks/', false, source)) if (Path.extension(c).toLowerCase() == "xml") Path.withoutExtension(c)];
-
+		var weeksFound:Array<String> = null;
+		if (useTxt) {
+			var oldPath:String = Paths.txt('weeks/weeks');
+			var newPath:String = Paths.txt('config/weeks');
+			if (Paths.assetsTree.existsSpecific(newPath, "TEXT", source)) weeksFound = CoolUtil.coolTextFile(newPath);
+			else if (Paths.assetsTree.existsSpecific(oldPath, "TEXT", source)) {
+				Logs.warn("data/weeks/weeks.txt is deprecated and will be removed in the future. Please move the file to data/config/", DARKYELLOW, "StoryWeeklist");
+				weeksFound = CoolUtil.coolTextFile(oldPath);
+			}
+		}
+		if (weeksFound == null) weeksFound = [for (c in Paths.getFolderContent('data/weeks/weeks/', false, source)) if (Path.extension(c).toLowerCase() == "xml") Path.withoutExtension(c)];
 		if (weeksFound.length > 0) {
 			for (w in weeksFound) {
 				var week = Week.loadWeek(w, loadCharactersData);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!DOCTYPE codename-engine-game-mode>`
	`2`	`+<mode name="Botplay Mode" id="codename.botplay"/>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!DOCTYPE codename-engine-game-mode>`
	`2`	`+<mode name="Co-Op Mode" id="codename.coop"/>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!DOCTYPE codename-engine-game-mode>`
	`2`	`+<mode name="Opponent Mode" id="codename.opponent"/>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!DOCTYPE codename-engine-game-mode>`
	`2`	`+<mode name="Solo Mode" id="codename.solo"/>`