Handle RA2/YR WoodBridgeSet if present

Author: Rampastring

src/TSMapEditor/CCEngine/Theater.cs

@@ -79,6 +79,7 @@ public Theater(string name)
         public TileSet RampTileSet { get; set; }
         public TileSet BridgeTileSet { get; set; }
         public TileSet TrainBridgeTileSet { get; set; }
+        public TileSet WoodBridgeTileSet { get; set; }
 
         private const string REQUIRED_SECTION = "General";
 
@@ -131,21 +132,25 @@ public void ReadConfigINI(string baseDirectoryPath, CCFileManager ccFileManager)
             InitLATGround(theaterIni, "CrystalTile", "ClearToCrystalLat", null, null, null, "Crystal");
             InitLATGround(theaterIni, "BlueMoldTile", "ClearToBlueMoldLat", null, null, null, "Blue Mold");
 
-            int rampTileSetIndex = theaterIni.GetIntValue("General", "RampBase", -1);
-            if (rampTileSetIndex < 0 || rampTileSetIndex >= TileSets.Count)
-                throw new INIConfigException("Invalid value specified for RampBase= in the theater configuration file!");
+            RampTileSet = GetTileSetFromKey(theaterIni, "RampBase", false);
+            BridgeTileSet = GetTileSetFromKey(theaterIni, "BridgeSet", false);
+            TrainBridgeTileSet = GetTileSetFromKey(theaterIni, "TrainBridgeSet", false);
+            WoodBridgeTileSet = GetTileSetFromKey(theaterIni, "WoodBridgeSet", true); // Wood bridges are optional as they do not exist in TS
+        }
 
-            int bridgeTileSetIndex = theaterIni.GetIntValue("General", "BridgeSet", -1);
-            if (bridgeTileSetIndex < 0 || bridgeTileSetIndex >= TileSets.Count)
-                throw new INIConfigException("Invalid value specified for BridgeSet= in the theater configuration file!");
+        private TileSet GetTileSetFromKey(IniFile theaterIni, string key, bool optional)
+        {
+            int index = theaterIni.GetIntValue("General", key, -1);
 
-            int trainBridgeTileSetIndex = theaterIni.GetIntValue("General", "TrainBridgeSet", -1);
-            if (trainBridgeTileSetIndex < 0 || trainBridgeTileSetIndex >= TileSets.Count)
-                throw new INIConfigException("Invalid value specified for TrainBridgeSet= in the theater configuration file!");
+            if (index < 0 || index >= TileSets.Count)
+            {
+                if (optional)
+                    return null;
+
+                throw new INIConfigException($"Invalid value specified for {key}= in the theater configuration file!");
+            }
 
-            RampTileSet = TileSets[rampTileSetIndex];
-            BridgeTileSet = TileSets[bridgeTileSetIndex];
-            TrainBridgeTileSet = TileSets[trainBridgeTileSetIndex];
+            return TileSets[index];
         }
 
         public TileSet TryGetTileSetById(int id)

src/TSMapEditor/Rendering/MapView.cs

@@ -655,13 +655,21 @@ public void DrawTerrainTile(MapTile tile)
 
             if (tile.TileImage == null)
             {
+                var theater = TheaterGraphics.Theater;
+
                 // Hardcode variant 0 for bridges and train bridges so they don't appear damaged
                 // Ideally we'd need to check HasDamagedData in the subcell's TmpImage, but that
-                // would be very messy... gg, Westwood.
-                if (TheaterGraphics.Theater.BridgeTileSet.ContainsTile(tile.TileIndex) || TheaterGraphics.Theater.TrainBridgeTileSet.ContainsTile(tile.TileIndex))
+                // would be very messy..
+                if (theater.BridgeTileSet.ContainsTile(tile.TileIndex) ||
+                    theater.TrainBridgeTileSet.ContainsTile(tile.TileIndex) ||
+                    (theater.WoodBridgeTileSet != null && theater.WoodBridgeTileSet.ContainsTile(tile.TileIndex)))
+                {
                     tile.TileImage = TheaterGraphics.GetTileGraphics(tile.TileIndex, 0);
+                }
                 else
+                {
                     tile.TileImage = TheaterGraphics.GetTileGraphics(tile.TileIndex);
+                }
             }
 
             TileImage tileImage;