rename ShopBase -> ShopDescriptor, ShopItem -> ShopItemDescriptor

pandinocoder · pandinocoder · commit 369d7733fec0 · 2025-02-27T13:51:54.000-05:00
diff --git a/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs b/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs
@@ -33,7 +33,7 @@ public enum GameObjectType
     [GameObjectInfo(typeof(ResourceDescriptor), "resources")]
     Resource,
 
-    [GameObjectInfo(typeof(ShopBase), "shops")]
+    [GameObjectInfo(typeof(ShopDescriptor), "shops")]
     Shop,
 
     [GameObjectInfo(typeof(SpellBase), "spells")]
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Shops/ShopDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Shops/ShopDescriptor.cs
@@ -5,22 +5,22 @@
 
 namespace Intersect.GameObjects;
 
-public partial class ShopBase : DatabaseObject<ShopBase>, IFolderable
+public partial class ShopDescriptor : DatabaseObject<ShopDescriptor>, IFolderable
 {
     [NotMapped]
-    public List<ShopItem> BuyingItems { get; set; } = [];
+    public List<ShopItemDescriptor> BuyingItems { get; set; } = [];
 
     [NotMapped]
-    public List<ShopItem> SellingItems { get; set; } = [];
+    public List<ShopItemDescriptor> SellingItems { get; set; } = [];
 
     [JsonConstructor]
-    public ShopBase(Guid id) : base(id)
+    public ShopDescriptor(Guid id) : base(id)
     {
         Name = "New Shop";
     }
 
     //EF is so damn picky about its parameters
-    public ShopBase()
+    public ShopDescriptor()
     {
         Name = "New Shop";
     }
@@ -45,15 +45,15 @@ public ItemDescriptor DefaultCurrency
     public string JsonBuyingItems
     {
         get => JsonConvert.SerializeObject(BuyingItems);
-        set => BuyingItems = JsonConvert.DeserializeObject<List<ShopItem>>(value);
+        set => BuyingItems = JsonConvert.DeserializeObject<List<ShopItemDescriptor>>(value);
     }
 
     [Column("SellingItems")]
     [JsonIgnore]
     public string JsonSellingItems
     {
         get => JsonConvert.SerializeObject(SellingItems);
-        set => SellingItems = JsonConvert.DeserializeObject<List<ShopItem>>(value);
+        set => SellingItems = JsonConvert.DeserializeObject<List<ShopItemDescriptor>>(value);
     }
 
     public string BuySound { get; set; } = null;
@@ -62,25 +62,4 @@ public string JsonSellingItems
 
     /// <inheritdoc />
     public string Folder { get; set; } = string.Empty;
-}
-
-public partial class ShopItem
-{
-    public Guid CostItemId;
-
-    public int CostItemQuantity;
-
-    public Guid ItemId;
-
-    [JsonConstructor]
-    public ShopItem(Guid itemId, Guid costItemId, int costVal)
-    {
-        ItemId = itemId;
-        CostItemId = costItemId;
-        CostItemQuantity = costVal;
-    }
-
-    [NotMapped]
-    [JsonIgnore]
-    public ItemDescriptor Item => ItemDescriptor.Get(ItemId);
-}
+}
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Shops/ShopItemDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Shops/ShopItemDescriptor.cs
@@ -0,0 +1,26 @@
+﻿using System.ComponentModel.DataAnnotations.Schema;
+using Intersect.Framework.Core.GameObjects.Items;
+using Newtonsoft.Json;
+
+namespace Intersect.GameObjects;
+
+public partial class ShopItemDescriptor
+{
+    public Guid CostItemId { get; set; }
+
+    public int CostItemQuantity { get; set; }
+
+    public Guid ItemId { get; set; }
+
+    [JsonConstructor]
+    public ShopItemDescriptor(Guid itemId, Guid costItemId, int costVal)
+    {
+        ItemId = itemId;
+        CostItemId = costItemId;
+        CostItemQuantity = costVal;
+    }
+
+    [NotMapped]
+    [JsonIgnore]
+    public ItemDescriptor Item => ItemDescriptor.Get(ItemId);
+}
diff --git a/Intersect.Client.Core/General/Globals.cs b/Intersect.Client.Core/General/Globals.cs
@@ -126,7 +126,7 @@ public static partial class Globals
 
     //Game Shop
     //Only need 1 shop, and that is the one we see at a given moment in time.
