Lots of Stuff Credit for Custom songs, Custom Images and fixes

CamLikesKirby · May 18, 2024 · 19432de · 19432de
1 parent 4b1a61d
commit 19432de
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 9 deletions.
diff --git a/assets/preload/images/packs/mod.png b/assets/preload/images/packs/mod.png
diff --git a/mods/test/Icon.png b/mods/test/Icon.png
diff --git a/mods/test/data/charts/test-cred.txt b/mods/test/data/charts/test-cred.txt
@@ -0,0 +1 @@
+Kawai Sprite & MtH
diff --git a/source/CreditsPopUp.hx b/source/CreditsPopUp.hx
@@ -61,6 +61,15 @@ class CreditsPopUp extends FlxSpriteGroup
 				songCreator = 'TH3R34LD34L';
 			case 'roofs':
 				songCreator = 'sibottle';
+			default:
+				if (FreeplayState.isaCustomSong) {
+					var custom = CoolUtil.coolTextFile(TitleState.modFolder + '/data/charts/' + PlayState.SONG.song.toLowerCase() + '-cred.txt');
+					for (i in 0...custom.length)
+						{
+							var data:Array<String> = custom[i].split(':');
+							songCreator = data[0];
+						}
+				}
 		}
 		switch (PlayState.storyWeek)
 		{
@@ -101,13 +110,19 @@ class CreditsPopUp extends FlxSpriteGroup
 			case 16:
 				headingPath = {path: 'songHeadings/expungedHeading', antiAliasing: true,
 				animation: new Animation('expunged', 'Expunged', 24, true, [false, false]), iconOffset: 0};
+			default:
+			if (FreeplayState.isaCustomSong)
+			headingPath = {path: 'songHeadings/daveHeading', antiAliasing: false, iconOffset: 0};
 		}
 		switch (PlayState.SONG.song.toLowerCase())
 		{
 			case 'polygonized':
 				headingPath = {path: 'songHeadings/3D-daveHeading', antiAliasing: false, iconOffset: 0};
 			case 'interdimensional':
 				headingPath = {path: 'songHeadings/interdimensionalHeading', antiAliasing: false, iconOffset: 0};
+			default:
+			if (FreeplayState.isaCustomSong)
+			headingPath = {path: 'songHeadings/daveHeading', antiAliasing: false, iconOffset: 0};
 		}
 		if (PlayState.recursedStaticWeek)
 		{

diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -21,6 +21,10 @@ import flixel.FlxObject;
 import flixel.addons.util.FlxAsyncLoop;
 #if sys import sys.FileSystem; #end
 #if desktop import Discord.DiscordClient; #end
+import flixel.graphics.FlxGraphic;
+import openfl.display.BitmapData;
+import openfl.utils.Assets as OpenFlAssets;
+
 
 using StringTools;
 
@@ -49,7 +53,7 @@ class FreeplayState extends MusicBeatState
 	var customSongs = CoolUtil.coolTextFile(TitleState.modFolder + '/data/CustomSongs.txt'); // idk should work
 
 	private var Catagories:Array<String> = ['dave', 'joke', 'extras', 'mod'];
-	var translatedCatagory:Array<String> = [LanguageManager.getTextString('freeplay_dave'), LanguageManager.getTextString('freeplay_joke'), LanguageManager.getTextString('freeplay_extra')];
+	var translatedCatagory:Array<String> = [LanguageManager.getTextString('freeplay_dave'), LanguageManager.getTextString('freeplay_joke'), LanguageManager.getTextString('freeplay_extra'), TitleState.currentMod];
 
 	private var CurrentPack:Int = 0;
 	private var NameAlpha:Alphabet;
@@ -170,7 +174,8 @@ class FreeplayState extends MusicBeatState
 		for (i in 0...Catagories.length)
 		{
 			Highscore.load();
-
+			if (FileSystem.exists(Paths.image('packs/' + (Catagories[i].toLowerCase())))) {
+				trace('yay');
 			var CurrentSongIcon:FlxSprite = new FlxSprite(0,0).loadGraphic(Paths.image('packs/' + (Catagories[i].toLowerCase()), "preload"));
 			CurrentSongIcon.centerOffsets(false);
 			CurrentSongIcon.x = (1000 * i + 1) + (512 - CurrentSongIcon.width);
@@ -184,6 +189,22 @@ class FreeplayState extends MusicBeatState
 			icons.push(CurrentSongIcon);
 			add(NameAlpha);
 			titles.push(NameAlpha);
+			} else {
+			trace('nae');
+		var CurrentSongIcon:FlxSprite = new FlxSprite(0,0).loadGraphic(Paths.customImage('Icon'));
+			CurrentSongIcon.centerOffsets(false);
+			CurrentSongIcon.x = (1000 * i + 1) + (512 - CurrentSongIcon.width);
+			CurrentSongIcon.y = (FlxG.height / 2) - 256;
+			CurrentSongIcon.antialiasing = true;
+
+			var NameAlpha:Alphabet = new Alphabet(40, (FlxG.height / 2) - 282, translatedCatagory[i], true, false);
+			NameAlpha.x = CurrentSongIcon.x;
+
+			add(CurrentSongIcon);
+			icons.push(CurrentSongIcon);
+			add(NameAlpha);
+			titles.push(NameAlpha);
+			}
 		}
 
 

diff --git a/source/HealthIcon.hx b/source/HealthIcon.hx
@@ -2,6 +2,9 @@ package;
 
 import flixel.FlxSprite;
 import flixel.math.FlxMath;
+import flixel.graphics.FlxGraphic;
+import openfl.display.BitmapData;
+
 
 class HealthIcon extends FlxSprite
 {
@@ -34,7 +37,7 @@ class HealthIcon extends FlxSprite
 		if (this.char != char)
 		{
 			if (char != "none")
-				loadGraphic(Paths.image('ui/iconGrid/' + char, 'preload'), true, 150, 150);
+				loadGraphic(FlxGraphic.fromBitmapData(BitmapData.fromFile(Paths.image('ui/iconGrid/' + char, 'preload'))), true, 150, 150);
 			else
 				loadGraphic(Paths.image('blank', 'shared'));
 

diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx
@@ -92,9 +92,7 @@ class OptionsMenu extends MusicBeatState
 			+ "\n" + (FlxG.save.data.disableFps ? LanguageManager.getTextString('option_enable_fps') : LanguageManager.getTextString('option_disable_fps'))
 			+ "\n" + (CompatTool.save.data.compatMode ? LanguageManager.getTextString('option_enable_compat') : LanguageManager.getTextString('option_disable_compat'))
 			+ "\n" + (FlxG.save.data.modchart ? 'Mod Chart OFF' : 'Mod Chart ON')
-			#if debug
 			+ "\n" + (FlxG.save.data.botplay ? 'Bot Play ON' : 'Bot Play OFF')
-			#end
 			);
 
 		grpControls = new FlxTypedGroup<Alphabet>();
@@ -205,11 +203,9 @@ class OptionsMenu extends MusicBeatState
 				case 12:
 					if (!awaitingExploitation) FlxG.save.data.modchart = !FlxG.save.data.modchart;
 					updateGroupControls(FlxG.save.data.modchart ? 'Mod Chart OFF' : 'Mod Chart ON', 12, 'Vertical');
-				#if debug
 				case 13:
 				   FlxG.save.data.botplay = !FlxG.save.data.botplay;
 					updateGroupControls(FlxG.save.data.botplay ? 'Bot Play ON' : 'Bot Play OFF', 13, 'Vertical');
-				#end
 			}
 		}
 	}

diff --git a/source/Paths.hx b/source/Paths.hx
@@ -1,5 +1,7 @@
 package;
 
+import flixel.graphics.FlxGraphic;
+import openfl.display.BitmapData;
 import flixel.FlxG;
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.utils.AssetType;
@@ -154,6 +156,10 @@ class Paths
 			return TitleState.modFolder + '/data/charts/$key.json';
 		}
 
+		inline static public function customImage(key:String)
+			{
+				return (FlxGraphic.fromBitmapData(BitmapData.fromFile(TitleState.modFolder + '/${key}.png')));
+			}
 	inline static public function music(key:String, ?library:String)
 	{
 		return getPath('music/$key.$SOUND_EXT', MUSIC, library);

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -533,9 +533,9 @@ class PlayState extends MusicBeatState
 		if (FlxG.sound.music != null)
 			FlxG.sound.music.stop();
 		eyesoreson = FlxG.save.data.eyesores;
-		#if debug
+
 		botPlay = FlxG.save.data.botplay;
-		#end
+
 		modchartoption = !FlxG.save.data.modchart;
 
 		sicks = 0;