improve TypeOfValue system

Elektryk-Andrzej · Elektryk-Andrzej · commit 9bbf2648a9e2 · 2026-01-19T16:52:52.000+01:00
diff --git a/Code/ContextSystem/Contexts/FunctionDefinitionContext.cs b/Code/ContextSystem/Contexts/FunctionDefinitionContext.cs
@@ -43,7 +43,7 @@ public TypeOfValue? Returns
 
             if (varTypeToken == null) return null;
 
-            return new TypeOfValue(varTypeToken.CreateInstance<VariableToken>().ValueType);
+            return new SingleTypeOfValue(varTypeToken.CreateInstance<VariableToken>().ValueType);
         }
     }
 
diff --git a/Code/MethodSystem/Methods/DoorMethods/DoorInfoMethod.cs b/Code/MethodSystem/Methods/DoorMethods/DoorInfoMethod.cs
@@ -17,7 +17,7 @@ public class DoorInfoMethod : LiteralValueReturningMethod, IReferenceResolvingMe
 {
     public Type ReferenceType => typeof(Door);
     
-    public override TypeOfValue LiteralReturnTypes => new([
+    public override TypeOfValue LiteralReturnTypes => new TypesOfValue([
         typeof(TextValue), 
         typeof(BoolValue), 
         typeof(NumberValue)
diff --git a/Code/MethodSystem/Methods/HealthMethods/DamageInfoMethod.cs b/Code/MethodSystem/Methods/HealthMethods/DamageInfoMethod.cs
@@ -16,7 +16,7 @@ public class DamageInfoMethod : ReturningMethod, IReferenceResolvingMethod, IAdd
 {
     public Type ReferenceType => typeof(DamageHandlerBase);
     
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(TextValue), 
         typeof(ReferenceValue)
     ]);
diff --git a/Code/MethodSystem/Methods/IntercomMethods/IntercomInfoMethod.cs b/Code/MethodSystem/Methods/IntercomMethods/IntercomInfoMethod.cs
@@ -25,7 +25,7 @@ public class IntercomInfoMethod : ReturningMethod
         )
     ];
 
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(TextValue),
         typeof(PlayerValue),
         typeof(DurationValue)
diff --git a/Code/MethodSystem/Methods/ItemMethods/FirearmItemInfoMethod.cs b/Code/MethodSystem/Methods/ItemMethods/FirearmItemInfoMethod.cs
@@ -10,7 +10,7 @@ internal class FirearmItemInfoMethod : ReturningMethod
 {
     public override string Description => "Returns info about provided firearm";
 
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(BoolValue),
         typeof(NumberValue)
     ]);
diff --git a/Code/MethodSystem/Methods/ItemMethods/ItemInfoMethod.cs b/Code/MethodSystem/Methods/ItemMethods/ItemInfoMethod.cs
@@ -17,7 +17,7 @@ public class ItemInfoMethod : ReturningMethod, IReferenceResolvingMethod
     
     public Type ReferenceType => typeof(Item);
 
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(TextValue),
         typeof(PlayerValue),
         typeof(BoolValue)
diff --git a/Code/MethodSystem/Methods/ItemMethods/UsableItemInfoMethod.cs b/Code/MethodSystem/Methods/ItemMethods/UsableItemInfoMethod.cs
@@ -10,7 +10,7 @@ internal class UsableItemInfoMethod : ReturningMethod
 {
     public override string Description => "Returns information about provided usable item, like Painkillers, Medkit, etc.";
 
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(NumberValue),
         typeof(BoolValue)
     ]);
diff --git a/Code/MethodSystem/Methods/PickupMethods/PickupInfoMethod.cs b/Code/MethodSystem/Methods/PickupMethods/PickupInfoMethod.cs
@@ -15,7 +15,7 @@ public class PickupInfoMethod : ReturningMethod, IReferenceResolvingMethod
 {
     public override string Description => "Returns information about a pickup.";
 
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(PlayerValue),
         typeof(BoolValue),
         typeof(TextValue),
diff --git a/Code/MethodSystem/Methods/PlayerVariableMethods/ShowMethod.cs b/Code/MethodSystem/Methods/PlayerVariableMethods/ShowMethod.cs
@@ -37,7 +37,7 @@ public override void Execute()
 
         if (!PlayerExpressionToken.PropertyInfoMap.TryGetValue(property, out var propInfo) ||
             propInfo is not { ReturnType: var type, Handler: var handler } ||
-            !typeof(LiteralValue).IsAssignableFrom(type)) 
+            !typeof(LiteralValue).IsAssignableFrom(type.Type)) 
         {
             throw new ScriptRuntimeError(this, ErrorReasons[0]);
         }
