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

38f1ddb...178a853: v0.8.9.1, removed content folder

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 19:46:58 +02:00
parent 38f1ddb6fe
commit 6c0679c297
1054 changed files with 151673 additions and 144931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
+6 -6
View File
@@ -17,8 +17,8 @@ namespace Barotrauma
private float delay;
public DelayedEffect(XElement element)
: base(element)
public DelayedEffect(XElement element, string parentDebugName)
: base(element, parentDebugName)
{
delay = element.GetAttributeFloat("delay", 1.0f);
}
@@ -27,8 +27,8 @@ namespace Barotrauma
{
if (this.type != type || !HasRequiredItems(entity)) return;
if (!Stackable && DelayList.Any(d => d.Parent == this && d.Targets.Count == 1 && d.Targets[0] == target)) return;
if (targetNames != null && !targetNames.Contains(target.Name)) return;
if (targetIdentifiers != null && !IsValidTarget(target)) return;
if (!HasRequiredConditions(new List<ISerializableEntity>() { target })) return;
DelayedListElement element = new DelayedListElement
@@ -48,9 +48,9 @@ namespace Barotrauma
if (!Stackable && DelayList.Any(d => d.Parent == this && d.Targets.SequenceEqual(targets))) return;
//remove invalid targets
if (targetNames != null)
if (targetIdentifiers != null)
{
targets.RemoveAll(t => !targetNames.Contains(t.Name));
targets.RemoveAll(t => !IsValidTarget(t));
if (targets.Count == 0) return;
}