some fixes

Psych-Slice · Dec 25, 2024 · 747da9e · 747da9e
1 parent 556b3e8
commit 747da9e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Project.xml b/Project.xml
@@ -5,7 +5,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/xsd/project-1.0.4.xsd">
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin': P-Slice Engine" file="PSliceEngine" packageName="com.mikolka9144.pslice" package="com.mikolka9144.pslice" main="Main" version="2.1" company="mikolka9144" />
+	<app title="Friday Night Funkin': P-Slice Engine" file="PSliceEngine" packageName="com.mikolka9144.pslice" package="com.mikolka9144.pslice" main="Main" version="2.2.1" company="mikolka9144" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />

diff --git a/source/mikolka/compatibility/FreeplaySongData.hx b/source/mikolka/compatibility/FreeplaySongData.hx
@@ -130,8 +130,10 @@ using mikolka.funkin.utils.ArrayTools;
              }
 
          }
-         if (!this.songDifficulties.contains(currentDifficulty))
+         if (!this.songDifficulties.contains(currentDifficulty)){
+             @:bypassAccessor
              currentDifficulty = songDifficulties[0]; // TODO
+         }
 
          songStartingBpm = BPMCache.instance.getBPM(sngDataPath,fileSngName);
 

diff --git a/source/options/VisualsSettingsSubState.hx b/source/options/VisualsSettingsSubState.hx
@@ -59,6 +59,7 @@ class VisualsSettingsSubState extends BaseOptionsMenu
 			noteOptionID = optionsArray.length - 1;
 		}
 
+		if (PlayState.SONG != null) PlayState.SONG.splashSkin = null; // Fix this component not working when entering from a song!
 		var noteSplashes:Array<String> = Mods.mergeAllTextsNamed('images/noteSplashes/list.txt');
 		if(noteSplashes.length > 0)
 		{

diff --git a/source/states/MainMenuState.hx b/source/states/MainMenuState.hx
@@ -12,7 +12,7 @@ import options.OptionsState;
 class MainMenuState extends MusicBeatState
 {
 	public static var psychEngineVersion:String = '1.0'; // This is also used for Discord RPC
-	public static var pSliceVersion:String = '2.2'; 
+	public static var pSliceVersion:String = '2.2.1'; 
 	public static var funkinVersion:String = '0.5.3'; // Version of funkin' we are emulationg
 	public static var curSelected:Int = 0;
 

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -3461,8 +3461,7 @@ class PlayState extends MusicBeatState
 
 		if (note != null) {
 			var strum:StrumNote = (note.mustPress ? playerStrums : opponentStrums).members[note.noteData];
-
-			if(strum != null && note.tail.length != 0)
+			if(strum != null && note.tail.length > 1)
 				spawnHoldSplash(note);
 		}
 	}