(d16942d30) Simplify.

2019-05-16 05:16:13 +03:00
parent bbce41fab0
commit 5b3696f7e4
10 changed files with 134 additions and 976 deletions
@@ -15,7 +15,11 @@ namespace Barotrauma
        public static List<Hull> hullList = new List<Hull>();
        public static List<EntityGrid> EntityGrids { get; } = new List<EntityGrid>();

-        public static bool ShowHulls = true;
+        public string DisplayName
+        {
+            get;
+            private set;
+        }

        public static bool EditWater, EditFire;
        public const float OxygenDistributionSpeed = 500.0f;
@@ -33,18 +37,43 @@ namespace Barotrauma
        public readonly Dictionary<string, SerializableProperty> properties;
        public Dictionary<string, SerializableProperty> SerializableProperties
        {
-            get { return properties; }
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
        }

-        private float lethalPressure;
+        public string DisplayName
+        {
+            get;
+            private set;
+        }

        private float surface, drawSurface;
        private float waterVolume;
        private float pressure;

-        private float oxygen;
+        public string DisplayName
+        {
+            get;
+            private set;
+        }

-        private bool update;
+        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 bool Visible = true;

@@ -56,654 +85,6 @@ namespace Barotrauma
                
        public List<Gap> ConnectedGaps;

-        public override string Name
-        {
-            get
-            {
-                return "Hull";
-            }
-        }
-        
-        [Editable, Serialize("", true)]
-        public string RoomName
-        {
-            get;
-            set;
-        }
-
-        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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 string DisplayName
-        {
-            get;
-            private set;
-        }
-
        private string roomName;
        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
        public string RoomName