(bad03a33d) Don't translate language names to the current display language in the settings menu (should be translated to the target language instead)

2019-05-16 05:44:31 +03:00
parent 7ae2b2f387
commit 96b2d953d2
14 changed files with 277 additions and 663 deletions
@@ -439,6 +439,18 @@ namespace Barotrauma
                            return;
                        }

+                        closestButton.Item.TryInteract(character, false, true, false);
+                        buttonPressCooldown = ButtonPressInterval;
+                        break;
+                    }
+                    else
+                    {
+                        if (!door.HasRequiredItems(character, false) && shouldBeOpen)
+                        {
+                            currentPath.Unreachable = true;
+                            return;
+                        }
+
                        door.Item.TryInteract(character, false, true, true);
                        buttonPressCooldown = ButtonPressInterval;
                        break;
@@ -36,6 +36,10 @@ namespace Barotrauma
        protected IndoorsSteeringManager PathSteering => HumanAIController.PathSteering;
        protected SteeringManager SteeringManager => HumanAIController.SteeringManager;

+        protected HumanAIController HumanAIController => character.AIController as HumanAIController;
+        protected IndoorsSteeringManager PathSteering => HumanAIController.PathSteering;
+        protected SteeringManager SteeringManager => HumanAIController.SteeringManager;
+
        /// <summary>
        /// Run the main objective with all subobjectives concurrently?
        /// If false, the main objective will continue only when all the subobjectives have been removed (done).
@@ -90,6 +90,16 @@ namespace Barotrauma
                unreachable.Clear();
            }

+            if (unreachableClearTimer > 0)
+            {
+                unreachableClearTimer -= deltaTime;
+            }
+            else
+            {
+                unreachableClearTimer = clearUnreachableInterval;
+                unreachable.Clear();
+            }
+
            if (searchHullTimer > 0.0f)
            {
                unreachableClearTimer = clearUnreachableInterval;
@@ -15,6 +15,8 @@ namespace Barotrauma

        private AIObjectiveFindDivingGear findDivingGear;

+        private AIObjectiveFindDivingGear findDivingGear;
+
        private AIObjectiveFindDivingGear findDivingGear;
        private Vector2 targetPos;
        private bool repeat;
@@ -87,8 +89,6 @@ namespace Barotrauma

        public bool FollowControlledCharacter;

-        public bool FollowControlledCharacter;
-
        public AIObjectiveGoTo(Entity target, Character character, AIObjectiveManager objectiveManager, bool repeat = false, bool getDivingGearIfNeeded = true, float priorityModifier = 1) 
            : base (character, objectiveManager, priorityModifier)
        {
@@ -38,9 +38,6 @@ namespace Barotrauma
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

-        public override bool IsCompleted() => false;
-        public override bool CanBeCompleted => true;
-
        public override void Update(float deltaTime)
        {
            if (objectiveManager.CurrentObjective == this)
@@ -89,9 +86,6 @@ namespace Barotrauma
                character.SelectedConstruction = null;
            }

-            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
-                (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
-
            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
                (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));

@@ -32,6 +32,10 @@ namespace Barotrauma

        private AIObjectiveGoTo gotoObjective;

+        private bool useController;
+
+        private AIObjectiveGoTo gotoObjective;
+
        public override bool CanBeCompleted
        {
            get
@@ -53,6 +57,8 @@ namespace Barotrauma

        public ItemComponent Component => component;

+        public ItemComponent Component => component;
+
        public override float GetPriority(AIObjectiveManager objectiveManager)
        {
            if (gotoObjective != null && !gotoObjective.CanBeCompleted) { return 0; }