(a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -731,7 +731,7 @@ namespace Barotrauma
                 if (IsSinglePlayer)
                 {
                     orderGiver.Speak(
-                        order.GetChatMessage("", orderGiver.CurrentHull?.RoomName, givingOrderToSelf: character == orderGiver), ChatMessageType.Order);
+                        order.GetChatMessage("", orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver), ChatMessageType.Order);
                 }
                 else
                 {
@@ -748,7 +748,7 @@ namespace Barotrauma
             if (IsSinglePlayer)
             {
                 orderGiver?.Speak(
-                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.RoomName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
+                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
             }
             else if (orderGiver != null)
             {

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs

@@ -221,7 +221,7 @@ namespace Barotrauma.Items.Components
                 {                    
                     hullInfoFrame.RectTransform.ScreenSpaceOffset = hullFrame.Rect.Center;
                     hullInfoFrame.Visible = true;
-                    hullNameText.Text = hull.RoomName;
+                    hullNameText.Text = hull.DisplayName;
 
                     foreach (Hull linkedHull in hullData.LinkedHulls)
                     {

Barotrauma/BarotraumaClient/Source/Networking/ChatMessage.cs

@@ -61,7 +61,7 @@ namespace Barotrauma.Networking
                 {
                     orderOption = order.Options[optionIndex];
                 }
-                txt = order.GetChatMessage(targetCharacter?.Name, senderCharacter?.CurrentHull?.RoomName, givingOrderToSelf: targetCharacter == senderCharacter, orderOption: orderOption);
+                txt = order.GetChatMessage(targetCharacter?.Name, senderCharacter?.CurrentHull?.DisplayName, givingOrderToSelf: targetCharacter == senderCharacter, orderOption: orderOption);
 
                 if (order.TargetAllCharacters)
                 {

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

@@ -267,7 +267,7 @@ namespace Barotrauma
                 if (GameMain.GameSession?.CrewManager != null && GameMain.GameSession.CrewManager.AddOrder(newOrder, newOrder.FadeOutTime))
                 {
                     Character.Speak(
-                        newOrder.GetChatMessage("", Character.CurrentHull?.RoomName, givingOrderToSelf: false), ChatMessageType.Order);
+                        newOrder.GetChatMessage("", Character.CurrentHull?.DisplayName, givingOrderToSelf: false), ChatMessageType.Order);
                 }
             }
         }
@@ -286,7 +286,7 @@ namespace Barotrauma
 
             if (Character.PressureTimer > 50.0f && Character.CurrentHull != null)
             {
-                Character.Speak(TextManager.Get("DialogPressure").Replace("[roomname]", Character.CurrentHull.RoomName), null, 0, "pressure", 30.0f);
+                Character.Speak(TextManager.Get("DialogPressure").Replace("[roomname]", Character.CurrentHull.DisplayName), null, 0, "pressure", 30.0f);
             }
         }
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -131,8 +131,8 @@ namespace Barotrauma
                     character.AIController.SelectTarget(currentTarget.AiTarget);
                     string errorMsg = null;
 #if DEBUG
-                    bool isRoomNameFound = currentTarget.RoomName != null;
+                    bool isRoomNameFound = currentTarget.DisplayName != null;
-                    errorMsg = "(Character " + character.Name + " idling, target " + (isRoomNameFound ? currentTarget.RoomName : currentTarget.ToString()) + ")";
+                    errorMsg = "(Character " + character.Name + " idling, target " + (isRoomNameFound ? currentTarget.DisplayName : currentTarget.ToString()) + ")";
 #endif
                     var path = PathSteering.PathFinder.FindPath(character.SimPosition, currentTarget.SimPosition, errorMsg);
                     PathSteering.SetPath(path);

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs

@@ -83,7 +83,7 @@ namespace Barotrauma
                 if (character.SelectedCharacter == null)
                 {
                     character?.Speak(TextManager.Get("DialogFoundUnconsciousTarget")
-                        .Replace("[targetname]", targetCharacter.Name).Replace("[roomname]", character.CurrentHull.RoomName),
+                        .Replace("[targetname]", targetCharacter.Name).Replace("[roomname]", character.CurrentHull.DisplayName),
                         null, 1.0f,
                         "foundunconscioustarget" + targetCharacter.Name, 60.0f);
                 }

Barotrauma/BarotraumaShared/Source/GameSession/CargoManager.cs

@@ -108,7 +108,7 @@ namespace Barotrauma
             }
 
 #if CLIENT
-            new GUIMessageBox("", TextManager.Get("CargoSpawnNotification").Replace("[roomname]", cargoRoom.RoomName));
+            new GUIMessageBox("", TextManager.Get("CargoSpawnNotification").Replace("[roomname]", cargoRoom.DisplayName));
 #endif
 
             Dictionary<ItemContainer, int> availableContainers = new Dictionary<ItemContainer, int>();

Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs

@@ -338,11 +338,11 @@ namespace Barotrauma.Items.Components
                 sinTime = 0;
                 if (!leak.FlowTargetHull.ConnectedGaps.Any(g => !g.IsRoomToRoom && g.Open > 0.0f))
                 {
-                    character.Speak(TextManager.Get("DialogLeaksFixed").Replace("[roomname]", leak.FlowTargetHull.RoomName), null, 0.0f, "leaksfixed", 10.0f);
+                    character.Speak(TextManager.Get("DialogLeaksFixed").Replace("[roomname]", leak.FlowTargetHull.DisplayName), null, 0.0f, "leaksfixed", 10.0f);
                 }
                 else
                 {
-                    character.Speak(TextManager.Get("DialogLeakFixed").Replace("[roomname]", leak.FlowTargetHull.RoomName), null, 0.0f, "leakfixed", 10.0f);
+                    character.Speak(TextManager.Get("DialogLeakFixed").Replace("[roomname]", leak.FlowTargetHull.DisplayName), null, 0.0f, "leakfixed", 10.0f);
                 }
             }
 

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -71,6 +71,25 @@ namespace Barotrauma
             set;
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true)]
+        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
@@ -798,17 +817,17 @@ namespace Barotrauma
             }
 
             if (roomItems.Contains("reactor"))
