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

Pass PortableChrono instead of PortableChronoInfo to PortableChronoOrderGenerator.

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2022-03-13 15:47:21 +03:00
committed by abcdefg30
parent 648c56bca1
commit 9de8d8854d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Cnc.Traits
{ {
// HACK: Switch the global order generator instead of actually issuing an order // HACK: Switch the global order generator instead of actually issuing an order
if (CanTeleport) if (CanTeleport)
self.World.OrderGenerator = new PortableChronoOrderGenerator(self, Info); self.World.OrderGenerator = new PortableChronoOrderGenerator(self, this);
// HACK: We need to issue a fake order to stop the game complaining about the bodge above // HACK: We need to issue a fake order to stop the game complaining about the bodge above
return new Order(order.OrderID, self, Target.Invalid, queued); return new Order(order.OrderID, self, Target.Invalid, queued);
@@ -202,12 +202,14 @@ namespace OpenRA.Mods.Cnc.Traits
class PortableChronoOrderGenerator : OrderGenerator class PortableChronoOrderGenerator : OrderGenerator
{ {
readonly Actor self; readonly Actor self;
readonly PortableChrono portableChrono;
readonly PortableChronoInfo info; readonly PortableChronoInfo info;
public PortableChronoOrderGenerator(Actor self, PortableChronoInfo info) public PortableChronoOrderGenerator(Actor self, PortableChrono portableChrono)
{ {
this.self = self; this.self = self;
this.info = info; this.portableChrono = portableChrono;
info = portableChrono.Info;
} }
protected override IEnumerable<Order> OrderInner(World world, CPos cell, int2 worldPixel, MouseInput mi) protected override IEnumerable<Order> OrderInner(World world, CPos cell, int2 worldPixel, MouseInput mi)
@@ -241,12 +243,12 @@ namespace OpenRA.Mods.Cnc.Traits
if (!self.IsInWorld || self.Owner != self.World.LocalPlayer) if (!self.IsInWorld || self.Owner != self.World.LocalPlayer)
yield break; yield break;
if (!self.Trait<PortableChrono>().Info.HasDistanceLimit) if (!info.HasDistanceLimit)
yield break; yield break;
yield return new RangeCircleAnnotationRenderable( yield return new RangeCircleAnnotationRenderable(
self.CenterPosition, self.CenterPosition,
WDist.FromCells(self.Trait<PortableChrono>().Info.MaxDistance), WDist.FromCells(info.MaxDistance),
0, 0,
info.CircleColor, info.CircleColor,
info.CircleWidth, info.CircleWidth,
@@ -257,7 +259,7 @@ namespace OpenRA.Mods.Cnc.Traits
protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{ {
if (self.IsInWorld && self.Location != cell if (self.IsInWorld && self.Location != cell
&& self.Trait<PortableChrono>().CanTeleport && self.Owner.Shroud.IsExplored(cell)) && portableChrono.CanTeleport && self.Owner.Shroud.IsExplored(cell))
return info.TargetCursor; return info.TargetCursor;
else else
return info.TargetBlockedCursor; return info.TargetBlockedCursor;