fixing da pr

#242 and also under @NeeEoo suggestion ive deleted that string part in mainmenustate please tell me if you find another alpha message instead of beta😭
CodenameCrew · Feb 9, 2024 · 8cabf1e · 8cabf1e
1 parent b46d816
commit 8cabf1e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx
@@ -36,6 +36,10 @@ import funkin.backend.assets.ModsFolder;
 
 class Main extends Sprite
 {
+	// make this empty once you guys are done with the project.
+	// good luck /gen <3 @crowplexus
+	public static final releaseCycle:String = "Beta";
+
 	public static var instance:Main;
 
 	public static var modToLoad:String = null;

diff --git a/source/funkin/backend/system/framerate/CodenameBuildField.hx b/source/funkin/backend/system/framerate/CodenameBuildField.hx
@@ -6,15 +6,11 @@ import openfl.text.TextField;
 import funkin.backend.system.macros.GitCommitMacro;
 
 class CodenameBuildField extends TextField {
-	// make this empty once you guys are done with the project.
-	// good luck /gen <3 @crowplexus
-	public static final releaseCycle:String = " Beta";
-
 	public function new() {
 		super();
 		defaultTextFormat = Framerate.textFormat;
 		autoSize = LEFT;
 		multiline = wordWrap = false;
-		text = 'Codename Engine${releaseCycle}\nCommit ${GitCommitMacro.commitNumber} (${GitCommitMacro.commitHash})';
+		text = 'Codename Engine ${Main.releaseCycle}\nCommit ${GitCommitMacro.commitNumber} (${GitCommitMacro.commitHash})';
 	}
 }
diff --git a/source/funkin/import.hx b/source/funkin/import.hx
@@ -1,4 +1,5 @@
 #if !macro
+import funkin.backend.system.Main;
 import funkin.backend.assets.Paths;
 import funkin.backend.MusicBeatState;
 import funkin.backend.MusicBeatSubstate;
@@ -27,4 +28,4 @@ import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 
 using StringTools;
 using funkin.backend.utils.CoolUtil;
-#end
+#end
diff --git a/source/funkin/menus/BetaWarningState.hx b/source/funkin/menus/BetaWarningState.hx
@@ -20,7 +20,7 @@ class BetaWarningState extends MusicBeatState {
 
 		disclaimer = new FunkinText(16, titleAlphabet.y + titleAlphabet.height + 10, FlxG.width - 32, "", 32);
 		disclaimer.alignment = CENTER;
-		disclaimer.applyMarkup("This engine is still in a beta state. That means *majority of the features* are either *buggy* or *non finished*. If you find any bugs, please report them to the Codename Engine GitHub.\n\nPress ENTER to continue",
+		disclaimer.applyMarkup('This engine is still in a *${Main.releaseCycle}* state. That means *majority of the features* are either *buggy* or *non finished*. If you find any bugs, please report them to the Codename Engine GitHub.\n\nPress ENTER to continue',
 			[
 				new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFF4444), "*")
 			]

diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx
@@ -76,7 +76,7 @@ class MainMenuState extends MusicBeatState
 
 		FlxG.camera.follow(camFollow, null, 0.06);
 
-		var versionShit:FunkinText = new FunkinText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nAlpha: Commit ${funkin.backend.system.macros.GitCommitMacro.commitNumber} (${funkin.backend.system.macros.GitCommitMacro.commitHash})\n[TAB] Open Mods menu\n');
+		var versionShit:FunkinText = new FunkinText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nCommit ${funkin.backend.system.macros.GitCommitMacro.commitNumber} (${funkin.backend.system.macros.GitCommitMacro.commitHash})\n[TAB] Open Mods menu\n');
 		versionShit.y -= versionShit.height;
 		versionShit.scrollFactor.set();
 		add(versionShit);

diff --git a/source/openfl/utils/Assets.hx b/source/openfl/utils/Assets.hx
@@ -1,5 +1,6 @@
 package openfl.utils;
 
+import funkin.backend.system.Main;
 import funkin.options.Options;
 import funkin.backend.system.OptimizedBitmapData;
 import openfl.utils._internal.Log;