(5269b5857) tweaks

2019-05-16 06:58:09 +03:00
parent 3fc539d373
commit 42d4b5bfcd
12 changed files with 217 additions and 49 deletions
@@ -74,6 +74,21 @@ namespace Barotrauma
            }
        }

+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -28,7 +28,14 @@ namespace Barotrauma
            get { return _waitTimer; }
            set
            {
-                _waitTimer = IsAllowedToWait() ? value : 0;
+                if (CurrentObjective is AIObjectiveCombat || CurrentObjective is AIObjectiveFindSafety)
+                {
+                    _waitTimer = 0;
+                }
+                else
+                {
+                    _waitTimer = value;
+                }
            }
        }

@@ -198,6 +205,31 @@ namespace Barotrauma
            {
                CurrentObjective?.TryComplete(deltaTime);
            }
+            else
+            {
+                if (CurrentOrder != null)
+                {
+                    CurrentOrder.TryComplete(deltaTime);
+                }
+                else
+                {
+                    // Wait, if not swimming, climbing, or staying in a forbidden/unsafe hull.
+                    if (character.AIController is HumanAIController humanAI && humanAI.SteeringManager != null)
+                    {
+                        if (!character.AnimController.InWater &&
+                            !character.IsClimbing &&
+                            !humanAI.UnsafeHulls.Contains(character.CurrentHull) && 
+                            !AIObjectiveIdle.IsForbidden(character.CurrentHull))
+                        {
+                            humanAI.SteeringManager.Reset();
+                        }
+                        else
+                        {
+                            CurrentObjective?.TryComplete(deltaTime);
+                        }
+                    }
+                }
+            }
        }
        
        public void SetOrder(AIObjective objective)
@@ -274,19 +306,5 @@ namespace Barotrauma
            }
            return newObjective;
        }
-
-        private bool IsAllowedToWait()
-        {
-            if (CurrentOrder != null) { return false; }
-            if (CurrentObjective is AIObjectiveCombat || CurrentObjective is AIObjectiveFindSafety) { return false; }
-            if (character.AnimController.InWater) { return false; }
-            if (character.IsClimbing) { return false; }
-            if (character.AIController is HumanAIController humanAI)
-            {
-                if (humanAI.UnsafeHulls.Contains(character.CurrentHull)) { return false; }
-            }
-            if (AIObjectiveIdle.IsForbidden(character.CurrentHull)) { return false; }
-            return true;
-        }
    }
 }
@@ -893,6 +893,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -1154,6 +1154,15 @@ namespace Barotrauma
                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
            }
            
+            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
+            {
+                //apply some smoothing to the cursor positions of remote players when playing as a client
+                //to make aiming look a little less choppy
+                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
+                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
+                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
+            }
+            
            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
            {
                if (speedMultipliers.Count == 0) return 1f;