(d74fee449) Revert "Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons."

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:25:20 +03:00
parent e4f41789b0
commit f46990d539
12 changed files with 293 additions and 116 deletions
@@ -433,12 +433,8 @@ namespace Barotrauma
//door closed and the character can't open doors -> node can't be traversed
if (!canOpenDoors || character.LockHands) { return null; }
var doorButtons = nextNode.Waypoint.ConnectedDoor.Item.GetComponents<Controller>();
if (doorButtons.None())
{
doorButtons = nextNode.Waypoint.ConnectedDoor.Item.GetConnectedComponents<Controller>();
}
if (doorButtons.None())
var doorButtons = nextNode.Waypoint.ConnectedDoor.Item.GetConnectedComponents<Controller>();
if (!doorButtons.Any())
{
if (!nextNode.Waypoint.ConnectedDoor.HasRequiredItems(character, false)) { return null; }
}
@@ -68,15 +68,8 @@ namespace Barotrauma
if (useController)
{
var controllers = component.Item.GetComponents<Controller>();
if (controllers.None())
{
controllers = component.Item.GetConnectedComponents<Controller>();
}
if (controllers.Any())
{
controller = controllers.First();
}
var controllers = component.Item.GetConnectedComponents<Controller>();
if (controllers.Any()) controller = controllers[0];
}
canBeCompleted = true;
@@ -141,15 +141,8 @@ namespace Barotrauma
{
if (UseController)
{
var controllers = targetItem.Item.GetComponents<Controller>();
if (controllers.None())
{
controllers = targetItem.Item.GetConnectedComponents<Controller>();
}
if (controllers.Any())
{
ConnectedController = controllers.First();
}
var controllers = targetItem.Item.GetConnectedComponents<Controller>();
if (controllers.Count > 0) ConnectedController = controllers[0];
}
TargetEntity = targetItem.Item;
TargetItemComponent = targetItem;