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

use actor type string rather than ProductionItem in ChooseBuildLocation

Browse Source
This commit is contained in:
Chris Forbes
2011-10-24 19:18:33 +13:00
parent 3a5cce1f1f
commit 268f06caf0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/AI/BaseBuilder.cs
View File

@@ -74,7 +74,7 @@ namespace OpenRA.Mods.RA.AI
lastThinkTick = ai.ticks; lastThinkTick = ai.ticks;
/* place the building */ /* place the building */
var location = ai.ChooseBuildLocation(currentBuilding); var location = ai.ChooseBuildLocation(currentBuilding.Item);
if (location == null) if (location == null)
{ {
HackyAI.BotDebug("AI: Nowhere to place {0}".F(currentBuilding.Item)); HackyAI.BotDebug("AI: Nowhere to place {0}".F(currentBuilding.Item));

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

@@ -157,16 +157,16 @@ namespace OpenRA.Mods.RA.AI
return cells.All(c => bi.GetBuildingAt(c) == null); return cells.All(c => bi.GetBuildingAt(c) == null);
} }
public int2? ChooseBuildLocation(ProductionItem item) public int2? ChooseBuildLocation(string actorType)
{ {
var bi = Rules.Info[item.Item].Traits.Get<BuildingInfo>(); var bi = Rules.Info[actorType].Traits.Get<BuildingInfo>();
for (var k = 0; k < MaxBaseDistance; k++) for (var k = 0; k < MaxBaseDistance; k++)
foreach (var t in world.FindTilesInCircle(baseCenter, k)) foreach (var t in world.FindTilesInCircle(baseCenter, k))
if (world.CanPlaceBuilding(item.Item, bi, t, null)) if (world.CanPlaceBuilding(actorType, bi, t, null))
if (bi.IsCloseEnoughToBase(world, p, item.Item, t)) if (bi.IsCloseEnoughToBase(world, p, actorType, t))
if (NoBuildingsUnder(Util.ExpandFootprint( if (NoBuildingsUnder(Util.ExpandFootprint(
FootprintUtils.Tiles( item.Item, bi, t ), false))) FootprintUtils.Tiles(actorType, bi, t), false)))
return t; return t;
return null; // i don't know where to put it. return null; // i don't know where to put it.