mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge d571e53347 into d58673105d

This commit is contained in:
spacek531 2024-05-10 01:49:42 +00:00 committed by GitHub
parent d58673105d d571e53347
commit 95790b1498
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
92 changed files with 138 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/ride/Ride.cpp
View File

@ -5444,19 +5444,8 @@ bool RideHasRatings(const Ride& ride)
int32_t GetBoosterSpeed(ride_type_t rideType, int32_t rawSpeed)
{
int8_t shiftFactor = GetRideTypeDescriptor(rideType).OperatingSettings.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()

34
src/openrct2/ride/RideData.h
View File

@ -199,12 +199,30 @@ struct RideOperatingSettings
{
uint8_t MinValue;
uint8_t MaxValue;
uint8_t MaxBrakesSpeed;
uint8_t OperatingSettingMultiplier = 1; // Used for the Ride window, cosmetic only.
};
struct RideTrackSpeedSettings
{
int8_t BrakesMaxSpeed = 30;
int8_t BoosterMaxSpeed = 30;
};
struct RideBoosterSettings
{
uint8_t PoweredLiftAcceleration;
uint8_t BoosterAcceleration;
int8_t BoosterSpeedFactor; // The factor to shift the raw booster speed with
uint16_t AccelerationFactor = 12;
uint8_t OperatingSettingMultiplier = 1; // Used for the Ride window, cosmetic only.
uint8_t AccelerationFactor = 12; // the amount to right-shift the launch speed for powered launch from a station
};
struct RideLegacyBoosterSettings
// These values that must be kept for backwards compatibility. New ride types should set the acceleration values equal to
// BoosterSettings' and leave BoosterSpeedFactor at default.
{
uint8_t PoweredLiftAcceleration = 0; // PoweredLiftAcceleration value before unified-speed update
uint8_t BoosterAcceleration = 0; // BoosterAcceleration value before unified-speed update
int8_t BoosterSpeedFactor = 2; // Multiplier representing how much to multiply booster speed by, scaled to 2x the final
// multiplier.
};
struct RatingsModifier
@ -317,6 +335,9 @@ struct RideTypeDescriptor
RideMode DefaultMode{};
/** rct2: 0x0097CF40 */
RideOperatingSettings OperatingSettings{};
RideTrackSpeedSettings TrackSpeedSettings{};
RideBoosterSettings BoosterSettings{};
RideLegacyBoosterSettings LegacyBoosterSettings{};
RideNaming Naming{};
RideNameConvention NameConvention{};
const char* EnumName{};
@ -538,7 +559,10 @@ constexpr RideTypeDescriptor DummyRTD =
.Flags = 0,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 0, 0, 0 },
.OperatingSettings = { 0, 0, 1 },
.TrackSpeedSettings = { 30, 30 },
.BoosterSettings = {0, 0, 12},
.LegacyBoosterSettings = {0, 0, 2},
.Naming = { STR_UNKNOWN_RIDE, STR_RIDE_DESCRIPTION_UNKNOWN },
.NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
.EnumName = "(INVALID)",

8
src/openrct2/ride/Vehicle.cpp
View File

@ -2535,7 +2535,7 @@ void Vehicle::UpdateDeparting()
case RideMode::UpwardLaunch:
if ((curRide->launch_speed << 16) > velocity)
{
acceleration = curRide->launch_speed << rtd.OperatingSettings.AccelerationFactor;
acceleration = curRide->launch_speed << rtd.BoosterSettings.AccelerationFactor;
}
break;
case RideMode::DownwardLaunch:
@ -7108,7 +7108,7 @@ Loc6DAEB9:
auto boosterSpeed = GetBoosterSpeed(curRide.type, (brake_speed << 16));
if (boosterSpeed > _vehicleVelocityF64E08)
{
acceleration = GetRideTypeDescriptor(curRide.type).OperatingSettings.BoosterAcceleration
acceleration = GetRideTypeDescriptor(curRide.type).LegacyBoosterSettings.BoosterAcceleration
<< 16; //_vehicleVelocityF64E08 * 1.2;
}
}
@ -7120,7 +7120,7 @@ Loc6DAEB9:
if ((trackType == TrackElemType::Flat && curRide.type == RIDE_TYPE_REVERSE_FREEFALL_COASTER)
|| (trackType == TrackElemType::PoweredLift))
{
acceleration = GetRideTypeDescriptor(curRide.type).OperatingSettings.PoweredLiftAcceleration << 16;
acceleration = GetRideTypeDescriptor(curRide.type).LegacyBoosterSettings.PoweredLiftAcceleration << 16;
}
if (trackType == TrackElemType::BrakeForDrop)
{
@ -7490,7 +7490,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
auto boosterSpeed = GetBoosterSpeed(curRide.type, (brake_speed << 16));
if (boosterSpeed < _vehicleVelocityF64E08)
{
acceleration = GetRideTypeDescriptor(curRide.type).OperatingSettings.BoosterAcceleration << 16;
acceleration = GetRideTypeDescriptor(curRide.type).LegacyBoosterSettings.BoosterAcceleration << 16;
}
}

