Update spell_target_position sql generation for TARGET_DEST_NEARBY_DB (#917)

Author: meji46

WowPacketParser/Enums/SpellEnums.cs

@@ -472,7 +472,7 @@ public enum Targets
         TARGET_UNIT_PASSENGER_7                 = 103,
         TARGET_UNIT_CONE_ENEMY_104              = 104,
         TARGET_UNIT_UNK_105                     = 105, // 1 spell
-        TARGET_DEST_CHANNEL_CASTER              = 106,
+        TARGET_DEST_NEARBY_DB                   = 106,
         TARGET_UNK_DEST_AREA_UNK_107            = 107, // not enough info - only generic spells avalible
         TARGET_GAMEOBJECT_CONE                  = 108,
         TARGET_109                              = 109,
@@ -1526,7 +1526,7 @@ public enum UnitMods
         UNIT_MOD_POWER_START            = UNIT_MOD_MANA,
         UNIT_MOD_POWER_END              = UNIT_MOD_ALTERNATIVE       + 1,
     };
-    
+
     public enum AuraTypeLegion
     {
         SPELL_AURA_NONE                                         = 0,

WowPacketParser/SQL/Builders/Spells.cs

@@ -1,6 +1,9 @@
-using WowPacketParser.Enums;
+using System.Linq;
+using System.Collections.Generic;
+using WowPacketParser.Enums;
 using WowPacketParser.Misc;
 using WowPacketParser.Store;
+using WowPacketParser.Store.Objects;
 
 namespace WowPacketParser.SQL.Builders
 {
@@ -18,5 +21,56 @@ public static string SpellTargetPosition()
 
             return SQLUtil.Compare(Storage.SpellTargetPositions, SQLDatabase.Get(Storage.SpellTargetPositions), t => t.EffectHelper);
         }
+
+        [BuilderMethod]
+        public static string SpellTargetMultiplePositions()
+        {
+            if (Storage.SpellTargetPositions.IsEmpty())
+                return string.Empty;
+
+            if (!Settings.SQLOutputFlag.HasAnyFlagBit(SQLOutput.spell_target_position))
+                return string.Empty;
+
+            var rows = new RowList<SpellTargetPosition>();
+            Dictionary<uint, uint> idCount = new Dictionary<uint, uint>();
+
+            foreach (var spellTargetPosition in Storage.SpellTargetMultiplePositions.OrderBy(t => t.Key))
+            {
+                foreach (var spellTargetPositionValue in spellTargetPosition.Value)
+                {
+                    idCount.TryGetValue(spellTargetPosition.Key, out uint count);
+                    var duplicatedRow = rows.Where(spellTargetPosition2 =>
+                        spellTargetPosition2.Data.ID == spellTargetPosition.Key &&
+                        spellTargetPosition2.Data.PositionX == spellTargetPositionValue.Item1.PositionX &&
+                        spellTargetPosition2.Data.PositionY == spellTargetPositionValue.Item1.PositionY &&
+                        spellTargetPosition2.Data.PositionZ == spellTargetPositionValue.Item1.PositionZ &&
+                        spellTargetPosition2.Data.MapID == spellTargetPositionValue.Item1.MapID
+                    ).Any();
+
+                    if (duplicatedRow)
+                        continue;
+
+                    var row = new Row<SpellTargetPosition>
+                    {
+                        Data = new SpellTargetPosition
+                        {
+                            ID = spellTargetPosition.Key,
+                            EffectIndex = spellTargetPositionValue.Item1.EffectIndex,
+                            OrderIndex = "ORD_INDEX+" + count,
+                            PositionX = spellTargetPositionValue.Item1.PositionX,
+                            PositionY = spellTargetPositionValue.Item1.PositionY,
+                            PositionZ = spellTargetPositionValue.Item1.PositionZ,
+                            MapID = spellTargetPositionValue.Item1.MapID
+                        },
+
+                        Comment = spellTargetPositionValue.Item1.EffectHelper
+                    };
+
+                    idCount[spellTargetPosition.Key] = count + 1;
+                    rows.Add(row);
+                }
+            }
+            return new SQLInsert<SpellTargetPosition>(rows, false).Build();
+        }
     }
 }

