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

Fix retaliation against garrisoned actors.

Browse Source
This commit is contained in:
Paul Chote
2014-03-18 17:28:45 +13:00
parent 4f7f0b7a55
commit 3f9e89a746
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -72,27 +72,33 @@ namespace OpenRA.Mods.RA
if (!self.IsIdle || !info.TargetWhenDamaged)
return;
if (e.Attacker.Destroyed)
var attacker = e.Attacker;
if (attacker.Destroyed || Stance < UnitStance.ReturnFire)
return;
if (Stance < UnitStance.ReturnFire) return;
if (!attacker.IsInWorld && !attacker.Destroyed)
{
// If the aggressor is in a transport, then attack the transport instead
var passenger = attacker.TraitOrDefault<Passenger>();
if (passenger != null && passenger.Transport != null)
attacker = passenger.Transport;
}
// not a lot we can do about things we can't hurt... although maybe we should automatically run away?
if (!attack.HasAnyValidWeapons(Target.FromActor(e.Attacker)))
if (!attack.HasAnyValidWeapons(Target.FromActor(attacker)))
return;
// don't retaliate against own units force-firing on us. It's usually not what the player wanted.
if (e.Attacker.AppearsFriendlyTo(self))
if (attacker.AppearsFriendlyTo(self))
return;
// don't retaliate against healers
if (e.Damage < 0)
return;
Aggressor = e.Attacker;
Aggressor = attacker;
if (at == null || !at.IsReachableTarget(at.Target, info.AllowMovement && Stance != UnitStance.Defend))
Attack(self, e.Attacker);
Attack(self, Aggressor);
}
public void TickIdle(Actor self)