v1.5.2 98%

AstroEngineDevs · Apr 19, 2023 · 2faf1e5 · 2faf1e5
1 parent 90d9bd2
commit 2faf1e5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/assets/preload/images/credits/nullObj.png b/assets/preload/images/credits/nullObj.png
diff --git a/source/TitleState.hx b/source/TitleState.hx
@@ -498,7 +498,7 @@ class TitleState extends MusicBeatState
 				new FlxTimer().start(1, function(tmr:FlxTimer)
 				{
 					if (mustUpdate) {
-						MusicBeatState.switchState(new OutdatedState());
+						MusicBeatState.switchState(new states.OutdatedState());
 					} else {
 						MusicBeatState.switchState(new menus.MainMenuState());
 					}

diff --git a/source/menus/CreditsState.hx b/source/menus/CreditsState.hx
@@ -81,6 +81,9 @@ class CreditsState extends MusicBeatState
 		#end
 
 		var pisspoop:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color
+			['Psy Engine Team'],
+			['Hackx2',		'',		'Main Programmer of Psy Engine',								'https://twitter.com/AnimatesHack',	'444444'],
+			[''],
 			['Psych Engine Team'],
 			['Shadow Mario',		'shadowmario',		'Main Programmer of Psych Engine',								'https://twitter.com/Shadow_Mario_',	'444444'],
 			['RiverOaken',			'river',			'Main Artist/Animator of Psych Engine',							'https://twitter.com/RiverOaken',		'B42F71'],
@@ -126,7 +129,14 @@ class CreditsState extends MusicBeatState
 					Paths.currentModDirectory = creditsStuff[i][5];
 				}
 
-				var icon:AttachedSprite = new AttachedSprite('credits/' + creditsStuff[i][1]);
+				//var icon:AttachedSprite = new AttachedSprite('credits/' + creditsStuff[i][1]);
+
+				// i stole from shadowmario
+				var str:String = 'credits/nullObj';
+				if (Paths.image('credits/' + creditsStuff[i][1]) != null)
+					str = 'credits/' + creditsStuff[i][1];
+
+				var icon:AttachedSprite = new AttachedSprite(str);
 				icon.xAdd = optionText.width + 10;
 				icon.sprTracker = optionText;
 

diff --git a/source/menus/FreeplayState.hx b/source/menus/FreeplayState.hx
@@ -125,6 +125,7 @@ class FreeplayState extends MusicBeatState
 
 			Paths.currentModDirectory = songs[i].folder;
 			var icon:HealthIcon = new HealthIcon(songs[i].songCharacter);
+			icon.animation.curAnim.curFrame = 1;
 			icon.sprTracker = songText;
 
 			// using a FlxGroup is too much fuss!

diff --git a/source/menus/MainMenuState.hx b/source/menus/MainMenuState.hx
@@ -9,6 +9,7 @@ import flixel.FlxSprite;
 import flixel.FlxCamera;
 import flixel.addons.transition.FlxTransitionableState;
 import flixel.effects.FlxFlicker;
+import flixel.util.FlxTimer;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.group.FlxGroup.FlxTypedGroup;
@@ -53,6 +54,7 @@ class MainMenuState extends MusicBeatState
 		["Psych Engine v", psych.CorePsych.psychVersion, null, null],
 		["Friday Night Funkin' v", Application.current.meta.get('version'), null, null]
 	];
+	private var selectedSomethinAnal:Bool = true;
 
 
 	var magenta:FlxSprite;
@@ -138,10 +140,15 @@ class MainMenuState extends MusicBeatState
 			menuItem.updateHitbox();
 			if (Core.mouseEvents)
 			{
+
 				#if (flixel >= "5.0.0") // update your fucking haxeflixel version
 					FlxMouseEvent.add(menuItem, null, function(e) stateChangeThing(), function(e)
 					{
-						if (!selectedSomethin)
+						new FlxTimer().start(0.2, function (tmr:FlxTimer) {
+							selectedSomethinAnal = true;
+						});
+
+						if (!selectedSomethin && selectedSomethinAnal)
 						{
 							curSelected = i;
 							changeItem();
@@ -220,12 +227,14 @@ class MainMenuState extends MusicBeatState
 			{
 				FlxG.sound.play(Paths.sound('scrollMenu'));
 				changeItem(-1);
+				susOWO();
 			}
 
 			if (controls.UI_DOWN_P)
 			{
 				FlxG.sound.play(Paths.sound('scrollMenu'));
 				changeItem(1);
+				susOWO();
 			}
 
 			if (controls.BACK)
@@ -256,6 +265,10 @@ class MainMenuState extends MusicBeatState
 		});
 	}
 
+	function susOWO() {
+		selectedSomethinAnal = false;
+	}
+
 	function stateChangeThing(){
 		if (optionShit[curSelected] == 'donate')
 			{

diff --git a/source/OutdatedState.hx → source/states/OutdatedState.hx b/source/OutdatedState.hx → source/states/OutdatedState.hx
@@ -1,4 +1,4 @@
-package;
+package states;
 
 import flixel.FlxG;
 import flixel.FlxSprite;