Core/AreaTriggers: Refactor

* Moved IsServerside to custom flags * Flags moved from areatrigger_template to areatrigger_create_properties * New field to create custom CreateProperties (IsCustom) * New field to reference custom areatriggers (IsAreatriggerCustom) * Moved fields for shape data to areatrigger_create_properties Port From (https://github.com/TrinityCore/TrinityCore/commit/37eb2e64a6ad075e9866af6feb72bb4fbccb2adc)
2024-02-05 11:48:37 -05:00
parent ad880fc6b5
commit 34253877b0
11 changed files with 334 additions and 355 deletions
@@ -69,31 +69,31 @@ namespace Game.Entities
                HandleUnitEnterExit(new List<Unit>());

                base.RemoveFromWorld();
-                if (_spawnId != 0)
+                if (IsStaticSpawn())
                    GetMap().GetAreaTriggerBySpawnIdStore().Remove(_spawnId, this);

                GetMap().GetObjectsStore().Remove(GetGUID());
            }
        }

-        bool Create(uint areaTriggerCreatePropertiesId, Unit caster, Unit target, SpellInfo spellInfo, Position pos, int duration, SpellCastVisualField spellVisual, Spell spell, AuraEffect aurEff)
+        bool Create(AreaTriggerId areaTriggerCreatePropertiesId, Map map, Position pos, int duration, AreaTriggerSpawn spawnData = null, Unit caster = null, Unit target = null, SpellCastVisual spellVisual = default, SpellInfo spellInfo = null, Spell spell = null, AuraEffect aurEff = null)
        {
            _targetGuid = target != null ? target.GetGUID() : ObjectGuid.Empty;
            _aurEff = aurEff;

-            SetMap(caster.GetMap());
+            SetMap(map);
            Relocate(pos);
            RelocateStationaryPosition(pos);
            if (!IsPositionValid())
            {
-                Log.outError(LogFilter.AreaTrigger, $"AreaTrigger (areaTriggerCreatePropertiesId: {areaTriggerCreatePropertiesId}) not created. Invalid coordinates (X: {GetPositionX()} Y: {GetPositionY()})");
+                Log.outError(LogFilter.AreaTrigger, $"AreaTrigger (AreaTriggerCreatePropertiesId: (Id: {areaTriggerCreatePropertiesId.Id}, IsCustom: {areaTriggerCreatePropertiesId.IsCustom})) not created. Invalid coordinates (X: {GetPositionX()} Y: {GetPositionY()})");
                return false;
            }

            _areaTriggerCreateProperties = Global.AreaTriggerDataStorage.GetAreaTriggerCreateProperties(areaTriggerCreatePropertiesId);
            if (_areaTriggerCreateProperties == null)
            {
-                Log.outError(LogFilter.AreaTrigger, $"AreaTrigger (areaTriggerCreatePropertiesId {areaTriggerCreatePropertiesId}) not created. Invalid areatrigger create properties id ({areaTriggerCreatePropertiesId})");
+                Log.outError(LogFilter.AreaTrigger, $"AreaTrigger (AreaTriggerCreatePropertiesId: (Id: {areaTriggerCreatePropertiesId.Id}, IsCustom: {areaTriggerCreatePropertiesId.IsCustom})) not created. Invalid areatrigger create properties id");
                return false;
            }

@@ -101,64 +101,77 @@ namespace Game.Entities

            _areaTriggerTemplate = _areaTriggerCreateProperties.Template;

-            _Create(ObjectGuid.Create(HighGuid.AreaTrigger, GetMapId(), GetTemplate() != null ? GetTemplate().Id.Id : 0, caster.GetMap().GenerateLowGuid(HighGuid.AreaTrigger)));
+            _Create(ObjectGuid.Create(HighGuid.AreaTrigger, GetMapId(), GetTemplate() != null ? GetTemplate().Id.Id : 0, GetMap().GenerateLowGuid(HighGuid.AreaTrigger)));

            if (GetTemplate() != null)
                SetEntry(GetTemplate().Id.Id);

-            SetDuration(duration);
-
            SetObjectScale(1.0f);
+            SetDuration(duration);

            _shape = GetCreateProperties().Shape;

            var areaTriggerData = m_values.ModifyValue(m_areaTriggerData);
-            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.Caster), caster.GetGUID());
+            if (caster != null)
+                SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.Caster), caster.GetGUID());
            if (spell != null)
                SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.CreatingEffectGUID), spell.m_castId);

