v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -61,11 +61,11 @@ namespace Barotrauma
            }
        }

-        [Serialize("None", false)]
+        [Serialize(CampaignMode.InteractionType.None, false)]
        public CampaignMode.InteractionType CampaignInteractionType { get; protected set; }

-        [Serialize("Passive", false)]
-        public AIObjectiveIdle.BehaviorType BehaviorType { get; protected set; }
+        [Serialize(AIObjectiveIdle.BehaviorType.Passive, false)]
+        public AIObjectiveIdle.BehaviorType Behavior { get; protected set; }

        public List<string> PreferredOutpostModuleTypes { get; protected set; }

@@ -163,6 +163,13 @@ namespace Barotrauma
                {
                    item.AddTag("job:" + job.Name);
                }
+
+                IdCard idCardComponent = item.GetComponent<IdCard>();
+                if (idCardComponent != null)
+                {
+                    idCardComponent.Initialize(character.Info);
+                }
+
                var idCardTags = itemElement.GetAttributeStringArray("tags", new string[0]);
                foreach (string tag in idCardTags)
                {