update again

Author: Elektryk-Andrzej

Code/ContextSystem/Contexts/Control/Loops/OverLoop.cs

@@ -49,7 +49,7 @@ with @plr
         over &inventory
             with *item
             
-            Print "found item {ItemInfo *item type}"
+            Print "found item {*item -> type}"
         end
         # its important to remember that the variable type in "with" keyword 
         #  MUST match the value type inside the collection,

Code/ContextSystem/Contexts/ValueExpressionContext.cs

@@ -10,6 +10,7 @@
 using SER.Code.TokenSystem.Tokens;
 using SER.Code.TokenSystem.Tokens.Interfaces;
 using SER.Code.ValueSystem;
+using SER.Code.ValueSystem.PropertySystem;
 
 namespace SER.Code.ContextSystem.Contexts;
 
@@ -194,7 +195,22 @@ public override TryGet<Value> GetReturnValue()
         Value current = value;
         foreach (var prop in _propertyNames)
         {
-            if (!current.Properties.TryGetValue(prop, out var propInfo))
+            if (current is not IValueWithProperties propVal)
+            {
+                return $"{current} does not have any properties.";
+            }
+            
+            Console.WriteLine(propVal.Properties.Select(kvp => $"{kvp.Key} -> {kvp.Value.ReturnType}").JoinStrings(", "));
+            
+            IValueWithProperties.PropInfo? propInfo;
+            if (propVal.Properties is IValueWithProperties.IDynamicPropertyDictionary dynamicDict)
+            {
+                if (!dynamicDict.TryGetValue(prop, out propInfo))
+                {
+                    return $"{current} does not have property '{prop}'.";
+                }
+            }
+            else if (!propVal.Properties.TryGetValue(prop, out propInfo))
             {
                 return $"{current} does not have property '{prop}'.";
             }
@@ -223,7 +239,24 @@ public override TryAddTokenRes TryAddToken(BaseToken token)
         {
             foreach (var type in types)
             {
-                if (Value.GetPropertiesOfValue(type).TryGetValue(token.RawRep, out var property))
+                if (type == typeof(ReferenceValue))
+                {
+                    _exprRepr += $" {token.RawRep}";
+                    _lastValueType = new UnknownTypeOfValue();
+                    goto found;
+                }
+
+                var props = Value.GetPropertiesOfValue(type);
+                if (props is IValueWithProperties.IDynamicPropertyDictionary dynamicDict)
+                {
+                    if (dynamicDict.TryGetValue(token.RawRep, out var dynamicProp))
+                    {
+                        _exprRepr += $" {token.RawRep}";
+                        _lastValueType = dynamicProp.ReturnType;
+                        goto found;
+                    }
+                }
+                else if (props?.TryGetValue(token.RawRep, out var property) is true)
                 {
                     _exprRepr += $" {token.RawRep}";
                     _lastValueType = property.ReturnType;

Code/Examples/HotPotatoScript.cs

@@ -31,7 +31,7 @@ Wait 3s
             over {@potatoCarrier -> inventory}
                 with *item
 
-                if {ItemInfo *item type} isnt "GunA7"
+                if {*item -> type} isnt "GunA7"
                     continue
                 end
 

Code/Extensions/EnumExtensions.cs

@@ -1,13 +1,12 @@
-namespace SER.Code.Extensions;
+using System;
+using SER.Code.ValueSystem;
+
+namespace SER.Code.Extensions;
 
 public static class EnumExtensions
 {
-    public static IEnumerable<T> GetFlags<T>(this T value) where T : struct, Enum
+    public static EnumValue<T> ToEnumValue<T>(this T enumValue) where T : struct, Enum
     {
-        return from T flag in Enum.GetValues(typeof(T)) 
-            where Convert.ToUInt64(value) != 0
-            where Convert.ToUInt64(flag) != 0 
-            where value.HasFlag(flag) 
-            select flag;
+        return new EnumValue<T>(enumValue);
     }
-}
+}

Code/MethodSystem/MethodDescriptors/IReferenceResolvingMethod.cs

@@ -5,11 +5,17 @@
 using SER.Code.Helpers.ResultSystem;
 using SER.Code.MethodSystem.BaseMethods;
 using SER.Code.MethodSystem.Structures;
+using SER.Code.ValueSystem.PropertySystem;
 
 namespace SER.Code.MethodSystem;
 
 public static class MethodIndex
 {
+    static MethodIndex()
+    {
+        ReferencePropertyRegistry.Initialize();
+    }
+
     public static readonly Dictionary<string, Method> NameToMethodIndex = [];
     public static readonly Dictionary<FrameworkBridge.Type, List<Method>> FrameworkDependentMethods = [];
 

Code/MethodSystem/MethodIndex.cs

@@ -5,6 +5,7 @@
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.ArgumentSystem.Structures;
 using SER.Code.Exceptions;
+using SER.Code.Extensions;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.ValueSystem;
 
@@ -36,7 +37,7 @@ public override void Execute()
     {
         ReturnValue = (Args.GetOption("mode")) switch
         {
-            "state" => new StaticTextValue(Intercom.State.ToString()),
+            "state" => Intercom.State.ToEnumValue(),
             "speaker" => new PlayerValue(Player.ReadyList.ToList().Where(plr => plr.ReferenceHub == Intercom._singleton._curSpeaker)),
             "cooldown" => new DurationValue(TimeSpan.FromSeconds(Intercom.State == IntercomState.Cooldown ? Intercom._singleton.RemainingTime : 0)),
             "speechtimeleft" => new DurationValue(TimeSpan.FromSeconds(Intercom.State == IntercomState.InUse ? Intercom._singleton.RemainingTime : 0)),