Unstable 0.1500.0.0

2021-08-26 21:08:21 +09:00
parent 265a2e7ab3
commit 501e02c026
245 changed files with 9775 additions and 2034 deletions
@@ -1,11 +1,29 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;

 namespace Barotrauma.Items.Components
 {
    partial class IdCard : Pickable
    {
+        [Serialize(CharacterTeamType.None, true, alwaysUseInstanceValues: true)]
+        public CharacterTeamType TeamID
+        {
+            get;
+            set;
+        }
+
+        [Serialize(0, true, alwaysUseInstanceValues: true)]
+        public int SubmarineSpecificID
+        {
+            get;
+            set;
+        }
+
+        private JobPrefab cachedJobPrefab;
+        private string cachedName;
+
        public IdCard(Item item, XElement element) : base(item, element)
        {

@@ -20,6 +38,8 @@ namespace Barotrauma.Items.Components
                item.AddTag("jobid:" + info.Job.Prefab.Identifier);
            }

+            TeamID = info.TeamID;
+
            var head = info.Head;

            if (info != null && head != null)
@@ -50,5 +70,48 @@ namespace Barotrauma.Items.Components
            base.Unequip(character);
            character.Info?.CheckDisguiseStatus(true, this);
        }
+
+        public JobPrefab GetJob()
+        {
+            if (cachedJobPrefab != null)
+            {
+                return cachedJobPrefab;
+            }
+
+            foreach (string tag in item.GetTags())
+            {
+                if (tag.StartsWith("jobid:"))
+                {
+                    string jobIdentifier = tag.Split(':').Last();
+                    if (JobPrefab.Get(jobIdentifier) is { } jobPrefab)
+                    {
+                        cachedJobPrefab = jobPrefab;
+                        return jobPrefab;
+                    }
+                }
+            }
+
+            return null;
+        }
+        
+        public string GetName()
+        {
+            if (cachedName != null)
+            {
+                return cachedName;
+            }
+
+            foreach (string tag in item.GetTags())
+            {
+                if (tag.StartsWith("name:"))
+                {
+                    string ownerName = tag.Split(':').Last();
+                    cachedName = ownerName;
+                    return ownerName;
+                }
+            }
+
+            return null;
+        }
    }
 }