Unstable 1.1.14.0

2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -37,7 +37,20 @@ namespace Barotrauma.Items.Components

        [Serialize("", IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
        public string OwnerName { get; set; }
-        
+
+        private string ownerNameLocalized;
+        [Serialize("", IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
+        public string OwnerNameLocalized 
+        {
+            get { return ownerNameLocalized; }
+            set 
+            { 
+                if (value.IsNullOrWhiteSpace()) { return; }
+                ownerNameLocalized = value;
+                OwnerName = TextManager.Get(value).Fallback(value).Value;
+            }
+        }
+
        [Serialize("", IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
        public Identifier OwnerJobId { get; set; }

@@ -67,6 +80,9 @@ namespace Barotrauma.Items.Components
        [Serialize("0,0", IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
        public Vector2 OwnerSheetIndex { get; set; }

+        [Serialize(false, IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
+        public bool SpawnPointTagsGiven { get; set; }
+
        public IdCard(Item item, ContentXElement element) : base(item, element) { }

        public void Initialize(WayPoint spawnPoint, Character character)