Merge branch 'dev' of https://github.com/ScriptedEvents/ScriptedEventsReloaded into dev

Author: Elektryk-Andrzej

Code/ContextSystem/Contexter.cs

@@ -79,6 +79,7 @@ List<Context> contexts
         }
 
         var currentStatement = statementStack.FirstOrDefault();
+        string error;
         if (context is StatementContext treeExtenderContext and IStatementExtender treeExtenderInfo)
         {
             if (currentStatement is null)
@@ -99,10 +100,10 @@ List<Context> contexts
             extendable.RegisteredSignals[treeExtenderInfo.Extends] = treeExtenderContext.Run;
             statementStack.Pop();
             statementStack.Push(treeExtenderContext);
-            return true;
+            return context.VerifyCurrentState().HasErrored(out error) ? rs + error : true;
         }
 
-        if (context.VerifyCurrentState().HasErrored(out var error)) 
+        if (context.VerifyCurrentState().HasErrored(out error)) 
             return rs + error;
 
         if (currentStatement is not null)

Code/EventSystem/EventHandler.cs

@@ -145,7 +145,7 @@ private static void OnNonArgumentedEvent(string evName)
                 continue;
             }
 
-            script.Run();
+            script.Run(RunContext.Event);
         }
     }
 
@@ -179,7 +179,7 @@ private static void OnArgumentedEvent<T>(string evName, T ev) where T : EventArg
             }
 
             script.AddVariables(variables);
-            var isAllowed = script.RunForEvent();
+            var isAllowed = script.RunForEvent(RunContext.Event);
             if (isAllowed.HasValue && ev is ICancellableEvent cancellable1)
                 cancellable1.IsAllowed = isAllowed.Value;
         }

Code/FlagSystem/Flags/CustomCommandFlag.cs

@@ -222,7 +222,7 @@ public static Result RunAttachedScript(CustomCommand requestingCommand, ScriptEx
             script.AddVariable(new LiteralVariable<TextValue>(name, slice.Value));
         }
 
-        script.Run();
+        script.Run(RunContext.Command);
         return true;
     }
 

Code/Helpers/Extensions/PlayerExtensions.cs

@@ -1,4 +1,5 @@
 using LabApi.Features.Wrappers;
+using PlayerRoles.PlayableScps.Scp173;
 using UnityEngine;
 
 namespace SER.Code.Helpers.Extensions;
@@ -9,4 +10,17 @@ public static Vector3 RelativeRoomPosition(this Player player)
     {
         return player.Room == null ? new(0,0,0) : player.Room.Transform.InverseTransformPoint(player.Position) - new Vector3(0, player.Scale.y + 0.01f, 0);
     }
+
+    extension(Scp173Role peanut)
+    {
+        public Scp173ObserversTracker ObserversTracker =>
+            !peanut.SubroutineModule.TryGetSubroutine(out Scp173ObserversTracker observersTracker)
+                ? throw new Exception("I fucking hate Northwood so much.")
+                : observersTracker;
+
+        public Player[] ObservingPlayers => peanut.ObserversTracker.Observers
+            .Select(Player.Get)
+            .RemoveNulls()
+            .ToArray();
+    }
 }

Code/MethodSystem/Methods/IntercomMethods/IntercomInfoMethod.cs

@@ -3,6 +3,7 @@
 using PlayerRoles.Voice;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.ArgumentSystem.Structures;
 using SER.Code.Helpers.Exceptions;
 using SER.Code.MethodSystem.BaseMethods;
 using SER.Code.ValueSystem;
@@ -17,7 +18,7 @@ public class IntercomInfoMethod : ReturningMethod
     public override Argument[] ExpectedArguments { get; } =
     [
         new OptionsArgument("mode",
-            "state",
+            Option.Enum<IntercomState>("state"),
             "speaker",
             "cooldown",
             "speechTimeLeft",

Code/MethodSystem/Methods/ScpMethods/Get173ObserversMethod.cs

@@ -0,0 +1,40 @@
+using Exiled.Events.Handlers;
+using JetBrains.Annotations;
+using PlayerRoles.PlayableScps.Scp173;
+using SER.Code.ArgumentSystem.Arguments;
+using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.ContextSystem.Structures;
+using SER.Code.Helpers.Exceptions;
+using SER.Code.Helpers.Extensions;
+using SER.Code.MethodSystem.BaseMethods;
+using SER.Code.MethodSystem.MethodDescriptors;
+using SER.Code.ValueSystem;
+using Player = LabApi.Features.Wrappers.Player;
+
+namespace SER.Code.MethodSystem.Methods.ScpMethods;
+
+[UsedImplicitly]
+public class Get173ObserversMethod : ReturningMethod<PlayerValue>, ICanError
+{
+    public override string Description => "Returns the people that are looking at the specified SCP-173";
+
+    public string[] ErrorReasons =>
+    [
+        "The specified player isn't SCP-173."
+    ];
+
+    public override Argument[] ExpectedArguments { get; } =
+    [
+        new PlayerArgument("peanut")
+    ];
+
+    public override void Execute()
+    {
+        var pnut = Args.GetPlayer("peanut");
+        
+        if (pnut.RoleBase is not Scp173Role pnutRole)
+            throw new ScriptRuntimeError(this, ErrorReasons[0]);
+        
+        ReturnValue = new PlayerValue(pnutRole.ObservingPlayers);
+    }
+}

…/Scp079Methods/Set079AccessTierMethod.cs …ods/ScpMethods/Set079AccessTierMethod.csCode/MethodSystem/Methods/Scp079Methods/Set079AccessTierMethod.cs renamed to Code/MethodSystem/Methods/ScpMethods/Set079AccessTierMethod.cs Code/MethodSystem/Methods/Scp079Methods/Set079AccessTierMethod.cs renamed to Code/MethodSystem/Methods/ScpMethods/Set079AccessTierMethod.cs

@@ -7,6 +7,7 @@
 using SER.Code.Helpers.Extensions;
 using SER.Code.MethodSystem.BaseMethods;
 using SER.Code.MethodSystem.MethodDescriptors;
+using SER.Code.ScriptSystem;
 using SER.Code.ValueSystem;
 using SER.Code.VariableSystem.Bases;
 
@@ -82,6 +83,6 @@ public override void Execute()
             scriptToRun.AddVariable(variable);
         }
 
-        scriptToRun.Run();
+        scriptToRun.Run(RunContext.Script, Script);
     }
 }