diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 1be1f3eb016a..15beee60a9db 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -199,14 +199,26 @@ struct RideOperatingSettings { uint8_t MinValue; uint8_t MaxValue; - uint8_t MaxBrakesSpeed; uint8_t PoweredLiftAcceleration; uint8_t BoosterAcceleration; - int8_t BoosterSpeedFactor; // The factor to shift the raw booster speed with - uint16_t AccelerationFactor = 12; + uint16_t AccelerationFactor = 12; // the amount to right-shift the launch speed for powered launch from a station uint8_t OperatingSettingMultiplier = 1; // Used for the Ride window, cosmetic only. }; +struct RideTrackSpeedSettings +{ + int8_t BrakesMaxSpeed = 30; + int8_t BoosterMaxSpeed = 30; +}; + +struct RideLegacyBoosterSettings +// These are values that must be kept for backwards compatibility and should not be used for new work +{ + 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 +}; + struct RatingsModifier { RatingsModifierType Type; @@ -317,6 +329,8 @@ struct RideTypeDescriptor RideMode DefaultMode{}; /** rct2: 0x0097CF40 */ RideOperatingSettings OperatingSettings{}; + RideTrackSpeedSettings TrackSpeedSettings{}; + RideLegacyBoosterSettings LegacyBoosterSettings{}; RideNaming Naming{}; RideNameConvention NameConvention{}; const char* EnumName{}; @@ -538,7 +552,9 @@ constexpr RideTypeDescriptor DummyRTD = .Flags = 0, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0, 12, 1 }, + .TrackSpeedSettings = { 30, 30 }, + .LegacyBoosterSettings = {0, 0, 0}, .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 index 5b7507a27b56..840d7e9a7eaa 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -28,7 +28,9 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = .Flags = RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), .DefaultMode = RideMode::PoweredLaunchPasstrough, - .OperatingSettings = { 30, 50, 30, 40, 40, 0, 13 }, + .OperatingSettings = { 30, 50, 40, 40, 13 }, + .TrackSpeedSettings = { 60, 60 }, + .LegacyBoosterSettings = { 40, 40, 0 }, .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/AlpineCoaster.h b/src/openrct2/ride/coaster/meta/AlpineCoaster.h index ba4c9f65a285..5742eb26fde5 100644 --- a/src/openrct2/ride/coaster/meta/AlpineCoaster.h +++ b/src/openrct2/ride/coaster/meta/AlpineCoaster.h @@ -31,7 +31,9 @@ constexpr RideTypeDescriptor AlpineCoasterRTD = RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG_UP_INCLINE_REQUIRES_LIFT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .TrackSpeedSettings = { 10, 10 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_ALPINE_COASTER, STR_RIDE_DESCRIPTION_ALPINE_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_ALPINE_ROLLER_COASTER), diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index e76452bca831..0af7ae8db762 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_BOBSLEIGH_COASTER), diff --git a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h index a5ed68829bbb..99ae322b75d4 100644 --- a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 17, 16, -1 }, + .OperatingSettings = { 0, 0, 17, 16 }, + .LegacyBoosterSettings = { 0, 0, -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/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h index 694fd7ae1b24..754cb8e8c490 100644 --- a/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 7, 27, 0, 0, 0, 0 }, + .OperatingSettings = { 7, 27, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_CLASSIC_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_STAND_UP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_CLASSIC_STAND_UP_ROLLER_COASTER), diff --git a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h index a2551d411a68..cf5fba9cff20 100644 --- a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 68, 0 }, + .OperatingSettings = { 0, 0, 0, 68 }, + .LegacyBoosterSettings = { 0, 68, 0 }, .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/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index 481705ef0769..c85ae328835f 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_IS_SUSPENDED, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 7, 27, 0, 0, 0, 0 }, + .OperatingSettings = { 7, 27, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_COMPACT_INVERTED_COASTER, STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_COMPACT_INVERTED_COASTER), diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index 875c55012800..7933bdfc85b1 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch, RideMode::ReverseInclineLaunchedShuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 27, 25, 25 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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 index c8d1ca37cf07..d41b1abcde71 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -36,7 +36,8 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_START_CONSTRUCTION_INVERTED, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 27, 25, 25 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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), diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index 672f131bd182..7549e03006a3 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -31,7 +31,9 @@ constexpr RideTypeDescriptor GigaCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 17, 68, 1 }, + .OperatingSettings = { 10, 27, 17, 68 }, + .TrackSpeedSettings = { 60, 60 } + .LegacyBoosterSettings = { 17, 68, 1 }, .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 index 0eb9946b2755..520d6430bd85 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 27, 25, 25 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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 index a447dca72022..7c7135e84b31 100644 --- a/src/openrct2/ride/coaster/meta/HybridCoaster.h +++ b/src/openrct2/ride/coaster/meta/HybridCoaster.h @@ -28,7 +28,8 @@ constexpr RideTypeDescriptor HybridCoasterRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 30, 15, 52, 0 }, + .OperatingSettings = { 0, 0, 15, 52 }, + .LegacyBoosterSettings = { 15, 52, 0 }, .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 index c95241405c08..2dcc35e41f1c 100644 --- a/src/openrct2/ride/coaster/meta/HyperTwister.h +++ b/src/openrct2/ride/coaster/meta/HyperTwister.h @@ -32,7 +32,9 @@ constexpr RideTypeDescriptor HyperTwisterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 17, 68, 0 }, + .OperatingSettings = { 10, 27, 17, 68 }, + .TrackSpeedSettings = { 60, 60 }, + .LegacyBoosterSettings = { 17, 68, 0 }, .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 index 056f8ae89c55..839e6a7bab7f 100644 --- a/src/openrct2/ride/coaster/meta/Hypercoaster.h +++ b/src/openrct2/ride/coaster/meta/Hypercoaster.h @@ -30,7 +30,9 @@ constexpr RideTypeDescriptor HypercoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch, RideMode::ReverseInclineLaunchedShuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 27, 25, 25 }, + .TrackSpeedSettings = { 60, 60 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index ce99f723ce3c..6296b85c7bd0 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = RIDE_TYPE_FLAG_IS_SUSPENDED, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER, STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_INVERTED_HAIRPIN_COASTER), diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index 386f5769c7cd..43282b9a76e5 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), .DefaultMode = RideMode::PoweredLaunchPasstrough, - .OperatingSettings = { 10, 33, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 33, 25, 25 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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 index 9164a8d4ecb8..ac6914d2b332 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 7, 27, 0, 0, 38, 0 }, + .OperatingSettings = { 7, 27, 0, 38 }, + .LegacyBoosterSettings = { 0, 38, 0 }, .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 index 7dd098e0b41b..7878c705add9 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 17, 16, -1 }, + .OperatingSettings = { 0, 0, 17, 16 }, + .LegacyBoosterSettings = { 17, 16, 0-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 index b33782a0b111..62e54cbbe35c 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch, RideMode::PoweredLaunchBlockSectioned), .DefaultMode = RideMode::PoweredLaunchPasstrough, - .OperatingSettings = { 10, 31, 26, 18, 52, 0 }, + .OperatingSettings = { 10, 31, 18, 52 }, + .LegacyBoosterSettings = { 18, 52, 0 }, .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 index b08620900701..9a24dc477f70 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -38,7 +38,8 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 27, 25, 25 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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), diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 2889c2688866..109d278af5ea 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 26, 18, 18, 0 }, + .OperatingSettings = { 10, 27, 18, 18 }, + .LegacyBoosterSettings = { 18, 18, 0 }, .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/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 2f9e930e11c6..e35e0ff09b3b 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor MineRideRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MINE_RIDE, STR_RIDE_DESCRIPTION_MINE_RIDE }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MINE_RIDE), diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index 6d515c7c700e..f75f15e54067 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MINE_TRAIN_COASTER, STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MINE_TRAIN_COASTER), diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index f69e4774d326..32c75e4f323b 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 68, 1 }, + .OperatingSettings = { 0, 0, 0, 68 }, + .LegacyBoosterSettings = { 0, 68, 1 }, .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/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index f5ea7e28c950..c37c5506e708 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_IS_SUSPENDED, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MINI_SUSPENDED_COASTER), diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index 2911473643f3..39d5557ba52b 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -36,7 +36,8 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 25, 25, 0 }, + .OperatingSettings = { 10, 27, 25, 25 }, + .LegacyBoosterSettings = { 25, 25, 0 }, .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), diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index b2ba617e2ecf..9ac20938ec55 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -28,7 +28,9 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .Flags = RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::LimPoweredLaunch), .DefaultMode = RideMode::LimPoweredLaunch, - .OperatingSettings = { 7, 30, 30, 40, 40, 0 }, + .OperatingSettings = { 7, 30, 40, 40 }, + .TrackSpeedSettings = { 60, 60 }, + .LegacyBoosterSettings = { 40, 40, 0 }, .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/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index 4f903e4ca9a9..62f3919fc58c 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -29,7 +29,8 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_REVERSER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_REVERSER_ROLLER_COASTER), diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index 3b0cb73c38d7..ca14b259e4eb 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER), diff --git a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h index 18bd59feb10d..0c97f396f66d 100644 --- a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h @@ -29,7 +29,8 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 30, 15, 52, 0 }, + .OperatingSettings = { 0, 0, 15, 52 }, + .LegacyBoosterSettings = { 15, 52, 0 }, .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/SpinningWildMouse.h b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h index 645ea0882b93..4e6106cf1399 100644 --- a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h @@ -28,7 +28,8 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_SPINNING_WILD_MOUSE_GROUP, STR_SPINNING_WILD_MOUSE_GROUP_DESC }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SPINNING_WILD_MOUSE), diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index d10c6e821da1..5e76c0af84a6 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 17, 17, 0 }, + .OperatingSettings = { 10, 27, 17, 17 }, + .LegacyBoosterSettings = { 17, 17, 0 }, .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/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index 6925a4aac362..c957572390a5 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 7, 27, 0, 0, 0, 0 }, + .OperatingSettings = { 7, 27, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER), diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index 611fdce5a2ff..a8c93a8d434b 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_STEEL_WILD_MOUSE), diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index b59d4e4710ee..de47577a425a 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor SteeplechaseRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_STEEPLECHASE), diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index 518e0fb6d8b9..606490e27635 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_IS_SUSPENDED, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER, STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SUSPENDED_SWINGING_COASTER), diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index 522428567365..8e8f9276aec0 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 30, 17, 68, 0 }, + .OperatingSettings = { 10, 27, 17, 68 }, + .LegacyBoosterSettings = { 17, 68, 0 }, .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 index 52270198bc5c..de3ff7029e60 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 10, 27, 26, 17, 68, 0 }, + .OperatingSettings = { 10, 27, 17, 68 }, + .LegacyBoosterSettings = { 17, 68, 0 }, .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/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index 28a270c00e20..c12647ade7a3 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -29,7 +29,8 @@ constexpr RideTypeDescriptor VirginiaReelRTD = RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_VIRGINIA_REEL), diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index da9d5e882072..adb5a33b79f9 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -38,7 +38,8 @@ constexpr RideTypeDescriptor WaterCoasterRTD = RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIETIES | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 17, 16, -1 }, + .OperatingSettings = { 0, 0, 17, 16 }, + .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 index d739a27665bf..3a7940b74ae0 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 68, 0 }, + .OperatingSettings = { 0, 0, 0, 68 }, + .LegacyBoosterSettings = { 0, 68, 0 }, .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), diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index 53571f5f5006..d9135f16af73 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_WOODEN_WILD_MOUSE), diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index d0056d84789d..1d9c116fa0e2 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor CarRideRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_CAR_RIDE), diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 0ff77bf17591..2547719fd13a 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor CircusRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Circus), .DefaultMode = RideMode::Circus, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_CIRCUS, STR_RIDE_DESCRIPTION_CIRCUS }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_CIRCUS), diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index dbfd6f939ebc..5fc606702eba 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor CrookedHouseRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::CrookedHouse), .DefaultMode = RideMode::CrookedHouse, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_CROOKED_HOUSE, STR_RIDE_DESCRIPTION_CROOKED_HOUSE }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_CROOKED_HOUSE), diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index 5d3879d39e0e..8f0823fcee80 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor DodgemsRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::Dodgems), .DefaultMode = RideMode::Dodgems, - .OperatingSettings = { 20, 180, 0, 0, 0, 0 }, + .OperatingSettings = { 20, 180, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_DODGEMS), diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index 23de92cd37ad..dd499293cdb0 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor FerrisWheelRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::ForwardRotation, RideMode::BackwardRotation), .DefaultMode = RideMode::ForwardRotation, - .OperatingSettings = { 1, 3, 0, 0, 0, 0 }, + .OperatingSettings = { 1, 3, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL }, .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_FERRIS_WHEEL), diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index 47e0cc3fce8e..4fbce68daec2 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor FlyingSaucersRTD = RIDE_TYPE_FLAG_SINGLE_SESSION | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::Dodgems), .DefaultMode = RideMode::Dodgems, - .OperatingSettings = { 20, 180, 0, 0, 0, 0 }, + .OperatingSettings = { 20, 180, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_FLYING_SAUCERS), diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index 177b59b5f7ea..57b7b647ba00 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -35,7 +35,8 @@ constexpr RideTypeDescriptor GhostTrainRTD = RIDE_TYPE_FLAG_HAS_LANDSCAPE_DOORS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_GHOST_TRAIN), diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index ec8a20c0759f..705c3dbf242e 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor HauntedHouseRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::HauntedHouse), .DefaultMode = RideMode::HauntedHouse, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_HAUNTED_HOUSE), diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index dea5befb5296..2586d9e8dd91 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor MazeRTD = RIDE_TYPE_FLAG_PEEP_CAN_USE_UMBRELLA | RIDE_TYPE_FLAG_IS_MAZE, .RideModes = EnumsToFlags(RideMode::Maze), .DefaultMode = RideMode::Maze, - .OperatingSettings = { 1, 64, 0, 0, 0, 0 }, + .OperatingSettings = { 1, 64, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MAZE), diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index d67fc1a0fcc4..e8ec3cd5dd0c 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor MerryGoRoundRTD = RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Rotation), .DefaultMode = RideMode::Rotation, - .OperatingSettings = { 4, 25, 0, 0, 0, 0 }, + .OperatingSettings = { 4, 25, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MERRY_GO_ROUND, STR_RIDE_DESCRIPTION_MERRY_GO_ROUND }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MERRY_GO_ROUND), diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index f47110aeddd1..0a881c79ac84 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor MiniGolfRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF }, .NameConvention = { RideComponentType::Player, RideComponentType::Course, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MINI_GOLF), diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index c546fc71f355..b916a8c8385f 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MINI_HELICOPTERS), diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index 8ea78654dbf0..cf10dee61c59 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor MonorailCyclesRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MONORAIL_CYCLES), diff --git a/src/openrct2/ride/gentle/meta/MonsterTrucks.h b/src/openrct2/ride/gentle/meta/MonsterTrucks.h index 4a8cdab5164a..ce1163987ff8 100644 --- a/src/openrct2/ride/gentle/meta/MonsterTrucks.h +++ b/src/openrct2/ride/gentle/meta/MonsterTrucks.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor MonsterTrucksRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = (1uLL << static_cast(RideMode::ContinuousCircuit)), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MONSTER_TRUCKS, STR_RIDE_DESCRIPTION_MONSTER_TRUCKS_GROUP }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MONSTER_TRUCKS), diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index c35ce95009a7..71f998cef7d9 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor ObservationTowerRTD = RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::RotatingLift), .DefaultMode = RideMode::RotatingLift, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER }, .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_OBSERVATION_TOWER), diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index c31ff15a6d5e..bb50f0055694 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor SpaceRingsRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::SpaceRings), .DefaultMode = RideMode::SpaceRings, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS }, .NameConvention = { RideComponentType::Ring, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SPACE_RINGS), diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index d21cd83b9981..cef5d52ff1a5 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor SpiralSlideRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY | RIDE_TYPE_FLAG_IS_SPIRAL_SLIDE, .RideModes = EnumsToFlags(RideMode::SingleRidePerAdmission, RideMode::UnlimitedRidesPerAdmission), .DefaultMode = RideMode::SingleRidePerAdmission, - .OperatingSettings = { 1, 5, 0, 0, 0, 0 }, + .OperatingSettings = { 1, 5, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE }, .NameConvention = { RideComponentType::Train, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SPIRAL_SLIDE), diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index 96f97a884a36..acdd6d6bd4eb 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -29,7 +29,8 @@ constexpr RideTypeDescriptor CashMachineRTD = RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_CASH_MACHINE), diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index 6f54445ced5d..bfaa1d5c6604 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor DrinkStallRTD = RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_DRINK_STALL, STR_RIDE_DESCRIPTION_DRINK_STALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_DRINK_STALL), diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index d58f72f1b89c..b96e328dfa0c 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor FirstAidRTD = RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 8, 8, 0, 0, 0, 0 }, + .OperatingSettings = { 8, 8, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_FIRST_AID), diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index 0433b4580635..5e67a21bb51a 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor FoodStallRTD = RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_FOOD_STALL), diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index 487d0f9b623b..f32e2ae8bba5 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor InformationKioskRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_INFORMATION_KIOSK, STR_RIDE_DESCRIPTION_INFORMATION_KIOSK }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_INFORMATION_KIOSK), diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index 59d1edab317c..c4280635a902 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor ShopRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SHOP), diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index 8514e061a75d..c53eac0a2e47 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor ToiletsRTD = RIDE_TYPE_FLAG_IS_TOILET | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::ShopStall), .DefaultMode = RideMode::ShopStall, - .OperatingSettings = { 4, 4, 0, 0, 0, 0 }, + .OperatingSettings = { 4, 4, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_TOILETS), diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index 3f702f2e7701..2550d97303a3 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor CinemaRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::MouseTails3DFilm, RideMode::StormChasers3DFilm, RideMode::SpaceRaiders3DFilm), .DefaultMode = RideMode::MouseTails3DFilm, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_3D_CINEMA), diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index 0938e9e502ed..2944aecd6dc6 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor EnterpriseRTD = RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Rotation), .DefaultMode = RideMode::Rotation, - .OperatingSettings = { 10, 20, 0, 0, 0, 0 }, + .OperatingSettings = { 10, 20, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE }, .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_ENTERPRISE), diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index e60ed3a9aa2e..225e2c23c902 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor GoKartsRTD = RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR | RIDE_TYPE_FLAG_ALLOW_MUSIC | RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::Race, RideMode::ContinuousCircuit), .DefaultMode = RideMode::Race, - .OperatingSettings = { 1, 10, 0, 0, 0, 0 }, + .OperatingSettings = { 1, 10, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_GO_KARTS), diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index 2a94f42dac37..5326444872a1 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD = RIDE_TYPE_FLAG_ALLOW_MUSIC | RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::UpwardLaunch, RideMode::DownwardLaunch), .DefaultMode = RideMode::UpwardLaunch, - .OperatingSettings = { 10, 40, 0, 0, 0, 0 }, + .OperatingSettings = { 10, 40, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_LAUNCHED_FREEFALL), diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index 75632aa03fa6..57fb74110505 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor MagicCarpetRTD = RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Swing), .DefaultMode = RideMode::Swing, - .OperatingSettings = { 7, 15, 0, 0, 0, 0 }, + .OperatingSettings = { 7, 15, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MAGIC_CARPET), diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index ce95c26e341f..98c6cd5621f4 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor MotionSimulatorRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::FilmAvengingAviators, RideMode::FilmThrillRiders), .DefaultMode = RideMode::FilmAvengingAviators, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MOTION_SIMULATOR), diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index 6a8dbbd8c8cc..f23f19649039 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor RotoDropRTD = RIDE_TYPE_FLAG_SINGLE_SESSION | RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::FreefallDrop), .DefaultMode = RideMode::FreefallDrop, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_ROTO_DROP), diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index 6717feefb1e1..2984c9d5804d 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD = RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Swing), .DefaultMode = RideMode::Swing, - .OperatingSettings = { 7, 15, 0, 0, 0, 0 }, + .OperatingSettings = { 7, 15, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP }, .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SWINGING_INVERTER_SHIP), diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index eda2505d40f5..a0182b9fd804 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor SwingingShipRTD = RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Swing), .DefaultMode = RideMode::Swing, - .OperatingSettings = { 7, 25, 0, 0, 0, 0 }, + .OperatingSettings = { 7, 25, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP }, .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SWINGING_SHIP), diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index 0bd85bc5fbfd..518b29a6dcfa 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -32,7 +32,8 @@ constexpr RideTypeDescriptor TopSpinRTD = RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Beginners, RideMode::Intense, RideMode::Berserk), .DefaultMode = RideMode::Beginners, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_TOP_SPIN), diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index a9e8462fd6ca..e00605bdd3f4 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -30,7 +30,8 @@ constexpr RideTypeDescriptor TwistRTD = RIDE_TYPE_FLAG_SINGLE_SESSION | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY, .RideModes = EnumsToFlags(RideMode::Rotation), .DefaultMode = RideMode::Rotation, - .OperatingSettings = { 3, 6, 0, 0, 0, 0, 12, 3 }, + .OperatingSettings = { 3, 6, 0, 0, 12, 3 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST }, .NameConvention = { RideComponentType::Structure, RideComponentType::Structure, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_TWIST), diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index c07deef1a729..f214b48d320d 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor ChairliftRTD = RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_IS_SUSPENDED, .RideModes = EnumsToFlags(RideMode::StationToStation), .DefaultMode = RideMode::StationToStation, - .OperatingSettings = { 1, 4, 0, 0, 0, 0 }, + .OperatingSettings = { 1, 4, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_CHAIRLIFT), diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index aeb651bb8e91..aed35422250a 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor LiftRTD = RIDE_TYPE_FLAG_ALLOW_MUSIC | RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG_TRANSPORT_RIDE | RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER, .RideModes = EnumsToFlags(RideMode::Shuttle), .DefaultMode = RideMode::Shuttle, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT }, .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_LIFT), diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index 0d85ecae902c..ac5d88a905aa 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = RIDE_TYPE_FLAG_SUPPORTS_LEVEL_CROSSINGS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MINIATURE_RAILWAY), diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index bf00e87d78d9..762ce93cb522 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor MonorailRTD = RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_TRANSPORT_RIDE | RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_MONORAIL), diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index 572dc296ba2a..fe3be5e1bbca 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD = RIDE_TYPE_FLAG_IS_SUSPENDED, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SUSPENDED_MONORAIL, STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SUSPENDED_MONORAIL), diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index 6da96f60eb1a..6c1c1e94c93e 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -31,7 +31,8 @@ constexpr RideTypeDescriptor BoatHireRTD = RIDE_TYPE_FLAG_HAS_TRACK | RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR | RIDE_TYPE_FLAG_ALLOW_MUSIC | RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT, .RideModes = EnumsToFlags(RideMode::BoatHire), .DefaultMode = RideMode::BoatHire, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE }, .NameConvention = { RideComponentType::Boat, RideComponentType::DockingPlatform, RideComponentType::DockingPlatform }, .EnumName = nameof(RIDE_TYPE_BOAT_HIRE), diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index bad3c78765d9..8df1464caa9d 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -41,7 +41,8 @@ constexpr RideTypeDescriptor DinghySlideRTD = RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_DINGHY_SLIDE), diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 3791042a826e..91659ee0440e 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor LogFlumeRTD = RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_LOG_FLUME), diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index 411e8b374d00..00b3c207052c 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor RiverRaftsRTD = RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_RIVER_RAFTS), diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 75798341e16e..b79743ceba88 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor RiverRapidsRTD = RIDE_TYPE_FLAG_HAS_AIR_TIME | RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_RIVER_RAPIDS), diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index 8b09a53eab72..7f124c8afecc 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -34,7 +34,8 @@ constexpr RideTypeDescriptor SplashBoatsRTD = RIDE_TYPE_FLAG_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .EnumName = nameof(RIDE_TYPE_SPLASH_BOATS), diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index 285fdcc33d22..a46f30f286ae 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -33,7 +33,8 @@ constexpr RideTypeDescriptor SubmarineRideRTD = RIDE_TYPE_FLAG_ALLOW_MORE_VEHICLES_THAN_STATION_FITS, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, - .OperatingSettings = { 0, 0, 0, 0, 0, 0 }, + .OperatingSettings = { 0, 0, 0, 0 }, + .LegacyBoosterSettings = { 0, 0, 0 }, .Naming = { STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::DockingPlatform }, .EnumName = nameof(RIDE_TYPE_SUBMARINE_RIDE),