Add support for building Palette= override introduced in RA2 #1

Rampastring · Jun 17, 2023 · c4167b9 · c4167b9
1 parent 326d0f5
commit c4167b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/TSMapEditor/Models/ArtConfig/BuildingArtConfig.cs b/src/TSMapEditor/Models/ArtConfig/BuildingArtConfig.cs
@@ -18,6 +18,11 @@ public class BuildingArtConfig : IArtConfig
         public string Image { get; set; }
         public string BibShape { get; set; }
 
+        /// <summary>
+        /// Palette override introduced in Red Alert 2.
+        /// </summary>
+        public string Palette { get; set; }
+
         public void ReadFromIniSection(IniSection iniSection)
         {
             if (iniSection == null)
@@ -43,6 +48,7 @@ public void ReadFromIniSection(IniSection iniSection)
             Theater = iniSection.GetBooleanValue(nameof(Theater), Theater);
             Image = iniSection.GetStringValue(nameof(Image), Image);
             BibShape = iniSection.GetStringValue(nameof(BibShape), BibShape);
+            Palette = iniSection.GetStringValue(nameof(Palette), Palette);
         }
 
         public void DoForFoundationCoords(Action<Point2D> action)

diff --git a/src/TSMapEditor/Rendering/TheaterGraphics.cs b/src/TSMapEditor/Rendering/TheaterGraphics.cs
@@ -632,10 +632,14 @@ public void ReadBuildingTextures(List<BuildingType> buildingTypes)
                     }
                 }
 
+                // Palette override in RA2/YR
+                Palette palette = buildingType.ArtConfig.TerrainPalette ? theaterPalette : unitPalette;
+                if (!string.IsNullOrWhiteSpace(buildingType.ArtConfig.Palette))
+                    palette = GetPaletteOrFail(buildingType.ArtConfig.Palette + Theater.FileExtension + ".pal");
+
                 var shpFile = new ShpFile();
                 shpFile.ParseFromBuffer(shpData);
-                BuildingTextures[i] = new ObjectImage(graphicsDevice, shpFile, shpData,
-                    buildingType.ArtConfig.TerrainPalette ? theaterPalette : unitPalette, null, buildingType.ArtConfig.Remapable);
+                BuildingTextures[i] = new ObjectImage(graphicsDevice, shpFile, shpData, palette, null, buildingType.ArtConfig.Remapable);
 
                 // If this building has a bib, attempt to load it
                 if (!string.IsNullOrWhiteSpace(buildingType.ArtConfig.BibShape))
@@ -665,8 +669,7 @@ public void ReadBuildingTextures(List<BuildingType> buildingTypes)
 
                     var bibShpFile = new ShpFile();
                     bibShpFile.ParseFromBuffer(shpData);
-                    BuildingBibTextures[i] = new ObjectImage(graphicsDevice, bibShpFile, shpData,
-                        buildingType.ArtConfig.TerrainPalette ? theaterPalette : unitPalette, null, buildingType.ArtConfig.Remapable);
+                    BuildingBibTextures[i] = new ObjectImage(graphicsDevice, bibShpFile, shpData, palette, null, buildingType.ArtConfig.Remapable);
                 }
             }
         }