Skip to content

Commit 851fbd9

Browse files
committed
rename MapBase -> MapDescriptor
1 parent fb562fe commit 851fbd9

File tree

86 files changed

+245
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+245
-238
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using Intersect.Framework.Core.GameObjects.Crafting;
33
using Intersect.Framework.Core.GameObjects.Events;
44
using Intersect.Framework.Core.GameObjects.Items;
5+
using Intersect.Framework.Core.GameObjects.Maps;
56
using Intersect.Framework.Core.GameObjects.Variables;
67
using Intersect.GameObjects;
7-
using Intersect.GameObjects.Maps;
88

99
namespace Intersect.Enums;
1010

@@ -43,7 +43,7 @@ public enum GameObjectType
4343
[GameObjectInfo(typeof(CraftingRecipeDescriptor), "crafts")]
4444
Crafts,
4545

46-
[GameObjectInfo(typeof(MapBase), "maps")]
46+
[GameObjectInfo(typeof(MapDescriptor), "maps")]
4747
Map,
4848

4949
[GameObjectInfo(typeof(EventDescriptor), "events")]

Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorReferenceAttribute.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Reflection;
22
using Intersect.Collections;
3-
using Intersect.GameObjects.Maps;
4-
using Intersect.GameObjects.Maps.MapList;
3+
using Intersect.Framework.Core.GameObjects.Maps;
4+
using Intersect.Framework.Core.GameObjects.Maps.MapList;
55
using Intersect.Models;
66

77
namespace Intersect.GameObjects.Annotations;
@@ -40,7 +40,7 @@ public override string Format(Type stringsType, object value)
4040
throw new ArgumentException($"Invalid value type {value?.GetType().FullName}", nameof(value));
4141
}
4242

43-
if (DescriptorType == typeof(MapBase))
43+
if (DescriptorType == typeof(MapDescriptor))
4444
{
4545
var mapName = MapList.OrderedMaps.FirstOrDefault(map => map.MapId == guid)?.Name;
4646
if (mapName != default)

Framework/Intersect.Framework.Core/GameObjects/ClassDescriptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.ComponentModel.DataAnnotations.Schema;
22
using Intersect.Enums;
3+
using Intersect.Framework.Core.GameObjects.Maps;
34
using Intersect.Framework.Core.GameObjects.PlayerClass;
4-
using Intersect.GameObjects.Maps;
55
using Intersect.Models;
66
using Intersect.Server.Utilities;
77
using Intersect.Utilities;
@@ -221,9 +221,9 @@ public long ExpIncrease
221221

222222
[NotMapped]
223223
[JsonIgnore]
224-
public MapBase SpawnMap
224+
public MapDescriptor SpawnMap
225225
{
226-
get => MapBase.Get(SpawnMapId);
226+
get => MapDescriptor.Get(SpawnMapId);
227227
set => SpawnMapId = value?.Id ?? Guid.Empty;
228228
}
229229

Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/MapZoneTypeIs.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Intersect.Enums;
2+
using Intersect.Framework.Core.GameObjects.Maps;
23

34
namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
45

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Intersect.Enums;
2+
using Intersect.Framework.Core.GameObjects.Maps;
23

34
namespace Intersect.Framework.Core.GameObjects.Events.Commands;
45

Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapAnimationAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Intersect.Enums;
1+
using Intersect.GameObjects;
22
using Intersect.GameObjects.Annotations;
33
using Intersect.Localization;
44

5-
namespace Intersect.GameObjects.Maps;
5+
namespace Intersect.Framework.Core.GameObjects.Maps.Attributes;
66

77
public partial class MapAnimationAttribute : MapAttribute
88
{

Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapBlockedAttribute.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Intersect.Enums;
2-
3-
namespace Intersect.GameObjects.Maps;
1+
namespace Intersect.Framework.Core.GameObjects.Maps.Attributes;
42

53
public partial class MapBlockedAttribute : MapAttribute
64
{

Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapCritterAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Intersect.Enums;
1+
using Intersect.GameObjects;
22
using Intersect.GameObjects.Annotations;
33
using Intersect.Localization;
44

5-
namespace Intersect.GameObjects.Maps;
5+
namespace Intersect.Framework.Core.GameObjects.Maps.Attributes;
66

77
public partial class MapCritterAttribute : MapAttribute
88
{

Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapGrappleStoneAttribute.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Intersect.Enums;
2-
3-
namespace Intersect.GameObjects.Maps;
1+
namespace Intersect.Framework.Core.GameObjects.Maps.Attributes;
42

53
public partial class MapGrappleStoneAttribute : MapAttribute
64
{

Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapItemAttribute.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using Intersect.Enums;
2-
using Intersect.Framework.Core.GameObjects.Items;
1+
using Intersect.Framework.Core.GameObjects.Items;
32
using Intersect.GameObjects.Annotations;
43

5-
namespace Intersect.GameObjects.Maps;
4+
namespace Intersect.Framework.Core.GameObjects.Maps.Attributes;
65

76
public partial class MapItemAttribute : MapAttribute
87
{

0 commit comments

Comments
 (0)