fix viewmodel issues not copying data back to dat object

Author: LeftofZen

Gui/ViewModels/DatTypes/Objects/AirportViewModel.cs

@@ -57,23 +57,23 @@ public AirportViewModel(AirportObject ao)
 		public override AirportObject GetAsStruct(AirportObject ao)
 			=> ao with
 			{
-				BuildCostFactor = ao.BuildCostFactor,
-				SellCostFactor = ao.SellCostFactor,
-				CostIndex = ao.CostIndex,
-				var_07 = ao.var_07,
-				AllowedPlaneTypes = ao.AllowedPlaneTypes,
-				LargeTiles = ao.LargeTiles,
-				MinX = ao.MinX,
-				MinY = ao.MinY,
-				MaxX = ao.MaxX,
-				MaxY = ao.MaxY,
-				DesignedYear = ao.DesignedYear,
-				ObsoleteYear = ao.ObsoleteYear,
-				NumBuildingParts = (uint8_t)ao.BuildingAnimations.Count,
-				NumBuildingVariations = (uint8_t)ao.BuildingVariations.Count,
-				NumMovementEdges = (uint8_t)ao.MovementEdges.Count,
-				NumMovementNodes = (uint8_t)ao.MovementNodes.Count,
-				var_B6 = [.. ao.var_B6],
+				BuildCostFactor = BuildCostFactor,
+				SellCostFactor = SellCostFactor,
+				CostIndex = CostIndex,
+				var_07 = var_07,
+				AllowedPlaneTypes = AllowedPlaneTypes,
+				LargeTiles = LargeTiles,
+				MinX = MinX,
+				MinY = MinY,
+				MaxX = MaxX,
+				MaxY = MaxY,
+				DesignedYear = DesignedYear,
+				ObsoleteYear = ObsoleteYear,
+				NumBuildingParts = (uint8_t)BuildingAnimations.Count,
+				NumBuildingVariations = (uint8_t)BuildingVariations.Count,
+				NumMovementEdges = (uint8_t)MovementEdges.Count,
+				NumMovementNodes = (uint8_t)MovementNodes.Count,
+				var_B6 = [.. var_B6],
 			};
 	}
 }

Gui/ViewModels/DatTypes/Objects/BuildingViewModel.cs

@@ -77,8 +77,8 @@ public override BuildingObject GetAsStruct(BuildingObject bo)
 				CostIndex = CostIndex,
 				SellCostFactor = SellCostFactor,
 				var_AC = var_AC,
-				NumBuildingParts = (uint8_t)bo.BuildingAnimations.Count,
-				NumBuildingVariations = (uint8_t)bo.BuildingVariations.Count,
+				NumBuildingParts = (uint8_t)BuildingAnimations.Count,
+				NumBuildingVariations = (uint8_t)BuildingVariations.Count,
 				ProducedQuantity = [.. ProducedQuantity],
 				ProducedCargo = ProducedCargo.ToList().ConvertAll(x => x.GetAsUnderlyingType()),
 				RequiredCargo = RequiredCargo.ToList().ConvertAll(x => x.GetAsUnderlyingType()),

Gui/ViewModels/DatTypes/Objects/DockViewModel.cs

@@ -2,7 +2,6 @@
 using OpenLoco.Dat.Types;
 using ReactiveUI.Fody.Helpers;
 using System.ComponentModel;
-using System.Linq;
 
 namespace OpenLoco.Gui.ViewModels
 {
@@ -46,8 +45,8 @@ public override DockObject GetAsStruct(DockObject @do)
 				SellCostFactor = SellCostFactor,
 				BoatPosition = BoatPosition,
 				var_07 = var_07,
-				BuildingPartAnimations = BuildingPartAnimations.ToList(),
-				BuildingVariationParts = BuildingVariationParts.ToList(),
+				BuildingPartAnimations = [.. BuildingPartAnimations],
+				BuildingVariationParts = [.. BuildingVariationParts],
 				NumBuildingPartAnimations = (uint8_t)BuildingPartAnimations.Count,
 				NumBuildingVariationParts = (uint8_t)BuildingVariationParts.Count,
 			};

Gui/ViewModels/EditorSettingsWindowViewModel.cs

@@ -36,7 +36,7 @@ public void Commit()
 			_Settings.ServerAddressHttps = ServerAddressHttps;
 			_Settings.DownloadFolder = DownloadFolder;
 			_Settings.ObjDataDirectory = ObjDataDirectory;
-			_Settings.ObjDataDirectories = ObjDataDirectories.ToHashSet();
+			_Settings.ObjDataDirectories = [.. ObjDataDirectories];
 		}
 
 		[Reactive, Category("Misc"), DisplayName("Allow saving as vanilla object"), Description("If enabled, the editor will allow saving objects with \"Vanilla\" flag set. If disabled, the object will be forcefully saved as \"Custom\" instead.")]