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

Merge pull request #3762 from Mailaender/deviator

Browse Source 
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
parent 97858dae55 edd84c1c2e
commit 0bd7f4e205
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -485,7 +485,7 @@ namespace OpenRA.Mods.RA.AI
{ {
squads.RemoveAll(s => !s.IsValid); squads.RemoveAll(s => !s.IsValid);
foreach (var s in squads) 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 // 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) void AssignRolesToIdleUnits(Actor self)
{ {
CleanSquads(); CleanSquads();
activeUnits.RemoveAll(a => a.Destroyed || a.IsDead()); activeUnits.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead()); unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
if (--rushTicks <= 0) if (--rushTicks <= 0)
{ {

2
mods/d2k/rules/ordos.yaml
View File

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