GenericInfo

TaikoLocalServer/Controllers/Game/BaidController.cs

@@ -1,4 +1,6 @@
-using TaikoLocalServer.Services.Interfaces;
+using System.Text.Json;
+using TaikoLocalServer.Services.Interfaces;
+using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;
 
@@ -93,6 +95,23 @@ public class BaidController : BaseController<BaidController>
             .Max();
         var gotDanFlagArray = FlagCalculator.ComputeGotDanFlags(danData);
 
+        var genericInfoFlg = Array.Empty<uint>();
+        try
+        {
+            genericInfoFlg = JsonSerializer.Deserialize<uint[]>(userData.GenericInfoFlgArray);
+        }
+        catch (JsonException e)
+        {
+            Logger.LogError(e, "Parsing genericinfo flg json data failed");
+        }
+
+        // The only way to get a null is provide string "null" as input,
+        // which means database content need to be fixed, so better throw
+        genericInfoFlg.ThrowIfNull("Genericinfo flg should never be null!");
+
+        var genericInfoFlgLength = genericInfoFlg.Any()? genericInfoFlg.Max() + 1 : 0;
+        var genericInfoFlgArray = FlagCalculator.GetBitArrayFromIds(genericInfoFlg, (int)genericInfoFlgLength, Logger);
+
         response = new BAIDResponse
         {
             Result = 1,
@@ -131,7 +150,7 @@ public class BaidController : BaseController<BaidController>
             GotDanFlg = gotDanFlagArray,
             GotDanextraFlg = new byte[20],
             DefaultToneSetting = userData.SelectedToneId,
-            GenericInfoFlg = new byte[10],
+            GenericInfoFlg = genericInfoFlgArray,
             AryCrownCounts = crownCount,
             AryScoreRankCounts = scoreRankCount,
             IsDispAchievementOn = userData.DisplayAchievement,

TaikoLocalServer/Controllers/Game/MyDonEntryController.cs

@@ -43,7 +43,8 @@ public class MyDonEntryController : BaseController<MyDonEntryController>
             FavoriteSongsArray = "[]",
             ToneFlgArray = "[]",
             TitleFlgArray = "[]",
-            CostumeFlgArray = "[[],[],[],[],[]]"
+            CostumeFlgArray = "[[],[],[],[],[]]",
+            GenericInfoFlgArray = "[]"
         };
 
         await userDatumService.InsertUserDatum(newUser);

TaikoLocalServer/Controllers/Game/PlayResultController.cs

@@ -196,8 +196,7 @@ public class PlayResultController : BaseController<PlayResultController>
             UpdateJsonUintFlagArray(userdata.ToneFlgArray, playResultData.GetToneNoes, nameof(userdata.ToneFlgArray));
 
         userdata.TitleFlgArray =
-            UpdateJsonUintFlagArray(userdata.TitleFlgArray, playResultData.GetTitleNoes,
+            UpdateJsonUintFlagArray(userdata.TitleFlgArray, playResultData.GetTitleNoes, nameof(userdata.TitleFlgArray));
-                nameof(userdata.TitleFlgArray));
 
         userdata.CostumeFlgArray = UpdateJsonCostumeFlagArray(userdata.CostumeFlgArray,
             new[]
@@ -209,6 +208,9 @@ public class PlayResultController : BaseController<PlayResultController>
                 playResultData.GetCostumeNo5s
             });
 
+        userdata.GenericInfoFlgArray =
+            UpdateJsonUintFlagArray(userdata.GenericInfoFlgArray, playResultData.GetGenericInfoNoes, nameof(userdata.GenericInfoFlgArray));
+
         await userDatumService.UpdateUserDatum(userdata);
     }
 

TaikoLocalServer/Entities/UserDatum.cs

@@ -9,7 +9,8 @@
         public string FavoriteSongsArray { get; set; } = "[]";
         public string ToneFlgArray { get; set; } = "[]";
         public string TitleFlgArray { get; set; } = "[]";
