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

Port DonateCash to the new Enter activity.

Browse Source
This commit is contained in:
Paul Chote
2019-02-01 21:27:43 +00:00
committed by Oliver Brakmann
parent 4551625bb4
commit cc288f5afc
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRA.Mods.Common/Activities/DonateCash.cs
View File

@@ -12,42 +12,41 @@
using System.Drawing; using System.Drawing;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class DonateCash : LegacyEnter class DonateCash : Enter
{ {
readonly Actor target;
readonly int payload; readonly int payload;
readonly int experience; readonly int playerExperience;
public DonateCash(Actor self, Actor target, int payload, int playerExperience) public DonateCash(Actor self, Target target, int payload, int playerExperience)
: base(self, target, EnterBehaviour.Dispose, targetLineColor: Color.Yellow) : base(self, target, Color.Yellow)
{ {
this.target = target;
this.payload = payload; 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) var targetOwner = targetActor.Owner;
return; var donated = targetOwner.PlayerActor.Trait<PlayerResources>().ChangeCash(payload);
var donated = target.Owner.PlayerActor.Trait<PlayerResources>().ChangeCash(payload);
var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>(); var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (exp != null && target.Owner != self.Owner) if (exp != null && targetOwner != self.Owner)
exp.GiveExperience(experience); exp.GiveExperience(playerExperience);
if (self.Owner.IsAlliedWith(self.World.RenderPlayer)) 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<INotifyCashTransfer>()) foreach (var nct in targetActor.TraitsImplementing<INotifyCashTransfer>())
nct.OnAcceptingCash(target, self); nct.OnAcceptingCash(targetActor, self);
foreach (var nct in self.TraitsImplementing<INotifyCashTransfer>()) foreach (var nct in self.TraitsImplementing<INotifyCashTransfer>())
nct.OnDeliveringCash(self, target); nct.OnDeliveringCash(self, targetActor);
self.Dispose();
} }
} }
} }

5
OpenRA.Mods.Common/Scripting/Properties/DeliveryProperties.cs
View File

@@ -33,8 +33,9 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Deliver cash to the target actor.")] [Desc("Deliver cash to the target actor.")]
public void DeliverCash(Actor target) public void DeliverCash(Actor target)
{ {
Self.SetTargetLine(Target.FromActor(target), Color.Yellow); var t = Target.FromActor(target);
Self.QueueActivity(new DonateCash(Self, target, info.Payload, info.PlayerExperience)); Self.SetTargetLine(t, Color.Yellow);
Self.QueueActivity(new DonateCash(Self, t, info.Payload, info.PlayerExperience));
} }
} }

8
OpenRA.Mods.Common/Traits/DeliversCash.cs
View File

@@ -69,15 +69,11 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "DeliverCash") if (order.OrderString != "DeliverCash")
return; return;
var target = self.ResolveFrozenActorOrder(order, Color.Yellow);
if (target.Type != TargetType.Actor)
return;
if (!order.Queued) if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
self.SetTargetLine(target, Color.Yellow); self.SetTargetLine(order.Target, Color.Yellow);
self.QueueActivity(new DonateCash(self, target.Actor, info.Payload, info.PlayerExperience)); self.QueueActivity(new DonateCash(self, order.Target, info.Payload, info.PlayerExperience));
} }
void INotifyCashTransfer.OnAcceptingCash(Actor self, Actor donor) { } void INotifyCashTransfer.OnAcceptingCash(Actor self, Actor donor) { }