(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
@@ -279,7 +279,7 @@ namespace Barotrauma
            {
                followTargetObjective.CloseEnough = ConvertUnits.ToSimUnits(rt.Range);
            }
-            if (retreatTarget != null)
+            else if (WeaponComponent is RepairTool rt)
            {
                SteeringManager.Reset();
                Mode = CombatMode.Retreat;
@@ -100,6 +100,31 @@ namespace Barotrauma
            {
 #if DEBUG
                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
+#endif
+                abandon = true;
+                return;
+            }
+            Vector2 gapDiff = Leak.WorldPosition - character.WorldPosition;
+            // TODO: use the collider size/reach?
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            {
+                HumanAIController.AnimController.Crouching = true;
+            }
+            float reach = ConvertUnits.ToSimUnits(repairTool.Range);
+            bool canOperate = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach;
+            if (canOperate)
+            {
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: "", requireEquip: true, operateTarget: Leak));
+            }
+            else
+            {
+                TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character, objectiveManager) { CloseEnough = reach * 0.75f });
+            }
+            var repairTool = weldingTool.GetComponent<RepairTool>();
+            if (repairTool == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
 #endif
                abandon = true;
                return;
@@ -74,6 +74,21 @@ namespace Barotrauma
            }
        }

+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -48,7 +48,10 @@ namespace Barotrauma
            this.useController = useController;
            if (useController)
            {
-                controller = component.Item.GetConnectedComponents<Controller>().FirstOrDefault();
+                //try finding the controller with the simpler non-recursive method first
+                controller =
+                        component.Item.GetConnectedComponents<Controller>().FirstOrDefault() ??
+                        component.Item.GetConnectedComponents<Controller>(recursive: true).FirstOrDefault();
            }
        }

@@ -83,6 +86,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -140,7 +140,10 @@ namespace Barotrauma
            {
                if (UseController)
                {
-                    ConnectedController = targetItem.Item.GetConnectedComponents<Controller>().FirstOrDefault();
+                    //try finding the controller with the simpler non-recursive method first
+                    ConnectedController = 
+                        targetItem.Item.GetConnectedComponents<Controller>().FirstOrDefault() ?? 
+                        targetItem.Item.GetConnectedComponents<Controller>(recursive: true).FirstOrDefault();
                }
                TargetEntity = targetItem.Item;
                TargetItemComponent = targetItem;
@@ -835,6 +835,35 @@ namespace Barotrauma
                    VoiceSetting = voiceSetting;
                }
            }
+
+            TextManager.LoadTextPacks(SelectedContentPackages);
+
+            //display error messages after all content packages have been loaded
+            //to make sure the package that contains text files has been loaded before we attempt to use TextManager
+            foreach (string missingPackagePath in missingPackagePaths)
+            {
+                DebugConsole.ThrowError(TextManager.Get("ContentPackageNotFound").Replace("[packagepath]", missingPackagePath));
+            }
+            foreach (ContentPackage incompatiblePackage in incompatiblePackages)
+            {
+                DebugConsole.ThrowError(TextManager.Get(incompatiblePackage.GameVersion <= new Version(0, 0, 0, 0) ? "IncompatibleContentPackageUnknownVersion" : "IncompatibleContentPackage")
+                                .Replace("[packagename]", incompatiblePackage.Name)
+                                .Replace("[packageversion]", incompatiblePackage.GameVersion.ToString())
+                                .Replace("[gameversion]", GameMain.Version.ToString()));
+            }
+            foreach (ContentPackage contentPackage in SelectedContentPackages)
+            {
+                bool packageOk = contentPackage.VerifyFiles(out List<string> errorMessages);
+                if (!packageOk)
+                {
+                    DebugConsole.ThrowError("Error in content package \"" + contentPackage.Name + "\":\n" + string.Join("\n", errorMessages));
+                    continue;
+                }
+                foreach (ContentFile file in contentPackage.Files)
+                {
+                    ToolBox.IsProperFilenameCase(file.Path);
+                }
+            }
            if (!SelectedContentPackages.Any())
            {
                var availablePackage = ContentPackage.List.FirstOrDefault(cp => cp.IsCompatible() && cp.CorePackage);
@@ -966,7 +995,22 @@ namespace Barotrauma

            foreach (XElement subElement in doc.Root.Elements())
            {
-                switch (subElement.Name.ToString().ToLowerInvariant())
+                gSettings = new XElement("graphicssettings");
+                doc.Root.Add(gSettings);
+            }
+
+            gSettings.ReplaceAttributes(
+                new XAttribute("particlelimit", ParticleLimit),
+                new XAttribute("lightmapscale", LightMapScale),
+                new XAttribute("specularity", SpecularityEnabled),
+                new XAttribute("chromaticaberration", ChromaticAberrationEnabled),
+                new XAttribute("losmode", LosMode),
+                new XAttribute("hudscale", HUDScale),
+                new XAttribute("inventoryscale", InventoryScale));
+
+            foreach (ContentPackage contentPackage in SelectedContentPackages)
+            {
+                if (contentPackage.Path.Contains(vanillaContentPackagePath))
                {
                    case "contentpackage":
                        string path = System.IO.Path.GetFullPath(subElement.GetAttributeString("path", ""));
@@ -1080,6 +1124,7 @@ namespace Barotrauma
                new XAttribute("autocheckupdates", AutoCheckUpdates),
                new XAttribute("musicvolume", musicVolume),
                new XAttribute("soundvolume", soundVolume),
+                new XAttribute("voicechatvolume", voiceChatVolume),
                new XAttribute("verboselogging", VerboseLogging),
                new XAttribute("savedebugconsolelogs", SaveDebugConsoleLogs),
                new XAttribute("enablesplashscreen", EnableSplashScreen),
@@ -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);                   
            }

@@ -588,6 +588,25 @@ namespace Barotrauma
            }
        }

+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
        public override Rectangle Rect
        {
            get