(067f4d694) The recursive version of GetConnectedComponents can traverse between wifi components, use recursive GetConnectedComponents when finding the controller used to operate some item (-> AI characters can now figure out how to operate a turret that's connected to a periscope through wifi components, relays, etc)

2019-05-16 05:41:41 +03:00
parent 1d5de494cd
commit 5b2bf67d66
14 changed files with 458 additions and 100 deletions
@@ -867,6 +867,25 @@ namespace Barotrauma.Items.Components
                    }
                }
                
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                if (targetItem.Prefab.DeconstructItems.Any())
                {
                    inputContainer.Inventory.RemoveItem(targetItem);
@@ -212,33 +212,6 @@ namespace Barotrauma.Items.Components
            }
        }

-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
-        struct ObstacleDebugInfo
-        {
-            public Vector2 Point1;
-            public Vector2 Point2;
-
-            public Vector2? Intersection;
-
-            public float Dot;
-
-            public Vector2 AvoidStrength;
-
-            public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength)
-            {
-                Point1 = edge.Point1;
-                Point2 = edge.Point2;
-                Intersection = intersection;
-                Dot = dot;
-                AvoidStrength = avoidStrength;
-            }
-        }
-
        //edge point 1, edge point 2, avoid strength
        private List<ObstacleDebugInfo> debugDrawObstacles = new List<ObstacleDebugInfo>();

@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;

 namespace Barotrauma.Items.Components
@@ -74,9 +75,9 @@ namespace Barotrauma.Items.Components
            return HasRequiredContainedItems(true);
        }
        
-        private List<WifiComponent> GetReceiversInRange()
+        public IEnumerable<WifiComponent> GetReceiversInRange()
        {
-            return list.FindAll(w => w != this && w.CanReceive(this));
+            return list.Where(w => w != this && w.CanReceive(this));
        }

        public bool CanReceive(WifiComponent sender)
@@ -1584,6 +1584,10 @@ namespace Barotrauma
            {
                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
            }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
            ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);

            if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }
@@ -1731,7 +1735,6 @@ namespace Barotrauma
            {
                HashSet<Connection> alreadySearched = new HashSet<Connection>();
                GetConnectedComponentsRecursive(alreadySearched, connectedComponents);
-
                return connectedComponents;
            }

@@ -1760,18 +1763,7 @@ namespace Barotrauma
            {
                if (alreadySearched.Contains(c)) { continue; }
                alreadySearched.Add(c);
-
-                var recipients = c.Recipients;
-                foreach (Connection recipient in recipients)
-                {
-                    if (alreadySearched.Contains(recipient)) { continue; }
-                    var component = recipient.Item.GetComponent<T>();                    
-                    if (component != null)
-                    {
-                        connectedComponents.Add(component);
-                    }
-                    recipient.Item.GetConnectedComponentsRecursive<T>(alreadySearched, connectedComponents);                   
-                }
+                GetConnectedComponentsRecursive(c, alreadySearched, connectedComponents);
            }
        }

@@ -1807,13 +1799,28 @@ namespace Barotrauma
            foreach (Connection recipient in recipients)
            {
                if (alreadySearched.Contains(recipient)) { continue; }
-
                var component = recipient.Item.GetComponent<T>();                    
                if (component != null)
                {
                    connectedComponents.Add(component);
                }

+                //connected to a wifi component -> see which other wifi components it can communicate with
+                var wifiComponent = recipient.Item.GetComponent<WifiComponent>();
+                if (wifiComponent != null && wifiComponent.CanTransmit())
+                {
+                    foreach (var wifiReceiver in wifiComponent.GetReceiversInRange())
+                    {
+                        var receiverConnections = wifiReceiver.Item.Connections;
+                        if (receiverConnections == null) { continue; }
+                        foreach (Connection wifiOutput in receiverConnections)
+                        {
+                            if ((wifiOutput.IsOutput == recipient.IsOutput) || alreadySearched.Contains(wifiOutput)) { continue; }
+                            GetConnectedComponentsRecursive(wifiOutput, alreadySearched, connectedComponents);
+                        }
+                    }
+                }
+
                recipient.Item.GetConnectedComponentsRecursive(recipient, alreadySearched, connectedComponents);                   
            }