diff --git a/OpenRA.Mods.Common/Activities/CaptureActor.cs b/OpenRA.Mods.Common/Activities/CaptureActor.cs index f1ca1aaef7..a2620b2dae 100644 --- a/OpenRA.Mods.Common/Activities/CaptureActor.cs +++ b/OpenRA.Mods.Common/Activities/CaptureActor.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Activities readonly Health health; public CaptureActor(Actor self, Actor target) - : base(self, target) + : base(self, target, EnterBehaviour.Dispose) { actor = target; building = actor.TraitOrDefault(); diff --git a/OpenRA.Mods.Common/Activities/Demolish.cs b/OpenRA.Mods.Common/Activities/Demolish.cs index afa2c9d3f8..c70069a064 100644 --- a/OpenRA.Mods.Common/Activities/Demolish.cs +++ b/OpenRA.Mods.Common/Activities/Demolish.cs @@ -20,7 +20,6 @@ namespace OpenRA.Mods.Common.Activities { readonly Actor target; readonly IDemolishable[] demolishables; - readonly EnterBehaviour enterBehaviour; readonly int delay; readonly int flashes; readonly int flashesDelay; @@ -31,11 +30,10 @@ namespace OpenRA.Mods.Common.Activities public Demolish(Actor self, Actor target, EnterBehaviour enterBehaviour, int delay, int flashes, int flashesDelay, int flashInterval, int flashDuration) - : base(self, target) + : base(self, target, enterBehaviour) { this.target = target; demolishables = target.TraitsImplementing().ToArray(); - this.enterBehaviour = enterBehaviour; this.delay = delay; this.flashes = flashes; this.flashesDelay = flashesDelay; @@ -75,11 +73,6 @@ namespace OpenRA.Mods.Common.Activities if (Util.ApplyPercentageModifiers(100, modifiers) > 0) demolishables.Do(d => d.Demolish(target, self)); })); - - if (enterBehaviour == EnterBehaviour.Suicide) - self.Kill(self); - else if (enterBehaviour == EnterBehaviour.Dispose) - self.Dispose(); }); } } diff --git a/OpenRA.Mods.Common/Activities/DonateSupplies.cs b/OpenRA.Mods.Common/Activities/DonateSupplies.cs index c6cd5c4c16..754f1f2a83 100644 --- a/OpenRA.Mods.Common/Activities/DonateSupplies.cs +++ b/OpenRA.Mods.Common/Activities/DonateSupplies.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Activities readonly int payload; public DonateSupplies(Actor self, Actor target, int payload) - : base(self, target) + : base(self, target, EnterBehaviour.Dispose) { this.target = target; this.payload = payload; @@ -31,7 +31,6 @@ namespace OpenRA.Mods.Common.Activities return; target.Owner.PlayerActor.Trait().GiveCash(payload); - self.Dispose(); if (self.Owner.IsAlliedWith(self.World.RenderPlayer)) self.World.AddFrameEndTask(w => w.Add(new FloatingText(target.CenterPosition, target.Owner.Color.RGB, FloatingText.FormatCashTick(payload), 30))); diff --git a/OpenRA.Mods.Common/Activities/Enter.cs b/OpenRA.Mods.Common/Activities/Enter.cs index ad99857013..60f3526253 100644 --- a/OpenRA.Mods.Common/Activities/Enter.cs +++ b/OpenRA.Mods.Common/Activities/Enter.cs @@ -24,7 +24,9 @@ namespace OpenRA.Mods.Common.Activities readonly IMove move; readonly int maxTries = 0; + readonly EnterBehaviour enterBehaviour; readonly bool targetCenter; + public Target Target { get { return target; } } Target target; State nextState = State.ApproachingOrEntering; // Hint/starting point for next state @@ -33,11 +35,12 @@ namespace OpenRA.Mods.Common.Activities Activity inner; bool firstApproach = true; - protected Enter(Actor self, Actor target, int maxTries = 1, bool targetCenter = false) + protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1, bool targetCenter = false) { this.move = self.Trait(); this.target = Target.FromActor(target); this.maxTries = maxTries; + this.enterBehaviour = enterBehaviour; this.targetCenter = targetCenter; } @@ -215,6 +218,11 @@ namespace OpenRA.Mods.Common.Activities OnInside(self); + if (enterBehaviour == EnterBehaviour.Suicide) + self.Kill(self); + else if (enterBehaviour == EnterBehaviour.Dispose) + self.Dispose(); + // Return if Abort(Actor) or Done(self) was called from OnInside. if (nextState >= State.Exiting) return State.Inside; diff --git a/OpenRA.Mods.Common/Activities/EnterTransport.cs b/OpenRA.Mods.Common/Activities/EnterTransport.cs index c31172eddc..edae4573d2 100644 --- a/OpenRA.Mods.Common/Activities/EnterTransport.cs +++ b/OpenRA.Mods.Common/Activities/EnterTransport.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Activities Cargo cargo; public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool targetCenter = false) - : base(self, transport, maxTries, targetCenter) + : base(self, transport, EnterBehaviour.Exit, maxTries, targetCenter) { this.transport = transport; this.maxTries = maxTries; diff --git a/OpenRA.Mods.Common/Activities/RepairBridge.cs b/OpenRA.Mods.Common/Activities/RepairBridge.cs index 1b02b81644..a7f4d93e21 100644 --- a/OpenRA.Mods.Common/Activities/RepairBridge.cs +++ b/OpenRA.Mods.Common/Activities/RepairBridge.cs @@ -17,8 +17,8 @@ namespace OpenRA.Mods.Common.Activities { readonly BridgeHut hut; - public RepairBridge(Actor self, Actor target) - : base(self, target) + public RepairBridge(Actor self, Actor target, EnterBehaviour enterBehaviour) + : base(self, target, enterBehaviour) { hut = target.Trait(); } @@ -32,8 +32,8 @@ namespace OpenRA.Mods.Common.Activities { if (hut.BridgeDamageState == DamageState.Undamaged || hut.Repairing || hut.Bridge.GetHut(0) == null || hut.Bridge.GetHut(1) == null) return; + hut.Repair(self); - self.Dispose(); } } } diff --git a/OpenRA.Mods.Common/Activities/RepairBuilding.cs b/OpenRA.Mods.Common/Activities/RepairBuilding.cs index 418808bb46..65112dc0e3 100644 --- a/OpenRA.Mods.Common/Activities/RepairBuilding.cs +++ b/OpenRA.Mods.Common/Activities/RepairBuilding.cs @@ -18,8 +18,8 @@ namespace OpenRA.Mods.Common.Activities readonly Actor target; readonly Health health; - public RepairBuilding(Actor self, Actor target) - : base(self, target) + public RepairBuilding(Actor self, Actor target, EnterBehaviour enterBehaviour) + : base(self, target, enterBehaviour) { this.target = target; health = target.Trait(); @@ -34,8 +34,8 @@ namespace OpenRA.Mods.Common.Activities { if (health.DamageState == DamageState.Undamaged) return; + target.InflictDamage(self, -health.MaxHP, null); - self.Dispose(); } } } diff --git a/OpenRA.Mods.Common/Traits/EngineerRepair.cs b/OpenRA.Mods.Common/Traits/EngineerRepair.cs index 4da01c7c1a..faa21f774f 100644 --- a/OpenRA.Mods.Common/Traits/EngineerRepair.cs +++ b/OpenRA.Mods.Common/Traits/EngineerRepair.cs @@ -21,6 +21,10 @@ namespace OpenRA.Mods.Common.Traits { [VoiceReference] public readonly string Voice = "Action"; + [Desc("Behaviour when entering the structure.", + "Possible values are Exit, Suicide, Dispose.")] + public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose; + public object Create(ActorInitializer init) { return new EngineerRepair(init, this); } } @@ -91,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits self.CancelActivity(); self.SetTargetLine(target, Color.Yellow); - self.QueueActivity(new RepairBuilding(self, target.Actor)); + self.QueueActivity(new RepairBuilding(self, target.Actor, info.EnterBehaviour)); } class EngineerRepairOrderTargeter : UnitOrderTargeter diff --git a/OpenRA.Mods.Common/Traits/RepairsBridges.cs b/OpenRA.Mods.Common/Traits/RepairsBridges.cs index 31fc51bd24..e902f876eb 100644 --- a/OpenRA.Mods.Common/Traits/RepairsBridges.cs +++ b/OpenRA.Mods.Common/Traits/RepairsBridges.cs @@ -21,6 +21,10 @@ namespace OpenRA.Mods.Common.Traits { [VoiceReference] public readonly string Voice = "Action"; + [Desc("Behaviour when entering the structure.", + "Possible values are Exit, Suicide, Dispose.")] + public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose; + public object Create(ActorInitializer init) { return new RepairsBridges(this); } } @@ -72,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits self.SetTargetLine(Target.FromOrder(self.World, order), Color.Yellow); self.CancelActivity(); - self.QueueActivity(new RepairBridge(self, order.TargetActor)); + self.QueueActivity(new RepairBridge(self, order.TargetActor, info.EnterBehaviour)); } } diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs index b6a4e634dd..ff08174378 100644 --- a/OpenRA.Mods.RA/Activities/Infiltrate.cs +++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs @@ -18,19 +18,17 @@ namespace OpenRA.Mods.RA.Activities class Infiltrate : Enter { readonly Actor target; - + readonly Stance validStances; readonly Cloak cloak; + readonly string notification; - readonly Infiltrates infiltrates; - - public Infiltrate(Actor self, Actor target) - : base(self, target) + public Infiltrate(Actor self, Actor target, EnterBehaviour enterBehaviour, Stance validStances, string notification) + : base(self, target, enterBehaviour) { this.target = target; - + this.validStances = validStances; + this.notification = notification; cloak = self.TraitOrDefault(); - - infiltrates = self.TraitOrDefault(); } protected override void OnInside(Actor self) @@ -39,7 +37,7 @@ namespace OpenRA.Mods.RA.Activities return; var stance = self.Owner.Stances[target.Owner]; - if (!infiltrates.Info.ValidStances.HasStance(stance)) + if (!validStances.HasStance(stance)) return; if (cloak != null && cloak.Info.UncloakOnInfiltrate) @@ -48,10 +46,9 @@ namespace OpenRA.Mods.RA.Activities foreach (var t in target.TraitsImplementing()) t.Infiltrated(target, self); - self.Dispose(); - - if (target.Info.HasTraitInfo()) - Game.Sound.PlayToPlayer(self.Owner, "bldginf1.aud"); + if (!string.IsNullOrEmpty(notification)) + Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", + notification, self.Owner.Faction.InternalName); } } } diff --git a/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs index 53e81b9a5e..41bd1c98f0 100644 --- a/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs +++ b/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs @@ -8,22 +8,29 @@ */ #endregion +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Activities; +using OpenRA.Mods.RA.Traits; using OpenRA.Scripting; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Scripting { [ScriptPropertyGroup("Ability")] - public class InfiltrateProperties : ScriptActorProperties + public class InfiltrateProperties : ScriptActorProperties, Requires { + readonly InfiltratesInfo info; + public InfiltrateProperties(ScriptContext context, Actor self) : base(context, self) - { } + { + info = Self.Info.TraitInfo(); + } [Desc("Infiltrate the target actor.")] public void Infiltrate(Actor target) { - Self.QueueActivity(new Infiltrate(Self, target)); + Self.QueueActivity(new Infiltrate(Self, target, info.EnterBehaviour, info.ValidStances, info.Notification)); } } } diff --git a/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs b/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs index dc2fa3a2e1..2d247b94f1 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs +++ b/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs @@ -12,6 +12,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Orders; using OpenRA.Mods.RA.Activities; using OpenRA.Traits; @@ -27,21 +28,28 @@ namespace OpenRA.Mods.RA.Traits [Desc("What diplomatic stances can be infiltrated by this actor.")] public readonly Stance ValidStances = Stance.Neutral | Stance.Enemy; + [Desc("Behaviour when entering the structure.", + "Possible values are Exit, Suicide, Dispose.")] + public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose; + + [Desc("Notification to play when a building is infiltrated.")] + public readonly string Notification = "BuildingInfiltrated"; + public object Create(ActorInitializer init) { return new Infiltrates(this); } } class Infiltrates : IIssueOrder, IResolveOrder, IOrderVoice { - public readonly InfiltratesInfo Info; + readonly InfiltratesInfo info; public Infiltrates(InfiltratesInfo info) { - Info = info; + this.info = info; } public IEnumerable Orders { - get { yield return new InfiltrationOrderTargeter(Info); } + get { yield return new InfiltrationOrderTargeter(info); } } public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) @@ -79,13 +87,13 @@ namespace OpenRA.Mods.RA.Traits else targetTypes = order.TargetActor.GetEnabledTargetTypes(); - return Info.Types.Overlaps(targetTypes); + return info.Types.Overlaps(targetTypes); } public string VoicePhraseForOrder(Actor self, Order order) { return order.OrderString == "Infiltrate" && IsValidOrder(self, order) - ? Info.Voice : null; + ? info.Voice : null; } public void ResolveOrder(Actor self, Order order) @@ -95,14 +103,14 @@ namespace OpenRA.Mods.RA.Traits var target = self.ResolveFrozenActorOrder(order, Color.Red); if (target.Type != TargetType.Actor - || !Info.Types.Overlaps(target.Actor.GetAllTargetTypes())) + || !info.Types.Overlaps(target.Actor.GetAllTargetTypes())) return; if (!order.Queued) self.CancelActivity(); self.SetTargetLine(target, Color.Red); - self.QueueActivity(new Infiltrate(self, target.Actor)); + self.QueueActivity(new Infiltrate(self, target.Actor, info.EnterBehaviour, info.ValidStances, info.Notification)); } }