more fixes and changes

Elektryk-Andrzej · Elektryk-Andrzej · commit efbe30d6668d · 2025-10-30T23:03:28.000+01:00
diff --git a/ArgumentSystem/Arguments/IsValidReferenceArgument.cs b/ArgumentSystem/Arguments/IsValidReferenceArgument.cs
@@ -0,0 +1,24 @@
+﻿using JetBrains.Annotations;
+using SER.ArgumentSystem.BaseArguments;
+using SER.Helpers.Extensions;
+using SER.Helpers.ResultSystem;
+using SER.TokenSystem.Tokens;
+using SER.ValueSystem;
+
+namespace SER.ArgumentSystem.Arguments;
+
+public class IsValidReferenceArgument(string name) : Argument(name)
+{
+    public override string InputDescription => "a reference we want to check is valid e.g. @room";
+    
+    [UsedImplicitly]
+    public DynamicTryGet<bool> GetConvertSolution(BaseToken token)
+    {
+        if (!token.CanReturn<ReferenceValue>(out var func))
+        {
+            return $"Value '{token.RawRep}' is not a reference.";
+        }
+        
+        return new(() => func().OnSuccess(v => v.IsValid));
+    }
+}
diff --git a/ArgumentSystem/Arguments/UnknownReferenceArgument.cs b/ArgumentSystem/Arguments/UnknownReferenceArgument.cs
diff --git a/ArgumentSystem/ProvidedArguments.cs b/ArgumentSystem/ProvidedArguments.cs
@@ -22,6 +22,11 @@ public class ProvidedArguments(Method method)
 {
     private Dictionary<(string name, Type type), List<DynamicTryGet>> Arguments { get; } = [];
 
+    public bool GetIsValidReference(string argName)
+    {
+        return GetValue<bool, IsValidReferenceArgument>(argName);
+    }
+    
     public T GetToken<T>(string argName) where T : BaseToken
     {
         return GetValue<T, TokenArgument<T>>(argName);
diff --git a/Helpers/Extensions/SerExtensions.cs b/Helpers/Extensions/SerExtensions.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Linq;
-using System.Runtime.InteropServices;
 using JetBrains.Annotations;
 using SER.Helpers.Exceptions;
 using SER.Helpers.ResultSystem;
diff --git a/MethodSystem/Methods/DoorMethods/DoorInfoMethod.cs b/MethodSystem/Methods/DoorMethods/DoorInfoMethod.cs
@@ -26,7 +26,7 @@ public class DoorInfoMethod : LiteralValueReturningMethod, IReferenceResolvingMe
             "isClosed",
             "isLocked",
             "isUnlocked",
-            Option.Enum<DoorName>(),
+            Option.Enum<DoorName>("name"),
             "unityName")
     ];
 
@@ -37,7 +37,7 @@ public override void Execute()
         
         ReturnValue = info switch
         {
-            "doorname" => new TextValue(door.DoorName.ToString()),
+            "name" => new TextValue(door.DoorName.ToString()),
             "unityname" => new TextValue(door.Base.name),
             "isopen" => new BoolValue(door.IsOpened),
             "isclosed" => new BoolValue(!door.IsOpened),
diff --git a/MethodSystem/Methods/ReferenceVariableMethods/ValidRefMethod.cs b/MethodSystem/Methods/ReferenceVariableMethods/ValidRefMethod.cs
@@ -11,11 +11,11 @@ public class ValidRefMethod : ReturningMethod<BoolValue>
 
     public override Argument[] ExpectedArguments { get; } =
     [
-        new ValueArgument<ReferenceValue>("reference")
+        new IsValidReferenceArgument("reference")
     ];
     
     public override void Execute()
     {
-        ReturnValue = new BoolValue(Args.GetValue<ReferenceValue>("reference").IsValid);
+        ReturnValue = Args.GetIsValidReference("reference");
     }
 }
diff --git a/Plugin/Commands/HelpSystem/HelpCommand.cs b/Plugin/Commands/HelpSystem/HelpCommand.cs
@@ -507,7 +507,7 @@ private static string GetMethodHelp(Method method)
                 if (ret.LiteralReturnTypes is { } types)
                 {
                     typeReturn = types
-                        .Select(t => t.FriendlyTypeName())
+                        .Select(Value.FriendlyName)
                         .Select(name => $"a {name} value")
                         .JoinStrings(" or ");
                 }
@@ -549,6 +549,7 @@ private static string GetMethodHelp(Method method)
                     typeReturn = "a value depending on your input";
                 }
                 
+                sb.AppendLine();
                 sb.AppendLine($"This method returns {typeReturn}, which can be saved or used directly. ");
                 break;
             }
diff --git a/SER.csproj b/SER.csproj
@@ -108,7 +108,7 @@
         <Compile Include="ArgumentSystem\Arguments\ScriptArgument.cs" />
         <Compile Include="ArgumentSystem\Arguments\TextArgument.cs" />
         <Compile Include="ArgumentSystem\Arguments\TokenArgument.cs" />
-        <Compile Include="ArgumentSystem\Arguments\UnknownReferenceArgument.cs" />
+        <Compile Include="ArgumentSystem\Arguments\IsValidReferenceArgument.cs" />
         <Compile Include="ArgumentSystem\Arguments\ValueArgument.cs" />
         <Compile Include="ArgumentSystem\Arguments\VariableArgument.cs" />
         <Compile Include="ArgumentSystem\BaseArguments\Argument.cs" />