-            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellID), spellInfo.Id);
-            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellForVisuals), spellInfo.Id);
+            if (spellInfo != null && !IsStaticSpawn())
+                SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellID), spellInfo.Id);
+            if (spellInfo != null)
+                SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellForVisuals), spellInfo.Id);

            SpellCastVisualField spellCastVisual = areaTriggerData.ModifyValue(m_areaTriggerData.SpellVisual);
            SetUpdateFieldValue(ref spellCastVisual.SpellXSpellVisualID, spellVisual.SpellXSpellVisualID);
            SetUpdateFieldValue(ref spellCastVisual.ScriptVisualID, spellVisual.ScriptVisualID);

-            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.TimeToTargetScale), GetCreateProperties().TimeToTargetScale != 0 ? GetCreateProperties().TimeToTargetScale : m_areaTriggerData.Duration);
-            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.BoundsRadius2D), GetCreateProperties().GetMaxSearchRadius());
+            if (!IsStaticSpawn())
+                SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.TimeToTargetScale), GetCreateProperties().TimeToTargetScale != 0 ? GetCreateProperties().TimeToTargetScale : m_areaTriggerData.Duration);
+            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.BoundsRadius2D), GetCreateProperties().Shape.GetMaxSearchRadius());
            SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.DecalPropertiesID), GetCreateProperties().DecalPropertiesId);
+            if (IsServerSide())
+                SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.DecalPropertiesID), 24u); // Blue decal, for .debug areatrigger visibility

-            SetScaleCurve(areaTriggerData.ModifyValue(m_areaTriggerData.ExtraScaleCurve), GetCreateProperties().ExtraScale);
+            AreaTriggerScaleCurveTemplate extraScaleCurve = IsStaticSpawn() ? new AreaTriggerScaleCurveTemplate() : GetCreateProperties().ExtraScale;
+            SetScaleCurve(areaTriggerData.ModifyValue(m_areaTriggerData.ExtraScaleCurve), extraScaleCurve);

-            Player modOwner = caster.GetSpellModOwner();
-            if (modOwner != null)
+            if (caster != null)
            {
-                float multiplier = 1.0f;
-                int flat = 0;
-                modOwner.GetSpellModValues(spellInfo, SpellModOp.Radius, spell, (float)m_areaTriggerData.BoundsRadius2D, ref flat, ref multiplier);
-                if (multiplier != 1.0f)
+                Player modOwner = caster.GetSpellModOwner();
+                if (modOwner != null)
                {
-                    AreaTriggerScaleCurveTemplate overrideScale = new();
-                    overrideScale.Curve = multiplier;
-                    SetScaleCurve(areaTriggerData.ModifyValue(m_areaTriggerData.OverrideScaleCurve), overrideScale);
+                    float multiplier = 1.0f;
+                    int flat = 0;
+                    modOwner.GetSpellModValues(spellInfo, SpellModOp.Radius, spell, (float)m_areaTriggerData.BoundsRadius2D, ref flat, ref multiplier);
+                    if (multiplier != 1.0f)
+                    {
+                        AreaTriggerScaleCurveTemplate overrideScale = new();
+                        overrideScale.Curve = multiplier;
+                        SetScaleCurve(areaTriggerData.ModifyValue(m_areaTriggerData.OverrideScaleCurve), overrideScale);
+                    }
                }
            }

            VisualAnim visualAnim = areaTriggerData.ModifyValue(m_areaTriggerData.VisualAnim);
            SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.AnimationDataID), GetCreateProperties().AnimId);
            SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.AnimKitID), GetCreateProperties().AnimKitId);
-            if (GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.Unk3))
+            if (GetCreateProperties() != null && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.Unk3))
                SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.Field_C), true);

-            PhasingHandler.InheritPhaseShift(this, caster);
-
-            if (target != null && GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached))
+            if (caster != null)
+                PhasingHandler.InheritPhaseShift(this, caster);
+            else if (IsStaticSpawn() && spawnData != null)
            {
-                m_movementInfo.transport.guid = target.GetGUID();
+                if (spawnData.PhaseUseFlags != 0 || spawnData.PhaseId != 0 || spawnData.PhaseGroup != 0)
+                    PhasingHandler.InitDbPhaseShift(GetPhaseShift(), spawnData.PhaseUseFlags, spawnData.PhaseId, spawnData.PhaseGroup);
            }

-            UpdatePositionData();
-            SetZoneScript();
+            if (target != null && GetCreateProperties() != null && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAttached))
+                m_movementInfo.transport.guid = target.GetGUID();
+
+            if (!IsStaticSpawn())
+                UpdatePositionData();

            UpdateShape();

