v0.19.0.0 (unstable)

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/Job.cs

@@ -19,7 +19,7 @@ namespace Barotrauma
 
         public int Variant;
 
-        public Skill PrimarySkill { get; }
+        public Skill PrimarySkill { get; private set; }
 
         public Job(JobPrefab jobPrefab) : this(jobPrefab, randSync: Rand.RandSync.Unsynced, variant: 0) { }
 
@@ -102,9 +102,14 @@ namespace Barotrauma
         public void OverrideSkills(Dictionary<Identifier, float> newSkills)
         {
             skills.Clear();            
-            foreach (var newSkill in newSkills)
+            foreach (var newSkillInfo in newSkills)
             {
-                skills.Add(newSkill.Key, new Skill(newSkill.Key, newSkill.Value));
+                var newSkill = new Skill(newSkillInfo.Key, newSkillInfo.Value);
+                if (PrimarySkill != null && newSkill.Identifier == PrimarySkill.Identifier)
+                {
+                    PrimarySkill = newSkill;
+                }
+                skills.Add(newSkillInfo.Key, newSkill);
             }
         }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/JobPrefab.cs

@@ -79,7 +79,7 @@ namespace Barotrauma
         /// </summary>
         public static IReadOnlyDictionary<Identifier, float> ItemRepairPriorities => _itemRepairPriorities;
 
-        public static JobPrefab Get(string identifier)
+        public static JobPrefab Get(Identifier identifier)
         {
             if (Prefabs.ContainsKey(identifier))
             {