epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reimplement demolition lock using conditions.

Browse Source
This commit is contained in:
Paul Chote
2018-10-27 17:09:30 +00:00
committed by abcdefg30
parent 0901a7d9de
commit 18b84750aa
25 changed files with 239 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Activities/Demolish.cs
View File

@@ -52,23 +52,13 @@ namespace OpenRA.Mods.Common.Activities
if (target.IsDead)
return;
w.Add(new FlashTarget(target, count: flashes, delay: flashesDelay, interval: flashInterval));
foreach (var ind in notifiers)
ind.Demolishing(self);
w.Add(new FlashTarget(target, count: flashes, delay: flashesDelay, interval: flashInterval));
w.Add(new DelayedAction(delay, () =>
{
if (target.IsDead)
return;
var modifiers = target.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(self, null));
if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
demolishables.Do(d => d.Demolish(target, self));
}));
foreach (var d in demolishables)
d.Demolish(target, self, delay);
});
}
}