1
0
mirror of synced 2024-11-27 16:10:53 +01:00

Readded locking songs in initialDataCheck, updated game constants TRY 2

This commit is contained in:
S-Sebb?? 2023-09-17 22:11:56 +08:00
parent d476d323d9
commit 62ef9bf980
2 changed files with 10 additions and 5 deletions

View File

@ -29,13 +29,13 @@ public static class Constants
public const int TONE_UID_MAX = 19; 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_2_ARRAY_SIZE = 140;
private const int COSTUME_FLAG_3_ARRAY_SIZE = 156; private const int COSTUME_FLAG_3_ARRAY_SIZE = 156;
private const int COSTUME_FLAG_4_ARRAY_SIZE = 58; 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 = public static readonly int[] CostumeFlagArraySizes =
{ {
COSTUME_FLAG_1_ARRAY_SIZE, COSTUME_FLAG_1_ARRAY_SIZE,

View File

@ -24,12 +24,17 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
Logger.LogInformation("Initial data check request: {Request}", request.Stringify()); Logger.LogInformation("Initial data check request: {Request}", request.Stringify());
var songIdMax = settings.EnableMoreSongs ? Constants.MUSIC_ID_MAX_EXPANDED : Constants.MUSIC_ID_MAX; 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 = var enabledArray =
FlagCalculator.GetBitArrayFromIds(gameDataService.GetMusicList(), songIdMax, Logger); FlagCalculator.GetBitArrayFromIds(enabledMusicList, songIdMax, Logger);
var defaultSongWithUraList = gameDataService.GetMusicWithUraList(); var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
var enabledUraMusicList = defaultSongWithUraList.Except(lockedSongsList);
var uraReleaseBit = var uraReleaseBit =
FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger); FlagCalculator.GetBitArrayFromIds(enabledUraMusicList, songIdMax, Logger);
var response = new InitialdatacheckResponse var response = new InitialdatacheckResponse
{ {