Vantha/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix mapgeneration of ambush & frontier in atlas

Browse Source 
56f15f0869 broke those maps in atlas where g_MapSettings.TeamPlacement
is never initialized.

Bug found by @elexis
Fix not objected by @elexis (comments: committable if 56f15f0869 should
not be reverted and developer time is limited)

Differential revision: https://code.wildfiregames.com/D5200
This was SVN commit r27952.
This commit is contained in:
marder 2023-11-21 21:44:31 +00:00
parent 62ab340622
commit 63a4799f56
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binaries/data/mods/public/maps/random/ambush.js
View File

@ -20,15 +20,16 @@ Engine.SetProgress(10);
if (!isNomad())
{
let pattern = g_MapSettings.TeamPlacement || pickRandom(["line", "radial", "randomGroup", "stronghold"]);
var [playerIDs, playerPosition] =
createBases(
...playerPlacementByPattern(
g_MapSettings.TeamPlacement,
pattern,
fractionToTiles(randFloat(0.2, 0.35)),
fractionToTiles(randFloat(0.08, 0.1)),
randomAngle(),
undefined),
g_PlayerbaseTypes[g_MapSettings.TeamPlacement].walls);
g_PlayerbaseTypes[pattern].walls);
markPlayerAvoidanceArea(playerPosition, defaultPlayerBaseRadius());
}

3
binaries/data/mods/public/maps/random/frontier.js
View File

@ -21,7 +21,8 @@ Engine.SetProgress(20);
if (!isNomad())
{
let pattern = g_MapSettings.TeamPlacement;
// Note: `|| pickRandom(...)` is needed for atlas.
let pattern = g_MapSettings.TeamPlacement || pickRandom(["line", "radial", "randomGroup", "stronghold"]);
createBases(
...playerPlacementByPattern(
pattern,