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

Remove the hardcoded cloak reference from activities

Browse Source
This commit is contained in:
abcdefg30
2017-07-13 23:45:48 +02:00
committed by reaperrr
parent 049ed086f9
commit 71f2026b32
6 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@
*/
#endregion
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Mods.Common.Activities;
@@ -21,14 +22,14 @@ namespace OpenRA.Mods.Cnc.Activities
{
readonly Actor target;
readonly Infiltrates infiltrates;
readonly Cloak cloak;
readonly INotifyInfiltration[] notifiers;
public Infiltrate(Actor self, Actor target, Infiltrates infiltrate)
: base(self, target, infiltrate.Info.EnterBehaviour)
{
this.target = target;
infiltrates = infiltrate;
cloak = self.TraitOrDefault<Cloak>();
notifiers = self.TraitsImplementing<INotifyInfiltration>().ToArray();
}
protected override void OnInside(Actor self)
@@ -40,8 +41,8 @@ namespace OpenRA.Mods.Cnc.Activities
if (!infiltrates.Info.ValidStances.HasStance(stance))
return;
if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Infiltrate))
cloak.Uncloak();
foreach (var ini in notifiers)
ini.Infiltrating(self);
foreach (var t in target.TraitsImplementing<INotifyInfiltrated>())
t.Infiltrated(target, self);