visually connect to different layers

stilnat · Jan 6, 2025 · a985b93 · a985b93
1 parent 4f823d2
commit a985b93
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Atmos/AtmosFilterRSo.asset b/Assets/Content/Data/TileMap/Resources/Structures/Atmos/AtmosFilterRSo.asset
@@ -12,11 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3}
   m_Name: AtmosFilterRSo
   m_EditorClassIdentifier: 
-  prefab: {fileID: 5199170345094387172, guid: 420c8757d9e32fa43bee79d6c980fd19, type: 3}
-  icon: {fileID: 0}
-  layer: 11
-  genericType: 1
-  specificType: 0
-  width: 1
-  height: 1
-  isLarge: 0
+  _prefab: {fileID: 5199170345094387172, guid: 420c8757d9e32fa43bee79d6c980fd19, type: 3}
+  _icon: {fileID: 0}
+  _layer: 1
+  _genericType: 1
+  _specificType: 0
+  _width: 1
+  _height: 1
+  _isLarge: 0
diff --git a/Assets/Scripts/SS3D/Systems/Atmospherics/AtmosTrinaryDeviceAdjacencyConnector.cs b/Assets/Scripts/SS3D/Systems/Atmospherics/AtmosTrinaryDeviceAdjacencyConnector.cs
@@ -29,14 +29,16 @@ public class AtmosTrinaryDeviceAdjacencyConnector : NetworkActor, IAdjacencyConn
         /// </summary>
         private bool _initialized;
 
+        public AdjacencyMap Connections => _pipeLayerConnections;
+
         public bool UpdateSingleConnection(Direction dir, PlacedTileObject neighbourObject, bool updateNeighbour)
         {
             Setup();
 
             bool isConnected = IsConnected(neighbourObject);
             bool isUpdated = _pipeLayerConnections.SetConnection(dir, isConnected);
 
-            if (isUpdated && neighbourObject)
+            if (isUpdated && neighbourObject && updateNeighbour)
             {
                 neighbourObject.UpdateSingleAdjacency(TileHelper.GetOpposite(dir), _placedObject, false);
             }
@@ -73,11 +75,9 @@ public bool IsConnected(PlacedTileObject neighbourObject)
                 || neighbourObject.WorldOrigin == GetComponent<PlacedTileObject>().WorldOrigin - twoDForward
                 || neighbourObject.WorldOrigin == GetComponent<PlacedTileObject>().WorldOrigin + twoDRight;
 
-            // Only connect to pipes of the same layer as the set up trinary device layer
-            if (neighbourObject.TryGetComponent(out PipeAdjacencyConnector neighbourConnector))
-            {
-                isConnected &= GetComponent<TrinaryAtmosDevice>().PipeLayer == neighbourObject.Layer;
-            }
+            // Only connect if not already connected to something else.
+            isConnected &= _placedObject.NeighbourAtDirectionOf(neighbourObject, out Direction neighbourDirection)
+                && !_pipeLayerConnections.HasConnection(neighbourDirection);
 
             return isConnected;
         }

diff --git a/Assets/Scripts/SS3D/Systems/Atmospherics/PipeAdjacencyConnector.cs b/Assets/Scripts/SS3D/Systems/Atmospherics/PipeAdjacencyConnector.cs
@@ -80,7 +80,7 @@ public bool UpdateSingleConnection(Direction dir, PlacedTileObject neighbourObje
 
             if (isUpdated)
             {
-                if (neighbourObject)
+                if (neighbourObject && updateNeighbour)
                 {
                     neighbourObject.UpdateSingleAdjacency(TileHelper.GetOpposite(dir), _placedObject, false);
                 }
@@ -128,8 +128,9 @@ public bool IsConnected(PlacedTileObject neighbourObject)
                 isConnected &= valve.IsOpen;
             }
 
-            if (neighbourObject.TryGetComponent(out TrinaryAtmosDevice filter))
+            if (neighbourObject.TryGetComponent(out AtmosTrinaryDeviceAdjacencyConnector filter))
             {
+                // This pipe connects to TrinaryAtmosDevice only if it's placed behind, in front or on one of its side
                 isConnected &= tileObject.WorldOrigin == neighbourObject.WorldOrigin + neighbourObjectTwoDForward
                     || tileObject.WorldOrigin == neighbourObject.WorldOrigin - neighbourObjectTwoDForward
                     || tileObject.WorldOrigin == neighbourObject.WorldOrigin + neighbourObjectTwoDRight;
@@ -140,11 +141,14 @@ public bool IsConnected(PlacedTileObject neighbourObject)
                 // Can't connect if connected to more than one other pipe
                 isConnected &= _pipeLayerConnections.ConnectionCount <= 1;
 
-                // If connected to one pipe already, connect only if this pipe is opposite to the machinery.
+                // If connected to one pipe already, connect only if the neighbour pipe is opposite to the machinery.
                 if (_pipeLayerConnections.ConnectionCount == 1)
                 {
                     isConnected &= _pipeLayerConnections.GetSingleConnection() == TileHelper.GetOpposite(neighbourDirection);
                 }
+
+                // If the device is already connected does not connect
+                isConnected &= !filter.Connections.HasConnection(TileHelper.GetOpposite(neighbourDirection));
             }
 
             if (

diff --git a/Assets/Scripts/SS3D/Systems/Atmospherics/Pipes/PipeSystem.cs b/Assets/Scripts/SS3D/Systems/Atmospherics/Pipes/PipeSystem.cs
@@ -112,7 +112,7 @@ public bool TryGetAtmosPipe(Vector3 worldPosition, TileLayer layer, out IAtmosPi
             atmosPipe = null;
             SingleTileLocation tileLocation = Subsystems.Get<TileSystem>().CurrentMap.GetTileLocation(layer, worldPosition) as SingleTileLocation;
 
-            if (!tileLocation.TryGetPlacedObject(out PlacedTileObject placedTileObject))
+            if (tileLocation == null || !tileLocation.TryGetPlacedObject(out PlacedTileObject placedTileObject))
             {
                 return false;
             }