@@ -167,7 +180,7 @@ namespace Game.Entities
            if (GetCreateProperties().OrbitInfo != null)
            {
                AreaTriggerOrbitInfo orbit = GetCreateProperties().OrbitInfo;
-                if (target != null && GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached))
+                if (target != null && GetCreateProperties() != null && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAttached))
                    orbit.PathTarget = target.GetGUID();
                else
                    orbit.Center = new(pos.posX, pos.posY, pos.posZ);
@@ -180,16 +193,21 @@ namespace Game.Entities
            }

            // movement on transport of areatriggers on unit is handled by themself
-            ITransport transport = m_movementInfo.transport.guid.IsEmpty() ? caster.GetTransport() : null;
-            if (transport != null)
+            ITransport transport = null;
+            if (caster != null)
            {
-                float x, y, z, o;
-                pos.GetPosition(out x, out y, out z, out o);
-                transport.CalculatePassengerOffset(ref x, ref y, ref z, ref o);
-                m_movementInfo.transport.pos.Relocate(x, y, z, o);
+                transport = m_movementInfo.transport.guid.IsEmpty() ? caster.GetTransport() : null;

-                // This object must be added to transport before adding to map for the client to properly display it
-                transport.AddPassenger(this);
+                if (transport != null)
+                {
+                    float x, y, z, o;
+                    pos.GetPosition(out x, out y, out z, out o);
+                    transport.CalculatePassengerOffset(ref x, ref y, ref z, ref o);
+                    m_movementInfo.transport.pos.Relocate(x, y, z, o);
+
+                    // This object must be added to transport before adding to map for the client to properly display it
+                    transport.AddPassenger(this);
+                }
            }

            AI_Initialize();
@@ -198,24 +216,27 @@ namespace Game.Entities
            if (HasOrbit())
                Relocate(CalculateOrbitPosition());

-            if (!GetMap().AddToMap(this))
-            {         // Returning false will cause the object to be deleted - remove from transport
-                if (transport != null)
-                    transport.RemovePassenger(this);
-                return false;
+            if (!IsStaticSpawn())
+            {
+                if (!GetMap().AddToMap(this))
+                {         // Returning false will cause the object to be deleted - remove from transport
+                    if (transport != null)
+                        transport.RemovePassenger(this);
+                    return false;
+                }
            }

-            caster._RegisterAreaTrigger(this);
+            caster?._RegisterAreaTrigger(this);

            _ai.OnCreate(spell);

            return true;
        }

