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

Unstable 1.8.4.0

Browse Source
This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/CharacterInventory.cs
+38 -22
View File
@@ -30,13 +30,18 @@ namespace Barotrauma
private readonly Character character;
/// <summary>
/// Slot type for each inventory slot. Vanilla package has one type for each slot,
/// although it is technically possible to have multiple types for a single slot.
/// </summary>
public InvSlotType[] SlotTypes
{
get;
private set;
}
public static readonly List<InvSlotType> AnySlot = new List<InvSlotType>() { InvSlotType.Any };
public static readonly List<InvSlotType> AnySlot = new List<InvSlotType> { InvSlotType.Any };
public static readonly List<InvSlotType> BagSlot = new List<InvSlotType> { InvSlotType.Bag };
public static bool IsHandSlotType(InvSlotType s) => s.HasFlag(InvSlotType.LeftHand) || s.HasFlag(InvSlotType.RightHand);
@@ -356,31 +361,40 @@ namespace Barotrauma
}
if (item.GetComponent<Pickable>() == null || item.AllowedSlots.None()) { return false; }
bool inSuitableSlot = false;
bool inWrongSlot = false;
int currentSlot = -1;
for (int i = 0; i < capacity; i++)
bool inWrongSlot = false;
bool inSuitableSlot = false;
// verify item's current placement
for (int slotIndex = 0; slotIndex < capacity; slotIndex++)
{
if (slots[i].Contains(item))
if (!slots[slotIndex].Contains(item)) { continue; }
// item is at least in this slot, can be in many
currentSlot = slotIndex;
var firstMatchingSlotType = allowedSlots.FirstOrDefault(slot => slot.HasFlag(SlotTypes[slotIndex]));
if (firstMatchingSlotType == default) // if (firstMatchingSlotType == InvSlotType.None)
{
currentSlot = i;
if (allowedSlots.Any(a => a.HasFlag(SlotTypes[i])))
inWrongSlot = true;
break;
}
inSuitableSlot = true;
// can have more than one flag, such as InvSlotType.InnerClothes | InvSlotType.OuterClothes
var individualFlags = EnumExtensions.GetIndividualFlags(firstMatchingSlotType);
// if item is not in ALL required slot types
foreach (var flag in individualFlags)
{
if (flag == InvSlotType.None) { continue; }
if (!IsInLimbSlot(item, flag))
{
if ((SlotTypes[i] == InvSlotType.RightHand || SlotTypes[i] == InvSlotType.LeftHand) && !allowedSlots.Contains(SlotTypes[i]))
{
//allowed slot = InvSlotType.RightHand | InvSlotType.LeftHand
// -> make sure the item is in both hand slots
inSuitableSlot = IsInLimbSlot(item, InvSlotType.RightHand) && IsInLimbSlot(item, InvSlotType.LeftHand);
}
else
{
inSuitableSlot = true;
}
}
else if (!allowedSlots.Any(a => a.HasFlag(SlotTypes[i])))
{
inWrongSlot = true;
inSuitableSlot = false;
break;
}
}
}
@@ -447,6 +461,8 @@ namespace Barotrauma
return placedInSlot > -1;
}
public bool IsAnySlotAvailable(Item item) => GetFreeAnySlot(item, inWrongSlot: false) > -1;