diff --git a/Code/MethodSystem/Methods/RespawnMethods/RespawnWaveInfoMethod.cs b/Code/MethodSystem/Methods/RespawnMethods/RespawnWaveInfoMethod.cs
@@ -16,7 +16,7 @@ public class RespawnWaveInfoMethod : LiteralValueReturningMethod, IReferenceReso
 {
     public Type ReferenceType => typeof(RespawnWave);
 
-    public override TypeOfValue LiteralReturnTypes => new([
+    public override TypeOfValue LiteralReturnTypes => new TypesOfValue([
         typeof(NumberValue), 
         typeof(TextValue)
     ]);
diff --git a/Code/MethodSystem/Methods/RoomMethods/RoomInfoMethod.cs b/Code/MethodSystem/Methods/RoomMethods/RoomInfoMethod.cs
@@ -16,7 +16,7 @@ public class RoomInfoMethod : LiteralValueReturningMethod, IReferenceResolvingMe
 {
     public Type ReferenceType => typeof(Room);
     
-    public override TypeOfValue LiteralReturnTypes => new([
+    public override TypeOfValue LiteralReturnTypes => new TypesOfValue([
         typeof(TextValue), 
         typeof(NumberValue)
     ]);
diff --git a/Code/MethodSystem/Methods/RoundMethods/RoundInfoMethod.cs b/Code/MethodSystem/Methods/RoundMethods/RoundInfoMethod.cs
@@ -13,7 +13,7 @@ public class RoundInfoMethod : LiteralValueReturningMethod
 {
     public override string Description => "Returns information about the current round.";
     
-    public override TypeOfValue LiteralReturnTypes => new([
+    public override TypeOfValue LiteralReturnTypes => new TypesOfValue([
         typeof(BoolValue), 
         typeof(DurationValue)
     ]);
diff --git a/Code/MethodSystem/Methods/TimeMethods/TimeInfoMethod.cs b/Code/MethodSystem/Methods/TimeMethods/TimeInfoMethod.cs
@@ -12,7 +12,7 @@ public class TimeInfoMethod : LiteralValueReturningMethod
 {
     public override string Description => "Returns information about current time.";
 
-    public override TypeOfValue LiteralReturnTypes => new([
+    public override TypeOfValue LiteralReturnTypes => new TypesOfValue([
         typeof(NumberValue), 
         typeof(TextValue)
     ]);
diff --git a/Code/MethodSystem/Methods/WarheadMethods/WarheadInfoMethod.cs b/Code/MethodSystem/Methods/WarheadMethods/WarheadInfoMethod.cs
@@ -13,7 +13,7 @@ public class WarheadInfoMethod : ReturningMethod
 {
     public override string Description => "Returns information about Alpha Warhead";
 
-    public override TypeOfValue Returns => new([
+    public override TypeOfValue Returns => new TypesOfValue([
         typeof(BoolValue),
         typeof(DurationValue)
     ]);
diff --git a/Code/TokenSystem/Tokens/ExpressionTokens/PlayerExpressionToken.cs b/Code/TokenSystem/Tokens/ExpressionTokens/PlayerExpressionToken.cs
@@ -68,15 +68,15 @@ public enum PlayerProperty
     public abstract class Info
     {
         public abstract Func<Player, Value> Handler { get; }
-        public abstract Type ReturnType { get; }
+        public abstract SingleTypeOfValue ReturnType { get; }
         public abstract string? Description { get; }
     }
 
     public class Info<T>(Func<Player, T> handler, string? description) : Info 
         where T : Value
     {
         public override Func<Player, Value> Handler => handler;
-        public override Type ReturnType => typeof(T);
+        public override SingleTypeOfValue ReturnType => new(typeof(T));
         public override string? Description => description;
     }
 
diff --git a/Code/ValueSystem/TypeOfValue.cs b/Code/ValueSystem/TypeOfValue.cs
@@ -1,36 +1,41 @@
 ﻿namespace SER.Code.ValueSystem;
 
-public class TypeOfValue
+public abstract class TypeOfValue
 {
-    public TypeOfValue(Type[] required)
+    protected TypeOfValue(Type[] required)
     {
         Required = required;
     }
     
-    public TypeOfValue(Type required)
+    protected TypeOfValue(Type? required)
     {
-        Required = [required];
-    }
-
-    protected TypeOfValue()
-    {
-        Required = null;
+        if (required is null) Required = null;
+        else Required = [required];
     }
     
     public Type[]? Required { get; }
     
     public bool AreKnown(out Type[] known) => (known = Required!) is not null;
-    
-    public bool DefinitelyAllows<T>() where T : Value => DefinitelyAllows(typeof(T));
-    
-    public bool DefinitelyAllows(Type checkT)
-    {
-        if (Required is null) return false;
-        return Required.All(requiredT => requiredT.IsAssignableFrom(checkT));
-    }
+
+    public abstract override string ToString();
 }
 
-public class TypeOfValue<T>() : TypeOfValue(typeof(T))
-    where T : Value;
+public class TypesOfValue(Type[] types) : TypeOfValue(types)
+{
+    private readonly Type[] _types = types;
+    public override string ToString() => $"{string.Join(" or ", _types.Select(Value.FriendlyName))} value";
+}
+
+public class UnknownTypeOfValue() : TypeOfValue((Type?)null)
+{
+    public override string ToString() => "unknown value";
+}
+
+public class SingleTypeOfValue(Type type) : TypeOfValue(type)
+{
+    public readonly Type Type = type;
+    public override string ToString() => $"{Value.FriendlyName(Type)} value";
+}
 
-public class UnknownTypeOfValue : TypeOfValue;
+public class TypeOfValue<T>() : SingleTypeOfValue(typeof(T))
+    where T : Value;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public TypeOfValue? Returns`
`43`	`43`
`44`	`44`	`if (varTypeToken == null) return null;`
`45`	`45`
`46`		`- return new TypeOfValue(varTypeToken.CreateInstance<VariableToken>().ValueType);`
	`46`	`+ return new SingleTypeOfValue(varTypeToken.CreateInstance<VariableToken>().ValueType);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class DoorInfoMethod : LiteralValueReturningMethod, IReferenceResolvingMe`
`17`	`17`	`{`
`18`	`18`	`public Type ReferenceType => typeof(Door);`
`19`	`19`
`20`		`- public override TypeOfValue LiteralReturnTypes => new([`
	`20`	`+ public override TypeOfValue LiteralReturnTypes => new TypesOfValue([`
`21`	`21`	`typeof(TextValue),`
`22`	`22`	`typeof(BoolValue),`
`23`	`23`	`typeof(NumberValue)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class DamageInfoMethod : ReturningMethod, IReferenceResolvingMethod, IAdd`
`16`	`16`	`{`
`17`	`17`	`public Type ReferenceType => typeof(DamageHandlerBase);`
`18`	`18`
`19`		`- public override TypeOfValue Returns => new([`
	`19`	`+ public override TypeOfValue Returns => new TypesOfValue([`
`20`	`20`	`typeof(TextValue),`
`21`	`21`	`typeof(ReferenceValue)`
`22`	`22`	`]);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class IntercomInfoMethod : ReturningMethod`
`25`	`25`	`)`
`26`	`26`	`];`
`27`	`27`
`28`		`- public override TypeOfValue Returns => new([`
	`28`	`+ public override TypeOfValue Returns => new TypesOfValue([`
`29`	`29`	`typeof(TextValue),`
`30`	`30`	`typeof(PlayerValue),`
`31`	`31`	`typeof(DurationValue)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ internal class FirearmItemInfoMethod : ReturningMethod`
`10`	`10`	`{`
`11`	`11`	`public override string Description => "Returns info about provided firearm";`
`12`	`12`
`13`		`- public override TypeOfValue Returns => new([`
	`13`	`+ public override TypeOfValue Returns => new TypesOfValue([`
`14`	`14`	`typeof(BoolValue),`
`15`	`15`	`typeof(NumberValue)`
`16`	`16`	`]);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ internal class UsableItemInfoMethod : ReturningMethod`
`10`	`10`	`{`
`11`	`11`	`public override string Description => "Returns information about provided usable item, like Painkillers, Medkit, etc.";`
`12`	`12`
`13`		`- public override TypeOfValue Returns => new([`
	`13`	`+ public override TypeOfValue Returns => new TypesOfValue([`
`14`	`14`	`typeof(NumberValue),`
`15`	`15`	`typeof(BoolValue)`
`16`	`16`	`]);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class PickupInfoMethod : ReturningMethod, IReferenceResolvingMethod`
`15`	`15`	`{`
`16`	`16`	`public override string Description => "Returns information about a pickup.";`
`17`	`17`
`18`		`- public override TypeOfValue Returns => new([`
	`18`	`+ public override TypeOfValue Returns => new TypesOfValue([`
`19`	`19`	`typeof(PlayerValue),`
`20`	`20`	`typeof(BoolValue),`
`21`	`21`	`typeof(TextValue),`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override void Execute()`
`37`	`37`
`38`	`38`	`if (!PlayerExpressionToken.PropertyInfoMap.TryGetValue(property, out var propInfo) \|\|`
`39`	`39`	`propInfo is not { ReturnType: var type, Handler: var handler } \|\|`
`40`		`- !typeof(LiteralValue).IsAssignableFrom(type))`
	`40`	`+ !typeof(LiteralValue).IsAssignableFrom(type.Type))`
`41`	`41`	`{`
`42`	`42`	`throw new ScriptRuntimeError(this, ErrorReasons[0]);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class RespawnWaveInfoMethod : LiteralValueReturningMethod, IReferenceReso`
`16`	`16`	`{`
`17`	`17`	`public Type ReferenceType => typeof(RespawnWave);`
`18`	`18`
`19`		`- public override TypeOfValue LiteralReturnTypes => new([`
	`19`	`+ public override TypeOfValue LiteralReturnTypes => new TypesOfValue([`
`20`	`20`	`typeof(NumberValue),`
`21`	`21`	`typeof(TextValue)`
`22`	`22`	`]);`