-        public string CostumeFlgArray { get; set; } = "[]";
+        public string CostumeFlgArray { get; set; } = "[[],[],[],[],[]]";
+        public string GenericInfoFlgArray { get; set; } = "[]";
         public short OptionSetting { get; set; }
         public int NotesPosition { get; set; }
         public bool IsVoiceOn { get; set; }

TaikoLocalServer/Migrations/20220916121143_AddGenericInfoFlg.Designer.cs

@@ -0,0 +1,345 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using TaikoLocalServer.Context;
+
+#nullable disable
+
+namespace TaikoLocalServer.Migrations
+{
+    [DbContext(typeof(TaikoDbContext))]
+    [Migration("20220916121143_AddGenericInfoFlg")]
+    partial class AddGenericInfoFlg
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.0-preview.7.22376.2");
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.Card", b =>
+                {
+                    b.Property<string>("AccessCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("AccessCode");
+
+                    b.HasIndex(new[] { "Baid" }, "IX_Card_Baid")
+                        .IsUnique();
+
+                    b.ToTable("Card", (string)null);
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.DanScoreDatum", b =>
+                {
+                    b.Property<uint>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DanId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ArrivalSongCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ClearState")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0u);
+
+                    b.Property<uint>("ComboCountTotal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SoulGaugeTotal")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "DanId");
+
+                    b.ToTable("DanScoreData");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.DanStageScoreDatum", b =>
+                {
+                    b.Property<uint>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DanId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BadCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ComboCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DrumrollCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("GoodCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("HighScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("OkCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("PlayScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("TotalHitCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "DanId", "SongNumber");
+
+                    b.ToTable("DanStageScoreData");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.SongBestDatum", b =>
+                {
+                    b.Property<uint>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Difficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestCrown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestScoreRank")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "SongId", "Difficulty");
+
+                    b.ToTable("SongBestData");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.SongPlayDatum", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ComboCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Crown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Difficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DrumrollCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("GoodCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("HitCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("MissCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("OkCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("PlayTime")
+                        .HasColumnType("datetime");
+
+                    b.Property<uint>("Score")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ScoreRank")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ScoreRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Skipped")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Baid");
+
+                    b.ToTable("SongPlayData");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.UserDatum", b =>
+                {
+                    b.Property<uint>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("AchievementDisplayDifficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ColorBody")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ColorFace")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ColorLimb")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CostumeData")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CostumeFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayAchievement")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayDan")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FavoriteSongsArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GenericInfoFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsSkipOn")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVoiceOn")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastPlayDatetime")
+                        .HasColumnType("datetime");
+
+                    b.Property<uint>("LastPlayMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("MyDonName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("NotesPosition")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<short>("OptionSetting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SelectedToneId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TitleFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("TitlePlateId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ToneFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Baid");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.DanScoreDatum", b =>
+                {
+                    b.HasOne("TaikoLocalServer.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.DanStageScoreDatum", b =>
+                {
+                    b.HasOne("TaikoLocalServer.Entities.DanScoreDatum", "Parent")
+                        .WithMany("DanStageScoreData")
+                        .HasForeignKey("Baid", "DanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.SongBestDatum", b =>
+                {
+                    b.HasOne("TaikoLocalServer.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.SongPlayDatum", b =>
+                {
+                    b.HasOne("TaikoLocalServer.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.UserDatum", b =>
+                {
+                    b.HasOne("TaikoLocalServer.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("TaikoLocalServer.Entities.DanScoreDatum", b =>
+                {
+                    b.Navigation("DanStageScoreData");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

TaikoLocalServer/Migrations/20220916121143_AddGenericInfoFlg.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TaikoLocalServer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddGenericInfoFlg : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GenericInfoFlgArray",
+                table: "UserData",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: "[]");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GenericInfoFlgArray",
+                table: "UserData");
+        }
+    }
+}

TaikoLocalServer/Migrations/TaikoDbContextModelSnapshot.cs

@@ -224,6 +224,10 @@ namespace TaikoLocalServer.Migrations
                         .IsRequired()
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("GenericInfoFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("IsSkipOn")
                         .HasColumnType("INTEGER");