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

Decloak on demolish and infiltrate

Browse Source 
Per issue #7028, infiltrating or demolishing a building will now cause an
infantry unit to decloak (if it has a cloak ability). This behaviour is
configurable (defaults to true in both cases) using the
DecloakOnInfiltrate and DecloakOnDemolish options.
This commit is contained in:
David Russell
2014-12-16 01:46:58 +00:00
parent f186f22bfc
commit 5e2df2c39a
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Activities/Demolish.cs
View File

@@ -13,6 +13,7 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.Effects;
using OpenRA.Traits;
using OpenRA.Mods.RA.Traits;
namespace OpenRA.Mods.RA.Activities
{
@@ -26,6 +27,8 @@ namespace OpenRA.Mods.RA.Activities
readonly int flashInterval;
readonly int flashDuration;
readonly Cloak cloak;
public Demolish(Actor self, Actor target, int delay, int flashes, int flashesDelay, int flashInterval, int flashDuration)
: base(self, target)
{
@@ -36,6 +39,7 @@ namespace OpenRA.Mods.RA.Activities
this.flashesDelay = flashesDelay;
this.flashInterval = flashInterval;
this.flashDuration = flashDuration;
cloak = self.TraitOrDefault<Cloak>();
}
protected override bool CanReserve(Actor self)
@@ -50,6 +54,9 @@ namespace OpenRA.Mods.RA.Activities
if (target.IsDead)
return;
if (cloak != null && cloak.Info.UncloakOnDemolish)
cloak.Uncloak();
for (var f = 0; f < flashes; f++)
w.Add(new DelayedAction(flashesDelay + f * flashInterval, () =>
w.Add(new FlashTarget(target, ticks: flashDuration))));

9
OpenRA.Mods.RA/Activities/Infiltrate.cs
View File

@@ -11,16 +11,22 @@
using OpenRA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
using OpenRA.Mods.RA.Traits;
namespace OpenRA.Mods.RA.Activities
{
class Infiltrate : Enter
{
readonly Actor target;
readonly Cloak cloak;
public Infiltrate(Actor self, Actor target)
: base(self, target)
{
this.target = target;
cloak = self.TraitOrDefault<Cloak>();
}
protected override void OnInside(Actor self)
@@ -28,6 +34,9 @@ namespace OpenRA.Mods.RA.Activities
if (target.IsDead || target.Owner == self.Owner)
return;
if (cloak != null && cloak.Info.UncloakOnInfiltrate)
cloak.Uncloak();
foreach (var t in target.TraitsImplementing<INotifyInfiltrated>())
t.Infiltrated(target, self);