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

Add Lua Scripting for Carryall.

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2021-04-03 18:08:46 +03:00
committed by abcdefg30
parent 860ec642b8
commit d149624b84
6 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -12,6 +12,7 @@
using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
@@ -22,19 +23,21 @@ namespace OpenRA.Mods.Common.Activities
readonly BodyOrientation body;
readonly bool assignTargetOnFirstRun;
readonly WDist deliverRange;
readonly Color? targetLineColor;
Target destination;
public DeliverUnit(Actor self, WDist deliverRange)
: this(self, Target.Invalid, deliverRange)
public DeliverUnit(Actor self, WDist deliverRange, Color? targetLineColor)
: this(self, Target.Invalid, deliverRange, targetLineColor)
{
assignTargetOnFirstRun = true;
}
public DeliverUnit(Actor self, in Target destination, WDist deliverRange)
public DeliverUnit(Actor self, in Target destination, WDist deliverRange, Color? targetLineColor)
{
this.destination = destination;
this.deliverRange = deliverRange;
this.targetLineColor = targetLineColor;
carryall = self.Trait<Carryall>();
body = self.Trait<BodyOrientation>();
@@ -59,7 +62,8 @@ namespace OpenRA.Mods.Common.Activities
public override IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
{
yield return new TargetLineNode(destination, carryall.Info.TargetLineColor);
if (targetLineColor != null)
yield return new TargetLineNode(destination, targetLineColor.Value);
}
class ReleaseUnit : Activity

8
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -12,6 +12,7 @@
using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
@@ -25,6 +26,7 @@ namespace OpenRA.Mods.Common.Activities
readonly BodyOrientation carryableBody;
readonly int delay;
readonly Color? targetLineColor;
// TODO: Expose this to yaml
readonly WDist targetLockRange = WDist.FromCells(4);
@@ -32,10 +34,11 @@ namespace OpenRA.Mods.Common.Activities
enum PickupState { Intercept, LockCarryable, Pickup }
PickupState state = PickupState.Intercept;
public PickupUnit(Actor self, Actor cargo, int delay)
public PickupUnit(Actor self, Actor cargo, int delay, Color? targetLineColor)
{
this.cargo = cargo;
this.delay = delay;
this.targetLineColor = targetLineColor;
carryable = cargo.Trait<Carryable>();
carryableFacing = cargo.Trait<IFacing>();
carryableBody = cargo.Trait<BodyOrientation>();
@@ -115,7 +118,8 @@ namespace OpenRA.Mods.Common.Activities
public override IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
{
yield return new TargetLineNode(Target.FromActor(cargo), carryall.Info.TargetLineColor);
if (targetLineColor != null)
yield return new TargetLineNode(Target.FromActor(cargo), targetLineColor.Value);
}
class AttachUnit : Activity