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

Rename IAcceptInfiltrator to INotifyInfiltrated

Browse Source
This commit is contained in:
ScottNZ
2014-08-01 22:47:18 +12:00
parent 058185754e
commit ca4b947037
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -81,9 +81,9 @@ namespace OpenRA.Traits
public interface INotifyEffectiveOwnerChanged { void OnEffectiveOwnerChanged(Actor self, Player oldEffectiveOwner, Player newEffectiveOwner); } public interface INotifyEffectiveOwnerChanged { void OnEffectiveOwnerChanged(Actor self, Player oldEffectiveOwner, Player newEffectiveOwner); }
public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); } public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
public interface INotifyHarvest { void Harvested(Actor self, ResourceType resource); } public interface INotifyHarvest { void Harvested(Actor self, ResourceType resource); }
public interface ISeedableResource { void Seed(Actor self); } public interface INotifyInfiltrated { void Infiltrated(Actor self, Actor infiltrator); }
public interface IAcceptInfiltrator { void OnInfiltrate(Actor self, Actor infiltrator); } public interface ISeedableResource { void Seed(Actor self); }
public interface IDemolishableInfo { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); } public interface IDemolishableInfo { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); }
public interface IDemolishable public interface IDemolishable

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

@@ -23,8 +23,8 @@ namespace OpenRA.Mods.RA.Activities
if (IsCanceled || target.Type != TargetType.Actor || target.Actor.Owner == self.Owner) if (IsCanceled || target.Type != TargetType.Actor || target.Actor.Owner == self.Owner)
return NextActivity; return NextActivity;
foreach (var t in target.Actor.TraitsImplementing<IAcceptInfiltrator>()) foreach (var t in target.Actor.TraitsImplementing<INotifyInfiltrated>())
t.OnInfiltrate(target.Actor, self); t.Infiltrated(target.Actor, self);
self.Destroy(); self.Destroy();

4
OpenRA.Mods.RA/InfiltrateForCash.cs
View File

@@ -24,13 +24,13 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new InfiltrateForCash(this); } public object Create(ActorInitializer init) { return new InfiltrateForCash(this); }
} }
class InfiltrateForCash : IAcceptInfiltrator class InfiltrateForCash : INotifyInfiltrated
{ {
readonly InfiltrateForCashInfo info; readonly InfiltrateForCashInfo info;
public InfiltrateForCash(InfiltrateForCashInfo info) { this.info = info; } public InfiltrateForCash(InfiltrateForCashInfo info) { this.info = info; }
public void OnInfiltrate(Actor self, Actor infiltrator) public void Infiltrated(Actor self, Actor infiltrator)
{ {
var targetResources = self.Owner.PlayerActor.Trait<PlayerResources>(); var targetResources = self.Owner.PlayerActor.Trait<PlayerResources>();
var spyResources = infiltrator.Owner.PlayerActor.Trait<PlayerResources>(); var spyResources = infiltrator.Owner.PlayerActor.Trait<PlayerResources>();

4
OpenRA.Mods.RA/InfiltrateForExploration.cs
View File

@@ -14,9 +14,9 @@ namespace OpenRA.Mods.RA
{ {
class InfiltrateForExplorationInfo : TraitInfo<InfiltrateForExploration> { } class InfiltrateForExplorationInfo : TraitInfo<InfiltrateForExploration> { }
class InfiltrateForExploration : IAcceptInfiltrator class InfiltrateForExploration : INotifyInfiltrated
{ {
public void OnInfiltrate(Actor self, Actor infiltrator) public void Infiltrated(Actor self, Actor infiltrator)
{ {
// Steal and reset the owners exploration // Steal and reset the owners exploration
infiltrator.Owner.Shroud.Explore(self.Owner.Shroud); infiltrator.Owner.Shroud.Explore(self.Owner.Shroud);

4
OpenRA.Mods.RA/InfiltrateForSupportPower.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new InfiltrateForSupportPower(this); } public object Create(ActorInitializer init) { return new InfiltrateForSupportPower(this); }
} }
class InfiltrateForSupportPower : IAcceptInfiltrator class InfiltrateForSupportPower : INotifyInfiltrated
{ {
readonly InfiltrateForSupportPowerInfo info; readonly InfiltrateForSupportPowerInfo info;
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
this.info = info; this.info = info;
} }
public void OnInfiltrate(Actor self, Actor infiltrator) public void Infiltrated(Actor self, Actor infiltrator)
{ {
infiltrator.World.AddFrameEndTask(w => w.CreateActor(info.Proxy, new TypeDictionary infiltrator.World.AddFrameEndTask(w => w.CreateActor(info.Proxy, new TypeDictionary
{ {