Remove Ruleset.TileSet.

This commit is contained in:
Paul Chote
2020-10-11 14:30:49 +01:00
committed by reaperrr
parent 6d6efd5fe8
commit 995c33a942
7 changed files with 26 additions and 24 deletions

View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
try
{
Console.WriteLine("Tileset: " + kv.Key);
var terrainInfo = modData.DefaultTileSets[kv.Key];
var terrainInfo = modData.DefaultTerrainInfo[kv.Key];
if (terrainInfo is ITemplatedTerrainInfo templatedTerrainInfo)
foreach (var r in modData.DefaultRules.Actors["world"].TraitInfos<ITiledTerrainRendererInfo>())

View File

@@ -65,10 +65,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
// The original game isn't case sensitive, but we are.
var tileset = GetTileset(mapSection).ToUpperInvariant();
if (!ModData.DefaultTileSets.ContainsKey(tileset))
if (!ModData.DefaultTerrainInfo.TryGetValue(tileset, out var terrainInfo))
throw new InvalidDataException("Unknown tileset {0}".F(tileset));
Map = new Map(ModData, ModData.DefaultTileSets[tileset], MapSize, MapSize)
Map = new Map(ModData, terrainInfo, MapSize, MapSize)
{
Title = basic.GetValue("Name", Path.GetFileNameWithoutExtension(filename)),
Author = "Westwood Studios",