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

Stance modification for engineer repair

Browse Source
This commit is contained in:
entropai
2016-10-16 13:14:58 +03:00
committed by reaperrr
parent 285e9a8030
commit 57e5bbb448
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/RepairBuilding.cs
View File

@@ -18,11 +18,13 @@ namespace OpenRA.Mods.Common.Activities
{ {
readonly Actor target; readonly Actor target;
readonly Health health; readonly Health health;
readonly Stance validStances;
public RepairBuilding(Actor self, Actor target, EnterBehaviour enterBehaviour) public RepairBuilding(Actor self, Actor target, EnterBehaviour enterBehaviour, Stance validStances)
: base(self, target, enterBehaviour) : base(self, target, enterBehaviour)
{ {
this.target = target; this.target = target;
this.validStances = validStances;
health = target.Trait<Health>(); health = target.Trait<Health>();
} }
@@ -33,6 +35,10 @@ namespace OpenRA.Mods.Common.Activities
protected override void OnInside(Actor self) protected override void OnInside(Actor self)
{ {
var stance = self.Owner.Stances[target.Owner];
if (!stance.HasStance(validStances))
return;
if (health.DamageState == DamageState.Undamaged) if (health.DamageState == DamageState.Undamaged)
return; return;

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

@@ -26,6 +26,9 @@ namespace OpenRA.Mods.Common.Traits
"Possible values are Exit, Suicide, Dispose.")] "Possible values are Exit, Suicide, Dispose.")]
public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose; public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose;
[Desc("What diplomatic stances allow target to be repaired by this actor.")]
public readonly Stance ValidStances = Stance.Ally;
public object Create(ActorInitializer init) { return new EngineerRepair(init, this); } public object Create(ActorInitializer init) { return new EngineerRepair(init, this); }
} }
@@ -96,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity(); self.CancelActivity();
self.SetTargetLine(target, Color.Yellow); self.SetTargetLine(target, Color.Yellow);
self.QueueActivity(new RepairBuilding(self, target.Actor, info.EnterBehaviour)); self.QueueActivity(new RepairBuilding(self, target.Actor, info.EnterBehaviour, info.ValidStances));
} }
class EngineerRepairOrderTargeter : UnitOrderTargeter class EngineerRepairOrderTargeter : UnitOrderTargeter