From 62ef9bf9804f16a780b96bbd02bce971c68a5b69 Mon Sep 17 00:00:00 2001
From: S-Sebb?? <tonyscwang@tencent.com>
Date: Sun, 17 Sep 2023 22:11:56 +0800
Subject: [PATCH] Readded locking songs in initialDataCheck, updated game
 constants TRY 2

---
 TaikoLocalServer/Common/Constants.cs                     | 6 +++---
 .../Controllers/Game/InitialDataCheckController.cs       | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/TaikoLocalServer/Common/Constants.cs b/TaikoLocalServer/Common/Constants.cs
index 71c96c3..ae4ab64 100644
--- a/TaikoLocalServer/Common/Constants.cs
+++ b/TaikoLocalServer/Common/Constants.cs
@@ -29,13 +29,13 @@ public static class Constants
 
 	public const int TONE_UID_MAX = 19;
 
-	public const int TITLE_UID_MAX = 814;
+	public const int TITLE_UID_MAX = 941;
 
-	private const int COSTUME_FLAG_1_ARRAY_SIZE = 154;
+	private const int COSTUME_FLAG_1_ARRAY_SIZE = 156;
 	private const int COSTUME_FLAG_2_ARRAY_SIZE = 140;
 	private const int COSTUME_FLAG_3_ARRAY_SIZE = 156;
 	private const int COSTUME_FLAG_4_ARRAY_SIZE = 58;
-	private const int COSTUME_FLAG_5_ARRAY_SIZE = 129;
+	private const int COSTUME_FLAG_5_ARRAY_SIZE = 142;
 	public static readonly int[] CostumeFlagArraySizes =
 	{
 		COSTUME_FLAG_1_ARRAY_SIZE,
diff --git a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
index fc6db04..e7fc337 100644
--- a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
+++ b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
@@ -24,12 +24,17 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 		Logger.LogInformation("Initial data check request: {Request}", request.Stringify());
 
 		var songIdMax = settings.EnableMoreSongs ? Constants.MUSIC_ID_MAX_EXPANDED : Constants.MUSIC_ID_MAX;
+		
+		var musicList = gameDataService.GetMusicList();
+		var lockedSongsList = gameDataService.GetLockedSongsList();
+		var enabledMusicList = musicList.Except(lockedSongsList);
 		var enabledArray =
-			FlagCalculator.GetBitArrayFromIds(gameDataService.GetMusicList(), songIdMax, Logger);
+			FlagCalculator.GetBitArrayFromIds(enabledMusicList, songIdMax, Logger);
 
 		var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
+		var enabledUraMusicList = defaultSongWithUraList.Except(lockedSongsList);
 		var uraReleaseBit =
-			FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger);
+			FlagCalculator.GetBitArrayFromIds(enabledUraMusicList, songIdMax, Logger);
 
 		var response = new InitialdatacheckResponse
 		{