-    public static ShopBase? GameShop { get; set; }
+    public static ShopDescriptor? GameShop { get; set; }
 
     /// <see cref="GameStates" />
     public static GameStates GameState
diff --git a/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs b/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs
@@ -215,32 +215,32 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
         else
         {
             var invItem = Globals.Me.Inventory[mMySlot];
-            ShopItem shopItem = null;
+            ShopItemDescriptor shopItemDescriptor = null;
             for (var i = 0; i < Globals.GameShop.BuyingItems.Count; i++)
             {
                 var tmpShop = Globals.GameShop.BuyingItems[i];
 
                 if (invItem.ItemId == tmpShop.ItemId)
                 {
-                    shopItem = tmpShop;
+                    shopItemDescriptor = tmpShop;
 
                     break;
                 }
             }
 
-            if (Globals.GameShop.BuyingWhitelist && shopItem != null)
+            if (Globals.GameShop.BuyingWhitelist && shopItemDescriptor != null)
             {
-                var hoveredItem = ItemDescriptor.Get(shopItem.CostItemId);
+                var hoveredItem = ItemDescriptor.Get(shopItemDescriptor.CostItemId);
                 if (hoveredItem != null && Globals.Me.Inventory[mMySlot]?.Descriptor != null)
                 {
                     mDescWindow = new ItemDescriptionWindow(
                         Globals.Me.Inventory[mMySlot].Descriptor, Globals.Me.Inventory[mMySlot].Quantity,
                         mInventoryWindow.X, mInventoryWindow.Y, Globals.Me.Inventory[mMySlot].ItemProperties, "",
-                        Strings.Shop.SellsFor.ToString(shopItem.CostItemQuantity, hoveredItem.Name)
+                        Strings.Shop.SellsFor.ToString(shopItemDescriptor.CostItemQuantity, hoveredItem.Name)
                     );
                 }
             }
-            else if (shopItem == null)
+            else if (shopItemDescriptor == null)
             {
                 var costItem = Globals.GameShop.DefaultCurrency;
                 if (invItem.Descriptor != null && costItem != null && Globals.Me.Inventory[mMySlot]?.Descriptor != null)
diff --git a/Intersect.Client.Core/Networking/PacketHandler.cs b/Intersect.Client.Core/Networking/PacketHandler.cs
@@ -1711,7 +1711,7 @@ public void HandlePacket(IPacketSender packetSender, ShopPacket packet)
 
         if (packet.ShopData != null)
         {
-            Globals.GameShop = new ShopBase();
+            Globals.GameShop = new ShopDescriptor();
             Globals.GameShop.Load(packet.ShopData);
             Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenShop());
         }
diff --git a/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs b/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs
@@ -1216,7 +1216,7 @@ private static string GetCommandText(OpenBankCommand command, MapInstance map)
 
     private static string GetCommandText(OpenShopCommand command, MapInstance map)
     {
-        return Strings.EventCommandList.openshop.ToString(ShopBase.GetName(command.ShopId));
+        return Strings.EventCommandList.openshop.ToString(ShopDescriptor.GetName(command.ShopId));
     }
 
     private static string GetCommandText(OpenCraftingTableCommand command, MapInstance map)
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenShop.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenShop.cs
@@ -19,8 +19,8 @@ public EventCommandOpenShop(OpenShopCommand refCommand, FrmEvent editor)
         mEventEditor = editor;
         InitLocalization();
         cmbShop.Items.Clear();
-        cmbShop.Items.AddRange(ShopBase.Names);
-        cmbShop.SelectedIndex = ShopBase.ListIndex(mMyCommand.ShopId);
+        cmbShop.Items.AddRange(ShopDescriptor.Names);
+        cmbShop.SelectedIndex = ShopDescriptor.ListIndex(mMyCommand.ShopId);
     }
 
     private void InitLocalization()
