v1.6.17.0 (Unto the Breach update)

This commit is contained in:
Regalis11
2024-10-22 17:29:04 +03:00
parent e74b3cdb17
commit 6e6c17e100
417 changed files with 17166 additions and 5870 deletions
@@ -39,14 +39,7 @@ namespace Barotrauma
public void CheckConditionals()
{
if (Target == null)
{
IsActive = false;
}
else
{
IsActive = LogicalOperator == PropertyConditional.LogicalOperatorType.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
}
IsActive = Target != null && PropertyConditional.CheckConditionals(Target, conditionals, LogicalOperator);
}
}
}
@@ -145,7 +145,6 @@ namespace Barotrauma
RelativeOrigin = SourceElement.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
Depth = SourceElement.GetAttributeFloat("depth", 0.001f);
#if CLIENT
Identifier = GetIdentifier(SourceElement);
AddToList(this);
#endif
}
@@ -282,9 +281,6 @@ namespace Barotrauma
size.Y *= sourceRect.Height;
RelativeOrigin = SourceElement.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
Depth = SourceElement.GetAttributeFloat("depth", 0.001f);
#if CLIENT
Identifier = GetIdentifier(SourceElement);
#endif
}
}