change RunReason and improve flags

Author: Elektryk-Andrzej

Code/EventSystem/EventHandler.cs

@@ -145,7 +145,7 @@ private static void OnNonArgumentedEvent(string evName)
                 continue;
             }
 
-            script.Run(RunContext.Event);
+            script.Run(RunReason.Event);
         }
     }
 
@@ -179,7 +179,7 @@ private static void OnArgumentedEvent<T>(string evName, T ev) where T : EventArg
             }
 
             script.AddLocalVariables(variables);
-            var isAllowed = script.RunForEvent(RunContext.Event);
+            var isAllowed = script.RunForEvent(RunReason.Event);
             if (isAllowed.HasValue && ev is ICancellableEvent cancellable1)
                 cancellable1.IsAllowed = isAllowed.Value;
         }
@@ -219,37 +219,12 @@ where value is not null
     private static Variable[] InternalGetVariablesFromProperties(List<(object value, string name, Type type)> properties)
     {
         List<Variable> variables = [];
-        foreach (var (value, name, type) in properties)
+        foreach (var (value, name, _) in properties)
         {
-            switch (value)
-            {
-                case Enum enumValue:
-                    variables.Add(new LiteralVariable<TextValue>(GetName(), new StaticTextValue(enumValue.ToString())));
-                    continue;
-                case Player player:
-                    variables.Add(new PlayerVariable(GetName(), new(player)));
-                    continue;
-                case IEnumerable<Player> players:
-                    variables.Add(new PlayerVariable(GetName(), new(players)));
-                    continue;
-                case null:
-                    if (type == typeof(Player))
-                    {
-                        // todo: wtf is this?
-                        // variables.Add(new PlayerVariable(GetName(), []));
-                    }
-                    continue;
-                default:
-                {
-                    variables.Add(Variable.Create(GetName(), Value.Parse(value, null)));
-                    continue;
-                }
-            }
-
-            string GetName()
-            {
-                return $"ev{name.First().ToString().ToUpper()}{name[1..]}";
-            }
+            variables.Add(Variable.Create(
+                $"ev{name.First().ToString().ToUpper()}{name[1..]}", 
+                Value.Parse(value, null))
+            );
         }
 
         return variables.ToArray();

Code/FlagSystem/Flags/CustomCommandFlag.cs

@@ -158,7 +158,12 @@ public override void Unbind()
 
     public override Result OnScriptRunning(Script scr)
     {
-        if (scr.Context == RunContext.CustomCommand)
+        if (scr.HasFlag<OnEventFlag>())
+        {
+            return $"Detected conflicting flag: {nameof(OnEventFlag)}.";
+        }
+        
+        if (scr.RunReason == RunReason.CustomCommand)
         {
             return true;
         }
@@ -256,7 +261,7 @@ public static Result RunAttachedScript(CustomCommand cmd, ScriptExecutor sender,
             script.AddLocalVariable(new LiteralVariable<TextValue>(name, new StaticTextValue(slice.Value)));
         }
 
-        script.Run(RunContext.CustomCommand);
+        script.Run(RunReason.CustomCommand);
         return true;
     }
 

Code/FlagSystem/Flags/InteractableToyEventFlag.cs

@@ -55,7 +55,7 @@ public static void RunBoundScripts(Player player, InteractableToy interactableTo
             }
 
             script.AddLocalVariables(variables);
-            script.Run(RunContext.Event);
+            script.Run(RunReason.Event);
         }
     }
 }

Code/FlagSystem/Flags/OnEventFlag.cs

@@ -2,6 +2,7 @@
 using SER.Code.Helpers;
 using SER.Code.Helpers.ResultSystem;
 using SER.Code.ScriptSystem;
+using SER.Code.ScriptSystem.Structures;
 using EventHandler = SER.Code.EventSystem.EventHandler;
 
 namespace SER.Code.FlagSystem.Flags;
