rename ProjectileBase -> ProjectileDescriptor

RenameProjectileDescriptor migration

Author: pandinocoder

Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs

@@ -23,7 +23,7 @@ public enum GameObjectType
     [GameObjectInfo(typeof(NPCDescriptor), "npcs")]
     Npc,
 
-    [GameObjectInfo(typeof(ProjectileBase), "projectiles")]
+    [GameObjectInfo(typeof(ProjectileDescriptor), "projectiles")]
     Projectile,
 
     [GameObjectInfo(typeof(QuestBase), "quests")]

Framework/Intersect.Framework.Core/GameObjects/Items/ItemDescriptor.cs

@@ -205,9 +205,9 @@ public string JsonColor
 
     [NotMapped]
     [JsonIgnore]
-    public ProjectileBase Projectile
+    public ProjectileDescriptor Projectile
     {
-        get => ProjectileBase.Get(ProjectileId);
+        get => ProjectileDescriptor.Get(ProjectileId);
         set => ProjectileId = value?.Id ?? Guid.Empty;
     }
 

Framework/Intersect.Framework.Core/GameObjects/Projectiles/Location.cs

@@ -0,0 +1,6 @@
+namespace Intersect.GameObjects;
+
+public partial class Location
+{
+    public bool[] Directions = new bool[ProjectileDescriptor.MAX_PROJECTILE_DIRECTIONS];
+}

Framework/Intersect.Framework.Core/GameObjects/Projectiles/ProjectileAnimation.cs

@@ -0,0 +1,17 @@
+namespace Intersect.GameObjects;
+
+public partial class ProjectileAnimation
+{
+    public Guid AnimationId;
+
+    public bool AutoRotate;
+
+    public int SpawnRange = 1;
+
+    public ProjectileAnimation(Guid animationId, int spawnRange, bool autoRotate)
+    {
+        AnimationId = animationId;
+        SpawnRange = spawnRange;
+        AutoRotate = autoRotate;
+    }
+}

…ework.Core/GameObjects/ProjectileBase.cs …ects/Projectiles/ProjectileDescriptor.csFramework/Intersect.Framework.Core/GameObjects/ProjectileBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Projectiles/ProjectileDescriptor.cs Framework/Intersect.Framework.Core/GameObjects/ProjectileBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Projectiles/ProjectileDescriptor.cs

@@ -6,7 +6,7 @@
 
 namespace Intersect.GameObjects;
 
-public partial class ProjectileBase : DatabaseObject<ProjectileBase>, IFolderable
+public partial class ProjectileDescriptor : DatabaseObject<ProjectileDescriptor>, IFolderable
 {
     public const int MAX_PROJECTILE_DIRECTIONS = 8;
 
@@ -37,7 +37,7 @@ public partial class ProjectileBase : DatabaseObject<ProjectileBase>, IFolderabl
 
     //Init
     [JsonConstructor]
-    public ProjectileBase(Guid id) : base(id)
+    public ProjectileDescriptor(Guid id) : base(id)
     {
         Name = "New Projectile";
         for (var x = 0; x < SPAWN_LOCATIONS_WIDTH; x++)
@@ -50,7 +50,7 @@ public ProjectileBase(Guid id) : base(id)
     }
 
     //Parameterless for EF
-    public ProjectileBase()
+    public ProjectileDescriptor()
     {
         Name = "New Projectile";
         for (var x = 0; x < SPAWN_LOCATIONS_WIDTH; x++)
@@ -145,25 +145,4 @@ public SpellBase Spell
 
     /// <inheritdoc />
     public string Folder { get; set; } = string.Empty;
-}
-
-public partial class Location
-{
-    public bool[] Directions = new bool[ProjectileBase.MAX_PROJECTILE_DIRECTIONS];
-}
-
-public partial class ProjectileAnimation
-{
-    public Guid AnimationId;
-
-    public bool AutoRotate;
-
-    public int SpawnRange = 1;
-
-    public ProjectileAnimation(Guid animationId, int spawnRange, bool autoRotate)
-    {
-        AnimationId = animationId;
-        SpawnRange = spawnRange;
-        AutoRotate = autoRotate;
-    }
-}
+}

