feat: added in between to static numeric variable comparison

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

@@ -1,4 +1,3 @@
-using Intersect.Enums;
 using Intersect.Framework.Core.GameObjects.Events;
 
 namespace Intersect.Framework.Core.GameObjects.Conditions.ConditionMetadata;
@@ -13,5 +12,7 @@ public partial class IntegerVariableComparison : VariableComparison
 
     public long Value { get; set; }
 
+    public long MaxValue { get; set; }
+
     public bool TimeSystem { get; set; }
 }

Framework/Intersect.Framework.Core/GameObjects/Events/VariableComparator.cs

@@ -13,4 +13,6 @@ public enum VariableComparator
     Less,
 
     NotEqual,
+
+    Between,
 }

Intersect.Editor/Forms/Editors/Events/Event Commands/Conditions/ConditionControl_PlayerStat.cs

@@ -27,10 +27,7 @@ public void InitLocalization()
         }
 
         cmbLevelComparator.Items.Clear();
-        for (var i = 0; i < Strings.EventConditional.comparators.Count; i++)
-        {
-            cmbLevelComparator.Items.Add(Strings.EventConditional.comparators[i]);
-        }
+        cmbLevelComparator.Items.AddRange(Strings.EventConditional.comparators.Values.ToArray());
 
         chkStatIgnoreBuffs.Text = Strings.EventConditional.ignorestatbuffs;
     }

Intersect.Editor/Forms/Editors/Events/Event Commands/Conditions/ConditionControl_Variable.cs

@@ -18,6 +18,9 @@ public ConditionControl_Variable(EventCommandConditionalBranch parent)
 
         nudVariableValue.Minimum = long.MinValue;
         nudVariableValue.Maximum = long.MaxValue;
+        nudVariableMaxValue.Minimum = long.MinValue;
+        nudVariableMaxValue.Maximum = long.MaxValue;
+
         InitLocalization();
     }
 
@@ -41,11 +44,7 @@ public void InitLocalization()
         rdoVarCompareGuildVar.Text = Strings.EventConditional.guildvariablevalue;
         rdoVarCompareUserVar.Text = Strings.EventConditional.UserVariableValue;
         cmbNumericComparitor.Items.Clear();
-        for (var i = 0; i < Strings.EventConditional.comparators.Count; i++)
-        {
-            cmbNumericComparitor.Items.Add(Strings.EventConditional.comparators[i]);
-        }
-
+        cmbNumericComparitor.Items.AddRange(Strings.EventConditional.comparators.Values.ToArray());
         cmbNumericComparitor.SelectedIndex = 0;
 
         //Boolean Variable
@@ -359,6 +358,7 @@ private void TryLoadVariableIntegerComparison(VariableComparison comparison)
         {
             rdoVarCompareStaticValue.Checked = true;
             nudVariableValue.Value = integerComparison.Value;
+            nudVariableMaxValue.Value = integerComparison.MaxValue;
         }
 
         UpdateNumericVariableElements();
