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

817c58e...af8a4af

Browse Source 
commit af8a4af10c665a1f539c008a9440b4f89df55fa5
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 19 15:06:21 2019 +0200

    Fixed default StatusEffect conditional comparison type back to OR. Using AND caused a variety of bugs, for example flares would not activate or oxygen tanks explode when on fire because the conditional would have to be true on all the components of the item, and the Item object itself. Closes #1307
This commit is contained in:
Joonas Rikkonen
2019-03-19 15:06:48 +02:00
parent 1561fa4867
commit 2c17675288
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
+15 -1
View File
@@ -107,7 +107,7 @@ namespace Barotrauma
public string[] propertyNames;
private object[] propertyEffects;
private PropertyConditional.Comparison conditionalComparison = PropertyConditional.Comparison.And;
private PropertyConditional.Comparison conditionalComparison = PropertyConditional.Comparison.Or;
private List<PropertyConditional> propertyConditionals;
private bool setValue;
@@ -465,6 +465,13 @@ namespace Barotrauma
if (target == null || target.SerializableProperties == null) { continue; }
foreach (PropertyConditional pc in propertyConditionals)
{
if (!string.IsNullOrEmpty(pc.TargetItemComponentName))
{
if (!(target is ItemComponent ic) || ic.GetType().ToString() != pc.TargetItemComponentName)
{
continue;
}
}
if (pc.Matches(target)) { return true; }
}
}
@@ -475,6 +482,13 @@ namespace Barotrauma
if (target == null || target.SerializableProperties == null) { continue; }
foreach (PropertyConditional pc in propertyConditionals)
{
if (!string.IsNullOrEmpty(pc.TargetItemComponentName))
{
if (!(target is ItemComponent ic) || ic.GetType().ToString() != pc.TargetItemComponentName)
{
continue;
}
}
if (!pc.Matches(target)) { return false; }
}
}