fix binding issues in building object

Author: LeftofZen

Dat/Objects/BuildingObject.cs

@@ -26,7 +26,7 @@ public record BuildingObject(
 			[property: LocoStructOffset(0x07)] uint8_t NumBuildingVariations,
 			[property: LocoStructOffset(0x08), LocoStructVariableLoad, LocoArrayLength(BuildingObject.BuildingHeightCount)] List<uint8_t> BuildingHeights,
 			[property: LocoStructOffset(0x0C), LocoStructVariableLoad, LocoArrayLength(BuildingObject.BuildingAnimationCount)] List<BuildingPartAnimation> BuildingAnimations,
-			[property: LocoStructOffset(0x10), LocoStructVariableLoad, LocoArrayLength(BuildingObject.BuildingVariationCount)] List<uint8_t[]> BuildingVariations,
+			[property: LocoStructOffset(0x10), LocoStructVariableLoad, LocoArrayLength(BuildingObject.BuildingVariationCount)] List<List<uint8_t>> BuildingVariations,
 			[property: LocoStructOffset(0x90)] uint32_t Colours,
 			[property: LocoStructOffset(0x94)] uint16_t DesignedYear,
 			[property: LocoStructOffset(0x96)] uint16_t ObsoleteYear,
@@ -37,7 +37,7 @@ public record BuildingObject(
 			[property: LocoStructOffset(0x9D)] Colour ScaffoldingColour,
 			[property: LocoStructOffset(0x9E)] uint8_t GeneratorFunction,
 			[property: LocoStructOffset(0x9F)] uint8_t AverageNumberOnMap,
-			[property: LocoStructOffset(0xA0), LocoArrayLength(BuildingObject.MaxProducedQuantity)] uint8_t[] ProducedQuantity,
+			[property: LocoStructOffset(0xA0), LocoArrayLength(BuildingObject.MaxProducedCargoType)] uint8_t[] ProducedQuantity,
 			[property: LocoStructOffset(0xA2), LocoStructVariableLoad, LocoArrayLength(BuildingObject.MaxProducedCargoType)] List<S5Header> ProducedCargo,
 			[property: LocoStructOffset(0xA4), LocoStructVariableLoad, LocoArrayLength(BuildingObject.MaxRequiredCargoType)] List<S5Header> RequiredCargo,
 			[property: LocoStructOffset(0xA6), LocoStructVariableLoad, LocoArrayLength(2)] List<uint8_t> var_A6,
@@ -51,7 +51,6 @@ public record BuildingObject(
 		public const int BuildingVariationCount = 32;
 		public const int BuildingHeightCount = 4;
 		public const int BuildingAnimationCount = 2;
-		public const int MaxProducedQuantity = 2;
 		public const int MaxProducedCargoType = 2;
 		public const int MaxRequiredCargoType = 2;
 		public const int MaxElevatorHeightSequences = 4;
@@ -84,7 +83,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 					;
 				}
 
-				BuildingVariations.Add(remainingData[..ptr_10].ToArray());
+				BuildingVariations.Add(remainingData[..ptr_10].ToArray().ToList());
 				ptr_10++;
 				remainingData = remainingData[ptr_10..];
 			}
@@ -133,7 +132,7 @@ public ReadOnlySpan<byte> Save()
 			// variation parts
 			foreach (var x in BuildingVariations)
 			{
-				ms.Write(x);
+				ms.Write(x.ToArray());
 				ms.WriteByte(0xFF);
 			}
 

Gui/ViewModels/DatTypes/Objects/BuildingViewModel.cs

@@ -25,7 +25,7 @@ public class BuildingViewModel : ReactiveObject, IObjectViewModel<ILocoStruct>
 		[Reactive, Category("Cost")] public uint16_t SellCostFactor { get; set; }
 		[Reactive, Category("Production"), Length(0, BuildingObject.MaxProducedCargoType)] public BindingList<S5Header> ProducedCargo { get; set; }
 		[Reactive, Category("Production"), Length(0, BuildingObject.MaxProducedCargoType)] public BindingList<S5Header> RequiredCargo { get; set; }
-		[Reactive, Category("Production"), Length(1, BuildingObject.MaxProducedQuantity)] public BindingList<uint8_t> ProducedQuantity { get; set; }
+		[Reactive, Category("Production"), Length(1, BuildingObject.MaxProducedCargoType)] public BindingList<uint8_t> ProducedQuantity { get; set; }
 		[Reactive, Category("Building"), Length(1, BuildingObject.BuildingVariationCount)] public BindingList<BindingList<uint8_t>> BuildingVariations { get; set; } // NumBuildingVariations
 		[Reactive, Category("Building"), Length(1, BuildingObject.BuildingHeightCount)] public BindingList<uint8_t> BuildingHeights { get; set; } // NumBuildingParts
 		[Reactive, Category("Building"), Length(1, BuildingObject.BuildingAnimationCount)] public BindingList<BuildingPartAnimation> BuildingAnimations { get; set; } // NumBuildingParts
@@ -52,7 +52,7 @@ public BuildingViewModel(BuildingObject bo)
 			SellCostFactor = bo.SellCostFactor;
 			ProducedCargo = new(bo.ProducedCargo);
 			RequiredCargo = new(bo.RequiredCargo);
-			ProducedQuantity = new(bo.ProducedQuantity);
+			ProducedQuantity = [.. bo.ProducedQuantity];
 			BuildingHeights = new(bo.BuildingHeights);
 			BuildingAnimations = new(bo.BuildingAnimations);
 			BuildingVariations = new(bo.BuildingVariations.Select(x => new BindingList<uint8_t>(x)).ToBindingList());
@@ -84,6 +84,7 @@ public BuildingObject GetAsStruct(BuildingObject bo)
 				var_AC = var_AC,
 				NumBuildingParts = (uint8_t)bo.BuildingAnimations.Count,
 				NumBuildingVariations = (uint8_t)bo.BuildingVariations.Count,
+				ProducedQuantity = [.. ProducedQuantity],
 				//NumElevatorSequences = (uint8_t)bo.ElevatorHeightSequences.Count,
 			};
 	}