Merge branch 'main' into dev

Tosoks67 · Tosoks67 · commit f41f287a88de · 2026-01-22T19:43:57.000+01:00
diff --git a/Code/ContextSystem/Contexts/Control/ElifStatementContext.cs b/Code/ContextSystem/Contexts/Control/ElifStatementContext.cs
@@ -31,6 +31,11 @@ public class ElifStatementContext : StatementContext, IStatementExtender, IExten
 
     public override TryAddTokenRes TryAddToken(BaseToken token)
     {
+        if (NumericExpressionReslover.IsValidForExpression(token).HasErrored(out var error))
+        {
+            return TryAddTokenRes.Error(error);
+        }
+        
         _condition.Add(token);
         return TryAddTokenRes.Continue();
     }
diff --git a/Code/ContextSystem/Contexts/Control/IfStatementContext.cs b/Code/ContextSystem/Contexts/Control/IfStatementContext.cs
@@ -26,6 +26,11 @@ public class IfStatementContext : StatementContext, IExtendableStatement, IKeywo
 
     public override TryAddTokenRes TryAddToken(BaseToken token)
     {
+        if (NumericExpressionReslover.IsValidForExpression(token).HasErrored(out var error))
+        {
+            return TryAddTokenRes.Error(error);
+        }        
+        
         _condition.Add(token);
         return TryAddTokenRes.Continue();
     }
diff --git a/Code/Examples/ChaosCoinScript.cs b/Code/Examples/ChaosCoinScript.cs
@@ -1,10 +1,13 @@
-﻿namespace SER.Code.Examples;
+﻿using JetBrains.Annotations;
 
