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

Simplify FlashTarget.

Browse Source 
Now defined in terms of a flash count, interval, and delay.
Broken FlashDuration parameter removed from Demolition.
This commit is contained in:
Paul Chote
2018-10-28 11:34:07 +00:00
committed by abcdefg30
parent 1b9f23eca0
commit 0901a7d9de
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,11 +25,10 @@ namespace OpenRA.Mods.Common.Activities
readonly int flashes;
readonly int flashesDelay;
readonly int flashInterval;
readonly int flashDuration;
readonly INotifyDemolition[] notifiers;
public Demolish(Actor self, Actor target, EnterBehaviour enterBehaviour, int delay,
int flashes, int flashesDelay, int flashInterval, int flashDuration)
int flashes, int flashesDelay, int flashInterval)
: base(self, target, enterBehaviour)
{
this.target = target;
@@ -39,7 +38,6 @@ namespace OpenRA.Mods.Common.Activities
this.flashes = flashes;
this.flashesDelay = flashesDelay;
this.flashInterval = flashInterval;
this.flashDuration = flashDuration;
}
protected override bool CanReserve(Actor self)
@@ -57,9 +55,7 @@ namespace OpenRA.Mods.Common.Activities
foreach (var ind in notifiers)
ind.Demolishing(self);
for (var f = 0; f < flashes; f++)
w.Add(new DelayedAction(flashesDelay + f * flashInterval, () =>
w.Add(new FlashTarget(target, ticks: flashDuration))));
w.Add(new FlashTarget(target, count: flashes, delay: flashesDelay, interval: flashInterval));
w.Add(new DelayedAction(delay, () =>
{