change BoosterSpeedFactor to simple multiplier

OpenRCT2 · May 2, 2024 · 8b9bfa6 · 8b9bfa6
1 parent 5cbe933
commit 8b9bfa6
Show file tree

Hide file tree

Showing 27 changed files with 33 additions and 43 deletions.
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
@@ -5444,19 +5444,8 @@ bool RideHasRatings(const Ride& ride)
 
 int32_t GetBoosterSpeed(ride_type_t rideType, int32_t rawSpeed)
 {
- int8_t shiftFactor = GetRideTypeDescriptor(rideType).LegacyBoosterSettings.BoosterSpeedFactor;
- if (shiftFactor == 0)
- {
- return rawSpeed;
- }
- if (shiftFactor > 0)
- {
- return (rawSpeed << shiftFactor);
- }
-
- // Workaround for an issue with older compilers (GCC 6, Clang 4) which would fail the build
- int8_t shiftFactorAbs = std::abs(shiftFactor);
- return (rawSpeed >> shiftFactorAbs);
+ // BoosterSpeedFactor has valid values of 1, 2, 4 representing a 1/2, 1, and 2 multiplier.
+ return rawSpeed * GetRideTypeDescriptor(rideType).LegacyBoosterSettings.BoosterSpeedFactor / 2;
 }
 
 void FixInvalidVehicleSpriteSizes()

diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h
@@ -220,7 +220,8 @@ struct RideLegacyBoosterSettings
 {
  uint8_t PoweredLiftAcceleration = 0; // PoweredLiftAcceleration value before unified-speed update
  uint8_t BoosterAcceleration = 0; // BoosterAcceleration value before unified-speed update
- int8_t BoosterSpeedFactor = 0; // The factor to shift the raw booster speed with
+ int8_t BoosterSpeedFactor = 2; // Multiplier representing how much to multiply booster speed by, scaled to 2x the final
+ // multiplier.
 };
 
 struct RatingsModifier
@@ -560,7 +561,7 @@ constexpr RideTypeDescriptor DummyRTD =
  .OperatingSettings = { 0, 0, 1 },
  .TrackSpeedSettings = { 30, 30 },
  .BoosterSettings = {0, 0, 12},
- .LegacyBoosterSettings = {0, 0, 0},
+ .LegacyBoosterSettings = {0, 0, 2},
  .Naming = { STR_UNKNOWN_RIDE, STR_RIDE_DESCRIPTION_UNKNOWN },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = "(INVALID)",

diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h
@@ -31,7 +31,7 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD =
  .OperatingSettings = { 30, 50 },
  .TrackSpeedSettings = { 60, 60 },
  .BoosterSettings = { 40, 40, 13 },
- .LegacyBoosterSettings = { 40, 40, 0 },
+ .LegacyBoosterSettings = { 40, 40 },
  .Naming = { STR_RIDE_NAME_AIR_POWERED_VERTICAL_COASTER, STR_RIDE_DESCRIPTION_AIR_POWERED_VERTICAL_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h
@@ -31,7 +31,7 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD =
  .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle),
  .DefaultMode = RideMode::ContinuousCircuit,
  .BoosterSettings = { 17, 16 },
- .LegacyBoosterSettings = { 17, 16, -1 },
+ .LegacyBoosterSettings = { 17, 16, 1 },
  .Naming = { STR_RIDE_NAME_CLASSIC_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_MINI_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h
@@ -32,7 +32,7 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD =
  .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
  .DefaultMode = RideMode::ContinuousCircuit,
  .BoosterSettings = { 0, 68 },
- .LegacyBoosterSettings = { 0, 68, 0 },
+ .LegacyBoosterSettings = { 0, 68 },
  .Naming = { STR_RIDE_NAME_CLASSIC_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_WOODEN_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_CORKSCREW_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CORKSCREW_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_CORKSCREW_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h
@@ -38,7 +38,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_FLYING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_FLYING_ROLLER_COASTER),
@@ -114,7 +114,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_3A, STR_RIDE_DESCRIPTION_UNKNOWN },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_FLYING_ROLLER_COASTER_ALT),

diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h
@@ -34,7 +34,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD =
  .OperatingSettings = { 10, 27 },
  .TrackSpeedSettings = { 60, 60 },
  .BoosterSettings = { 17, 68 },
- .LegacyBoosterSettings = { 17, 68, 1 },
+ .LegacyBoosterSettings = { 17, 68, 4 },
  .Naming = { STR_RIDE_NAME_GIGA_COASTER, STR_RIDE_DESCRIPTION_GIGA_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_GIGA_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h
@@ -32,7 +32,7 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_HEARTLINE_TWISTER_COASTER, STR_RIDE_DESCRIPTION_HEARTLINE_TWISTER_COASTER },
  .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_HEARTLINE_TWISTER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/HybridCoaster.h b/src/openrct2/ride/coaster/meta/HybridCoaster.h
@@ -29,7 +29,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD =
  .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
  .DefaultMode = RideMode::ContinuousCircuit,
  .BoosterSettings = { 15, 52 },
- .LegacyBoosterSettings = { 15, 52, 0 },
+ .LegacyBoosterSettings = { 15, 52 },
  .Naming = { STR_RIDE_NAME_HYBRID_COASTER, STR_RIDE_DESCRIPTION_HYBRID_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_HYBRID_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/HyperTwister.h b/src/openrct2/ride/coaster/meta/HyperTwister.h
@@ -35,7 +35,7 @@ constexpr RideTypeDescriptor HyperTwisterRTD =
  .OperatingSettings = { 10, 27 },
  .TrackSpeedSettings = { 60, 60 },
  .BoosterSettings = { 17, 68 },
- .LegacyBoosterSettings = { 17, 68, 0 },
+ .LegacyBoosterSettings = { 17, 68 },
  .Naming = { STR_RIDE_NAME_HYPER_TWISTER, STR_RIDE_DESCRIPTION_HYPER_TWISTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station},
  .EnumName = nameof(RIDE_TYPE_HYPER_TWISTER),

diff --git a/src/openrct2/ride/coaster/meta/Hypercoaster.h b/src/openrct2/ride/coaster/meta/Hypercoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor HypercoasterRTD =
  .OperatingSettings = { 10, 27 },
  .TrackSpeedSettings = { 60, 60 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_HYPERCOASTER, STR_RIDE_DESCRIPTION_HYPERCOASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_HYPERCOASTER),

diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD =
  .DefaultMode = RideMode::PoweredLaunchPasstrough,
  .OperatingSettings = { 10, 33 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_INVERTED_IMPULSE_COASTER, STR_RIDE_DESCRIPTION_INVERTED_IMPULSE_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_INVERTED_IMPULSE_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 7, 27 },
  .BoosterSettings = { 0, 38 },
- .LegacyBoosterSettings = { 0, 38, 0 },
+ .LegacyBoosterSettings = { 0, 38 },
  .Naming = { STR_RIDE_NAME_INVERTED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_INVERTED_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .TrackSpeedSettings = { 30, 15 },
  .BoosterSettings = { 17, 16 },
- .LegacyBoosterSettings = { 17, 16, -1 },
+ .LegacyBoosterSettings = { 17, 16, 1 },
  .Naming = { STR_RIDE_NAME_JUNIOR_ROLLER_COASTER, STR_RIDE_DESCRIPTION_JUNIOR_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_JUNIOR_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD =
  .DefaultMode = RideMode::PoweredLaunchPasstrough,
  .OperatingSettings = { 10, 31 },
  .BoosterSettings = { 18, 52 },
- .LegacyBoosterSettings = { 18, 52, 0 },
+ .LegacyBoosterSettings = { 18, 52 },
  .Naming = { STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h
@@ -40,7 +40,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_LAY_DOWN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LAY_DOWN_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER),
@@ -112,7 +112,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_40, STR_RIDE_DESCRIPTION_UNKNOWN },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT),

diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h
@@ -33,7 +33,7 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 18, 18 },
- .LegacyBoosterSettings = { 18, 18, 0 },
+ .LegacyBoosterSettings = { 18, 18 },
  .Naming = { STR_RIDE_NAME_LOOPING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LOOPING_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_LOOPING_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h
@@ -32,7 +32,7 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD =
  .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
  .DefaultMode = RideMode::ContinuousCircuit,
  .BoosterSettings = { 0, 68 },
- .LegacyBoosterSettings = { 0, 68, 1 },
+ .LegacyBoosterSettings = { 0, 68, 4 },
  .Naming = { STR_RIDE_NAME_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_MINI_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h
@@ -38,7 +38,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER),
@@ -113,7 +113,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 25, 25 },
- .LegacyBoosterSettings = { 25, 25, 0 },
+ .LegacyBoosterSettings = { 25, 25 },
  .Naming = { STR_RIDE_NAME_38, STR_RIDE_DESCRIPTION_UNKNOWN },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT),

diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h
@@ -31,7 +31,7 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD =
  .OperatingSettings = { 7, 30 },
  .TrackSpeedSettings = { 60, 60 },
  .BoosterSettings = { 40, 40 },
- .LegacyBoosterSettings = { 40, 40, 0 },
+ .LegacyBoosterSettings = { 40, 40 },
  .Naming = { STR_RIDE_NAME_REVERSE_FREEFALL_COASTER, STR_RIDE_DESCRIPTION_REVERSE_FREEFALL_COASTER },
  .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_REVERSE_FREEFALL_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h
@@ -30,7 +30,7 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD =
  .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
  .DefaultMode = RideMode::ContinuousCircuit,
  .BoosterSettings = { 15, 52 },
- .LegacyBoosterSettings = { 15, 52, 0 },
+ .LegacyBoosterSettings = { 15, 52 },
  .Naming = { STR_RIDE_NAME_SINGLE_RAIL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SINGLE_RAIL_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h
@@ -32,7 +32,7 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 17, 17 },
- .LegacyBoosterSettings = { 17, 17, 0 },
+ .LegacyBoosterSettings = { 17, 17 },
  .Naming = { STR_RIDE_NAME_SPIRAL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SPIRAL_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h
@@ -35,7 +35,7 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 17, 68 },
- .LegacyBoosterSettings = { 17, 68, 0 },
+ .LegacyBoosterSettings = { 17, 68 },
  .Naming = { STR_RIDE_NAME_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_TWISTER_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h
@@ -34,7 +34,7 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .OperatingSettings = { 10, 27 },
  .BoosterSettings = { 17, 68 },
- .LegacyBoosterSettings = { 17, 68, 0 },
+ .LegacyBoosterSettings = { 17, 68 },
  .Naming = { STR_RIDE_NAME_VERTICAL_DROP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_VERTICAL_DROP_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h
@@ -40,7 +40,7 @@ constexpr RideTypeDescriptor WaterCoasterRTD =
  .DefaultMode = RideMode::ContinuousCircuit,
  .TrackSpeedSettings = { 30, 15 },
  .BoosterSettings = { 17, 16 },
- .LegacyBoosterSettings = { 17, 16, -1 },
+ .LegacyBoosterSettings = { 17, 16, 1 },
  .Naming = { STR_RIDE_NAME_WATER_COASTER, STR_RIDE_DESCRIPTION_WATER_COASTER },
  .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_WATER_COASTER),

diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h
@@ -32,7 +32,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD =
  .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle),
  .DefaultMode = RideMode::ContinuousCircuit,
  .BoosterSettings = { 0, 68 },
- .LegacyBoosterSettings = { 0, 68, 0 },
+ .LegacyBoosterSettings = { 0, 68 },
  .Naming = { STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER },
  .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
  .EnumName = nameof(RIDE_TYPE_WOODEN_ROLLER_COASTER),