5
src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h
View File

@ -28,7 +28,10 @@ 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 },
.TrackSpeedSettings = { 60, 60 },
.BoosterSettings = { 40, 40, 13 },
.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),

2
src/openrct2/ride/coaster/meta/AlpineCoaster.h
View File

@ -31,7 +31,7 @@ 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 },
.TrackSpeedSettings = { 10, 10 },
.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),

1
src/openrct2/ride/coaster/meta/BobsleighCoaster.h
View File

@ -30,7 +30,6 @@ 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 },
.Naming = { STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER },
.NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_BOBSLEIGH_COASTER),

3
src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h
View File

@ -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 },
.BoosterSettings = { 17, 16 },
.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),

2
src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h
View File

@ -31,7 +31,7 @@ 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 },
.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),

3
src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h
View File

@ -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 },
.BoosterSettings = { 0, 68 },
.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),

2
src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h
View File

@ -30,7 +30,7 @@ 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 },
.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),

4
src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h
View File

@ -31,7 +31,9 @@ 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 },
.BoosterSettings = { 25, 25 },
.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),

8
src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h
View File

@ -36,7 +36,9 @@ 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 },
.BoosterSettings = { 25, 25 },
.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),
@ -110,7 +112,9 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD =
RIDE_TYPE_FLAGS_COMMON_COASTER | 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 },
.BoosterSettings = { 25, 25 },
.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),

5
src/openrct2/ride/coaster/meta/GigaCoaster.h
View File

@ -31,7 +31,10 @@ 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 },
.TrackSpeedSettings = { 60, 60 },
.BoosterSettings = { 17, 68 },
.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),

4
src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h
View File

@ -30,7 +30,9 @@ 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 },
.BoosterSettings = { 25, 25 },
.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),

3
src/openrct2/ride/coaster/meta/HybridCoaster.h
View File

@ -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 },
.BoosterSettings = { 15, 52 },
.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),

5
src/openrct2/ride/coaster/meta/HyperTwister.h
View File

@ -32,7 +32,10 @@ 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 },
.TrackSpeedSettings = { 60, 60 },
.BoosterSettings = { 17, 68 },
.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),

5
src/openrct2/ride/coaster/meta/Hypercoaster.h
View File

@ -30,7 +30,10 @@ 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 },
.TrackSpeedSettings = { 60, 60 },
.BoosterSettings = { 25, 25 },
.LegacyBoosterSettings = { 25, 25 },
.Naming = { STR_RIDE_NAME_HYPERCOASTER, STR_RIDE_DESCRIPTION_HYPERCOASTER },
.NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_HYPERCOASTER),

1
src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h
View File

@ -30,7 +30,6 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD =
RIDE_TYPE_FLAG_IS_SUSPENDED,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

4
src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h
View File

@ -31,7 +31,9 @@ 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 },
.BoosterSettings = { 25, 25 },
.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),

4
src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
View File

@ -31,7 +31,9 @@ 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 },
.BoosterSettings = { 0, 38 },
.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),

4
src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h
View File

@ -31,7 +31,9 @@ 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 },
.TrackSpeedSettings = { 30, 15 },
.BoosterSettings = { 17, 16 },
.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),

4
src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h
View File

@ -31,7 +31,9 @@ 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 },
.BoosterSettings = { 18, 52 },
.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),

8
src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h
View File

@ -38,7 +38,9 @@ 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 },
.BoosterSettings = { 25, 25 },
.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),
@ -108,7 +110,9 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD =
RIDE_TYPE_FLAGS_COMMON_COASTER,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 10, 27, 30, 25, 25, 0 },
.OperatingSettings = { 10, 27 },
.BoosterSettings = { 25, 25 },
.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),

4
src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h
View File

@ -31,7 +31,9 @@ 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 },
.BoosterSettings = { 18, 18 },
.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),

1
src/openrct2/ride/coaster/meta/MineRide.h
View File

@ -31,7 +31,6 @@ constexpr RideTypeDescriptor MineRideRTD =
RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/coaster/meta/MineTrainCoaster.h
View File

@ -32,7 +32,6 @@ 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 },
.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),

