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

(98ad00fa2) v0.9.1.0

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-07-10 13:52:12 +03:00
parent 2a791887ed
commit afa2137bd2
104 changed files with 3041 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/StatusEffects/PropertyConditional.cs
+2 -2
View File
@@ -277,7 +277,7 @@ namespace Barotrauma
case OperatorType.Equals:
if (type == typeof(bool))
{
return ((bool)propertyValue) == (AttributeValue == "true");
return ((bool)propertyValue) == (AttributeValue == "true" || AttributeValue == "True");
}
else if (FloatValue == null)
{
@@ -290,7 +290,7 @@ namespace Barotrauma
case OperatorType.NotEquals:
if (type == typeof(bool))
{
return ((bool)propertyValue) != (AttributeValue == "true");
return ((bool)propertyValue) != (AttributeValue == "true" || AttributeValue == "True");
}
else if (FloatValue == null)
{
Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
+1
View File
@@ -424,6 +424,7 @@ namespace Barotrauma
public virtual bool HasRequiredConditions(List<ISerializableEntity> targets)
{
if (!propertyConditionals.Any()) return true;
if (requiredItems.All(ri => ri.MatchOnEmpty) && targets.Count == 0) return true;
switch (conditionalComparison)
{
case PropertyConditional.Comparison.Or: