Skip to content

Commit

Permalink
Add InstantlyRepairsProperties
Browse files Browse the repository at this point in the history
  • Loading branch information
dnqbob committed Jul 31, 2023
1 parent 00d0f23 commit 3805dcf
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 3 deletions.
5 changes: 3 additions & 2 deletions OpenRA.Mods.Common/Activities/InstantRepair.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#endregion

using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

namespace OpenRA.Mods.Common.Activities
Expand All @@ -22,8 +23,8 @@ public sealed class InstantRepair : Enter
IHealth enterHealth;
InstantlyRepairable enterInstantlyRepariable;

public InstantRepair(Actor self, in Target target, InstantlyRepairsInfo info)
: base(self, target, info.TargetLineColor)
public InstantRepair(Actor self, in Target target, InstantlyRepairsInfo info, Color? targetLineColor)
: base(self, target, targetLineColor)
{
this.info = info;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#region Copyright & License Information
/*
* Copyright (c) The OpenRA Developers and Contributors
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion

using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;

namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Ability")]
public class InstantlyRepairsProperties : ScriptActorProperties, Requires<IMoveInfo>, Requires<InstantlyRepairsInfo>
{
readonly InstantlyRepairs[] instantlyRepairs;

public InstantlyRepairsProperties(ScriptContext context, Actor self)
: base(context, self)
{
instantlyRepairs = Self.TraitsImplementing<InstantlyRepairs>().ToArray();
}

[ScriptActorPropertyActivity]
[Desc("Enter the target actor to repair it instantly.")]
public void InstantlyRepair(Actor target)
{
// NB: Scripted actions get no visible targetlines.
var repair = instantlyRepairs.FirstEnabledConditionalTraitOrDefault();
if (repair != null)
Self.QueueActivity(new InstantRepair(Self, Target.FromActor(target), repair.Info, null));
}
}
}
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Traits/InstantlyRepairs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void ResolveOrder(Actor self, Order order)
if (order.OrderString != "InstantRepair" || !IsValidOrder(order))
return;

self.QueueActivity(order.Queued, new InstantRepair(self, order.Target, Info));
self.QueueActivity(order.Queued, new InstantRepair(self, order.Target, Info, Info.TargetLineColor));
self.ShowTargetLines();
}

Expand Down

0 comments on commit 3805dcf

Please sign in to comment.