improvements

Author: Elektryk-Andrzej

Code/ContextSystem/Contexts/GlobalVariableContext.cs

@@ -47,8 +47,16 @@ public override Result VerifyCurrentState()
 
     protected override IEnumerator<float> Execute()
     {
+        _variableContext.CreateLocalVariable = false;
+        
         using var definitionEnumerator = _variableContext.Run();
         while (definitionEnumerator.MoveNext()) yield return definitionEnumerator.Current;
-        VariableIndex.AddGlobalVariable(_variableContext.DefinedVariable ?? throw new TosoksFuckedUpException());
+
+        if (_variableContext.DefinedVariable is null)
+        {
+            throw new TosoksFuckedUpException();
+        }
+        
+        VariableIndex.AddGlobalVariable(_variableContext.DefinedVariable);
     }
 }

Code/ContextSystem/Contexts/VariableDefinition/VariableDefinitionContext.cs

@@ -17,6 +17,7 @@ namespace SER.Code.ContextSystem.Contexts.VariableDefinition;
 public abstract class VariableDefinitionContext : YieldingContext
 {
     public Variable? DefinedVariable;
+    public bool CreateLocalVariable = true;
 }
 
 public abstract class VariableDefinitionContext<TVarToken, TValue, TVariable>(TVarToken varToken) : VariableDefinitionContext
@@ -134,16 +135,17 @@ protected override IEnumerator<float> Execute()
             }
 
             DefinedVariable = Variable.Create(varToken.Name, tValue);
-            Script.AddLocalVariable(DefinedVariable);
         }
         else if (_parser is not null)
         {
             DefinedVariable = Variable.Create(varToken.Name, Value.Parse(_parser(), Script));
-            Script.AddLocalVariable(DefinedVariable);
         }
         else
         {
             throw new AndrzejFuckedUpException();
         }
+        
+        if (CreateLocalVariable) 
+            Script.AddLocalVariable(DefinedVariable);
     }
 }

Code/FlagSystem/Flags/CustomCommandFlag.cs

@@ -163,7 +163,7 @@ public override Result OnScriptRunning(Script scr)
             return true;
         }
 
-        return $"A script using '{Name}' flag cannot be ran by any other mean than a custom command.";
+        return $"Tried to run script by other mean than the '{Command.Command}' command, which is not allowed.";
     }
 
     public class CustomCommand : ICommand, IUsageProvider, IHelpProvider

Code/FlagSystem/Flags/OnEventFlag.cs

@@ -8,6 +8,8 @@ namespace SER.Code.FlagSystem.Flags;
 [UsedImplicitly]
 public class OnEventFlag : Flag
 {
+    private string _event;
+    
     public override string Description =>
         "Binds a script to an in-game event. When the event happens, the script will execute. " +
         "Events can sometimes also carry information of their own, ";
@@ -25,7 +27,8 @@ public class OnEventFlag : Flag
                     return "Too many arguments, only event name is allowed";
             }
 
-            if (EventHandler.ConnectEvent(inlineArgs.First(), ScriptName).HasErrored(out var error))
+            _event = inlineArgs.First();
+            if (EventHandler.ConnectEvent(_event, ScriptName).HasErrored(out var error))
             {
                 return error;
             }
@@ -42,7 +45,7 @@ public override Result OnScriptRunning(Script scr)
             return true;
         }
 
-        return $"A script using '{Name}' flag cannot be ran by any other mean than an event.";
+        return $"Tried to run script by other mean than the '{_event}' event, which is not allowed.";
     }
 
     public override Argument[] Arguments => [];

Code/FlagSystem/ScriptFlagHandler.cs

@@ -70,7 +70,7 @@ public static Result DoFlagsApproveExecution(Script scr)
         {
             if (flag.OnScriptRunning(scr).HasErrored(out var error))
             {
-                Result rs = $"Script '{scr.Name}' cannot run due to flag '{flag.Name}'.";
+                Result rs = $"Flag '{flag.Name}' disallows script execution.";
                 return rs + error;
             }
         }