-public class ChaosCoinScript : IExample
+namespace SER.Code.Examples;
+
+[UsedImplicitly]
+public class ChaosCoinScript : Example
 {
-    public string Name => "chaosCoin";
+    public override string Name => "chaosCoin";
 
-    public string Content =>
+    public override string Content =>
         """
         !-- OnEvent FlippingCoin
 
@@ -16,7 +19,7 @@ public class ChaosCoinScript : IExample
         # "coin locked" is a property of this player, storing whether a coin can be used.
         # this is because some effects of the coin take time, and we DO NOT want to
         # have the coin be used again WHILE a different effect is still ongoing
-        if {PlayerDataExists @evPlayer "coin locked"}
+        if {HasPlayerData @evPlayer "coin locked"}
             if {GetPlayerData @evPlayer "coin locked"}
                 Hint @evPlayer 5s "{$hintInfo}You can't use the coin for now!<br><size=20>Come back when the current effect has finished."
                 IsAllowed false
diff --git a/Code/Examples/DoorRestartScript.cs b/Code/Examples/DoorRestartScript.cs
@@ -1,10 +1,10 @@
 ﻿namespace SER.Code.Examples;
 
-public class DoorRestartScript : IExample
+public class DoorRestartScript : Example
 {
-    public string Name => "doorRestart";
+    public override string Name => "doorRestart";
 
-    public string Content =>
+    public override string Content =>
         """
         # initial cassie announcement
         Cassie jingle "ATTENTIONALLPERSONNEL . DOOR CONTROL CONSOLE MALFUNCTION DETECTED . INITIALIZING REACTIVATION SEQUENCE . ATTEMPTING FULL SYSTEM REACTIVATION IN . 3 . 2 . 1" "Attention all personnel. Door control console malfunction detected.<split>Initializing reactivation sequence. Attempting full system reactivation in..."
diff --git a/Code/Examples/Example.cs b/Code/Examples/Example.cs
@@ -0,0 +1,33 @@
+﻿using System.Reflection;
+using Cassie.Interpreters;
+using JetBrains.Annotations;
+using SER.Code.Helpers.ResultSystem;
+using SER.Code.ScriptSystem;
+
+namespace SER.Code.Examples;
+
+public abstract class Example
+{
+    public abstract string Name { get; }
+    public abstract string Content { get; }
+
+    [UsedImplicitly]
+    public static string Verify()
+    {
+        var examples = Assembly.GetExecutingAssembly().GetTypes()
+            .Where(t => !t.IsAbstract && typeof(Example).IsAssignableFrom(t))
+            .Select(Activator.CreateInstance)
+            .Cast<Example>()
+            .ToArray();
+
+        foreach (var example in examples)
+        {
+            if (Script.CreateAnonymous(example.Name, example.Content).Compile().HasErrored(out var error))
+            {
+                return new Result(false, $"in example '{example.Name}'") + error;
+            }
+        }
+
+        return string.Empty;
+    }
+}
diff --git a/Code/Examples/IExample.cs b/Code/Examples/IExample.cs
diff --git a/Code/Examples/RaveScript.cs b/Code/Examples/RaveScript.cs
@@ -1,10 +1,10 @@
 ﻿namespace SER.Code.Examples;
 
-public class RaveScript : IExample
+public class RaveScript : Example
 {
-    public string Name => "rave";
+    public override string Name => "rave";
 
-    public string Content =>
+    public override string Content =>
         """
         # confirm that @sender variable was created
         if {VarExists @sender} == false
diff --git a/Code/Examples/ScanScript.cs b/Code/Examples/ScanScript.cs
@@ -1,10 +1,10 @@
 ﻿namespace SER.Code.Examples;
 
-public class ScanScript : IExample
+public class ScanScript : Example
 {
-    public string Name => "scan";
+    public override string Name => "scan";
 
-    public string Content =>
+    public override string Content =>
         """
         # scan beginning announcement
         Cassie jingle "a facility scan is commencing" "A facility scan is commencing..."
diff --git a/Code/Examples/WelcomeScript.cs b/Code/Examples/WelcomeScript.cs
@@ -1,10 +1,10 @@
 ﻿namespace SER.Code.Examples;
 
-public class WelcomeScript : IExample
+public class WelcomeScript : Example
 {
-    public string Name => "welcome";
+    public override string Name => "welcome";
 
-    public string Content =>
+    public override string Content =>
         """
         # this script is connected to the 'Joined' event, which means that this script will run when a player joins
         # this event provides us with the @evPlayer variable with the player who just joined
diff --git a/Code/FileSystem/FileSystem.cs b/Code/FileSystem/FileSystem.cs
@@ -95,8 +95,8 @@ public static bool DoesScriptExistByPath(string path)
     public static void GenerateExamples()
     {
         var examples = Assembly.GetExecutingAssembly().GetTypes()
-            .Where(t => typeof(IExample).IsAssignableFrom(t) && !t.IsAbstract)
-            .Select(t => t.CreateInstance<IExample>());
+            .Where(t => typeof(Example).IsAssignableFrom(t) && !t.IsAbstract)
+            .Select(t => t.CreateInstance<Example>());
 
         var exampleDir = Directory.CreateDirectory(Path.Combine(MainDirPath, "Example Scripts"));
         foreach (var example in examples)
diff --git a/Code/Helpers/NumericExpressionReslover.cs b/Code/Helpers/NumericExpressionReslover.cs
@@ -13,6 +13,17 @@ namespace SER.Code.Helpers;
 
 public static class NumericExpressionReslover
 {
+    public static Result IsValidForExpression(BaseToken token)
+    {
+        if (ParseToken(token, new(), new(), "Expression is invalid.", 0)
+            .HasErrored(out var err))
+        {
+            return err;
+        }
+        
+        return true;
+    }
+    
     public static TryGet<CompiledExpression> CompileExpression(string expression, Script scr)
     {
         Result mainErr = $"Condition '{expression}' is invalid.";
@@ -33,76 +44,16 @@ public static TryGet<CompiledExpression> CompileExpression(BaseToken[] tokens)
 
         var variables = new Dictionary<string, DynamicTryGet<object>>(StringComparer.OrdinalIgnoreCase);
         var sb = new StringBuilder();
-        int tempId = 0;
+        uint tempId = 0;
 
         foreach (var token in tokens)
         {
+            tempId++;
             Log.D($"parsing token {token.RawRep} ({token.GetType().AccurateName})");
-            switch (token)
+            
+            if (ParseToken(token, variables, sb, mainErr, tempId).HasErrored(out var err))
             {
-                case IValueToken valueToken when valueToken.CanReturn<LiteralValue>(out var get):
-                {
-                    var tmp = MakeTempName();
-                    
-                    if (valueToken.IsConstant)
-                    {
-                        variables[tmp] = get().OnSuccess(s => s.Value, mainErr);
-                    }
-                    else
-                    {
-                        variables[tmp] = new(() => get().OnSuccess(s => s.Value, mainErr));
-                    }
-                    
-                    AppendRaw(tmp);
-                    continue;
-                }
-                case ParenthesesToken parentheses:
-                {
-                    var tmp = MakeTempName();
-                    variables[tmp] = new(() =>
-                    {
-                        if (parentheses.TryGetTokens().HasErrored(out var tokenizeError, out var tokensInParentheses))
-                        {
-                            return mainErr + tokenizeError;
-                        }
-                
-                        if (CompileExpression(tokensInParentheses).HasErrored(out var conditonError, out var value))
-                        {
-                            return mainErr + conditonError;
-                        }
-                        
-                        return value.Evaluate();
-                    });
-                    
-                    AppendRaw(tmp);
-                    continue;
-                }
-                case { RawRep: "is" }:
-                {
-                    AppendRaw("==");
-                    break;
-                }
-                // great addition XD
-                case { RawRep: "isnt" or "isn't" or "isnot" }:
-                {
-                    AppendRaw("!=");
-                    break;
-                }
-                case { RawRep: "and" }:
-                {
-                    AppendRaw("&&");
-                    break;
-                }
-                case { RawRep: "or" }:
-                {
-                    AppendRaw("||");
-                    break;
-                }
-                default:
-                {
-                    AppendRaw(token.RawRep);
-                    break;
-                }
+                return err;
             }
         }
         
@@ -114,17 +65,6 @@ public static TryGet<CompiledExpression> CompileExpression(BaseToken[] tokens)
             variables, 
             initial
         );
-
-        string MakeTempName()
-        {
-            return "value" + (tempId++).ToString(CultureInfo.InvariantCulture);
-        }
-
-        void AppendRaw(string s)
-        {
-            if (sb.Length > 0) sb.Append(' ');
-            sb.Append(s);
-        }
     }
 
     public readonly struct CompiledExpression(
@@ -158,4 +98,96 @@ public TryGet<object> Evaluate()
             }
         }
     }
+
+    private static Result ParseToken(
+        BaseToken token,
+        Dictionary<string, DynamicTryGet<object>> variables,
+        StringBuilder sb, 
+        Result mainErr,
+        uint tempId
+    )
+    {
+        switch (token)
+        {
+            case IValueToken valueToken when valueToken.CanReturn<LiteralValue>(out var get):
+            {
+                var tmp = MakeTempName();
+                
+                if (valueToken.IsConstant)
+                {
+                    variables[tmp] = get().OnSuccess(s => s.Value, mainErr);
+                }
+                else
+                {
+                    variables[tmp] = new(() => get().OnSuccess(s => s.Value, mainErr));
+                }
+                
+                AppendRaw(tmp);
+                return true;
+            }
+            case ParenthesesToken parentheses:
+            {
+                var tmp = MakeTempName();
+                variables[tmp] = new(() =>
+                {
+                    if (parentheses.TryGetTokens().HasErrored(out var tokenizeError, out var tokensInParentheses))
+                    {
+                        return mainErr + tokenizeError;
+                    }
+            
+                    if (CompileExpression(tokensInParentheses).HasErrored(out var conditonError, out var value))
+                    {
+                        return mainErr + conditonError;
+                    }
+                    
+                    return value.Evaluate();
+                });
+                
+                AppendRaw(tmp);
+                return true;
+            }
+            case { RawRep: "not" }:
+            case SymbolToken:
+            {
+                AppendRaw(token.RawRep);
+                return true;
+            }
+            case { RawRep: "is" }:
+            {
+                AppendRaw("==");
+                return true;
+            }
+            // great addition XD
+            case { RawRep: "isnt" or "isn't" or "isnot" }:
+            {
+                AppendRaw("!=");
+                return true;
+            }
+            case { RawRep: "and" }:
+            {
+                AppendRaw("&&");
+                return true;
+            }
+            case { RawRep: "or" }:
+            {
+                AppendRaw("||");
+                return true;
+            }
+            default:
+            {
+                return mainErr + $"{token} cannot be used in an expression. Maybe you made a typo?";
+            }
+        }
+        
+        string MakeTempName()
+        {
+            return "value" + tempId.ToString(CultureInfo.InvariantCulture);
+        }
+
+        void AppendRaw(string s)
+        {
+            if (sb.Length > 0) sb.Append(' ');
+            sb.Append(s);
+        }
+    }
 }
diff --git a/Code/Plugin/MainPlugin.cs b/Code/Plugin/MainPlugin.cs
@@ -23,7 +23,7 @@ public class MainPlugin : LabApi.Loader.Features.Plugins.Plugin<Config>
     public override string Description => "The scripting language for SCP:SL.";
     public override string Author => "Elektryk_Andrzej";
     public override Version RequiredApiVersion => LabApiProperties.CurrentVersion;
-    public override Version Version => new(0, 12, 0);
+    public override Version Version => new(0, 12, 1);
 
     public static string GitHubLink => "https://github.com/ScriptedEvents/ScriptedEventsReloaded";
     public static string DocsLink => "https://scriptedeventsreloaded.gitbook.io/docs/tutorial";
diff --git a/Code/ScriptSystem/Script.cs b/Code/ScriptSystem/Script.cs
diff --git a/Code/TokenSystem/Tokens/DurationToken.cs b/Code/TokenSystem/Tokens/DurationToken.cs
diff --git a/SER.csproj b/SER.csproj

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ public class ElifStatementContext : StatementContext, IStatementExtender, IExten`
`31`	`31`
`32`	`32`	`public override TryAddTokenRes TryAddToken(BaseToken token)`
`33`	`33`	`{`
	`34`	`+ if (NumericExpressionReslover.IsValidForExpression(token).HasErrored(out var error))`
	`35`	`+ {`
	`36`	`+ return TryAddTokenRes.Error(error);`
	`37`	`+ }`
	`38`	`+`
`34`	`39`	`_condition.Add(token);`
`35`	`40`	`return TryAddTokenRes.Continue();`
`36`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ public class IfStatementContext : StatementContext, IExtendableStatement, IKeywo`
`26`	`26`
`27`	`27`	`public override TryAddTokenRes TryAddToken(BaseToken token)`
`28`	`28`	`{`
	`29`	`+ if (NumericExpressionReslover.IsValidForExpression(token).HasErrored(out var error))`
	`30`	`+ {`
	`31`	`+ return TryAddTokenRes.Error(error);`
	`32`	`+ }`
	`33`	`+`
`29`	`34`	`_condition.Add(token);`
`30`	`35`	`return TryAddTokenRes.Continue();`
`31`	`36`	`}`