add ability to set produced quantity for buildings

Author: LeftofZen

Dat/Objects/BuildingObject.cs

@@ -38,8 +38,8 @@ public record BuildingObject(
 			[property: LocoStructOffset(0x9E)] uint8_t GeneratorFunction,
 			[property: LocoStructOffset(0x9F)] uint8_t AverageNumberOnMap,
 			[property: LocoStructOffset(0xA0), LocoArrayLength(BuildingObject.MaxProducedQuantity)] uint8_t[] ProducedQuantity,
-			[property: LocoStructOffset(0xA2), LocoStructVariableLoad, LocoArrayLength(BuildingObject.MaxProducedCargoType), Browsable(false)] List<object_id> _ProducedCargoType,
-			[property: LocoStructOffset(0xA4), LocoStructVariableLoad, LocoArrayLength(BuildingObject.MaxRequiredCargoType), Browsable(false)] List<object_id> _RequiredCargoType,
+			[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,
 			[property: LocoStructOffset(0xA8), LocoStructVariableLoad, LocoArrayLength(2)] List<uint8_t> var_A8,
 			[property: LocoStructOffset(0xAA)] int16_t DemolishRatingReduction,
@@ -56,9 +56,6 @@ public record BuildingObject(
 		public const int MaxRequiredCargoType = 2;
 		public const int MaxElevatorHeightSequences = 4;
 
-		public List<S5Header> ProducedCargo { get; set; } = [];
-		public List<S5Header> RequiredCargo { get; set; } = [];
-
 		public List<uint8_t[]> ElevatorHeightSequences { get; set; } = [];
 
 		// known issues:
@@ -94,12 +91,12 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 
 			// produced cargo
 			ProducedCargo.Clear();
-			ProducedCargo = SawyerStreamReader.LoadVariableCountS5Headers(remainingData, MaxProducedCargoType);
+			ProducedCargo.AddRange(SawyerStreamReader.LoadVariableCountS5Headers(remainingData, MaxProducedCargoType));
 			remainingData = remainingData[(S5Header.StructLength * MaxProducedCargoType)..];
 
 			// required cargo
 			RequiredCargo.Clear();
-			RequiredCargo = SawyerStreamReader.LoadVariableCountS5Headers(remainingData, MaxRequiredCargoType);
+			RequiredCargo.AddRange(SawyerStreamReader.LoadVariableCountS5Headers(remainingData, MaxRequiredCargoType));
 			remainingData = remainingData[(S5Header.StructLength * MaxRequiredCargoType)..];
 
 			// animation sequences

Gui/Models/ObjectEditorModel.cs

@@ -375,7 +375,7 @@ public async Task UploadDatToServer(ObjectIndexEntry dat)
 			var minimumDate = new DateTime(2024, 01, 01);
 			if (File.GetCreationTimeUtc(filename) > minimumDate || File.GetLastWriteTimeUtc(filename) > minimumDate)
 			{
-				Logger.Debug("File is really new - skipping automatic upload for now as this doens't seem like an historical dat file");
+				Logger.Debug("File is really new - skipping automatic upload for now as this doesn't seem like an historical dat file");
 				return;
 			}
 

Gui/ViewModels/DatTypes/Objects/BuildingViewModel.cs

@@ -25,12 +25,14 @@ 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("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
 
 		// note: these height sequences are massive. BLDCTY28 has 2 sequences, 512 in length and 1024 in length. Avalonia PropertyGrid takes 30+ seconds to render this. todo: don't use property grid in future
-		[Reactive, Category("Building"), Length(1, BuildingObject.MaxElevatorHeightSequences), Browsable(false)] public BindingList<BindingList<uint8_t>> ElevatorHeightSequences { get; set; } // NumElevatorSequences
+		//[Reactive, Category("Building"), Length(1, BuildingObject.MaxElevatorHeightSequences), Browsable(false)] public BindingList<BindingList<uint8_t>> ElevatorHeightSequences { get; set; } // NumElevatorSequences
+
 		[Reactive, Category("<unknown>"), Length(2, 2)] public BindingList<uint8_t> var_A6 { get; set; }
 		[Reactive, Category("<unknown>"), Length(2, 2)] public BindingList<uint8_t> var_A8 { get; set; }
 		[Reactive, Category("<unknown>")] public uint8_t var_AC { get; set; }
@@ -50,6 +52,7 @@ public BuildingViewModel(BuildingObject bo)
 			SellCostFactor = bo.SellCostFactor;
 			ProducedCargo = new(bo.ProducedCargo);
 			RequiredCargo = new(bo.RequiredCargo);
+			ProducedQuantity = new(bo.ProducedQuantity);
 			BuildingHeights = new(bo.BuildingHeights);
 			BuildingAnimations = new(bo.BuildingAnimations);
 			BuildingVariations = new(bo.BuildingVariations.Select(x => new BindingList<uint8_t>(x)).ToBindingList());

Gui/Views/MainWindow.axaml

@@ -250,7 +250,7 @@
 														<DataTemplate>
 															<Border BorderThickness="2">
 																<StackPanel>
-																	<TextBlock Margin="4" Text="{Binding}" />
+																	<TextBlock Margin="4" Text="{Binding Name}" />
 																</StackPanel>
 															</Border>
 														</DataTemplate>