epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow MapGeneratorSettings to be initialized from MapGenerationArgs.

Browse Source
This commit is contained in:
Paul Chote
2025-05-11 19:14:15 +01:00
committed by Gustas Kažukauskas
parent ad08045e5f
commit 4f1b17b832
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenRA.Mods.Common/MapGenerator/MapGeneratorSettings.cs
View File

@@ -208,6 +208,11 @@ namespace OpenRA.Mods.Common.MapGenerator
public sealed class MapGeneratorSettings : IMapGeneratorSettings public sealed class MapGeneratorSettings : IMapGeneratorSettings
{ {
sealed class MapGenerationArgsWithOptions : MapGenerationArgs
{
public Dictionary<string, string> Options = [];
}
readonly IMapGeneratorInfo generatorInfo; readonly IMapGeneratorInfo generatorInfo;
public MapGeneratorSettings(IMapGeneratorInfo generatorInfo, MiniYaml yaml) public MapGeneratorSettings(IMapGeneratorInfo generatorInfo, MiniYaml yaml)
@@ -253,6 +258,26 @@ namespace OpenRA.Mods.Common.MapGenerator
} }
} }
public void Initialize(MapGenerationArgs args)
{
if (args is MapGenerationArgsWithOptions optionArgs)
{
foreach (var o in Options)
{
if (!optionArgs.Options.TryGetValue(o.Id, out var value))
continue;
switch (o)
{
case MapGeneratorBooleanOption bo: bo.Value = FieldLoader.GetValue<bool>(o.Id, value); break;
case MapGeneratorIntegerOption io: io.Value = FieldLoader.GetValue<int>(o.Id, value); break;
case MapGeneratorMultiIntegerChoiceOption mio: mio.Value = FieldLoader.GetValue<int>(o.Id, value); break;
case MapGeneratorMultiChoiceOption mo: mo.Value = value; break;
}
}
}
}
public MapGenerationArgs Compile(ITerrainInfo terrainInfo, Size size) public MapGenerationArgs Compile(ITerrainInfo terrainInfo, Size size)
{ {
// Apply the choices in their canonical order. // Apply the choices in their canonical order.
@@ -261,14 +286,27 @@ namespace OpenRA.Mods.Common.MapGenerator
.OrderBy(option => option.Priority) .OrderBy(option => option.Priority)
.Select(o => o.GetSettings(terrainInfo, playerCount)); .Select(o => o.GetSettings(terrainInfo, playerCount));
return new MapGenerationArgs() var options = new Dictionary<string, string>();
foreach (var o in Options)
{
switch (o)
{
case MapGeneratorBooleanOption bo: options[o.Id] = FieldSaver.FormatValue(bo.Value); break;
case MapGeneratorIntegerOption io: options[o.Id] = FieldSaver.FormatValue(io.Value); break;
case MapGeneratorMultiIntegerChoiceOption mio: options[o.Id] = FieldSaver.FormatValue(mio.Value); break;
case MapGeneratorMultiChoiceOption mo: options[o.Id] = mo.Value; break;
}
}
return new MapGenerationArgsWithOptions()
{ {
Generator = generatorInfo.Type, Generator = generatorInfo.Type,
Tileset = terrainInfo.Id, Tileset = terrainInfo.Id,
Size = size, Size = size,
Title = FluentProvider.GetMessage(generatorInfo.MapTitle), Title = FluentProvider.GetMessage(generatorInfo.MapTitle),
Author = FluentProvider.GetMessage(generatorInfo.Name), Author = FluentProvider.GetMessage(generatorInfo.Name),
Settings = new MiniYaml(null, MiniYaml.Merge(layers)) Settings = new MiniYaml(null, MiniYaml.Merge(layers)),
Options = options
}; };
} }
} }

2
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -984,6 +984,8 @@ namespace OpenRA.Mods.Common.Traits
void Randomize(MersenneTwister random); void Randomize(MersenneTwister random);
void Initialize(MapGenerationArgs args);
MapGenerationArgs Compile(ITerrainInfo terrainInfo, Size size); MapGenerationArgs Compile(ITerrainInfo terrainInfo, Size size);
} }