-        public static AreaTrigger CreateAreaTrigger(uint areaTriggerCreatePropertiesId, Unit caster, Unit target, SpellInfo spellInfo, Position pos, int duration, SpellCastVisualField spellVisual, Spell spell = null, AuraEffect aurEff = null)
+        public static AreaTrigger CreateAreaTrigger(AreaTriggerId areaTriggerCreatePropertiesId, Position pos, int duration, Unit caster, Unit target, SpellCastVisual spellVisual = default, SpellInfo spellInfo = null, Spell spell = null, AuraEffect aurEff = null)
        {
            AreaTrigger at = new();
-            if (!at.Create(areaTriggerCreatePropertiesId, caster, target, spellInfo, pos, duration, spellVisual, spell, aurEff))
+            if (!at.Create(areaTriggerCreatePropertiesId, caster.GetMap(), pos, duration, null, caster, target, spellVisual, spellInfo, spell, aurEff))
                return null;

            return at;
@@ -230,70 +251,23 @@ namespace Game.Entities
        {
            _spawnId = spawnId;

-            AreaTriggerSpawn position = Global.AreaTriggerDataStorage.GetAreaTriggerSpawn(spawnId);
-            if (position == null)
+            AreaTriggerSpawn spawnData = Global.AreaTriggerDataStorage.GetAreaTriggerSpawn(spawnId);
+            if (spawnData == null)
                return false;

-            AreaTriggerTemplate areaTriggerTemplate = Global.AreaTriggerDataStorage.GetAreaTriggerTemplate(position.TriggerId);
-            if (areaTriggerTemplate == null)
+            AreaTriggerCreateProperties createProperties = Global.AreaTriggerDataStorage.GetAreaTriggerCreateProperties(spawnData.Id);
+            if (createProperties == null)
                return false;

-            return CreateServer(map, areaTriggerTemplate, position);
-        }
-
-        bool CreateServer(Map map, AreaTriggerTemplate areaTriggerTemplate, AreaTriggerSpawn position)
-        {
-            SetMap(map);
-            Relocate(position.SpawnPoint);
-            RelocateStationaryPosition(position.SpawnPoint);
-            if (!IsPositionValid())
+            SpellInfo spellInfo = null;
+            SpellCastVisual spellVisual = default;
+            if (spawnData.SpellForVisuals != 0)
            {
-                Log.outError(LogFilter.AreaTrigger, $"AreaTriggerServer (id {areaTriggerTemplate.Id}) not created. Invalid coordinates (X: {GetPositionX()} Y: {GetPositionY()})");
-                return false;
+                spellInfo = Global.SpellMgr.GetSpellInfo((uint)spawnData.SpellForVisuals, Difficulty.None);
+                if (spellInfo != null)
+                    spellVisual.SpellXSpellVisualID = spellInfo.GetSpellXSpellVisualId();
            }
-
-            SetZoneScript();
-
-            _areaTriggerTemplate = areaTriggerTemplate;
-
-            _Create(ObjectGuid.Create(HighGuid.AreaTrigger, GetMapId(), areaTriggerTemplate.Id.Id, GetMap().GenerateLowGuid(HighGuid.AreaTrigger)));
-
-            SetEntry(areaTriggerTemplate.Id.Id);
-
-            SetObjectScale(1.0f);
-            SetDuration(-1);
-
-            _shape = position.Shape;
-
-            if (position.SpellForVisuals.HasValue)
-            {
-                SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(position.SpellForVisuals.Value, Difficulty.None);
-                SetUpdateFieldValue(m_areaTriggerData.ModifyValue(m_areaTriggerData.SpellForVisuals), position.SpellForVisuals.Value);
-
-                SpellCastVisualField spellCastVisual = m_areaTriggerData.ModifyValue(m_areaTriggerData.SpellVisual);
-                SetUpdateFieldValue(ref spellCastVisual.SpellXSpellVisualID, spellInfo.GetSpellXSpellVisualId());
-                SetUpdateFieldValue(ref spellCastVisual.ScriptVisualID, 0u);
-            }
-
-            SetUpdateFieldValue(m_areaTriggerData.ModifyValue(m_areaTriggerData.BoundsRadius2D), _shape.GetMaxSearchRadius());
-            if (IsServerSide())
-                SetUpdateFieldValue(m_areaTriggerData.ModifyValue(m_areaTriggerData.DecalPropertiesID), 24u); // blue decal, for .debug areatrigger visibility
-
-            SetScaleCurve(m_areaTriggerData.ModifyValue(m_areaTriggerData.ExtraScaleCurve), new AreaTriggerScaleCurveTemplate());
-
-            VisualAnim visualAnim = m_areaTriggerData.ModifyValue(m_areaTriggerData.VisualAnim);
-            SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.AnimationDataID), -1);
-
-            if (position.PhaseUseFlags != 0 || position.PhaseId != 0 || position.PhaseGroup != 0)
-                PhasingHandler.InitDbPhaseShift(GetPhaseShift(), position.PhaseUseFlags, position.PhaseId, position.PhaseGroup);
-
-            UpdateShape();
-
-            AI_Initialize();
-
-            _ai.OnCreate(null);
-
-            return true;
+            return Create(spawnData.Id, map, spawnData.SpawnPoint, -1, spawnData, null, null, spellVisual, spellInfo);
        }

        public override void Update(uint diff)
@@ -301,7 +275,7 @@ namespace Game.Entities
            base.Update(diff);
            _timeSinceCreated += diff;

-            if (!IsServerSide())
+            if (!IsStaticSpawn())
            {
                // "If" order matter here, Orbit > Attached > Splines
                if (HasOverridePosition())
@@ -312,7 +286,7 @@ namespace Game.Entities
                {
                    UpdateOrbitPosition(diff);
                }
-                else if (GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached))
+                else if (GetCreateProperties() != null && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAttached))
                {
                    Unit target = GetTarget();
                    if (target != null)
@@ -322,7 +296,7 @@ namespace Game.Entities
                        if (createProperties != null && createProperties.FacingCurveId != 0)
                            orientation = Global.DB2Mgr.GetCurveValueAt(createProperties.FacingCurveId, GetProgress());

-                        if (GetTemplate() == null || !GetTemplate().HasFlag(AreaTriggerFlags.HasAbsoluteOrientation))
+                        if (GetCreateProperties() == null || !GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAbsoluteOrientation))
                            orientation += target.GetOrientation();

                        GetMap().AreaTriggerRelocation(this, target.GetPositionX(), target.GetPositionY(), target.GetPositionZ(), orientation);
