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

Merge pull request #8870 from obrakmann/fix-ai-using-shared-random

Browse Source 
Fix AI using SharedRandom values
This commit is contained in:
abcdefg30
2015-08-01 16:39:32 +02:00
parent 97192dd8b2 c539b9fcb4
commit 1b20807677
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ namespace OpenRA.Mods.Common.AI
// Add a random factor so not every AI produces at the same tick early in the game. // Add a random factor so not every AI produces at the same tick early in the game.
// Minimum should not be negative as delays in HackyAI could be zero. // Minimum should not be negative as delays in HackyAI could be zero.
var randomFactor = world.SharedRandom.Next(0, ai.Info.StructureProductionRandomBonusDelay); var randomFactor = ai.Random.Next(0, ai.Info.StructureProductionRandomBonusDelay);
waitTicks = active ? ai.Info.StructureProductionActiveDelay + randomFactor waitTicks = active ? ai.Info.StructureProductionActiveDelay + randomFactor
: ai.Info.StructureProductionInactiveDelay + randomFactor; : ai.Info.StructureProductionInactiveDelay + randomFactor;
} }

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

@@ -230,15 +230,6 @@ namespace OpenRA.Mods.Common.AI
Info = info; Info = info;
World = init.World; World = init.World;
// Avoid all AIs trying to rush in the same tick, randomize their initial rush a little.
var smallFractionOfRushInterval = Info.RushInterval / 20;
rushTicks = World.SharedRandom.Next(Info.RushInterval - smallFractionOfRushInterval, Info.RushInterval + smallFractionOfRushInterval);
// Avoid all AIs reevaluating assignments on the same tick, randomize their initial evaluation delay.
assignRolesTicks = World.SharedRandom.Next(0, Info.AssignRolesInterval);
attackForceTicks = World.SharedRandom.Next(0, Info.AttackForceInterval);
minAttackForceDelayTicks = World.SharedRandom.Next(0, Info.MinimumAttackForceDelay);
foreach (var decision in info.PowerDecisions) foreach (var decision in info.PowerDecisions)
powerDecisions.Add(decision.OrderName, decision); powerDecisions.Add(decision.OrderName, decision);
} }
@@ -265,6 +256,15 @@ namespace OpenRA.Mods.Common.AI
Random = new MersenneTwister((int)p.PlayerActor.ActorID); Random = new MersenneTwister((int)p.PlayerActor.ActorID);
// Avoid all AIs trying to rush in the same tick, randomize their initial rush a little.
var smallFractionOfRushInterval = Info.RushInterval / 20;
rushTicks = Random.Next(Info.RushInterval - smallFractionOfRushInterval, Info.RushInterval + smallFractionOfRushInterval);
// Avoid all AIs reevaluating assignments on the same tick, randomize their initial evaluation delay.
assignRolesTicks = Random.Next(0, Info.AssignRolesInterval);
attackForceTicks = Random.Next(0, Info.AttackForceInterval);
minAttackForceDelayTicks = Random.Next(0, Info.MinimumAttackForceDelay);
resourceTypeIndices = new BitArray(World.TileSet.TerrainInfo.Length); // Big enough resourceTypeIndices = new BitArray(World.TileSet.TerrainInfo.Length); // Big enough
foreach (var t in Map.Rules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>()) foreach (var t in Map.Rules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>())
resourceTypeIndices.Set(World.TileSet.GetTerrainIndex(t.TerrainType), true); resourceTypeIndices.Set(World.TileSet.GetTerrainIndex(t.TerrainType), true);