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

Add Type Support for InfiltrateFor* traits

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2017-11-07 10:32:11 +03:00
committed by Paul Chote
parent f7de5d46be
commit fc07391c8c
10 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Cnc.Activities
ini.Infiltrating(self);
foreach (var t in target.TraitsImplementing<INotifyInfiltrated>())
t.Infiltrated(target, self);
t.Infiltrated(target, self, infiltrates.Info.Types);
var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (exp != null)

8
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -19,6 +20,8 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("This structure can be infiltrated causing funds to be stolen.")]
class InfiltrateForCashInfo : ITraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
[Desc("Percentage of the victim's resources that will be stolen.")]
public readonly int Percentage = 100;
@@ -44,8 +47,11 @@ namespace OpenRA.Mods.Cnc.Traits
public InfiltrateForCash(InfiltrateForCashInfo info) { this.info = info; }
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
{
if (!info.Types.Overlaps(types))
return;
var targetResources = self.Owner.PlayerActor.Trait<PlayerResources>();
var spyResources = infiltrator.Owner.PlayerActor.Trait<PlayerResources>();
var spyValue = infiltrator.Info.TraitInfoOrDefault<ValuedInfo>();

15
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForDecoration.cs
View File

@@ -20,18 +20,27 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("Reveals a decoration sprite to the indicated players when infiltrated.")]
class InfiltrateForDecorationInfo : WithDecorationInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public override object Create(ActorInitializer init) { return new InfiltrateForDecoration(init.Self, this); }
}
class InfiltrateForDecoration : WithDecoration, INotifyInfiltrated
{
readonly HashSet<Player> infiltrators = new HashSet<Player>();
readonly InfiltrateForDecorationInfo info;
public InfiltrateForDecoration(Actor self, InfiltrateForDecorationInfo info)
: base(self, info) { }
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator)
: base(self, info)
{
this.info = info;
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
{
if (!info.Types.Overlaps(types))
return;
infiltrators.Add(infiltrator.Owner);
}

20
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -16,12 +17,27 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Steal and reset the owner's exploration.")]
class InfiltrateForExplorationInfo : TraitInfo<InfiltrateForExploration> { }
class InfiltrateForExplorationInfo : ITraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public object Create(ActorInitializer init) { return new InfiltrateForExploration(init.Self, this); }
}
class InfiltrateForExploration : INotifyInfiltrated
{
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator)
readonly InfiltrateForExplorationInfo info;
public InfiltrateForExploration(Actor self, InfiltrateForExplorationInfo info)
{
this.info = info;
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
{
if (!info.Types.Overlaps(types))
return;
infiltrator.Owner.Shroud.Explore(self.Owner.Shroud);
var preventReset = self.Owner.PlayerActor.TraitsImplementing<IPreventsShroudReset>()
.Any(p => p.PreventShroudReset(self));

8
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -16,6 +17,8 @@ namespace OpenRA.Mods.Cnc.Traits
{
class InfiltrateForPowerOutageInfo : ITraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public readonly int Duration = 25 * 20;
public object Create(ActorInitializer init) { return new InfiltrateForPowerOutage(init.Self, this); }
@@ -32,8 +35,11 @@ namespace OpenRA.Mods.Cnc.Traits
playerPower = self.Owner.PlayerActor.Trait<PowerManager>();
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
{
if (!info.Types.Overlaps(types))
return;
playerPower.TriggerPowerOutage(info.Duration);
}

8
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForSupportPower.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
@@ -19,6 +20,8 @@ namespace OpenRA.Mods.Cnc.Traits
{
[ActorReference, FieldLoader.Require] public readonly string Proxy = null;
public readonly HashSet<string> Types = new HashSet<string>();
public object Create(ActorInitializer init) { return new InfiltrateForSupportPower(this); }
}
@@ -31,8 +34,11 @@ namespace OpenRA.Mods.Cnc.Traits
this.info = info;
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
{
if (!info.Types.Overlaps(types))
return;
infiltrator.World.AddFrameEndTask(w => w.CreateActor(info.Proxy, new TypeDictionary
{
new OwnerInit(infiltrator.Owner)

2
OpenRA.Mods.Common/Scripting/ScriptTriggers.cs
View File

@@ -302,7 +302,7 @@ namespace OpenRA.Mods.Common.Scripting
OnCapturedInternal(self);
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
{
if (world.Disposing)
return;

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

@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits
public interface ISeedableResource { void Seed(Actor self); }
[RequireExplicitImplementation]
public interface INotifyInfiltrated { void Infiltrated(Actor self, Actor infiltrator); }
public interface INotifyInfiltrated { void Infiltrated(Actor self, Actor infiltrator, HashSet<string> types); }
[RequireExplicitImplementation]
public interface INotifyBlockingMove { void OnNotifyBlockingMove(Actor self, Actor blocking); }

2
mods/ra/rules/defaults.yaml
View File

@@ -770,6 +770,7 @@
Targetable:
TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate
InfiltrateForDecoration:
Types: SpyInfiltrate
RequiresSelection: true
Image: pips
Sequence: tag-fake
@@ -1120,5 +1121,6 @@
AffectedByPowerOutage:
Condition: power-outage
InfiltrateForPowerOutage:
Types: SpyInfiltrate
Power:
RequiresCondition: !disabled

9
mods/ra/rules/structures.yaml
View File

@@ -112,6 +112,7 @@ SPEN:
Inherits: ^Building
InfiltrateForSupportPower:
Proxy: powerproxy.sonarpulse
Types: SpyInfiltrate
Valued:
Cost: 800
Tooltip:
@@ -241,6 +242,7 @@ SYRD:
Inherits: ^Building
InfiltrateForSupportPower:
Proxy: powerproxy.sonarpulse
Types: SpyInfiltrate
Buildable:
Queue: Building
BuildPaletteOrder: 40
@@ -621,6 +623,7 @@ DOME:
ProvidesRadar:
RequiresCondition: !jammed && !disabled
InfiltrateForExploration:
Types: SpyInfiltrate
DetectCloaked:
Range: 10c0
RequiresCondition: !disabled
@@ -1016,6 +1019,7 @@ WEAP:
TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
InfiltrateForSupportPower:
Proxy: vehicles.upgraded
Types: SpyInfiltrate
WithDecoration@primary:
RequiresSelection: true
Image: pips
@@ -1153,6 +1157,7 @@ PROC:
Facing: 64
InfiltrateForCash:
Percentage: 50
Types: SpyInfiltrate
Notification: CreditsStolen
WithIdleOverlay@TOP:
Sequence: idle-top
@@ -1286,6 +1291,7 @@ HPAD:
TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
InfiltrateForSupportPower:
Proxy: aircraft.upgraded
Types: SpyInfiltrate
WithDecoration@primary:
RequiresSelection: true
Image: pips
@@ -1422,6 +1428,7 @@ AFLD:
TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
InfiltrateForSupportPower:
Proxy: aircraft.upgraded
Types: SpyInfiltrate
WithDecoration@primary:
RequiresSelection: true
Image: pips
@@ -1626,6 +1633,7 @@ BARR:
ProvidesPrerequisite@buildingname:
InfiltrateForSupportPower:
Proxy: barracks.upgraded
Types: SpyInfiltrate
Targetable:
TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
WithDecoration@primary:
@@ -1763,6 +1771,7 @@ TENT:
ProvidesPrerequisite@buildingname:
InfiltrateForSupportPower:
Proxy: barracks.upgraded
Types: SpyInfiltrate
Targetable:
TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
WithDecoration@primary: