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

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItem.cs
+40 -10
View File
@@ -15,6 +15,7 @@ namespace Barotrauma
public override bool AbandonWhenCannotCompleteSubjectives => false;
public override bool AllowMultipleInstances => true;
public override bool AllowWhileHandcuffed => false;
public HashSet<Item> ignoredItems = new HashSet<Item>();
@@ -158,11 +159,6 @@ namespace Barotrauma
protected override void Act(float deltaTime)
{
if (character.LockHands)
{
Abandon = true;
return;
}
if (IdentifiersOrTags != null && !isDoneSeeking)
{
if (checkInventory)
@@ -271,15 +267,49 @@ namespace Barotrauma
Inventory itemInventory = targetItem.ParentInventory;
var slots = itemInventory?.FindIndices(targetItem);
var droppedStack = TargetItem.DroppedStack.ToList();
if (HumanAIController.TakeItem(targetItem, character.Inventory, Equip, Wear, storeUnequipped: true, targetTags: IdentifiersOrTags))
{
if (TakeWholeStack && slots != null)
if (TakeWholeStack)
{
foreach (int slot in slots)
//taking the whole stack in this context means "as many items that can fit in one of the bot's slots",
//and the stack means either a stack of items in an inventory slot or a "dropped stack"
//so we need a bit of extra logic here
int maxStackSize = 0;
int takenItemCount = 1;
for (int i = 0; i < character.Inventory.Capacity; i++)
{
foreach (Item item in itemInventory.GetItemsAt(slot).ToList())
maxStackSize = Math.Max(maxStackSize, character.Inventory.HowManyCanBePut(targetItem.Prefab, i, condition: null));
}
if (slots != null)
{
foreach (int slot in slots)
{
HumanAIController.TakeItem(item, character.Inventory, equip: false, storeUnequipped: true);
foreach (Item item in itemInventory.GetItemsAt(slot).ToList())
{
if (HumanAIController.TakeItem(item, character.Inventory, equip: false, storeUnequipped: true))
{
takenItemCount++;
if (takenItemCount >= maxStackSize) { break; }
}
else
{
break;
}
}
}
}
foreach (var item in droppedStack)
{
if (item == TargetItem) { continue; }
if (HumanAIController.TakeItem(item, character.Inventory, equip: false, storeUnequipped: true))
{
takenItemCount++;
if (takenItemCount >= maxStackSize) { break; }
}
else
{
break;
}
}
}
@@ -411,7 +441,7 @@ namespace Barotrauma
if (!CheckItem(item)) { continue; }
if (item.Container != null)
{
if (item.Container.HasTag("donttakeitems")) { continue; }
if (item.Container.HasTag(Tags.DontTakeItems)) { continue; }
if (ignoredItems.Contains(item.Container)) { continue; }
if (ignoredContainerIdentifiers != null)
{