Unstable 1.1.14.0

2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -13,6 +13,7 @@ namespace Barotrauma
        public override bool KeepDivingGearOn => true;
        public override bool KeepDivingGearOnAlsoWhenInactive => true;
        public override bool PrioritizeIfSubObjectivesActive => true;
+        public override bool AllowWhileHandcuffed => false;

        private AIObjectiveGetItem getSingleItemObjective;
        private AIObjectiveGetItems getAllItemsObjective;
@@ -60,8 +61,7 @@ namespace Barotrauma
        {
            if (!IsAllowed)
            {
-                Priority = 0;
-                Abandon = true;
+                HandleNonAllowed();
                return Priority;
            }
            Priority = objectiveManager.GetOrderPriority(this);
@@ -75,11 +75,6 @@ namespace Barotrauma

        protected override void Act(float deltaTime)
        {
-            if (character.LockHands)
-            {
-                Abandon = true;
-                return;
-            }
            if (!subObjectivesCreated)
            {
                if (FindAllItems && targetItem == null)