dumbass

Snirozu · Dec 21, 2023 · 715d1a1 · 715d1a1
1 parent 845b946
commit 715d1a1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/source/online/states/PostGame.hx b/source/online/states/PostGame.hx
@@ -93,18 +93,18 @@ class PostGame extends MusicBeatState {
 		chatBox.y = FlxG.height - chatBox.height;
 		add(chatBox);
 
-		var _p1Accuracy = GameClient.getPlayerAccuracyPercent(GameClient.room.state.player1);
-		var _p2Accuracy = GameClient.getPlayerAccuracyPercent(GameClient.room.state.player2);
+		p1Accuracy = GameClient.getPlayerAccuracyPercent(GameClient.room.state.player1);
+		p2Accuracy = GameClient.getPlayerAccuracyPercent(GameClient.room.state.player2);
 
 		if (p1Accuracy >= p2Accuracy) {
-			winnerAccuracy = _p1Accuracy;
-			loserAccuracy = _p2Accuracy;
+			winnerAccuracy = p1Accuracy;
+			loserAccuracy = p2Accuracy;
 			winner = GameClient.room.state.player1;
 			loser = GameClient.room.state.player2;
         }
         else {
-			winnerAccuracy = _p2Accuracy;
-			loserAccuracy = _p1Accuracy;
+			winnerAccuracy = p2Accuracy;
+			loserAccuracy = p1Accuracy;
 			winner = GameClient.room.state.player2;
 			loser = GameClient.room.state.player1;
         }

diff --git a/source/online/states/Room.hx b/source/online/states/Room.hx
@@ -402,7 +402,23 @@ class Room extends MusicBeatState {
 					case 1:
 						chatBox.focused = true;
 					case 2:
-						GameClient.send("startGame");
+						var selfPlayer:Player;
+						if (GameClient.isOwner)
+							selfPlayer = GameClient.room.state.player1;
+						else
+							selfPlayer = GameClient.room.state.player2;
+
+						if (!selfPlayer.hasSong && GameClient.room.state.song != "" && (Mods.getModDirectories().contains(GameClient.room.state.modDir) || GameClient.room.state.modDir == "")) {
+							Mods.currentModDirectory = GameClient.room.state.modDir;
+							try {
+								GameClient.send("verifyChart", Md5.encode(Song.loadRawSong(GameClient.room.state.song, GameClient.room.state.folder)));
+							}
+							catch (exc) {
+							}
+						}
+						else {
+							GameClient.send("startGame");
+						}
 					case 3:
 						roomCode.text = "Room Code: " + GameClient.room.roomId;
 						roomCode.x = settingsIconBg.x + settingsIconBg.width - roomCode.width;

diff --git a/source/online/states/SetupMods.hx b/source/online/states/SetupMods.hx
@@ -54,7 +54,7 @@ class SetupMods extends MusicBeatState {
 		add(items);
 
 		var title = new FlxText(0, 0, FlxG.width, 
-        "Before you play, you need to set links for your mods!\nGamebanana mod links need to look similiar to this: https://gamebanana.com/mods/479714\nSelect them with ACCEPT, paste links with CTRL + V\nWhen you finish or if you want to skip press BACK"
+        "Before you play, it is recommended to set links for your mods!\nGamebanana mod links need to look similiar to this: https://gamebanana.com/mods/479714\nSelect them with ACCEPT, paste links with CTRL + V\nWhen you finish or if you want to skip press BACK"
         );
 		title.setFormat("VCR OSD Mono", 22, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 		title.y = 50;

diff --git a/source/states/MainMenuState.hx b/source/states/MainMenuState.hx
@@ -17,7 +17,7 @@ import options.OptionsState;
 
 class MainMenuState extends MusicBeatState
 {
-	public static var psychOnlineVersion:String = "0.3.1";
+	public static var psychOnlineVersion:String = "0.3.2";
 	public static var psychEngineVersion:String = '0.7.1h'; //This is also used for Discord RPC
 	public static var curSelected:Int = 0;