Merge branch 'main' of https://github.com/Snirozu/Funkin-Psych-Online

Author: Snirozu

Diff for: source/backend/ClientPrefs.hx

@@ -1,5 +1,6 @@
 package backend;
 
+import options.VisualsUISubState;
 import options.NotesSubState;
 import online.network.FunkinNetwork;
 import online.GameClient;
@@ -383,4 +384,15 @@ class ClientPrefs {
 			CoolUtil.asta(GameClient.room.state.player2.arrowColorP3),
 		];
 	}
+
+	public static function getNoteSkin(player:Int = 0):String
+	{
+		if(!GameClient.isConnected() || NotesSubState.isOpened || VisualsUISubState.isOpened)
+			return data.noteSkin;
+
+		if(player == 0)
+			return GameClient.room.state.player1.noteSkin;
+		else
+			return GameClient.room.state.player2.noteSkin;
+	}
 }

Diff for: source/backend/NoteSkinData.hx

@@ -0,0 +1,72 @@
+package backend;
+
+import openfl.utils.Assets;
+
+#if sys
+import sys.io.File;
+import sys.FileSystem;
+#end
+
+class NoteSkinData {
+	public static var noteSkins:Array<NoteSkinStructure> = [];
+	public static var noteSkinArray:Array<String> = [];
+
+	public static function reloadNoteSkins()
+	{
+		noteSkins = [];
+		noteSkinArray = [];
+
+		var directories:Array<Array<String>> = [[Paths.getLibraryPathForce('', 'shared'), '']];
+		#if MODS_ALLOWED
+		directories.push([Paths.mods(), '']);
+
+		for (mod in Mods.parseList().enabled)
+		{
+			if(Mods.getGlobalMods().contains(mod))
+				directories.push([Paths.mods(mod + '/'), mod]);
+		}
+		#end
+
+		var skinsFinished:Array<String> = [];
+
+		for (i in 0...directories.length) {
+			var directory:String = directories[i][0] + 'images/noteSkins/list.txt';
+
+			for (skin in CoolUtil.coolTextFile(directory)) {
+				if(!noteSkinArray.contains(skin)) {
+					noteSkins.push({
+						skin: skin, 
+						folder: directories[i][1], 
+						url: online.mods.OnlineMods.getModURL(directories[i][1])
+					});
+
+					noteSkinArray.push(skin);
+				}
+			}
+		}
+
+		noteSkins.insert(0, {skin: ClientPrefs.defaultData.noteSkin, folder: ''}); //Default skin always comes first
+		noteSkinArray.insert(0, ClientPrefs.defaultData.noteSkin);
+	}
+
+	public static function getCurrent(?player:Int = 0):NoteSkinStructure
+	{
+		var toReturn:NoteSkinStructure = null;
+		
+		if(player == -1)
+			toReturn = NoteSkinData.noteSkins[NoteSkinData.noteSkinArray.indexOf(ClientPrefs.data.noteSkin)];
+		else
+			toReturn = NoteSkinData.noteSkins[NoteSkinData.noteSkinArray.indexOf(ClientPrefs.getNoteSkin(player))];
+
+		if(toReturn == null)
+			toReturn = NoteSkinData.noteSkins[0];
+
+		return toReturn;
+	}
+}
+
+typedef NoteSkinStructure = {
+	var skin:String;
+	var folder:String;
+	@:optional var url:String;
+}

Diff for: source/objects/Note.hx

@@ -3,6 +3,7 @@ package objects;
 // If you want to make a custom note type, you should search for:
 // "function set_noteType"
 
+import backend.NoteSkinData;
 import online.GameClient;
 import backend.NoteTypesConfig;
 import shaders.RGBPalette;
@@ -37,7 +38,7 @@ class Note extends FlxSprite
 	public var extraData:Map<String, Dynamic> = new Map<String, Dynamic>();
 
 	public var strumTime:Float = 0;
-	public var mustPress:Bool = false;
+	public var mustPress(default, set):Bool = false;
 	public var noteData:Int = 0;
 	public var canBeHit:Bool = false;
 	public var tooLate:Bool = false;
@@ -317,8 +318,18 @@ class Note extends FlxSprite
 		var skin:String = texture + postfix;
 		if(texture.length < 1) {
 			skin = PlayState.SONG != null ? PlayState.SONG.arrowSkin : null;
-			if(skin == null || skin.length < 1)
+			if(skin == null || skin.length < 1) {
 				skin = defaultNoteSkin + postfix;
+
+				lastTexture = defaultNoteSkin;
+				lastPostfix = postfix;
+			} else {
+				lastTexture = '';
+				lastPostfix = '';
+			}
+		} else {
+			lastTexture = texture;
+			lastPostfix = postfix;
 		}
 
 		var animName:String = null;
@@ -328,7 +339,7 @@ class Note extends FlxSprite
 
 		var skinPixel:String = skin;
 		var lastScaleY:Float = scale.y;
