what the fuck dude

AstroEngineDevs · Jun 29, 2024 · fe0198e · fe0198e
1 parent 8e5fdd9
commit fe0198e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,8 +1,8 @@
 # ```TODO```
 
-* Make a macro to change the current version from github.com
-* finish Init State.
-* add bg to FPS (so it readable frfr)
+* ~~finish Init State.~~
+* Finsh Video Handler State
+* add winning icon support :3c
 
 OLD:
 * Might add winning icons (only if i can get the icons for them :3)

diff --git a/source/funkin/backend/system/MusicBeatState.hx b/source/funkin/backend/system/MusicBeatState.hx
@@ -41,6 +41,10 @@ class MusicBeatState extends FlxUIState
 		FlxTransitionableState.skipNextTransOut = false;
 	}
 
+	public static function init() {
+		trace('Init Complete'); // Makes Sure MusicBeatState isnt null fr
+	}
+
 	public function addBehindObject(obj:FlxBasic, obj2:FlxBasic)
 		return insert(members.indexOf(obj2), obj);
 

diff --git a/source/funkin/game/Init.hx b/source/funkin/game/Init.hx
@@ -3,7 +3,7 @@ package funkin.game;
 import flixel.input.keyboard.FlxKey;
 import funkin.backend.utils.Paths;
 
-class Init extends MusicBeatState
+class Init extends flixel.FlxState
 {
 	override public function create():Void
 	{
@@ -16,26 +16,24 @@ class Init extends MusicBeatState
 		Paths.pushGlobalMods();
 		#end
 		funkin.backend.data.WeekData.loadTheFirstEnabledMod();
- 
+
 		Logs.init();
 		Volume.init();
 		funkin.backend.Highscore.load();
 		funkin.backend.utils.ClientPrefs.init();
+		MusicBeatState.init();
 
 		#if DISCORD_ALLOWED
 		DiscordClient.prepare();
 		#end
 
-		if (ClientPrefs.data.mouseEvents && !ClientPrefs.data.lowQuality)
-			FlxG.mouse.visible = true;
-		else
-			FlxG.mouse.visible = false;
-
 		super.create();
 
 		// Extra stuff goes here :3
+		if (FlxG.save.data != null && FlxG.save.data.fullscreen)
+			FlxG.fullscreen = FlxG.save.data.fullscreen;
 
-		MusicBeatState.switchState(new TitleState());
+		FlxG.switchState(new TitleState());
 	}
 }
 
@@ -45,7 +43,7 @@ class Volume
 	public static var volumeDownKeys:Array<FlxKey> = [FlxKey.NUMPADMINUS, FlxKey.MINUS];
 	public static var volumeUpKeys:Array<FlxKey> = [FlxKey.NUMPADPLUS, FlxKey.PLUS];
 
-	public static function init()
+	public static function init():Void
 	{
 		FlxG.sound.muteKeys = muteKeys;
 		FlxG.sound.volumeDownKeys = volumeDownKeys;
@@ -58,7 +56,7 @@ class Logs // Modded trace func
 {
 	private static final fuckbaby:String = "[Astro System]"; // prefix i guess
 
-	public static function init()
+	public static function init():Void
 	{
 		haxe.Log.trace = tracev2;
 	}

diff --git a/source/funkin/game/states/PlayState.hx b/source/funkin/game/states/PlayState.hx
@@ -3335,9 +3335,10 @@ class PlayState extends MusicBeatState
 		else
 			iconP1.animation.curAnim.curFrame = 0;
 
-		if (healthBar.percent > 80)
+		if (healthBar.percent > 80){
 			iconP2.animation.curAnim.curFrame = 1;
-		else
+			iconP1.animation.curAnim.curFrame = 2;
+		} else
 			iconP2.animation.curAnim.curFrame = 0;
 
 		if (FlxG.keys.anyJustPressed(debugKeysCharacter) && !endingSong && !inCutscene) {

diff --git a/source/funkin/game/states/TitleState.hx b/source/funkin/game/states/TitleState.hx
@@ -137,11 +137,6 @@ class TitleState extends MusicBeatState
 
 		if (!initialized)
 		{
-			if (FlxG.save.data != null && FlxG.save.data.fullscreen)
-			{
-				FlxG.fullscreen = FlxG.save.data.fullscreen;
-				// trace('LOADED FULLSCREEN SETTING!!');
-			}
 			persistentUpdate = true;
 			persistentDraw = true;
 		}

diff --git a/source/funkin/game/states/VideoHandlerState.hx b/source/funkin/game/states/VideoHandlerState.hx
@@ -0,0 +1,3 @@
+package funkin.game.states;
+
+// TODO: umm make video states easier :3