feat: is on combat condition (AscensionGameDev#2653)

* feat: is on combat condition

* rename enum

* rename strings

Author: WeylonSantana

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

@@ -0,0 +1,6 @@
+namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
+
+public partial class CombatCondition : Condition
+{
+    public override ConditionType Type { get; } = ConditionType.IsInCombat;
+}

Framework/Intersect.Framework.Core/GameObjects/Conditions/ConditionType.cs

@@ -39,4 +39,6 @@ public enum ConditionType
     MapZoneTypeIs,
 
     CheckEquipment,
+
+    IsInCombat,
 }

Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ConditionalBranch.cs

@@ -96,7 +96,7 @@ ConditionalBranchCommand command
         var typeIndex = 0;
         foreach (var item in Strings.EventConditional.conditions)
         {
-            if (item.Key == (int)Condition.Type)
+            if (item.Key == Condition.Type)
             {
                 cmbConditionType.SelectedIndex = typeIndex;
                 break;
@@ -228,6 +228,9 @@ private void UpdateFormElements(ConditionType type)
                 _variableControl.Show();
                 break;
 
+            case ConditionType.IsInCombat:
+                break;
+
             default:
                 throw new ArgumentOutOfRangeException();
         }
@@ -313,6 +316,9 @@ private void SetupFormValues(dynamic condition)
                 _variableControl.SetupFormValues(variableIsCondition);
                 break;
 
+            case CombatCondition _:
+                break;
+
             default:
                 throw new ArgumentOutOfRangeException();
         }
@@ -398,6 +404,9 @@ private void SaveFormValues(dynamic condition)
                 _variableControl.SaveFormValues(variableIsCondition);
                 break;
 
+            case CombatCondition _:
+                break;
+
             default:
                 throw new ArgumentOutOfRangeException();
         }
@@ -438,7 +447,7 @@ private void btnCancel_Click(object sender, EventArgs e)
     private void cmbConditionType_SelectedIndexChanged(object sender, EventArgs e)
     {
         var type = Strings.EventConditional.conditions.FirstOrDefault(x => x.Value == cmbConditionType.Text).Key;
-        if (type < 4)
+        if (type < ConditionType.HasItem)
         {
             type = 0;
         }
@@ -518,7 +527,6 @@ private void cmbConditionType_SelectedIndexChanged(object sender, EventArgs e)
                     Condition = new SelfSwitchCondition();
                     break;
 
-
                 case ConditionType.VariableIs:
                     Condition = new VariableIsCondition();
                     SetupFormValues(Condition);
@@ -528,6 +536,10 @@ private void cmbConditionType_SelectedIndexChanged(object sender, EventArgs e)
                     Condition = new TimeBetweenCondition();
                     break;
 
+                case ConditionType.IsInCombat:
+                    Condition = new CombatCondition();
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException();
             }

Intersect.Editor/Localization/Strings.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using Intersect.Enums;
+using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.GameObjects.Events;
 using Intersect.Framework.Core.GameObjects.Items;
@@ -364,6 +365,11 @@ public static string GetEventConditionalDesc(CheckEquippedSlot condition)
         return EventConditionDesc.checkequippedslot.ToString(condition.Name);
     }
 
+    public static string GetEventConditionalDesc(CombatCondition condition)
+    {
+        return EventConditionDesc.Combat.ToString();
+    }
+
     public static string GetVariableComparisonString(VariableComparison comparison)
     {
         return "";
@@ -2461,27 +2467,28 @@ public partial struct EventConditional
             {5, @"Does Not Equal"}
         };
 
-        public static Dictionary<int, LocalizedString> conditions = new Dictionary<int, LocalizedString>
+        public static Dictionary<ConditionType, LocalizedString> conditions = new Dictionary<ConditionType, LocalizedString>
         {
-            {0, @"Variable Is..."},
-            {4, @"Has item..."},
-            {5, @"Class is..."},
-            {6, @"Knows spell..."},
-            {7, @"Level or Stat is..."},
-            {8, @"Self Switch is..."},
-            {9, @"Power level is..."},
-            {10, @"Time is between..."},
-            {11, @"Can Start Quest..."},
-            {12, @"Quest In Progress..."},
-            {13, @"Quest Completed..."},
-            {14, @"No NPCs on Map..."},
-            {15, @"Gender is..."},
-            {16, @"Map is..."},
-            {17, @"Item Equipped is..."},
-            {18, @"Has X free Inventory slots..." },
-            {19, @"In Guild With At Least Rank..." },
-            {20, @"Map Zone Type is..." },
-            {21, @"Check Equipped Slot..." },
+            {ConditionType.VariableIs, @"Variable Is..."},
+            {ConditionType.HasItem, @"Has item..."},
+            {ConditionType.ClassIs, @"Class is..."},
+            {ConditionType.KnowsSpell, @"Knows spell..."},
+            {ConditionType.LevelOrStat, @"Level or Stat is..."},
+            {ConditionType.SelfSwitch, @"Self Switch is..."},
+            {ConditionType.AccessIs, @"Power level is..."},
+            {ConditionType.TimeBetween, @"Time is between..."},
+            {ConditionType.CanStartQuest, @"Can Start Quest..."},
+            {ConditionType.QuestInProgress, @"Quest In Progress..."},
+            {ConditionType.QuestCompleted, @"Quest Completed..."},
+            {ConditionType.NoNpcsOnMap, @"No NPCs on Map..."},
+            {ConditionType.GenderIs, @"Gender is..."},
+            {ConditionType.MapIs, @"Map is..."},
+            {ConditionType.IsItemEquipped, @"Item Equipped is..."},
+            {ConditionType.HasFreeInventorySlots, @"Has X free Inventory slots..." },
+            {ConditionType.InGuildWithRank, @"In Guild With At Least Rank..." },
+            {ConditionType.MapZoneTypeIs, @"Map Zone Type is..." },
+            {ConditionType.CheckEquipment, @"Check Equipped Slot..." },
+            {ConditionType.IsInCombat, @"Is in Combat" },
         };
 
         public static LocalizedString endrange = @"End Range:";
@@ -2660,6 +2667,8 @@ public partial struct EventConditionDesc
 
         public static LocalizedString Class = @"Player's class is {00}";
 
+        public static LocalizedString Combat = @"Is in Combat";
+
         public static LocalizedString contains = @"contains {00}";
 
         public static LocalizedString equal = @"is equal to {00}";

Intersect.Server.Core/Entities/Events/Conditions.cs

@@ -1,4 +1,5 @@
 using Intersect.Enums;
+using Intersect.Framework.Core;
 using Intersect.Framework.Core.GameObjects.Conditions;
 using Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
 using Intersect.Framework.Core.GameObjects.Events;
@@ -511,6 +512,15 @@ public static bool MeetsCondition(
         return player.Map?.ZoneType == condition.ZoneType;
     }
 
+    public static bool MeetsCondition(
+        CombatCondition condition,
+        Player player,
+        Event eventInstance,
+        QuestDescriptor questDescriptor)
+    {
+        return player.CombatTimer > Timing.Global.Milliseconds;
+    }
+
     //Variable Comparison Processing
 
     public static bool CheckVariableComparison(