fixed EnumArgument.cs error, other smaller changes

Author: Elektryk-Andrzej

ArgumentSystem/Arguments/EnumArgument.cs

@@ -33,18 +33,18 @@ public static TryGet<T> Convert<T>(BaseToken token, Script script) where T : str
     {
         if (Convert(token, script, typeof(T)).HasErrored(out var error, out var value))
         {
-            return (T)value;
+            return error;
         }
 
-        return error;
+        return (T)value;
     }
 
     public static TryGet<object> Convert(BaseToken token, Script script, Type enumType)
     {
         var stringRep = token.GetBestTextRepresentation(script);
-        if (!Enum.IsDefined(enumType, stringRep))
+        if (Enum.TryParse(stringRep, true, out TEnum result))
         {
-            return Enum.Parse(enumType, stringRep);
+            return result;
         }
 
         return $"Value '{token.RawRepresentation}' does not represent a valid {enumType.GetAccurateName()} " +

ArgumentSystem/Arguments/FloatArgument.cs

@@ -32,22 +32,22 @@ public override string InputDescription
         {
             if (_minValue.HasValue && _maxValue.HasValue)
             {
-                return $"Value must be at least {_minValue} and most {_maxValue} e.g. " +
+                return $"A number which is at least {_minValue} and most {_maxValue} e.g. " +
                        $"{Math.Round(Random.Range(_minValue.Value, _maxValue.Value), 2)}";
             }
 
             if (_minValue.HasValue)
             {
-                return $"Value must be at least {_minValue} e.g. {_minValue + 2f}";
+                return $"A number which is at least {_minValue} e.g. {_minValue + 2f}";
             }
 
             // ReSharper disable once ConvertIfStatementToReturnStatement
             if (_maxValue.HasValue)
             {
-                return $"Value must be at most {_maxValue} e.g. {_maxValue - 2f}";
+                return $"A number which is at most {_maxValue} e.g. {_maxValue - 2f}";
             }
 
-            throw new AndrzejFuckedUpException();
+            return "Any number e.g. 2.5";
         }
     }
 

ArgumentSystem/MethodArgumentDispatcher.cs

@@ -25,9 +25,9 @@ public DynamicTryGet Invoke(BaseToken token, Argument arg)
             {
                 return (DynamicTryGet)Method.Invoke(arg, [token]);
             }
-            catch (TargetInvocationException)
+            catch (TargetInvocationException ex)
             {
-                return DynamicTryGet.Error($"Evaluation system of {arg.Name} has failed. Report this to the plugin developer.");
+                return DynamicTryGet.Error($"This error is not an expected one, report it to the developers. {ex.InnerException?.Message} {ex.InnerException?.StackTrace}");
             }
         }
     }

ContextSystem/Contexts/Control/ElifStatementContext.cs

@@ -40,10 +40,9 @@ public override Result VerifyCurrentState()
 
     protected override IEnumerator<float> Execute()
     {
-        if (ExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var result))
+        if (NumericExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var result))
         {
             throw new ScriptErrorException($"'elif' statement condition error: {error}");
-            yield break;
         }
 
         if (!result)

ContextSystem/Contexts/Control/IfStatementContext.cs

@@ -36,7 +36,7 @@ public override Result VerifyCurrentState()
 
     protected override IEnumerator<float> Execute()
     {
-        if (ExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var result))
+        if (NumericExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var result))
         {
             throw new ScriptErrorException($"'if' statement condition error: {error}");
         }

ContextSystem/Contexts/Control/Loops/WhileLoopContext.cs

@@ -42,7 +42,7 @@ public override Result VerifyCurrentState()
 
     protected override IEnumerator<float> Execute()
     {
-        if (ExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var condition))
+        if (NumericExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var condition))
         {
             throw new ScriptErrorException(error);
         }
@@ -64,7 +64,7 @@ protected override IEnumerator<float> Execute()
                 break;
             }
 
-            if (ExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error2, out condition))
+            if (NumericExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error2, out condition))
             {
                 throw new ScriptErrorException(error2);
             }

ContextSystem/Contexts/VariableDefinition/LiteralVariableDefinitionContext.cs

@@ -143,7 +143,6 @@ protected override void Execute()
             if (_variableFunc().HasErrored(out var error, out var variableToCopy))
             {
                 throw new ScriptErrorException(error);
-                return;
             }
 
             variable = variableToCopy;

Helpers/ExpressionReslover.cs Helpers/NumericExpressionReslover.csHelpers/ExpressionReslover.cs renamed to Helpers/NumericExpressionReslover.cs

@@ -14,7 +14,7 @@
 
 namespace SER.Helpers;
 
-public static class ExpressionReslover
+public static class NumericExpressionReslover
 {
     public static TryGet<object> EvalString(string expression, Script scr)
     {

MethodSystem/Methods/LiteralVariableMethods/EvalMethod.cs

@@ -22,7 +22,7 @@ public class EvalMethod : ReturningMethod
     public override void Execute()
     {
         var value = Args.GetText("value");
-        if (ExpressionReslover.EvalString(value, Script).HasErrored(out var error, out var result))
+        if (NumericExpressionReslover.EvalString(value, Script).HasErrored(out var error, out var result))
         {
             throw new ScriptErrorException(error);
         }

MethodSystem/Methods/MathMethods/RandomNumMethod.cs

@@ -23,7 +23,11 @@ public class RandomNumMethod : ReturningMethod, IAdditionalDescription
     [
         new FloatArgument("startingNum"),
         new FloatArgument("endingNum"),
-        new OptionsArgument("numberType", "int", "real")
+        new OptionsArgument(
+            "numberType", 
+            new("int", "Returns an integer number"), 
+            new("real", "Returns a real number")
+        )
         {
             DefaultValue = "real"
         }