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

Make EngineerRepairable Conditional.

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2019-04-13 20:31:11 +03:00
committed by reaperrr
parent c89d90e4b0
commit 1f730fbfb9
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Traits/EngineerRepair.cs
View File

@@ -19,7 +19,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Can instantly repair other actors, but gets consumed afterwards.")] [Desc("Can instantly repair other actors, but gets consumed afterwards.")]
class EngineerRepairInfo : ITraitInfo class EngineerRepairInfo : ConditionalTraitInfo
{ {
[Desc("Uses the \"EngineerRepairable\" trait to determine repairability.")] [Desc("Uses the \"EngineerRepairable\" trait to determine repairability.")]
public readonly BitSet<EngineerRepairType> Types = default(BitSet<EngineerRepairType>); public readonly BitSet<EngineerRepairType> Types = default(BitSet<EngineerRepairType>);
@@ -42,21 +42,23 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Cursor to show when target actor has full health so it can't be repaired.")] [Desc("Cursor to show when target actor has full health so it can't be repaired.")]
public readonly string RepairBlockedCursor = "goldwrench-blocked"; public readonly string RepairBlockedCursor = "goldwrench-blocked";
public object Create(ActorInitializer init) { return new EngineerRepair(init, this); } public override object Create(ActorInitializer init) { return new EngineerRepair(init, this); }
} }
class EngineerRepair : IIssueOrder, IResolveOrder, IOrderVoice class EngineerRepair : ConditionalTrait<EngineerRepairInfo>, IIssueOrder, IResolveOrder, IOrderVoice
{ {
readonly EngineerRepairInfo info;
public EngineerRepair(ActorInitializer init, EngineerRepairInfo info) public EngineerRepair(ActorInitializer init, EngineerRepairInfo info)
{ : base(info) { }
this.info = info;
}
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {
get { yield return new EngineerRepairOrderTargeter(); } get
{
if (IsTraitDisabled)
yield break;
yield return new EngineerRepairOrderTargeter(Info);
}
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
@@ -81,7 +83,7 @@ namespace OpenRA.Mods.Common.Traits
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return order.OrderString == "EngineerRepair" && IsValidOrder(self, order) return order.OrderString == "EngineerRepair" && IsValidOrder(self, order)
? info.Voice : null; ? Info.Voice : null;
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
@@ -93,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity(); self.CancelActivity();
self.SetTargetLine(order.Target, Color.Yellow); self.SetTargetLine(order.Target, Color.Yellow);
self.QueueActivity(new RepairBuilding(self, order.Target, info)); self.QueueActivity(new RepairBuilding(self, order.Target, Info));
} }
class EngineerRepairOrderTargeter : UnitOrderTargeter class EngineerRepairOrderTargeter : UnitOrderTargeter