Unstable 0.17.1.0

2022-03-17 01:25:04 +09:00
parent 3974067915
commit 6d410cc1b7
302 changed files with 5878 additions and 3317 deletions
@@ -30,6 +30,7 @@ namespace Barotrauma
                if (!character.Submarine.IsConnectedTo(item.Submarine)) { return false; }
            }
            if (item.ConditionPercentage <= 0) { return false; }
+            if (item.IsClaimedByBallastFlora) { return false; }
            if (Character.CharacterList.Any(c => c.CurrentHull == item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return false; }
            if (IsReady(battery)) { return false; }
            return true;
@@ -83,7 +83,8 @@ namespace Barotrauma
            container.HasTag("allowcleanup") && 
            container.ParentInventory == null && container.OwnInventory != null && container.OwnInventory.AllItems.Any() && 
            container.GetComponent<ItemContainer>() != null &&
-            IsItemInsideValidSubmarine(container, character);
+            IsItemInsideValidSubmarine(container, character) &&
+            !container.IsClaimedByBallastFlora;

        public static bool IsValidTarget(Item item, Character character, bool checkInventory, bool allowUnloading = true)
        {
@@ -100,6 +101,7 @@ namespace Barotrauma
                if (!IsValidContainer(item.Container, character, allowUnloading)) { return false; }
            }
            if (character != null && !IsItemInsideValidSubmarine(item, character)) { return false; }
+            if (item.HasBallastFloraInHull) { return false; }
            var pickable = item.GetComponent<Pickable>();
            if (pickable == null) { return false; }
            if (pickable is Holdable h && h.Attachable && h.Attached) { return false; }
@@ -777,7 +777,7 @@ namespace Barotrauma
            }
            if (retreatTarget != null && character.CurrentHull != retreatTarget)
            {
-                TryAddSubObjective(ref retreatObjective, () => new AIObjectiveGoTo(retreatTarget, character, objectiveManager, false, true)
+                TryAddSubObjective(ref retreatObjective, () => new AIObjectiveGoTo(retreatTarget, character, objectiveManager)
                {
                    UsePathingOutside = false
                },
@@ -162,7 +162,6 @@ namespace Barotrauma
                    CloseEnough = reach,
                    DialogueIdentifier = Leak.FlowTargetHull != null ? "dialogcannotreachleak".ToIdentifier() : Identifier.Empty,
                    TargetName = Leak.FlowTargetHull?.DisplayName,
-                    CheckVisibility = false,
                    requiredCondition = () => Leak.Submarine == character.Submarine,
                    // The Go To objective can be abandoned if the leak is fixed (in which case we don't want to use the dialogue)
                    SpeakCannotReachCondition = () => !CheckObjectiveSpecific()
@@ -1,7 +1,6 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using Barotrauma.Extensions;

@@ -11,6 +10,8 @@ namespace Barotrauma
    {
        public override Identifier Identifier { get; set; } = "go to".ToIdentifier();

+        public override bool KeepDivingGearOn => GetTargetHull() == null;
+
        private AIObjectiveFindDivingGear findDivingGear;
        private readonly bool repeat;
        //how long until the path to the target is declared unreachable
@@ -74,14 +75,6 @@ namespace Barotrauma
                _closeEnough = Math.Max(minDistance, value);
            }
        }
-
-        // TODO: Currently we never check the visibility (to the end node), which is actually unintentional.
-        // I don't think it has caused any issues so far, so let's keep defaulting to false for now, because the less we do raycasts the better.
-        // However, if there are cases where the bots attempt to go through walls (select the end node that is behind an obstacle), we should set this true.
-
-        // NOTE: This seemes to have caused an issue now Regalis11/Barotrauma#8067: namely, the bot was trying to use a waypoint that was obstructed by a shuttle
-        // because obstruction was only checked when checking visibility in PathFinder. Changed that so that obstructed nodes are no longer used.
-        public bool CheckVisibility { get; set; }
        public bool IgnoreIfTargetDead { get; set; }
        public bool AllowGoingOutside { get; set; }

@@ -268,15 +261,15 @@ namespace Barotrauma
                {
                    Character followTarget = Target as Character;
                    bool needsDivingSuit = (!isInside || hasOutdoorNodes) && character.NeedsAir && !character.HasAbilityFlag(AbilityFlags.ImmuneToPressure);
-                    bool needsDivingGear = (needsDivingSuit || HumanAIController.NeedsDivingGear(targetHull, out needsDivingSuit)) && character.NeedsAir;
+                    bool needsDivingGear = (needsDivingSuit || HumanAIController.NeedsDivingGear(targetHull, out needsDivingSuit));
                    if (Mimic)
                    {
-                        if (HumanAIController.HasDivingSuit(followTarget) && character.NeedsAir)
+                        if (HumanAIController.HasDivingSuit(followTarget))
                        {
                            needsDivingGear = true;
                            needsDivingSuit = true;
                        }
-                        else if (HumanAIController.HasDivingMask(followTarget) && character.NeedsAir)
+                        else if (HumanAIController.HasDivingMask(followTarget))
                        {
                            needsDivingGear = true;
                        }
@@ -505,7 +498,7 @@ namespace Barotrauma
                            startNodeFilter: n => (n.Waypoint.CurrentHull == null) == (character.CurrentHull == null),
                            endNodeFilter: endNodeFilter,
                            nodeFilter: nodeFilter,
-                            checkVisiblity: CheckVisibility);
+                            checkVisiblity: Target is Item || Target is Character);
                    }
                    if (!isInside && (PathSteering.CurrentPath == null || PathSteering.IsPathDirty || PathSteering.CurrentPath.Unreachable))
                    {
@@ -60,6 +60,7 @@ namespace Barotrauma
            if (targetCondition.HasValue && container.Inventory.IsFull() && container.Inventory.AllItems.None(i => ItemMatchesTargetCondition(i, targetCondition.Value))) { return false; }
            if (!AIObjectiveCleanupItems.IsItemInsideValidSubmarine(item, character)) { return false; }
            if (item.GetRootInventoryOwner() is Character owner && owner != character) { return false; }
+            if (item.IsClaimedByBallastFlora) { return false; }
            if (!item.HasAccess(character)) { return false; }
            // Ignore items that require power but don't have it
            if (item.GetComponent<Powered>() is Powered powered && powered.PowerConsumption > 0 && powered.Voltage < powered.MinVoltage) { return false; }
@@ -10,6 +10,16 @@ namespace Barotrauma
 {
    class AIObjectiveManager
    {
+        public enum ObjectiveType
+        {
+            None = 0,
+            Order = 1,
+            Objective = 2,
+            
+            MinValue = 0,
+            MaxValue = 2
+        }
+
        public const float HighestOrderPriority = 70;
        public const float LowestOrderPriority = 60;
        public const float RunPriority = 50;
@@ -184,28 +194,20 @@ namespace Barotrauma
        {
            var previousObjective = CurrentObjective;
            var firstObjective = Objectives.FirstOrDefault();
+            
            bool currentObjectiveIsOrder = CurrentOrder != null && firstObjective != null && CurrentOrder.Priority > firstObjective.Priority;
-            if (currentObjectiveIsOrder)
+            
+            CurrentObjective = currentObjectiveIsOrder ? CurrentOrder : firstObjective;
+
+            if (previousObjective == CurrentObjective) { return CurrentObjective; }
+
+            previousObjective?.OnDeselected();
+            CurrentObjective?.OnSelected();
+            GetObjective<AIObjectiveIdle>().CalculatePriority(Math.Max(CurrentObjective.Priority - 10, 0));
+            if (GameMain.NetworkMember is { IsServer: true })
            {
-                CurrentObjective = CurrentOrder;
-            }
-            else
-            {
-                CurrentObjective = firstObjective;
-            }
-            if (previousObjective != CurrentObjective)
-            {
-                previousObjective?.OnDeselected();
-                CurrentObjective?.OnSelected();
-                GetObjective<AIObjectiveIdle>().CalculatePriority(Math.Max(CurrentObjective.Priority - 10, 0));
-                if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
-                {
-                    GameMain.NetworkMember.CreateEntityEvent(character, new object[]
-                    {
-                        NetEntityEvent.Type.ObjectiveManagerState,
-                        currentObjectiveIsOrder ? "order" : "objective"
-                    });
-                }
+                GameMain.NetworkMember.CreateEntityEvent(character,
+                    new Character.ObjectiveManagerStateEventData(currentObjectiveIsOrder ? ObjectiveType.Order : ObjectiveType.Objective));
            }
            return CurrentObjective;
        }
@@ -67,6 +67,11 @@ namespace Barotrauma
                    Priority = 0;
                    return Priority;
                }
+                else if (targetItem.IsClaimedByBallastFlora)
+                {
+                    Priority = 0;
+                    return Priority;
+                }
                var reactor = component?.Item.GetComponent<Reactor>();
                if (reactor != null)
                {
@@ -41,6 +41,7 @@ namespace Barotrauma
                if (!character.Submarine.IsConnectedTo(pump.Item.Submarine)) { return false; }
            }
            if (Character.CharacterList.Any(c => c.CurrentHull == pump.Item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return false; }
+            if (pump.Item.IsClaimedByBallastFlora) { return false; }
            if (IsReady(pump)) { return false; }
            return true;
        }
@@ -1,7 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Barotrauma.Extensions;

@@ -12,6 +11,7 @@ namespace Barotrauma
        public override Identifier Identifier { get; set; } = "repair item".ToIdentifier();

        public override bool AllowInAnySub => true;
+        public override bool KeepDivingGearOn => Item?.CurrentHull == null;

        public Item Item { get; private set; }

@@ -52,6 +52,10 @@ namespace Barotrauma
                Priority = 0;
                IsCompleted = true;
            }
+            else if (Item.IsClaimedByBallastFlora)
+            {
+                Priority = 0;
+            }
            else
            {
                float distanceFactor = 1;
@@ -151,6 +151,7 @@ namespace Barotrauma
            if (!item.IsInteractable(character)) { return false; }
            if (item.IsFullCondition) { return false; }
            if (item.Submarine == null || character.Submarine == null) { return false; }
+            if (item.IsClaimedByBallastFlora) { return false; } 
            //player crew ignores items in outposts
            if (character.IsOnPlayerTeam && item.Submarine.Info.IsOutpost) { return false; }
            if (!character.Submarine.IsEntityFoundOnThisSub(item, includingConnectedSubs: true)) { return false; }
@@ -30,6 +30,7 @@ namespace Barotrauma
        private float findHullTimer;
        private bool ignoreOxygen;
        private readonly float findHullInterval = 1.0f;
+        private bool performedCpr;

        public AIObjectiveRescue(Character character, Character targetCharacter, AIObjectiveManager objectiveManager, float priorityModifier = 1) 
            : base(character, objectiveManager, priorityModifier)
@@ -220,12 +221,12 @@ namespace Barotrauma
                    DialogueIdentifier = "dialogcannotreachpatient".ToIdentifier(),
                    TargetName = targetCharacter.DisplayName
                },
-                    onCompleted: () => RemoveSubObjective(ref goToObjective),
-                    onAbandon: () =>
-                    {
-                        RemoveSubObjective(ref goToObjective);
-                        Abandon = true;
-                    });
+                onCompleted: () => RemoveSubObjective(ref goToObjective),
+                onAbandon: () =>
+                {
+                    RemoveSubObjective(ref goToObjective);
+                    Abandon = true;
+                });
            }
            else
            {
@@ -401,6 +402,7 @@ namespace Barotrauma
                {
                    character.SelectCharacter(targetCharacter);
                    character.AnimController.Anim = AnimController.Animation.CPR;
+                    performedCpr = true;
                }
                else
                {
@@ -436,9 +438,10 @@ namespace Barotrauma
        {
            bool isCompleted = AIObjectiveRescueAll.GetVitalityFactor(targetCharacter) >= AIObjectiveRescueAll.GetVitalityThreshold(objectiveManager, character, targetCharacter);
            if (isCompleted && targetCharacter != character && character.IsOnPlayerTeam)
-            {                
-                character.Speak(TextManager.GetWithVariable("DialogTargetHealed", "[targetname]", targetCharacter.Name).Value,
-                    null, 1.0f, $"targethealed{targetCharacter.Name}".ToIdentifier(), 60.0f);
+            {
+                string textTag = performedCpr ? "DialogTargetResuscitated" : "DialogTargetHealed";
+                string message = TextManager.GetWithVariable(textTag, "[targetname]", targetCharacter.Name)?.Value;
+                character.Speak(message, delay: 1.0f, identifier: $"targethealed{targetCharacter.Name}".ToIdentifier(), minDurationBetweenSimilar: 60.0f);
            }
            return isCompleted;
        }