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

Merge pull request #5812 from Mailaender/rallypoint-test-building-hack-removal

Browse Source 
Fixed the AI choosing rallypoints on land for shipyards
This commit is contained in:
Paul Chote
2014-07-05 11:22:00 +12:00
parent 6deadd7658 79dd9a9c6b
commit 31aaaf26b5
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,6 @@ namespace OpenRA.Mods.RA.AI
[Desc("Radius in cells around a factory scanned for rally points by the AI.")] [Desc("Radius in cells around a factory scanned for rally points by the AI.")]
public readonly int RallyPointScanRadius = 8; public readonly int RallyPointScanRadius = 8;
// Temporary hack to maintain previous rallypoint behavior.
public readonly string RallypointTestBuilding = "fact";
public readonly string[] UnitQueues = { "Vehicle", "Infantry", "Plane", "Ship", "Aircraft" }; public readonly string[] UnitQueues = { "Vehicle", "Infantry", "Plane", "Ship", "Aircraft" };
public readonly bool ShouldRepairBuildings = true; public readonly bool ShouldRepairBuildings = true;
@@ -101,7 +99,6 @@ namespace OpenRA.Mods.RA.AI
PowerManager playerPower; PowerManager playerPower;
SupportPowerManager supportPowerMngr; SupportPowerManager supportPowerMngr;
PlayerResources playerResource; PlayerResources playerResource;
BuildingInfo rallypointTestBuilding;
internal readonly HackyAIInfo Info; internal readonly HackyAIInfo Info;
HashSet<int> resourceTypeIndices; HashSet<int> resourceTypeIndices;
@@ -128,9 +125,6 @@ namespace OpenRA.Mods.RA.AI
{ {
Info = info; Info = info;
world = init.world; world = init.world;
// Temporary hack.
rallypointTestBuilding = Map.Rules.Actors[Info.RallypointTestBuilding].Traits.Get<BuildingInfo>();
} }
public static void BotDebug(string s, params object[] args) public static void BotDebug(string s, params object[] args)
@@ -671,37 +665,35 @@ namespace OpenRA.Mods.RA.AI
} }
} }
bool IsRallyPointValid(CPos x) bool IsRallyPointValid(CPos x, BuildingInfo info)
{ {
// This is actually WRONG as soon as HackyAI is building units with return info != null && world.IsCellBuildable(x, info);
// a variety of movement capabilities. (has always been wrong)
return world.IsCellBuildable(x, rallypointTestBuilding);
} }
void SetRallyPointsForNewProductionBuildings(Actor self) void SetRallyPointsForNewProductionBuildings(Actor self)
{ {
var buildings = self.World.ActorsWithTrait<RallyPoint>() var buildings = self.World.ActorsWithTrait<RallyPoint>()
.Where(rp => rp.Actor.Owner == p && .Where(rp => rp.Actor.Owner == p &&
!IsRallyPointValid(rp.Trait.rallyPoint)).ToArray(); !IsRallyPointValid(rp.Trait.rallyPoint, rp.Actor.Info.Traits.GetOrDefault<BuildingInfo>())).ToArray();
if (buildings.Length > 0) if (buildings.Length > 0)
BotDebug("Bot {0} needs to find rallypoints for {1} buildings.", BotDebug("Bot {0} needs to find rallypoints for {1} buildings.",
p.PlayerName, buildings.Length); p.PlayerName, buildings.Length);
foreach (var a in buildings) foreach (var a in buildings)
world.IssueOrder(new Order("SetRallyPoint", a.Actor, false) { TargetLocation = ChooseRallyLocationNear(a.Actor.Location), SuppressVisualFeedback = true }); world.IssueOrder(new Order("SetRallyPoint", a.Actor, false) { TargetLocation = ChooseRallyLocationNear(a.Actor), SuppressVisualFeedback = true });
} }
// Won't work for shipyards... // Won't work for shipyards...
CPos ChooseRallyLocationNear(CPos startPos) CPos ChooseRallyLocationNear(Actor producer)
{ {
var possibleRallyPoints = Map.FindTilesInCircle(startPos, Info.RallyPointScanRadius) var possibleRallyPoints = Map.FindTilesInCircle(producer.Location, Info.RallyPointScanRadius)
.Where(IsRallyPointValid); .Where(c => IsRallyPointValid(c, producer.Info.Traits.GetOrDefault<BuildingInfo>()));
if (!possibleRallyPoints.Any()) if (!possibleRallyPoints.Any())
{ {
BotDebug("Bot Bug: No possible rallypoint near {0}", startPos); BotDebug("Bot Bug: No possible rallypoint near {0}", producer.Location);
return startPos; return producer.Location;
} }
return possibleRallyPoints.Random(random); return possibleRallyPoints.Random(random);

3
mods/d2k/rules/ai.yaml
View File

@@ -2,7 +2,6 @@ Player:
HackyAI@Omnius: HackyAI@Omnius:
Name: Omnius Name: Omnius
UnitQueues: Infantry, Vehicle, Armor, Starport UnitQueues: Infantry, Vehicle, Armor, Starport
RallypointTestBuilding: conyarda
BuildingCommonNames: BuildingCommonNames:
ConstructionYard: conyarda,conyardh,conyardo ConstructionYard: conyarda,conyardh,conyardo
Refinery: refa,refh,refo Refinery: refa,refh,refo
@@ -104,7 +103,6 @@ Player:
HackyAI@Vidius: HackyAI@Vidius:
Name: Vidious Name: Vidious
UnitQueues: Infantry, Vehicle, Armor, Starport UnitQueues: Infantry, Vehicle, Armor, Starport
RallypointTestBuilding: conyarda
BuildingCommonNames: BuildingCommonNames:
ConstructionYard: conyarda,conyardh,conyardo ConstructionYard: conyarda,conyardh,conyardo
Refinery: refa,refh,refo Refinery: refa,refh,refo
@@ -207,7 +205,6 @@ Player:
HackyAI@Gladius: HackyAI@Gladius:
Name: Gladius Name: Gladius
UnitQueues: Infantry, Vehicle, Armor, Starport UnitQueues: Infantry, Vehicle, Armor, Starport
RallypointTestBuilding: conyarda
BuildingCommonNames: BuildingCommonNames:
ConstructionYard: conyarda,conyardh,conyardo ConstructionYard: conyarda,conyardh,conyardo
Refinery: refa,refh,refo Refinery: refa,refh,refo