-		var skinPostfix:String = getNoteSkinPostfix();
+		var skinPostfix:String = getNoteSkinPostfix(mustPress);
 		var customSkin:String = skin + skinPostfix;
 		var path:String = PlayState.isPixelStage ? 'pixelUI/' : '';
 		if(customSkin == _lastValidChecked || Paths.fileExists('images/' + path + customSkin + '.png', IMAGE))
@@ -375,11 +386,12 @@ class Note extends FlxSprite
 			animation.play(animName, true);
 	}
 
-	public static function getNoteSkinPostfix()
+	public static function getNoteSkinPostfix(?mustPress:Bool = true)
 	{
 		var skin:String = '';
-		if(ClientPrefs.data.noteSkin != ClientPrefs.defaultData.noteSkin)
-			skin = '-' + ClientPrefs.data.noteSkin.trim().toLowerCase().replace(' ', '_');
+		var noteSkin:String = NoteSkinData.getCurrent(!GameClient.room?.state?.swagSides ?? false ? (mustPress ? 1 : 0) : (mustPress ? 0 : 1)).skin;
+		if(noteSkin != ClientPrefs.defaultData.noteSkin)
+			skin = '-' + noteSkin.trim().toLowerCase().replace(' ', '_');
 		return skin;
 	}
 
@@ -553,4 +565,28 @@ class Note extends FlxSprite
 	@:unreflective public var noteAlpha(get, set):Float;
 	@:unreflective function get_noteAlpha():Float { return alpha; }
 	@:unreflective function set_noteAlpha(value:Float):Float { return super.set_alpha(value); }
+
+	var lastTexture:String = '';
+	var lastPostfix:String = '';
+	function set_mustPress(value:Bool):Bool
+	{
+		mustPress = value;
+		reloadNote(lastTexture, lastPostfix); // workaround for player related things
+
+		if (isSustainNote) {
+			var animBefore:String = animation.curAnim.name;
+
+			animation.play(colArray[noteData % colArray.length] + 'Scroll');
+			offsetX = width / 2;
+
+			animation.play(animBefore);
+			updateHitbox();
+			offsetX -= width / 2;
+
+			if (PlayState.isPixelStage)
+				offsetX += 30;
+		}
+
+		return value;
+	}
 }

Diff for: source/objects/NoteSplash.hx

@@ -1,5 +1,6 @@
 package objects;
 
+import online.GameClient;
 import shaders.RGBPalette;
 import flixel.system.FlxAssets.FlxShader;
 import flixel.graphics.frames.FlxFrame;

Diff for: source/objects/StrumNote.hx

@@ -3,6 +3,7 @@ package objects;
 import online.GameClient;
 import shaders.RGBPalette;
 import shaders.RGBPalette.RGBShaderReference;
+import backend.NoteSkinData;
 
 class StrumNote extends FlxSprite
 {
@@ -52,7 +53,7 @@ class StrumNote extends FlxSprite
 		if(PlayState.SONG != null && PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin;
 		else skin = Note.defaultNoteSkin;
 
-		var customSkin:String = skin + Note.getNoteSkinPostfix();
+		var customSkin:String = skin + Note.getNoteSkinPostfix(player == 1);
 		if(Paths.fileExists('images/$customSkin.png', IMAGE)) skin = customSkin;
 
 		texture = skin; //Load texture and anims

Diff for: source/online/GameClient.hx

@@ -1,5 +1,6 @@
 package online;
 
+import backend.NoteSkinData;
 import flixel.FlxState;
 import online.network.Auth;
 import online.network.FunkinNetwork;
@@ -51,7 +52,7 @@ class GameClient {
 		}, (exc) -> {
 			onJoin(exc);
 			LoadingScreen.toggle(false);
-			Alert.alert("Failed to connect!", exc.toString());
+			Alert.alert("Failed to connect!", exc.details());
 		});
     }
 
@@ -200,6 +201,11 @@ class GameClient {
 			options.set("skinURL", OnlineMods.getModURL(ClientPrefs.data.modSkin[0]));
 		}
 
+		var data:NoteSkinStructure = NoteSkinData.getCurrent(-1);
+		options.set('noteSkin', data.skin);
+		options.set('noteSkinMod', data.folder);
+		options.set('noteSkinURL', data.url);
+
 		// if (asHost) {
 		// 	options.set("gameplaySettings", ClientPrefs.data.gameplaySettings);
 		// }

Diff for: source/online/backend/schema/Player.hx

