From 6a43f91630e6bbca35d3a1aebe77cac3a63e5bdc Mon Sep 17 00:00:00 2001
From: marder <marder@wildfiregames.com>
Date: Sun, 19 Nov 2023 20:54:12 +0000
Subject: [PATCH] Fix oversight in 56f15f0869 regarding iber wall placement

Needed until / if D5082 lands.
Until then we also still need: `g_PlayerbaseTypes`.

Differential revision: https://code.wildfiregames.com/D5196
This was SVN commit r27946.
---
 binaries/data/mods/public/maps/random/ambush.js              | 2 +-
 binaries/data/mods/public/maps/random/empire.js              | 4 ++--
 binaries/data/mods/public/maps/random/frontier.js            | 2 +-
 binaries/data/mods/public/maps/random/harbor.js              | 2 +-
 binaries/data/mods/public/maps/random/hells_pass.js          | 2 +-
 binaries/data/mods/public/maps/random/lions_den.js           | 2 +-
 binaries/data/mods/public/maps/random/rmgen-common/player.js | 2 +-
 binaries/data/mods/public/maps/random/stronghold.js          | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/binaries/data/mods/public/maps/random/ambush.js b/binaries/data/mods/public/maps/random/ambush.js
index 2fcbf03361..c9e3516f64 100644
--- a/binaries/data/mods/public/maps/random/ambush.js
+++ b/binaries/data/mods/public/maps/random/ambush.js
@@ -28,7 +28,7 @@ if (!isNomad())
 				fractionToTiles(randFloat(0.08, 0.1)),
 				randomAngle(),
 				undefined),
-			undefined);
+			g_PlayerbaseTypes[g_MapSettings.TeamPlacement].walls);
 
 	markPlayerAvoidanceArea(playerPosition, defaultPlayerBaseRadius());
 }
diff --git a/binaries/data/mods/public/maps/random/empire.js b/binaries/data/mods/public/maps/random/empire.js
index a89d63457e..4324751dcc 100644
--- a/binaries/data/mods/public/maps/random/empire.js
+++ b/binaries/data/mods/public/maps/random/empire.js
@@ -24,7 +24,7 @@ createBases(
 		fractionToTiles(0.04),
 		startAngle,
 		undefined),
-	undefined);
+	false);
 Engine.SetProgress(20);
 
 // Change the starting angle and add the players again
@@ -43,7 +43,7 @@ createBases(
 		fractionToTiles(0.04),
 		startAngle + rotation,
 		undefined),
-	undefined);
+	false);
 Engine.SetProgress(40);
 
 addElements(shuffleArray([
diff --git a/binaries/data/mods/public/maps/random/frontier.js b/binaries/data/mods/public/maps/random/frontier.js
index 64224ba019..837f5f69c9 100644
--- a/binaries/data/mods/public/maps/random/frontier.js
+++ b/binaries/data/mods/public/maps/random/frontier.js
@@ -29,7 +29,7 @@ if (!isNomad())
 			fractionToTiles(randFloat(0.08, 0.1)),
 			randomAngle(),
 			undefined),
-		undefined);
+		g_PlayerbaseTypes[pattern].walls);
 }
 Engine.SetProgress(40);
 
diff --git a/binaries/data/mods/public/maps/random/harbor.js b/binaries/data/mods/public/maps/random/harbor.js
index 5b1498b18e..c6a3ce216e 100644
--- a/binaries/data/mods/public/maps/random/harbor.js
+++ b/binaries/data/mods/public/maps/random/harbor.js
@@ -33,7 +33,7 @@ const [playerIDs, playerPosition] =
 			fractionToTiles(0.05),
 			startAngle,
 			undefined),
-		undefined);
+		true);
 Engine.SetProgress(20);
 
 addCenterLake();
diff --git a/binaries/data/mods/public/maps/random/hells_pass.js b/binaries/data/mods/public/maps/random/hells_pass.js
index ca5e97959d..accc5743c2 100644
--- a/binaries/data/mods/public/maps/random/hells_pass.js
+++ b/binaries/data/mods/public/maps/random/hells_pass.js
@@ -29,7 +29,7 @@ createBases(
 		fractionToTiles(0.08),
 		startAngle,
 		undefined),
-	undefined);
+	false);
 Engine.SetProgress(20);
 
 placeBarriers();
diff --git a/binaries/data/mods/public/maps/random/lions_den.js b/binaries/data/mods/public/maps/random/lions_den.js
index 6e020d7330..3f3c342ca6 100644
--- a/binaries/data/mods/public/maps/random/lions_den.js
+++ b/binaries/data/mods/public/maps/random/lions_den.js
@@ -32,7 +32,7 @@ createBases(
 		fractionToTiles(randFloat(0.05, 0.1)),
 		startAngle,
 		undefined),
-	undefined);
+	true);
 Engine.SetProgress(20);
 
 createSunkenTerrain();
diff --git a/binaries/data/mods/public/maps/random/rmgen-common/player.js b/binaries/data/mods/public/maps/random/rmgen-common/player.js
index e6317caade..f265e77b69 100644
--- a/binaries/data/mods/public/maps/random/rmgen-common/player.js
+++ b/binaries/data/mods/public/maps/random/rmgen-common/player.js
@@ -615,7 +615,7 @@ function playerPlacementByPattern(patternName, distance = undefined, groupedDist
 	switch (patternName)
 	{
 		case "radial":
-			return playerPlacementCircle(distance, angle, center);
+			return playerPlacementCircle(distance, angle, center).slice(0, 2);
 		case "river":
 			return playerPlacementRiver(angle, distance, center);
 		case "line":
diff --git a/binaries/data/mods/public/maps/random/stronghold.js b/binaries/data/mods/public/maps/random/stronghold.js
index 9290f29db8..9b5c8e2475 100644
--- a/binaries/data/mods/public/maps/random/stronghold.js
+++ b/binaries/data/mods/public/maps/random/stronghold.js
@@ -25,7 +25,7 @@ const [playerIDs, playerPosition] =
 			fractionToTiles(randFloat(0.05, 0.1)),
 			randomAngle(),
 			undefined),
-		undefined);
+		false);
 markPlayerAvoidanceArea(playerPosition, defaultPlayerBaseRadius());
 
 Engine.SetProgress(30);