update namespaces for conditions

pandinocoder · pandinocoder · commit a053903475c1 · 2025-02-27T11:59:32.000-05:00
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionListsSerializer.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionListsSerializer.cs
@@ -1,7 +1,7 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Intersect.GameObjects.Conditions;
+namespace Intersect.Framework.Core.GameObjects.Conditions;
 
 public partial class ConditionListsSerializer : JsonConverter
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/AccessIsCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/AccessIsCondition.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class AccessIsCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/BooleanVariableComparison.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/BooleanVariableComparison.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class BooleanVariableComparison : VariableComparison
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/CanStartQuestCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/CanStartQuestCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class CanStartQuestCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/CheckEquippedSlot.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/CheckEquippedSlot.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class CheckEquippedSlot : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/ClassIsCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/ClassIsCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class ClassIsCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/GenderIsCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/GenderIsCondition.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class GenderIsCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/HasFreeInventorySlots.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/HasFreeInventorySlots.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 /// <summary>
 /// Defines the condition class used when checking for a player's free inventory slots.
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/HasItemCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/HasItemCondition.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class HasItemCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/InGuildWithRank.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/InGuildWithRank.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 /// <summary>
 /// Defines the condition class used when checking whether a player is in a guild with at least a specified rank
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/IntegerVariableComparison.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/IntegerVariableComparison.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class IntegerVariableComparison : VariableComparison
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/IsItemEquippedCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/IsItemEquippedCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class IsItemEquippedCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/KnowsSpellCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/KnowsSpellCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class KnowsSpellCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/LevelOrStatCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/LevelOrStatCondition.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class LevelOrStatCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/MapIsCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/MapIsCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class MapIsCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/MapZoneTypeIs.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/MapZoneTypeIs.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 /// <summary>
 /// Defines the condition class used when checking whether a player is on a specific map zone type.
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/NoNpcsOnMapCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/NoNpcsOnMapCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class NoNpcsOnMapCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/QuestCompletedCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/QuestCompletedCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class QuestCompletedCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/QuestInProgressCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/QuestInProgressCondition.cs
@@ -1,4 +1,6 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿using Intersect.GameObjects;
+
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class QuestInProgressCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/SelfSwitchCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/SelfSwitchCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class SelfSwitchCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/StringVariableComparison.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/StringVariableComparison.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class StringVariableComparison : VariableComparison
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/TimeBetweenCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/TimeBetweenCondition.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class TimeBetweenCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/VariableComparison.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/VariableComparison.cs
@@ -1,4 +1,4 @@
-﻿namespace Intersect.GameObjects.Events;
+﻿namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class VariableComparison
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/VariableIsCondition.cs b/Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionMetadata/VariableIsCondition.cs
@@ -1,6 +1,6 @@
 ﻿using Intersect.Enums;
 
