Merge branch 'develop' into develop

Author: D00MK1D

Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbCharacter.cs

@@ -99,6 +99,30 @@ public partial class DdonSqlDb : SqlDb
 
     private readonly string SqlUpdatePartnerPawnId = "UPDATE \"ddon_character\" SET \"partner_pawn_id\" = @partner_pawn_id WHERE \"character_id\" = @character_id;";
 
+    private readonly string SqlSelectAllCompletedQuests =
+        $"SELECT {BuildQueryField(CompletedQuestsFields)} FROM \"ddon_completed_quests\" WHERE \"character_common_id\" = @character_common_id;";
+
+    private static readonly string[] StorageItemFieldsForCharacter = new[]
+    {
+        "item_uid", "item_id", "safety", "color", "plus_value", "equip_points"
+    };
+
+    private static readonly string[] CrestFieldsForCharacter = new[]
+    {
+        "character_common_id", "item_uid", "slot", "crest_id", "crest_amount"
+    };
+
+    private static readonly string[] EquipmentLimitBreakFieldsForCharacter = new[]
+    {
+        "item_uid", "effect_id", "unk1", "effect_type", "unk0"
+    };
+
+    private static readonly string SqlSelectStorageCrestDataByCharacter =
+        $"SELECT {BuildQueryField(CrestFieldsForCharacter)} FROM \"ddon_crests\" WHERE \"character_common_id\" = @character_common_id;";
+
+    private static readonly string SqlSelectStorageLimitBreakByCharacter =
+        $"SELECT {BuildQueryField(EquipmentLimitBreakFieldsForCharacter)} FROM \"ddon_equipment_limit_break\" WHERE \"character_id\" = @character_id;";
+
     public override bool CreateCharacter(Character character)
     {
         return ExecuteInTransaction(conn =>
@@ -242,7 +266,7 @@ public override bool DeleteCharacter(uint characterId)
 
     private void QueryCharacterData(DbConnection conn, Character character)
     {
-        QueryCharacterCommonData(conn, character);
+        QueryCharacterCommonData(conn, character, character.CharacterId);
 
         // Shortcuts
         ExecuteReader(conn, SqlSelectShortcuts,
@@ -271,44 +295,78 @@ private void QueryCharacterData(DbConnection conn, Character character)
                     character.Storage.AddStorage(tuple.Item1, tuple.Item2);
                 }
             });
+
+        // Materialize storage item rows before running batch crest/limit-break queries.
+        var storageRows = new List<(StorageType StorageType, ushort Slot, uint ItemNum, Item Item)>();
         ExecuteReader(conn, SqlSelectStorageItemsByCharacter,
-            (Action<DbCommand>)(command2 => { AddParameter(command2, "@character_id", character.CharacterId); }),
-            reader2 =>
+            (Action<DbCommand>)(command => { AddParameter(command, "@character_id", character.CharacterId); }),
+            reader =>
             {
-                while (reader2.Read())
+                while (reader.Read())
                 {
-                    StorageType storageType = (StorageType)GetByte(reader2, "storage_type");
-                    ushort slot = GetUInt16(reader2, "slot_no");
-                    uint itemNum = GetUInt32(reader2, "item_num");
-                    Item item = new();
+                    storageRows.Add((
+                        (StorageType)GetByte(reader, "storage_type"),
+                        GetUInt16(reader, "slot_no"),
+                        GetUInt32(reader, "item_num"),
+                        new Item
+                        {
+                            UId           = GetString(reader, "item_uid"),
+                            ItemId        = GetUInt32(reader, "item_id"),
+                            SafetySetting = GetByte(reader, "safety"),
+                            Color         = GetByte(reader, "color"),
+                            PlusValue     = GetByte(reader, "plus_value"),
+                            EquipPoints   = GetUInt32(reader, "equip_points")
+                        }
+                    ));
+                }
+            });
 
-                    item.UId = GetString(reader2, "item_uid");
-                    item.ItemId = GetUInt32(reader2, "item_id");
-                    item.SafetySetting = GetByte(reader2, "safety");
-                    item.Color = GetByte(reader2, "color");
-                    item.PlusValue = GetByte(reader2, "plus_value");
-                    item.EquipPoints = GetUInt32(reader2, "equip_points");
+        if (storageRows.Count > 0)
+        {
+            var crestMap = new Dictionary<string, List<CDataEquipElementParam>>();
+            using DbConnection crestConn = OpenNewConnection();
+            ExecuteReader(crestConn, SqlSelectStorageCrestDataByCharacter,
+                command => { AddParameter(command, "@character_common_id", character.CommonId); },
+                reader =>
+                {
+                    while (reader.Read())
+                    {
+                        string uid = GetString(reader, "item_uid");
+                        if (!crestMap.TryGetValue(uid, out var list))
+                            crestMap[uid] = list = new List<CDataEquipElementParam>();
+                        list.Add(ReadCrestData(reader).ToCDataEquipElementParam());
+                    }
+                });
 
-                    using DbConnection connection = OpenNewConnection();
-                    ExecuteReader(connection, SqlSelectAllCrestData,
-                        command4 =>
-                        {
-                            AddParameter(command4, "character_common_id", character.CommonId);
-                            AddParameter(command4, "item_uid", item.UId);
-                        }, reader4 =>
+            var limitBreakMap = new Dictionary<string, List<CDataAddStatusParam>>();
+            using DbConnection limitBreakConn = OpenNewConnection();
+            ExecuteReader(limitBreakConn, SqlSelectStorageLimitBreakByCharacter,
+                command => { AddParameter(command, "@character_id", character.CharacterId); },
+                reader =>
+                {
+                    while (reader.Read())
+                    {
+                        string uid = GetString(reader, "item_uid");
+                        if (!limitBreakMap.TryGetValue(uid, out var list))
+                            limitBreakMap[uid] = list = new List<CDataAddStatusParam>();
+                        list.Add(new CDataAddStatusParam
                         {
-                            while (reader4.Read())
-                            {
-                                Crest result = ReadCrestData(reader4);
-                                item.EquipElementParamList.Add(result.ToCDataEquipElementParam());
-                            }
+                            EnhanceId   = GetUInt16(reader, "effect_id"),
+                            Unk1        = GetUInt16(reader, "unk1"),
+                            EnhanceType = (EquipEnhanceType)GetByte(reader, "effect_type"),
+                            Unk0        = GetByte(reader, "unk0")
                         });
+                    }
+                });
 
-                    item.AddStatusParamList = GetEquipmentLimitBreakRecord(item.UId, connection);
-
-                    character.Storage.GetStorage(storageType).SetItem(item, itemNum, slot);
-                }
-            });
+            foreach (var (storageType, slot, itemNum, item) in storageRows)
+            {
+                if (crestMap.TryGetValue(item.UId, out var crests))
+                    item.EquipElementParamList.AddRange(crests);
+                item.AddStatusParamList = limitBreakMap.GetValueOrDefault(item.UId, new List<CDataAddStatusParam>());
+                character.Storage.GetStorage(storageType).SetItem(item, itemNum, slot);
+            }
+        }
 
         // Wallet Points
         ExecuteReader(conn, SqlSelectWalletPoints,
@@ -350,29 +408,25 @@ private void QueryCharacterData(DbConnection conn, Character character)
                 while (reader.Read()) character.AbilityPresets.Add(ReadAbilityPreset(reader));
             });
 
