Add DeriveTotalPossibleBarbCamps

Author: ajhalme

C7Engine/MapGenerator.cs

@@ -1310,8 +1310,8 @@ private static void AddBarbarianCamps(WorldCharacteristics wc, GameMap m) {
 					++landTiles;
 				}
 			}
-			int totalPossibleBarbCamps = landTiles / 100;
-			// TODO: Update this based on barbarian activity.
+			
+			int totalPossibleBarbCamps = DeriveTotalPossibleBarbCamps(wc, landTiles);
 
 			int numCamps = 0;
 			for (int i = 0; i < tileIndicies.Count && numCamps < totalPossibleBarbCamps; ++i) {
@@ -1324,6 +1324,32 @@ private static void AddBarbarianCamps(WorldCharacteristics wc, GameMap m) {
 			}
 		}
 
+		/// <summary>
+		/// Apply barbarian activity level to barbarian camp spawn rate. Currently NOT based on Civ3 values.
+		/// TODO: Make configurable
+		/// TODO: Determine what these values are in Civ3 
+		/// </summary>
+		private static int DeriveTotalPossibleBarbCamps(WorldCharacteristics wc, int landTiles)
+		{
+			var totalCampsBaseline = landTiles / 100; 
+			switch (wc.barbarianActivity)
+			{
+				case BarbarianActivity.None:
+					return 0;
+				case BarbarianActivity.Sedentary:
+					return totalCampsBaseline;
+				case BarbarianActivity.Roaming:
+					return totalCampsBaseline;
+				case BarbarianActivity.Restless:
+					return (int)Math.Round(totalCampsBaseline * 1.25); // extra 25%
+				case BarbarianActivity.Raging:
+					return (int)Math.Round(totalCampsBaseline * 1.50); // extra 50%
+				default:
+					log.Warning("Unknown Barbarian Activity at barb camps derivation.");
+					return totalCampsBaseline;
+			}
+		}
+
 		private static bool IsValidForBarbarianCamp(WorldCharacteristics wc, GameMap m, Tile t) {
 			// No barbarian camps on water, volcanos, or mountains.
 			if (!t.IsLand() || t == Tile.NONE || t.overlayTerrainType.Key == "volcano" || t.overlayTerrainType.Key == "mountains") {