add driving side to region object

Author: LeftofZen

Dat/Loaders/RegionObjectLoader.cs

@@ -32,7 +32,8 @@ public static LocoObject Load(Stream stream)
 			// fixed
 			br.SkipStringId(); // Name offset, not part of object definition
 			br.SkipImageId(); // Image offset, not part of object definition
-			br.SkipByte(0x08 - 0x06); // pad
+			model.VehiclesDriveOnThe = br.ReadByte() == 0 ? DrivingSide.Left : DrivingSide.Right;
+			model.pad_07 = br.ReadByte();
 			var numCargoInfluenceObjects = br.ReadByte();
 			for (var i = 0; i < Constants.MaxCargoInfluenceObjects; ++i)
 			{
@@ -67,7 +68,8 @@ public static void Save(Stream stream, LocoObject obj)
 		{
 			bw.WriteEmptyStringId(); // Name offset, not part of object definition
 			bw.WriteEmptyImageId(); // Image offset, not part of object definition
-			bw.Write((uint16_t)0); // pad
+			bw.Write(model.VehiclesDriveOnThe == DrivingSide.Left ? (uint8_t)0 : (uint8_t)1);
+			bw.Write(model.pad_07);
 			bw.Write((uint8_t)model.CargoInfluenceObjects.Count);
 			bw.WriteEmptyObjectId(Constants.MaxCargoInfluenceObjects);
 			for (var i = 0; i < Constants.MaxCargoInfluenceObjects; ++i)

Definitions/ObjectModels/Objects/Land/LandObject.cs

@@ -47,7 +47,24 @@ public bool TryGetImageName(int id, out string? value)
 
 	public static readonly Dictionary<int, string> ImageIdNameMap = new()
 	{
-		{ 0, "kFlatSE" },
-		{ 1, "toolbar_terraform_land" },
+		{ 0, "flat" },
+		{ 1, "west corner up" },
+		{ 2, "south corner up" },
+		{ 3, "north east slope" },
+		{ 4, "east corner up" },
+		{ 5, "west and east corner up" },
+		{ 6, "north west slope" },
+		{ 7, "north corner down" },
+		{ 8, "north corner up" },
+		{ 9, "south east slope" },
+		{ 10, "north and south corners up" },
+		{ 11, "east corner down" },
+		{ 12, "north west slope" },
+		{ 13, "south corner down" },
+		{ 14, "west corner down" },
+		{ 15, "south slope" },
+		{ 16, "north slope" },
+		{ 17, "east slope" },
+		{ 18, "west slope" }
 	};
 }

Definitions/ObjectModels/Objects/Region/DrivingSide.cs

@@ -0,0 +1,7 @@
+namespace Definitions.ObjectModels.Objects.Region;
+
+public enum DrivingSide
+{
+	Left,
+	Right
+}

Definitions/ObjectModels/Objects/Region/RegionObject.cs

@@ -4,6 +4,8 @@ namespace Definitions.ObjectModels.Objects.Region;
 
 public class RegionObject : ILocoStruct
 {
+	public DrivingSide VehiclesDriveOnThe { get; set; }
+	public uint8_t pad_07 { get; set; }
 	public List<ObjectModelHeader> CargoInfluenceObjects { get; set; } = [];
 	public List<ObjectModelHeader> DependentObjects { get; set; } = [];
 	public List<CargoInfluenceTownFilterType> CargoInfluenceTownFilter { get; set; } = [];

Gui/ViewModels/DatTypes/Objects/RegionViewModel.cs

@@ -1,29 +1,33 @@
 using Definitions.ObjectModels.Objects.Region;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Gui.ViewModels;
 
 public class RegionViewModel : LocoObjectViewModel<RegionObject>
 {
-	public List<ObjectModelHeaderViewModel> CargoInfluenceObjects { get; set; }
-	public List<ObjectModelHeaderViewModel> DependentObjects { get; set; }
-	public List<CargoInfluenceTownFilterType> CargoInfluenceTownFilter { get; set; }
+	public DrivingSide VehiclesDriveOnThe { get; set; }
+	public uint8_t pad_07 { get; set; }
+	[Category("Cargo")] public List<ObjectModelHeaderViewModel> CargoInfluenceObjects { get; set; }
+	[Category("Cargo")] public List<ObjectModelHeaderViewModel> DependentObjects { get; set; }
+	[Category("Cargo")] public List<CargoInfluenceTownFilterType> CargoInfluenceTownFilter { get; set; }
 
 	public RegionViewModel(RegionObject ro)
 	{
 		CargoInfluenceObjects = [.. ro.CargoInfluenceObjects.ConvertAll(x => new ObjectModelHeaderViewModel(x))];
 		DependentObjects = [.. ro.DependentObjects.ConvertAll(x => new ObjectModelHeaderViewModel(x))];
 		CargoInfluenceTownFilter = [.. ro.CargoInfluenceTownFilter];
+		VehiclesDriveOnThe = ro.VehiclesDriveOnThe;
+		pad_07 = ro.pad_07;
 	}
 
 	public override RegionObject GetAsModel()
-	{ 
-		var regionObject = new RegionObject()
+		=> new RegionObject()
 		{
 			CargoInfluenceObjects = CargoInfluenceObjects.ConvertAll(x => x.GetAsModel()),
 			DependentObjects = DependentObjects.ConvertAll(x => x.GetAsModel()),
 			CargoInfluenceTownFilter = CargoInfluenceTownFilter,
+			VehiclesDriveOnThe = VehiclesDriveOnThe,
+			pad_07 = pad_07
 		};
-		return regionObject;
-	}
 }

Tests/LoadSaveTests.cs

@@ -369,7 +369,8 @@ void assertFunc(LocoObject obj, DockObject struc) => Assert.Multiple(() =>
 
 			Assert.That(struc.DesignedYear, Is.Zero, nameof(struc.DesignedYear));
 			Assert.That(struc.ObsoleteYear, Is.EqualTo(65535), nameof(struc.ObsoleteYear));
-			Assert.That(struc.BoatPosition, Is.EqualTo(new Pos2() { X = 48, Y = 0 }), nameof(struc.BoatPosition));
+			Assert.That(struc.BoatPosition.X, Is.EqualTo(48), nameof(struc.BoatPosition));
+			Assert.That(struc.BoatPosition.Y, Is.EqualTo(0), nameof(struc.BoatPosition));
 
 			Assert.That(obj.GraphicsElements, Has.Count.EqualTo(9));
 		});
@@ -657,7 +658,7 @@ public void RegionObject(string objectName)
 	{
 		void assertFunc(LocoObject obj, RegionObject struc) => Assert.Multiple(() =>
 		{
-			//Assert.That(struc.pad_06, Is.EquivalentTo(Array.CreateInstance(typeof(byte), 2)), nameof(struc.pad_06));
+			Assert.That(struc.VehiclesDriveOnThe, Is.EqualTo(DrivingSide.Left), nameof(struc.VehiclesDriveOnThe));
 			Assert.That(struc.CargoInfluenceObjects.Count, Is.EqualTo(1), nameof(struc.CargoInfluenceObjects));
 			Assert.That(struc.DependentObjects, Has.Count.EqualTo(239), nameof(struc.DependentObjects));
 			Assert.That(struc.CargoInfluenceTownFilter, Is.EquivalentTo(Enumerable.Repeat(CargoInfluenceTownFilterType.AllTowns, 4)), nameof(struc.CargoInfluenceTownFilter));