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

Displaying the condition of contained items in the inventory slot of the parent item (i.e. the amount of oxygen left in a diving suit is visible without highlighting the suit), some debug logging, colored speech bubbles

Browse Source
This commit is contained in:
Regalis
2016-04-21 17:17:32 +03:00
parent e46ec1ade2
commit 12dc494e42
15 changed files with 114 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Holdable/Pickable.cs
+6 -6
View File
@@ -11,12 +11,12 @@ namespace Barotrauma.Items.Components
{
protected Character picker;
protected List<LimbSlot> allowedSlots;
protected List<InvSlotType> allowedSlots;
private float pickTimer;
public List<LimbSlot> AllowedSlots
public List<InvSlotType> AllowedSlots
{
get { return allowedSlots; }
}
@@ -29,23 +29,23 @@ namespace Barotrauma.Items.Components
public Pickable(Item item, XElement element)
: base(item, element)
{
allowedSlots = new List<LimbSlot>();
allowedSlots = new List<InvSlotType>();
string slotString = ToolBox.GetAttributeString(element, "slots", "Any");
string[] slotCombinations = slotString.Split(',');
foreach (string slotCombination in slotCombinations)
{
string[] slots = slotCombination.Split('+');
LimbSlot allowedSlot = LimbSlot.None;
InvSlotType allowedSlot = InvSlotType.None;
foreach (string slot in slots)
{
if (slot.ToLower()=="bothhands")
{
allowedSlot = LimbSlot.LeftHand | LimbSlot.RightHand;
allowedSlot = InvSlotType.LeftHand | InvSlotType.RightHand;
}
else
{
allowedSlot = allowedSlot | (LimbSlot)Enum.Parse(typeof(LimbSlot), slot.Trim());
allowedSlot = allowedSlot | (InvSlotType)Enum.Parse(typeof(InvSlotType), slot.Trim());
}
}
allowedSlots.Add(allowedSlot);