Build 0.18.13.0

2022-07-01 12:16:36 +09:00
parent 8e6c601162
commit 497045de7e
79 changed files with 717 additions and 361 deletions
@@ -308,6 +308,7 @@ namespace Barotrauma
                        }
                    }
                }
+                if (targetSlot < 0) { return false; }
                return targetInventory.TryPutItem(item, targetSlot, allowSwapping, allowCombine: false, Character);
            }
            else
@@ -1297,6 +1297,7 @@ namespace Barotrauma

            AIObjectiveCombat.CombatMode DetermineCombatMode(Character c, float cumulativeDamage = 0, bool isWitnessing = false)
            {
+                if (!(c.AIController is HumanAIController humanAI)) { return AIObjectiveCombat.CombatMode.None; }
                if (!IsFriendly(attacker))
                {
                    if (c.Submarine == null)
@@ -1306,12 +1307,15 @@ namespace Barotrauma
                    }
                    if (!c.Submarine.GetConnectedSubs().Contains(attacker.Submarine))
                    {
-                        // Attacked from an unconnected submarine.
-                        return c.SelectedConstruction?.GetComponent<Turret>() != null ? AIObjectiveCombat.CombatMode.None : AIObjectiveCombat.CombatMode.Retreat;
+                        // Attacked from an unconnected submarine (pirate/pvp)
+                        return 
+                            humanAI.ObjectiveManager.CurrentOrder is AIObjectiveOperateItem operateOrder && operateOrder.GetTarget() is Controller ? 
+                                AIObjectiveCombat.CombatMode.None : AIObjectiveCombat.CombatMode.Retreat;
                    }
-                    return c.AIController is HumanAIController humanAI &&
-                        (humanAI.ObjectiveManager.IsCurrentOrder<AIObjectiveFightIntruders>() || humanAI.ObjectiveManager.Objectives.Any(o => o is AIObjectiveFightIntruders)) 
-                        ? AIObjectiveCombat.CombatMode.Offensive : AIObjectiveCombat.CombatMode.Defensive;
+                    return 
+                        humanAI.ObjectiveManager.IsCurrentOrder<AIObjectiveFightIntruders>() || 
+                        humanAI.ObjectiveManager.Objectives.Any(o => o is AIObjectiveFightIntruders) ? 
+                            AIObjectiveCombat.CombatMode.Offensive : AIObjectiveCombat.CombatMode.Defensive;
                }
                else
                {
@@ -1362,7 +1366,7 @@ namespace Barotrauma
                    }
                    else
                    {
-                        if (c.AIController is HumanAIController humanAI && humanAI.ObjectiveManager.GetActiveObjective<AIObjectiveCombat>()?.Enemy == attacker)
+                        if (humanAI.ObjectiveManager.GetActiveObjective<AIObjectiveCombat>()?.Enemy == attacker)
                        {
                            // Already targeting the attacker -> treat as a more serious threat.
                            cumulativeDamage *= 2;
@@ -31,8 +31,9 @@ namespace Barotrauma
            if (!pump.Item.IsInteractable(character)) { return false; }
            if (pump.IsAutoControlled) { return false; }
            if (pump.Item.ConditionPercentage <= 0) { return false; }
+            if (pump.Item.CurrentHull == null) { return false; }
            if (pump.Item.CurrentHull.FireSources.Count > 0) { return false; }
-            if (character.Submarine != null)
+            if (character.Submarine != null && pump.Item.Submarine != null)
            {
                if (!character.Submarine.IsConnectedTo(pump.Item.Submarine)) { return false; }
            }
@@ -1030,21 +1030,30 @@ namespace Barotrauma
        /// <param name="hasAi">Is the character controlled by AI.</param>
        /// <param name="createNetworkEvent">Should clients receive a network event about the creation of this character?</param>
        /// <param name="ragdoll">Ragdoll configuration file. If null, will select the default.</param>
-        public static Character Create(string speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null)
+        public static Character Create(string speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null, bool throwErrorIfNotFound = true)
        {
            if (speciesName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
            {
                speciesName = Path.GetFileNameWithoutExtension(speciesName);
            }
-            return Create(speciesName.ToIdentifier(), position, seed, characterInfo, id, isRemotePlayer, hasAi, createNetworkEvent, ragdoll);
+            return Create(speciesName.ToIdentifier(), position, seed, characterInfo, id, isRemotePlayer, hasAi, createNetworkEvent, ragdoll, throwErrorIfNotFound);
        }

-        public static Character Create(Identifier speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null)
+        public static Character Create(Identifier speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null, bool throwErrorIfNotFound = true)
        {
            var prefab = CharacterPrefab.FindBySpeciesName(speciesName);
            if (prefab == null)
            {
-                DebugConsole.ThrowError($"Failed to create character \"{speciesName}\". Matching prefab not found.\n" + Environment.StackTrace);
+                string errorMsg = $"Failed to create character \"{speciesName}\". Matching prefab not found.\n" + Environment.StackTrace;
+                if (throwErrorIfNotFound)
+                {
+                    DebugConsole.ThrowError(errorMsg);
+                }
+                else
+                {
+                    DebugConsole.AddWarning(errorMsg);
+                }
+
                return null;
            }
            return Create(prefab, position, seed, characterInfo, id, isRemotePlayer, hasAi, createNetworkEvent, ragdoll);
@@ -1510,9 +1519,10 @@ namespace Barotrauma

            if (skillIdentifier != null)
            {
-                for (int i = 0; i < Inventory.Capacity; i++)
+                foreach (Item item in Inventory.AllItems)
                {
-                    if (Inventory.SlotTypes[i] != InvSlotType.Any && Inventory.GetItemAt(i)?.GetComponent<Wearable>() is Wearable wearable)
+                    if (item?.GetComponent<Wearable>() is Wearable wearable &&
+                        !Inventory.IsInLimbSlot(item, InvSlotType.Any))
                    {
                        if (wearable.SkillModifiers.TryGetValue(skillIdentifier, out float skillValue))
                        {
@@ -1639,8 +1639,13 @@ namespace Barotrauma

        private void RefreshHeadSprites()
        {
-            HeadSprite = null;
-            AttachmentSprites = null;
+            _headSprite = null;
+            LoadHeadSprite();
+#if CLIENT
+            CalculateHeadPosition(_headSprite);
+#endif
+            attachmentSprites?.Clear();
+            LoadAttachmentSprites();
        }

        // This could maybe be a LookUp instead?
@@ -809,8 +809,13 @@ namespace Barotrauma

            if (!Character.GodMode)
            {
-                UpdateLimbAfflictionOverlays();
-                UpdateSkinTint();                
+#if CLIENT
+                if (Character.IsVisible)
+                {
+                    UpdateLimbAfflictionOverlays();
+                    UpdateSkinTint();
+                }
+#endif
                CalculateVitality();

                if (Vitality <= MinVitality)
@@ -820,6 +825,12 @@ namespace Barotrauma
            }
        }

+        public void ForceUpdateVisuals()
+        {
+            UpdateLimbAfflictionOverlays();
+            UpdateSkinTint();
+        }
+
        private void UpdateDamageReductions(float deltaTime)
        {
            float healthRegen = Character.Params.Health.ConstantHealthRegeneration;