-namespace Intersect.GameObjects.Events;
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 
 public partial class VariableIsCondition : Condition
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Events/Commands/ConditionalBranchCommand.cs b/Framework/Intersect.Framework.Core/GameObjects/Events/Commands/ConditionalBranchCommand.cs
@@ -1,4 +1,6 @@
-﻿namespace Intersect.GameObjects.Events.Commands;
+﻿using Intersect.Framework.Core.GameObjects.Conditions;
+
+namespace Intersect.GameObjects.Events.Commands;
 
 public partial class ConditionalBranchCommand : EventCommand
 {
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Events/EventPage.cs b/Framework/Intersect.Framework.Core/GameObjects/Events/EventPage.cs
@@ -1,5 +1,5 @@
 ﻿using Intersect.Enums;
-using Intersect.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.GameObjects.Events.Commands;
 using Newtonsoft.Json;
 
diff --git a/Framework/Intersect.Framework.Core/GameObjects/ItemBase.cs b/Framework/Intersect.Framework.Core/GameObjects/ItemBase.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Intersect.Enums;
-using Intersect.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.GameObjects.Events;
 using Intersect.GameObjects.Ranges;
 using Intersect.Models;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/NpcBase.cs b/Framework/Intersect.Framework.Core/GameObjects/NpcBase.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
-using Intersect.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.GameObjects.Events;
 using Intersect.Models;
 using Intersect.Utilities;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/QuestBase.cs b/Framework/Intersect.Framework.Core/GameObjects/QuestBase.cs
@@ -1,7 +1,7 @@
 ﻿using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.Serialization;
-using Intersect.GameObjects.Conditions;
 using Intersect.GameObjects.Events;
 using Intersect.Localization;
 using Intersect.Models;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/ResourceBase.cs b/Framework/Intersect.Framework.Core/GameObjects/ResourceBase.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
-using Intersect.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.GameObjects.Events;
 using Intersect.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/SpellBase.cs b/Framework/Intersect.Framework.Core/GameObjects/SpellBase.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Enums;
-using Intersect.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.GameObjects.Events;
 using Intersect.Models;
 using Intersect.Utilities;
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ConditionalBranch.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ConditionalBranch.cs
@@ -1,5 +1,7 @@
 using Intersect.Editor.Localization;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.GameObjects;
 using Intersect.GameObjects.Events;
diff --git a/Intersect.Editor/Forms/Editors/frmDynamicRequirements.cs b/Intersect.Editor/Forms/Editors/frmDynamicRequirements.cs
@@ -1,7 +1,8 @@
 ﻿using Intersect.Editor.Core;
 using Intersect.Editor.Forms.Editors.Events.Event_Commands;
 using Intersect.Editor.Localization;
-using Intersect.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.GameObjects.Events;
 
 namespace Intersect.Editor.Forms.Editors;
diff --git a/Intersect.Editor/Localization/Strings.cs b/Intersect.Editor/Localization/Strings.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.Framework.Reflection;
 using Intersect.GameObjects;
diff --git a/Intersect.Server.Core/Database/GameData/Migrations/Beta6Migration.cs b/Intersect.Server.Core/Database/GameData/Migrations/Beta6Migration.cs
@@ -1,5 +1,7 @@
 ﻿using System.IO.Compression;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.Serialization;
 using Intersect.GameObjects.Events;
 using Intersect.GameObjects.Events.Commands;
diff --git a/Intersect.Server.Core/Entities/Events/ConditionHandlerRegistry.cs b/Intersect.Server.Core/Entities/Events/ConditionHandlerRegistry.cs
@@ -1,6 +1,7 @@
 using Intersect.GameObjects;
 using Intersect.GameObjects.Events;
 using System.Reflection;
+using Intersect.Framework.Core.GameObjects.Conditions;
 
 namespace Intersect.Server.Entities.Events;
 
diff --git a/Intersect.Server.Core/Entities/Events/Conditions.cs b/Intersect.Server.Core/Entities/Events/Conditions.cs
@@ -1,7 +1,8 @@
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Conditions;
+using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.GameObjects;
-using Intersect.GameObjects.Conditions;
 using Intersect.GameObjects.Events;
 using Intersect.Server.General;
 using Intersect.Server.Maps;
diff --git a/Intersect.Server.Core/Entities/Events/VariableCheckHandlerRegistry.cs b/Intersect.Server.Core/Entities/Events/VariableCheckHandlerRegistry.cs
@@ -1,5 +1,6 @@
 using Intersect.GameObjects.Events;
 using System.Reflection;
+using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.GameObjects.Variables;
 
 namespace Intersect.Server.Entities.Events;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`	`2`	`using Newtonsoft.Json.Linq;`
`3`	`3`
`4`		`-namespace Intersect.GameObjects.Conditions;`
	`4`	`+namespace Intersect.Framework.Core.GameObjects.Conditions;`
`5`	`5`
`6`	`6`	`public partial class ConditionListsSerializer : JsonConverter`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Intersect.Enums;`
`2`	`2`
`3`		`-namespace Intersect.GameObjects.Events;`
	`3`	`+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;`
`4`	`4`
`5`	`5`	`public partial class AccessIsCondition : Condition`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Intersect.GameObjects.Events;`
	`1`	`+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;`
`2`	`2`
`3`	`3`	`public partial class CanStartQuestCondition : Condition`
`4`	`4`	`{`