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

Added HpPerStep to Repairable for enable repair speed to be changed per unit.

Browse Source
This commit is contained in:
teinarss
2018-05-04 21:20:50 +02:00
committed by reaperrr
parent c5e36636ae
commit dcc11c7a41
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Repair.cs
View File

@@ -23,6 +23,7 @@ namespace OpenRA.Mods.Common.Activities
readonly RepairsUnits[] allRepairsUnits; readonly RepairsUnits[] allRepairsUnits;
readonly Target host; readonly Target host;
readonly WDist closeEnough; readonly WDist closeEnough;
readonly Repairable repairable;
int remainingTicks; int remainingTicks;
bool played = false; bool played = false;
@@ -33,6 +34,7 @@ namespace OpenRA.Mods.Common.Activities
this.closeEnough = closeEnough; this.closeEnough = closeEnough;
allRepairsUnits = host.TraitsImplementing<RepairsUnits>().ToArray(); allRepairsUnits = host.TraitsImplementing<RepairsUnits>().ToArray();
health = self.TraitOrDefault<Health>(); health = self.TraitOrDefault<Health>();
repairable = self.TraitOrDefault<Repairable>();
} }
protected override void OnFirstRun(Actor self) protected override void OnFirstRun(Actor self)
@@ -97,7 +99,7 @@ namespace OpenRA.Mods.Common.Activities
if (remainingTicks == 0) if (remainingTicks == 0)
{ {
var unitCost = self.Info.TraitInfo<ValuedInfo>().Cost; var unitCost = self.Info.TraitInfo<ValuedInfo>().Cost;
var hpToRepair = repairsUnits.Info.HpPerStep; var hpToRepair = repairable != null && repairable.Info.HpPerStep > 0 ? repairable.Info.HpPerStep : repairsUnits.Info.HpPerStep;
// Cast to long to avoid overflow when multiplying by the health // Cast to long to avoid overflow when multiplying by the health
var cost = Math.Max(1, (int)(((long)hpToRepair * unitCost * repairsUnits.Info.ValuePercentage) / (health.MaxHP * 100L))); var cost = Math.Max(1, (int)(((long)hpToRepair * unitCost * repairsUnits.Info.ValuePercentage) / (health.MaxHP * 100L)));

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

@@ -26,19 +26,22 @@ namespace OpenRA.Mods.Common.Traits
[VoiceReference] public readonly string Voice = "Action"; [VoiceReference] public readonly string Voice = "Action";
[Desc("The amount the unit will be repaired at each step. Use -1 for fallback behavior where HpPerStep from RepairUnit trait will be used.")]
public readonly int HpPerStep = -1;
public virtual object Create(ActorInitializer init) { return new Repairable(init.Self, this); } public virtual object Create(ActorInitializer init) { return new Repairable(init.Self, this); }
} }
class Repairable : IIssueOrder, IResolveOrder, IOrderVoice class Repairable : IIssueOrder, IResolveOrder, IOrderVoice
{ {
readonly RepairableInfo info; public readonly RepairableInfo Info;
readonly Health health; readonly Health health;
readonly IMove movement; readonly IMove movement;
readonly AmmoPool[] ammoPools; readonly AmmoPool[] ammoPools;
public Repairable(Actor self, RepairableInfo info) public Repairable(Actor self, RepairableInfo info)
{ {
this.info = info; Info = info;
health = self.Trait<Health>(); health = self.Trait<Health>();
movement = self.Trait<IMove>(); movement = self.Trait<IMove>();
ammoPools = self.TraitsImplementing<AmmoPool>().ToArray(); ammoPools = self.TraitsImplementing<AmmoPool>().ToArray();
@@ -62,12 +65,12 @@ namespace OpenRA.Mods.Common.Traits
bool CanRepairAt(Actor target) bool CanRepairAt(Actor target)
{ {
return info.RepairBuildings.Contains(target.Info.Name); return Info.RepairBuildings.Contains(target.Info.Name);
} }
bool CanRearmAt(Actor target) bool CanRearmAt(Actor target)
{ {
return info.RepairBuildings.Contains(target.Info.Name); return Info.RepairBuildings.Contains(target.Info.Name);
} }
bool CanRepair() bool CanRepair()
@@ -82,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return (order.OrderString == "Repair" && CanRepair()) ? info.Voice : null; return (order.OrderString == "Repair" && CanRepair()) ? Info.Voice : null;
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
@@ -133,7 +136,7 @@ namespace OpenRA.Mods.Common.Traits
var repairBuilding = self.World.ActorsWithTrait<RepairsUnits>() var repairBuilding = self.World.ActorsWithTrait<RepairsUnits>()
.Where(a => !a.Actor.IsDead && a.Actor.IsInWorld .Where(a => !a.Actor.IsDead && a.Actor.IsInWorld
&& a.Actor.Owner.IsAlliedWith(self.Owner) && && a.Actor.Owner.IsAlliedWith(self.Owner) &&
info.RepairBuildings.Contains(a.Actor.Info.Name)) Info.RepairBuildings.Contains(a.Actor.Info.Name))
.OrderBy(p => (self.Location - p.Actor.Location).LengthSquared); .OrderBy(p => (self.Location - p.Actor.Location).LengthSquared);
// Worst case FirstOrDefault() will return a TraitPair<null, null>, which is OK. // Worst case FirstOrDefault() will return a TraitPair<null, null>, which is OK.