diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 8eaeb41998..829a3514c2 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -188,7 +188,7 @@ public: { ride->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC; } - ride->music = RideData4[ride->type].default_music; + ride->music = RideTypeDescriptors[ride->type].DefaultMusic; auto rideProperties = RideProperties[ride->type]; ride->operation_option = (rideProperties.min_value * 3 + rideProperties.max_value) / 4; @@ -210,7 +210,7 @@ public: { for (auto i = 0; i < NUM_SHOP_ITEMS_PER_RIDE; i++) { - ride->price[i] = RideData4[ride->type].price[i]; + ride->price[i] = RideTypeDescriptors[ride->type].DefaultPrices[i]; } if (rideEntry->shop_item[0] == SHOP_ITEM_NONE) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 9e64d3a6c4..feb435b389 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -1972,7 +1972,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, int32_t entranceNum, bool atQueue, bool t if (ride->status == RIDE_STATUS_OPEN && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { // Peeps that are leaving the park will refuse to go on any rides, with the exception of free transport rides. - assert(ride->type < std::size(RideData4)); + assert(ride->type < std::size(RideTypeDescriptors)); if (!(RideTypeDescriptors[ride->type].Flags & RIDE_TYPE_FLAG_TRANSPORT_RIDE) || ride->value == RIDE_VALUE_UNDEFINED || ride_get_price(ride) != 0) { diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index f8d997e995..1df55d5df4 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -838,7 +838,7 @@ private: if (_gameVersion == FILE_VERSION_RCT1) { // Original RCT had no music settings, take default style - dst->music = RideData4[dst->type].default_music; + dst->music = RideTypeDescriptors[dst->type].DefaultMusic; // Only merry-go-round and dodgems had music and used // the same flag as synchronise stations for the option to enable it diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index 3dd2f9ef4d..a25ba860e3 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -299,101 +299,6 @@ const rct_ride_name RideNaming[] = { { STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER }; -// rct2: 0x0097D4F0, 0x0097D4F1, 0x0097D4F2, 0x0097D4F4, 0x0097D4F5 -const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT] = { - { 20, 20, MUSIC_STYLE_ROCK_STYLE_3, }, // RIDE_TYPE_SPIRAL_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_STAND_UP_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER - { 20, 20, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_INVERTED_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_JUNIOR_ROLLER_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MINIATURE_RAILWAY - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MONORAIL - { 20, 20, MUSIC_STYLE_WILD_WEST, }, // RIDE_TYPE_MINI_SUSPENDED_COASTER - { 10, 0, MUSIC_STYLE_WATER, }, // RIDE_TYPE_BOAT_HIRE - { 20, 20, MUSIC_STYLE_WILD_WEST, }, // RIDE_TYPE_WOODEN_WILD_MOUSE - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_STEEPLECHASE - { 15, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_CAR_RIDE - { 20, 0, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_LAUNCHED_FREEFALL - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_BOBSLEIGH_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_OBSERVATION_TOWER - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_LOOPING_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_WATER, }, // RIDE_TYPE_DINGHY_SLIDE - { 20, 20, MUSIC_STYLE_WILD_WEST, }, // RIDE_TYPE_MINE_TRAIN_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_CHAIRLIFT - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MAZE - { 15, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_SPIRAL_SLIDE - { 20, 0, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_GO_KARTS - { 20, 20, MUSIC_STYLE_WATER, }, // RIDE_TYPE_LOG_FLUME - { 20, 20, MUSIC_STYLE_WATER, }, // RIDE_TYPE_RIVER_RAPIDS - { 15, 0, MUSIC_STYLE_DODGEMS_BEAT, }, // RIDE_TYPE_DODGEMS - { 15, 0, MUSIC_STYLE_PIRATES, }, // RIDE_TYPE_SWINGING_SHIP - { 15, 0, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_SWINGING_INVERTER_SHIP - { 9, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_FOOD_STALL - { 15, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_1D - { 12, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_DRINK_STALL - { 8, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_1F - { 15, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_SHOP - { 10, 0, MUSIC_STYLE_FAIRGROUND_ORGAN, }, // RIDE_TYPE_MERRY_GO_ROUND - { 9, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_22 - { 6, 25, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_INFORMATION_KIOSK - { 0, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_TOILETS - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_FERRIS_WHEEL - { 20, 0, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_MOTION_SIMULATOR - { 20, 0, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_3D_CINEMA - { 20, 0, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_TOP_SPIN - { 5, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_SPACE_RINGS - { 20, 0, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_REVERSE_FREEFALL_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_LIFT - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER - { 0, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_CASH_MACHINE - { 10, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_TWIST - { 10, 0, MUSIC_STYLE_HORROR, }, // RIDE_TYPE_HAUNTED_HOUSE - { 0, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_FIRST_AID - { 15, 0, MUSIC_STYLE_CIRCUS_SHOW, }, // RIDE_TYPE_CIRCUS - { 15, 0, MUSIC_STYLE_HORROR, }, // RIDE_TYPE_GHOST_TRAIN - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_TWISTER_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_WILD_WEST, }, // RIDE_TYPE_WOODEN_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_STEEL_WILD_MOUSE - { 20, 20, MUSIC_STYLE_ROCK_STYLE_3, }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_FLYING_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_VIRGINIA_REEL - { 20, 20, MUSIC_STYLE_WATER, }, // RIDE_TYPE_SPLASH_BOATS - { 15, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MINI_HELICOPTERS - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_SUSPENDED_MONORAIL - { 20, 20, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT - { 20, 20, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_REVERSER_ROLLER_COASTER - { 15, 20, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER - { 10, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MINI_GOLF - { 20, 20, MUSIC_STYLE_ROCK_STYLE_3, }, // RIDE_TYPE_GIGA_COASTER - { 20, 0, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_ROTO_DROP - { 15, 0, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_FLYING_SAUCERS - { 10, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_CROOKED_HOUSE - { 15, 0, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MONORAIL_CYCLES - { 20, 20, MUSIC_STYLE_TECHNO, }, // RIDE_TYPE_COMPACT_INVERTED_COASTER - { 20, 20, MUSIC_STYLE_WATER, }, // RIDE_TYPE_WATER_COASTER - { 20, 0, MUSIC_STYLE_ROCK_STYLE_2, }, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER - { 20, 20, MUSIC_STYLE_ROCK_STYLE_2, }, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER - { 15, 0, MUSIC_STYLE_EGYPTIAN, }, // RIDE_TYPE_MAGIC_CARPET - { 10, 0, MUSIC_STYLE_WATER, }, // RIDE_TYPE_SUBMARINE_RIDE - { 10, 20, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_RIVER_RAFTS - { 7, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_50 - { 20, 0, MUSIC_STYLE_ROCK_STYLE_2, }, // RIDE_TYPE_ENTERPRISE - { 12, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_52 - { 15, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_53 - { 12, 0, MUSIC_STYLE_GENTLE, }, // RIDE_TYPE_54 - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_55 - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_INVERTED_IMPULSE_COASTER - { 20, 20, MUSIC_STYLE_SUMMER, }, // RIDE_TYPE_MINI_ROLLER_COASTER - { 20, 20, MUSIC_STYLE_WILD_WEST, }, // RIDE_TYPE_MINE_RIDE - { 20, 20, MUSIC_STYLE_ROCK_STYLE_2, }, // RIDE_TYPE_59 - { 20, 20, MUSIC_STYLE_ROCK, }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER -}; - // rct2: 0x0097DD78 const ride_cost RideTrackCosts[RIDE_TYPE_COUNT] = { { 70, 5 }, // RIDE_TYPE_SPIRAL_ROLLER_COASTER diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index f8111b291a..bdbf64cd29 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -54,12 +54,6 @@ struct RideNameConvention RIDE_COMPONENT_TYPE station; }; -struct rct_ride_data_4 -{ - uint8_t price[NUM_SHOP_ITEMS_PER_RIDE]; - uint8_t default_music; -}; - struct ride_cost { uint16_t track_price; @@ -125,6 +119,8 @@ struct RideTypeDescriptor /** rct2: 0x0097D7C8, 0x0097D7C9, 0x0097D7CA */ rct_ride_lift_data LiftData; UpkeepCostsDescriptor UpkeepCosts; + money16 DefaultPrices[NUM_SHOP_ITEMS_PER_RIDE]; + uint8_t DefaultMusic; /** rct2: 0x0097D7CB */ uint8_t PhotoItem; @@ -265,7 +261,6 @@ constexpr const uint64_t AllRideModesAvailable = (1ULL << RIDE_MODE_CONTINUOUS_C | (1ULL << RIDE_MODE_DOWNWARD_LAUNCH) | (1ULL << RIDE_MODE_CROOKED_HOUSE) | (1ULL << RIDE_MODE_FREEFALL_DROP) | (1ULL << RIDE_MODE_POWERED_LAUNCH) | (1ULL << RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED); -extern const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT]; extern const ride_cost RideTrackCosts[RIDE_TYPE_COUNT]; extern const rct_ride_data_5 RideData5[RIDE_TYPE_COUNT]; @@ -295,6 +290,8 @@ constexpr const RideTypeDescriptor DummyRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 534c83b565..1f035e80d6 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -995,7 +995,7 @@ static void ride_ratings_apply_adjustments(Ride* ride, rating_tuple* ratings) // Apply total air time #ifdef ORIGINAL_RATINGS - if (RideData4[ride->type].flags & RIDE_TYPE_FLAG_HAS_AIR_TIME) + if (RideTypeDescriptors[ride->type].HasFlag(RIDE_TYPE_FLAG_HAS_AIR_TIME)) { uint16_t totalAirTime = ride->total_air_time; if (rideEntry->flags & RIDE_ENTRY_FLAG_LIMIT_AIRTIME_BONUS) diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h index 1b645c4292..511850bfe5 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -29,6 +29,8 @@ constexpr const RideTypeDescriptor AirPoweredVerticalCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 90, 20, 0, 0, 0, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index f91c202a4a..10abbdf15d 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 5 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index 9adce25772..f1ccbe860f 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 13, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index abbfb0c5a3..35086e95d4 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftArrow, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 11, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h index 97433b5128..7aebae1831 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftBM, 4, 6 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; @@ -54,6 +56,8 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterAltRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftBM, 4, 6 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index 4a2362d1b9..1d666c4587 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor GigaCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 5, 8 }), SET_FIELD(UpkeepCosts, { 10, 20, 80, 12, 3, 40 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h index e7869fe384..d73f9fa2c3 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -30,6 +30,8 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 47, 20, 80, 11, 3, 10 }), + SET_FIELD(DefaultPrices, { 15, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index 511f2524c5..5da5d89a5d 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftWildMouse, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index 3249c56f02..227453042f 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 7 }), SET_FIELD(UpkeepCosts, { 180, 20, 80, 11, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index da75a3b194..0560c5264d 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftBM, 5, 7 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 13, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h index e358156708..e25b9b2c21 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 8, 3, 5 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h index 6b2b2e51ac..f08c000f06 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::Null, 4, 6 }), SET_FIELD(UpkeepCosts, { 42, 20, 80, 9, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h index 0529d61f3f..47b90b3104 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; @@ -50,6 +52,8 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 3f18a45680..287a5ae1a7 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 184a33f7ad..dce0b90a03 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor MineRideRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index 13eace4ba9..7cc40ec866 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftArrow, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index 96c404db72..1dea3e0d42 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 35, 20, 80, 8, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index 6e85e227eb..935092012b 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 5 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index 0ebcfe1313..b3123079af 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 6 }), SET_FIELD(UpkeepCosts, { 75, 20, 90, 11, 3, 15 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; @@ -51,6 +53,8 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 6 }), SET_FIELD(UpkeepCosts, { 75, 20, 90, 11, 3, 15 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index c7971f1495..02c414fa6a 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -29,6 +29,8 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 80, 20, 0, 0, 0, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index cf895a659e..17a3721514 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -30,6 +30,8 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 3, 4 }), SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index dea9ecc68e..42900f458e 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftWood, 3, 4 }), SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index f000d7f98e..4e7e263326 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 7, 7 }), SET_FIELD(UpkeepCosts, { 41, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index 38638a6aa6..d6e2c33ece 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index b06bcc5cf1..649de8600d 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor SteelWildMouseRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftWildMouse, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index e5f1f7996a..5518e06338 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor SteeplechaseRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 5 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index ee2cc95fa7..c51e446c65 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 20, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index e906aa6789..1de363df69 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor TwisterRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftBM, 5, 8 }), SET_FIELD(UpkeepCosts, { 43, 20, 80, 11, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index 0632f405df..a95309d141 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftBM, 4, 5 }), SET_FIELD(UpkeepCosts, { 44, 20, 80, 11, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index 316be0139b..a262a15da5 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -30,6 +30,8 @@ constexpr const RideTypeDescriptor VirginiaReelRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 3, 4 }), SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index d60b333a19..0295e2ed1c 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor WaterCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 6 }), SET_FIELD(UpkeepCosts, { 60, 20, 80, 8, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index e354de6177..8109eff743 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftWood, 5, 7 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index ecb52ed5ae..2e7bf49c61 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor WoodenWildMouseRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(LiftData, { SoundId::LiftClassic, 4, 5 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index 6048404710..c13a71054c 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor CarRideRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 14ffdcdd89..dea80bf208 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_CIRCUS_SHOW), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index 35216c239b..4cec955caa 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor CrookedHouseRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 30, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index 2a1835d342..55f6f477e3 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor DodgemsRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 5, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_DODGEMS_BEAT), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index cb508a9f13..1b3191e6e0 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor FerrisWheelRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index a228ae22e9..0ca47e120c 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 90, 1, 0, 5, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index 20e79acb61..d81b42a9bf 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor GhostTrainRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 80, 20, 0, 8, 3, 5 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_HORROR), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index a3ab6a7742..5f5890b52d 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor HauntedHouseRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_HORROR), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index 520f158d77..c3a9a0badc 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -30,6 +30,8 @@ constexpr const RideTypeDescriptor MazeRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index 66db817036..82b2e4bdcf 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor MerryGoRoundRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_FAIRGROUND_ORGAN), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index 615bbe4d92..8f5d33b8d3 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor MiniGolfRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 30, 20, 80, 11, 3, 10 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index 73423356e7..8129f74d95 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor MiniHelicoptersRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index fdbd34f45c..14abe06fc5 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor MonorailCyclesRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 47, 20, 0, 8, 3, 5 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index 088e1bfa9b..c8d16e863d 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor ObservationTowerRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index e3bac1a617..f758491d0a 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor SpaceRingsRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 5, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index c4054eafe5..39bf4cd63e 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor SpiralSlideRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index 37081d3c08..ff12a6fba2 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -30,6 +30,8 @@ constexpr const RideTypeDescriptor CashMachineRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 40, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index 0a06827181..8fdc509c19 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor DrinkStallRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index 55ebaf701f..77e755418e 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor FirstAidRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 45, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index 0ca267648c..a0789f4298 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor FoodStallRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index fe639795ef..610f55bda8 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor InformationKioskRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index d77c475a81..97bdf7a0f5 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor ShopRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index 073fedf754..f2cea4f544 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor ToiletsRTD = SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 0, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index b0343288e6..51d937c51f 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor CinemaRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index bda8f4daa1..4fb2183e5d 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor EnterpriseRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index 0daf9d71f2..12090793d5 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor GoKartsRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 8, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index 246458495e..4c79994c17 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor LaunchedFreefallRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index 4890faee96..97f191f01f 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor MagicCarpetRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_EGYPTIAN), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index 4a81a2d4a5..d3e00bfadc 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor MotionSimulatorRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index b5ddcf04b0..c0c684c2fc 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor RotoDropRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index 98a8ab20f7..c84477a28c 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor SwingingInverterShipRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index 2426e56fde..4c30376f6b 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 15, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_PIRATES), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index 3aa5861e4a..b44bc7c32e 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor TopSpinRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 20, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index 619a8eb6eb..9a9fea482a 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor TwistRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index ee36a20d6d..bf132615b9 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor ChairliftRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 60, 20, 0, 4, 3, 10 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index f93eef3a8e..8d79009b06 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -32,6 +32,8 @@ constexpr const RideTypeDescriptor LiftRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index 704550f366..d3917ac10c 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor MiniatureRailwayRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 60, 20, 0, 10, 3, 5 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index b218f053d8..2f95dfa312 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor MonorailRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 65, 20, 0, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index 15465e7506..11a4a3587b 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -35,6 +35,8 @@ constexpr const RideTypeDescriptor SuspendedMonorailRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 10, 3, 10 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index 92e9c9426e..6ab01eda55 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -31,6 +31,8 @@ constexpr const RideTypeDescriptor BoatHireRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 4, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index 30cbd4885c..8523d456e0 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -35,6 +35,8 @@ constexpr const RideTypeDescriptor DinghySlideRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::LiftFrictionWheels, 4, 5 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 4, 3, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index e3b7f3e3c8..535ed1b896 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor LogFlumeRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 80, 20, 0, 9, 0, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index f92ef0326e..0da87bf5f3 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor RiverRaftsRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 9, 0, 10 }), + SET_FIELD(DefaultPrices, { 10, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 81fa2bcd10..4c4a344d22 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -35,6 +35,8 @@ constexpr const RideTypeDescriptor RiverRapidsRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 82, 20, 0, 10, 0, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index c30ed19eae..7ec85c9463 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -34,6 +34,8 @@ constexpr const RideTypeDescriptor SplashBoatsRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 9, 0, 10 }), + SET_FIELD(DefaultPrices, { 20, 20 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index acba3af2f3..b839e92c99 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -33,6 +33,8 @@ constexpr const RideTypeDescriptor SubmarineRideRTD = SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 4, 0, 0 }), + SET_FIELD(DefaultPrices, { 10, 0 }), + SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), }; // clang-format on