(f417b026f) Fetched: Changes for playing video tutorial from local branch

2019-03-27 20:45:14 +02:00
parent e65c669eaa
commit 3f82c9a2cb
125 changed files with 1317 additions and 3166 deletions
@@ -115,7 +115,6 @@ namespace Barotrauma
                        unreachable.Add(goToObjective.Target as Hull);
                    }
                    goToObjective = null;
-                    SteeringManager.SteeringWander();
                }
            }
            else if (currentHull != null)
@@ -132,11 +131,6 @@ namespace Barotrauma

                foreach (Character enemy in Character.CharacterList)
                {
-                    //don't run from friendly NPCs
-                    if (enemy.TeamID == Character.TeamType.FriendlyNPC) { continue; }
-                    //friendly NPCs don't run away from anything but characters controlled by EnemyAIController (= monsters)
-                    if (character.TeamID == Character.TeamType.FriendlyNPC && !(enemy.AIController is EnemyAIController)) { continue; }
-
                    if (enemy.CurrentHull == currentHull && !enemy.IsDead && !enemy.IsUnconscious && 
                        (enemy.AIController is EnemyAIController || enemy.TeamID != character.TeamID))
                    {