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

make portable chrono queueable

Browse Source 
give PortableChrono fallback movement

style fix

add chrono target line

require and cache IMove
This commit is contained in:
tovl
2019-01-27 18:13:55 +01:00
committed by abcdefg30
parent 71b61ad8ee
commit c096fbde96
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Activities/Teleport.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Cnc.Activities
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
var pc = self.TraitOrDefault<PortableChrono>(); var pc = self.TraitOrDefault<PortableChrono>();
if (teleporter == self && pc != null && !pc.CanTeleport) if (teleporter == self && pc != null && (!pc.CanTeleport || IsCanceling))
{ {
if (killOnFailure) if (killOnFailure)
self.Kill(teleporter, killDamageTypes); self.Kill(teleporter, killDamageTypes);

21
OpenRA.Mods.Cnc/Traits/PortableChrono.cs
View File

@@ -14,12 +14,13 @@ using OpenRA.Graphics;
using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits namespace OpenRA.Mods.Cnc.Traits
{ {
class PortableChronoInfo : ITraitInfo class PortableChronoInfo : ITraitInfo, Requires<IMoveInfo>
{ {
[Desc("Cooldown in ticks until the unit can teleport.")] [Desc("Cooldown in ticks until the unit can teleport.")]
public readonly int ChargeDelay = 500; public readonly int ChargeDelay = 500;
@@ -53,17 +54,19 @@ namespace OpenRA.Mods.Cnc.Traits
[VoiceReference] public readonly string Voice = "Action"; [VoiceReference] public readonly string Voice = "Action";
public object Create(ActorInitializer init) { return new PortableChrono(this); } public object Create(ActorInitializer init) { return new PortableChrono(init.Self, this); }
} }
class PortableChrono : IIssueOrder, IResolveOrder, ITick, ISelectionBar, IOrderVoice, ISync class PortableChrono : IIssueOrder, IResolveOrder, ITick, ISelectionBar, IOrderVoice, ISync
{ {
[Sync] int chargeTick = 0;
public readonly PortableChronoInfo Info; public readonly PortableChronoInfo Info;
readonly IMove move;
[Sync] int chargeTick = 0;
public PortableChrono(PortableChronoInfo info) public PortableChrono(Actor self, PortableChronoInfo info)
{ {
Info = info; Info = info;
move = self.Trait<IMove>();
} }
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
@@ -102,19 +105,25 @@ namespace OpenRA.Mods.Cnc.Traits
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "PortableChronoTeleport" && CanTeleport && order.Target.Type != TargetType.Invalid) if (order.OrderString == "PortableChronoTeleport" && order.Target.Type != TargetType.Invalid)
{ {
var maxDistance = Info.HasDistanceLimit ? Info.MaxDistance : (int?)null; var maxDistance = Info.HasDistanceLimit ? Info.MaxDistance : (int?)null;
if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
var cell = self.World.Map.CellContaining(order.Target.CenterPosition); var cell = self.World.Map.CellContaining(order.Target.CenterPosition);
self.SetTargetLine(order.Target, Color.LawnGreen);
if (maxDistance != null)
self.QueueActivity(move.MoveWithinRange(order.Target, WDist.FromCells(maxDistance.Value)));
self.QueueActivity(new Teleport(self, cell, maxDistance, Info.KillCargo, Info.FlashScreen, Info.ChronoshiftSound)); self.QueueActivity(new Teleport(self, cell, maxDistance, Info.KillCargo, Info.FlashScreen, Info.ChronoshiftSound));
self.QueueActivity(move.MoveTo(cell, 5));
} }
} }
string IOrderVoice.VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
return order.OrderString == "PortableChronoTeleport" && CanTeleport ? Info.Voice : null; return order.OrderString == "PortableChronoTeleport" ? Info.Voice : null;
} }
public void ResetChargeTime() public void ResetChargeTime()