(add7a8fe6) Fixed: Error in localization when importing npc conversations. Added: proofread englishvanilla

Barotrauma/BarotraumaClient/Source/Utils/LocalizationCSVtoXML.cs

@@ -151,6 +151,7 @@ namespace Barotrauma
 
             for (int i = traitStart + NPCPersonalityTrait.List.Count; i < csvContent.Length; i++) // Conversations
             {
+                string[] presplit = csvContent[i].Split(','); // Handling speaker index fetching, somehow doesn't work with the regex
                 string[] split = SplitCSV(csvContent[i]);
 
                 int emptyFields = 0;
@@ -172,20 +173,20 @@ namespace Barotrauma
                     continue;
                 }
 
-                string speaker = split[1];
+                string speaker = presplit[1];
-                int depthIndex = int.Parse(split[2]);
+                int depthIndex = int.Parse(presplit[2]);
                 // 3 = original line
                 string line = split[4].Replace("\"", "");
                 string flags = split[5].Replace("\"", "");
                 string allowedJobs = split[6].Replace("\"", "");
                 string speakerTags = split[7].Replace("\"", "");
-                string minIntensity = split[8].Replace("\"", "");
+                string minIntensity = split[8].Replace("\"", "").Replace(",", ".");
-                string maxIntensity = split[9].Replace("\"", "");
+                string maxIntensity = split[9].Replace("\"", "").Replace(",", ".");
 
                 string element =
                     $"{GetIndenting(depthIndex)}" +
                     $"<Conversation line=\"{line}\" " +
-                    $"{GetVariable("speaker" ,speaker)}" +
+                    $"{GetVariable("speaker", speaker)}" +
                     $"{GetVariable("flags", flags)}" +
                     $"{GetVariable("allowedjobs", allowedJobs)}" +
                     $"{GetVariable("speakertags", speakerTags)}" +

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

@@ -388,18 +388,6 @@ 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;
-                    }
                 }
             }
         }
@@ -426,12 +414,20 @@ 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, translationTextTag: "ItemMsg")]
+        [Editable, Serialize("", true)]
         public string Msg
         {
             get;

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

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