Merge remote-tracking branch 'upstream/master'

Author: JoyfulShush

src/TSMapEditor/CCEngine/Theater.cs

@@ -77,6 +77,9 @@ public Theater(string name)
         public List<TileSet> TileSets = new List<TileSet>();
         public List<LATGround> LATGrounds = new List<LATGround>();
         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";
 
@@ -129,13 +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)
+            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
+        }
+
+        private TileSet GetTileSetFromKey(IniFile theaterIni, string key, bool optional)
+        {
+            int index = theaterIni.GetIntValue("General", key, -1);
+
+            if (index < 0 || index >= TileSets.Count)
             {
-                throw new INIConfigException("Invalid value specified for RampBase= in the theater configuration file!");
+                if (optional)
+                    return null;
+
+                throw new INIConfigException($"Invalid value specified for {key}= in the theater configuration file!");
             }
 
-            RampTileSet = TileSets[rampTileSetIndex];
+            return TileSets[index];
         }
 
         public TileSet TryGetTileSetById(int id)

src/TSMapEditor/CCEngine/TmpFile.cs

@@ -201,9 +201,9 @@ private RGBColor ReadRGBColorFromStream(Stream stream)
         public RGBColor RadarRightColor { get; set; }
 
         public byte[] ColorData = new byte[Constants.TileColorBufferSize];
-        public byte[] ZData = new byte[0];
-        public byte[] ExtraGraphicsColorData = new byte[0];
-        public byte[] ExtraGraphicsZData = new byte[0];
+        public byte[] ZData = Array.Empty<byte>();
+        public byte[] ExtraGraphicsColorData = Array.Empty<byte>();
+        public byte[] ExtraGraphicsZData = Array.Empty<byte>();
     }
 
     [Flags]

src/TSMapEditor/Constants.cs

@@ -1,16 +1,16 @@
 using Rampastring.Tools;
