(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -90,6 +90,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
@@ -817,17 +836,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();
@@ -847,7 +866,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)