From cc288f5afc2c74efcbd6c5759e4c970cc866fbc5 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 1 Feb 2019 21:27:43 +0000 Subject: [PATCH] Port DonateCash to the new Enter activity. --- OpenRA.Mods.Common/Activities/DonateCash.cs | 35 +++++++++---------- .../Properties/DeliveryProperties.cs | 5 +-- OpenRA.Mods.Common/Traits/DeliversCash.cs | 8 ++--- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/DonateCash.cs b/OpenRA.Mods.Common/Activities/DonateCash.cs index e44f943e49..f7a4cfce7f 100644 --- a/OpenRA.Mods.Common/Activities/DonateCash.cs +++ b/OpenRA.Mods.Common/Activities/DonateCash.cs @@ -12,42 +12,41 @@ using System.Drawing; using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Traits; +using OpenRA.Traits; namespace OpenRA.Mods.Common.Activities { - class DonateCash : LegacyEnter + class DonateCash : Enter { - readonly Actor target; readonly int payload; - readonly int experience; + readonly int playerExperience; - public DonateCash(Actor self, Actor target, int payload, int playerExperience) - : base(self, target, EnterBehaviour.Dispose, targetLineColor: Color.Yellow) + public DonateCash(Actor self, Target target, int payload, int playerExperience) + : base(self, target, Color.Yellow) { - this.target = target; this.payload = payload; - this.experience = playerExperience; + this.playerExperience = playerExperience; } - protected override void OnInside(Actor self) + protected override void OnEnterComplete(Actor self, Actor targetActor) { - if (target.IsDead) - return; - - var donated = target.Owner.PlayerActor.Trait().ChangeCash(payload); + var targetOwner = targetActor.Owner; + var donated = targetOwner.PlayerActor.Trait().ChangeCash(payload); var exp = self.Owner.PlayerActor.TraitOrDefault(); - if (exp != null && target.Owner != self.Owner) - exp.GiveExperience(experience); + if (exp != null && targetOwner != self.Owner) + exp.GiveExperience(playerExperience); if (self.Owner.IsAlliedWith(self.World.RenderPlayer)) - self.World.AddFrameEndTask(w => w.Add(new FloatingText(target.CenterPosition, target.Owner.Color.RGB, FloatingText.FormatCashTick(donated), 30))); + self.World.AddFrameEndTask(w => w.Add(new FloatingText(targetActor.CenterPosition, targetOwner.Color.RGB, FloatingText.FormatCashTick(donated), 30))); - foreach (var nct in target.TraitsImplementing()) - nct.OnAcceptingCash(target, self); + foreach (var nct in targetActor.TraitsImplementing()) + nct.OnAcceptingCash(targetActor, self); foreach (var nct in self.TraitsImplementing()) - nct.OnDeliveringCash(self, target); + nct.OnDeliveringCash(self, targetActor); + + self.Dispose(); } } } diff --git a/OpenRA.Mods.Common/Scripting/Properties/DeliveryProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/DeliveryProperties.cs index 964ab5a872..ec82da1ff4 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/DeliveryProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/DeliveryProperties.cs @@ -33,8 +33,9 @@ namespace OpenRA.Mods.Common.Scripting [Desc("Deliver cash to the target actor.")] public void DeliverCash(Actor target) { - Self.SetTargetLine(Target.FromActor(target), Color.Yellow); - Self.QueueActivity(new DonateCash(Self, target, info.Payload, info.PlayerExperience)); + var t = Target.FromActor(target); + Self.SetTargetLine(t, Color.Yellow); + Self.QueueActivity(new DonateCash(Self, t, info.Payload, info.PlayerExperience)); } } diff --git a/OpenRA.Mods.Common/Traits/DeliversCash.cs b/OpenRA.Mods.Common/Traits/DeliversCash.cs index 05111f4e08..45aadb5777 100644 --- a/OpenRA.Mods.Common/Traits/DeliversCash.cs +++ b/OpenRA.Mods.Common/Traits/DeliversCash.cs @@ -69,15 +69,11 @@ namespace OpenRA.Mods.Common.Traits if (order.OrderString != "DeliverCash") return; - var target = self.ResolveFrozenActorOrder(order, Color.Yellow); - if (target.Type != TargetType.Actor) - return; - if (!order.Queued) self.CancelActivity(); - self.SetTargetLine(target, Color.Yellow); - self.QueueActivity(new DonateCash(self, target.Actor, info.Payload, info.PlayerExperience)); + self.SetTargetLine(order.Target, Color.Yellow); + self.QueueActivity(new DonateCash(self, order.Target, info.Payload, info.PlayerExperience)); } void INotifyCashTransfer.OnAcceptingCash(Actor self, Actor donor) { }