(ded4a3e0a) v0.9.0.7

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs

@@ -196,7 +196,7 @@ namespace Barotrauma
                 if (ignoredHulls != null && ignoredHulls.Contains(hull)) { continue; }
                 if (unreachable.Contains(hull)) { continue; }
                 float hullSafety = 0;
-                if (character.CurrentHull != null)
+                if (character.CurrentHull != null && character.Submarine != null)
                 {
                     // Inside
                     if (!character.Submarine.IsConnectedTo(hull.Submarine)) { continue; }

Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs

@@ -1101,7 +1101,7 @@ namespace Barotrauma
             //prevent the hands from going above the top of the ladders
             handPos.Y = Math.Min(-0.5f, handPos.Y);
 
-            if (!PlayerInput.KeyDown(InputType.Aim) || Math.Abs(movement.Y) > 0.01f)
+            if (!character.IsKeyDown(InputType.Aim) || Math.Abs(movement.Y) > 0.01f)
             {
                 MoveLimb(leftHand,
                     new Vector2(handPos.X,

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -836,13 +836,21 @@ namespace Barotrauma
         private static string humanConfigFile;
         public static string HumanConfigFile
         {
-            get 
+            get
             {
                 if (string.IsNullOrEmpty(humanConfigFile))
                 {
-                    humanConfigFile = GetConfigFile("Human");
+                    humanConfigFile = GameMain.Instance.GetFilesOfType(ContentType.Character)?
+                            .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == "human.xml");
+
+                    if (humanConfigFile == null)
+                    {
+                        DebugConsole.ThrowError($"Couldn't find a human config file from the selected content packages!");
+                        DebugConsole.ThrowError($"(The config file must end with \"human.xml\")");
+                        return string.Empty;
+                    }
                 }
-                return humanConfigFile; 
+                return humanConfigFile;
             }
         }
 
@@ -859,12 +867,16 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Searches for a character config file from all currently selected content packages, 
+        /// or from a specific package if the contentPackage parameter is given.
+        /// </summary>
         public static string GetConfigFile(string speciesName, ContentPackage contentPackage = null)
         {
             string configFile = null;
             if (contentPackage == null)
             {
-                configFile = GameMain.Instance.GetFilesOfType(ContentType.Character, searchAllContentPackages: true)
+                configFile = GameMain.Instance.GetFilesOfType(ContentType.Character)
                     .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
             }
             else
@@ -1519,10 +1531,9 @@ namespace Barotrauma
             if (inventory.Owner is Item)
             {
                 var owner = (Item)inventory.Owner;
-                if (!CanInteractWith(owner))
-                {
-                    return false;
-                }
+                if (!CanInteractWith(owner)) { return false; }
+                ItemContainer container = owner.GetComponents<ItemContainer>().FirstOrDefault(ic => ic.Inventory == inventory);
+                if (container != null && !container.HasRequiredItems(this, addMessage: false)) { return false; }
             }
             return true;
         }

Barotrauma/BarotraumaShared/Source/Characters/CharacterInfo.cs

@@ -747,7 +747,7 @@ namespace Barotrauma
 
         public void IncreaseSkillLevel(string skillIdentifier, float increase, Vector2 worldPos)
         {
-            if (Job == null || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient)) return;            
+            if (Job == null || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) || Character == null) { return; }         
 
             float prevLevel = Job.GetSkillLevel(skillIdentifier);
             Job.IncreaseSkillLevel(skillIdentifier, increase);

Barotrauma/BarotraumaShared/Source/Characters/Limb.cs

@@ -444,6 +444,8 @@ namespace Barotrauma
         public bool SectorHit(Vector2 armorSector, Vector2 simPosition)
         {
             if (armorSector == Vector2.Zero) { return false; }
+            //sector 360 degrees or more -> always hits
+            if (Math.Abs(armorSector.Y - armorSector.X) >= MathHelper.TwoPi) { return true; }
             float rotation = body.TransformedRotation;
             float offset = (MathHelper.PiOver2 - GetArmorSectorRotationOffset(armorSector)) * Dir;
             float hitAngle = VectorExtensions.Angle(VectorExtensions.Forward(rotation + offset), SimPosition - simPosition);
@@ -460,9 +462,7 @@ namespace Barotrauma
 
         protected float GetArmorSectorSize(Vector2 armorSector)
         {
-            float min = Math.Min(armorSector.X, armorSector.Y);
-            float max = Math.Max(armorSector.X, armorSector.Y);
-            return max - min;
+            return Math.Abs(armorSector.X - armorSector.Y);
         }
 
         public void Update(float deltaTime)