Unstable v0.10.601.0

This commit is contained in:
Juan Pablo Arce
2020-10-07 10:39:32 -03:00
parent ebe1ce1427
commit 768f516e7c
65 changed files with 743 additions and 139 deletions
@@ -8,14 +8,7 @@ namespace Barotrauma
partial class ConditionalSprite
{
public readonly List<PropertyConditional> conditionals = new List<PropertyConditional>();
public bool IsActive
{
get
{
if (Target == null) { return false; }
return Comparison == PropertyConditional.Comparison.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
}
}
public bool IsActive { get; private set; } = true;
public readonly PropertyConditional.Comparison Comparison;
public readonly bool Exclusive;
@@ -55,5 +48,17 @@ namespace Barotrauma
}
}
}
public void CheckConditionals()
{
if (Target == null)
{
IsActive = false;
}
else
{
IsActive = Comparison == PropertyConditional.Comparison.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
}
}
}
}