3
src/openrct2/ride/coaster/meta/MiniRollerCoaster.h
View File

@ -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 },
.BoosterSettings = { 0, 68 },
.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),

1
src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h
View File

@ -31,7 +31,6 @@ 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 },
.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),

8
src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h
View File

@ -36,7 +36,9 @@ 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 },
.BoosterSettings = { 25, 25 },
.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),
@ -109,7 +111,9 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD =
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAG_HAS_SEAT_ROTATION,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 10, 27, 30, 25, 25, 0 },
.OperatingSettings = { 10, 27 },
.BoosterSettings = { 25, 25 },
.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),

5
src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h
View File

@ -28,7 +28,10 @@ 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 },
.TrackSpeedSettings = { 60, 60 },
.BoosterSettings = { 40, 40 },
.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),

1
src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h
View File

@ -29,7 +29,6 @@ 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 },
.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),

1
src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h
View File

@ -31,7 +31,6 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD =
RIDE_TYPE_FLAG_ALLOW_REVERSED_TRAINS,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

3
src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h
View File

@ -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 },
.BoosterSettings = { 15, 52 },
.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),

1
src/openrct2/ride/coaster/meta/SpinningWildMouse.h
View File

@ -28,7 +28,6 @@ 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 },
.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),

4
src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h
View File

@ -30,7 +30,9 @@ 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 },
.BoosterSettings = { 17, 17 },
.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),

2
src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h
View File

@ -31,7 +31,7 @@ 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 },
.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),

1
src/openrct2/ride/coaster/meta/SteelWildMouse.h
View File

@ -30,7 +30,6 @@ 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 },
.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),

1
src/openrct2/ride/coaster/meta/Steeplechase.h
View File

@ -30,7 +30,6 @@ 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 },
.Naming = { STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_STEEPLECHASE),

1
src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h
View File

@ -30,7 +30,6 @@ 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 },
.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),

4
src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h
View File

@ -33,7 +33,9 @@ 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 },
.BoosterSettings = { 17, 68 },
.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),

4
src/openrct2/ride/coaster/meta/VerticalDropCoaster.h
View File

@ -32,7 +32,9 @@ 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 },
.BoosterSettings = { 17, 68 },
.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),

1
src/openrct2/ride/coaster/meta/VirginiaReel.h
View File

@ -29,7 +29,6 @@ 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 },
.Naming = { STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_VIRGINIA_REEL),

4
src/openrct2/ride/coaster/meta/WaterCoaster.h
View File

@ -38,7 +38,9 @@ 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 },
.TrackSpeedSettings = { 30, 15 },
.BoosterSettings = { 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),

3
src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h
View File

@ -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 },
.BoosterSettings = { 0, 68 },
.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),

1
src/openrct2/ride/coaster/meta/WoodenWildMouse.h
View File

@ -31,7 +31,6 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD =
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/gentle/meta/CarRide.h
View File

@ -34,7 +34,6 @@ 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 },
.Naming = { STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_CAR_RIDE),

1
src/openrct2/ride/gentle/meta/Circus.h
View File

@ -32,7 +32,6 @@ constexpr RideTypeDescriptor CircusRTD =
RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY,
.RideModes = EnumsToFlags(RideMode::Circus),
.DefaultMode = RideMode::Circus,
.OperatingSettings = { 0, 0, 0, 0, 0, 0 },
.Naming = { STR_RIDE_NAME_CIRCUS, STR_RIDE_DESCRIPTION_CIRCUS },
.NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_CIRCUS),

1
src/openrct2/ride/gentle/meta/CrookedHouse.h
View File

@ -32,7 +32,6 @@ constexpr RideTypeDescriptor CrookedHouseRTD =
RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY,
.RideModes = EnumsToFlags(RideMode::CrookedHouse),
.DefaultMode = RideMode::CrookedHouse,
.OperatingSettings = { 0, 0, 0, 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),

2
src/openrct2/ride/gentle/meta/Dodgems.h
View File

@ -33,7 +33,7 @@ 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 },
.Naming = { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS },
.NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_DODGEMS),

2
src/openrct2/ride/gentle/meta/FerrisWheel.h
View File

@ -32,7 +32,7 @@ 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 },
.Naming = { STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL },
.NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_FERRIS_WHEEL),

2
src/openrct2/ride/gentle/meta/FlyingSaucers.h
View File

@ -32,7 +32,7 @@ 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 },
.Naming = { STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS },
.NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_FLYING_SAUCERS),

1
src/openrct2/ride/gentle/meta/GhostTrain.h
View File