@@ -74,6 +74,15 @@ class Player extends Schema {
 	@:type("boolean")
 	public var verified:Bool = false;
 
+	@:type("string")
+	public var noteSkin:String = null;
+
+	@:type("string")
+	public var noteSkinMod:String = null;
+
+	@:type("string")
+	public var noteSkinURL:String = null;
+
 	@:type("array", "number")
 	public var arrowColor0:ArraySchema<Dynamic> = new ArraySchema<Dynamic>();
 

Diff for: source/online/objects/ChatBox.hx

@@ -40,6 +40,7 @@ class ChatBox extends FlxTypedSpriteGroup<FlxSprite> {
 	var onCommand:(String, Array<String>) -> Bool;
 
 	static var lastMessages:Array<Dynamic> = [];
+	var dwnMsgToClick:Map<NoteSkinDownloadMessage, ()->Void> = new Map<NoteSkinDownloadMessage, ()->Void>();
 
 	var initMessage:String = "See /help for the list of commands!";
 
@@ -59,6 +60,19 @@ class ChatBox extends FlxTypedSpriteGroup<FlxSprite> {
 		}
 	}
 
+	public function addNoteSkinDownloadMessage(onClick:()->Void) {
+		instance.targetAlpha = 5;
+
+		var chat = new NoteSkinDownloadMessage(instance.bg.width);
+		instance.chatGroup.insert(0, chat);
+
+		dwnMsgToClick.set(chat, onClick);
+
+		if (instance.chatGroup.length >= 22) {
+			instance.chatGroup.remove(instance.chatGroup.members[instance.chatGroup.length - 1], true);
+		}
+	}
+
 	public static function clearLogs() {
 		if (instance?.chatGroup != null)
 			instance.chatGroup.clear();
@@ -188,9 +202,17 @@ class ChatBox extends FlxTypedSpriteGroup<FlxSprite> {
 				msg.alpha = 0.8;
 				if (msg != null && FlxG.mouse.visible && FlxG.mouse.overlaps(msg, camera)) {
 					msg.alpha = 1;
-					if (FlxG.mouse.justPressed && msg.link != null) {
-						focused = false;
-						RequestSubstate.requestURL(msg.link);
+					if (FlxG.mouse.justPressed) {
+						if(msg.link != null) {
+							focused = false;
+							RequestSubstate.requestURL(msg.link);
+						}
+						else if(Std.isOfType(msg, NoteSkinDownloadMessage)) {
+							var func = dwnMsgToClick.get(cast msg);
+
+							if(func != null)
+								func();
+						}
 					}
 				}
 				if (!focused) {
@@ -292,4 +314,17 @@ class ChatMessage extends FlxText {
 		if (link != null)
 			addFormat(new FlxTextFormat(FlxColor.CYAN), formatBeg, formatEnd);
 	}
+}
+
+class NoteSkinDownloadMessage extends ChatMessage {
+	static final MESSAGE:String = "There's an opponent note skin available! Click here to download it.";
+	static final DOWNLOAD_MSG_PART:String = 'Click here to download it.';
+
+	public function new(fieldWidth:Float = 0) {
+		super(fieldWidth, {content: MESSAGE, hue: null});
+
+		var startIndex:Int = MESSAGE.indexOf(DOWNLOAD_MSG_PART);
+		var endIndex:Int = startIndex + DOWNLOAD_MSG_PART.length;
+		addFormat(new FlxTextFormat(FlxColor.CYAN), startIndex, endIndex);
+	}
 }

Diff for: source/online/states/RoomState.hx

@@ -19,6 +19,7 @@ import backend.WeekData;
 import backend.Song;
 import haxe.crypto.Md5;
 import states.FreeplayState;
+import states.ModsMenuState;
 import openfl.utils.Assets as OpenFlAssets;
 
 @:build(lumod.LuaScriptClass.build())
@@ -196,9 +197,26 @@ class RoomState extends MusicBeatState {
 			});
 		});
 
+		GameClient.room.state.player1.listen("noteSkin", (value, prev) -> {
+			if (value == prev)
+				return;
+			Waiter.put(() -> {
+				checkNoteSkin(true);
+			});
+		});
+
+		GameClient.room.state.player2.listen("noteSkin", (value, prev) -> {
+			if (value == prev)
+				return;
+			Waiter.put(() -> {
+				checkNoteSkin(false);
+			});
+		});
+
 		GameClient.room.state.gameplaySettings.onChange((o, n) -> {
 			FreeplayState.updateFreeplayMusicPitch();
 		});
+
 	}
 
 	override function destroy() {
@@ -474,6 +492,9 @@ class RoomState extends MusicBeatState {
 		verifyDownloadMod(false, true);
 		checkStage();
 
+		checkNoteSkin(true);
+		checkNoteSkin(false);
+
 		if (stage != null)
 			stage.createPost();
 
@@ -607,6 +628,24 @@ class RoomState extends MusicBeatState {
 		}
 	}
 
+	function checkNoteSkin(isP1:Bool, ?manualDownload:Bool = false) {
+		var player = isP1 ? GameClient.room.state.player1 : GameClient.room.state.player2;
+
+		if (!FileSystem.exists(Paths.mods(player.noteSkinMod)) && player.noteSkinURL != null) {
+			OnlineMods.downloadMod(player.noteSkinURL, manualDownload, function(_) {
+				Mods.updatedOnState = false;
+				Mods.parseList();
+				Mods.pushGlobalMods();
+			});
+
+			if(!manualDownload && ClientPrefs.data.disableAutoDownloads) {
+				chatBox.addNoteSkinDownloadMessage(function() {
+					checkNoteSkin(isP1, true);
+				});
+			}
+		}
+	}
+
 	override function openSubState(obj:FlxSubState) {
 		obj.cameras = [camHUD];
 		super.openSubState(obj);