rename TilesetBase -> TilesetDescriptor

pandinocoder · pandinocoder · commit a0f9d9ae1389 · 2025-02-27T14:24:19.000-05:00
diff --git a/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs b/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs
@@ -2,6 +2,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.NPCs;
 using Intersect.Framework.Core.GameObjects.Resources;
@@ -57,7 +58,7 @@ public enum GameObjectType
     [GameObjectInfo(typeof(ServerVariableDescriptor), "server_variables")]
     ServerVariable,
 
-    [GameObjectInfo(typeof(TilesetBase), "tilesets")]
+    [GameObjectInfo(typeof(TilesetDescriptor), "tilesets")]
     Tileset,
 
     [GameObjectInfo(typeof(TimeBase), "")]
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Mapping/Tilesets/TilesetDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Mapping/Tilesets/TilesetDescriptor.cs
@@ -1,18 +1,18 @@
 ﻿using Intersect.Models;
 using Newtonsoft.Json;
 
-namespace Intersect.GameObjects;
+namespace Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 
-public partial class TilesetBase : DatabaseObject<TilesetBase>
+public partial class TilesetDescriptor : DatabaseObject<TilesetDescriptor>
 {
     [JsonConstructor]
-    public TilesetBase(Guid id) : base(id)
+    public TilesetDescriptor(Guid id) : base(id)
     {
         Name = string.Empty;
     }
 
     //Ef Parameterless Constructor
-    public TilesetBase()
+    public TilesetDescriptor()
     {
         Name = string.Empty;
     }
diff --git a/Intersect.Client.Core/Core/Main.cs b/Intersect.Client.Core/Core/Main.cs
@@ -5,6 +5,7 @@
 using Intersect.Configuration;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.GameObjects;
 
@@ -173,7 +174,7 @@ private static void ProcessLoading()
 
         if (!_loadedTilesets && Globals.HasGameData)
         {
-            Globals.ContentManager.LoadTilesets(TilesetBase.GetNameList());
+            Globals.ContentManager.LoadTilesets(TilesetDescriptor.GetNameList());
             _loadedTilesets = true;
         }
 
diff --git a/Intersect.Client.Core/Maps/MapInstance.cs b/Intersect.Client.Core/Maps/MapInstance.cs
@@ -18,6 +18,7 @@
 using Intersect.Framework.Core;
 using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.Attributes;
 using Intersect.Framework.Core.Serialization;
@@ -236,7 +237,7 @@ private void CacheTextures()
                         continue;
                     }
 
-                    if (!TilesetBase.TryGet(layerTile.TilesetId, out var tileset))
+                    if (!TilesetDescriptor.TryGet(layerTile.TilesetId, out var tileset))
                     {
                         continue;
                     }
diff --git a/Intersect.Client.Core/Networking/PacketHandler.cs b/Intersect.Client.Core/Networking/PacketHandler.cs
@@ -25,6 +25,7 @@
 using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.Attributes;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
@@ -1791,12 +1792,12 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)
                 //Handled in a different packet
                 break;
             case GameObjectType.Tileset:
-                var obj = new TilesetBase(objectId);
+                var obj = new TilesetDescriptor(objectId);
                 obj.Load(json);
-                TilesetBase.Lookup.Set(objectId, obj);
+                TilesetDescriptor.Lookup.Set(objectId, obj);
                 if (Globals.HasGameData && !another)
                 {
-                    Globals.ContentManager.LoadTilesets(TilesetBase.GetNameList());
+                    Globals.ContentManager.LoadTilesets(TilesetDescriptor.GetNameList());
                 }
 
                 break;
diff --git a/Intersect.Editor/Content/ContentManager.cs b/Intersect.Editor/Content/ContentManager.cs
@@ -1,6 +1,7 @@
 using Intersect.Editor.Core;
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.GameObjects;
 using Intersect.IO.Files;
 using Intersect.Utilities;
