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

(3315662d5) Implement optional required items (lol) and fix the doors. It's a bit confusing, but should work.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-10 13:26:56 +03:00
parent f941a21ada
commit 74da38bd10
3 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
+46 -25
View File
@@ -581,43 +581,63 @@ namespace Barotrauma.Items.Components
{
if (!requiredItems.Any()) return true;
if (character.Inventory == null) return false;
bool hasRequiredItems = false;
bool canContinue = true;
if (requiredItems.ContainsKey(RelatedItem.RelationType.Equipped))
{
foreach (RelatedItem ri in requiredItems[RelatedItem.RelationType.Equipped])
{
if (character.SelectedItems.FirstOrDefault(it => it != null && it.Condition > 0.0f && ri.MatchesItem(it)) == null)
{
#if CLIENT
msg = msg ?? ri.Msg;
if (addMessage && !string.IsNullOrEmpty(msg))
{
GUI.AddMessage(msg, Color.Red);
}
#endif
return false;
}
canContinue = CheckItems(ri, character.SelectedItems);
if (!canContinue) { break; }
}
}
if (requiredItems.ContainsKey(RelatedItem.RelationType.Picked))
if (canContinue)
{
foreach (RelatedItem ri in requiredItems[RelatedItem.RelationType.Picked])
if (requiredItems.ContainsKey(RelatedItem.RelationType.Picked))
{
if (character.Inventory.Items.FirstOrDefault(it => it != null && it.Condition > 0.0f && ri.MatchesItem(it)) == null)
foreach (RelatedItem ri in requiredItems[RelatedItem.RelationType.Picked])
{
#if CLIENT
msg = msg ?? ri.Msg;
if (addMessage && !string.IsNullOrEmpty(msg))
{
GUI.AddMessage(msg, Color.Red);
}
#endif
return false;
if (!CheckItems(ri, character.Inventory.Items)) { break; }
}
}
}
return true;
#if CLIENT
if (!hasRequiredItems && addMessage && !string.IsNullOrEmpty(msg))
{
GUI.AddMessage(msg, Color.Red);
}
#endif
return hasRequiredItems;
bool CheckItems(RelatedItem relatedItem, IEnumerable<Item> itemList)
{
bool Predicate(Item it) => it != null && it.Condition > 0.0f && relatedItem.MatchesItem(it);
bool shouldBreak = false;
if (relatedItem.IsOptional)
{
if (!hasRequiredItems)
{
hasRequiredItems = itemList.Any(Predicate);
}
}
else
{
hasRequiredItems = itemList.Any(Predicate);
if (!hasRequiredItems)
{
shouldBreak = true;
}
}
if (!hasRequiredItems)
{
if (msg == null && !string.IsNullOrEmpty(relatedItem.Msg))
{
msg = relatedItem.Msg;
}
}
return !shouldBreak;
}
}
public void ApplyStatusEffects(ActionType type, float deltaTime, Character character = null, Limb targetLimb = null, Character user = null)
@@ -762,6 +782,7 @@ namespace Barotrauma.Items.Components
{
newRequiredItem.statusEffects = prevRequiredItem.statusEffects;
newRequiredItem.Msg = prevRequiredItem.Msg;
newRequiredItem.IsOptional = prevRequiredItem.IsOptional;
}
if (!requiredItems.ContainsKey(newRequiredItem.Type))