relocate AnimationDescriptor

pandinocoder · pandinocoder · commit afc7bbe46725 · 2025-02-27T14:38:26.000-05:00
diff --git a/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs b/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs
@@ -1,4 +1,5 @@
 using Intersect.Extensions;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationDescriptor.cs
@@ -1,8 +1,7 @@
-﻿using Intersect.Framework.Core.GameObjects.Animations;
-using Intersect.Models;
+﻿using Intersect.Models;
 using Newtonsoft.Json;
 
-namespace Intersect.GameObjects;
+namespace Intersect.Framework.Core.GameObjects.Animations;
 
 public partial class AnimationDescriptor : DatabaseObject<AnimationDescriptor>, IFolderable
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/ClassDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/ClassDescriptor.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.PlayerClass;
 using Intersect.Models;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Items/ItemDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Items/ItemDescriptor.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.GameObjects;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapAnimationAttribute.cs b/Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapAnimationAttribute.cs
@@ -1,4 +1,5 @@
-﻿using Intersect.GameObjects;
+﻿using Intersect.Framework.Core.GameObjects.Animations;
+using Intersect.GameObjects;
 using Intersect.GameObjects.Annotations;
 using Intersect.Localization;
 
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapCritterAttribute.cs b/Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapCritterAttribute.cs
@@ -1,4 +1,5 @@
-﻿using Intersect.GameObjects;
+﻿using Intersect.Framework.Core.GameObjects.Animations;
+using Intersect.GameObjects;
 using Intersect.GameObjects.Annotations;
 using Intersect.Localization;
 
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Maps/MapDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Maps/MapDescriptor.cs
@@ -2,6 +2,7 @@
 using Intersect.Collections;
 using Intersect.Compression;
 using Intersect.Config;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.Serialization;
 using Intersect.GameObjects;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/NPCs/NPCDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/NPCs/NPCDescriptor.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Spells/SpellDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Spells/SpellDescriptor.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Intersect.Client.Core/Entities/Critter.cs b/Intersect.Client.Core/Entities/Critter.cs
@@ -5,6 +5,7 @@
 using Intersect.Client.Maps;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Maps.Attributes;
 using Intersect.GameObjects;
 using Intersect.Utilities;
diff --git a/Intersect.Client.Core/Entities/Projectiles/Projectile.cs b/Intersect.Client.Core/Entities/Projectiles/Projectile.cs
@@ -2,6 +2,7 @@
 using Intersect.Client.General;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.Framework.Core.GameObjects.Maps.Attributes;
 using Intersect.GameObjects;
diff --git a/Intersect.Client.Core/Entities/Projectiles/ProjectileSpawns.cs b/Intersect.Client.Core/Entities/Projectiles/ProjectileSpawns.cs
@@ -1,5 +1,6 @@
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
 using Intersect.Utilities;
 
diff --git a/Intersect.Client.Core/Maps/WeatherParticle.cs b/Intersect.Client.Core/Maps/WeatherParticle.cs
@@ -5,6 +5,7 @@
 using Intersect.Client.General;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
 using Intersect.Utilities;
 
diff --git a/Intersect.Client.Framework/Entities/IAnimation.cs b/Intersect.Client.Framework/Entities/IAnimation.cs
@@ -1,5 +1,6 @@
 using Intersect.GameObjects;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 
 namespace Intersect.Client.Framework.Entities;
 
diff --git a/Intersect.Editor/Core/Graphics.cs b/Intersect.Editor/Core/Graphics.cs
@@ -8,6 +8,7 @@
 using Intersect.Editor.Maps;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Mapping.Tilesets;
 using Intersect.Framework.Core.GameObjects.Maps;
diff --git a/Intersect.Editor/Entities/Animation.cs b/Intersect.Editor/Entities/Animation.cs
@@ -1,5 +1,6 @@
 ﻿using Intersect.Editor.Content;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
 using Intersect.Utilities;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs b/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs
@@ -4,6 +4,7 @@
 using Intersect.Editor.General;
 using Intersect.Editor.Localization;
 using Intersect.Enums;
+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;
diff --git a/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs b/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs
@@ -2,6 +2,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Maps;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Events.Commands;
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_PlayAnimation.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_PlayAnimation.cs
@@ -1,6 +1,7 @@
 using Intersect.Editor.Forms.Helpers;
 using Intersect.Editor.Localization;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Events.Commands;
 using Intersect.Framework.Core.GameObjects.Maps;
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/Event_MoveRouteAnimationSelector.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/Event_MoveRouteAnimationSelector.cs
@@ -1,4 +1,5 @@
 ﻿using Intersect.Editor.Localization;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.GameObjects;
 
diff --git a/Intersect.Editor/Forms/Editors/Events/frmEvent.cs b/Intersect.Editor/Forms/Editors/Events/frmEvent.cs
@@ -7,6 +7,7 @@
 using Intersect.Editor.Maps;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Events.Commands;
 using Intersect.Framework.Core.GameObjects.Maps;