diff --git a/SER.sln.DotSettings.user b/SER.sln.DotSettings.user
@@ -233,6 +233,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFacilityZone_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9b41e261b6f7438da74257a46de8480732e000_003F77_003F77f001f1_003FFacilityZone_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFile_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F1f_003F9e0347e9_003FFile_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFirearmItem_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fbea7f403b90e4786abd99fa819db98538f400_003F53_003F15cbc31b_003FFirearmItem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFirearmItem_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd231fdc39b074662bb6a34ea8879e37bc2000_003F34_003F019b9135_003FFirearmItem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFirearm_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9b41e261b6f7438da74257a46de8480732e000_003Fe6_003Ffab32290_003FFirearm_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFirstPersonMovementModule_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F0925a5a9c79c48e6a7811d1a106b942e3c3000_003F60_003F598a51c8_003FFirstPersonMovementModule_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFootprint_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9b41e261b6f7438da74257a46de8480732e000_003F55_003F419d25d6_003FFootprint_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
diff --git a/TokenSystem/Tokens/ExpressionTokens/MethodExpressionToken.cs b/TokenSystem/Tokens/ExpressionTokens/MethodExpressionToken.cs
@@ -1,9 +1,7 @@
 ﻿using System;
 using System.Linq;
 using SER.ContextSystem;
-using SER.Helpers;
 using SER.Helpers.Exceptions;
-using SER.Helpers.Extensions;
 using SER.Helpers.ResultSystem;
 using SER.MethodSystem.BaseMethods;
 using SER.ValueSystem;
diff --git a/TokenSystem/Tokens/TextToken.cs b/TokenSystem/Tokens/TextToken.cs
@@ -8,7 +8,6 @@
 using SER.TokenSystem.Slices;
 using SER.TokenSystem.Structures;
 using SER.TokenSystem.Tokens.ExpressionTokens;
-using SER.TokenSystem.Tokens.Interfaces;
 using SER.ValueSystem;
 
 namespace SER.TokenSystem.Tokens;
diff --git a/ValueSystem/LiteralValue.cs b/ValueSystem/LiteralValue.cs
@@ -1,4 +1,5 @@
-﻿using SER.Helpers.Extensions;
+﻿using System;
+using SER.Helpers.Extensions;
 using SER.Helpers.ResultSystem;
 
 namespace SER.ValueSystem;
diff --git a/ValueSystem/ReferenceValue.cs b/ValueSystem/ReferenceValue.cs
@@ -5,7 +5,7 @@ namespace SER.ValueSystem;
 
 public class ReferenceValue(object? obj) : Value
 {
-    public bool IsValid => Value is not null;
+    public bool IsValid => obj is not null;
     public object Value => obj ?? throw new ScriptRuntimeError("Value of reference is invalid.");
 
     public override string ToString()
diff --git a/ValueSystem/Value.cs b/ValueSystem/Value.cs
@@ -35,4 +35,7 @@ public static Value Parse(object obj)
             _             => new ReferenceValue(obj),
         };
     }
+    
+    public static string FriendlyName(Type type) => type.Name.Replace("Value", "").ToLower();
+    public string FriendlyName() => FriendlyName(GetType());
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,11 @@ public class ProvidedArguments(Method method)`
`22`	`22`	`{`
`23`	`23`	`private Dictionary<(string name, Type type), List<DynamicTryGet>> Arguments { get; } = [];`
`24`	`24`
	`25`	`+ public bool GetIsValidReference(string argName)`
	`26`	`+ {`
	`27`	`+ return GetValue<bool, IsValidReferenceArgument>(argName);`
	`28`	`+ }`
	`29`	`+`
`25`	`30`	`public T GetToken<T>(string argName) where T : BaseToken`
`26`	`31`	`{`
`27`	`32`	`return GetValue<T, TokenArgument<T>>(argName);`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ public class ValidRefMethod : ReturningMethod<BoolValue>`
`11`	`11`
`12`	`12`	`public override Argument[] ExpectedArguments { get; } =`
`13`	`13`	`[`
`14`		`- new ValueArgument<ReferenceValue>("reference")`
	`14`	`+ new IsValidReferenceArgument("reference")`
`15`	`15`	`];`
`16`	`16`
`17`	`17`	`public override void Execute()`
`18`	`18`	`{`
`19`		`- ReturnValue = new BoolValue(Args.GetValue<ReferenceValue>("reference").IsValid);`
	`19`	`+ ReturnValue = Args.GetIsValidReference("reference");`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ private static string GetMethodHelp(Method method)`
`507`	`507`	`if (ret.LiteralReturnTypes is { } types)`
`508`	`508`	`{`
`509`	`509`	`typeReturn = types`
`510`		`- .Select(t => t.FriendlyTypeName())`
	`510`	`+ .Select(Value.FriendlyName)`
`511`	`511`	`.Select(name => $"a {name} value")`
`512`	`512`	`.JoinStrings(" or ");`
`513`	`513`	`}`
`@@ -549,6 +549,7 @@ private static string GetMethodHelp(Method method)`
`549`	`549`	`typeReturn = "a value depending on your input";`
`550`	`550`	`}`
`551`	`551`
	`552`	`+ sb.AppendLine();`
`552`	`553`	`sb.AppendLine($"This method returns {typeReturn}, which can be saved or used directly. ");`
`553`	`554`	`break;`
`554`	`555`	`}`