From e022744b0ae21c52669cd3ebfaef594e6d140029 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 2 Mar 2025 08:50:13 +0000
Subject: [PATCH] Remove Map requirement from IMapGeneratorInfo.GetSettings.

---
 .../MapGenerator/MapGeneratorSettings.cs             | 12 ++++++------
 OpenRA.Mods.Common/Traits/World/ClearMapGenerator.cs |  4 ++--
 OpenRA.Mods.Common/Traits/World/RaMapGenerator.cs    |  4 ++--
 OpenRA.Mods.Common/TraitsInterfaces.cs               |  6 +++---
 .../UtilityCommands/FuzzMapGeneratorCommand.cs       |  2 +-
 .../Widgets/Logic/Editor/MapGeneratorToolLogic.cs    |  4 +++-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/OpenRA.Mods.Common/MapGenerator/MapGeneratorSettings.cs b/OpenRA.Mods.Common/MapGenerator/MapGeneratorSettings.cs
index a5b58a94ba..0941ad2ad6 100644
--- a/OpenRA.Mods.Common/MapGenerator/MapGeneratorSettings.cs
+++ b/OpenRA.Mods.Common/MapGenerator/MapGeneratorSettings.cs
@@ -89,9 +89,9 @@ namespace OpenRA.Mods.Common.MapGenerator
 			}
 
 			/// <summary>Check whether this choice is permitted for this map.</summary>
-			public bool Allowed(Map map)
+			public bool Allowed(ITerrainInfo terrainInfo)
 			{
-				if (Tileset != null && !Tileset.Contains(map.Tileset))
+				if (Tileset != null && !Tileset.Contains(terrainInfo.Id))
 					return false;
 
 				return true;
@@ -144,7 +144,7 @@ namespace OpenRA.Mods.Common.MapGenerator
 			/// <summary>Settings layering priority. Higher overrides lower.</summary>
 			public readonly int Priority = 0;
 
-			public Option(string id, MiniYaml my, Map map)
+			public Option(string id, MiniYaml my, ITerrainInfo terrainInfo)
 			{
 				Id = id;
 				FieldLoader.Load(this, my);
@@ -214,7 +214,7 @@ namespace OpenRA.Mods.Common.MapGenerator
 								if (split.Length >= 2)
 									choiceId = split[1];
 								var choice = new Choice(choiceId, node.Value);
-								if (choice.Allowed(map))
+								if (choice.Allowed(terrainInfo))
 									choices.Add(choice);
 							}
 						}
@@ -334,7 +334,7 @@ namespace OpenRA.Mods.Common.MapGenerator
 		/// <summary>
 		/// Parse settings from a MiniYaml definition. Returns null if the map isn't compatible.
 		/// </summary>
-		public static MapGeneratorSettings LoadSettings(MiniYaml my, Map map)
+		public static MapGeneratorSettings LoadSettings(MiniYaml my, ITerrainInfo terrainInfo)
 		{
 			var options = new List<Option>();
 
@@ -346,7 +346,7 @@ namespace OpenRA.Mods.Common.MapGenerator
 					string id = null;
 					if (split.Length >= 2)
 						id = split[1];
-					var option = new Option(id, node.Value, map);
+					var option = new Option(id, node.Value, terrainInfo);
 					if (option.Choices.Count == 0)
 						return null;
 					options.Add(option);
diff --git a/OpenRA.Mods.Common/Traits/World/ClearMapGenerator.cs b/OpenRA.Mods.Common/Traits/World/ClearMapGenerator.cs
index b806b708d5..6ae977ff4b 100644
--- a/OpenRA.Mods.Common/Traits/World/ClearMapGenerator.cs
+++ b/OpenRA.Mods.Common/Traits/World/ClearMapGenerator.cs
@@ -54,9 +54,9 @@ namespace OpenRA.Mods.Common.Traits
 			return MapGeneratorSettings.DumpFluent(my.NodeWithKey("Settings").Value);
 		}
 
