From fce54167fd22a06fe7af7f099bd3cc2c8c192b0d Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Sat, 28 Apr 2018 20:34:31 +0000
Subject: [PATCH] Place palisade walls around Napata when chosing the "easy"
 difficulty.

This was SVN commit r21798.
---
 .../mods/public/maps/random/jebel_barkal.js   | 19 +++++++++++++++----
 .../maps/random/jebel_barkal_triggers.js      |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/binaries/data/mods/public/maps/random/jebel_barkal.js b/binaries/data/mods/public/maps/random/jebel_barkal.js
index d2539073ea..e06d945a54 100644
--- a/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ b/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -81,6 +81,9 @@ const oElephantStables = "structures/kush_elephant_stables";
 const oWallMedium = "structures/kush_wall_medium";
 const oWallGate = "structures/kush_wall_gate";
 const oWallTower = "structures/kush_wall_tower";
+const oPalisadeMedium = "other/palisades_rocks_medium";
+const oPalisadeGate = "other/palisades_rocks_gate";
+const oPalisadeTower = "other/palisades_rocks_tower";
 const oKushCitizenArcher = "units/kush_infantry_archer_b";
 const oKushHealer = "units/kush_support_healer_b";
 const oKushChampionArcher = "units/kush_champion_infantry";
@@ -197,7 +200,7 @@ const pathWidth = 4;
 const pathWidthCenter = 10;
 const pathWidthSecondary = 6;
 
-const placeNapataWall = getDifficulty() >= 3 && mapSize >= 192;
+const placeNapataWall = mapSize < 192 || getDifficulty() < 2 ? false : getDifficulty() < 3 ? "napata_palisade" : "napata_wall";
 
 const layoutFertileLandTextures = [
 	{
@@ -316,7 +319,7 @@ const layoutKushCity = [
 	}
 ].filter(building => getDifficulty() >= getDifficulties().find(difficulty => difficulty.Name == building.difficulty).Difficulty);
 
-g_WallStyles.napata = {
+g_WallStyles.napata_wall = {
 	"short": readyWallElement("uncapturable|" + oWallMedium),
 	"medium": readyWallElement("uncapturable|" + oWallMedium),
 	"tower": readyWallElement("uncapturable|" + oWallTower),
@@ -324,6 +327,14 @@ g_WallStyles.napata = {
 	"overlap": 0.05
 };
 
+g_WallStyles.napata_palisade = {
+	"short": readyWallElement("uncapturable|" + oPalisadeMedium),
+	"medium": readyWallElement("uncapturable|" + oPalisadeMedium),
+	"tower": readyWallElement("uncapturable|" + oPalisadeTower),
+	"gate": readyWallElement("uncapturable|" + oPalisadeGate),
+	"overlap": 0.05
+};
+
 Engine.SetProgress(10);
 
 g_Map.log("Loading hill heightmap");
@@ -881,7 +892,7 @@ if (placeNapataWall)
 		gridCenter,
 		wallGridRadiusFront,
 		["tower", "short", "tower", "gate", "tower", "medium", "tower", "short"],
-		"napata",
+		placeNapataWall,
 		0,
 		wallGridStartAngle,
 		wallGridMaxAngleFront,
@@ -901,7 +912,7 @@ if (placeNapataWall)
 				wallGridPosition[x - 1],
 				wallGridPosition[x],
 				["tower", "gate", "tower", "short", "tower", "short", "tower"],
-				"napata",
+				placeNapataWall,
 				0,
 				false,
 				avoidClasses(clHill, 0, clTemple, 0)));
diff --git a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
index 881c8b88aa..71b70a1e55 100644
--- a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
+++ b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
@@ -76,7 +76,7 @@ var scaleByMapSize = (min, max) => min + (max - min) * (TriggerHelper.GetMapSize
 /**
  * Defensive Infantry units patrol along the paths of the city.
  */
-var jebelBarkal_cityPatrolGroup_count = time => scaleByTime(time, 3, scaleByMapSize(3, 10));
+var jebelBarkal_cityPatrolGroup_count = time => TriggerHelper.GetMapSizeTiles() > 192 ? scaleByTime(time, 3, scaleByMapSize(3, 10)) : 0;
 var jebelBarkal_cityPatrolGroup_interval = time => scaleByTime(time, 5, 3);
 var jebelBarkal_cityPatrolGroup_balancing = {
 	"buildingClasses": ["Wonder", "Temple", "CivCentre", "Fortress", "Barracks+!Stables", "Embassy"],