nerdyy nerd

Project.xml

@@ -52,16 +52,11 @@
 	<define name="CRASH_HANDLER" if="desktop release" />
 
 	<section if="officialBuild">
-		<define name="TITLE_SCREEN_EASTER_EGG"/>
 		<define name="VIDEOS_ALLOWED" if="windows || linux || android" unless="32bits"/> <!-- IF YOU WANT TO USE VIDEOS ON YOUR SOURCE MOD, GET THIS LINE OUTSIDE OF THE SECTION -->
 	</section>
 
 	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
 	<assets path="assets/preload" rename="assets" exclude="*.mp3"  unless="web"/>
-	<section if="TITLE_SCREEN_EASTER_EGG">
-		<assets path="assets/secrets" rename="assets" exclude="*.ogg" if="web"/>
-		<assets path="assets/secrets" rename="assets" exclude="*.mp3"  unless="web"/>
-	</section>
 
 	<!-- DONT ENABLE THIS -->
 	<define name="CHECK_FOR_UPDATES" if="desktop officialBuild"/>
@@ -128,12 +123,11 @@
 	<!-- _______________________________ Libraries ______________________________ -->
 
 	<haxedev set='webgl' />
-	<!-- TODO: go to new flixel (5.5.0) -->
-
-	<haxelib name="lime" version="8.1.1"/>
+
+	<haxelib name="lime" version="8.1.2"/>
 	<haxelib name="openfl" version="9.3.3"/>
 
-	<haxelib name="flixel"/>
+	<haxelib name="flixel" version="5.5.0"/>
 	<haxelib name="flixel-ui" />
 	<haxelib name="flixel-addons"/>
 

hmm.json

@@ -8,12 +8,12 @@
     {
       "name": "openfl",
       "type": "haxelib",
-      "version": "9.3.2"
+      "version": null
     },
     {
       "name": "flixel",
       "type": "haxelib",
-      "version": "5.5.0"
+      "version": null
     },
     {
       "name": "flixel-addons",

source/game/options/BaseOptionsMenu.hx

@@ -30,6 +30,7 @@ import backend.system.MusicBeatSubstate;
 import backend.system.MusicBeatState;
 import game.objects.AttachedText;
 import game.objects.*;
+import game.options.objects.CheckboxThingie;
 
 using StringTools;
 

source/game/options/CheckboxThingie.hx → source/game/options/objects/CheckboxThingie.hx

@@ -1,4 +1,4 @@
-package game.options;
+package game.options.objects;
 
 import flixel.FlxSprite;
 import flixel.graphics.frames.FlxAtlasFrames;

source/game/states/AnimatedImageState.hx

@@ -6,9 +6,9 @@ import flixel.FlxG;
 import flixel.text.FlxText;
 import flixel.FlxSprite;
 import flixel.util.FlxColor;
-
 import backend.system.MusicBeatSubstate;
 import backend.system.MusicBeatState;
+
 using StringTools;
 
 class AnimatedImageState extends MusicBeatState
@@ -18,8 +18,8 @@ class AnimatedImageState extends MusicBeatState
 	var index:FlxSprite;
 	var stateReturn:FlxState;
 
-
-	public function new(text:String, image:String, animPrefix:String, center:Bool, framerate:Int = 24, returnState:FlxState, color:FlxColor = FlxColorPastel.PASTELPINK)
+	public function new(text:String, image:String, animPrefix:String, center:Bool, framerate:Int = 24, returnState:FlxState,
+			color:FlxColor = FlxColorPastel.PASTELPINK)
 	{
 		super();
 		FlxG.sound.music.stop();
@@ -41,11 +41,12 @@ class AnimatedImageState extends MusicBeatState
 		index.frames = backend.utils.Paths.getSparrowAtlas(image);
 		index.antialiasing = backend.utils.ClientPrefs.data.globalAntialiasing;
 		index.animation.addByPrefix('instance', animPrefix, framerate, true);
-		if (center) index.screenCenter();
+		if (center)
+			index.screenCenter();
 		index.animation.play('instance');
 		index.updateHitbox();
 		add(index);
-	};
+	}
 
 	override function update(elapsed:Float)
 	{

source/game/states/OutdatedState.hx

@@ -1,5 +1,6 @@
 package game.states;
 
+import backend.data.EngineData;
 import backend.CoolUtil;
 import flixel.FlxG;
 import flixel.FlxSprite;
@@ -12,50 +13,57 @@ import flixel.addons.transition.FlxTransitionableState;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;
 import backend.data.PsychData;
-
 import backend.system.MusicBeatSubstate;
 import backend.system.MusicBeatState;
+
 class OutdatedState extends MusicBeatState
 {
 	public static var leftState:Bool = false;
 
 	var warnText:FlxText;
+
 	override function create()
 	{
 		super.create();
 
 		var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
 		add(bg);
 
-		warnText = new FlxText(0, 0, FlxG.width,
-			"Sup bro, looks like you're running an   \n
-			outdated version of Psych Engine (" + PsychData.psychVersion + "),\n
-			please update to " + game.states.TitleState.updateVersion + "!\n
+		warnText = new FlxText(0, 0, FlxG.width, "Sup bro, looks like you're running an   \n
+			outdated version of Astro Engine ["
+			+ EngineData.mainCoreShit.coreVersion
+			+ "],\n
+			please update to "
+			+ game.states.TitleState.updateVersion
+			+ "!\n
 			Press ESCAPE to proceed anyway.\n
 			\n
-			Thank you for using the Engine!",
-			32);
+			Thank you for using the Engine!", 32);
 		warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
 		warnText.screenCenter(Y);
 		add(warnText);
 	}
 
 	override function update(elapsed:Float)
 	{
-		if(!leftState) {
-			if (controls.ACCEPT) {
+		if (!leftState)
+		{
+			if (controls.ACCEPT)
+			{
 				leftState = true;
 				CoolUtil.browserLoad("https://github.com/ShadowMario/FNF-PsychEngine/releases");
 			}
-			else if(controls.BACK) {
+			else if (controls.BACK)
+			{
 				leftState = true;
 			}
 
-			if(leftState)
+			if (leftState)
 			{
 				FlxG.sound.play(backend.utils.Paths.sound('cancelMenu'));
 				FlxTween.tween(warnText, {alpha: 0}, 1, {
-					onComplete: function (twn:FlxTween) {
+					onComplete: function(twn:FlxTween)
+					{
 						MusicBeatState.switchState(new game.states.MainMenuState());
 					}
 				});