Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add InstantlyRepairsProperties #20980

Merged
merged 2 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions OpenRA.Mods.Common/Activities/InstantRepair.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@
#endregion

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

namespace OpenRA.Mods.Common.Activities
{
sealed class InstantRepair : Enter
public sealed class InstantRepair : Enter
{
readonly InstantlyRepairsInfo info;

Actor enterActor;
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.
abcdefg30 marked this conversation as resolved.
Show resolved Hide resolved
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