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

Port DonateExperience to the new Enter activity.

Browse Source
This commit is contained in:
Paul Chote
2019-02-01 21:57:42 +00:00
committed by Oliver Brakmann
parent cc288f5afc
commit d6b7d5c4c7
3 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OpenRA.Mods.Common/Activities/DonateExperience.cs
View File

@@ -11,44 +11,58 @@
using System.Drawing; using System.Drawing;
using OpenRA.Activities; using OpenRA.Activities;
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 DonateExperience : LegacyEnter class DonateExperience : Enter
{ {
readonly Actor target;
readonly GainsExperience targetGainsExperience;
readonly int level; readonly int level;
readonly int playerExperience; readonly int playerExperience;
public DonateExperience(Actor self, Actor target, int level, int playerExperience, GainsExperience targetGainsExperience) Actor enterActor;
: base(self, target, EnterBehaviour.Dispose, targetLineColor: Color.Yellow) GainsExperience enterGainsExperience;
public DonateExperience(Actor self, Target target, int level, int playerExperience)
: base(self, target, Color.Yellow)
{ {
this.target = target;
this.level = level; this.level = level;
this.playerExperience = playerExperience; this.playerExperience = playerExperience;
this.targetGainsExperience = targetGainsExperience;
} }
protected override void OnInside(Actor self) protected override bool TryStartEnter(Actor self, Actor targetActor)
{ {
if (target.IsDead) enterActor = targetActor;
enterGainsExperience = targetActor.TraitOrDefault<GainsExperience>();
if (enterGainsExperience == null || enterGainsExperience.Level == enterGainsExperience.MaxLevel)
{
Cancel(self, true);
return false;
}
return true;
}
protected override void OnEnterComplete(Actor self, Actor targetActor)
{
// Make sure the target hasn't changed while entering
// OnEnterComplete is only called if targetActor is alive
if (targetActor != enterActor)
return; return;
targetGainsExperience.GiveLevels(level); if (enterGainsExperience.Level == enterGainsExperience.MaxLevel)
return;
enterGainsExperience.GiveLevels(level);
var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>(); var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (exp != null && target.Owner != self.Owner) if (exp != null && enterActor.Owner != self.Owner)
exp.GiveExperience(playerExperience); exp.GiveExperience(playerExperience);
}
public override Activity Tick(Actor self) self.Dispose();
{
if (target.IsDead || targetGainsExperience.Level == targetGainsExperience.MaxLevel)
Cancel(self);
return base.Tick(self);
} }
} }
} }

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

@@ -65,8 +65,9 @@ namespace OpenRA.Mods.Common.Scripting
var level = gainsExperience.Level; var level = gainsExperience.Level;
Self.SetTargetLine(Target.FromActor(target), Color.Yellow); var t = Target.FromActor(target);
Self.QueueActivity(new DonateExperience(Self, target, level, deliversExperience.PlayerExperience, targetGainsExperience)); Self.SetTargetLine(t, Color.Yellow);
Self.QueueActivity(new DonateExperience(Self, t, level, deliversExperience.PlayerExperience));
} }
} }
} }

19
OpenRA.Mods.Common/Traits/DeliversExperience.cs
View File

@@ -71,21 +71,20 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "DeliverExperience") if (order.OrderString != "DeliverExperience")
return; return;
var target = self.ResolveFrozenActorOrder(order, Color.Yellow); if (order.Target.Type == TargetType.Actor)
if (target.Type != TargetType.Actor) {
return; var targetGainsExperience = order.Target.Actor.Trait<GainsExperience>();
if (targetGainsExperience.Level == targetGainsExperience.MaxLevel)
var targetGainsExperience = target.Actor.Trait<GainsExperience>(); return;
if (targetGainsExperience.Level == targetGainsExperience.MaxLevel) }
else if (order.Target.Type != TargetType.FrozenActor)
return; return;
if (!order.Queued) if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
var level = gainsExperience.Level; self.SetTargetLine(order.Target, Color.Yellow);
self.QueueActivity(new DonateExperience(self, order.Target, gainsExperience.Level, info.PlayerExperience));
self.SetTargetLine(target, Color.Yellow);
self.QueueActivity(new DonateExperience(self, target.Actor, level, info.PlayerExperience, targetGainsExperience));
} }
public class DeliversExperienceOrderTargeter : UnitOrderTargeter public class DeliversExperienceOrderTargeter : UnitOrderTargeter