暂存4

Source/WulaFallenEmpire/EventSystem/Condition.cs

@@ -12,6 +12,7 @@ namespace WulaFallenEmpire
     {
         public string name;
         public string value;
+        public string valueVariableName;
 
         public override bool IsMet(out string reason)
         {
@@ -22,11 +23,21 @@ namespace WulaFallenEmpire
                 return false;
             }
 
-            // Simple string comparison for now. Can be expanded.
-            bool met = variable.ToString() == value;
+            string compareValue = value;
+            if (!string.IsNullOrEmpty(valueVariableName))
+            {
+                compareValue = EventContext.GetVariable<object>(valueVariableName)?.ToString();
+                if (compareValue == null)
+                {
+                    reason = $"Comparison variable '{valueVariableName}' not set.";
+                    return false;
+                }
+            }
+
+            bool met = variable.ToString() == compareValue;
             if (!met)
             {
-                reason = $"Requires {name} = {value} (Current: {variable})";
+                reason = $"Requires {name} = {compareValue} (Current: {variable})";
             }
             else
             {
@@ -35,25 +46,40 @@ namespace WulaFallenEmpire
             return met;
         }
     }
-    
-    public class Condition_VariableGreaterThan : Condition
+
+    public abstract class Condition_CompareVariable : Condition
     {
         public string name;
         public float value;
+        public string valueVariableName;
+
+        protected abstract bool Compare(float var1, float var2);
+        protected abstract string GetOperatorString();
 
         public override bool IsMet(out string reason)
         {
-            float variable = EventContext.GetVariable<float>(name, float.MinValue);
-            if (variable == float.MinValue)
+            float variable = EventContext.GetVariable<float>(name, float.NaN);
+            if (float.IsNaN(variable))
             {
-                reason = $"Variable '{name}' not set.";
+                reason = $"Variable '{name}' not set or not a number.";
                 return false;
             }
 
-            bool met = variable > value;
+            float compareValue = value;
+            if (!string.IsNullOrEmpty(valueVariableName))
+            {
+                compareValue = EventContext.GetVariable<float>(valueVariableName, float.NaN);
+                if (float.IsNaN(compareValue))
+                {
+                    reason = $"Comparison variable '{valueVariableName}' not set or not a number.";
+                    return false;
+                }
+            }
+
+            bool met = Compare(variable, compareValue);
             if (!met)
             {
-                reason = $"Requires {name} > {value} (Current: {variable})";
+                reason = $"Requires {name} {GetOperatorString()} {compareValue} (Current: {variable})";
             }
             else
             {
@@ -63,4 +89,27 @@ namespace WulaFallenEmpire
         }
     }
 
+    public class Condition_VariableGreaterThan : Condition_CompareVariable
+    {
+        protected override bool Compare(float var1, float var2) => var1 > var2;
+        protected override string GetOperatorString() => ">";
+    }
+
+    public class Condition_VariableLessThan : Condition_CompareVariable
+    {
+        protected override bool Compare(float var1, float var2) => var1 < var2;
+        protected override string GetOperatorString() => "<";
+    }
+
+    public class Condition_VariableGreaterThanOrEqual : Condition_CompareVariable
+    {
+        protected override bool Compare(float var1, float var2) => var1 >= var2;
+        protected override string GetOperatorString() => ">=";
+    }
+
+    public class Condition_VariableLessThanOrEqual : Condition_CompareVariable
+    {
+        protected override bool Compare(float var1, float var2) => var1 <= var2;
+        protected override string GetOperatorString() => "<=";
+    }
 }