v0.14.6.0

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

@@ -158,9 +158,12 @@ namespace Barotrauma
 
             if (itemElement.GetAttributeBool("equip", false))
             {
-                List<InvSlotType> allowedSlots = new List<InvSlotType>(item.AllowedSlots);
+                //if the item is both pickable and wearable, try to wear it instead of picking it up
+                List<InvSlotType> allowedSlots =
+                   item.GetComponents<Pickable>().Count() > 1 ?
+                   new List<InvSlotType>(item.GetComponent<Wearable>()?.AllowedSlots ?? item.GetComponent<Pickable>().AllowedSlots) :
+                   new List<InvSlotType>(item.AllowedSlots);
                 allowedSlots.Remove(InvSlotType.Any);
-
                 character.Inventory.TryPutItem(item, null, allowedSlots);
             }
             else
@@ -201,10 +204,7 @@ namespace Barotrauma
                 item.AddTag("job:" + Name);
 
                 IdCard idCardComponent = item.GetComponent<IdCard>();
-                if (idCardComponent != null)
-                {
-                    idCardComponent.Initialize(character.Info);
-                }
+                idCardComponent?.Initialize(character.Info);
             }
 
             foreach (WifiComponent wifiComponent in item.GetComponents<WifiComponent>())

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

@@ -1,9 +1,9 @@
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Barotrauma.Extensions;
+using Barotrauma.Extensions;
+using Microsoft.Xna.Framework;
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
@@ -43,6 +43,12 @@ namespace Barotrauma
             Prefabs.Remove(this);
         }
 
+        private static readonly Dictionary<string, float> _itemRepairPriorities = new Dictionary<string, float>();
+        /// <summary>
+        /// Tag -> priority.
+        /// </summary>
+        public static IReadOnlyDictionary<string, float> ItemRepairPriorities => _itemRepairPriorities;
+
         public static XElement NoJobElement;
         public static JobPrefab Get(string identifier)
         {
@@ -178,6 +184,14 @@ namespace Barotrauma
             private set;
         }
 
+        //whether the job should be available to NPCs
+        [Serialize(false, false)]
+        public bool HiddenJob
+        {
+            get;
+            private set;
+        }
+
         public Sprite Icon;
         public Sprite IconSmall;
 
@@ -195,7 +209,7 @@ namespace Barotrauma
             SerializableProperty.DeserializeProperties(this, element);
 
             Name = TextManager.Get("JobName." + Identifier);
-            Description = TextManager.Get("JobDescription." + Identifier);
+            Description = TextManager.Get("JobDescription." + Identifier, returnNull: true) ?? string.Empty;
             Identifier = Identifier.ToLowerInvariant();
             Element = element;
 
@@ -265,7 +279,7 @@ namespace Barotrauma
         }
         
 
-        public static JobPrefab Random(Rand.RandSync sync = Rand.RandSync.Unsynced) => Prefabs.GetRandom(p => p.Identifier != "watchman", sync);
+        public static JobPrefab Random(Rand.RandSync sync = Rand.RandSync.Unsynced) => Prefabs.GetRandom(p => !p.HiddenJob, sync);
 
         public static void LoadAll(IEnumerable<ContentFile> files)
         {
@@ -286,7 +300,6 @@ namespace Barotrauma
             }
             foreach (XElement element in mainElement.Elements())
             {
-                if (element.Name.ToString().Equals("nojob", StringComparison.OrdinalIgnoreCase)) { continue; }
                 if (element.IsOverride())
                 {
                     var job = new JobPrefab(element.FirstElement(), file.Path)
@@ -297,6 +310,7 @@ namespace Barotrauma
                 }
                 else
                 {
+                    if (!element.Name.ToString().Equals("job", StringComparison.OrdinalIgnoreCase)) { continue; }
                     var job = new JobPrefab(element, file.Path)
                     {
                         ContentPackage = file.ContentPackage
@@ -304,8 +318,31 @@ namespace Barotrauma
                     Prefabs.Add(job, false);
                 }
             }
-            NoJobElement = NoJobElement ?? mainElement.Element("NoJob");
-            NoJobElement = NoJobElement ?? mainElement.Element("nojob");
+            NoJobElement ??= mainElement.GetChildElement("nojob");
+            var itemRepairPrioritiesElement = mainElement.GetChildElement("ItemRepairPriorities");
+            if (itemRepairPrioritiesElement != null)
+            {
+                foreach (var subElement in itemRepairPrioritiesElement.Elements())
+                {
+                    string tag = subElement.GetAttributeString("tag", null);
+                    if (tag != null)
+                    {
+                        float priority = subElement.GetAttributeFloat("priority", -1f);
+                        if (priority >= 0)
+                        {
+                            _itemRepairPriorities.TryAdd(tag, priority);
+                        }
+                        else
+                        {
+                            DebugConsole.AddWarning($"The 'priority' attribute is missing from the the item repair priorities definition in {subElement} of {file.Path}.");
+                        }
+                    }
+                    else
+                    {
+                        DebugConsole.AddWarning($"The 'tag' attribute is missing from the the item repair priorities definition in {subElement} of {file.Path}.");
+                    }
+                }
+            }
         }
 
         public static void RemoveByFile(string filePath)