-                return TextManager.Get("ReactorRoom");
+                return "RoomName.ReactorRoom";
             else if (roomItems.Contains("engine"))
-                return TextManager.Get("EngineRoom");
+                return "RoomName.EngineRoom";
             else if (roomItems.Contains("steering") && roomItems.Contains("sonar"))
-                return TextManager.Get("CommandRoom");
+                return "RoomName.CommandRoom";
             else if (roomItems.Contains("ballast"))
-                return TextManager.Get("Ballast");
+                return "RoomName.Ballast";
 
             if (ConnectedGaps.Any(g => !g.IsRoomToRoom && g.ConnectedDoor != null))
             {
-                return TextManager.Get("Airlock");
+                return "RoomName.Airlock";
             }
 
             Rectangle subRect = Submarine.CalculateDimensions();
@@ -828,7 +847,7 @@ namespace Barotrauma
             else
                 roomPos |= Alignment.Right;
 
-            return TextManager.Get("Sub" + roomPos.ToString());
+            return "RoomName.Sub" + roomPos.ToString();
         }
 
         public static Hull Load(XElement element, Submarine submarine)

Barotrauma/BarotraumaShared/Source/Networking/OrderChatMessage.cs

@@ -20,7 +20,7 @@ namespace Barotrauma.Networking
 
         public OrderChatMessage(Order order, string orderOption, Entity targetEntity, Character targetCharacter, Character sender)
             : this(order, orderOption,
-                  order.GetChatMessage(targetCharacter?.Name, sender?.CurrentHull?.RoomName, givingOrderToSelf: targetCharacter == sender, orderOption: orderOption),
+                  order.GetChatMessage(targetCharacter?.Name, sender?.CurrentHull?.DisplayName, givingOrderToSelf: targetCharacter == sender, orderOption: orderOption),
                   targetEntity, targetCharacter, sender)
         {
         }