@@ -338,7 +312,7 @@ namespace Game.Entities
                    if (createProperties != null && createProperties.FacingCurveId != 0)
                    {
                        float orientation = Global.DB2Mgr.GetCurveValueAt(createProperties.FacingCurveId, GetProgress());
-                        if (GetTemplate() == null || !GetTemplate().HasFlag(AreaTriggerFlags.HasAbsoluteOrientation))
+                        if (GetCreateProperties() == null || !GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAbsoluteOrientation))
                            orientation += GetStationaryO();

                        SetOrientation(orientation);
@@ -597,22 +571,22 @@ namespace Game.Entities

            switch (_shape.TriggerType)
            {
-                case AreaTriggerTypes.Sphere:
+                case AreaTriggerShapeType.Sphere:
                    SearchUnitInSphere(targetList);
                    break;
-                case AreaTriggerTypes.Box:
+                case AreaTriggerShapeType.Box:
                    SearchUnitInBox(targetList);
                    break;
-                case AreaTriggerTypes.Polygon:
+                case AreaTriggerShapeType.Polygon:
                    SearchUnitInPolygon(targetList);
                    break;
-                case AreaTriggerTypes.Cylinder:
+                case AreaTriggerShapeType.Cylinder:
                    SearchUnitInCylinder(targetList);
                    break;
-                case AreaTriggerTypes.Disk:
+                case AreaTriggerShapeType.Disk:
                    SearchUnitInDisk(targetList);
                    break;
-                case AreaTriggerTypes.BoundedPlane:
+                case AreaTriggerShapeType.BoundedPlane:
                    SearchUnitInBoundedPlane(targetList);
                    break;
                default:
@@ -621,7 +595,7 @@ namespace Game.Entities

            if (GetTemplate() != null)
            {
-                var conditions = Global.ConditionMgr.GetConditionsForAreaTrigger(GetTemplate().Id.Id, GetTemplate().Id.IsServerSide);
+                var conditions = Global.ConditionMgr.GetConditionsForAreaTrigger(GetTemplate().Id.Id, GetTemplate().Id.IsCustom);
                if (!conditions.Empty())
                    targetList.RemoveAll(target => !Global.ConditionMgr.IsObjectMeetToConditions(target, conditions));
            }
@@ -632,7 +606,7 @@ namespace Game.Entities
        void SearchUnits(List<Unit> targetList, float radius, bool check3D)
        {
            var check = new AnyUnitInObjectRangeCheck(this, radius, check3D);
-            if (IsServerSide())
+            if (IsStaticSpawn())
            {
                var searcher = new PlayerListSearcher(this, targetList, check);
                Cell.VisitWorldObjects(this, searcher, GetMaxSearchRadius());
@@ -781,7 +755,7 @@ namespace Game.Entities
                if (player != null)
                {
                    if (player.IsDebugAreaTriggers)
-                        player.SendSysMessage(CypherStrings.DebugAreatriggerEntered, GetEntry());
+                        player.SendSysMessage(CypherStrings.DebugAreatriggerEntityEntered, GetEntry(), IsCustom(), IsStaticSpawn(), GetGUID().GetCounter());

                    player.UpdateQuestObjectiveProgress(QuestObjectiveType.AreaTriggerEnter, (int)GetEntry(), 1);
                }
@@ -800,7 +774,7 @@ namespace Game.Entities
                    if (player != null)
                    {
                        if (player.IsDebugAreaTriggers)
-                            player.SendSysMessage(CypherStrings.DebugAreatriggerLeft, GetEntry());
+                            player.SendSysMessage(CypherStrings.DebugAreatriggerEntityLeft, GetEntry(), IsCustom(), IsStaticSpawn(), GetGUID().GetCounter());

                        player.UpdateQuestObjectiveProgress(QuestObjectiveType.AreaTriggerExit, (int)GetEntry(), 1);
                    }
@@ -859,15 +833,16 @@ namespace Game.Entities
        void UpdatePolygonVertices()
        {
            AreaTriggerCreateProperties createProperties = GetCreateProperties();
+            AreaTriggerShapeInfo shape = GetShape();
            float newOrientation = GetOrientation();

            // No need to recalculate, orientation didn't change
-            if (MathFunctions.fuzzyEq(_verticesUpdatePreviousOrientation, newOrientation) && (createProperties == null) || createProperties.PolygonVerticesTarget.Empty())
+            if (MathFunctions.fuzzyEq(_verticesUpdatePreviousOrientation, newOrientation) && shape.PolygonVerticesTarget.Empty())
                return;

-            _polygonVertices = createProperties.PolygonVertices;
+            _polygonVertices = shape.PolygonVertices;

-            if (!createProperties.PolygonVerticesTarget.Empty())
+            if (!shape.PolygonVerticesTarget.Empty())
            {
                float progress = GetProgress();
                if (createProperties.MorphCurveId != 0)
@@ -876,7 +851,7 @@ namespace Game.Entities
                for (var i = 0; i < _polygonVertices.Count; ++i)
                {
                    Vector2 vertex = _polygonVertices[i];
-                    Vector2 vertexTarget = createProperties.PolygonVerticesTarget[i];
+                    Vector2 vertexTarget = shape.PolygonVerticesTarget[i];

                    vertex.X = MathFunctions.Lerp(vertex.X, vertexTarget.X, progress);
                    vertex.Y = MathFunctions.Lerp(vertex.Y, vertexTarget.Y, progress);
@@ -1004,12 +979,12 @@ namespace Game.Entities

        void DoActions(Unit unit)
        {
-            Unit caster = IsServerSide() ? unit : GetCaster();
+            Unit caster = IsStaticSpawn() ? unit : GetCaster();
            if (caster != null && GetTemplate() != null)
            {
                foreach (AreaTriggerAction action in GetTemplate().Actions)
                {
-                    if (IsServerSide() || UnitFitToActionRequirement(unit, caster, action))
+                    if (IsStaticSpawn() || UnitFitToActionRequirement(unit, caster, action))
                    {
                        switch (action.ActionType)
                        {
@@ -1210,7 +1185,7 @@ namespace Game.Entities
            if (createProperties != null && createProperties.FacingCurveId != 0)
                orientation = Global.DB2Mgr.GetCurveValueAt(createProperties.FacingCurveId, GetProgress());

-            if (GetTemplate() == null || !GetTemplate().HasFlag(AreaTriggerFlags.HasAbsoluteOrientation))
+            if (GetCreateProperties() == null || !GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAbsoluteOrientation))
            {
                orientation += angle;
                orientation += cmi.CounterClockwise ? MathFunctions.PiOver4 : -MathFunctions.PiOver4;
@@ -1266,7 +1241,7 @@ namespace Game.Entities
                float progress = Global.DB2Mgr.GetCurveValueAt(createProperties.MoveCurveId, currentTimePercent);
                if (progress < 0.0f || progress > 1.0f)
                {
-                    Log.outError(LogFilter.AreaTrigger, $"AreaTrigger (Id: {GetEntry()}, AreaTriggerCreatePropertiesId: {createProperties.Id}) has wrong progress ({progress}) caused by curve calculation (MoveCurveId: {createProperties.MorphCurveId})");
+                    Log.outError(LogFilter.AreaTrigger, $"AreaTrigger (Id: {GetEntry()}, AreaTriggerCreatePropertiesId: (Id: {createProperties.Id.Id}, IsCustom: {createProperties.Id.IsCustom})) has wrong progress ({progress}) caused by curve calculation (MoveCurveId: {createProperties.MoveCurveId})");
                }
                else
                    currentTimePercent = progress;
@@ -1283,7 +1258,7 @@ namespace Game.Entities
            if (createProperties != null && createProperties.FacingCurveId != 0)
                orientation += Global.DB2Mgr.GetCurveValueAt(createProperties.FacingCurveId, GetProgress());

-            if (GetTemplate() != null && !GetTemplate().HasFlag(AreaTriggerFlags.HasAbsoluteOrientation) && GetTemplate().HasFlag(AreaTriggerFlags.HasFaceMovementDir))
+            if (GetCreateProperties() != null && !GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAbsoluteOrientation) && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasFaceMovementDir))
            {
                _spline.Evaluate_Derivative(lastPositionIndex, percentFromLastPoint, out Vector3 derivative);
                if (derivative.X != 0.0f || derivative.Y != 0.0f)
@@ -1313,7 +1288,7 @@ namespace Game.Entities
            if (GetCreateProperties().FacingCurveId != 0)
            {
                orientation = Global.DB2Mgr.GetCurveValueAt(GetCreateProperties().FacingCurveId, GetProgress());
-                if (GetTemplate() == null || !GetTemplate().HasFlag(AreaTriggerFlags.HasAbsoluteOrientation))
+                if (GetCreateProperties() == null || !GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAbsoluteOrientation))
                    orientation += GetStationaryO();
            }

@@ -1342,7 +1317,7 @@ namespace Game.Entities
            if (base.IsNeverVisibleFor(seer, allowServersideObjects))
                return true;

-            if (IsServerSide() && !allowServersideObjects)
+            if (IsCustom() && !allowServersideObjects)
            {
                Player seerPlayer = seer.ToPlayer();
                if (seerPlayer != null)
@@ -1418,7 +1393,9 @@ namespace Game.Entities

        public T GetAI<T>() where T : AreaTriggerAI { return (T)_ai; }

-        public bool IsServerSide() { return _areaTriggerTemplate.Id.IsServerSide; }
+        public bool IsCustom() { return _areaTriggerTemplate.Id.IsCustom; }
+        public bool IsServerSide() { return _areaTriggerTemplate.Flags.HasFlag(AreaTriggerFlag.IsServerSide); }
+        public bool IsStaticSpawn() { return _spawnId != 0; }

        [System.Diagnostics.Conditional("DEBUG")]
        void DebugVisualizePosition()
@@ -119,17 +119,17 @@ namespace Game.Entities
    public struct AreaTriggerId
    {
        public uint Id;
-        public bool IsServerSide;
+        public bool IsCustom;

-        public AreaTriggerId(uint id, bool isServerSide)
+        public AreaTriggerId(uint id, bool isCustom)
        {
            Id = id;
-            IsServerSide = isServerSide;
+            IsCustom = isCustom;
        }

        public override int GetHashCode()
        {
-            return Id.GetHashCode() ^ IsServerSide.GetHashCode();
+            return Id.GetHashCode() ^ IsCustom.GetHashCode();
        }

        public override bool Equals(object obj)
@@ -139,7 +139,7 @@ namespace Game.Entities

        public static bool operator ==(AreaTriggerId left, AreaTriggerId right)
        {
-            return left.Id == right.Id && left.IsServerSide == right.IsServerSide;
+            return left.Id == right.Id && left.IsCustom == right.IsCustom;
        }
        public static bool operator !=(AreaTriggerId left, AreaTriggerId right)
        {
@@ -149,27 +149,44 @@ namespace Game.Entities

    public class AreaTriggerShapeInfo : AreaTriggerData
    {
-        public AreaTriggerTypes TriggerType;
+        public AreaTriggerShapeType TriggerType;
+        public List<Vector2> PolygonVertices;
+        public List<Vector2> PolygonVerticesTarget;

        public AreaTriggerShapeInfo()
        {
-            TriggerType = AreaTriggerTypes.Max;
+            TriggerType = AreaTriggerShapeType.Max;
+            PolygonVertices = new();
+            PolygonVerticesTarget = new();
        }

        public unsafe float GetMaxSearchRadius()
        {
            switch (TriggerType)
            {
-                case AreaTriggerTypes.Sphere:
+                case AreaTriggerShapeType.Sphere:
                    return Math.Max(SphereDatas.Radius, SphereDatas.RadiusTarget);
-                case AreaTriggerTypes.Box:
+                case AreaTriggerShapeType.Box:
                    return MathF.Sqrt(Math.Max(BoxDatas.Extents[0] * BoxDatas.Extents[0] + BoxDatas.Extents[1] * BoxDatas.Extents[1],
                        BoxDatas.ExtentsTarget[0] * BoxDatas.ExtentsTarget[0] + BoxDatas.ExtentsTarget[1] * BoxDatas.ExtentsTarget[1]));
-                case AreaTriggerTypes.Cylinder:
+                case AreaTriggerShapeType.Polygon:
+                {
+                    Position center = new(0.0f, 0.0f);
+                    float maxSearchRadius = 0.0f;
+
+                    foreach (var vertex in PolygonVertices)
+                        maxSearchRadius = Math.Max(maxSearchRadius, center.GetExactDist2d(vertex.X, vertex.Y));
+
+                    foreach (var vertex in PolygonVerticesTarget)
+                        maxSearchRadius = Math.Max(maxSearchRadius, center.GetExactDist2d(vertex.X, vertex.Y));
+
+                    return maxSearchRadius;
+                }
+                case AreaTriggerShapeType.Cylinder:
                    return Math.Max(CylinderDatas.Radius, CylinderDatas.RadiusTarget);
-                case AreaTriggerTypes.Disk:
+                case AreaTriggerShapeType.Disk:
                    return Math.Max(DiskDatas.OuterRadius, DiskDatas.OuterRadiusTarget);
-                case AreaTriggerTypes.BoundedPlane:
+                case AreaTriggerShapeType.BoundedPlane:
                    return MathF.Sqrt(Math.Max(BoundedPlaneDatas.Extents[0] * BoundedPlaneDatas.Extents[0] / 4 + BoundedPlaneDatas.Extents[1] * BoundedPlaneDatas.Extents[1] / 4,
                        BoundedPlaneDatas.ExtentsTarget[0] * BoundedPlaneDatas.ExtentsTarget[0] / 4 + BoundedPlaneDatas.ExtentsTarget[1] * BoundedPlaneDatas.ExtentsTarget[1] / 4));
            }
@@ -177,12 +194,12 @@ namespace Game.Entities
            return 0.0f;
        }

-        public bool IsSphere() { return TriggerType == AreaTriggerTypes.Sphere; }
-        public bool IsBox() { return TriggerType == AreaTriggerTypes.Box; }
-        public bool IsPolygon() { return TriggerType == AreaTriggerTypes.Polygon; }
-        public bool IsCylinder() { return TriggerType == AreaTriggerTypes.Cylinder; }
-        public bool IsDisk() { return TriggerType == AreaTriggerTypes.Disk; }
-        public bool IsBoudedPlane() { return TriggerType == AreaTriggerTypes.BoundedPlane; }
+        public bool IsSphere() { return TriggerType == AreaTriggerShapeType.Sphere; }
+        public bool IsBox() { return TriggerType == AreaTriggerShapeType.Box; }
+        public bool IsPolygon() { return TriggerType == AreaTriggerShapeType.Polygon; }
+        public bool IsCylinder() { return TriggerType == AreaTriggerShapeType.Cylinder; }
+        public bool IsDisk() { return TriggerType == AreaTriggerShapeType.Disk; }
+        public bool IsBoundedPlane() { return TriggerType == AreaTriggerShapeType.BoundedPlane; }
    }

    public class AreaTriggerOrbitInfo
@@ -225,43 +242,15 @@ namespace Game.Entities
    public class AreaTriggerTemplate
    {
        public AreaTriggerId Id;
-        public AreaTriggerFlags Flags;
-
+        public AreaTriggerFlag Flags;
        public List<AreaTriggerAction> Actions = new();
-
-        public bool HasFlag(AreaTriggerFlags flag) { return Flags.HasAnyFlag(flag); }
    }

-    public unsafe class AreaTriggerCreateProperties
+    public class AreaTriggerCreateProperties
    {
-        public AreaTriggerCreateProperties()
-        {
-            ExtraScale = new();
-        }
-
-        public bool HasSplines() { return SplinePoints.Count >= 2; }
-
-        public float GetMaxSearchRadius()
-        {
-            if (Shape.TriggerType == AreaTriggerTypes.Polygon)
-            {
-                Position center = new(0.0f, 0.0f);
-                float maxSearchRadius = 0.0f;
-
-                foreach (var vertex in PolygonVertices)
-                    maxSearchRadius = Math.Max(maxSearchRadius, center.GetExactDist2d(vertex.X, vertex.Y));
-
-                foreach (var vertex in PolygonVerticesTarget)
-                    maxSearchRadius = Math.Max(maxSearchRadius, center.GetExactDist2d(vertex.X, vertex.Y));
-
-                return maxSearchRadius;
-            }
-
-            return Shape.GetMaxSearchRadius();
-        }
-
-        public uint Id;
+        public AreaTriggerId Id;
        public AreaTriggerTemplate Template;
+        public AreaTriggerCreatePropertiesFlag Flags;

        public uint MoveCurveId;
        public uint ScaleCurveId;
@@ -280,18 +269,23 @@ namespace Game.Entities
        public AreaTriggerScaleCurveTemplate ExtraScale;

        public AreaTriggerShapeInfo Shape = new();
-        public List<Vector2> PolygonVertices = new();
-        public List<Vector2> PolygonVerticesTarget = new();
        public List<Vector3> SplinePoints = new();
        public AreaTriggerOrbitInfo OrbitInfo;

        public uint ScriptId;
+
+        public AreaTriggerCreateProperties()
+        {
+            Id = new(0, false);
+            ExtraScale = new();
+        }
+
+        public bool HasSplines() { return SplinePoints.Count >= 2; }
    }

    public class AreaTriggerSpawn : SpawnData
    {
-        public AreaTriggerId TriggerId;
-        public AreaTriggerShapeInfo Shape = new();
+        public AreaTriggerId Id;
        public uint? SpellForVisuals;

        public AreaTriggerSpawn() : base(SpawnObjectType.AreaTrigger) { }