(f0d812055) v0.9.9.0

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs

@@ -293,6 +293,9 @@ namespace Barotrauma
 
         private NPCPersonalityTrait personalityTrait;
 
+        public Order CurrentOrder { get; set;}
+        public string CurrentOrderOption { get; set; }
+
         //unique ID given to character infos in MP
         //used by clients to identify which infos are the same to prevent duplicate characters in round summary
         public ushort ID;
@@ -524,9 +527,11 @@ namespace Barotrauma
             }      
             foreach (XElement subElement in infoElement.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "job") continue;
-                Job = new Job(subElement);
-                break;
+                if (subElement.Name.ToString().Equals("job", StringComparison.OrdinalIgnoreCase))
+                {
+                    Job = new Job(subElement);
+                    break;
+                }
             }
             LoadHeadAttachments();
         }
@@ -661,7 +666,7 @@ namespace Barotrauma
         {
             foreach (XElement limbElement in Ragdoll.MainElement.Elements())
             {
-                if (limbElement.GetAttributeString("type", "").ToLowerInvariant() != "head") { continue; }
+                if (!limbElement.GetAttributeString("type", "").Equals("head", StringComparison.OrdinalIgnoreCase)) { continue; }
 
                 XElement spriteElement = limbElement.Element("sprite");
                 if (spriteElement == null) { continue; }
@@ -677,7 +682,7 @@ namespace Barotrauma
                 //go through the files in the directory to find a matching sprite
                 foreach (string file in Directory.GetFiles(Path.GetDirectoryName(spritePath)))
                 {
-                    if (!file.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
+                    if (!file.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
                     {
                         continue;
                     }
@@ -828,6 +833,11 @@ namespace Barotrauma
         {
             if (Job == null || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) || Character == null) { return; }         
 
+            if (Job.Prefab.Identifier == "assistant")
+            {
+                increase *= SkillSettings.Current.AssistantSkillIncreaseMultiplier;
+            }
+
             float prevLevel = Job.GetSkillLevel(skillIdentifier);
             Job.IncreaseSkillLevel(skillIdentifier, increase);
 
@@ -955,7 +965,7 @@ namespace Barotrauma
                 foreach (XElement childInvElement in itemElement.Elements())
                 {
                     if (itemContainerIndex >= itemContainers.Count) break;
-                    if (childInvElement.Name.ToString().ToLowerInvariant() != "inventory") continue;
+                    if (!childInvElement.Name.ToString().Equals("inventory", StringComparison.OrdinalIgnoreCase)) { continue; }
                     SpawnInventoryItemsRecursive(itemContainers[itemContainerIndex].Inventory, childInvElement);
                     itemContainerIndex++;
                 }
@@ -987,6 +997,15 @@ namespace Barotrauma
             faceAttachments = null;
         }
 
+        /// <summary>
+        /// Reset order data so it doesn't carry into further rounds, as the AI is "recreated" always in between rounds anyway.
+        /// </summary>
+        public void ResetCurrentOrder()
+        {
+            CurrentOrder = null;
+            CurrentOrderOption = "";
+        }
+
         public void Remove()
         {
             Character = null;