vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(e0d673b0d) Test: Don't calculate the distance to the buttons when seeking path. Instead, check the distance when checking the doors. Allows the bots to access the Remora ballast through the door where the button is a bit farther from the door than usually.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-16 05:42:51 +03:00
parent 828150e0ae
commit de2246fe57
85 changed files with 1955 additions and 1760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs
+24 -43
View File
@@ -9,15 +9,9 @@ namespace Barotrauma
{
public override string DebugTag => "contain item";
public int MinContainedAmount = 1;
//can either be a tag or an identifier
private string[] itemIdentifiers;
private ItemContainer container;
public Func<Item, float> GetItemPriority;
public int MinContainedAmount = 1;
public string[] ignoredContainerIdentifiers;
//can either be a tag or an identifier
@@ -27,14 +21,12 @@ namespace Barotrauma
private bool isCompleted;
private AIObjectiveGetItem getItemObjective;
private AIObjectiveGoTo goToObjective;
public AIObjectiveContainItem(Character character, string itemIdentifier, ItemContainer container)
: this(character, new string[] { itemIdentifier }, container)
{
}
public AIObjectiveContainItem(Character character, string[] itemIdentifiers, ItemContainer container)
: base (character, "")
public AIObjectiveContainItem(Character character, string itemIdentifier, ItemContainer container, AIObjectiveManager objectiveManager, float priorityModifier = 1)
: this(character, new string[] { itemIdentifier }, container, objectiveManager, priorityModifier) { }
public AIObjectiveContainItem(Character character, string[] itemIdentifiers, ItemContainer container, AIObjectiveManager objectiveManager, float priorityModifier = 1)
: base (character, objectiveManager, priorityModifier)
{
this.itemIdentifiers = itemIdentifiers;
for (int i = 0; i < itemIdentifiers.Length; i++)
@@ -51,22 +43,10 @@ namespace Barotrauma
int containedItemCount = 0;
foreach (Item item in container.Inventory.Items)
{
if (item != null && itemIdentifiers.Any(id => item.Prefab.Identifier == id || item.HasTag(id))) containedItemCount++;
}
return containedItemCount >= MinContainedAmount;
}
public override bool CanBeCompleted
{
get
{
if (goToObjective != null)
if (item != null && itemIdentifiers.Any(id => item.Prefab.Identifier == id || item.HasTag(id)))
{
containedItemCount++;
}
return getItemObjective == null || getItemObjective.CanBeCompleted;
}
return containedItemCount >= MinContainedAmount;
}
@@ -88,17 +68,16 @@ namespace Barotrauma
foreach (string identifier in itemIdentifiers)
{
itemToContain = character.Inventory.FindItemByIdentifier(identifier) ?? character.Inventory.FindItemByTag(identifier);
if (itemToContain != null && itemToContain.Condition > 0.0f) break;
}
if (itemToContain != null && itemToContain.Condition > 0.0f) { break; }
}
if (itemToContain == null)
{
getItemObjective = new AIObjectiveGetItem(character, itemIdentifiers)
{
GetItemPriority = GetItemPriority,
ignoredContainerIdentifiers = ignoredContainerIdentifiers
};
AddSubObjective(getItemObjective);
TryAddSubObjective(ref getItemObjective, () =>
new AIObjectiveGetItem(character, itemIdentifiers, objectiveManager)
{
GetItemPriority = GetItemPriority,
ignoredContainerIdentifiers = ignoredContainerIdentifiers
});
return;
}
if (container.Item.ParentInventory == character.Inventory)
@@ -115,7 +94,8 @@ namespace Barotrauma
}
else
{
if (container.Item.CurrentHull != character.CurrentHull || (Vector2.Distance(character.Position, container.Item.Position) > container.Item.InteractDistance && !container.Item.IsInsideTrigger(character.WorldPosition)))
if (container.Item.CurrentHull != character.CurrentHull ||
(Vector2.DistanceSquared(character.Position, container.Item.Position) > Math.Pow(container.Item.InteractDistance, 2) && !container.Item.IsInsideTrigger(character.WorldPosition)))
{
TryAddSubObjective(ref goToObjective, () => new AIObjectiveGoTo(container.Item, character, objectiveManager));
return;
@@ -127,14 +107,15 @@ namespace Barotrauma
public override bool IsDuplicate(AIObjective otherObjective)
{
AIObjectiveContainItem objective = otherObjective as AIObjectiveContainItem;
if (objective == null) return false;
if (objective.container != container) return false;
if (objective.itemIdentifiers.Length != itemIdentifiers.Length) return false;
if (!(otherObjective is AIObjectiveContainItem objective)) { return false; }
if (objective.container != container) { return false; }
if (objective.itemIdentifiers.Length != itemIdentifiers.Length) { return false; }
for (int i = 0; i < itemIdentifiers.Length; i++)
{
if (objective.itemIdentifiers[i] != itemIdentifiers[i]) return false;
if (objective.itemIdentifiers[i] != itemIdentifiers[i])
{
return false;
}
}
return true;
}