From b2458fc614a5a583a21f33ab3db5e07c904aae10 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 26 Mar 2015 22:45:32 +0000 Subject: [PATCH] Remove GlobalFilesystem.OpenWithExts. Closes #5272. --- OpenRA.Editor/RenderUtils.cs | 36 ++++++---------- OpenRA.Editor/TileSetRenderer.cs | 2 +- OpenRA.Game/FileSystem/GlobalFileSystem.cs | 43 ++++++++----------- OpenRA.Game/Graphics/CursorProvider.cs | 2 +- OpenRA.Game/Graphics/SequenceProvider.cs | 2 +- OpenRA.Game/Graphics/SpriteLoader.cs | 20 ++++----- OpenRA.Game/Graphics/Theater.cs | 2 +- OpenRA.Game/Graphics/VoxelLoader.cs | 4 +- OpenRA.Game/Map/TileSet.cs | 4 +- .../UtilityCommands/CheckSequenceSprites.cs | 2 +- .../ConvertSpriteToPngCommand.cs | 2 +- .../UtilityCommands/FixClassicTilesets.cs | 8 ++-- OpenRA.TilesetBuilder/FormBuilder.cs | 6 +-- mods/cnc/tilesets/desert.yaml | 1 - mods/cnc/tilesets/jungle.yaml | 1 - mods/cnc/tilesets/snow.yaml | 1 - mods/cnc/tilesets/temperat.yaml | 1 - mods/cnc/tilesets/winter.yaml | 1 - mods/d2k/rules/world.yaml | 2 +- mods/d2k/tilesets/arrakis.yaml | 1 - mods/ra/tilesets/desert.yaml | 1 - mods/ra/tilesets/interior.yaml | 1 - mods/ra/tilesets/snow.yaml | 1 - mods/ra/tilesets/temperat.yaml | 1 - mods/ts/tilesets/snow.yaml | 1 - mods/ts/tilesets/temperat.yaml | 1 - 26 files changed, 56 insertions(+), 91 deletions(-) diff --git a/OpenRA.Editor/RenderUtils.cs b/OpenRA.Editor/RenderUtils.cs index 7dbf094d80..1416575bf7 100644 --- a/OpenRA.Editor/RenderUtils.cs +++ b/OpenRA.Editor/RenderUtils.cs @@ -47,37 +47,30 @@ namespace OpenRA.Editor return bitmap; } - static string[] SpriteExtensions(TileSet tileSet) + static readonly string[] LegacyExtensions = new[] { ".shp", ".tem", "" }; + + static string ResolveFilename(string name, TileSet tileSet) { var ssl = Game.ModData.SpriteSequenceLoader as TilesetSpecificSpriteSequenceLoader; - if (ssl == null) - return tileSet.Extensions; + var extensions = ssl != null ? new[] { ssl.TilesetExtensions[tileSet.Id], ssl.DefaultSpriteExtension }.Append(LegacyExtensions) : + LegacyExtensions.AsEnumerable(); - return tileSet.Extensions.Append(ssl.TilesetExtensions[tileSet.Id], ssl.DefaultSpriteExtension).ToArray(); + foreach (var e in extensions) + if (GlobalFileSystem.Exists(name + e)) + return name + e; + + return name; } public static ActorTemplate RenderActor(ActorInfo info, SequenceProvider sequenceProvider, TileSet tileset, IPalette p, string race) { var image = info.Traits.Get().EditorImage(info, sequenceProvider, race); - var exts = SpriteExtensions(tileset); - using (var s = GlobalFileSystem.OpenWithExts(image, exts)) + image = ResolveFilename(image, tileset); + using (var s = GlobalFileSystem.Open(image)) { var shp = new ShpTDSprite(s); var bitmap = RenderShp(shp, p); - try - { - using (var s2 = GlobalFileSystem.OpenWithExts(image + "2", exts)) - { - var shp2 = new ShpTDSprite(s2); - var roofBitmap = RenderShp(shp2, p); - - using (var g = System.Drawing.Graphics.FromImage(bitmap)) - g.DrawImage(roofBitmap, 0, 0); - } - } - catch { } - return new ActorTemplate { Bitmap = bitmap, @@ -89,9 +82,8 @@ namespace OpenRA.Editor public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, TileSet tileset, IPalette p) { - var image = info.EditorSprite; - var exts = SpriteExtensions(tileset); - using (var s = GlobalFileSystem.OpenWithExts(image, exts)) + var image = ResolveFilename(info.EditorSprite, tileset); + using (var s = GlobalFileSystem.Open(image)) { // TODO: Do this properly var shp = new ShpTDSprite(s); diff --git a/OpenRA.Editor/TileSetRenderer.cs b/OpenRA.Editor/TileSetRenderer.cs index f3d3e5b0a5..abb118977e 100644 --- a/OpenRA.Editor/TileSetRenderer.cs +++ b/OpenRA.Editor/TileSetRenderer.cs @@ -50,7 +50,7 @@ namespace OpenRA.Editor this.TileSize = Math.Min(tileSize.Width, tileSize.Height); templates = new Dictionary(); - var frameCache = new FrameCache(Game.ModData.SpriteLoaders, tileset.Extensions); + var frameCache = new FrameCache(Game.ModData.SpriteLoaders); foreach (var t in tileset.Templates) { var allFrames = frameCache[t.Value.Image]; diff --git a/OpenRA.Game/FileSystem/GlobalFileSystem.cs b/OpenRA.Game/FileSystem/GlobalFileSystem.cs index 3460bbac35..a7c9337832 100644 --- a/OpenRA.Game/FileSystem/GlobalFileSystem.cs +++ b/OpenRA.Game/FileSystem/GlobalFileSystem.cs @@ -164,45 +164,38 @@ namespace OpenRA.FileSystem return null; } - public static Stream Open(string filename) { return OpenWithExts(filename, ""); } - - public static Stream OpenWithExts(string filename, params string[] exts) + public static Stream Open(string filename) { Stream s; - if (!TryOpenWithExts(filename, exts, out s)) + if (!TryOpen(filename, out s)) throw new FileNotFoundException("File not found: {0}".F(filename), filename); return s; } - public static bool TryOpenWithExts(string filename, string[] exts, out Stream s) + public static bool TryOpen(string filename, out Stream s) { + // Check the cache for a quick lookup if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1) { - foreach (var ext in exts) - { - s = GetFromCache(PackageHashType.Classic, filename + ext); - if (s != null) - return true; + s = GetFromCache(PackageHashType.Classic, filename); + if (s != null) + return true; - s = GetFromCache(PackageHashType.CRC32, filename + ext); - if (s != null) - return true; - } + s = GetFromCache(PackageHashType.CRC32, filename); + if (s != null) + return true; } - foreach (var ext in exts) - { - var possibleName = filename + ext; - var folder = MountedFolders - .Where(x => x.Exists(possibleName)) - .MaxByOrDefault(x => x.Priority); + // Ask each package individually + var folder = MountedFolders + .Where(x => x.Exists(filename)) + .MaxByOrDefault(x => x.Priority); - if (folder != null) - { - s = folder.GetContent(possibleName); - return true; - } + if (folder != null) + { + s = folder.GetContent(filename); + return true; } s = null; diff --git a/OpenRA.Game/Graphics/CursorProvider.cs b/OpenRA.Game/Graphics/CursorProvider.cs index 40aa72f602..d8665d01a2 100644 --- a/OpenRA.Game/Graphics/CursorProvider.cs +++ b/OpenRA.Game/Graphics/CursorProvider.cs @@ -42,7 +42,7 @@ namespace OpenRA.Graphics Palettes = palettes.AsReadOnly(); - var frameCache = new FrameCache(modData.SpriteLoaders, new string[0]); + var frameCache = new FrameCache(modData.SpriteLoaders); var cursors = new Dictionary(); foreach (var s in nodesDict["Cursors"].Nodes) foreach (var sequence in s.Value.Nodes) diff --git a/OpenRA.Game/Graphics/SequenceProvider.cs b/OpenRA.Game/Graphics/SequenceProvider.cs index 2b1241ebf6..1c021c7447 100644 --- a/OpenRA.Game/Graphics/SequenceProvider.cs +++ b/OpenRA.Game/Graphics/SequenceProvider.cs @@ -114,7 +114,7 @@ namespace OpenRA.Graphics this.tileSet = tileSet; // Every time we load a tile set, we create a sequence cache for it - spriteCache = Exts.Lazy(() => new SpriteCache(modData.SpriteLoaders, tileSet.Extensions, new SheetBuilder(SheetType.Indexed))); + spriteCache = Exts.Lazy(() => new SpriteCache(modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed))); } public Sequences LoadSequences(Map map) diff --git a/OpenRA.Game/Graphics/SpriteLoader.cs b/OpenRA.Game/Graphics/SpriteLoader.cs index 8a58066d2a..220844ef8f 100644 --- a/OpenRA.Game/Graphics/SpriteLoader.cs +++ b/OpenRA.Game/Graphics/SpriteLoader.cs @@ -35,13 +35,11 @@ namespace OpenRA.Graphics public readonly SheetBuilder SheetBuilder; readonly Cache sprites; - public SpriteCache(ISpriteLoader[] loaders, string[] exts, SheetBuilder sheetBuilder) + public SpriteCache(ISpriteLoader[] loaders, SheetBuilder sheetBuilder) { SheetBuilder = sheetBuilder; - // Include extension-less version - exts = exts.Append("").ToArray(); - sprites = new Cache(filename => SpriteLoader.GetSprites(filename, exts, loaders, sheetBuilder)); + sprites = new Cache(filename => SpriteLoader.GetSprites(filename, loaders, sheetBuilder)); } public Sprite[] this[string filename] { get { return sprites[filename]; } } @@ -51,11 +49,9 @@ namespace OpenRA.Graphics { readonly Cache frames; - public FrameCache(ISpriteLoader[] loaders, string[] exts) + public FrameCache(ISpriteLoader[] loaders) { - // Include extension-less version - exts = exts.Append("").ToArray(); - frames = new Cache(filename => SpriteLoader.GetFrames(filename, exts, loaders)); + frames = new Cache(filename => SpriteLoader.GetFrames(filename, loaders)); } public ISpriteFrame[] this[string filename] { get { return frames[filename]; } } @@ -63,14 +59,14 @@ namespace OpenRA.Graphics public static class SpriteLoader { - public static Sprite[] GetSprites(string filename, string[] exts, ISpriteLoader[] loaders, SheetBuilder sheetBuilder) + public static Sprite[] GetSprites(string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder) { - return GetFrames(filename, exts, loaders).Select(a => sheetBuilder.Add(a)).ToArray(); + return GetFrames(filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray(); } - public static ISpriteFrame[] GetFrames(string filename, string[] exts, ISpriteLoader[] loaders) + public static ISpriteFrame[] GetFrames(string filename, ISpriteLoader[] loaders) { - using (var stream = GlobalFileSystem.OpenWithExts(filename, exts)) + using (var stream = GlobalFileSystem.Open(filename)) { ISpriteFrame[] frames; foreach (var loader in loaders) diff --git a/OpenRA.Game/Graphics/Theater.cs b/OpenRA.Game/Graphics/Theater.cs index bd5f3c4694..940657bcf6 100644 --- a/OpenRA.Game/Graphics/Theater.cs +++ b/OpenRA.Game/Graphics/Theater.cs @@ -39,7 +39,7 @@ namespace OpenRA.Graphics sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate); templates = new Dictionary(); - var frameCache = new FrameCache(Game.ModData.SpriteLoaders, tileset.Extensions); + var frameCache = new FrameCache(Game.ModData.SpriteLoaders); foreach (var t in tileset.Templates) { var allFrames = frameCache[t.Value.Image]; diff --git a/OpenRA.Game/Graphics/VoxelLoader.cs b/OpenRA.Game/Graphics/VoxelLoader.cs index f9c6b172f4..f2677ddec1 100644 --- a/OpenRA.Game/Graphics/VoxelLoader.cs +++ b/OpenRA.Game/Graphics/VoxelLoader.cs @@ -217,9 +217,9 @@ namespace OpenRA.Graphics { VxlReader vxl; HvaReader hva; - using (var s = GlobalFileSystem.OpenWithExts(files.First, ".vxl")) + using (var s = GlobalFileSystem.Open(files.First + ".vxl")) vxl = new VxlReader(s); - using (var s = GlobalFileSystem.OpenWithExts(files.Second, ".hva")) + using (var s = GlobalFileSystem.Open(files.Second + ".hva")) hva = new HvaReader(s); return new Voxel(this, vxl, hva); } diff --git a/OpenRA.Game/Map/TileSet.cs b/OpenRA.Game/Map/TileSet.cs index fc3733597c..4904f68996 100644 --- a/OpenRA.Game/Map/TileSet.cs +++ b/OpenRA.Game/Map/TileSet.cs @@ -171,7 +171,6 @@ namespace OpenRA public readonly int SheetSize = 512; public readonly string Palette; public readonly string PlayerPalette; - public readonly string[] Extensions; public readonly int WaterPaletteRotationBase = 0x60; public readonly byte MaxGroundHeight = 0; public readonly Color[] HeightDebugColors = new[] { Color.Red }; @@ -222,12 +221,11 @@ namespace OpenRA .Select(y => new TerrainTemplateInfo(this, y)).ToDictionary(t => t.Id); } - public TileSet(string name, string id, string palette, string[] extensions, TerrainTypeInfo[] terrainInfo) + public TileSet(string name, string id, string palette, TerrainTypeInfo[] terrainInfo) { Name = name; Id = id; Palette = palette; - Extensions = extensions; TerrainInfo = terrainInfo; if (TerrainInfo.Length >= byte.MaxValue) diff --git a/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs b/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs index 5a8fc92407..75140a4378 100644 --- a/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs +++ b/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs @@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { var ts = new TileSet(Game.ModData, t); Console.WriteLine("Tileset: " + ts.Name); - var sc = new SpriteCache(modData.SpriteLoaders, ts.Extensions, new SheetBuilder(SheetType.Indexed)); + var sc = new SpriteCache(modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed)); var sequenceFiles = modData.Manifest.Sequences; var nodes = sequenceFiles diff --git a/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs index 5c164d4833..dacc502ca1 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs @@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.UtilityCommands var palette = new ImmutablePalette(args[2], shadowIndex); - var frames = SpriteLoader.GetFrames(src, new[] { "" }, modData.SpriteLoaders); + var frames = SpriteLoader.GetFrames(src, modData.SpriteLoaders); var usePadding = !args.Contains("--nopadding"); var count = 0; diff --git a/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs b/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs index 6b0f95ce8b..1e5f9e7fd3 100644 --- a/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs +++ b/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { public string Name { get { return "--fix-classic-tilesets"; } } - [Desc("Fixes missing template tile definitions and adds filename extensions.")] + [Desc("EXTENSIONS", "Fixes missing template tile definitions and adds filename extensions.")] public void Run(ModData modData, string[] args) { // HACK: The engine code assumes that Game.modData is set. @@ -40,12 +40,12 @@ namespace OpenRA.Mods.Common.UtilityCommands var terrainRightColorField = typeof(TerrainTileInfo).GetField("RightColor"); var empty = new Size(0, 0); var single = new int2(1, 1); + var exts = new[] { "" }.Concat(args[1].Split(',')); foreach (var t in Game.ModData.Manifest.TileSets) { var ts = new TileSet(Game.ModData, t); - var exts = new[] { "" }.Concat(ts.Extensions); - var frameCache = new FrameCache(Game.ModData.SpriteLoaders, ts.Extensions); + var frameCache = new FrameCache(Game.ModData.SpriteLoaders); Console.WriteLine("Tileset: " + ts.Name); foreach (var template in ts.Templates.Values) @@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.UtilityCommands foreach (var ext in exts) { Stream s; - if (!GlobalFileSystem.TryOpenWithExts(template.Image, new[] { ext }, out s)) + if (!GlobalFileSystem.TryOpen(template.Image + ext, out s)) continue; // Rewrite the template image (normally readonly) using reflection diff --git a/OpenRA.TilesetBuilder/FormBuilder.cs b/OpenRA.TilesetBuilder/FormBuilder.cs index 3cfbfe4d58..f3dc850913 100644 --- a/OpenRA.TilesetBuilder/FormBuilder.cs +++ b/OpenRA.TilesetBuilder/FormBuilder.cs @@ -348,7 +348,7 @@ namespace OpenRA.TilesetBuilder if (tilesetName.Length < 1) tilesetName = "Temperat"; if (tilesetID.Length < 1) tilesetID = "TEMPERAT"; if (tilesetPalette.Length < 1) tilesetPalette = "temperat"; - if (tilesetExt.Length < 1) tilesetExt = ".tem,.shp"; + if (tilesetExt.Length < 1) tilesetExt = ".tem"; // Create a Tileset definition // TODO: Pull this info from the GUI @@ -359,12 +359,10 @@ namespace OpenRA.TilesetBuilder else tilesetFile = tilesetName.ToLower().Substring(0, 8) + ".yaml"; - var ext = tilesetExt.Split(','); var tileset = new TileSet( name: tilesetName, id: tilesetID.ToUpper(), palette: tilesetPalette.ToLower(), - extensions: new string[] { ext[0], ext[1] }, terrainInfo: TerrainType); // List of files to add to the mix file @@ -376,7 +374,7 @@ namespace OpenRA.TilesetBuilder // Export tile artwork foreach (var t in surface1.Templates) - fileList.Add(ExportTemplate(t, surface1.Templates.IndexOf(t), tileset.Extensions.First(), dir)); + fileList.Add(ExportTemplate(t, surface1.Templates.IndexOf(t), tilesetExt, dir)); // Add the templates ushort cur = 0; diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index 12f1606f6f..0ac21ea93d 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -2,7 +2,6 @@ General: Name: Desert Id: DESERT Palette: desert.pal - Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge diff --git a/mods/cnc/tilesets/jungle.yaml b/mods/cnc/tilesets/jungle.yaml index f94734019c..ca6d7a66f3 100644 --- a/mods/cnc/tilesets/jungle.yaml +++ b/mods/cnc/tilesets/jungle.yaml @@ -2,7 +2,6 @@ General: Name: Jungle Id: JUNGLE Palette: jungle.pal - Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index 2da8cfa493..7af6b27516 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -2,7 +2,6 @@ General: Name: Snow Id: SNOW Palette: snow.pal - Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml index e4280df4fa..c18e8dfd91 100644 --- a/mods/cnc/tilesets/temperat.yaml +++ b/mods/cnc/tilesets/temperat.yaml @@ -2,7 +2,6 @@ General: Name: Temperate Id: TEMPERAT Palette: temperat.pal - Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml index cfada6549c..0f6292b20c 100644 --- a/mods/cnc/tilesets/winter.yaml +++ b/mods/cnc/tilesets/winter.yaml @@ -2,7 +2,6 @@ General: Name: Winter Id: WINTER Palette: winter.pal - Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index 7640fc9ffc..66f26d8c9d 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -121,7 +121,7 @@ World: ResourceType: 1 Palette: d2k TerrainType: Spice - EditorSprite: spice0 + EditorSprite: spice0.shp Variants: spice MaxDensity: 20 ValuePerUnit: 25 diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 2d032e701f..0034d13a7f 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -3,7 +3,6 @@ General: Id: ARRAKIS SheetSize: 1024 Palette: d2k.pal - Extensions: # Obsolete EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified IgnoreTileSpriteOffsets: True diff --git a/mods/ra/tilesets/desert.yaml b/mods/ra/tilesets/desert.yaml index 6280c67094..dd32fd3ea2 100644 --- a/mods/ra/tilesets/desert.yaml +++ b/mods/ra/tilesets/desert.yaml @@ -3,7 +3,6 @@ General: Id: DESERT Palette: desert.pal PlayerPalette: temperat.pal - Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge diff --git a/mods/ra/tilesets/interior.yaml b/mods/ra/tilesets/interior.yaml index d46063d90c..d01cd83d58 100644 --- a/mods/ra/tilesets/interior.yaml +++ b/mods/ra/tilesets/interior.yaml @@ -2,7 +2,6 @@ General: Name: Interior Id: INTERIOR Palette: interior.pal - Extensions: # Obsolete EditorTemplateOrder: Floor, Wall Terrain: diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml index 93bfd29005..a4805c9b7c 100644 --- a/mods/ra/tilesets/snow.yaml +++ b/mods/ra/tilesets/snow.yaml @@ -2,7 +2,6 @@ General: Name: Snow Id: SNOW Palette: snow.pal - Extensions: # Obsolete EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge Terrain: diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index 7a03f50db8..710156b591 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -2,7 +2,6 @@ General: Name: Temperate Id: TEMPERAT Palette: temperat.pal - Extensions: # Obsolete EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge Terrain: diff --git a/mods/ts/tilesets/snow.yaml b/mods/ts/tilesets/snow.yaml index 11215a44ae..fbf6082c41 100644 --- a/mods/ts/tilesets/snow.yaml +++ b/mods/ts/tilesets/snow.yaml @@ -1,7 +1,6 @@ General: Name: Snow Id: SNOW - Extensions: .sno, .shp Palette: isosno.pal MaxGroundHeight: 16 HeightDebugColors: 128,0,0,0, 128,0,0,68, 128,0,0,136, 128,0,0,204, 128,0,0,255, 128,68,0,204, 128,136,0,136, 128,204,0,68, 128,255,17,0, 128,255,85,0, 128,255,153,0, 128,255,221,0, 128,221,255,0, 128,153,255,0, 128,85,255,0, 128,17,255,0 diff --git a/mods/ts/tilesets/temperat.yaml b/mods/ts/tilesets/temperat.yaml index 99d465feed..e0e9a38b3b 100644 --- a/mods/ts/tilesets/temperat.yaml +++ b/mods/ts/tilesets/temperat.yaml @@ -1,7 +1,6 @@ General: Name: Temperate Id: TEMPERAT - Extensions: # Obsolete Palette: isotem.pal MaxGroundHeight: 16 HeightDebugColors: 128,0,0,0, 128,0,0,68, 128,0,0,136, 128,0,0,204, 128,0,0,255, 128,68,0,204, 128,136,0,136, 128,204,0,68, 128,255,17,0, 128,255,85,0, 128,255,153,0, 128,255,221,0, 128,221,255,0, 128,153,255,0, 128,85,255,0, 128,17,255,0