(aebb26541) Added localizable connection names to all items (TODO: display in the connection panel interface, load from prefab if the value is not present in a sub or ItemAssembly file)

2019-05-16 06:03:51 +03:00
parent 392040c29c
commit f259748910
18 changed files with 144 additions and 324 deletions
@@ -772,6 +772,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>();

@@ -12,6 +12,7 @@ namespace Barotrauma.Items.Components
        public const int MaxLinked = 5;

        public readonly string Name;
+        public readonly string DisplayName;

        private Wire[] wires;
        public IEnumerable<Wire> Wires
@@ -81,6 +82,11 @@ 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));
+
+
            IsPower = Name == "power_in" || Name == "power" || Name == "power_out";

            effects = new List<StatusEffect>();