add ship wake offset

Author: LeftofZen

Dat/Objects/Vehicle/VehicleObject.cs

@@ -38,10 +38,10 @@ public record VehicleObject(
 		[property: LocoStructOffset(0xEC), LocoArrayLength(VehicleObject.CargoTypeSpriteOffsetsLength), LocoStructVariableLoad] Dictionary<CargoCategory, uint8_t> CargoTypeSpriteOffsets,
 		[property: LocoStructOffset(0x10C), LocoStructVariableLoad, Browsable(false)] uint8_t _NumSimultaneousCargoTypes,
 		[property: LocoStructOffset(0x10D), LocoArrayLength(VehicleObject.AnimationCount)] SimpleAnimation[] Animation,
-		[property: LocoStructOffset(0x113)] uint8_t var_113,
+		[property: LocoStructOffset(0x113)] uint8_t ShipWakeOffset, // the distance between each wake of the boat. 0 will be a single wake. anything > 0 gives dual wakes
 		[property: LocoStructOffset(0x114)] uint16_t DesignedYear,
 		[property: LocoStructOffset(0x116)] uint16_t ObsoleteYear,
-		[property: LocoStructOffset(0x118), LocoStructVariableLoad, Browsable(false)] object_id RackRailType,
+		[property: LocoStructOffset(0x118), LocoStructVariableLoad, Browsable(false)] object_id RackRailType, // also airport taxi speed
 		[property: LocoStructOffset(0x119)] DrivingSoundType DrivingSoundType,
 		// this is a union...length is the length of the longest union struct, which is Engine2Sound. make the byte[] not visible in editor
 		[property: LocoStructOffset(0x11A), LocoArrayLength(VehicleObject.MaxUnionSoundStructLength), Browsable(false)] byte[] SoundPropertiesData,

Gui/ViewModels/DatTypes/Objects/VehicleViewModel.cs

@@ -26,11 +26,11 @@ public class VehicleViewModel : LocoObjectViewModel<VehicleObject>
 		[Reactive, Range(0, 4)] public uint8_t NumCarComponents { get; set; }
 		[Reactive, Length(0, 8)] public BindingList<S5HeaderViewModel> CompatibleVehicles { get; set; }
 		[Reactive, Length(0, 4)] public BindingList<S5HeaderViewModel> RequiredTrackExtras { get; set; }
+		[Reactive, Description("If 0, boat has a single wake animation. if > 0, boat has 2 wakes, offset horizontally by this value")] public uint8_t ShipWakeOffset { get; set; }
 		[Reactive, Category("Cost"), Range(0, 32)] public uint8_t CostIndex { get; set; }
 		[Reactive, Category("Cost"), Range(1, int16_t.MaxValue)] public int16_t CostFactor { get; set; }
 		[Reactive, Category("Cost"), Range(0, 32)] public uint8_t RunCostIndex { get; set; }
 		[Reactive, Category("Cost"), Range(0, int16_t.MaxValue)] public int16_t RunCostFactor { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_113 { get; set; }
 		[Reactive, Category("Sprites")] public CompanyColourType SpecialColourSchemeIndex { get; set; } // called "ColourType" in the loco codebase
 		[Reactive, Category("Sprites"), Editable(false)] public BindingList<VehicleObjectCar> CarComponents { get; set; }
 		[Reactive, Category("Sprites"), Editable(false)] public BindingList<BodySprite> BodySprites { get; set; }
@@ -79,7 +79,7 @@ public VehicleViewModel(VehicleObject vo)
 			CargoTypeSpriteOffsets = new(vo.CargoTypeSpriteOffsets.Select(x => new CargoTypeSpriteOffset(x.Key, x.Value)).ToList());
 			Animation = new(vo.Animation);
 			AnimationHeaders = new(vo.AnimationHeaders.ConvertAll(x => new S5HeaderViewModel(x)));
-			var_113 = vo.var_113;
+			ShipWakeOffset = vo.ShipWakeOffset;
 			DesignedYear = vo.DesignedYear;
 			ObsoleteYear = vo.ObsoleteYear;
 			RackRail = vo.RackRail == null ? null : new(vo.RackRail);
@@ -115,7 +115,7 @@ public override VehicleObject GetAsStruct(VehicleObject vo)
 				RackSpeed = RackSpeed,
 				Weight = Weight,
 				Flags = Flags,
-				var_113 = var_113,
+				ShipWakeOffset = ShipWakeOffset,
 				DesignedYear = DesignedYear,
 				ObsoleteYear = ObsoleteYear,
 				RackRail = RackRail?.GetAsUnderlyingType(),

Tests/LoadSaveTests.cs

@@ -1027,7 +1027,7 @@ void assertFunc(ILocoObject obj, VehicleObject struc) => Assert.Multiple(() =>
 				Assert.That(struc.Animation[1].ObjectId, Is.EqualTo(0), nameof(struc.Animation));
 				Assert.That(struc.Animation[1].Height, Is.EqualTo(0), nameof(struc.Animation));
 				Assert.That(struc.Animation[1].Type, Is.EqualTo(SimpleAnimationType.None), nameof(struc.Animation));
-				Assert.That(struc.var_113, Is.EqualTo(0), nameof(struc.var_113));
+				Assert.That(struc.ShipWakeOffset, Is.EqualTo(0), nameof(struc.ShipWakeOffset));
 				Assert.That(struc.DesignedYear, Is.EqualTo(1957), nameof(struc.DesignedYear));
 				Assert.That(struc.ObsoleteYear, Is.EqualTo(1987), nameof(struc.ObsoleteYear));
 				Assert.That(struc.RackRailType, Is.EqualTo(0), nameof(struc.RackRailType));