@ -35,7 +35,6 @@ constexpr RideTypeDescriptor GhostTrainRTD =
RIDE_TYPE_FLAG_HAS_LANDSCAPE_DOORS,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/gentle/meta/HauntedHouse.h
View File

@ -32,7 +32,6 @@ constexpr RideTypeDescriptor HauntedHouseRTD =
RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY,
.RideModes = EnumsToFlags(RideMode::HauntedHouse),
.DefaultMode = RideMode::HauntedHouse,
.OperatingSettings = { 0, 0, 0, 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),

2
src/openrct2/ride/gentle/meta/Maze.h
View File

@ -31,7 +31,7 @@ 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 },
.Naming = { STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE },
.NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MAZE),

2
src/openrct2/ride/gentle/meta/MerryGoRound.h
View File

@ -32,7 +32,7 @@ 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 },
.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),

1
src/openrct2/ride/gentle/meta/MiniGolf.h
View File

@ -30,7 +30,6 @@ 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 },
.Naming = { STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF },
.NameConvention = { RideComponentType::Player, RideComponentType::Course, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MINI_GOLF),

1
src/openrct2/ride/gentle/meta/MiniHelicopters.h
View File

@ -34,7 +34,6 @@ 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 },
.Naming = { STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MINI_HELICOPTERS),

1
src/openrct2/ride/gentle/meta/MonorailCycles.h
View File

@ -33,7 +33,6 @@ 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 },
.Naming = { STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MONORAIL_CYCLES),

1
src/openrct2/ride/gentle/meta/MonsterTrucks.h
View File

@ -33,7 +33,6 @@ constexpr RideTypeDescriptor MonsterTrucksRTD =
RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT,
.RideModes = (1uLL << static_cast<uint8_t>(RideMode::ContinuousCircuit)),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/gentle/meta/ObservationTower.h
View File

@ -32,7 +32,6 @@ 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 },
.Naming = { STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER },
.NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_OBSERVATION_TOWER),

1
src/openrct2/ride/gentle/meta/SpaceRings.h
View File

@ -31,7 +31,6 @@ 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 },
.Naming = { STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS },
.NameConvention = { RideComponentType::Ring, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_SPACE_RINGS),

2
src/openrct2/ride/gentle/meta/SpiralSlide.h
View File

@ -32,7 +32,7 @@ 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 },
.Naming = { STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE },
.NameConvention = { RideComponentType::Train, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_SPIRAL_SLIDE),

1
src/openrct2/ride/shops/meta/CashMachine.h
View File

@ -29,7 +29,6 @@ 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 },
.Naming = { STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE },
.NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_CASH_MACHINE),

1
src/openrct2/ride/shops/meta/DrinkStall.h
View File

@ -30,7 +30,6 @@ constexpr RideTypeDescriptor DrinkStallRTD =
RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN,
.RideModes = EnumsToFlags(RideMode::ShopStall),
.DefaultMode = RideMode::ShopStall,
.OperatingSettings = { 0, 0, 0, 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),

2
src/openrct2/ride/shops/meta/FirstAid.h
View File

@ -30,7 +30,7 @@ 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 },
.Naming = { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID },
.NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_FIRST_AID),

1
src/openrct2/ride/shops/meta/FoodStall.h
View File

@ -30,7 +30,6 @@ constexpr RideTypeDescriptor FoodStallRTD =
RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN,
.RideModes = EnumsToFlags(RideMode::ShopStall),
.DefaultMode = RideMode::ShopStall,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/shops/meta/InformationKiosk.h
View File

@ -30,7 +30,6 @@ constexpr RideTypeDescriptor InformationKioskRTD =
RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY,
.RideModes = EnumsToFlags(RideMode::ShopStall),
.DefaultMode = RideMode::ShopStall,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/shops/meta/Shop.h
View File

@ -30,7 +30,6 @@ constexpr RideTypeDescriptor ShopRTD =
RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY,
.RideModes = EnumsToFlags(RideMode::ShopStall),
.DefaultMode = RideMode::ShopStall,
.OperatingSettings = { 0, 0, 0, 0, 0, 0 },
.Naming = { STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP },
.NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_SHOP),

2
src/openrct2/ride/shops/meta/Toilets.h
View File

@ -30,7 +30,7 @@ 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 },
.Naming = { STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS },
.NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_TOILETS),

1
src/openrct2/ride/thrill/meta/3DCinema.h
View File

@ -32,7 +32,6 @@ 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 },
.Naming = { STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA },
.NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_3D_CINEMA),

2
src/openrct2/ride/thrill/meta/Enterprise.h
View File

