Change DispAchievementType lock to IsDispAchievementTypeSet param

Author: ryumiyax

TaikoLocalServer/Controllers/Game/BaidController.cs

@@ -26,7 +26,6 @@ public async Task<IActionResult> GetBaid([FromBody] BAIDRequest request)
 
         response = Mappers.BaidResponseMapper.Map3906WithPostProcess(commonResponse);
         response.PlayerType = 0;
-        response.IsDispAchievementTypeSet = true;
 
         return Ok(response);
     }
@@ -55,7 +54,6 @@ public async Task<IActionResult> GetBaid3209([FromBody] Models.v3209.BAIDRequest
 
         response = Mappers.BaidResponseMapper.Map3209WithPostProcess(commonResponse);
         response.PlayerType = 0;
-        response.IsDispAchievementTypeSet = true;
 
         return Ok(response);
     }

TaikoLocalServer/Handlers/BaidQuery.cs

@@ -33,15 +33,16 @@ public async Task<CommonBaidResponse> Handle(BaidQuery request, CancellationToke
 
         var songBestData = context.SongBestData.Where(datum => datum.Baid == baid).ToList();
         var achievementDisplayDifficulty = userData.AchievementDisplayDifficulty;
-        // Please Do not rewrite Difficulty.None, it will lock your Difficulty Panel level in one play
-        // if (achievementDisplayDifficulty == Difficulty.None)
-        // {
-        //     achievementDisplayDifficulty = songBestData
-        //         .Where(datum => datum.BestCrown >= CrownType.Clear)
-        //         .Select(datum => datum.Difficulty)
-        //         .DefaultIfEmpty(Difficulty.Easy)
-        //         .Max();
-        // }
+        var isDispAchievementTypeSet = true;
+        if (achievementDisplayDifficulty == Difficulty.None)
+        {
+            isDispAchievementTypeSet = false;
+            achievementDisplayDifficulty = songBestData
+                .Where(datum => datum.BestCrown >= CrownType.Clear)
+                .Select(datum => datum.Difficulty)
+                .DefaultIfEmpty(Difficulty.Easy)
+                .Max();
+        }
         // For each crown type, calculate how many songs have that crown type
         var crownCountData = songBestData
             .Where(datum => !timeLimitSongsList.Contains(datum.SongId) && (datum.Difficulty == achievementDisplayDifficulty || (achievementDisplayDifficulty == Difficulty.UraOni && datum.Difficulty == Difficulty.Oni)))
@@ -124,8 +125,9 @@ public async Task<CommonBaidResponse> Handle(BaidQuery request, CancellationToke
             CostumeData = costumeData,
             CostumeFlagArrays = costumeFlagArrays,
             DisplayDan = userData.DisplayDan,
-            DisplaySouUchi = userData.DisplaySouUchi,
+            IsDispSouuchiOn = userData.DisplaySouUchi,
             DispAchievementType = (uint)achievementDisplayDifficulty,
+            IsDispAchievementTypeSet = isDispAchievementTypeSet,
             GenericInfoFlg = genericInfoFlgArray,
             GotDanFlg = gotDanFlagArray,
             GotDanMax = maxDan,

TaikoLocalServer/Mappers/BaidResponseMapper.cs

@@ -23,7 +23,6 @@ public static BAIDResponse Map3906WithPostProcess(CommonBaidResponse commonBaidR
         response.CostumeFlg3 = commonBaidResponse.CostumeFlagArrays[2];
         response.CostumeFlg4 = commonBaidResponse.CostumeFlagArrays[3];
         response.CostumeFlg5 = commonBaidResponse.CostumeFlagArrays[4];
-        response.IsDispSouuchiOn = commonBaidResponse.DisplaySouUchi;
         return response;
     }
 
@@ -45,7 +44,6 @@ public static Models.v3209.BAIDResponse Map3209WithPostProcess(CommonBaidRespons
         response.CostumeFlg3 = commonBaidResponse.CostumeFlagArrays[2];
         response.CostumeFlg4 = commonBaidResponse.CostumeFlagArrays[3];
         response.CostumeFlg5 = commonBaidResponse.CostumeFlagArrays[4];
-        response.IsDispSouuchiOn = commonBaidResponse.DisplaySouUchi;
         return response;
     }
 }

TaikoLocalServer/Models/Application/CommonBaidResponse.cs

@@ -18,7 +18,7 @@ public class CommonBaidResponse
 
     public string LastPlayDatetime    { get; set; } = DateTime.Now.ToString(Constants.DateTimeFormat);
     public bool   DisplayDan          { get; set; }
-    public bool   DisplaySouUchi      { get; set; }
+    public bool   IsDispSouuchiOn { get; set; }
     public uint   GotDanMax           { get; set; }
     public byte[] GotDanFlg           { get; set; } = Array.Empty<byte>();
     public byte[] GotGaidenFlg        { get; set; } = Array.Empty<byte>();
@@ -28,6 +28,7 @@ public class CommonBaidResponse
     public uint[] AryScoreRankCounts  { get; set; } = Array.Empty<uint>();
     public bool   IsDispAchievementOn { get; set; }
     public uint   DispAchievementType { get; set; }
+    public bool   IsDispAchievementTypeSet { get; set; }
     public uint   LastPlayMode        { get; set; }
     public uint   AiRank              { get; set; }
     public uint   AiTotalWin                   { get; set; }