From b46d816e006a51969e022e9e569e0dd517848c64 Mon Sep 17 00:00:00 2001 From: crowplexus <45212377+crowplexus@users.noreply.github.com> Date: Fri, 9 Feb 2024 08:05:45 -0400 Subject: [PATCH] Change some strings to comply with the newest version (#242) * Update README.md * Update CodenameBuildField.hx * Update MainMenuState.hx * Update CodenameBuildField.hx * Delete unused Main.hx file --- README.md | 2 +- source/Main.hx | 1 - .../system/framerate/CodenameBuildField.hx | 8 ++++++-- source/funkin/menus/MainMenuState.hx | 20 +++++-------------- 4 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 source/Main.hx diff --git a/README.md b/README.md index 24d415c6..0f623784 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## PLEASE NOTE - THIS IS STILL IN A BETA STATE ### Mods created with beta versions of Codename may not be compatible with the release version -Known issues in the alpha: +Known issues in the beta: - Some options are missing - Week 6 still have no dialogue diff --git a/source/Main.hx b/source/Main.hx deleted file mode 100644 index dfea956d..00000000 --- a/source/Main.hx +++ /dev/null @@ -1 +0,0 @@ -typedef Main = funkin.backend.system.Main; \ No newline at end of file diff --git a/source/funkin/backend/system/framerate/CodenameBuildField.hx b/source/funkin/backend/system/framerate/CodenameBuildField.hx index ad783ccb..248adcad 100644 --- a/source/funkin/backend/system/framerate/CodenameBuildField.hx +++ b/source/funkin/backend/system/framerate/CodenameBuildField.hx @@ -6,11 +6,15 @@ 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 Beta\nCommit ${GitCommitMacro.commitNumber} (${GitCommitMacro.commitHash})'; + text = 'Codename Engine${releaseCycle}\nCommit ${GitCommitMacro.commitNumber} (${GitCommitMacro.commitHash})'; } -} \ No newline at end of file +} diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 2b73ab10..33ff079d 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -77,8 +77,8 @@ 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'); - versionShit.scrollFactor.set(); versionShit.y -= versionShit.height; + versionShit.scrollFactor.set(); add(versionShit); changeItem(); @@ -165,20 +165,10 @@ class MainMenuState extends MusicBeatState if (event.cancelled) return; switch (daChoice) { - case 'story mode': - FlxG.switchState(new StoryMenuState()); - trace("Story Menu Selected"); - - case 'freeplay': - FlxG.switchState(new FreeplayState()); - trace("Freeplay Menu Selected"); - - case 'donate': - FlxG.switchState(new CreditsMain()); - trace("Credits Menu Selected"); - - case 'options': - FlxG.switchState(new OptionsMenu()); + case 'story mode': FlxG.switchState(new StoryMenuState()); + case 'freeplay': FlxG.switchState(new FreeplayState()); + case 'donate': FlxG.switchState(new CreditsMain()); + case 'options': FlxG.switchState(new OptionsMenu()); } }); }