From 9107ca3bc146aed02e8b9c05fe9be0138308ba38 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Feb 2018 02:11:44 +0100 Subject: [PATCH] Remove unused legacy IsWater flag This was planned anyway, we had just forgotten about it when the last blocker was removed. --- OpenRA.Game/Map/TileSet.cs | 1 - .../UtilityCommands/LegacyTilesetImporter.cs | 3 --- OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs | 11 +++++++++++ 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/tilesets/arrakis.yaml | 1 - mods/ra/tilesets/desert.yaml | 1 - mods/ra/tilesets/snow.yaml | 1 - mods/ra/tilesets/temperat.yaml | 1 - mods/ts/tilesets/snow.yaml | 1 - mods/ts/tilesets/temperate.yaml | 1 - 14 files changed, 11 insertions(+), 15 deletions(-) diff --git a/OpenRA.Game/Map/TileSet.cs b/OpenRA.Game/Map/TileSet.cs index 779bb19eee..3629f5bc98 100644 --- a/OpenRA.Game/Map/TileSet.cs +++ b/OpenRA.Game/Map/TileSet.cs @@ -62,7 +62,6 @@ namespace OpenRA public readonly string Type; public readonly HashSet TargetTypes = new HashSet(); public readonly HashSet AcceptsSmudgeType = new HashSet(); - public readonly bool IsWater = false; // TODO: Remove this public readonly Color Color; public readonly bool RestrictPlayerColor = false; public readonly string CustomCursor; diff --git a/OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs b/OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs index 2cc83a5126..8cb862cbfd 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs @@ -174,10 +174,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands metadata.AppendLine("\t\tType: {0}".F(terrainType)); if (terrainType == "Water") - { metadata.AppendLine("\t\tTargetTypes: Water"); - metadata.AppendLine("\t\tIsWater: True"); - } else metadata.AppendLine("\t\tTargetTypes: Ground"); diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index ea1bda3817..3d40f70088 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -1842,6 +1842,17 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + // Removed IsWater. + if (engineVersion < 20180222) + { + if (node.Key == "TerrainType" || node.Key.StartsWith("TerrainType@", StringComparison.Ordinal)) + { + var isWater = node.Value.Nodes.FirstOrDefault(n => n.Key == "IsWater"); + if (isWater != null) + node.Value.Nodes.Remove(isWater); + } + } + UpgradeTileset(modData, engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index ca02de33a8..ee94d85789 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -58,7 +58,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5DA5CE RestrictPlayerColor: true diff --git a/mods/cnc/tilesets/jungle.yaml b/mods/cnc/tilesets/jungle.yaml index aa38b8baa5..2235b24c92 100644 --- a/mods/cnc/tilesets/jungle.yaml +++ b/mods/cnc/tilesets/jungle.yaml @@ -58,7 +58,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5C74A4 RestrictPlayerColor: true diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index 7e3bef5c59..138e8ddf11 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -58,7 +58,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5C74A4 RestrictPlayerColor: true diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml index 5c2715133b..ce3167efcd 100644 --- a/mods/cnc/tilesets/temperat.yaml +++ b/mods/cnc/tilesets/temperat.yaml @@ -58,7 +58,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5C74A4 RestrictPlayerColor: true diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml index 10038ea104..23031abdf7 100644 --- a/mods/cnc/tilesets/winter.yaml +++ b/mods/cnc/tilesets/winter.yaml @@ -58,7 +58,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5C74A4 RestrictPlayerColor: true diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 24a57d54db..7aacd1c919 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -28,7 +28,6 @@ Terrain: TerrainType@Ice: Type: Ice TargetTypes: Ground - IsWater: True Color: FFFFFF TerrainType@Rock: Type: Rock diff --git a/mods/ra/tilesets/desert.yaml b/mods/ra/tilesets/desert.yaml index 875e8a4106..205d22bfd7 100644 --- a/mods/ra/tilesets/desert.yaml +++ b/mods/ra/tilesets/desert.yaml @@ -67,7 +67,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5DA5CE RestrictPlayerColor: true diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml index d5a25cb15b..250c37c558 100644 --- a/mods/ra/tilesets/snow.yaml +++ b/mods/ra/tilesets/snow.yaml @@ -63,7 +63,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5C74A4 RestrictPlayerColor: true diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index 4b98c1256c..e45f5f2ef0 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -64,7 +64,6 @@ Terrain: TerrainType@Water: Type: Water TargetTypes: Water - IsWater: True Color: 5C74A4 RestrictPlayerColor: true diff --git a/mods/ts/tilesets/snow.yaml b/mods/ts/tilesets/snow.yaml index 1ffe1911cd..6f2b9916e4 100644 --- a/mods/ts/tilesets/snow.yaml +++ b/mods/ts/tilesets/snow.yaml @@ -34,7 +34,6 @@ Terrain: Type: Water Color: 3D4148 TargetTypes: Water - IsWater: True RestrictPlayerColor: true TerrainType@DirtRoad: Type: DirtRoad diff --git a/mods/ts/tilesets/temperate.yaml b/mods/ts/tilesets/temperate.yaml index bd392557a1..e474329c6c 100644 --- a/mods/ts/tilesets/temperate.yaml +++ b/mods/ts/tilesets/temperate.yaml @@ -34,7 +34,6 @@ Terrain: Type: Water Color: 745537 TargetTypes: Water - IsWater: True RestrictPlayerColor: true TerrainType@DirtRoad: Type: DirtRoad