fix type checking, modify collection methods etc.

Author: Elektryk-Andrzej

ArgumentSystem/Arguments/CollectionVariableArgument.cs

@@ -3,7 +3,6 @@
 using SER.Helpers.ResultSystem;
 using SER.TokenSystem.Tokens;
 using SER.TokenSystem.Tokens.VariableTokens;
-using SER.VariableSystem.Bases;
 using SER.VariableSystem.Variables;
 
 namespace SER.ArgumentSystem.Arguments;

MethodSystem/Methods/CollectionVariableMethods/CollectionInsertMethod.cs

@@ -2,12 +2,14 @@
 using SER.ArgumentSystem.BaseArguments;
 using SER.MethodSystem.BaseMethods;
 using SER.MethodSystem.MethodDescriptors;
+using SER.ValueSystem;
 using SER.VariableSystem.Variables;
 
 namespace SER.MethodSystem.Methods.CollectionVariableMethods;
+
 public class CollectionInsertMethod : SynchronousMethod, IAdditionalDescription
 {
-    public override string? Description => "Adds the value to the collection variable";
+    public override string Description => "Adds a value to a collection variable";
 
     public string AdditionalDescription =>
         "If value is a CollectionValue, it will nest the collection inside the collection variable. " +
@@ -22,6 +24,12 @@ public class CollectionInsertMethod : SynchronousMethod, IAdditionalDescription
     public override void Execute()
     {
         var collVar = Args.GetCollectionVariable("collection variable");
-        Script.AddVariable(new CollectionVariable(collVar.Name, collVar.Value.Insert(Args.GetAnyValue("value"))));
+        
+        Script.AddVariable(
+            new CollectionVariable(
+                collVar.Name, 
+                CollectionValue.Insert(collVar, Args.GetAnyValue("value"))
+            )
+        );
     }
 }

MethodSystem/Methods/CollectionVariableMethods/CollectionRemoveAtMethod.cs

@@ -1,12 +1,14 @@
 using SER.ArgumentSystem.Arguments;
 using SER.ArgumentSystem.BaseArguments;
 using SER.MethodSystem.BaseMethods;
+using SER.ValueSystem;
 using SER.VariableSystem.Variables;
 
 namespace SER.MethodSystem.Methods.CollectionVariableMethods;
+
 public class CollectionRemoveAtMethod : SynchronousMethod
 {
-    public override string? Description => "Removes the value at the provided index from the collection variable";
+    public override string Description => "Removes a value at the provided index from a collection variable";
 
     public override Argument[] ExpectedArguments { get; } =
     [
@@ -22,6 +24,11 @@ public override void Execute()
         var collVar = Args.GetCollectionVariable("collection variable");
         var index = Args.GetInt("index");
 
-        Script.AddVariable(new CollectionVariable(collVar.Name, collVar.Value.RemoveAt(index)));
+        Script.AddVariable(
+            new CollectionVariable(
+                collVar.Name,
+                CollectionValue.RemoveAt(collVar, index)
+            )
+        );
     }
 }

MethodSystem/Methods/CollectionVariableMethods/CollectionRemoveMethod.cs

@@ -1,17 +1,19 @@
 using SER.ArgumentSystem.Arguments;
 using SER.ArgumentSystem.BaseArguments;
 using SER.MethodSystem.BaseMethods;
+using SER.ValueSystem;
 using SER.VariableSystem.Variables;
 
 namespace SER.MethodSystem.Methods.CollectionVariableMethods;