WowPacketParser/Store/Objects/SpellTargetPosition.cs

@@ -1,4 +1,5 @@
-using WowPacketParser.Misc;
+using WowPacketParser.Enums;
+using WowPacketParser.Misc;
 using WowPacketParser.SQL;
 
 namespace WowPacketParser.Store.Objects
@@ -12,6 +13,9 @@ public sealed record SpellTargetPosition : IDataModel
         [DBFieldName("EffectIndex", true)]
         public byte? EffectIndex;
 
+        [DBFieldName("OrderIndex", TargetedDatabaseFlag.SinceTheWarWithin, true, true)]
+        public string OrderIndex;
+
         [DBFieldName("MapID")]
         public ushort? MapID;
 

WowPacketParser/Store/Storage.cs

@@ -132,6 +132,7 @@ public static class Storage
 
         // Spell Target Position
         public static readonly DataBag<SpellTargetPosition> SpellTargetPositions = new DataBag<SpellTargetPosition>(new List<SQLOutput> { SQLOutput.spell_target_position });
+        public static readonly StoreMulti<uint, SpellTargetPosition> SpellTargetMultiplePositions = new StoreMulti<uint, SpellTargetPosition>(new List<SQLOutput> { SQLOutput.spell_target_position });
 
         // Hotfixes
         public static readonly DataBag<HotfixData> HotfixDatas = new DataBag<HotfixData>(new List<SQLOutput> { SQLOutput.hotfix_data });
@@ -2122,6 +2123,7 @@ public static void ClearContainers()
             SpellClicks.Clear();
 
             SpellTargetPositions.Clear();
+            SpellTargetMultiplePositions.Clear();
 
             LocalesCreatures.Clear();
             LocalesQuests.Clear();

WowPacketParserModule.V8_0_1_27101/Parsers/SpellHandler.cs

@@ -63,9 +63,19 @@ public static void ReadSpellTargetData(Packet packet, PacketSpellData packetSpel
                     if (DBC.SpellEffectStores.ContainsKey(tuple))
                     {
                         var effect = DBC.SpellEffectStores[tuple];
-                        if ((Targets)effect.ImplicitTarget[0] == Targets.TARGET_DEST_DB || (Targets)effect.ImplicitTarget[1] == Targets.TARGET_DEST_DB)
+                        var isValidDBTarget = (short[] implicitTargets, Targets type) =>
                         {
-                            string effectHelper = $"Spell: { StoreGetters.GetName(StoreNameType.Spell, (int)spellID) } Efffect: { effect.Effect } ({ (SpellEffects)effect.Effect })";
+                            foreach (var implicitTarget in implicitTargets)
+                                if ((Targets)implicitTarget == type)
+                                    return true;
+
+                            return false;
+                        };
+                        var isSingleDBTarget = isValidDBTarget(effect.ImplicitTarget, Targets.TARGET_DEST_DB);
+                        var isMultipleDBTarget = isValidDBTarget(effect.ImplicitTarget, Targets.TARGET_DEST_NEARBY_DB);
+                        if (isSingleDBTarget || isMultipleDBTarget)
+                        {
+                            string effectHelper = $"Spell: { StoreGetters.GetName(StoreNameType.Spell, (int)spellID) } Effect {effect.EffectIndex}: { effect.Effect } ({ (SpellEffects)effect.Effect })";
 
                             var spellTargetPosition = new SpellTargetPosition
                             {
@@ -78,8 +88,16 @@ public static void ReadSpellTargetData(Packet packet, PacketSpellData packetSpel
                                 EffectHelper = effectHelper
                             };
 
-                            if (!Storage.SpellTargetPositions.ContainsKey(spellTargetPosition))
-                                Storage.SpellTargetPositions.Add(spellTargetPosition);
+                            if (isSingleDBTarget)
+                            {
+                                if (!Storage.SpellTargetPositions.ContainsKey(spellTargetPosition))
+                                {
+                                    spellTargetPosition.OrderIndex = "0";
+                                    Storage.SpellTargetPositions.Add(spellTargetPosition);
+                                }
+                            }
+                            else
+                                Storage.SpellTargetMultiplePositions.Add(spellID, spellTargetPosition, packet.TimeSpan);
                         }
                     }
                 }