-		public MapGeneratorSettings GetSettings(Map map)
+		public MapGeneratorSettings GetSettings(ITerrainInfo terrainInfo)
 		{
-			return MapGeneratorSettings.LoadSettings(Settings, map);
+			return MapGeneratorSettings.LoadSettings(Settings, terrainInfo);
 		}
 
 		public void Generate(Map map, MiniYaml settings)
diff --git a/OpenRA.Mods.Common/Traits/World/RaMapGenerator.cs b/OpenRA.Mods.Common/Traits/World/RaMapGenerator.cs
index 7bcba1796e..e20ad4028a 100644
--- a/OpenRA.Mods.Common/Traits/World/RaMapGenerator.cs
+++ b/OpenRA.Mods.Common/Traits/World/RaMapGenerator.cs
@@ -481,9 +481,9 @@ namespace OpenRA.Mods.Common.Traits
 			}
 		}
 
-		public MapGeneratorSettings GetSettings(Map map)
+		public MapGeneratorSettings GetSettings(ITerrainInfo terrainInfo)
 		{
-			return MapGeneratorSettings.LoadSettings(Settings, map);
+			return MapGeneratorSettings.LoadSettings(Settings, terrainInfo);
 		}
 
 		public void Generate(Map map, MiniYaml settings)
diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs
index 4ed8fddc29..2043a4ca35 100644
--- a/OpenRA.Mods.Common/TraitsInterfaces.cs
+++ b/OpenRA.Mods.Common/TraitsInterfaces.cs
@@ -975,10 +975,10 @@ namespace OpenRA.Mods.Common.Traits
 		string Name { get; }
 
 		/// <summary>
-		/// Get the generator settings available for this map.
-		/// Returns null if not compatible with the given map.
+		/// Get the generator settings available for this tileset.
+		/// Returns null if not compatible with the given tileset.
 		/// </summary>
-		MapGeneratorSettings GetSettings(Map map);
+		MapGeneratorSettings GetSettings(ITerrainInfo terrainInfo);
 
 		/// <summary>
 		/// Generate or manipulate a supplied map in-place.
diff --git a/OpenRA.Mods.Common/UtilityCommands/FuzzMapGeneratorCommand.cs b/OpenRA.Mods.Common/UtilityCommands/FuzzMapGeneratorCommand.cs
index a2c45f6d94..3bd67bacf2 100644
--- a/OpenRA.Mods.Common/UtilityCommands/FuzzMapGeneratorCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/FuzzMapGeneratorCommand.cs
@@ -269,7 +269,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					var br = new PPos(size[0], size[1] + maxTerrainHeight);
 					map.SetBounds(tl, br);
 
-					var settings = generator.GetSettings(map);
+					var settings = generator.GetSettings(tileset);
 					var choices = settings.DefaultChoices();
 					foreach (var option in choices.Keys)
 						if (iterationChoices.TryGetValue(option.Id, out var choice))
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
index a45edcae2e..d16a82996c 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
@@ -64,11 +64,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			generatorsToSettingsChoices = new Dictionary<IMapGeneratorInfo, Dictionary<MapGeneratorSettings.Option, MapGeneratorSettings.Choice>>();
 
 			var mapGenerators = new List<IMapGeneratorInfo>();
+			var terrainInfo = modData.DefaultTerrainInfo[world.Map.Tileset];
 			foreach (var generator in world.Map.Rules.Actors[SystemActors.EditorWorld].TraitInfos<IMapGeneratorInfo>())
 			{
-				var settings = generator.GetSettings(world.Map);
+				var settings = generator.GetSettings(terrainInfo);
 				if (settings == null)
 					continue;
+
 				var choices = settings.DefaultChoices();
 				mapGenerators.Add(generator);
 				generatorsToSettingsChoices.Add(generator, choices);