update vehicle sound property names, fix bug saving acceleration base frequency

Author: LeftofZen

Dat/Objects/Vehicle/SimpleMotorSound.cs

@@ -13,7 +13,7 @@ public record SimpleMotorSound(
 		[property: LocoStructOffset(0x04)] uint16_t CoastingFrequency,
 		[property: LocoStructOffset(0x06)] uint8_t CoastingVolume,
 		[property: LocoStructOffset(0x07)] uint16_t AccelerationBaseFrequency,
-		[property: LocoStructOffset(0x08)] uint8_t AccelerationVolume,
+		[property: LocoStructOffset(0x09)] uint8_t AccelerationVolume,
 		[property: LocoStructOffset(0x0A)] uint16_t FreqIncreaseStep,
 		[property: LocoStructOffset(0x0C)] uint16_t FreqDecreaseStep,
 		[property: LocoStructOffset(0x0E)] uint8_t VolumeIncreaseStep,

Dat/Objects/Vehicle/VehicleObject.cs

@@ -67,20 +67,10 @@ public record VehicleObject(
 		public VehicleObject() : this(0, TransportMode.Rail, VehicleType.Train, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, [], [], [], [], [], 0, 0, 0, 0, VehicleObjectFlags.None, [], [[], []], [], 0, [], 0, 0, 0, 0, DrivingSoundType.None, [], [], 0, [])
 		{ }
 
-		//public static object? GetSoundAs(DrivingSoundType soundType, ReadOnlySpan<byte> soundPropertiesData)
-		//	=> soundType switch
-		//	{
-		//		DrivingSoundType.None => default,
-		//		DrivingSoundType.Friction => ByteReader.ReadLocoStruct<FrictionSound>(soundPropertiesData[..ObjectAttributes.StructSize<FrictionSound>()]),
-		//		DrivingSoundType.Engine1 => ByteReader.ReadLocoStruct<Engine1Sound>(soundPropertiesData[..ObjectAttributes.StructSize<Engine1Sound>()]),
-		//		DrivingSoundType.Engine2 => ByteReader.ReadLocoStruct<Engine2Sound>(soundPropertiesData[..ObjectAttributes.StructSize<Engine2Sound>()]),
-		//		_ => throw new ArgumentOutOfRangeException()
-		//	};
-
 		public T GetSoundAs<T>() where T : ILocoStruct
 			=> (T)ByteReader.ReadLocoStruct(SoundPropertiesData.AsSpan()[..ObjectAttributes.StructSize<T>()], typeof(T));
 
-		public FrictionSound? SoundPropertyFriction
+		public FrictionSound? FrictionSound
 		{
 			get => DrivingSoundType == DrivingSoundType.Friction ? GetSoundAs<FrictionSound>() : null;
 			set
@@ -92,7 +82,7 @@ public FrictionSound? SoundPropertyFriction
 			}
 		}
 
-		public SimpleMotorSound? SoundPropertyEngine1
+		public SimpleMotorSound? SimpleMotorSound
 		{
 			get => DrivingSoundType == DrivingSoundType.SimpleMotor ? GetSoundAs<SimpleMotorSound>() : null;
 			set
@@ -104,7 +94,7 @@ public SimpleMotorSound? SoundPropertyEngine1
 			}
 		}
 
-		public GearboxMotorSound? SoundPropertyEngine2
+		public GearboxMotorSound? GearboxMotorSound
 		{
 			get => DrivingSoundType == DrivingSoundType.GearboxMotor ? GetSoundAs<GearboxMotorSound>() : null;
 			set

Gui/ViewModels/DatTypes/Objects/VehicleViewModel.cs

@@ -85,9 +85,9 @@ public VehicleViewModel(VehicleObject vo)
 			Sound = vo.Sound == null ? null : new(vo.Sound);
 			StartSounds = new(vo.StartSounds.ConvertAll(x => new S5HeaderViewModel(x)));
 			SoundType = vo.DrivingSoundType;
-			FrictionSound = vo.SoundPropertyFriction;
-			SimpleMotorSound = vo.SoundPropertyEngine1;
-			GearboxMotorSound = vo.SoundPropertyEngine2;
+			FrictionSound = vo.FrictionSound;
+			SimpleMotorSound = vo.SimpleMotorSound;
+			GearboxMotorSound = vo.GearboxMotorSound;
 		}
 
 		public override VehicleObject GetAsStruct(VehicleObject vo)
@@ -124,9 +124,9 @@ public override VehicleObject GetAsStruct(VehicleObject vo)
 				RequiredTrackExtras = RequiredTrackExtras.ToList().ConvertAll(x => x.GetAsUnderlyingType()),
 				AnimationHeaders = AnimationHeaders.ToList().ConvertAll(x => x.GetAsUnderlyingType()),
 				DrivingSoundType = SoundType,
-				SoundPropertyFriction = FrictionSound,
-				SoundPropertyEngine1 = SimpleMotorSound,
-				SoundPropertyEngine2 = GearboxMotorSound,
+				FrictionSound = FrictionSound,
+				SimpleMotorSound = SimpleMotorSound,
+				GearboxMotorSound = GearboxMotorSound,
 				NumCompatibleVehicles = (uint8_t)CompatibleVehicles.Count,
 				NumRequiredTrackExtras = (uint8_t)RequiredTrackExtras.Count,
 				NumStartSounds = (uint8_t)StartSounds.Count,