-        // Quest Completion
-        foreach (QuestType questType in Enum.GetValues<QuestType>())
-            ExecuteReader(conn, SqlSelectCompletedQuestByType,
-                command =>
-                {
-                    AddParameter(command, "@character_common_id", character.CommonId);
-                    AddParameter(command, "@quest_type", (uint)questType);
-                }, reader =>
+        // Quest Completion - single query for all types, replaces per-QuestType loop.
+        // QuestType is read directly from the stored column, identical end result to vanilla.
+        ExecuteReader(conn, SqlSelectAllCompletedQuests,
+            command => { AddParameter(command, "@character_common_id", character.CommonId); },
+            reader =>
+            {
+                while (reader.Read())
                 {
-                    while (reader.Read())
+                    CompletedQuest quest = new()
                     {
-                        CompletedQuest quest = new()
-                        {
-                            QuestId = (QuestId)GetUInt32(reader, "quest_id"),
-                            QuestType = questType,
-                            ClearCount = GetUInt32(reader, "clear_count")
-                        };
-
-                        character.CompletedQuests.TryAdd(quest.QuestId, quest);
-                    }
-                });
+                        QuestId    = (QuestId)GetUInt32(reader, "quest_id"),
+                        QuestType  = (QuestType)GetUInt32(reader, "quest_type"),
+                        ClearCount = GetUInt32(reader, "clear_count")
+                    };
+                    character.CompletedQuests.TryAdd(quest.QuestId, quest);
+                }
+            });
 
-        //Clan membership
+        // Clan membership
         character.ClanId = SelectClanMembershipByCharacterId(character.CharacterId, conn);
         character.ClanName = GetClanNameByClanId(character.ClanId);
 
@@ -470,7 +524,7 @@ public override void CreateItems(DbConnection conn, Character character)
                     continue;
 
                 // Give starter weapon for all classes
-                // If creating a character for normal mode, Wwe are only interested in slot 1 and 2
+                // If creating a character for normal mode, we are only interested in slot 1 and 2
                 for (byte i = 0; i < 2; i++)
                 {
                     Item item = jobEquipment.Value[EquipType.Performance][i];
@@ -512,7 +566,7 @@ public override void CreateItems(DbConnection conn, Character character)
         }
     }
 
-    //Helper function to add specific items to a storage
+    // Helper function to add specific items to a storage
     public override void CreateListItems(DbConnection conn, Character character, StorageType storageType, List<(uint ItemId, uint Amount)> itemList)
     {
         Storage itemType = character.Storage.GetAllStorages()[storageType];
@@ -533,11 +587,7 @@ public override Storages SelectAllStoragesByCharacterId(uint characterId)
     /// <summary>
     /// TODO: Optimize connection handling here and avoid nested loops re-using a single connection which is not supported with Npgsql.
     ///     Temporary workaround: Open a new connection for each nested read.
-    /// 
     /// </summary>
-    /// <param name="connection"></param>
-    /// <param name="characterId"></param>
-    /// <returns></returns>
     public Storages SelectAllStoragesByCharacterId(DbConnection connection, uint characterId)
     {
         Storages storages = new(new Dictionary<StorageType, ushort>());
@@ -644,8 +694,6 @@ private Character ReadAllCharacterData(DbDataReader reader)
         character.MatchingProfile.Comment = GetString(reader, "comment");
         character.MatchingProfile.IsJoinParty = GetBoolean(reader, "is_join_party");
 
-        
-
         character.FavWarpSlotNum = GetUInt32(reader, "fav_warp_slot_num");
 
         character.MaxBazaarExhibits = GetUInt32(reader, "max_bazaar_exhibits");