+
 public class CollectionRemoveMethod : SynchronousMethod
 {
-    public override string? Description => "Removes the value from the collection variable";
+    public override string Description => "Removes a matching value from a collection variable";
 
     public override Argument[] ExpectedArguments { get; } =
     [
         new CollectionVariableArgument("collection variable"),
-        new AnyValueArgument("value"),
+        new AnyValueArgument("value to remove"),
         new IntArgument("amount of matches to remove", -1)
         {
             Description = "Will delete every match if -1.",
@@ -21,10 +23,15 @@ public class CollectionRemoveMethod : SynchronousMethod
 
     public override void Execute()
     {
-        var collVar = Args.GetCollectionVariable("collection variable");
-        var i = Args.GetInt("amount of matches to remove");
-        var expectedVal = Args.GetAnyValue("value");
-
-        Script.AddVariable(new CollectionVariable(collVar.Name, collVar.Value.Remove(expectedVal, i)));
+        var collectionVar = Args.GetCollectionVariable("collection variable");
+        var amountToRemove = Args.GetInt("amount of matches to remove");
+        var value = Args.GetAnyValue("value to remove");
+        
+        Script.AddVariable(
+            new CollectionVariable(
+                collectionVar.Name,
+                CollectionValue.Remove(collectionVar.Value, value, amountToRemove)
+            )
+        );
     }
 }

MethodSystem/Methods/CollectionVariableMethods/EmptyCollectionMethod.cs

@@ -1,38 +1,16 @@
-using SER.ArgumentSystem.Arguments;
-using SER.ArgumentSystem.BaseArguments;
+using SER.ArgumentSystem.BaseArguments;
 using SER.MethodSystem.BaseMethods;
 using SER.ValueSystem;
-using SER.Helpers.Exceptions;
 
 namespace SER.MethodSystem.Methods.CollectionVariableMethods;
 public class EmptyCollectionMethod : ReturningMethod<CollectionValue>
 {
-    public override string? Description => "Returns an empty collection.";
+    public override string Description => "Returns an empty collection.";
 
-    public override Argument[] ExpectedArguments { get; } =
-    [
-        new OptionsArgument("collection type",
-            "bool",
-            "collection",
-            "duration",
-            "number",
-            "player",
-            "reference",
-            "text")
-    ];
+    public override Argument[] ExpectedArguments { get; } = [];
 
     public override void Execute()
     {
-        ReturnValue = Args.GetOption("collection type") switch
-        {
-            "bool" => new CollectionValue<BoolValue>([]),
-            "collection" => new CollectionValue<CollectionValue>([]),
-            "duration" => new CollectionValue<DurationValue>([]),
-            "number" => new CollectionValue<NumberValue>([]),
-            "player" => new CollectionValue<PlayerValue>([]),
-            "reference" => new CollectionValue<ReferenceValue>([]),
-            "text" => new CollectionValue<TextValue>([]),
-            _ => throw new TosoksFuckedUpException("out of range")
-        };
+        ReturnValue = new CollectionValue(Array.Empty<Value>());
     }
 }

MethodSystem/Methods/CollectionVariableMethods/JoinCollectionsMethod.cs

@@ -6,7 +6,7 @@
 namespace SER.MethodSystem.Methods.CollectionVariableMethods;
 public class JoinCollectionsMethod : ReturningMethod<CollectionValue>
 {
-    public override string? Description => "Returns a collection that has the combined values of all the given collections";
+    public override string Description => "Returns a collection that has the combined values of all the given collections";
 
     public override Argument[] ExpectedArguments { get; } =
     [

MethodSystem/Methods/CollectionVariableMethods/SubtractCollectionsMethod.cs

@@ -6,7 +6,7 @@
 namespace SER.MethodSystem.Methods.CollectionVariableMethods;
 public class SubtractCollectionsMethod : ReturningMethod<CollectionValue>
 {
-    public override string? Description => "Returns a collection that has the values of the first collection without the values of the latter";
+    public override string Description => "Returns a collection that has the values of the first collection without the values of the latter";
 
     public override Argument[] ExpectedArguments { get; } =
     [

MethodSystem/Methods/IntercomMethods/SetIntercomTextMethod.cs

@@ -8,7 +8,7 @@ namespace SER.MethodSystem.Methods.IntercomMethods;
 
 public class SetIntercomTextMethod : SynchronousMethod, IAdditionalDescription
 {
-    public override string? Description => "Sets the text on the Intercom.";
+    public override string Description => "Sets the text on the Intercom.";
 
     public string AdditionalDescription => "Resets the intercom text if given text is empty.";
 

MethodSystem/Methods/TeleportMethods/TPRelativeMethod.cs

@@ -1,6 +1,5 @@
 using SER.ArgumentSystem.Arguments;
 using SER.ArgumentSystem.BaseArguments;
-using SER.Helpers.Extensions;
 using SER.MethodSystem.BaseMethods;
 using UnityEngine;
 

SER.csproj

@@ -46,6 +46,7 @@
             <HintPath>$(SL_DEV_REFERENCES)\CommandSystem.Core.dll</HintPath>
             <Private>true</Private>
         </Reference>
+        <Reference Include="Microsoft.CSharp" />
         <Reference Include="Mirror">
             <HintPath>$(SL_DEV_REFERENCES)\Mirror.dll</HintPath>
         </Reference>