(461eade89) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs

@@ -388,6 +388,18 @@ namespace Barotrauma
                         buttonPressCooldown = ButtonPressInterval;
                         break;
                     }
+                    else
+                    {
+                        if (!door.HasRequiredItems(character, false) && shouldBeOpen)
+                        {
+                            currentPath.Unreachable = true;
+                            return;
+                        }
+
+                        door.Item.TryInteract(character, false, true, true);
+                        buttonPressCooldown = ButtonPressInterval;
+                        break;
+                    }
                 }
             }
         }
@@ -414,20 +426,12 @@ namespace Barotrauma
                         if (!nextNode.Waypoint.ConnectedDoor.HasRequiredItems(character, false)) { return null; }
                     }
 
-                if (!canBreakDoors)
-                {
-                    //door closed and the character can't open doors -> node can't be traversed
-                    if (!canOpenDoors || character.LockHands) return null;
-
-                    var doorButtons = nextNode.Waypoint.ConnectedDoor.Item.GetConnectedComponents<Controller>();
-                    if (!doorButtons.Any()) return null;
-
                     foreach (Controller button in doorButtons)
                     {
                         if (Math.Sign(button.Item.Position.X - nextNode.Waypoint.Position.X) !=
-                            Math.Sign(node.Position.X - nextNode.Position.X)) continue;
+                            Math.Sign(node.Position.X - nextNode.Position.X)) { continue; }
 
-                        if (!button.HasRequiredItems(character, false)) return null;
+                        if (!button.HasRequiredItems(character, false)) { return null; }
                     }
                 }
             }

Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs

@@ -190,7 +190,7 @@ namespace Barotrauma.Items.Components
             get { return name; }
         }
         
-        [Editable, Serialize("", true)]
+        [Editable, Serialize("", true, translationTextTag: "ItemMsg")]
         public string Msg
         {
             get;

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -280,6 +280,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

Barotrauma/BarotraumaShared/Source/TextPack.cs

@@ -37,6 +37,7 @@ namespace Barotrauma
                 text = text.Replace("&", "&");
                 text = text.Replace("&lt;", "<");
                 text = text.Replace("&gt;", ">");
+                text = text.Replace("&quot;", "\"");
                 infoList.Add(text);
             }
         }