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

Make Repairable(Near) implement interfaces explicitly

Browse Source
This commit is contained in:
reaperrr
2019-06-28 10:57:44 +02:00
committed by Paul Chote
parent 1bb988512f
commit 1f16cb6864
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Repairable.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits
isAircraft = self.Info.HasTraitInfo<AircraftInfo>(); isAircraft = self.Info.HasTraitInfo<AircraftInfo>();
} }
public IEnumerable<IOrderTargeter> Orders IEnumerable<IOrderTargeter> IIssueOrder.Orders
{ {
get get
{ {
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) Order IIssueOrder.IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if (order.OrderID == "Repair") if (order.OrderID == "Repair")
return new Order(order.OrderID, self, target, queued); return new Order(order.OrderID, self, target, queued);
@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits
return rearmable != null && rearmable.RearmableAmmoPools.Any(p => !p.FullAmmo()); return rearmable != null && rearmable.RearmableAmmoPools.Any(p => !p.FullAmmo());
} }
public string VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
return order.OrderString == "Repair" && (CanRepair() || CanRearm()) ? Info.Voice : null; return order.OrderString == "Repair" && (CanRepair() || CanRearm()) ? Info.Voice : null;
} }

8
OpenRA.Mods.Common/Traits/RepairableNear.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
Info = info; Info = info;
} }
public IEnumerable<IOrderTargeter> Orders IEnumerable<IOrderTargeter> IIssueOrder.Orders
{ {
get get
{ {
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) Order IIssueOrder.IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if (order.OrderID == "RepairNear") if (order.OrderID == "RepairNear")
return new Order(order.OrderID, self, target, queued); return new Order(order.OrderID, self, target, queued);
@@ -84,12 +84,12 @@ namespace OpenRA.Mods.Common.Traits
return self.GetDamageState() > DamageState.Undamaged; return self.GetDamageState() > DamageState.Undamaged;
} }
public string VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
return order.OrderString == "RepairNear" && ShouldRepair() ? Info.Voice : null; return order.OrderString == "RepairNear" && ShouldRepair() ? Info.Voice : null;
} }
public void ResolveOrder(Actor self, Order order) void IResolveOrder.ResolveOrder(Actor self, Order order)
{ {
// RepairNear orders are only valid for own/allied actors, // RepairNear orders are only valid for own/allied actors,
// which are guaranteed to never be frozen. // which are guaranteed to never be frozen.