rename erroneously named properties in trackobject

Author: LeftofZen

Dat/Objects/TrackObject.cs

@@ -40,7 +40,7 @@ public record TrackObject(
 		[property: LocoStructOffset(0x02)] TrackTraitFlags TrackPieces,
 		[property: LocoStructOffset(0x04)] TrackTraitFlags StationTrackPieces,
 		[property: LocoStructOffset(0x06)] uint8_t var_06,
-		[property: LocoStructOffset(0x07)] uint8_t NumCompatibleVehicles,
+		[property: LocoStructOffset(0x07)] uint8_t NumCompatibleTracksAndRoads,
 		[property: LocoStructOffset(0x08)] uint8_t NumMods,
 		[property: LocoStructOffset(0x09)] uint8_t NumSignals,
 		[property: LocoStructOffset(0x0A), LocoArrayLength(TrackObject.MaxMods), LocoStructVariableLoad, Browsable(false)] object_id[] _Mods,
@@ -63,7 +63,7 @@ public record TrackObject(
 		[property: LocoStructOffset(0x35), Browsable(false)] uint8_t var_35
 		) : ILocoStruct, ILocoStructVariableData, IImageTableNameProvider
 	{
-		public List<S5Header> Vehicles { get; set; } = [];
+		public List<S5Header> TracksAndRoads { get; set; } = [];
 		public List<S5Header> TrackMods { get; set; } = []; // aka TrackExtraObject
 		public List<S5Header> Signals { get; set; } = [];
 		public S5Header Tunnel { get; set; }
@@ -78,8 +78,8 @@ public record TrackObject(
 		public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 		{
 			// compatible roads/tracks
-			Vehicles = SawyerStreamReader.LoadVariableCountS5Headers(remainingData, NumCompatibleVehicles);
-			remainingData = remainingData[(S5Header.StructLength * NumCompatibleVehicles)..];
+			TracksAndRoads = SawyerStreamReader.LoadVariableCountS5Headers(remainingData, NumCompatibleTracksAndRoads);
+			remainingData = remainingData[(S5Header.StructLength * NumCompatibleTracksAndRoads)..];
 
 			// mods
 			TrackMods = SawyerStreamReader.LoadVariableCountS5Headers(remainingData, NumMods);
@@ -109,7 +109,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 
 		public ReadOnlySpan<byte> Save()
 		{
-			var headers = Vehicles
+			var headers = TracksAndRoads
 				.Concat(TrackMods)
 				.Concat(Signals)
 				.Concat(Enumerable.Repeat(Tunnel, 1))

DataQuery/Program.cs

@@ -11,12 +11,50 @@
 var index = ObjectIndex.LoadOrCreateIndex(dir, logger);
 
 //QueryCostIndices(dir, logger, index);
-QueryCargoCategories(dir, logger, index);
+//QueryCargoCategories(dir, logger, index);
+QueryVehicleBodyUnkSprites(dir, logger, index);
 
 Console.WriteLine("done");
 
 Console.ReadLine();
 
+static void QueryVehicleBodyUnkSprites(string dir, Logger logger, ObjectIndex index)
+{
+	var results = new List<(ObjectIndexEntry Obj, ObjectSource ObjectSource)>();
+
+	foreach (var obj in index.Objects.Where(x => x.ObjectType == ObjectType.Vehicle && x.ObjectSource == ObjectSource.LocomotionSteam))
+	{
+		try
+		{
+			var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.Filename), logger);
+			if (o?.LocoObject != null)
+			{
+				var struc = (VehicleObject)o.Value.LocoObject.Object;
+				var header = o.Value.DatFileInfo.S5Header;
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+
+				if (struc.BodySprites.Any(x => x.Flags.HasFlag(BodySpriteFlags.HasUnkSprites)))
+				{
+					results.Add((obj, source));
+				}
+
+				//results.Add((obj, struc.CargoCategory, o.Value.LocoObject.StringTable.Table["Name"][LanguageId.English_UK], source));
+			}
+		}
+		catch (Exception ex)
+		{
+			Console.WriteLine($"{obj.Filename} - {ex.Message}");
+		}
+	}
+
+	const string csvHeader = "DatName, ObjectSource";
+	var lines = results
+		.OrderBy(x => x.Obj.DatName)
+		.Select(x => string.Join(',', x.Obj.DatName, x.ObjectSource));
+
+	File.WriteAllLines("vehicleBodiesWithUnkSpritesFlag.csv", [csvHeader, .. lines]);
+}
+
 static void QueryCargoCategories(string dir, Logger logger, ObjectIndex index)
 {
 	var results = new List<(ObjectIndexEntry Obj, CargoCategory CargoCategory, string LocalisedName, ObjectSource ObjectSource)>();

Gui/ViewModels/DatTypes/Objects/TrackViewModel.cs

@@ -17,7 +17,7 @@ public class TrackViewModel : LocoObjectViewModel<TrackObject>
 		[Reactive, Category("Cost")] public int16_t SellCostFactor { get; set; }
 		[Reactive, Category("Cost")] public int16_t TunnelCostFactor { get; set; }
 		[Reactive, Category("Cost")] public uint8_t CostIndex { get; set; }
-		[Reactive, Category("Compatible")] public BindingList<S5HeaderViewModel> CompatibleVehicles { get; set; }
+		[Reactive, Category("Tracks and Roads")] public BindingList<S5HeaderViewModel> CompatibleTracksAndRoads { get; set; }
 		[Reactive, Category("Mods")] public BindingList<S5HeaderViewModel> CompatibleTrackExtras { get; set; }
 		[Reactive, Category("Signals")] public BindingList<S5HeaderViewModel> CompatibleSignals { get; set; }
 		[Reactive, Category("Bridges")] public BindingList<S5HeaderViewModel> CompatibleBridges { get; set; }
@@ -36,7 +36,7 @@ public TrackViewModel(TrackObject to)
 			SellCostFactor = to.SellCostFactor;
 			TunnelCostFactor = to.TunnelCostFactor;
 			CostIndex = to.CostIndex;
-			CompatibleVehicles = new(to.Vehicles.ConvertAll(x => new S5HeaderViewModel(x)));
+			CompatibleTracksAndRoads = new(to.TracksAndRoads.ConvertAll(x => new S5HeaderViewModel(x)));
 			CompatibleTrackExtras = new(to.TrackMods.ConvertAll(x => new S5HeaderViewModel(x)));
 			CompatibleSignals = new(to.Signals.ConvertAll(x => new S5HeaderViewModel(x)));
 			CompatibleTunnel = new(to.Tunnel);
@@ -60,8 +60,8 @@ public override TrackObject GetAsStruct(TrackObject to)
 				SellCostFactor = SellCostFactor,
 				TunnelCostFactor = TunnelCostFactor,
 				CostIndex = CostIndex,
-				NumCompatibleVehicles = (uint8_t)CompatibleVehicles.Count,
-				Vehicles = CompatibleVehicles.ToList().ConvertAll(x => x.GetAsUnderlyingType()),
+				NumCompatibleTracksAndRoads = (uint8_t)CompatibleTracksAndRoads.Count,
+				TracksAndRoads = CompatibleTracksAndRoads.ToList().ConvertAll(x => x.GetAsUnderlyingType()),
 				NumMods = (uint8_t)CompatibleTrackExtras.Count,
 				TrackMods = CompatibleTrackExtras.ToList().ConvertAll(x => x.GetAsUnderlyingType()),
 				NumSignals = (uint8_t)CompatibleSignals.Count,

Tests/LoadSaveTests.cs

@@ -866,7 +866,7 @@ void assertFunc(ILocoObject obj, TrackObject struc) => Assert.Multiple(() =>
 				Assert.That(struc.Flags, Is.EqualTo(TrackObjectFlags.unk_00), nameof(struc.Flags));
 				// Mods
 				Assert.That(struc.NumBridges, Is.EqualTo(5), nameof(struc.NumBridges));
-				Assert.That(struc.NumCompatibleVehicles, Is.EqualTo(7), nameof(struc.NumCompatibleVehicles));
+				Assert.That(struc.NumCompatibleTracksAndRoads, Is.EqualTo(7), nameof(struc.NumCompatibleTracksAndRoads));
 				Assert.That(struc.NumMods, Is.EqualTo(2), nameof(struc.NumMods));
 				Assert.That(struc.NumSignals, Is.EqualTo(10), nameof(struc.NumSignals));
 				Assert.That(struc.NumStations, Is.EqualTo(5), nameof(struc.NumStations));