@@ -35,7 +35,7 @@ private void btnSave_Click(object sender, EventArgs e)
     {
         if (cmbShop.SelectedIndex > -1)
         {
-            mMyCommand.ShopId = ShopBase.IdFromList(cmbShop.SelectedIndex);
+            mMyCommand.ShopId = ShopDescriptor.IdFromList(cmbShop.SelectedIndex);
         }
 
         mEventEditor.FinishCommandEdit();
diff --git a/Intersect.Editor/Forms/Editors/frmShop.cs b/Intersect.Editor/Forms/Editors/frmShop.cs
@@ -15,11 +15,11 @@ namespace Intersect.Editor.Forms.Editors;
 public partial class FrmShop : EditorForm
 {
 
-    private List<ShopBase> mChanged = new List<ShopBase>();
+    private List<ShopDescriptor> mChanged = new List<ShopDescriptor>();
 
     private string mCopiedItem;
 
-    private ShopBase mEditorItem;
+    private ShopDescriptor mEditorItem;
 
     private List<string> mKnownFolders = new List<string>();
 
@@ -33,7 +33,7 @@ public FrmShop()
     }
     private void AssignEditorItem(Guid id)
     {
-        mEditorItem = ShopBase.Get(id);
+        mEditorItem = ShopDescriptor.Get(id);
         UpdateEditor();
     }
 
@@ -42,7 +42,7 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type)
         if (type == GameObjectType.Shop)
         {
             InitEditor();
-            if (mEditorItem != null && !ShopBase.Lookup.Values.Contains(mEditorItem))
+            if (mEditorItem != null && !ShopDescriptor.Lookup.Values.Contains(mEditorItem))
             {
                 mEditorItem = null;
                 UpdateEditor();
@@ -278,7 +278,7 @@ private void btnAddSoldItem_Click(object sender, EventArgs e)
     {
         var addedItem = false;
         var cost = (int) nudSellCost.Value;
-        var newItem = new ShopItem(
+        var newItem = new ShopItemDescriptor(
             ItemDescriptor.IdFromList(cmbAddSoldItem.SelectedIndex), ItemDescriptor.IdFromList(cmbSellFor.SelectedIndex), cost
         );
 
@@ -315,7 +315,7 @@ private void btnAddBoughtItem_Click(object sender, EventArgs e)
     {
         var addedItem = false;
         var cost = (int) nudBuyAmount.Value;
-        var newItem = new ShopItem(
+        var newItem = new ShopItemDescriptor(
             ItemDescriptor.IdFromList(cmbAddBoughtItem.SelectedIndex), ItemDescriptor.IdFromList(cmbBuyFor.SelectedIndex), cost
         );
 
@@ -468,15 +468,15 @@ public void InitEditor()
     {
         //Collect folders
         var mFolders = new List<string>();
-        foreach (var itm in ShopBase.Lookup)
+        foreach (var itm in ShopDescriptor.Lookup)
         {
-            if (!string.IsNullOrEmpty(((ShopBase) itm.Value).Folder) &&
-                !mFolders.Contains(((ShopBase) itm.Value).Folder))
+            if (!string.IsNullOrEmpty(((ShopDescriptor) itm.Value).Folder) &&
+                !mFolders.Contains(((ShopDescriptor) itm.Value).Folder))
             {
-                mFolders.Add(((ShopBase) itm.Value).Folder);
-                if (!mKnownFolders.Contains(((ShopBase) itm.Value).Folder))
+                mFolders.Add(((ShopDescriptor) itm.Value).Folder);
+                if (!mKnownFolders.Contains(((ShopDescriptor) itm.Value).Folder))
                 {
-                    mKnownFolders.Add(((ShopBase) itm.Value).Folder);
+                    mKnownFolders.Add(((ShopDescriptor) itm.Value).Folder);
                 }
             }
         }
@@ -487,8 +487,8 @@ public void InitEditor()
         cmbFolder.Items.Add("");
         cmbFolder.Items.AddRange(mKnownFolders.ToArray());
 
-        var items = ShopBase.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,
-            new KeyValuePair<string, string>(((ShopBase)pair.Value)?.Name ?? Models.DatabaseObject<ShopBase>.Deleted, ((ShopBase)pair.Value)?.Folder ?? ""))).ToArray();
+        var items = ShopDescriptor.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,
+            new KeyValuePair<string, string>(((ShopDescriptor)pair.Value)?.Name ?? Models.DatabaseObject<ShopDescriptor>.Deleted, ((ShopDescriptor)pair.Value)?.Folder ?? ""))).ToArray();
         lstGameObjects.Repopulate(items, mFolders, btnAlphabetical.Checked, CustomSearch(), txtSearch.Text);
     }
 
diff --git a/Intersect.Editor/Networking/PacketHandler.cs b/Intersect.Editor/Networking/PacketHandler.cs
@@ -579,14 +579,14 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)
             case GameObjectType.Shop:
                 if (deleted)
                 {
-                    var shp = ShopBase.Get(id);
+                    var shp = ShopDescriptor.Get(id);
                     shp.Delete();
                 }
                 else
                 {
-                    var shp = new ShopBase(id);
+                    var shp = new ShopDescriptor(id);
                     shp.Load(json);
-                    ShopBase.Lookup.Set(id, shp);
+                    ShopDescriptor.Lookup.Set(id, shp);
                 }
 
                 break;
diff --git a/Intersect.Server.Core/Database/DbInterface.cs b/Intersect.Server.Core/Database/DbInterface.cs
@@ -669,7 +669,7 @@ private static void ClearGameObjects(GameObjectType type)
 
                 break;
             case GameObjectType.Shop:
-                ShopBase.Lookup.Clear();
+                ShopDescriptor.Lookup.Clear();
 
                 break;
             case GameObjectType.Spell:
@@ -784,7 +784,7 @@ private static void LoadGameObjects(GameObjectType gameObjectType)
                     case GameObjectType.Shop:
                         foreach (var shp in context.Shops)
                         {
-                            ShopBase.Lookup.Set(shp.Id, shp);
+                            ShopDescriptor.Lookup.Set(shp.Id, shp);
                         }
 
                         break;
@@ -1021,7 +1021,7 @@ public static IDatabaseObject AddGameObject(GameObjectType gameObjectType, Guid
 
                 break;
             case GameObjectType.Shop:
-                dbObj = new ShopBase(predefinedid);
+                dbObj = new ShopDescriptor(predefinedid);
 
                 break;
             case GameObjectType.Spell:
@@ -1135,8 +1135,8 @@ public static IDatabaseObject AddGameObject(GameObjectType gameObjectType, IData
                         break;
 
                     case GameObjectType.Shop:
-                        context.Shops.Add((ShopBase)dbObj);
-                        ShopBase.Lookup.Set(dbObj.Id, dbObj);
+                        context.Shops.Add((ShopDescriptor)dbObj);
+                        ShopDescriptor.Lookup.Set(dbObj.Id, dbObj);
 
                         break;
 
@@ -1287,7 +1287,7 @@ public static void DeleteGameObject(IDatabaseObject gameObject)
 
                         break;
                     case GameObjectType.Shop:
-                        context.Shops.Remove((ShopBase)gameObject);
+                        context.Shops.Remove((ShopDescriptor)gameObject);
 
                         break;
                     case GameObjectType.Spell:
@@ -1452,7 +1452,7 @@ public static void SaveGameObject(IDatabaseObject gameObject)
 
                         break;
                     case GameObjectType.Shop:
-                        context.Shops.Update((ShopBase)gameObject);
+                        context.Shops.Update((ShopDescriptor)gameObject);
 
                         break;
                     case GameObjectType.Spell:
diff --git a/Intersect.Server.Core/Database/GameData/GameContext.cs b/Intersect.Server.Core/Database/GameData/GameContext.cs
@@ -59,7 +59,7 @@ protected GameContext(DatabaseContextOptions databaseContextOptions) : base(data
     public DbSet<ResourceDescriptor> Resources { get; set; }
 
     //Shops
-    public DbSet<ShopBase> Shops { get; set; }
+    public DbSet<ShopDescriptor> Shops { get; set; }
 
     //Spells
     public DbSet<SpellBase> Spells { get; set; }
diff --git a/Intersect.Server.Core/Database/GameData/IGameContext.cs b/Intersect.Server.Core/Database/GameData/IGameContext.cs
@@ -39,7 +39,7 @@ public interface IGameContext : IDbContext
 
     DbSet<ResourceDescriptor> Resources { get; set; }
 
-    DbSet<ShopBase> Shops { get; set; }
+    DbSet<ShopDescriptor> Shops { get; set; }
 
     DbSet<SpellBase> Spells { get; set; }
 
diff --git a/Intersect.Server.Core/Entities/Events/CommandProcessing.cs b/Intersect.Server.Core/Entities/Events/CommandProcessing.cs
@@ -1253,7 +1253,7 @@ private static void ProcessCommand(
         Stack<CommandInstance> callStack
     )
     {
-        player.OpenShop(ShopBase.Get(command.ShopId));
+        player.OpenShop(ShopDescriptor.Get(command.ShopId));
         callStack.Peek().WaitingForResponse = CommandInstance.EventResponse.Shop;
     }
 
diff --git a/Intersect.Server.Core/Entities/Player.cs b/Intersect.Server.Core/Entities/Player.cs
@@ -3932,7 +3932,7 @@ public long GetEquipmentVitalRegen(Vital vital)
     }
 
     //Shop
-    public bool OpenShop(ShopBase shop)
+    public bool OpenShop(ShopDescriptor shop)
     {
         if (IsBusy())
         {
@@ -7848,7 +7848,7 @@ public bool TryAddToInstanceController()
 
     [JsonIgnore, NotMapped] public bool IsInBag => InBag != null;
 
-    [JsonIgnore, NotMapped] public ShopBase InShop;
+    [JsonIgnore, NotMapped] public ShopDescriptor InShop;
 
     [NotMapped] public bool InBank => BankInterface != null;
 
diff --git a/Intersect.Server.Core/Networking/PacketSender.cs b/Intersect.Server.Core/Networking/PacketSender.cs
diff --git a/Intersect.Server/Networking/NetworkedPacketHandler.cs b/Intersect.Server/Networking/NetworkedPacketHandler.cs

Original file line number	Diff line number	Diff line change
`@@ -215,32 +215,32 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)`
`215`	`215`	`else`
`216`	`216`	`{`
`217`	`217`	`var invItem = Globals.Me.Inventory[mMySlot];`
`218`		`- ShopItem shopItem = null;`
	`218`	`+ ShopItemDescriptor shopItemDescriptor = null;`
`219`	`219`	`for (var i = 0; i < Globals.GameShop.BuyingItems.Count; i++)`
`220`	`220`	`{`
`221`	`221`	`var tmpShop = Globals.GameShop.BuyingItems[i];`
`222`	`222`
`223`	`223`	`if (invItem.ItemId == tmpShop.ItemId)`
`224`	`224`	`{`
`225`		`- shopItem = tmpShop;`
	`225`	`+ shopItemDescriptor = tmpShop;`
`226`	`226`
`227`	`227`	`break;`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`
`231`		`- if (Globals.GameShop.BuyingWhitelist && shopItem != null)`
	`231`	`+ if (Globals.GameShop.BuyingWhitelist && shopItemDescriptor != null)`
`232`	`232`	`{`
`233`		`- var hoveredItem = ItemDescriptor.Get(shopItem.CostItemId);`
	`233`	`+ var hoveredItem = ItemDescriptor.Get(shopItemDescriptor.CostItemId);`
`234`	`234`	`if (hoveredItem != null && Globals.Me.Inventory[mMySlot]?.Descriptor != null)`
`235`	`235`	`{`
`236`	`236`	`mDescWindow = new ItemDescriptionWindow(`
`237`	`237`	`Globals.Me.Inventory[mMySlot].Descriptor, Globals.Me.Inventory[mMySlot].Quantity,`
`238`	`238`	`mInventoryWindow.X, mInventoryWindow.Y, Globals.Me.Inventory[mMySlot].ItemProperties, "",`
`239`		`- Strings.Shop.SellsFor.ToString(shopItem.CostItemQuantity, hoveredItem.Name)`
	`239`	`+ Strings.Shop.SellsFor.ToString(shopItemDescriptor.CostItemQuantity, hoveredItem.Name)`
`240`	`240`	`);`
`241`	`241`	`}`
`242`	`242`	`}`
`243`		`- else if (shopItem == null)`
	`243`	`+ else if (shopItemDescriptor == null)`
`244`	`244`	`{`
`245`	`245`	`var costItem = Globals.GameShop.DefaultCurrency;`
`246`	`246`	`if (invItem.Descriptor != null && costItem != null && Globals.Me.Inventory[mMySlot]?.Descriptor != null)`
Original file line number	Diff line number	Diff line change
`@@ -1711,7 +1711,7 @@ public void HandlePacket(IPacketSender packetSender, ShopPacket packet)`
`1711`	`1711`
`1712`	`1712`	`if (packet.ShopData != null)`
`1713`	`1713`	`{`
`1714`		`- Globals.GameShop = new ShopBase();`
	`1714`	`+ Globals.GameShop = new ShopDescriptor();`
`1715`	`1715`	`Globals.GameShop.Load(packet.ShopData);`
`1716`	`1716`	`Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenShop());`
`1717`	`1717`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,7 @@ private static string GetCommandText(OpenBankCommand command, MapInstance map)`
`1216`	`1216`
`1217`	`1217`	`private static string GetCommandText(OpenShopCommand command, MapInstance map)`
`1218`	`1218`	`{`
`1219`		`- return Strings.EventCommandList.openshop.ToString(ShopBase.GetName(command.ShopId));`
	`1219`	`+ return Strings.EventCommandList.openshop.ToString(ShopDescriptor.GetName(command.ShopId));`
`1220`	`1220`	`}`
`1221`	`1221`
`1222`	`1222`	`private static string GetCommandText(OpenCraftingTableCommand command, MapInstance map)`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public EventCommandOpenShop(OpenShopCommand refCommand, FrmEvent editor)`
`19`	`19`	`mEventEditor = editor;`
`20`	`20`	`InitLocalization();`
`21`	`21`	`cmbShop.Items.Clear();`
`22`		`- cmbShop.Items.AddRange(ShopBase.Names);`
`23`		`- cmbShop.SelectedIndex = ShopBase.ListIndex(mMyCommand.ShopId);`
	`22`	`+ cmbShop.Items.AddRange(ShopDescriptor.Names);`
	`23`	`+ cmbShop.SelectedIndex = ShopDescriptor.ListIndex(mMyCommand.ShopId);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`private void InitLocalization()`
`@@ -35,7 +35,7 @@ private void btnSave_Click(object sender, EventArgs e)`
`35`	`35`	`{`
`36`	`36`	`if (cmbShop.SelectedIndex > -1)`
`37`	`37`	`{`
`38`		`- mMyCommand.ShopId = ShopBase.IdFromList(cmbShop.SelectedIndex);`
	`38`	`+ mMyCommand.ShopId = ShopDescriptor.IdFromList(cmbShop.SelectedIndex);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`mEventEditor.FinishCommandEdit();`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ namespace Intersect.Editor.Forms.Editors;`
`15`	`15`	`public partial class FrmShop : EditorForm`
`16`	`16`	`{`
`17`	`17`
`18`		`- private List<ShopBase> mChanged = new List<ShopBase>();`
	`18`	`+ private List<ShopDescriptor> mChanged = new List<ShopDescriptor>();`
`19`	`19`
`20`	`20`	`private string mCopiedItem;`
`21`	`21`
`22`		`- private ShopBase mEditorItem;`
	`22`	`+ private ShopDescriptor mEditorItem;`
`23`	`23`
`24`	`24`	`private List<string> mKnownFolders = new List<string>();`
`25`	`25`
`@@ -33,7 +33,7 @@ public FrmShop()`
`33`	`33`	`}`
`34`	`34`	`private void AssignEditorItem(Guid id)`
`35`	`35`	`{`
`36`		`- mEditorItem = ShopBase.Get(id);`
	`36`	`+ mEditorItem = ShopDescriptor.Get(id);`
`37`	`37`	`UpdateEditor();`
`38`	`38`	`}`
`39`	`39`
`@@ -42,7 +42,7 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type)`
`42`	`42`	`if (type == GameObjectType.Shop)`
`43`	`43`	`{`
`44`	`44`	`InitEditor();`
`45`		`- if (mEditorItem != null && !ShopBase.Lookup.Values.Contains(mEditorItem))`
	`45`	`+ if (mEditorItem != null && !ShopDescriptor.Lookup.Values.Contains(mEditorItem))`
`46`	`46`	`{`
`47`	`47`	`mEditorItem = null;`
`48`	`48`	`UpdateEditor();`
`@@ -278,7 +278,7 @@ private void btnAddSoldItem_Click(object sender, EventArgs e)`
`278`	`278`	`{`
`279`	`279`	`var addedItem = false;`
`280`	`280`	`var cost = (int) nudSellCost.Value;`
`281`		`- var newItem = new ShopItem(`
	`281`	`+ var newItem = new ShopItemDescriptor(`
`282`	`282`	`ItemDescriptor.IdFromList(cmbAddSoldItem.SelectedIndex), ItemDescriptor.IdFromList(cmbSellFor.SelectedIndex), cost`
`283`	`283`	`);`
`284`	`284`
`@@ -315,7 +315,7 @@ private void btnAddBoughtItem_Click(object sender, EventArgs e)`
`315`	`315`	`{`
`316`	`316`	`var addedItem = false;`
`317`	`317`	`var cost = (int) nudBuyAmount.Value;`
`318`		`- var newItem = new ShopItem(`
	`318`	`+ var newItem = new ShopItemDescriptor(`
`319`	`319`	`ItemDescriptor.IdFromList(cmbAddBoughtItem.SelectedIndex), ItemDescriptor.IdFromList(cmbBuyFor.SelectedIndex), cost`
`320`	`320`	`);`
`321`	`321`
`@@ -468,15 +468,15 @@ public void InitEditor()`
`468`	`468`	`{`
`469`	`469`	`//Collect folders`
`470`	`470`	`var mFolders = new List<string>();`
`471`		`- foreach (var itm in ShopBase.Lookup)`
	`471`	`+ foreach (var itm in ShopDescriptor.Lookup)`
`472`	`472`	`{`
`473`		`- if (!string.IsNullOrEmpty(((ShopBase) itm.Value).Folder) &&`
`474`		`- !mFolders.Contains(((ShopBase) itm.Value).Folder))`
	`473`	`+ if (!string.IsNullOrEmpty(((ShopDescriptor) itm.Value).Folder) &&`
	`474`	`+ !mFolders.Contains(((ShopDescriptor) itm.Value).Folder))`
`475`	`475`	`{`
`476`		`- mFolders.Add(((ShopBase) itm.Value).Folder);`
`477`		`- if (!mKnownFolders.Contains(((ShopBase) itm.Value).Folder))`
	`476`	`+ mFolders.Add(((ShopDescriptor) itm.Value).Folder);`
	`477`	`+ if (!mKnownFolders.Contains(((ShopDescriptor) itm.Value).Folder))`
`478`	`478`	`{`
`479`		`- mKnownFolders.Add(((ShopBase) itm.Value).Folder);`
	`479`	`+ mKnownFolders.Add(((ShopDescriptor) itm.Value).Folder);`
`480`	`480`	`}`
`481`	`481`	`}`
`482`	`482`	`}`
`@@ -487,8 +487,8 @@ public void InitEditor()`
`487`	`487`	`cmbFolder.Items.Add("");`
`488`	`488`	`cmbFolder.Items.AddRange(mKnownFolders.ToArray());`
`489`	`489`
`490`		`- var items = ShopBase.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,`
`491`		`- new KeyValuePair<string, string>(((ShopBase)pair.Value)?.Name ?? Models.DatabaseObject<ShopBase>.Deleted, ((ShopBase)pair.Value)?.Folder ?? ""))).ToArray();`
	`490`	`+ var items = ShopDescriptor.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,`
	`491`	`+ new KeyValuePair<string, string>(((ShopDescriptor)pair.Value)?.Name ?? Models.DatabaseObject<ShopDescriptor>.Deleted, ((ShopDescriptor)pair.Value)?.Folder ?? ""))).ToArray();`
`492`	`492`	`lstGameObjects.Repopulate(items, mFolders, btnAlphabetical.Checked, CustomSearch(), txtSearch.Text);`
`493`	`493`	`}`
`494`	`494`
Original file line number	Diff line number	Diff line change
`@@ -579,14 +579,14 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)`
`579`	`579`	`case GameObjectType.Shop:`
`580`	`580`	`if (deleted)`
`581`	`581`	`{`
`582`		`- var shp = ShopBase.Get(id);`
	`582`	`+ var shp = ShopDescriptor.Get(id);`
`583`	`583`	`shp.Delete();`
`584`	`584`	`}`
`585`	`585`	`else`
`586`	`586`	`{`
`587`		`- var shp = new ShopBase(id);`
	`587`	`+ var shp = new ShopDescriptor(id);`
`588`	`588`	`shp.Load(json);`
`589`		`- ShopBase.Lookup.Set(id, shp);`
	`589`	`+ ShopDescriptor.Lookup.Set(id, shp);`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`break;`