diff --git a/Intersect.Editor/Forms/Editors/frmAnimation.cs b/Intersect.Editor/Forms/Editors/frmAnimation.cs
@@ -7,6 +7,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
 using Intersect.Utilities;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/Intersect.Editor/Forms/Editors/frmClass.cs b/Intersect.Editor/Forms/Editors/frmClass.cs
@@ -5,6 +5,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
 using Intersect.Framework.Core.GameObjects.PlayerClass;
diff --git a/Intersect.Editor/Forms/Editors/frmItem.cs b/Intersect.Editor/Forms/Editors/frmItem.cs
@@ -6,6 +6,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.GameObjects;
diff --git a/Intersect.Editor/Forms/Editors/frmNpc.cs b/Intersect.Editor/Forms/Editors/frmNpc.cs
@@ -7,6 +7,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.Framework.Core.GameObjects.NPCs;
diff --git a/Intersect.Editor/Forms/Editors/frmProjectile.cs b/Intersect.Editor/Forms/Editors/frmProjectile.cs
@@ -5,6 +5,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.GameObjects;
 using Graphics = System.Drawing.Graphics;
diff --git a/Intersect.Editor/Forms/Editors/frmResource.cs b/Intersect.Editor/Forms/Editors/frmResource.cs
@@ -6,6 +6,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.Framework.Core.GameObjects.Resources;
diff --git a/Intersect.Editor/Forms/Editors/frmSpell.cs b/Intersect.Editor/Forms/Editors/frmSpell.cs
@@ -6,6 +6,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
 using Intersect.Framework.Core.GameObjects.Maps.MapList;
diff --git a/Intersect.Editor/Maps/MapInstance.cs b/Intersect.Editor/Maps/MapInstance.cs
@@ -4,6 +4,7 @@
 using Intersect.Editor.Core;
 using Intersect.Editor.Entities;
 using Intersect.Editor.General;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.GameObjects;
diff --git a/Intersect.Editor/Maps/MapProperties.cs b/Intersect.Editor/Maps/MapProperties.cs
@@ -3,6 +3,7 @@
 using Intersect.Editor.General;
 using Intersect.Editor.Localization;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Maps;
 using Intersect.GameObjects;
 using Intersect.Utilities;
diff --git a/Intersect.Editor/Networking/PacketHandler.cs b/Intersect.Editor/Networking/PacketHandler.cs
@@ -5,6 +5,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Editor.Maps;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Intersect.Server.Core/Database/DbInterface.cs b/Intersect.Server.Core/Database/DbInterface.cs
@@ -10,6 +10,7 @@
 using Intersect.Config;
 using Intersect.Core;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Intersect.Server.Core/Database/GameData/GameContext.cs b/Intersect.Server.Core/Database/GameData/GameContext.cs
@@ -1,4 +1,5 @@
 using Intersect.Extensions;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Intersect.Server.Core/Database/GameData/IGameContext.cs b/Intersect.Server.Core/Database/GameData/IGameContext.cs
@@ -1,3 +1,4 @@
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
diff --git a/Intersect.Server.Core/Entities/Events/EventPageInstance.cs b/Intersect.Server.Core/Entities/Events/EventPageInstance.cs
@@ -1,5 +1,6 @@
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.GameObjects;
 using Intersect.Network.Packets.Server;
diff --git a/Intersect.Server/Networking/NetworkedPacketHandler.cs b/Intersect.Server/Networking/NetworkedPacketHandler.cs
@@ -1,6 +1,7 @@
 using Intersect.Core;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Intersect.Extensions;`
	`2`	`+using Intersect.Framework.Core.GameObjects.Animations;`
`2`	`3`	`using Intersect.Framework.Core.GameObjects.Crafting;`
`3`	`4`	`using Intersect.Framework.Core.GameObjects.Events;`
`4`	`5`	`using Intersect.Framework.Core.GameObjects.Items;`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-using Intersect.Framework.Core.GameObjects.Animations;`
`2`		`-using Intersect.Models;`
	`1`	`+using Intersect.Models;`
`3`	`2`	`using Newtonsoft.Json;`
`4`	`3`
`5`		`-namespace Intersect.GameObjects;`
	`4`	`+namespace Intersect.Framework.Core.GameObjects.Animations;`
`6`	`5`
`7`	`6`	`public partial class AnimationDescriptor : DatabaseObject<AnimationDescriptor>, IFolderable`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.ComponentModel.DataAnnotations.Schema;`
	`2`	`+using Intersect.Framework.Core.GameObjects.Animations;`
`2`	`3`	`using Intersect.Framework.Core.GameObjects.Conditions;`
`3`	`4`	`using Intersect.Framework.Core.GameObjects.Events;`
`4`	`5`	`using Intersect.Framework.Core.GameObjects.Items;`