-using System;
 
 namespace TSMapEditor
 {
     public static class Constants
     {
-        public const string ReleaseVersion = "1.4.11";
+        public const string ReleaseVersion = "1.5.0";
 
         public static int CellSizeX = 48;
         public static int CellSizeY = 24;
         public const int CellSizeInLeptons = 256;
         public static int CellHeight => CellSizeY / 2;
+        public static int HighBridgeHeight = 4;
         public static int TileColorBufferSize = 576;
 
         public static int RenderPixelPadding = 50;
@@ -91,7 +91,7 @@ public static class Constants
         public static int MaxHouseTechLevel = 10;
 
         public const int MAX_MAP_LENGTH_IN_DIMENSION = 512;
-        public const int NO_OVERLAY = 255; // 0xFF
+        public const int NO_OVERLAY = -1;
         public const int OverlayPackFormat = 80;
 
         public const string NoneValue1 = "<none>";

src/TSMapEditor/Initialization/MapLoader.cs

@@ -1,7 +1,8 @@
-using CNCMaps.FileFormats.Encodings;
+using CNCMaps.FileFormats.Encodings;
 using Microsoft.Xna.Framework;
 using Rampastring.Tools;
 using System;
+using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -672,10 +673,12 @@ public static void ReadOverlays(IMap map, IniFile mapIni)
             if (overlayPackSection == null || overlayDataPackSection == null)
                 return;
 
+            bool needsExtendedOverlayPack = map.Basic.NewINIFormat >= 5;
+
             var stringBuilder = new StringBuilder();
             overlayPackSection.Keys.ForEach(kvp => stringBuilder.Append(kvp.Value));
             byte[] compressedData = Convert.FromBase64String(stringBuilder.ToString());
-            byte[] uncompressedOverlayPack = new byte[Constants.MAX_MAP_LENGTH_IN_DIMENSION * Constants.MAX_MAP_LENGTH_IN_DIMENSION];
+            byte[] uncompressedOverlayPack = new byte[Constants.MAX_MAP_LENGTH_IN_DIMENSION * Constants.MAX_MAP_LENGTH_IN_DIMENSION * (needsExtendedOverlayPack ? 2 : 1)];
             Format5.DecodeInto(compressedData, uncompressedOverlayPack, Constants.OverlayPackFormat);
 
             stringBuilder.Clear();
@@ -693,7 +696,19 @@ public static void ReadOverlays(IMap map, IniFile mapIni)
                         continue;
 
                     int overlayDataIndex = (tile.Y * Constants.MAX_MAP_LENGTH_IN_DIMENSION) + tile.X;
-                    int overlayTypeIndex = uncompressedOverlayPack[overlayDataIndex];
+
+                    int overlayTypeIndex;
+                    if (needsExtendedOverlayPack)
+                    {
+                        ushort index = BinaryPrimitives.ReadUInt16LittleEndian(new ReadOnlySpan<byte>(uncompressedOverlayPack, overlayDataIndex * 2, 2));
+                        overlayTypeIndex = index != ushort.MaxValue ? index : Constants.NO_OVERLAY;
+                    }
+                    else
+                    {
+                        byte index = uncompressedOverlayPack[overlayDataIndex];
+                        overlayTypeIndex = index != byte.MaxValue ? index : Constants.NO_OVERLAY;
+                    }
+
                     if (overlayTypeIndex == Constants.NO_OVERLAY)
                         continue;
 

src/TSMapEditor/Initialization/MapWriter.cs

@@ -3,6 +3,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Rampastring.Tools;
 using System;
+using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -117,9 +118,11 @@ public static void WriteOverlays(IMap map, IniFile mapIni)
             mapIni.RemoveSection(overlayPackSectionName);
             mapIni.RemoveSection(overlayDataPackSectionName);
 
-            var overlayArray = new byte[Constants.MAX_MAP_LENGTH_IN_DIMENSION * Constants.MAX_MAP_LENGTH_IN_DIMENSION];
+            bool needsExtendedOverlayPack = map.Basic.NewINIFormat >= 5;
+
+            var overlayArray = new byte[Constants.MAX_MAP_LENGTH_IN_DIMENSION * Constants.MAX_MAP_LENGTH_IN_DIMENSION * (needsExtendedOverlayPack ? 2 : 1)];
             for (int i = 0; i < overlayArray.Length; i++)
-                overlayArray[i] = Constants.NO_OVERLAY;
+                overlayArray[i] = 0xFF; // fill the entire array with 0xFF, which will be (sbyte)-1 or (short)-1, regardless of what format we're writing in
 
             var overlayDataArray = new byte[Constants.MAX_MAP_LENGTH_IN_DIMENSION * Constants.MAX_MAP_LENGTH_IN_DIMENSION];
 
@@ -130,7 +133,11 @@ public static void WriteOverlays(IMap map, IniFile mapIni)
 
                 int dataIndex = (tile.Y * Constants.MAX_MAP_LENGTH_IN_DIMENSION) + tile.X;
 
-                overlayArray[dataIndex] = (byte)tile.Overlay.OverlayType.Index;
+                if (needsExtendedOverlayPack)
+                    BinaryPrimitives.WriteUInt16LittleEndian(new Span<byte>(overlayArray, dataIndex * 2, 2), (ushort)tile.Overlay.OverlayType.Index);
+                else
+                    overlayArray[dataIndex] = (byte)tile.Overlay.OverlayType.Index;
+
                 overlayDataArray[dataIndex] = (byte)tile.Overlay.FrameIndex;
             });
 

src/TSMapEditor/Models/CellTag.cs

@@ -17,6 +17,8 @@ public CellTag(Point2D position, Tag tag)
             Tag = tag;
         }
 
+        public bool IsOnBridge() => false;
+
         public Point2D Position { get; set; }
         public Tag Tag { get; set; }
 

src/TSMapEditor/Models/EditorConfig.cs

@@ -14,7 +14,7 @@ public class EditorConfig
     {
         public EditorConfig() 
         {
-            EditorRulesIni = new IniFile(Environment.CurrentDirectory + "/Config/EditorRules.ini");
+            EditorRulesIni = Helpers.ReadConfigINI("EditorRules.ini");
         }
 
         private const string IniSystemSectionName = "INISystem";

src/TSMapEditor/Models/Foot.cs

@@ -26,5 +26,7 @@ public Foot(T objectType) : base(objectType) { }
         /// Is this unit available for recruitment for TeamTypes that have Autocreate=yes?
         /// </summary>
         public bool AutocreateYesRecruitable { get; set; }
+
+        public override bool IsOnBridge() => High;
     }
 }

src/TSMapEditor/Models/GameObject.cs

@@ -53,6 +53,8 @@ public override int GetHashCode()
 
         public virtual bool HasShadow() => false;
 
+        public virtual bool IsOnBridge() => false;
+
         public virtual Color GetRemapColor() => Color.White;
     }
 }

src/TSMapEditor/Models/House.cs

@@ -21,6 +21,8 @@ public BaseNode(string structureTypeName, Point2D location)
         public string StructureTypeName { get; set; }
         public Point2D Position { get; set; }
 
+        public bool IsOnBridge() => false;
+
         public static BaseNode FromIniString(string iniString)
         {
             if (string.IsNullOrWhiteSpace(iniString))