Add enum for condition cancel on flags

Author: Crypto137

src/MHServerEmu.Games/GameData/Prototypes/ConditionPrototype.cs

@@ -1,6 +1,6 @@
-using MHServerEmu.Core;
-using MHServerEmu.Games.GameData.Calligraphy;
+using MHServerEmu.Games.GameData.Calligraphy;
 using MHServerEmu.Games.GameData.Calligraphy.Attributes;
+using MHServerEmu.Games.Powers;
 
 namespace MHServerEmu.Games.GameData.Prototypes
 {
@@ -173,7 +173,7 @@ public class ConditionPrototype : Prototype
         [DoNotCopy]
         public TimeSpan UpdateInterval { get => TimeSpan.FromMilliseconds(UpdateIntervalMS); }
         [DoNotCopy]
-        public UInt32Flags CancelOnFlags { get; private set; } = UInt32Flags.None;
+        public ConditionCancelOnFlags CancelOnFlags { get; private set; } = ConditionCancelOnFlags.None;
 
         public override void PostProcess()
         {
@@ -182,12 +182,12 @@ public override void PostProcess()
             // TODO: stuff
 
             // Combine cancel flags into a single bit field (TODO: flag enum)
-            if (CancelOnHit)                    CancelOnFlags |= UInt32Flags.Flag0;
-            if (CancelOnKilled)                 CancelOnFlags |= UInt32Flags.Flag1;
-            if (CancelOnPowerUse)               CancelOnFlags |= UInt32Flags.Flag2;
-            if (CancelOnPowerUsePost)           CancelOnFlags |= UInt32Flags.Flag3;
-            if (CancelOnTransfer)               CancelOnFlags |= UInt32Flags.Flag4;
-            if (CancelOnIntraRegionTeleport)    CancelOnFlags |= UInt32Flags.Flag5;
+            if (CancelOnHit)                    CancelOnFlags |= ConditionCancelOnFlags.OnHit;
+            if (CancelOnKilled)                 CancelOnFlags |= ConditionCancelOnFlags.OnKilled;
+            if (CancelOnPowerUse)               CancelOnFlags |= ConditionCancelOnFlags.OnPowerUse;
+            if (CancelOnPowerUsePost)           CancelOnFlags |= ConditionCancelOnFlags.OnPowerUsePost;
+            if (CancelOnTransfer)               CancelOnFlags |= ConditionCancelOnFlags.OnTransfer;
+            if (CancelOnIntraRegionTeleport)    CancelOnFlags |= ConditionCancelOnFlags.OnIntraRegionTeleport;
 
             // TODO: more stuff
         }

src/MHServerEmu.Games/Powers/Condition.cs

@@ -1,6 +1,5 @@
 using System.Text;
 using Google.ProtocolBuffers;
-using MHServerEmu.Core;
 using MHServerEmu.Core.Extensions;
 using MHServerEmu.Core.Logging;
 using MHServerEmu.Core.Serialization;
@@ -31,6 +30,18 @@ public enum ConditionSerializationFlags : uint
         HasCancelOnFlags            = 1 << 11,  // cancelOnFalgs from ConditionPrototype
     }
 
+    [Flags]
+    public enum ConditionCancelOnFlags : uint
+    {
+        None                        = 0,
+        OnHit                       = 1 << 0,
+        OnKilled                    = 1 << 1,
+        OnPowerUse                  = 1 << 2,
+        OnPowerUsePost              = 1 << 3,
+        OnTransfer                  = 1 << 4,
+        OnIntraRegionTeleport       = 1 << 5
+    }
+
     public class Condition
     {
         private static readonly Logger Logger = LogManager.CreateLogger();
@@ -53,7 +64,7 @@ public class Condition
         private bool _isEnabled = true;
         private int _updateIntervalMS;                              // milliseconds
         private ReplicatedPropertyCollection _properties = new();
-        private UInt32Flags _cancelOnFlags;
+        private ConditionCancelOnFlags _cancelOnFlags;
 
         private ulong _creatorPlayerId;                             // Player guid
 
@@ -82,7 +93,7 @@ public PrototypeId CreatorPowerPrototypeRef {
         public bool IsEnabled { get => _isEnabled; set => _isEnabled = value; }
         public TimeSpan UpdateInterval { get => TimeSpan.FromMilliseconds(_updateIntervalMS); set => _updateIntervalMS = (int)value.TotalMilliseconds; }
         public ReplicatedPropertyCollection Properties { get => _properties; }
-        public UInt32Flags CancelOnFlags { get => _cancelOnFlags; set => _cancelOnFlags = value; }
+        public ConditionCancelOnFlags CancelOnFlags { get => _cancelOnFlags; set => _cancelOnFlags = value; }
 
         public ulong CreatorPlayerId { get => _creatorPlayerId; set => _creatorPlayerId = value; }
 
@@ -248,7 +259,7 @@ public bool Serialize(Archive archive, WorldEntity owner)
                 {
                     uint cancelOnFlags = 0;
                     success &= Serializer.Transfer(archive, ref cancelOnFlags);
-                    _cancelOnFlags = (UInt32Flags)cancelOnFlags;
+                    _cancelOnFlags = (ConditionCancelOnFlags)cancelOnFlags;
                 }
             }
 
@@ -297,7 +308,7 @@ public void Decode(CodedInputStream stream)
             _properties.Decode(stream);
 
             if (_serializationFlags.HasFlag(ConditionSerializationFlags.HasCancelOnFlags))
-                _cancelOnFlags = (UInt32Flags)stream.ReadRawVarint32();
+                _cancelOnFlags = (ConditionCancelOnFlags)stream.ReadRawVarint32();
         }
 
         public void Encode(CodedOutputStream stream)