Merge pull request #3762 from Mailaender/deviator

Let the AI not command stolen units and brought back the Deviator tank
This commit is contained in:
Chris Forbes
2013-09-01 01:15:43 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -485,7 +485,7 @@ namespace OpenRA.Mods.RA.AI
{
squads.RemoveAll(s => !s.IsValid);
foreach (var s in squads)
s.units.RemoveAll(a => a.Destroyed || a.IsDead());
s.units.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
}
// Use of this function requires that one squad of this type. Hence it is a piece of shit
@@ -508,8 +508,8 @@ namespace OpenRA.Mods.RA.AI
void AssignRolesToIdleUnits(Actor self)
{
CleanSquads();
activeUnits.RemoveAll(a => a.Destroyed || a.IsDead());
unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead());
activeUnits.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
if (--rushTicks <= 0)
{

View File

@@ -232,7 +232,7 @@ DEVIATORTANK:
Queue: Armor
BuildPaletteOrder: 50
Prerequisites: heavyo, researcho
# Owner: ordos
Owner: ordos
Hotkey: d
Mobile:
ROT: 3