Skip to content

Commit 10d3da6

Browse files
committed
rename AnimationBase -> AnimationDescriptor
rename AnimationBase -> AnimationDescriptor without forgetting the editor...
1 parent 8b19dc2 commit 10d3da6

Some content is hidden

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

48 files changed

+3788
-239
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Intersect.Enums;
99

1010
public enum GameObjectType
1111
{
12-
[GameObjectInfo(typeof(AnimationBase), "animations")]
12+
[GameObjectInfo(typeof(AnimationDescriptor), "animations")]
1313
Animation = 0,
1414

1515
[GameObjectInfo(typeof(ClassBase), "classes")]

Framework/Intersect.Framework.Core/GameObjects/AnimationBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/AnimationDescriptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Intersect.GameObjects;
66

7-
public partial class AnimationBase : DatabaseObject<AnimationBase>, IFolderable
7+
public partial class AnimationDescriptor : DatabaseObject<AnimationDescriptor>, IFolderable
88
{
99
[JsonConstructor]
10-
public AnimationBase(Guid id) : base(id)
10+
public AnimationDescriptor(Guid id) : base(id)
1111
{
1212
// TODO: localize this
1313
Name = "New Animation";
@@ -16,7 +16,7 @@ public AnimationBase(Guid id) : base(id)
1616
}
1717

1818
//EF Parameterless Constructor
19-
public AnimationBase()
19+
public AnimationDescriptor()
2020
{
2121
// TODO: localize this
2222
Name = "New Animation";

Framework/Intersect.Framework.Core/GameObjects/ClassBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ public ClassBase()
154154

155155
[NotMapped]
156156
[JsonIgnore]
157-
public AnimationBase AttackAnimation
157+
public AnimationDescriptor AttackAnimation
158158
{
159-
get => AnimationBase.Get(AttackAnimationId);
159+
get => AnimationDescriptor.Get(AttackAnimationId);
160160
set => AttackAnimationId = value?.Id ?? Guid.Empty;
161161
}
162162

Framework/Intersect.Framework.Core/GameObjects/ItemBase.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public ItemBase(Guid id) : base(id)
3434

3535
[NotMapped]
3636
[JsonIgnore]
37-
public AnimationBase Animation
37+
public AnimationDescriptor Animation
3838
{
39-
get => AnimationBase.Get(AnimationId);
39+
get => AnimationDescriptor.Get(AnimationId);
4040
set => AnimationId = value?.Id ?? Guid.Empty;
4141
}
4242

@@ -46,9 +46,9 @@ public AnimationBase Animation
4646

4747
[NotMapped]
4848
[JsonIgnore]
49-
public AnimationBase AttackAnimation
49+
public AnimationDescriptor AttackAnimation
5050
{
51-
get => AnimationBase.Get(AttackAnimationId);
51+
get => AnimationDescriptor.Get(AttackAnimationId);
5252
set => AttackAnimationId = value?.Id ?? Guid.Empty;
5353
}
5454

@@ -57,9 +57,9 @@ public AnimationBase AttackAnimation
5757

5858
[NotMapped]
5959
[JsonIgnore]
60-
public AnimationBase EquipmentAnimation
60+
public AnimationDescriptor EquipmentAnimation
6161
{
62-
get => AnimationBase.Get(EquipmentAnimationId);
62+
get => AnimationDescriptor.Get(EquipmentAnimationId);
6363
set => EquipmentAnimationId = value?.Id ?? Guid.Empty;
6464
}
6565

Framework/Intersect.Framework.Core/GameObjects/Maps/MapAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public partial class MapAnimationAttribute : MapAttribute
218218
public override MapAttributeType Type => MapAttributeType.Animation;
219219

220220
[EditorLabel("Attributes", "MapAnimation")]
221-
[EditorReference(typeof(AnimationBase), nameof(AnimationBase.Name))]
221+
[EditorReference(typeof(AnimationDescriptor), nameof(AnimationDescriptor.Name))]
222222
public Guid AnimationId { get; set; }
223223

224224
[EditorLabel("Attributes", "MapAnimationBlock")]
@@ -269,7 +269,7 @@ public partial class MapCritterAttribute : MapAttribute
269269
public string Sprite { get; set; }
270270

271271
[EditorLabel("Attributes", "CritterAnimation")]
272-
[EditorReference(typeof(AnimationBase), nameof(AnimationBase.Name))]
272+
[EditorReference(typeof(AnimationDescriptor), nameof(AnimationDescriptor.Name))]
273273
public Guid AnimationId { get; set; }
274274

275275
//Movement types will mimic npc options?

Framework/Intersect.Framework.Core/GameObjects/Maps/MapBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,9 @@ public string PlayerLightColorJson
340340

341341
[NotMapped]
342342
[JsonIgnore]
343-
public AnimationBase WeatherAnimation
343+
public AnimationDescriptor WeatherAnimation
344344
{
345-
get => AnimationBase.Get(WeatherAnimationId);
345+
get => AnimationDescriptor.Get(WeatherAnimationId);
346346
set => WeatherAnimationId = value?.Id ?? Guid.Empty;
347347
}
348348

Framework/Intersect.Framework.Core/GameObjects/NpcBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ public string JsonAggroList
139139

140140
[NotMapped]
141141
[JsonIgnore]
142-
public AnimationBase AttackAnimation
142+
public AnimationDescriptor AttackAnimation
143143
{
144-
get => AnimationBase.Get(AttackAnimationId);
144+
get => AnimationDescriptor.Get(AttackAnimationId);
145145
set => AttackAnimationId = value?.Id ?? Guid.Empty;
146146
}
147147

Framework/Intersect.Framework.Core/GameObjects/ResourceBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public ResourceBase()
6161

6262
[NotMapped]
6363
[JsonIgnore]
64-
public AnimationBase Animation
64+
public AnimationDescriptor Animation
6565
{
66-
get => AnimationBase.Get(AnimationId);
66+
get => AnimationDescriptor.Get(AnimationId);
6767
set => AnimationId = value?.Id ?? Guid.Empty;
6868
}
6969

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public SpellBase()
4343

4444
[NotMapped]
4545
[JsonIgnore]
46-
public AnimationBase CastAnimation
46+
public AnimationDescriptor CastAnimation
4747
{
48-
get => AnimationBase.Get(CastAnimationId);
48+
get => AnimationDescriptor.Get(CastAnimationId);
4949
set => CastAnimationId = value?.Id ?? Guid.Empty;
5050
}
5151

@@ -54,9 +54,9 @@ public AnimationBase CastAnimation
5454

5555
[NotMapped]
5656
[JsonIgnore]
57-
public AnimationBase HitAnimation
57+
public AnimationDescriptor HitAnimation
5858
{
59-
get => AnimationBase.Get(HitAnimationId);
59+
get => AnimationDescriptor.Get(HitAnimationId);
6060
set => HitAnimationId = value?.Id ?? Guid.Empty;
6161
}
6262

@@ -65,9 +65,9 @@ public AnimationBase HitAnimation
6565

6666
[NotMapped]
6767
[JsonIgnore]
68-
public AnimationBase TickAnimation
68+
public AnimationDescriptor TickAnimation
6969
{
70-
get => AnimationBase.Get(TickAnimationId);
70+
get => AnimationDescriptor.Get(TickAnimationId);
7171
set => TickAnimationId = value?.Id ?? Guid.Empty;
7272
}
7373

0 commit comments

Comments
 (0)