Change the movable contents to special list, and make view include Co…

…ntents (#2050) Co-authored-by: wixoaGit <[email protected]>
OpenDreamProject · Jan 17, 2025 · 0863030 · 0863030
1 parent e721e2b
commit 0863030
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 36 deletions.
diff --git a/OpenDreamRuntime/Objects/Types/DreamList.cs b/OpenDreamRuntime/Objects/Types/DreamList.cs
@@ -977,20 +977,10 @@ private ImmutableAppearance GetAppearance() {
 }
 
 // client.screen list
-public sealed class ClientScreenList : DreamList {
-    private readonly DreamObjectTree _objectTree;
-    private readonly ServerScreenOverlaySystem? _screenOverlaySystem;
-
-    private readonly DreamConnection _connection;
+public sealed class ClientScreenList(DreamObjectTree objectTree, ServerScreenOverlaySystem? screenOverlaySystem, DreamConnection connection)
+    : DreamList(objectTree.List.ObjectDefinition, 0) {
     private readonly List<DreamValue> _screenObjects = new();
 
-    public ClientScreenList(DreamObjectTree objectTree, ServerScreenOverlaySystem? screenOverlaySystem, DreamConnection connection) : base(objectTree.List.ObjectDefinition, 0) {
-        _objectTree = objectTree;
-        _screenOverlaySystem = screenOverlaySystem;
-
-        _connection = connection;
-    }
-
     public override bool ContainsValue(DreamValue value) {
         return _screenObjects.Contains(value);
     }
@@ -1014,15 +1004,15 @@ public override void AddValue(DreamValue value) {
         if (!value.TryGetValueAsDreamObject<DreamObjectMovable>(out var movable))
             return;
 
-        _screenOverlaySystem?.AddScreenObject(_connection, movable);
+        screenOverlaySystem?.AddScreenObject(connection, movable);
         _screenObjects.Add(value);
     }
 
     public override void RemoveValue(DreamValue value) {
         if (!value.TryGetValueAsDreamObject<DreamObjectMovable>(out var movable))
             return;
 
-        _screenOverlaySystem?.RemoveScreenObject(_connection, movable);
+        screenOverlaySystem?.RemoveScreenObject(connection, movable);
         _screenObjects.Remove(value);
     }
 
@@ -1033,7 +1023,7 @@ public override void Cut(int start = 1, int end = 0) {
             if (!_screenObjects[i].TryGetValueAsDreamObject<DreamObjectMovable>(out var movable))
                 continue;
 
-            _screenOverlaySystem?.RemoveScreenObject(_connection, movable);
+            screenOverlaySystem?.RemoveScreenObject(connection, movable);
         }
 
         _screenObjects.RemoveRange(start - 1, end - start);
@@ -1044,7 +1034,6 @@ public override int GetLength() {
     }
 }
 
-
 // client.images list
 public sealed class ClientImagesList : DreamList {
     private readonly ServerClientImagesSystem? _clientImagesSystem;
@@ -1171,15 +1160,15 @@ public override void AddValue(DreamValue value) {
         if (!value.TryGetValueAsDreamObject<DreamObjectMovable>(out var movable))
             throw new Exception($"Cannot add {value} to turf contents");
 
-        movable.SetVariable("loc", new(Cell.Turf));
+        movable.SetLoc(Cell.Turf);
     }
 
     public override void Cut(int start = 1, int end = 0) {
         int movableCount = Cell.Movables.Count + 1;
         if (end == 0 || end > movableCount) end = movableCount;
 
         for (int i = start; i < end; i++) {
-            Cell.Movables[i - 1].SetVariable("loc", DreamValue.Null);
+            Cell.Movables[i - 1].SetLoc(null);
         }
     }
 
@@ -1257,6 +1246,81 @@ public override int GetLength() {
     }
 }
 
+// mob.contents, obj.contents list
+public sealed class MovableContentsList(DreamObjectDefinition listDef, DreamObjectMovable owner, TransformComponent transform) : DreamList(listDef, 0) {
+    public override DreamValue GetValue(DreamValue key) {
+        if (!key.TryGetValueAsInteger(out var index))
+            throw new Exception($"Invalid index into movable contents list: {key}");
+        if (index < 1 || index > transform.ChildCount)
+            throw new Exception($"Out of bounds index on movable contents list: {index}");
+
+        using var childEnumerator = transform.ChildEnumerator;
+        while (index >= 1) {
+            childEnumerator.MoveNext(out EntityUid child);
+
+            if (index == 1) {
+                if (AtomManager.TryGetMovableFromEntity(child, out var childObject))
+                    return new DreamValue(childObject);
+                else
+                    throw new Exception($"Invalid child in movable contents list: {child}");
+            }
+
+            index--;
+        }
+
+        throw new Exception($"Out of bounds index on movable contents list after iterating: {key}");
+    }
+
+    public override List<DreamValue> GetValues() {
+        List<DreamValue> values = new List<DreamValue>(transform.ChildCount);
+        using var childEnumerator = transform.ChildEnumerator;
+
+        while (childEnumerator.MoveNext(out EntityUid child)) {
+            if (!AtomManager.TryGetMovableFromEntity(child, out var childObject))
+                continue;
+
+            values.Add(new DreamValue(childObject));
+        }
+
+        return values;
+    }
+
+    public override void SetValue(DreamValue key, DreamValue value, bool allowGrowth = false) {
+        throw new Exception("Cannot set an index of movable contents list");
+    }
+
+    public override void AddValue(DreamValue value) {
+        if (!value.TryGetValueAsDreamObject<DreamObjectMovable>(out var dreamObject))
+            throw new Exception($"Cannot add {value} to movable contents");
+
+        dreamObject.SetLoc(owner);
+    }
+
+    public override void RemoveValue(DreamValue value) {
+        if (!value.TryGetValueAsDreamObject<DreamObjectMovable>(out var movable))
+            throw new Exception($"Cannot remove {value} from movable contents");
+        if (movable.Loc != owner)
+            return; // This object wasn't in our contents to begin with
+
+        movable.SetLoc(null);
+    }
+
+    public override bool ContainsValue(DreamValue value) {
+        if (!value.TryGetValueAsDreamObject<DreamObjectMovable>(out var dreamObject))
+            return false;
+
+        return dreamObject.Loc == owner;
+    }
+
+    public override void Cut(int start = 1, int end = 0) {
+        // TODO
+    }
+
+    public override int GetLength() {
+        return transform.ChildCount;
+    }
+}
+
 // proc args list
 internal sealed class ProcArgsList(DreamObjectDefinition listDef, DMProcState state) : DreamList(listDef, 0) {
     public override DreamValue GetValue(DreamValue key) {

diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectMovable.cs b/OpenDreamRuntime/Objects/Types/DreamObjectMovable.cs
@@ -1,4 +1,4 @@
-using OpenDreamRuntime.Procs;
+using OpenDreamRuntime.Procs;
 using OpenDreamRuntime.Rendering;
 using OpenDreamShared.Dream;
 using Robust.Shared.Map;
@@ -18,20 +18,21 @@ public class DreamObjectMovable : DreamObjectAtom {
     public int Z => (int)_transformComponent.MapID;
 
     private readonly TransformComponent _transformComponent;
-
+    private readonly MovableContentsList _contents;
+    private string? _screenLoc;
 
     private string? ScreenLoc {
         get => _screenLoc;
         set => SetScreenLoc(value);
     }
 
-    private string? _screenLoc;
-
     public DreamObjectMovable(DreamObjectDefinition objectDefinition) : base(objectDefinition) {
         Entity = AtomManager.CreateMovableEntity(this);
         SpriteComponent = EntityManager.GetComponent<DMISpriteComponent>(Entity);
         AtomManager.SetSpriteAppearance((Entity, SpriteComponent), AtomManager.GetAppearanceFromDefinition(ObjectDefinition));
+
         _transformComponent = EntityManager.GetComponent<TransformComponent>(Entity);
+        _contents = new MovableContentsList(ObjectTree.List.ObjectDefinition, this, _transformComponent);
     }
 
     public override void Initialize(DreamProcArguments args) {
@@ -80,18 +81,7 @@ protected override bool TryGetVar(string varName, out DreamValue value) {
                 value = (ScreenLoc != null) ? new(ScreenLoc) : DreamValue.Null;
                 return true;
             case "contents":
-                DreamList contents = ObjectTree.CreateList();
-
-                using (var childEnumerator = _transformComponent.ChildEnumerator) {
-                    while (childEnumerator.MoveNext(out EntityUid child)) {
-                        if (!AtomManager.TryGetMovableFromEntity(child, out var childAtom))
-                            continue;
-
-                        contents.AddValue(new DreamValue(childAtom));
-                    }
-                }
-
-                value = new(contents);
+                value = new(_contents);
                 return true;
             case "locs":
                 // Unimplemented; just return a list containing src.loc
@@ -150,7 +140,7 @@ protected override void SetVar(string varName, DreamValue value) {
         }
     }
 
-    private void SetLoc(DreamObjectAtom? loc) {
+    public void SetLoc(DreamObjectAtom? loc) {
         Loc = loc;
         if (TransformSystem == null)
             return;

diff --git a/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs b/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs
@@ -1,4 +1,4 @@
-using System.Buffers;
+using System.Buffers;
 using OpenDreamRuntime.Objects;
 using OpenDreamRuntime.Resources;
 using OpenDreamShared.Dream;
@@ -3084,6 +3084,14 @@ public static DreamValue NativeProc_view(NativeProc.Bundle bundle, DreamObject?
         if (center is null)
             return new(view);
 
+        if (center.TryGetVariable("contents", out var centerContents) && centerContents.TryGetValueAsDreamList(out var centerContentsList)) {
+            foreach (var item in centerContentsList.GetValues()) {
+                view.AddValue(item);
+            }
+        }
+
+        // Center gets included during the walk through the tiles
+
         var eyePos = bundle.AtomManager.GetAtomPosition(center);
         var viewData = DreamProcNativeHelpers.CollectViewData(bundle.AtomManager, bundle.MapManager, eyePos, range);