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

Merge pull request #5771 from Mailaender/hackyai-mcv-cleanup

Browse Source 
Cleaned up HackyAI MCV deployment
This commit is contained in:
Paul Chote
2014-06-29 13:00:21 +12:00
parent 1c511ea6eb 5130723fcd
commit 52af0d2c81
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,7 +234,7 @@ namespace OpenRA.Mods.RA.AI
ActorInfo GetInfoByCommonName(Dictionary<string, string[]> names, string commonName, Player owner) ActorInfo GetInfoByCommonName(Dictionary<string, string[]> names, string commonName, Player owner)
{ {
if (!names.Any() || !names.ContainsKey(commonName)) if (!names.Any() || !names.ContainsKey(commonName))
return null; throw new InvalidOperationException("Can't find {0} in the HackyAI UnitsCommonNames definition.".F(commonName));
return Map.Rules.Actors.Where(k => names[commonName].Contains(k.Key)).Random(random).Value; return Map.Rules.Actors.Where(k => names[commonName].Contains(k.Key)).Random(random).Value;
} }
@@ -734,13 +734,6 @@ namespace OpenRA.Mods.RA.AI
{ {
var maxBaseDistance = Math.Max(world.Map.MapSize.X, world.Map.MapSize.Y); var maxBaseDistance = Math.Max(world.Map.MapSize.X, world.Map.MapSize.Y);
// HACK: Assumes all MCVs deploy into the same construction yard footprint
var mcvInfo = GetUnitInfoByCommonName("Mcv", p);
if (mcvInfo == null)
return;
var factType = mcvInfo.Traits.Get<TransformsInfo>().IntoActor;
// HACK: This needs to query against MCVs directly // HACK: This needs to query against MCVs directly
var mcvs = self.World.Actors.Where(a => a.Owner == p && a.HasTrait<BaseBuilding>() && a.HasTrait<Mobile>()); var mcvs = self.World.Actors.Where(a => a.Owner == p && a.HasTrait<BaseBuilding>() && a.HasTrait<Mobile>());
if (!mcvs.Any()) if (!mcvs.Any())
@@ -751,6 +744,7 @@ namespace OpenRA.Mods.RA.AI
if (mcv.IsMoving()) if (mcv.IsMoving())
continue; continue;
var factType = mcv.Info.Traits.Get<TransformsInfo>().IntoActor;
var desiredLocation = ChooseBuildLocation(factType, false, maxBaseDistance, BuildingType.Building); var desiredLocation = ChooseBuildLocation(factType, false, maxBaseDistance, BuildingType.Building);
if (desiredLocation == null) if (desiredLocation == null)
continue; continue;