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

Combine IMapGenerator interfaces.

Browse Source 
This removes the need to instantiate a dummy
trait instance and is more idiomatic.
This commit is contained in:
Paul Chote
2025-03-02 08:39:56 +00:00
committed by Gustas Kažukauskas
parent 7ee79a0e64
commit 23b7b56c28
6 changed files with 29 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Traits/World/ClearMapGenerator.cs
View File

@@ -19,9 +19,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
[TraitLocation(SystemActors.EditorWorld)]
[Desc("A map generator that clears a map.")]
public sealed class ClearMapGeneratorInfo : TraitInfo, IMapGeneratorInfo
public sealed class ClearMapGeneratorInfo : TraitInfo<ClearMapGenerator>, IMapGeneratorInfo
{
[FieldLoader.Require]
[Desc("Human-readable name this generator uses.")]
@@ -44,8 +44,6 @@ namespace OpenRA.Mods.Common.Traits
string IMapGeneratorInfo.Name => Name;
public override object Create(ActorInitializer init) { return new ClearMapGenerator(this); }
static MiniYaml SettingsLoader(MiniYaml my)
{
return my.NodeWithKey("Settings").Value;
@@ -55,22 +53,10 @@ namespace OpenRA.Mods.Common.Traits
{
return MapGeneratorSettings.DumpFluent(my.NodeWithKey("Settings").Value);
}
}
public sealed class ClearMapGenerator : IMapGenerator
{
readonly ClearMapGeneratorInfo info;
IMapGeneratorInfo IMapGenerator.Info => info;
public ClearMapGenerator(ClearMapGeneratorInfo info)
{
this.info = info;
}
public MapGeneratorSettings GetSettings(Map map)
{
return MapGeneratorSettings.LoadSettings(info.Settings, map);
return MapGeneratorSettings.LoadSettings(Settings, map);
}
public void Generate(Map map, MiniYaml settings)
@@ -112,4 +98,6 @@ namespace OpenRA.Mods.Common.Traits
map.ActorDefinitions = ImmutableArray<MiniYamlNode>.Empty;
}
}
public class ClearMapGenerator { /* we're only interested in the Info */ }
}