(8ba0db51b) Load connection displaynames from the prefab xml if not present in a sub or itemassembly xml, use display names in the connection panel interface

2019-05-16 06:04:24 +03:00
parent c73fe6e132
commit 4b9fbe596c
13 changed files with 241 additions and 261 deletions
@@ -810,6 +810,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,6 +212,33 @@ 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>();

@@ -82,9 +82,36 @@ namespace Barotrauma.Items.Components
            IsOutput = (element.Name.ToString() == "output");
            Name = element.GetAttributeString("name", (IsOutput) ? "output" : "input");

-            DisplayName = element.Attributes("displayname") == null ? 
-                Name :
-                TextManager.GetServerMessage(element.GetAttributeString("displayname", Name));
+            //if displayname is not present, attempt to find it from the prefab
+            if (element.Attribute("displayname") == null)
+            {
+                foreach (XElement subElement in item.Prefab.ConfigElement.Elements())
+                {
+                    if (subElement.Name.ToString().ToLowerInvariant() != "connectionpanel") { continue; }
+                    
+                    foreach (XElement connectionElement in subElement.Elements())
+                    {
+                        if (connectionElement.Name.ToString() != element.Name.ToString()) { continue; }
+                        
+                        string prefabConnectionName = element.GetAttributeString("name", (IsOutput) ? "output" : "input");
+                        if (prefabConnectionName == Name)
+                        {
+                            DisplayName = TextManager.GetServerMessage(connectionElement.GetAttributeString("displayname", Name));
+                        }
+                    }                    
+                }
+#if DEBUG
+                if (string.IsNullOrEmpty(DisplayName))
+                {
+                    DebugConsole.ThrowError("Missing display name in connection " + item.Name + ": " + Name);
+                }
+#endif
+            }
+            else
+            {
+                DisplayName = TextManager.GetServerMessage(element.GetAttributeString("displayname", Name));
+            }
+


            IsPower = Name == "power_in" || Name == "power" || Name == "power_out";