Framework/Intersect.Framework.Core/GameObjects/SpellBase.cs

@@ -190,9 +190,9 @@ public partial class SpellCombatData
 
     [NotMapped]
     [JsonIgnore]
-    public ProjectileBase Projectile
+    public ProjectileDescriptor Projectile
     {
-        get => ProjectileBase.Get(ProjectileId);
+        get => ProjectileDescriptor.Get(ProjectileId);
         set => ProjectileId = value?.Id ?? Guid.Empty;
     }
 

Intersect.Client.Core/Entities/Projectiles/Projectile.cs

@@ -18,7 +18,7 @@ public partial class Projectile : Entity
 
     private readonly object _lock = new();
 
-    private ProjectileBase? _myBase;
+    private ProjectileDescriptor? _myBase;
 
     private Guid _owner;
 
@@ -76,14 +76,14 @@ public override void Load(EntityPacket? packet)
         DirectionFacing = (Direction)pkt.ProjectileDirection;
         _targetId = pkt.TargetId;
         _owner = pkt.OwnerId;
-        _myBase = ProjectileBase.Get(_projectileId);
+        _myBase = ProjectileDescriptor.Get(_projectileId);
         if (_myBase != null)
         {
-            for (var x = 0; x < ProjectileBase.SPAWN_LOCATIONS_WIDTH; x++)
+            for (var x = 0; x < ProjectileDescriptor.SPAWN_LOCATIONS_WIDTH; x++)
             {
-                for (var y = 0; y < ProjectileBase.SPAWN_LOCATIONS_HEIGHT; y++)
+                for (var y = 0; y < ProjectileDescriptor.SPAWN_LOCATIONS_HEIGHT; y++)
                 {
-                    for (var d = 0; d < ProjectileBase.MAX_PROJECTILE_DIRECTIONS; d++)
+                    for (var d = 0; d < ProjectileDescriptor.MAX_PROJECTILE_DIRECTIONS; d++)
                     {
                         if (_myBase.SpawnLocations[x, y].Directions[d] == true)
                         {
@@ -182,11 +182,11 @@ private void AddProjectileSpawns()
         var spawn = FindSpawnAnimationData();
         var animBase = AnimationDescriptor.Get(_myBase.Animations[spawn].AnimationId);
 
-        for (var x = 0; x < ProjectileBase.SPAWN_LOCATIONS_WIDTH; x++)
+        for (var x = 0; x < ProjectileDescriptor.SPAWN_LOCATIONS_WIDTH; x++)
         {
-            for (var y = 0; y < ProjectileBase.SPAWN_LOCATIONS_HEIGHT; y++)
+            for (var y = 0; y < ProjectileDescriptor.SPAWN_LOCATIONS_HEIGHT; y++)
             {
-                for (var d = 0; d < ProjectileBase.MAX_PROJECTILE_DIRECTIONS; d++)
+                for (var d = 0; d < ProjectileDescriptor.MAX_PROJECTILE_DIRECTIONS; d++)
                 {
                     // Check if the current direction is enabled for spawning at this location.
                     if (_myBase.SpawnLocations[x, y].Directions[d] == true)
@@ -254,7 +254,7 @@ private static int FindProjectileRotation(Direction direction, int x, int y, boo
     }
 
     private static Direction FindProjectileRotationDir(Direction entityDir, Direction projectionDir) =>
-        (Direction)ProjectileBase.ProjectileRotationDir[(int)entityDir * ProjectileBase.MAX_PROJECTILE_DIRECTIONS + (int)projectionDir];
+        (Direction)ProjectileDescriptor.ProjectileRotationDir[(int)entityDir * ProjectileDescriptor.MAX_PROJECTILE_DIRECTIONS + (int)projectionDir];
 
     /// <summary>
     /// Calculates the projectile range based on the given direction, range, and axis.
@@ -729,8 +729,8 @@ private bool Collided(int i)
             z: Z,
             mapId: spawn.MapId,
             blockedBy: ref blockedBy,
-            ignoreAliveResources: spawn.ProjectileBase.IgnoreActiveResources,
-            ignoreDeadResources: spawn.ProjectileBase.IgnoreExhaustedResources,
+            ignoreAliveResources: spawn.ProjectileDescriptor.IgnoreActiveResources,
+            ignoreDeadResources: spawn.ProjectileDescriptor.IgnoreExhaustedResources,
             ignoreNpcAvoids: true,
             projectileTrigger: true
         );
@@ -750,14 +750,14 @@ private bool Collided(int i)
 
                 break;
             case -2: // Collision with a map block
-                if (!spawn.ProjectileBase.IgnoreMapBlocks)
+                if (!spawn.ProjectileDescriptor.IgnoreMapBlocks)
                 {
                     killSpawn = true;
                 }
 
                 break;
             case -3: // Collision with a Z-dimension block
-                if (!spawn.ProjectileBase.IgnoreZDimension)
+                if (!spawn.ProjectileDescriptor.IgnoreZDimension)
                 {
                     killSpawn = true;
                 }

Intersect.Client.Core/Entities/Projectiles/ProjectileSpawns.cs

@@ -23,7 +23,7 @@ public partial class ProjectileSpawns
 
     public float OffsetY;
 
-    public ProjectileBase ProjectileBase;
+    public ProjectileDescriptor ProjectileDescriptor;
 
     public Guid SpawnMapId;
 
@@ -49,7 +49,7 @@ public ProjectileSpawns(
         Guid mapId,
         AnimationDescriptor animationDescriptor,
         bool autoRotate,
-        ProjectileBase projectileBase,
+        ProjectileDescriptor projectileDescriptor,
         Entity parent
     )
     {
@@ -63,8 +63,8 @@ Entity parent
         Dir = dir;
         Anim = new Animation(animationDescriptor, true, autoRotate, Z, parent);
         AutoRotate = autoRotate;
-        ProjectileBase = projectileBase;
-        TransmissionTimer = Timing.Global.Milliseconds + (ProjectileBase.Speed / ProjectileBase.Range);
+        ProjectileDescriptor = projectileDescriptor;
+        TransmissionTimer = Timing.Global.Milliseconds + (ProjectileDescriptor.Speed / ProjectileDescriptor.Range);
     }
 
     public void Dispose()

Intersect.Client.Core/Interface/Game/DescriptionWindows/SpellDescriptionWindow.cs

@@ -92,7 +92,7 @@ protected void SetupHeader()
         {
             if (mSpell.Combat.TargetType == SpellTargetType.Projectile)
             {
-                var proj = ProjectileBase.Get(mSpell.Combat.ProjectileId);
+                var proj = ProjectileDescriptor.Get(mSpell.Combat.ProjectileId);
                 header.SetDescription(Strings.SpellDescription.TargetTypes[(int)mSpell.Combat.TargetType].ToString(proj?.Range ?? 0, mSpell.Combat.HitRadius), Color.White);
             }
             else

Intersect.Editor/Forms/Editors/Events/frmEvent.cs

@@ -1021,7 +1021,7 @@ public void InitEditor(bool disableNaming, bool disableTriggers, bool questEvent
 
             cmbTriggerVal.Items.Clear();
             cmbTriggerVal.Items.Add(Strings.General.None);
-            cmbTriggerVal.Items.AddRange(ProjectileBase.Names);
+            cmbTriggerVal.Items.AddRange(ProjectileDescriptor.Names);
         }
 
         chkIsGlobal.Checked = Convert.ToBoolean(MyEvent.Global);