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

Merge pull request #12452 from GraionDilach/ai-vs-allowmultiple-sp

Browse Source 
Fix AI superweapon usage.
This commit is contained in:
reaperrr
2016-12-16 00:32:38 +01:00
committed by GitHub
parent f0dd19116f 35b1949a61
commit ddb22ec2bd
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/AI/HackyAI.cs
View File

@@ -1027,7 +1027,7 @@ namespace OpenRA.Mods.Common.AI
// Valid target found, delay by a few ticks to avoid rescanning before power fires via order // Valid target found, delay by a few ticks to avoid rescanning before power fires via order
BotDebug("AI: {2} found new target location {0} for support power {1}.", attackLocation, sp.Info.OrderName, Player.PlayerName); BotDebug("AI: {2} found new target location {0} for support power {1}.", attackLocation, sp.Info.OrderName, Player.PlayerName);
waitingPowers[sp] += 10; waitingPowers[sp] += 10;
QueueOrder(new Order(sp.Info.OrderName, supportPowerMngr.Self, false) { TargetLocation = attackLocation.Value, SuppressVisualFeedback = true }); QueueOrder(new Order(sp.Key, supportPowerMngr.Self, false) { TargetLocation = attackLocation.Value, SuppressVisualFeedback = true });
} }
} }
} }
@@ -1044,15 +1044,16 @@ namespace OpenRA.Mods.Common.AI
return null; return null;
} }
var map = World.Map;
var checkRadius = powerDecision.CoarseScanRadius; var checkRadius = powerDecision.CoarseScanRadius;
for (var i = 0; i < World.Map.MapSize.X; i += checkRadius) for (var i = 0; i < map.MapSize.X; i += checkRadius)
{ {
for (var j = 0; j < World.Map.MapSize.Y; j += checkRadius) for (var j = 0; j < map.MapSize.Y; j += checkRadius)
{ {
var consideredAttractiveness = 0; var consideredAttractiveness = 0;
var tl = World.Map.CenterOfCell(new CPos(i, j)); var tl = World.Map.CenterOfCell(new MPos(i, j).ToCPos(map));
var br = World.Map.CenterOfCell(new CPos(i + checkRadius, j + checkRadius)); var br = World.Map.CenterOfCell(new MPos(i + checkRadius, j + checkRadius).ToCPos(map));
var targets = World.ActorMap.ActorsInBox(tl, br); var targets = World.ActorMap.ActorsInBox(tl, br);
consideredAttractiveness = powerDecision.GetAttractiveness(targets, Player); consideredAttractiveness = powerDecision.GetAttractiveness(targets, Player);
@@ -1060,7 +1061,7 @@ namespace OpenRA.Mods.Common.AI
continue; continue;
bestAttractiveness = consideredAttractiveness; bestAttractiveness = consideredAttractiveness;
bestLocation = new CPos(i, j); bestLocation = new MPos(i, j).ToCPos(map);
} }
} }

11
OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
View File

@@ -153,7 +153,8 @@ namespace OpenRA.Mods.Common.Traits
public class SupportPowerInstance public class SupportPowerInstance
{ {
readonly SupportPowerManager manager; readonly SupportPowerManager manager;
readonly string key;
public readonly string Key;
public List<SupportPower> Instances; public List<SupportPower> Instances;
public int RemainingTime; public int RemainingTime;
@@ -170,7 +171,7 @@ namespace OpenRA.Mods.Common.Traits
public SupportPowerInstance(string key, SupportPowerManager manager) public SupportPowerInstance(string key, SupportPowerManager manager)
{ {
this.manager = manager; this.manager = manager;
this.key = key; Key = key;
} }
public void PrerequisitesAvailable(bool available) public void PrerequisitesAvailable(bool available)
@@ -205,14 +206,14 @@ namespace OpenRA.Mods.Common.Traits
--RemainingTime; --RemainingTime;
if (!notifiedCharging) if (!notifiedCharging)
{ {
power.Charging(power.Self, key); power.Charging(power.Self, Key);
notifiedCharging = true; notifiedCharging = true;
} }
if (RemainingTime == 0 if (RemainingTime == 0
&& !notifiedReady) && !notifiedReady)
{ {
power.Charged(power.Self, key); power.Charged(power.Self, Key);
notifiedReady = true; notifiedReady = true;
} }
} }
@@ -227,7 +228,7 @@ namespace OpenRA.Mods.Common.Traits
if (power == null) if (power == null)
return; return;
power.SelectTarget(power.Self, key, manager); power.SelectTarget(power.Self, Key, manager);
} }
public void Activate(Order order) public void Activate(Order order)