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

v0.12.0.2

Browse Source
This commit is contained in:
Joonas Rikkonen
2021-02-10 17:08:21 +02:00
parent 5c80a59bdd
commit 694cdfee7b
353 changed files with 12897 additions and 5028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/RelatedItem.cs
+21 -14
View File
@@ -17,6 +17,7 @@ namespace Barotrauma
}
public bool IsOptional { get; set; }
public bool MatchOnEmpty { get; set; }
public bool IgnoreInEditor { get; set; }
@@ -30,6 +31,10 @@ namespace Barotrauma
public string Msg;
public string MsgTag;
/// <summary>
/// Should broken (0 condition) items be excluded
/// </summary>
public bool ExcludeBroken { get; private set; }
public RelationType Type
{
@@ -107,21 +112,20 @@ namespace Barotrauma
return CheckContained(parentItem);
case RelationType.Container:
if (parentItem == null || parentItem.Container == null) { return MatchOnEmpty; }
return parentItem.Container.Condition > 0.0f && MatchesItem(parentItem.Container);
return (!ExcludeBroken || parentItem.Container.Condition > 0.0f) && MatchesItem(parentItem.Container);
case RelationType.Equipped:
if (character == null) { return false; }
if (MatchOnEmpty && character.SelectedItems.All(it => it == null)) { return true; }
foreach (Item equippedItem in character.SelectedItems)
if (MatchOnEmpty && !character.HeldItems.Any()) { return true; }
foreach (Item equippedItem in character.HeldItems)
{
if (equippedItem == null) { continue; }
if (equippedItem.Condition > 0.0f && MatchesItem(equippedItem)) { return true; }
if ((!ExcludeBroken || equippedItem.Condition > 0.0f) && MatchesItem(equippedItem)) { return true; }
}
break;
case RelationType.Picked:
if (character == null || character.Inventory == null) { return false; }
foreach (Item pickedItem in character.Inventory.Items)
foreach (Item pickedItem in character.Inventory.AllItems)
{
if (pickedItem == null) { continue; }
if (MatchesItem(pickedItem)) { return true; }
}
break;
@@ -134,18 +138,16 @@ namespace Barotrauma
private bool CheckContained(Item parentItem)
{
var containedItems = parentItem.OwnInventory?.Items;
if (containedItems == null) { return false; }
if (parentItem.OwnInventory == null) { return false; }
if (MatchOnEmpty && !containedItems.Any(ci => ci != null))
if (MatchOnEmpty && parentItem.OwnInventory.IsEmpty())
{
return true;
}
foreach (Item contained in containedItems)
foreach (Item contained in parentItem.ContainedItems)
{
if (contained == null) { continue; }
if (contained.Condition > 0.0f && MatchesItem(contained)) { return true; }
if ((!ExcludeBroken || contained.Condition > 0.0f) && MatchesItem(contained)) { return true; }
if (CheckContained(contained)) { return true; }
}
return false;
@@ -157,7 +159,8 @@ namespace Barotrauma
new XAttribute("items", JoinedIdentifiers),
new XAttribute("type", type.ToString()),
new XAttribute("optional", IsOptional),
new XAttribute("ignoreineditor", IgnoreInEditor));
new XAttribute("ignoreineditor", IgnoreInEditor),
new XAttribute("excludebroken", ExcludeBroken));
if (excludedIdentifiers.Length > 0)
{
@@ -215,9 +218,13 @@ namespace Barotrauma
}
}
if (identifiers.Length == 0 && excludedIdentifiers.Length == 0 && !returnEmpty) { return null; }
RelatedItem ri = new RelatedItem(identifiers, excludedIdentifiers);
RelatedItem ri = new RelatedItem(identifiers, excludedIdentifiers)
{
ExcludeBroken = element.GetAttributeBool("excludebroken", true)
};
string typeStr = element.GetAttributeString("type", "");
if (string.IsNullOrEmpty(typeStr))
{