@ -31,7 +31,7 @@ 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 },
.Naming = { STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE },
.NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_ENTERPRISE),

2
src/openrct2/ride/thrill/meta/GoKarts.h
View File

@ -31,7 +31,7 @@ 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 },
.Naming = { STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_GO_KARTS),

2
src/openrct2/ride/thrill/meta/LaunchedFreefall.h
View File

@ -31,7 +31,7 @@ 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 },
.Naming = { STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_LAUNCHED_FREEFALL),

2
src/openrct2/ride/thrill/meta/MagicCarpet.h
View File

@ -32,7 +32,7 @@ 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 },
.Naming = { STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET },
.NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MAGIC_CARPET),

1
src/openrct2/ride/thrill/meta/MotionSimulator.h
View File

@ -31,7 +31,6 @@ 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 },
.Naming = { STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR },
.NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MOTION_SIMULATOR),

1
src/openrct2/ride/thrill/meta/RotoDrop.h
View File

@ -32,7 +32,6 @@ 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 },
.Naming = { STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_ROTO_DROP),

2
src/openrct2/ride/thrill/meta/SwingingInverterShip.h
View File

@ -32,7 +32,7 @@ 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 },
.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),

2
src/openrct2/ride/thrill/meta/SwingingShip.h
View File

@ -33,7 +33,7 @@ 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 },
.Naming = { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP },
.NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_SWINGING_SHIP),

1
src/openrct2/ride/thrill/meta/TopSpin.h
View File

@ -32,7 +32,6 @@ 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 },
.Naming = { STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN },
.NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_TOP_SPIN),

2
src/openrct2/ride/thrill/meta/Twist.h
View File

@ -30,7 +30,7 @@ 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, 3 },
.Naming = { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST },
.NameConvention = { RideComponentType::Structure, RideComponentType::Structure, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_TWIST),

2
src/openrct2/ride/transport/meta/Chairlift.h
View File

@ -33,7 +33,7 @@ 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 },
.Naming = { STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT },
.NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_CHAIRLIFT),

1
src/openrct2/ride/transport/meta/Lift.h
View File

@ -31,7 +31,6 @@ 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 },
.Naming = { STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT },
.NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_LIFT),

1
src/openrct2/ride/transport/meta/MiniatureRailway.h
View File

@ -34,7 +34,6 @@ 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 },
.Naming = { STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY },
.NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MINIATURE_RAILWAY),

1
src/openrct2/ride/transport/meta/Monorail.h
View File

@ -34,7 +34,6 @@ 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 },
.Naming = { STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL },
.NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_MONORAIL),

1
src/openrct2/ride/transport/meta/SuspendedMonorail.h
View File

@ -34,7 +34,6 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD =
RIDE_TYPE_FLAG_IS_SUSPENDED,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/water/meta/BoatHire.h
View File

@ -31,7 +31,6 @@ 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 },
.Naming = { STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE },
.NameConvention = { RideComponentType::Boat, RideComponentType::DockingPlatform, RideComponentType::DockingPlatform },
.EnumName = nameof(RIDE_TYPE_BOAT_HIRE),

1
src/openrct2/ride/water/meta/DinghySlide.h
View File

@ -41,7 +41,6 @@ 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 },
.Naming = { STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE },
.NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_DINGHY_SLIDE),

1
src/openrct2/ride/water/meta/LogFlume.h
View File

@ -33,7 +33,6 @@ constexpr RideTypeDescriptor LogFlumeRTD =
RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT,
.RideModes = EnumsToFlags(RideMode::ContinuousCircuit),
.DefaultMode = RideMode::ContinuousCircuit,
.OperatingSettings = { 0, 0, 0, 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),

1
src/openrct2/ride/water/meta/RiverRafts.h
View File

@ -33,7 +33,6 @@ 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 },
.Naming = { STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS },
.NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_RIVER_RAFTS),

1
src/openrct2/ride/water/meta/RiverRapids.h
View File

@ -34,7 +34,6 @@ 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 },
.Naming = { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS },
.NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_RIVER_RAPIDS),

1
src/openrct2/ride/water/meta/SplashBoats.h
View File

@ -34,7 +34,6 @@ 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 },
.Naming = { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS },
.NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
.EnumName = nameof(RIDE_TYPE_SPLASH_BOATS),

1
src/openrct2/ride/water/meta/SubmarineRide.h
View File

@ -33,7 +33,6 @@ 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 },
.Naming = { STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE },
.NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::DockingPlatform },
.EnumName = nameof(RIDE_TYPE_SUBMARINE_RIDE),