@@ -41,7 +42,12 @@ public class OnEventFlag : Flag
 
     public override Result OnScriptRunning(Script scr)
     {
-        if (scr.Context == RunContext.Event)
+        if (scr.HasFlag<CustomCommandFlag>())
+        {
+            return $"Detected conflicting flag: {nameof(CustomCommandFlag)}.";
+        }
+        
+        if (scr.RunReason == RunReason.Event)
         {
             return true;
         }

Code/MethodSystem/Methods/ScriptMethods/RunFuncMethod.cs

@@ -8,6 +8,7 @@
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.MethodDescriptors;
 using SER.Code.ScriptSystem;
+using SER.Code.ScriptSystem.Structures;
 using SER.Code.ValueSystem;
 using SER.Code.VariableSystem.Bases;
 
@@ -83,6 +84,6 @@ public override void Execute()
             scriptToRun.AddLocalVariable(variable);
         }
 
-        scriptToRun.Run(RunContext.Script, Script);
+        scriptToRun.Run(RunReason.Script, Script);
     }
 }

Code/MethodSystem/Methods/ScriptMethods/RunScriptAndWaitMethod.cs

@@ -4,6 +4,7 @@
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.MethodSystem.BaseMethods.Yielding;
 using SER.Code.ScriptSystem;
+using SER.Code.ScriptSystem.Structures;
 using SER.Code.VariableSystem.Bases;
 
 namespace SER.Code.MethodSystem.Methods.ScriptMethods;
@@ -30,7 +31,7 @@ public override IEnumerator<float> Execute()
         var variables = Args.GetRemainingArguments<Variable, VariableArgument>("variables to pass");
 
         script.AddLocalVariables(variables);
-        script.Run(RunContext.Script, Script);
+        script.Run(RunReason.Script, Script);
 
         // ReSharper disable once ConditionIsAlwaysTrueOrFalse
         while (script.IsRunning)

Code/MethodSystem/Methods/ScriptMethods/RunScriptMethod.cs

@@ -3,6 +3,7 @@
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.ScriptSystem;
+using SER.Code.ScriptSystem.Structures;
 using SER.Code.VariableSystem.Bases;
 
 namespace SER.Code.MethodSystem.Methods.ScriptMethods;
@@ -29,6 +30,6 @@ public override void Execute()
         var variables = Args.GetRemainingArguments<Variable, VariableArgument>("variables to pass");
 
         script.AddLocalVariables(variables);
-        script.Run(RunContext.Script, Script);
+        script.Run(RunReason.Script, Script);
     }
 }

Code/MethodSystem/Methods/ScriptMethods/ThisMethod.cs

@@ -6,6 +6,7 @@
 using SER.Code.FlagSystem;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.ScriptSystem;
+using SER.Code.ScriptSystem.Structures;
 using SER.Code.ValueSystem;
 
 namespace SER.Code.MethodSystem.Methods.ScriptMethods;
@@ -20,7 +21,7 @@ public class ThisMethod : ReturningMethod
         new OptionsArgument("info to receive",
             "flags",
             new("caller","The name of the script that called this script"),
-            Option.Enum<RunContext>("context"),
+            Option.Enum<RunReason>("context"),
             new("duration","The amount of time the script's been running for"),
             "name",
             new("path", "The path to the script on the local directory of the server"),
@@ -40,7 +41,7 @@ public override void Execute()
             "flags" => new CollectionValue(ScriptFlagHandler.GetScriptFlags(Script.Name)
                 .Select(f => f.GetType().Name.Replace("Flag", ""))),
             "caller" => new StaticTextValue(Script.Caller?.Name ?? "none"),
-            "context" => new StaticTextValue(Script.Context.ToString()),
+            "context" => new StaticTextValue(Script.RunReason.ToString()),
             "duration" => new DurationValue(Script.TimeRunning),
             "name" => new StaticTextValue(Script.Name),
             "path" => new StaticTextValue(FileSystem.FileSystem.GetScriptPath(Script)),

Code/MethodSystem/Methods/ScriptMethods/TriggerMethod.cs

@@ -33,7 +33,7 @@ public override void Execute()
                 throw new ScriptRuntimeError(this, error);
             }
 
-            script.Run(RunContext.Script, Script);
+            script.Run(RunReason.Script, Script);
         }
     }
 }

Code/Plugin/CommandEvents.cs

@@ -74,6 +74,6 @@ public static void CaptureCommand(CommandExecutingEventArgs ev)
 
         ev.Sender.Respond($"Running method '{methodName}'!");
         ev.IsAllowed = false;
-        script.Run(RunContext.BaseCommand);
+        script.Run(RunReason.BaseCommand);
     }
 }