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);

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

@@ -26,8 +26,7 @@ namespace OpenRA.Mods.Common.Activities
readonly int flashesDelay;
readonly int flashInterval;
readonly int flashDuration;
readonly Cloak cloak;
readonly INotifyDemolition[] notifiers;
public Demolish(Actor self, Actor target, EnterBehaviour enterBehaviour, int delay,
int flashes, int flashesDelay, int flashInterval, int flashDuration)
@@ -35,12 +34,12 @@ namespace OpenRA.Mods.Common.Activities
{
this.target = target;
demolishables = target.TraitsImplementing<IDemolishable>().ToArray();
notifiers = self.TraitsImplementing<INotifyDemolition>().ToArray();
this.delay = delay;
this.flashes = flashes;
this.flashesDelay = flashesDelay;
this.flashInterval = flashInterval;
this.flashDuration = flashDuration;
cloak = self.TraitOrDefault<Cloak>();
}
protected override bool CanReserve(Actor self)
@@ -55,12 +54,8 @@ namespace OpenRA.Mods.Common.Activities
if (target.IsDead)
return;
if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Demolish))
cloak.Uncloak();
var building = target.TraitOrDefault<Building>();
if (building != null)
building.Lock();
foreach (var ind in notifiers)
ind.Demolishing(self);
for (var f = 0; f < flashes; f++)
w.Add(new DelayedAction(flashesDelay + f * flashInterval, () =>

9
OpenRA.Mods.Common/Activities/UnloadCargo.cs
View File

@@ -23,14 +23,14 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Actor self;
readonly Cargo cargo;
readonly Cloak[] cloaks;
readonly INotifyUnload[] notifiers;
readonly bool unloadAll;
public UnloadCargo(Actor self, bool unloadAll)
{
this.self = self;
cargo = self.Trait<Cargo>();
cloaks = self.TraitsImplementing<Cloak>().ToArray();
notifiers = self.TraitsImplementing<INotifyUnload>().ToArray();
this.unloadAll = unloadAll;
}
@@ -60,9 +60,8 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled || cargo.IsEmpty(self))
return NextActivity;
foreach (var cloak in cloaks)
if (cloak.Info.UncloakOn.HasFlag(UncloakType.Unload))
cloak.Uncloak();
foreach (var inu in notifiers)
inu.Unloading(self);
var actor = cargo.Peek(self);
var spawn = self.CenterPosition;

7
OpenRA.Mods.Common/Traits/Buildings/Building.cs
View File

@@ -237,7 +237,7 @@ namespace OpenRA.Mods.Common.Traits
}
public class Building : IOccupySpace, ITargetableCells, INotifySold, INotifyTransform, ISync, INotifyCreated,
INotifyAddedToWorld, INotifyRemovedFromWorld
INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyDemolition
{
public readonly bool SkipMakeAnimation;
public readonly BuildingInfo Info;
@@ -331,6 +331,11 @@ namespace OpenRA.Mods.Common.Traits
notify.BuildingComplete(self);
}
void INotifyDemolition.Demolishing(Actor self)
{
Lock();
}
void INotifySold.Selling(Actor self)
{
if (Info.RemoveSmudgesOnSell)

22
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -62,8 +62,8 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new Cloak(this); }
}
public class Cloak : ConditionalTrait<CloakInfo>, IRenderModifier, INotifyDamage,
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction
public class Cloak : ConditionalTrait<CloakInfo>, IRenderModifier, INotifyDamage, INotifyUnload, INotifyDemolition, INotifyInfiltration,
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction
{
[Sync] int remainingTime;
bool isDocking;
@@ -212,5 +212,23 @@ namespace OpenRA.Mods.Common.Traits
{
isDocking = false;
}
void INotifyUnload.Unloading(Actor self)
{
if (Info.UncloakOn.HasFlag(UncloakType.Unload))
Uncloak();
}
void INotifyDemolition.Demolishing(Actor self)
{
if (Info.UncloakOn.HasFlag(UncloakType.Demolish))
Uncloak();
}
void INotifyInfiltration.Infiltrating(Actor self)
{
if (Info.UncloakOn.HasFlag(UncloakType.Infiltrate))
Uncloak();
}
}
}

18
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -148,6 +148,24 @@ namespace OpenRA.Mods.Common.Traits
void Undocked();
}
[RequireExplicitImplementation]
public interface INotifyUnload
{
void Unloading(Actor self);
}
[RequireExplicitImplementation]
public interface INotifyDemolition
{
void Demolishing(Actor self);
}
[RequireExplicitImplementation]
public interface INotifyInfiltration
{
void Infiltrating(Actor self);
}
public interface ITechTreePrerequisiteInfo : ITraitInfo { }
public interface ITechTreePrerequisite
{