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

Fix illegal ore rings popping up around spawns in generated maps

Browse Source 
Reorders and groups selective clearing of the resource placement plan to
-int.MaxValue to avoid subsequent code from inappropriately trying to
use it in arithmetic, which may just underflow to some completely wrong
value and lead to resources in illegal places.
This commit is contained in:
Ashley Newson
2025-01-28 20:06:56 +00:00
committed by Gustas Kažukauskas
parent 19585ec7ac
commit cdbcfb9e20
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/World/RaMapGenerator.cs
View File

@@ -1481,10 +1481,7 @@ namespace OpenRA.Mods.Common.Traits
// Closer to +inf means "more preferable" for plan.
var plan1024ths = new CellLayer<int>(map);
foreach (var mpos in map.AllCells.MapCoords)
if (playableArea[mpos] && param.AllowedTerrainResourceCombos.Contains((bestResource[mpos], map.GetTerrainIndex(mpos))))
plan1024ths[mpos] = pattern1024ths[mpos] * maxStrength1024ths[mpos] / 1024;
else
plan1024ths[mpos] = -int.MaxValue;
plan1024ths[mpos] = pattern1024ths[mpos] * maxStrength1024ths[mpos] / 1024;
var wSpawnBuildSizeSq = (long)param.SpawnBuildSize * param.SpawnBuildSize * 1024 * 1024;
foreach (var actorPlan in actorPlans)
@@ -1497,6 +1494,10 @@ namespace OpenRA.Mods.Common.Traits
action: (mpos, _, _, rSq) =>
plan1024ths[mpos] += (int)(plan1024ths[mpos] * param.SpawnResourceBias * wSpawnBuildSizeSq / Math.Max(rSq, 1024 * 1024) / FractionMax));
foreach (var mpos in map.AllCells.MapCoords)
if (!playableArea[mpos] || !param.AllowedTerrainResourceCombos.Contains((bestResource[mpos], map.GetTerrainIndex(mpos))))
plan1024ths[mpos] = -int.MaxValue;
foreach (var actorPlan in actorPlans)
if (actorPlan.Reference.Type == "mpspawn")
CellLayerUtils.OverCircle(