@@ -178,7 +179,7 @@ public static void LoadTilesets()
         Array.Sort(tilesets, new AlphanumComparatorFast());
         if (tilesets.Length > 0)
         {
-            var tilesetBaseList = TilesetBase.Names;
+            var tilesetBaseList = TilesetDescriptor.Names;
             for (var i = 0; i < tilesets.Length; i++)
             {
                 tilesets[i] = tilesets[i].Replace("resources/tilesets\\", "");
@@ -209,9 +210,9 @@ public static void LoadTilesets()
         sTilesetDict.Clear();
         TilesetTextures.Clear();
         var badTilesets = new List<string>();
-        for (var i = 0; i < TilesetBase.Lookup.Count; i++)
+        for (var i = 0; i < TilesetDescriptor.Lookup.Count; i++)
         {
-            var tileset = TilesetBase.Get(TilesetBase.IdFromList(i));
+            var tileset = TilesetDescriptor.Get(TilesetDescriptor.IdFromList(i));
             if (File.Exists("resources/tilesets/" + tileset.Name))
             {
                 try
diff --git a/Intersect.Editor/Core/Graphics.cs b/Intersect.Editor/Core/Graphics.cs
@@ -9,6 +9,7 @@
 using Intersect.Enums;
 using Intersect.Framework.Core;
 using Intersect.Framework.Core.GameObjects.Events;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.Attributes;
 using Intersect.Framework.Core.GameObjects.Resources;
@@ -751,7 +752,7 @@ RenderTarget2D renderTarget2D
                             Options.Instance.Map.TileHeight
                         ).IntersectsWith(new System.Drawing.Rectangle(0, 0, CurrentView.Width, CurrentView.Height)))
                         {
-                            var tilesetObj = TilesetBase.Get(tmpMap.Layers[drawLayer][x, y].TilesetId);
+                            var tilesetObj = TilesetDescriptor.Get(tmpMap.Layers[drawLayer][x, y].TilesetId);
                             try
                             {
                                 if (tilesetObj == null)
diff --git a/Intersect.Editor/Forms/DockingElements/frmMapEditor.cs b/Intersect.Editor/Forms/DockingElements/frmMapEditor.cs
@@ -11,6 +11,7 @@
 using Intersect.Editor.Networking;
 using Intersect.Enums;
 using Intersect.Framework.Core.GameObjects.Events;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.GameObjects;
 using Microsoft.Extensions.Logging;
@@ -246,7 +247,7 @@ private void picMap_MouseDown(object sender, MouseEventArgs e)
                     {
                         if (tmpMap.Layers[layer][Globals.CurTileX, Globals.CurTileY].TilesetId != Guid.Empty)
                         {
-                            Globals.MapLayersWindow.SetTileset(TilesetBase.GetName(tmpMap.Layers[layer][Globals.CurTileX, Globals.CurTileY].TilesetId));
+                            Globals.MapLayersWindow.SetTileset(TilesetDescriptor.GetName(tmpMap.Layers[layer][Globals.CurTileX, Globals.CurTileY].TilesetId));
 
                             Globals.CurSelW = 0;
                             Globals.CurSelH = 0;
diff --git a/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs b/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs
@@ -5,6 +5,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Enums;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.Attributes;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
@@ -286,7 +287,7 @@ public void InitTilesets()
     {
         Globals.MapLayersWindow.cmbTilesets.Items.Clear();
         var tilesetList = new List<string>();
-        tilesetList.AddRange(TilesetBase.Names);
+        tilesetList.AddRange(TilesetDescriptor.Names);
         tilesetList.Sort(new AlphanumComparatorFast());
         foreach (var filename in tilesetList)
         {
@@ -299,21 +300,21 @@ public void InitTilesets()
             }
         }
 
-        if (TilesetBase.Lookup.Count > 0)
+        if (TilesetDescriptor.Lookup.Count > 0)
         {
             if (Globals.MapLayersWindow.cmbTilesets.Items.Count > 0)
             {
                 Globals.MapLayersWindow.cmbTilesets.SelectedIndex = 0;
             }
 
-            Globals.CurrentTileset = (TilesetBase) TilesetBase.Lookup.Values.ToArray()[0];
+            Globals.CurrentTileset = (TilesetDescriptor) TilesetDescriptor.Lookup.Values.ToArray()[0];
         }
     }
 
     public void SetTileset(string name)
     {
-        TilesetBase tSet = null;
-        var tilesets = TilesetBase.Lookup;
+        TilesetDescriptor tSet = null;
+        var tilesets = TilesetDescriptor.Lookup;
         var id = Guid.Empty;
         foreach (var tileset in tilesets.Pairs)
         {
@@ -327,7 +328,7 @@ public void SetTileset(string name)
 
         if (id != Guid.Empty)
         {
-            tSet = TilesetBase.Get(id);
+            tSet = TilesetDescriptor.Get(id);
         }
 
         if (tSet != null)
diff --git a/Intersect.Editor/General/Globals.cs b/Intersect.Editor/General/Globals.cs
@@ -4,6 +4,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Maps;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.GameObjects;
 
 namespace Intersect.Editor.General;
@@ -47,7 +48,7 @@ public static partial class Globals
     //Editor Variables
     public static MapInstance? CurrentMap { get; set; }
 
-    public static TilesetBase? CurrentTileset { get; set; }
+    public static TilesetDescriptor? CurrentTileset { get; set; }
 
     public static EditingTool _currentTool = EditingTool.Brush;
 
diff --git a/Intersect.Editor/Networking/PacketHandler.cs b/Intersect.Editor/Networking/PacketHandler.cs
@@ -8,6 +8,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.NPCs;
@@ -694,9 +695,9 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)
                 break;
 
             case GameObjectType.Tileset:
-                var obj = new TilesetBase(id);
+                var obj = new TilesetDescriptor(id);
                 obj.Load(json);
-                TilesetBase.Lookup.Set(id, obj);
+                TilesetDescriptor.Lookup.Set(id, obj);
                 if (Globals.HasGameData && !packet.AnotherFollowing)
                 {
                     GameContentManager.LoadTilesets();
diff --git a/Intersect.Server.Core/Database/DbInterface.cs b/Intersect.Server.Core/Database/DbInterface.cs
@@ -13,6 +13,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.NPCs;
@@ -701,7 +702,7 @@ private static void ClearGameObjects(GameObjectType type)
 
                 break;
             case GameObjectType.Tileset:
-                TilesetBase.Lookup.Clear();
+                TilesetDescriptor.Lookup.Clear();
 
                 break;
             case GameObjectType.Time:
@@ -844,7 +845,7 @@ private static void LoadGameObjects(GameObjectType gameObjectType)
                     case GameObjectType.Tileset:
                         foreach (var psw in context.Tilesets)
                         {
-                            TilesetBase.Lookup.Set(psw.Id, psw);
+                            TilesetDescriptor.Lookup.Set(psw.Id, psw);
                         }
 
                         break;
@@ -1053,7 +1054,7 @@ public static IDatabaseObject AddGameObject(GameObjectType gameObjectType, Guid
 
                 break;
             case GameObjectType.Tileset:
-                dbObj = new TilesetBase(predefinedid);
+                dbObj = new TilesetDescriptor(predefinedid);
 
                 break;
             case GameObjectType.Time:
@@ -1183,8 +1184,8 @@ public static IDatabaseObject AddGameObject(GameObjectType gameObjectType, IData
                         break;
 
                     case GameObjectType.Tileset:
-                        context.Tilesets.Add((TilesetBase)dbObj);
-                        TilesetBase.Lookup.Set(dbObj.Id, dbObj);
+                        context.Tilesets.Add((TilesetDescriptor)dbObj);
+                        TilesetDescriptor.Lookup.Set(dbObj.Id, dbObj);
 
                         break;
 
@@ -1329,7 +1330,7 @@ public static void DeleteGameObject(IDatabaseObject gameObject)
 
                         break;
                     case GameObjectType.Tileset:
-                        context.Tilesets.Remove((TilesetBase)gameObject);
+                        context.Tilesets.Remove((TilesetDescriptor)gameObject);
 
                         break;
                     case GameObjectType.Time:
@@ -1484,7 +1485,7 @@ public static void SaveGameObject(IDatabaseObject gameObject)
 
                         break;
                     case GameObjectType.Tileset:
-                        context.Tilesets.Update((TilesetBase)gameObject);
+                        context.Tilesets.Update((TilesetDescriptor)gameObject);
 
                         break;
                     case GameObjectType.Time:
diff --git a/Intersect.Server.Core/Database/GameData/GameContext.cs b/Intersect.Server.Core/Database/GameData/GameContext.cs
@@ -2,6 +2,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.NPCs;
 using Intersect.Framework.Core.GameObjects.Resources;
@@ -74,7 +75,7 @@ protected GameContext(DatabaseContextOptions databaseContextOptions) : base(data
     public DbSet<UserVariableDescriptor> UserVariables { get; set; }
 
     //Tilesets
-    public DbSet<TilesetBase> Tilesets { get; set; }
+    public DbSet<TilesetDescriptor> Tilesets { get; set; }
 
     //Time
     public DbSet<TimeBase> Time { get; set; }
diff --git a/Intersect.Server.Core/Database/GameData/IGameContext.cs b/Intersect.Server.Core/Database/GameData/IGameContext.cs
@@ -1,6 +1,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.NPCs;
 using Intersect.Framework.Core.GameObjects.Resources;
@@ -45,7 +46,7 @@ public interface IGameContext : IDbContext
 
     DbSet<ServerVariableDescriptor> ServerVariables { get; set; }
 
-    DbSet<TilesetBase> Tilesets { get; set; }
+    DbSet<TilesetDescriptor> Tilesets { get; set; }
 
     DbSet<TimeBase> Time { get; set; }
 }
diff --git a/Intersect.Server.Core/Networking/PacketSender.cs b/Intersect.Server.Core/Networking/PacketSender.cs
@@ -6,6 +6,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.NPCs;
 using Intersect.Framework.Core.GameObjects.Resources;
@@ -1835,7 +1836,7 @@ public static void SendGameObjects(Client client, GameObjectType type, List<Game
 
                 break;
             case GameObjectType.Tileset:
-                foreach (var obj in TilesetBase.Lookup)
+                foreach (var obj in TilesetDescriptor.Lookup)
                 {
                     SendGameObject(client, obj.Value, false, false, packetList);
                 }
diff --git a/Intersect.Server/Networking/NetworkedPacketHandler.cs b/Intersect.Server/Networking/NetworkedPacketHandler.cs
@@ -4,6 +4,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.NPCs;
@@ -1215,7 +1216,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.AddTilesetsPacket
             {
                 var value = tileset.Trim().ToLower();
                 var found = false;
-                foreach (var tset in TilesetBase.Lookup)
+                foreach (var tset in TilesetDescriptor.Lookup)
                 {
                     if (tset.Value.Name.Trim().ToLower() == value)
                     {
@@ -1226,7 +1227,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.AddTilesetsPacket
                 if (!found)
                 {
                     var obj = DbInterface.AddGameObject(GameObjectType.Tileset);
-                    ((TilesetBase)obj).Name = value;
+                    ((TilesetDescriptor)obj).Name = value;
                     DbInterface.SaveGameObject(obj);
                     PacketSender.CacheGameDataPacket();
                     PacketSender.SendGameObjectToAll(obj);

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`using Intersect.Models;`
`2`	`2`	`using Newtonsoft.Json;`
`3`	`3`
`4`		`-namespace Intersect.GameObjects;`
	`4`	`+namespace Intersect.Framework.Core.GameObjects.Mapping.Tilesets;`
`5`	`5`
`6`		`-public partial class TilesetBase : DatabaseObject<TilesetBase>`
	`6`	`+public partial class TilesetDescriptor : DatabaseObject<TilesetDescriptor>`
`7`	`7`	`{`
`8`	`8`	`[JsonConstructor]`
`9`		`- public TilesetBase(Guid id) : base(id)`
	`9`	`+ public TilesetDescriptor(Guid id) : base(id)`
`10`	`10`	`{`
`11`	`11`	`Name = string.Empty;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`//Ef Parameterless Constructor`
`15`		`- public TilesetBase()`
	`15`	`+ public TilesetDescriptor()`
`16`	`16`	`{`
`17`	`17`	`Name = string.Empty;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Intersect.Configuration;`
`6`	`6`	`using Intersect.Enums;`
`7`	`7`	`using Intersect.Framework.Core;`
	`8`	`+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;`
`8`	`9`	`using Intersect.Framework.Core.GameObjects.Maps;`
`9`	`10`	`using Intersect.GameObjects;`
`10`	`11`
`@@ -173,7 +174,7 @@ private static void ProcessLoading()`
`173`	`174`
`174`	`175`	`if (!_loadedTilesets && Globals.HasGameData)`
`175`	`176`	`{`
`176`		`- Globals.ContentManager.LoadTilesets(TilesetBase.GetNameList());`
	`177`	`+ Globals.ContentManager.LoadTilesets(TilesetDescriptor.GetNameList());`
`177`	`178`	`_loadedTilesets = true;`
`178`	`179`	`}`
`179`	`180`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`using Intersect.Framework.Core;`
`19`	`19`	`using Intersect.Framework.Core.GameObjects.Animations;`
`20`	`20`	`using Intersect.Framework.Core.GameObjects.Items;`
	`21`	`+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;`
`21`	`22`	`using Intersect.Framework.Core.GameObjects.Maps;`
`22`	`23`	`using Intersect.Framework.Core.GameObjects.Maps.Attributes;`
`23`	`24`	`using Intersect.Framework.Core.Serialization;`
`@@ -236,7 +237,7 @@ private void CacheTextures()`
`236`	`237`	`continue;`
`237`	`238`	`}`
`238`	`239`
`239`		`- if (!TilesetBase.TryGet(layerTile.TilesetId, out var tileset))`
	`240`	`+ if (!TilesetDescriptor.TryGet(layerTile.TilesetId, out var tileset))`
`240`	`241`	`{`
`241`	`242`	`continue;`
`242`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Intersect.Editor.Localization;`
`6`	`6`	`using Intersect.Enums;`
`7`	`7`	`using Intersect.Framework.Core.GameObjects.Items;`
	`8`	`+using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;`
`8`	`9`	`using Intersect.Framework.Core.GameObjects.Maps;`
`9`	`10`	`using Intersect.Framework.Core.GameObjects.Maps.Attributes;`
`10`	`11`	`using Intersect.Framework.Core.GameObjects.Maps.MapList;`
`@@ -286,7 +287,7 @@ public void InitTilesets()`
`286`	`287`	`{`
`287`	`288`	`Globals.MapLayersWindow.cmbTilesets.Items.Clear();`
`288`	`289`	`var tilesetList = new List<string>();`
`289`		`- tilesetList.AddRange(TilesetBase.Names);`
	`290`	`+ tilesetList.AddRange(TilesetDescriptor.Names);`
`290`	`291`	`tilesetList.Sort(new AlphanumComparatorFast());`
`291`	`292`	`foreach (var filename in tilesetList)`
`292`	`293`	`{`
`@@ -299,21 +300,21 @@ public void InitTilesets()`
`299`	`300`	`}`
`300`	`301`	`}`
`301`	`302`
`302`		`- if (TilesetBase.Lookup.Count > 0)`
	`303`	`+ if (TilesetDescriptor.Lookup.Count > 0)`
`303`	`304`	`{`
`304`	`305`	`if (Globals.MapLayersWindow.cmbTilesets.Items.Count > 0)`
`305`	`306`	`{`
`306`	`307`	`Globals.MapLayersWindow.cmbTilesets.SelectedIndex = 0;`
`307`	`308`	`}`
`308`	`309`
`309`		`- Globals.CurrentTileset = (TilesetBase) TilesetBase.Lookup.Values.ToArray()[0];`
	`310`	`+ Globals.CurrentTileset = (TilesetDescriptor) TilesetDescriptor.Lookup.Values.ToArray()[0];`
`310`	`311`	`}`
`311`	`312`	`}`
`312`	`313`
`313`	`314`	`public void SetTileset(string name)`
`314`	`315`	`{`
`315`		`- TilesetBase tSet = null;`
`316`		`- var tilesets = TilesetBase.Lookup;`
	`316`	`+ TilesetDescriptor tSet = null;`
	`317`	`+ var tilesets = TilesetDescriptor.Lookup;`
`317`	`318`	`var id = Guid.Empty;`
`318`	`319`	`foreach (var tileset in tilesets.Pairs)`
`319`	`320`	`{`
`@@ -327,7 +328,7 @@ public void SetTileset(string name)`
`327`	`328`
`328`	`329`	`if (id != Guid.Empty)`
`329`	`330`	`{`
`330`		`- tSet = TilesetBase.Get(id);`
	`331`	`+ tSet = TilesetDescriptor.Get(id);`
`331`	`332`	`}`
`332`	`333`
`333`	`334`	`if (tSet != null)`