rename ItemBase -> ItemDescriptor

Author: pandinocoder

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

@@ -1,6 +1,7 @@
 using Intersect.Extensions;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
+using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.GameObjects;
 using Intersect.GameObjects.Maps;
@@ -15,7 +16,7 @@ public enum GameObjectType
     [GameObjectInfo(typeof(ClassDescriptor), "classes")]
     Class,
 
-    [GameObjectInfo(typeof(ItemBase), "items")]
+    [GameObjectInfo(typeof(ItemDescriptor), "items")]
     Item,
 
     [GameObjectInfo(typeof(NpcBase), "npcs")]

Framework/Intersect.Framework.Core/GameObjects/Crafting/CraftingRecipeIngredient.cs

@@ -1,4 +1,5 @@
-using Intersect.GameObjects;
+using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.GameObjects;
 
 namespace Intersect.Framework.Core.GameObjects.Crafting;
 
@@ -14,8 +15,8 @@ public CraftingRecipeIngredient(Guid itemId, int quantity)
         Quantity = quantity;
     }
 
-    public ItemBase GetItem()
+    public ItemDescriptor GetItem()
     {
-        return ItemBase.Get(ItemId);
+        return ItemDescriptor.Get(ItemId);
     }
 }

Framework/Intersect.Framework.Core/GameObjects/EquipmentProperties.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.GameObjects.Ranges;
 
 namespace Intersect.GameObjects;
@@ -11,7 +12,7 @@ public EquipmentProperties()
     {
     }
 
-    public EquipmentProperties(ItemBase descriptor)
+    public EquipmentProperties(ItemDescriptor descriptor)
     {
         Descriptor = descriptor;
     }
@@ -22,7 +23,7 @@ public EquipmentProperties(ItemBase descriptor)
     [ForeignKey(nameof(DescriptorId))]
     [System.Text.Json.Serialization.JsonIgnore]
     [Newtonsoft.Json.JsonIgnore]
-    public ItemBase Descriptor { get; set; }
+    public ItemDescriptor Descriptor { get; set; }
 
     [NotMapped]
     public Dictionary<Stat, ItemRange> StatRanges { get; set; } = new();

Framework/Intersect.Framework.Core/GameObjects/Events/Commands/ChangeItemsCommand.cs

@@ -1,4 +1,5 @@
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Items;
 
 namespace Intersect.Framework.Core.GameObjects.Events.Commands;
 

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

@@ -1,7 +1,6 @@
-using Intersect.Enums;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 
-namespace Intersect.GameObjects;
+namespace Intersect.Framework.Core.GameObjects.Items;
 
 [Owned]
 public partial class ConsumableData

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

@@ -1,4 +1,4 @@
-namespace Intersect.Enums;
+namespace Intersect.Framework.Core.GameObjects.Items;
 
 public enum ConsumableType : byte
 {

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

@@ -1,7 +1,6 @@
-using Intersect.Enums;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 
-namespace Intersect.GameObjects;
+namespace Intersect.Framework.Core.GameObjects.Items;
 
 [Owned]
 public partial class EffectData

…ework.Core/GameObjects/Items/ItemBase.cs …Core/GameObjects/Items/ItemDescriptor.csFramework/Intersect.Framework.Core/GameObjects/Items/ItemBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Items/ItemDescriptor.cs Framework/Intersect.Framework.Core/GameObjects/Items/ItemBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Items/ItemDescriptor.cs

@@ -3,27 +3,28 @@
 using Intersect.Enums;
 using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Events;
+using Intersect.GameObjects;
 using Intersect.GameObjects.Ranges;
 using Intersect.Models;
 using Intersect.Utilities;
 using Newtonsoft.Json;
 
-namespace Intersect.GameObjects;
+namespace Intersect.Framework.Core.GameObjects.Items;
 
-public partial class ItemBase : DatabaseObject<ItemBase>, IFolderable
+public partial class ItemDescriptor : DatabaseObject<ItemDescriptor>, IFolderable
 {
     [NotMapped]
     public ConditionLists UsageRequirements { get; set; } = new();
 
     public string CannotUseMessage { get; set; } = string.Empty;
 
-    public ItemBase()
+    public ItemDescriptor()
     {
         Initialize();
     }
 
     [JsonConstructor]
-    public ItemBase(Guid id) : base(id)
+    public ItemDescriptor(Guid id) : base(id)
     {
         Initialize();
     }
@@ -431,8 +432,8 @@ public void SetEffectOfType(ItemEffect type, int value)
     /// Gets an array of all items sharing the provided cooldown group.
     /// </summary>
     /// <param name="cooldownGroup">The cooldown group to search for.</param>
-    /// <returns>Returns an array of <see cref="ItemBase"/> containing all items with the supplied cooldown group.</returns>
-    public static ItemBase[] GetCooldownGroup(string cooldownGroup)
+    /// <returns>Returns an array of <see cref="ItemDescriptor"/> containing all items with the supplied cooldown group.</returns>
+    public static ItemDescriptor[] GetCooldownGroup(string cooldownGroup)
     {
         cooldownGroup = cooldownGroup.Trim();
 
@@ -442,7 +443,7 @@ public static ItemBase[] GetCooldownGroup(string cooldownGroup)
             return [];
         }
 
-        return Lookup.Values.OfType<ItemBase>()
+        return Lookup.Values.OfType<ItemDescriptor>()
             .Where(descriptor => descriptor.CooldownGroup?.Trim() == cooldownGroup)
             .ToArray();
     }

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

@@ -1,4 +1,4 @@
-namespace Intersect.Enums;
+namespace Intersect.Framework.Core.GameObjects.Items;
 
 public enum ItemEffect : byte
 {

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

@@ -1,4 +1,4 @@
-namespace Intersect.Enums;
+namespace Intersect.Framework.Core.GameObjects.Items;
 
 /// <summary>
 /// Contains the definitions to be used on how to handle giving or taking away items to and from players.