@@ -435,6 +435,10 @@ private IntegerVariableComparison GetNumericVariableComparison()
         if (rdoVarCompareStaticValue.Checked)
         {
             comparison.Value = (long)nudVariableValue.Value;
+            if (comparison.Comparator == VariableComparator.Between)
+            {
+                comparison.MaxValue = (long)nudVariableMaxValue.Value;
+            }
         }
         else if (rdoVarCompareGlobalVar.Checked)
         {
@@ -483,10 +487,23 @@ private StringVariableComparison GetStringVariableComparison()
     private void UpdateNumericVariableElements()
     {
         nudVariableValue.Enabled = rdoVarCompareStaticValue.Checked;
+        nudVariableMaxValue.Enabled = 
+            rdoVarCompareStaticValue.Checked &&
+            cmbNumericComparitor.SelectedIndex == (int)VariableComparator.Between;
+
+        var isBetween = 
+            rdoVarCompareStaticValue.Checked &&
+            cmbNumericComparitor.SelectedIndex == (int)VariableComparator.Between;
+
+        rdoVarComparePlayerVar.Enabled = rdoVarComparePlayerVar.Checked || !isBetween;
         cmbComparePlayerVar.Enabled = rdoVarComparePlayerVar.Checked;
+        rdoVarCompareGlobalVar.Enabled = rdoVarCompareGlobalVar.Checked || !isBetween;
         cmbCompareGlobalVar.Enabled = rdoVarCompareGlobalVar.Checked;
+        rdoVarCompareGuildVar.Enabled = rdoVarCompareGuildVar.Checked || !isBetween;
         cmbCompareGuildVar.Enabled = rdoVarCompareGuildVar.Checked;
+        rdoVarCompareUserVar.Enabled = rdoVarCompareUserVar.Checked || !isBetween;
         cmbCompareUserVar.Enabled = rdoVarCompareUserVar.Checked;
+        rdoTimeSystem.Enabled = rdoTimeSystem.Checked || !isBetween;
     }
 
     #endregion
@@ -588,5 +605,15 @@ private void lblStringTextVariables_Click(object sender, EventArgs e)
         BrowserUtils.Open("http://www.ascensiongamedev.com/community/topic/749-event-text-variables/");
     }
 
+    private void cmbNumericComparitor_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        if (cmbNumericComparitor.SelectedIndex == (int)VariableComparator.Between && !rdoVarCompareStaticValue.Checked)
+        {
+            rdoVarCompareStaticValue.Checked = true;
+        }
+
+        UpdateNumericVariableElements();
+    }
+
     #endregion
 }

Intersect.Editor/Localization/Strings.cs

@@ -479,6 +479,10 @@ public static string GetVariableComparisonString(IntegerVariableComparison compa
             case VariableComparator.NotEqual:
                 pVar = EventConditionDesc.notequal.ToString(value);
 
+                break;
+            case VariableComparator.Between:
+                pVar = EventConditionDesc.Between.ToString(value, comparison.MaxValue);
+
                 break;
         }
 
@@ -2457,14 +2461,15 @@ public partial struct EventConditional
             {1, @"Contains"}
         };
 
-        public static Dictionary<int, LocalizedString> comparators = new Dictionary<int, LocalizedString>
+        public static Dictionary<VariableComparator, LocalizedString> comparators = new()
         {
-            {0, @"Equal To"},
-            {1, @"Greater Than or Equal To"},
-            {2, @"Less Than or Equal To"},
-            {3, @"Greater Than"},
-            {4, @"Less Than"},
-            {5, @"Does Not Equal"}
+            {VariableComparator.Equal, @"Equal To"},
+            {VariableComparator.GreaterOrEqual, @"Greater Than or Equal To"},
+            {VariableComparator.LesserOrEqual, @"Less Than or Equal To"},
+            {VariableComparator.Greater, @"Greater Than"},
+            {VariableComparator.Less, @"Less Than"},
+            {VariableComparator.NotEqual, @"Does Not Equal"},
+            {VariableComparator.Between, @"Between"},
         };
 
         public static Dictionary<ConditionType, LocalizedString> conditions = new Dictionary<ConditionType, LocalizedString>
@@ -2663,6 +2668,8 @@ public partial struct EventConditionDesc
 
         public static LocalizedString beforetask = @", Before Task: {00}";
 
+        public static LocalizedString Between = @"between {00} and {01}";
+
         public static LocalizedString checkequippedslot = @"Player has slot {00} occupied";
 
         public static LocalizedString Class = @"Player's class is {00}";

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

@@ -691,6 +691,13 @@ Event instance
                     return true;
                 }
 
+                break;
+            case VariableComparator.Between:
+                if (varVal >= comparison.Value && varVal <= comparison.MaxValue)
+                {
+                    return true;
+                }
+
                 break;
         }