diff --git a/assets/images/menuBG.png b/assets/images/menuBG.png index 2e3fd0a5..c5d1f5be 100644 Binary files a/assets/images/menuBG.png and b/assets/images/menuBG.png differ diff --git a/assets/images/menuBGBlue.png b/assets/images/menuBGBlue.png index d5b3c090..975b0dfb 100644 Binary files a/assets/images/menuBGBlue.png and b/assets/images/menuBGBlue.png differ diff --git a/assets/images/menuBGMagenta.png b/assets/images/menuBGMagenta.png index 2fd3d3d0..8501e2dd 100644 Binary files a/assets/images/menuBGMagenta.png and b/assets/images/menuBGMagenta.png differ diff --git a/assets/images/menuDesat.png b/assets/images/menuDesat.png index 1d0b5970..02ed705f 100644 Binary files a/assets/images/menuDesat.png and b/assets/images/menuDesat.png differ diff --git a/source/backend/Paths.hx b/source/backend/Paths.hx index c63c4301..74ef3ca7 100644 --- a/source/backend/Paths.hx +++ b/source/backend/Paths.hx @@ -1,6 +1,5 @@ package backend; -import openfl.utils.AssetType; import openfl.media.Sound; using haxe.io.Path; diff --git a/source/debug/FPS.hx b/source/debug/FPS.hx index f5b17a0f..67636d09 100644 --- a/source/debug/FPS.hx +++ b/source/debug/FPS.hx @@ -14,7 +14,7 @@ class FPS extends TextField width = 1280; height = 720; selectable = false; - defaultTextFormat = new TextFormat(Paths.font((font != null) ? font : 'vcr.ttf'), 18, 0xFFFFFF); + defaultTextFormat = new TextFormat(Paths.font((font != null) ? font : 'vcr.ttf'), 18, color); alpha = 0.8; // to see things from the back better addEventListener(openfl.events.Event.ENTER_FRAME, (_) -> diff --git a/source/meta/state/MainMenuState.hx b/source/meta/state/MainMenuState.hx index df39d1db..b2f2168e 100644 --- a/source/meta/state/MainMenuState.hx +++ b/source/meta/state/MainMenuState.hx @@ -303,7 +303,6 @@ class MainMenuState extends MusicBeatState #end var selectedSomethin:Bool = false; - override function update(elapsed:Float) { if (tipTextScrolling) @@ -366,6 +365,14 @@ class MainMenuState extends MusicBeatState if (controls.RESET && menuJSON.enableReloadKey) FlxG.resetState(); + + #if debug + if (FlxG.keys.justPressed.FOUR) { + openSubState(new meta.video.VideoSubState('video', () -> { + FlxG.sound.playMusic(Paths.music('freakyMenu')); + FlxG.resetState(); + })); + } } super.update(elapsed); diff --git a/source/meta/state/ModsMenuState.hx b/source/meta/state/ModsMenuState.hx index 18b22a86..37619486 100644 --- a/source/meta/state/ModsMenuState.hx +++ b/source/meta/state/ModsMenuState.hx @@ -1,7 +1,6 @@ package meta.state; import flixel.ui.FlxButton; -import flixel.input.keyboard.FlxKey; class ModsMenuState extends MusicBeatState { diff --git a/source/meta/state/PlayState.hx b/source/meta/state/PlayState.hx index 88494e49..72247f66 100644 --- a/source/meta/state/PlayState.hx +++ b/source/meta/state/PlayState.hx @@ -1201,10 +1201,14 @@ class PlayState extends MusicBeatState #if LUA_ALLOWED if(file.toLowerCase().endsWith('.lua')) luaArray.push(new FunkinLua(folder + file)); - #elseif HSCRIPT_ALLOWED + #end + + #if HSCRIPT_ALLOWED if(file.toLowerCase().endsWith('.hscript')) addHscript(folder + file); - #elseif SCRIPT_EXTENSION + #end + + #if SCRIPT_EXTENSION if(file.toLowerCase().endsWith('.hx')) scriptArray.push(new FunkinSScript(folder + file)); #end @@ -1228,7 +1232,9 @@ class PlayState extends MusicBeatState if(doPush) luaArray.push(new FunkinLua(luaFile)); - #elseif HSCRIPT_ALLOWED + #end + + #if HSCRIPT_ALLOWED var hscriptFile:String = 'stages/' + curStage + '.hscript'; if(FileSystem.exists(Paths.modFolders(hscriptFile))) { hscriptFile = Paths.modFolders(hscriptFile); @@ -1242,7 +1248,9 @@ class PlayState extends MusicBeatState if(doPush) addHscript(hscriptFile); - #elseif SCRIPT_EXTENSION + #end + + #if SCRIPT_EXTENSION var scriptFile:String = 'stages/' + curStage + '.hx'; if(FileSystem.exists(Paths.modFolders(scriptFile))) { scriptFile = Paths.modFolders(scriptFile); @@ -1560,6 +1568,7 @@ class PlayState extends MusicBeatState #end } #end + #if HSCRIPT_ALLOWED for (notetype in noteTypes) { @@ -1610,6 +1619,7 @@ class PlayState extends MusicBeatState #end } #end + #if SCRIPT_EXTENSION for (notetype in noteTypes) { @@ -1672,10 +1682,14 @@ class PlayState extends MusicBeatState #if LUA_ALLOWED if(file.toLowerCase().endsWith('.lua')) luaArray.push(new FunkinLua(folder + file)); - #elseif HSCRIPT_ALLOWED + #end + + #if HSCRIPT_ALLOWED if(file.toLowerCase().endsWith('.hscript')) addHscript(folder + file); - #elseif SCRIPT_EXTENSION + #end + + #if SCRIPT_EXTENSION if(file.toLowerCase().endsWith('.hx')) scriptArray.push(new FunkinSScript(folder + file)); #end diff --git a/source/meta/state/TestState.hx b/source/meta/state/TestState.hx deleted file mode 100644 index 1e66e50f..00000000 --- a/source/meta/state/TestState.hx +++ /dev/null @@ -1,52 +0,0 @@ -package meta.state; - -// simple test state -class TestState extends MusicBeatState -{ - override public function create() - { - super.create(); - - var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.WHITE); - bg.scale.set(10, 10); - bg.screenCenter(); - add(bg); - - var musplayer:FlxSprite = new FlxSprite(0, 0).loadGraphic(Paths.image('radio/musplayer')); - musplayer.screenCenter(); - musplayer.antialiasing = ClientPrefs.globalAntialiasing; - add(musplayer); - var disc:FlxSprite = new FlxSprite(0, 0).loadGraphic(Paths.image('radio/disc')); - disc.setPosition(musplayer.x + 268, musplayer.y + 13); - disc.antialiasing = ClientPrefs.globalAntialiasing; - disc.angularVelocity = 30; - add(disc); - var playerneedle:FlxSprite = new FlxSprite(0, 0).loadGraphic(Paths.image('radio/playerneedle')); - playerneedle.screenCenter(); - playerneedle.antialiasing = ClientPrefs.globalAntialiasing; - add(playerneedle); - - var testTxt:Alphabet = new Alphabet(0, 0, 'This is a test.', true); - testTxt.setPosition(50, musplayer.y - 120); - add(testTxt); - } - - override public function update(elapsed:Float) - { - super.update(elapsed); - - if (controls.BACK) - { - FlxG.sound.play(Paths.sound('cancelMenu')); - if (ClientPrefs.simpleMain) - MusicBeatState.switchState(new SimpleMainMenuState()); - else - MusicBeatState.switchState(new MainMenuState()); - } - } - - override function beatHit() - { - super.beatHit(); - } -} \ No newline at end of file diff --git a/source/meta/state/editors/MasterEditorMenu.hx b/source/meta/state/editors/MasterEditorMenu.hx index ee0bf110..aae7e255 100644 --- a/source/meta/state/editors/MasterEditorMenu.hx +++ b/source/meta/state/editors/MasterEditorMenu.hx @@ -125,9 +125,6 @@ class MasterEditorMenu extends MusicBeatState FlxG.sound.music.volume = 0; FreeplayState.destroyFreeplayVocals(); } - - if (FlxG.keys.justPressed.T) - MusicBeatState.switchState(new TestState()); for (num => item in grpTexts.members) {