diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 525392f729..53ff4ff551 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -110,7 +110,7 @@ public: return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_INVALID_RIDE_TYPE); } - const track_colour_preset_list* colourPresets = &RideColourPresets[_rideType]; + const track_colour_preset_list* colourPresets = &RideTypeDescriptors[_rideType].ColourPresets; if (_colour1 >= colourPresets->count) { return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index a9a078f207..1f7381ea12 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5539,12 +5539,12 @@ bool Ride::NameExists(const std::string_view& name, ride_id_t excludeRideId) */ int32_t ride_get_random_colour_preset_index(uint8_t ride_type) { - if (ride_type >= std::size(RideColourPresets)) + if (ride_type >= std::size(RideTypeDescriptors)) { return 0; } - const track_colour_preset_list* colourPresets = &RideColourPresets[ride_type]; + const track_colour_preset_list* colourPresets = &RideTypeDescriptors[ride_type].ColourPresets; // 200 attempts to find a colour preset that hasn't already been used in the park for this ride type for (int32_t i = 0; i < 200; i++) @@ -5566,7 +5566,7 @@ int32_t ride_get_random_colour_preset_index(uint8_t ride_type) */ void Ride::SetColourPreset(uint8_t index) { - const track_colour_preset_list* colourPresets = &RideColourPresets[type]; + const track_colour_preset_list* colourPresets = &RideTypeDescriptors[type].ColourPresets; TrackColour colours = { COLOUR_BLACK, COLOUR_BLACK, COLOUR_BLACK }; // Stalls save their default colour in the vehicle settings (since they share a common ride type) if (!IsRide()) diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index 363fb5f93f..cfd2396eff 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -164,562 +164,6 @@ const uint16_t RideFilmLength[3] = { 7000 // SPACE_RAIDERS }; -#define TRACK_COLOUR_PRESETS(...) {static_cast(std::size({__VA_ARGS__})), {__VA_ARGS__}} - -#define DEFAULT_FLAT_RIDE_COLOUR_PRESET TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW } ) -#define DEFAULT_STALL_COLOUR_PRESET TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED } ) - -const track_colour_preset_list RideColourPresets[] = { - // RIDE_TYPE_SPIRAL_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_GREEN }, - { COLOUR_GREY, COLOUR_GREY, COLOUR_BORDEAUX_RED }, - ), - - // RIDE_TYPE_STAND_UP_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, - { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, - { COLOUR_LIGHT_ORANGE, COLOUR_WHITE, COLOUR_LIGHT_ORANGE }, - { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, - { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_WHITE }, - { COLOUR_SATURATED_BROWN, COLOUR_LIGHT_ORANGE, COLOUR_SATURATED_BROWN }, - ), - - // RIDE_TYPE_SUSPENDED_SWINGING_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_LIGHT_BROWN }, - { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, - { COLOUR_SATURATED_BROWN, COLOUR_YELLOW, COLOUR_SATURATED_BROWN }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_OLIVE_GREEN }, - ), - - // RIDE_TYPE_INVERTED_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, - { COLOUR_WHITE, COLOUR_YELLOW, COLOUR_WHITE }, - { COLOUR_SALMON_PINK, COLOUR_SALMON_PINK, COLOUR_GREY }, - { COLOUR_BLACK, COLOUR_BRIGHT_RED, COLOUR_BLACK }, - { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BLACK }, - ), - - // RIDE_TYPE_JUNIOR_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_BROWN }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_OLIVE_GREEN }, - { COLOUR_TEAL, COLOUR_YELLOW, COLOUR_TEAL }, - { COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_OLIVE_GREEN }, - { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, - ), - - // RIDE_TYPE_MINIATURE_RAILWAY - TRACK_COLOUR_PRESETS( - { COLOUR_LIGHT_BLUE, COLOUR_WHITE, COLOUR_DARK_BROWN }, - { COLOUR_BRIGHT_RED, COLOUR_WHITE, COLOUR_BLACK }, - ), - - // RIDE_TYPE_MONORAIL - TRACK_COLOUR_PRESETS( - { COLOUR_GREY, COLOUR_GREY, COLOUR_DARK_OLIVE_GREEN }, - { COLOUR_GREY, COLOUR_GREY, COLOUR_SATURATED_BROWN }, - { COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, - { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_WHITE }, - ), - - // RIDE_TYPE_MINI_SUSPENDED_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BLACK, COLOUR_BLACK, COLOUR_SATURATED_BROWN }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, - ), - - // RIDE_TYPE_BOAT_HIRE - TRACK_COLOUR_PRESETS( - { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_WHITE }, - { COLOUR_BLACK, COLOUR_BLACK, COLOUR_DARK_GREEN }, - { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_YELLOW }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED }, - ), - - // RIDE_TYPE_WOODEN_WILD_MOUSE - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN }, - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_SATURATED_BROWN }, - ), - - // RIDE_TYPE_STEEPLECHASE - TRACK_COLOUR_PRESETS( - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, - { COLOUR_BRIGHT_GREEN, COLOUR_BRIGHT_GREEN, COLOUR_BLACK }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BLACK }, - { COLOUR_LIGHT_ORANGE, COLOUR_LIGHT_ORANGE, COLOUR_BLACK }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_BLACK }, - { COLOUR_BRIGHT_PINK, COLOUR_BRIGHT_PINK, COLOUR_BLACK }, - ), - - // RIDE_TYPE_CAR_RIDE - TRACK_COLOUR_PRESETS( - { COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_GREY }, - { COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE, COLOUR_WHITE }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_OLIVE_GREEN }, - { COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK }, - ), - - // RIDE_TYPE_LAUNCHED_FREEFALL - TRACK_COLOUR_PRESETS( - { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_LIGHT_PURPLE }, - { COLOUR_DARK_GREEN, COLOUR_YELLOW, COLOUR_WHITE }, - ), - - // RIDE_TYPE_BOBSLEIGH_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_WHITE }, - { COLOUR_LIGHT_BLUE, COLOUR_WHITE, COLOUR_BLACK }, - { COLOUR_YELLOW, COLOUR_BRIGHT_RED, COLOUR_BLACK }, - ), - - // RIDE_TYPE_OBSERVATION_TOWER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, - { COLOUR_LIGHT_BLUE, COLOUR_YELLOW, COLOUR_GREY }, - ), - - // RIDE_TYPE_LOOPING_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_BLACK }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_SATURATED_RED }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_WHITE }, - { COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE, COLOUR_DARK_GREEN }, - { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_LIGHT_BROWN }, - { COLOUR_GREY, COLOUR_LIGHT_ORANGE, COLOUR_GREY }, - ), - - // RIDE_TYPE_DINGHY_SLIDE - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_GREEN, COLOUR_SATURATED_BROWN, COLOUR_DARK_GREEN }, - { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_TEAL }, - { COLOUR_BRIGHT_RED, COLOUR_GREY, COLOUR_SATURATED_RED }, - ), - - // RIDE_TYPE_MINE_TRAIN_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_DARK_BROWN }, - { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_BLACK }, - ), - - // RIDE_TYPE_CHAIRLIFT - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_GREY }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_OLIVE_GREEN }, - { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_WHITE }, - ), - - // RIDE_TYPE_CORKSCREW_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, - { COLOUR_BLACK, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_GREEN }, - ), - - // RIDE_TYPE_MAZE - TRACK_COLOUR_PRESETS( - { COLOUR_GREY, COLOUR_GREY, COLOUR_GREY }, - ), - - // RIDE_TYPE_SPIRAL_SLIDE - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_DARK_BROWN }, - { COLOUR_LIGHT_BLUE, COLOUR_BRIGHT_PINK, COLOUR_LIGHT_PURPLE }, - ), - - // RIDE_TYPE_GO_KARTS - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, - { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN }, - { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, - ), - - // RIDE_TYPE_LOG_FLUME - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_GREY }, - { COLOUR_OLIVE_GREEN, COLOUR_BLACK, COLOUR_GREY }, - ), - - // RIDE_TYPE_RIVER_RAPIDS - TRACK_COLOUR_PRESETS( - { COLOUR_WHITE, COLOUR_BLACK, COLOUR_DARK_BROWN }, - ), - - // RIDE_TYPE_DODGEMS - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN }, - { COLOUR_LIGHT_BLUE, COLOUR_GREY, COLOUR_GREY }, - { COLOUR_DARK_GREEN, COLOUR_BLACK, COLOUR_DARK_GREEN }, - ), - - // RIDE_TYPE_SWINGING_SHIP - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, - ), - - // RIDE_TYPE_SWINGING_INVERTER_SHIP - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK }, - { COLOUR_BLACK, COLOUR_SATURATED_BROWN, COLOUR_BLACK }, - ), - - // RIDE_TYPE_FOOD_STALL - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_1D - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_DRINK_STALL - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_1F - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_SHOP - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_MERRY_GO_ROUND - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_22 - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_INFORMATION_KIOSK - DEFAULT_STALL_COLOUR_PRESET, - - // RIDE_TYPE_TOILETS - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_FERRIS_WHEEL - TRACK_COLOUR_PRESETS( - { COLOUR_BLACK, COLOUR_BLACK, COLOUR_BLACK }, - { COLOUR_GREY, COLOUR_GREY, COLOUR_GREY }, - ), - - // RIDE_TYPE_MOTION_SIMULATOR - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_3D_CINEMA - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_TOP_SPIN - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_YELLOW }, - { COLOUR_TEAL, COLOUR_WHITE, COLOUR_WHITE }, - { COLOUR_DARK_GREEN, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, - ), - - // RIDE_TYPE_SPACE_RINGS - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_REVERSE_FREEFALL_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_GREEN, COLOUR_YELLOW, COLOUR_DARK_GREEN }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_YELLOW }, - { COLOUR_GREY, COLOUR_SALMON_PINK, COLOUR_GREY }, - ), - - // RIDE_TYPE_LIFT - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_GREY }, - { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY }, - { COLOUR_BLACK, COLOUR_BLACK, COLOUR_GREY }, - ), - - // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BLACK, COLOUR_GREY, COLOUR_BLACK }, - { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY }, - ), - - // RIDE_TYPE_CASH_MACHINE - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_TWIST - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_HAUNTED_HOUSE - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_FIRST_AID - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_CIRCUS - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_GHOST_TRAIN - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_GREEN, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, - { COLOUR_TEAL, COLOUR_WHITE, COLOUR_DARK_BROWN }, - { COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, - { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK }, - ), - - // RIDE_TYPE_TWISTER_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, - { COLOUR_AQUAMARINE, COLOUR_AQUAMARINE, COLOUR_DARK_PURPLE }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_LIGHT_BLUE }, - { COLOUR_DARK_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN }, - { COLOUR_BORDEAUX_RED, COLOUR_LIGHT_ORANGE, COLOUR_WHITE }, - ), - - // RIDE_TYPE_WOODEN_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BLACK, COLOUR_WHITE }, - { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, - { COLOUR_YELLOW, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN }, - { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_WHITE }, - { COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_BLACK }, - ), - - // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_WHITE, COLOUR_DARK_BROWN, COLOUR_WHITE }, - { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN }, - { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN }, - ), - - // RIDE_TYPE_STEEL_WILD_MOUSE - TRACK_COLOUR_PRESETS( - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_YELLOW }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, - { COLOUR_DARK_PURPLE, COLOUR_BRIGHT_PINK, COLOUR_DARK_PURPLE }, - { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_BORDEAUX_RED }, - ), - - // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_PINK, COLOUR_YELLOW, COLOUR_YELLOW }, - { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, - { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE }, - ), - - // RIDE_TYPE_38 - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_PINK, COLOUR_YELLOW, COLOUR_YELLOW }, - { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, - { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE }, - ), - - // RIDE_TYPE_FLYING_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_TEAL }, - { COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE }, - ), - - // RIDE_TYPE_3A - TRACK_COLOUR_PRESETS( - { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_TEAL }, - { COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE }, - ), - - // RIDE_TYPE_VIRGINIA_REEL - TRACK_COLOUR_PRESETS( - { COLOUR_SATURATED_BROWN, COLOUR_GREY, COLOUR_SATURATED_BROWN }, - { COLOUR_BLACK, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN }, - { COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, - ), - - // RIDE_TYPE_SPLASH_BOATS - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, - { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY }, - ), - - // RIDE_TYPE_MINI_HELICOPTERS - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_PURPLE, COLOUR_YELLOW, COLOUR_DARK_PURPLE }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_BRIGHT_RED }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_YELLOW }, - { COLOUR_BRIGHT_PINK, COLOUR_BRIGHT_PINK, COLOUR_WHITE }, - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, - ), - - // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_YELLOW }, - { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_YELLOW }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN }, - ), - - // RIDE_TYPE_SUSPENDED_MONORAIL - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_BLACK, COLOUR_BLACK }, - { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_BLACK }, - { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_BLACK }, - ), - - // RIDE_TYPE_40 - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_YELLOW }, - { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_YELLOW }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN }, - ), - - // RIDE_TYPE_REVERSER_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN }, - { COLOUR_SATURATED_BROWN, COLOUR_BORDEAUX_RED, COLOUR_SATURATED_BROWN }, - ), - - // RIDE_TYPE_HEARTLINE_TWISTER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_WHITE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, - { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK }, - { COLOUR_DARK_PURPLE, COLOUR_WHITE, COLOUR_DARK_GREEN }, - ), - - // RIDE_TYPE_MINI_GOLF - TRACK_COLOUR_PRESETS( - { COLOUR_SATURATED_GREEN, COLOUR_DARK_BROWN, COLOUR_BLACK }, - { COLOUR_MOSS_GREEN, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, - ), - - // RIDE_TYPE_GIGA_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, - ), - - // RIDE_TYPE_ROTO_DROP - TRACK_COLOUR_PRESETS( - { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_GREY }, - { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_GREY }, - ), - - // RIDE_TYPE_FLYING_SAUCERS - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_PURPLE, COLOUR_GREY, COLOUR_BLACK }, - { COLOUR_BLACK, COLOUR_YELLOW, COLOUR_BLACK }, - ), - - // RIDE_TYPE_CROOKED_HOUSE - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, - ), - - // RIDE_TYPE_MONORAIL_CYCLES - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_DARK_BROWN }, - { COLOUR_GREY, COLOUR_BLACK, COLOUR_GREY }, - ), - - // RIDE_TYPE_COMPACT_INVERTED_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_RED }, - { COLOUR_ICY_BLUE, COLOUR_ICY_BLUE, COLOUR_DARK_GREEN }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_YELLOW }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_GREEN }, - ), - - // RIDE_TYPE_WATER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_BLACK }, - { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_PURPLE }, - ), - - // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_DARK_BROWN }, - { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, - { COLOUR_LIGHT_ORANGE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_YELLOW }, - ), - - // RIDE_TYPE_INVERTED_HAIRPIN_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_RED }, - { COLOUR_BLACK, COLOUR_ICY_BLUE, COLOUR_BLACK }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW }, - ), - - // RIDE_TYPE_MAGIC_CARPET - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_PURPLE, COLOUR_WHITE, COLOUR_BLACK }, - { COLOUR_YELLOW, COLOUR_WHITE, COLOUR_BLACK }, - { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_BLACK }, - ), - - // RIDE_TYPE_SUBMARINE_RIDE - TRACK_COLOUR_PRESETS( - { COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK }, - ), - - // RIDE_TYPE_RIVER_RAFTS - TRACK_COLOUR_PRESETS( - { COLOUR_BLACK, COLOUR_BLACK, COLOUR_SATURATED_BROWN }, - ), - - // RIDE_TYPE_50 - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_ENTERPRISE - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_52 - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_53 - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_54 - DEFAULT_FLAT_RIDE_COLOUR_PRESET, - - // RIDE_TYPE_55 - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_GREY }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_BROWN }, - ), - - // RIDE_TYPE_INVERTED_IMPULSE_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_GREY }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_WHITE }, - { COLOUR_BRIGHT_PURPLE, COLOUR_BRIGHT_PURPLE, COLOUR_BORDEAUX_RED }, - ), - - // RIDE_TYPE_MINI_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_GREY, COLOUR_GREY, COLOUR_DARK_BROWN }, - { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN }, - { COLOUR_SALMON_PINK, COLOUR_SALMON_PINK, COLOUR_BORDEAUX_RED }, - ), - - // RIDE_TYPE_MINE_RIDE - TRACK_COLOUR_PRESETS( - { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, - { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, - ), - - // RIDE_TYPE_59 - TRACK_COLOUR_PRESETS( - { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_YELLOW }, - ), - - // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER - TRACK_COLOUR_PRESETS( - { COLOUR_BRIGHT_GREEN, COLOUR_BRIGHT_GREEN, COLOUR_WHITE }, - { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_BROWN }, - { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_GREEN }, - ), -}; - const rct_string_id RideModeNames[] = { STR_RIDE_MODE_NORMAL, STR_RIDE_MODE_CONTINUOUS_CIRCUIT, diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 6eda369421..fb03af7bad 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -10,6 +10,16 @@ #ifndef _RIDE_DATA_H_ #define _RIDE_DATA_H_ +#define TRACK_COLOUR_PRESETS(...) \ + { \ + static_cast(std::size({ __VA_ARGS__ })), \ + { \ + __VA_ARGS__ \ + } \ + } +#define DEFAULT_FLAT_RIDE_COLOUR_PRESET TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW }) +#define DEFAULT_STALL_COLOUR_PRESET TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }) + #include "../common.h" #include "../localisation/StringIds.h" #include "Ride.h" @@ -138,6 +148,7 @@ struct RideTypeDescriptor uint8_t PhotoItem; /** rct2: 0x0097D21E */ uint8_t BonusValue; + track_colour_preset_list ColourPresets; bool HasFlag(uint64_t flag) const; uint64_t GetAvailableTrackPieces() const; @@ -276,8 +287,6 @@ extern const rct_ride_entry_vehicle CableLiftVehicle; extern const uint16_t RideFilmLength[3]; -extern const track_colour_preset_list RideColourPresets[RIDE_TYPE_COUNT]; - extern const rct_string_id RideModeNames[RIDE_MODE_COUNT]; // clang-format off @@ -307,7 +316,8 @@ constexpr const RideTypeDescriptor DummyRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 0) + SET_FIELD(BonusValue, 0), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h index cde47d3b96..2834d9b79c 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -41,5 +41,10 @@ constexpr const RideTypeDescriptor AirPoweredVerticalCoasterRTD = SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), SET_FIELD(BonusValue, 70), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_DARK_BROWN }, + { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, + { COLOUR_LIGHT_ORANGE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_YELLOW }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index 47eaf6bb8e..ea100984ac 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -42,6 +42,11 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 75) + SET_FIELD(BonusValue, 75), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_WHITE }, + { COLOUR_LIGHT_BLUE, COLOUR_WHITE, COLOUR_BLACK }, + { COLOUR_YELLOW, COLOUR_BRIGHT_RED, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index 5865f5bbdd..9f7f97aa3f 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 80) + SET_FIELD(BonusValue, 80), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_RED }, + { COLOUR_ICY_BLUE, COLOUR_ICY_BLUE, COLOUR_DARK_GREEN }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_YELLOW }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index d50d16f14d..23ed28006e 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, + { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, + { COLOUR_BLACK, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h index 9a85fa7b16..a486730429 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -44,7 +44,12 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_TEAL }, + { COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE }, + )), }; // Inverted variant @@ -76,6 +81,11 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterAltRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_TEAL }, + { COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index 91f352cb5f..886cd03cfd 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor GigaCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 120) + SET_FIELD(BonusValue, 120), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, + { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h index efb1de4710..711e324236 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -41,6 +41,11 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD = SET_FIELD(DefaultPrices, { 15, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 35) + SET_FIELD(BonusValue, 35), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_WHITE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, + { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK }, + { COLOUR_DARK_PURPLE, COLOUR_WHITE, COLOUR_DARK_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index 8e5b2e3a24..1ded834e55 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -42,6 +42,11 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_RED }, + { COLOUR_BLACK, COLOUR_ICY_BLUE, COLOUR_BLACK }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index 9ab0fb3d2d..267e6234e5 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -42,6 +42,11 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 75) + SET_FIELD(BonusValue, 75), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_RED }, + { COLOUR_BLACK, COLOUR_ICY_BLUE, COLOUR_BLACK }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index a465debab0..c7d635d52f 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -42,6 +42,14 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets,TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, + { COLOUR_WHITE, COLOUR_YELLOW, COLOUR_WHITE }, + { COLOUR_SALMON_PINK, COLOUR_SALMON_PINK, COLOUR_GREY }, + { COLOUR_BLACK, COLOUR_BRIGHT_RED, COLOUR_BLACK }, + { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h index d0942e76e4..46510cc9d5 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -43,6 +43,13 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 60) + SET_FIELD(BonusValue, 60), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_BROWN }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_OLIVE_GREEN }, + { COLOUR_TEAL, COLOUR_YELLOW, COLOUR_TEAL }, + { COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_OLIVE_GREEN }, + { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h index c5f281951c..dc98b3af93 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -42,6 +42,11 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_GREEN, COLOUR_BRIGHT_GREEN, COLOUR_WHITE }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_BROWN }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h index 2144ca22f8..f1b444c734 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -42,7 +42,12 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_YELLOW }, + { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_YELLOW }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN }, + )), }; constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD = @@ -72,6 +77,11 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_YELLOW }, + { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_YELLOW }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 273d91c522..19a3e326a1 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -42,6 +42,15 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 95) + SET_FIELD(BonusValue, 95), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_BLACK }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_SATURATED_RED }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_WHITE }, + { COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE, COLOUR_DARK_GREEN }, + { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_LIGHT_BROWN }, + { COLOUR_GREY, COLOUR_LIGHT_ORANGE, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 81f21a6d48..64fe7f7c3d 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -42,6 +42,10 @@ constexpr const RideTypeDescriptor MineRideRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 70) + SET_FIELD(BonusValue, 70), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index fbcb1ef7d5..6d968d899b 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -42,6 +42,10 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 85) + SET_FIELD(BonusValue, 85), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_DARK_BROWN }, + { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index 5e3a15975a..ece06ff1c0 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -42,6 +42,11 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 60) + SET_FIELD(BonusValue, 60), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_GREY, COLOUR_GREY, COLOUR_DARK_BROWN }, + { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN }, + { COLOUR_SALMON_PINK, COLOUR_SALMON_PINK, COLOUR_BORDEAUX_RED }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index a98033caa0..0efbd6b16b 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -43,6 +43,10 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 50) + SET_FIELD(BonusValue, 50), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BLACK, COLOUR_BLACK, COLOUR_SATURATED_BROWN }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index 164292ffa0..735e8a85e4 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -43,7 +43,12 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_PINK, COLOUR_YELLOW, COLOUR_YELLOW }, + { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, + { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE }, + )), }; constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = @@ -73,6 +78,11 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 100) + SET_FIELD(BonusValue, 100), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_PINK, COLOUR_YELLOW, COLOUR_YELLOW }, + { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, + { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index 21bfb65a66..8e8d0994b5 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -40,6 +40,11 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 70) + SET_FIELD(BonusValue, 70), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_GREEN, COLOUR_YELLOW, COLOUR_DARK_GREEN }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_YELLOW }, + { COLOUR_GREY, COLOUR_SALMON_PINK, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index 2a1ffe14f6..9310981723 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -41,6 +41,10 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), - SET_FIELD(BonusValue, 65) + SET_FIELD(BonusValue, 65), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN }, + { COLOUR_SATURATED_BROWN, COLOUR_BORDEAUX_RED, COLOUR_SATURATED_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index c4e61c47a4..331343de52 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -42,6 +42,11 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), - SET_FIELD(BonusValue, 65) + SET_FIELD(BonusValue, 65), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_WHITE, COLOUR_DARK_BROWN, COLOUR_WHITE }, + { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN }, + { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index 2ac9734138..8f44910125 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -42,6 +42,10 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 85) + SET_FIELD(BonusValue, 85), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_GREEN }, + { COLOUR_GREY, COLOUR_GREY, COLOUR_BORDEAUX_RED }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index d725535986..85ce67d35e 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -42,6 +42,14 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 90) + SET_FIELD(BonusValue, 90), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, + { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, + { COLOUR_LIGHT_ORANGE, COLOUR_WHITE, COLOUR_LIGHT_ORANGE }, + { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, + { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_WHITE }, + { COLOUR_SATURATED_BROWN, COLOUR_LIGHT_ORANGE, COLOUR_SATURATED_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index 0cd7cb65f8..1215e20242 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor SteelWildMouseRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_YELLOW }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, + { COLOUR_DARK_PURPLE, COLOUR_BRIGHT_PINK, COLOUR_DARK_PURPLE }, + { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_BORDEAUX_RED }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index 4392dab5fe..8874ee261d 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -42,6 +42,15 @@ constexpr const RideTypeDescriptor SteeplechaseRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 60) + SET_FIELD(BonusValue, 60), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, + { COLOUR_BRIGHT_GREEN, COLOUR_BRIGHT_GREEN, COLOUR_BLACK }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BLACK }, + { COLOUR_LIGHT_ORANGE, COLOUR_LIGHT_ORANGE, COLOUR_BLACK }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_BLACK }, + { COLOUR_BRIGHT_PINK, COLOUR_BRIGHT_PINK, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index b2bf26c322..45692665da 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO2), - SET_FIELD(BonusValue, 90) + SET_FIELD(BonusValue, 90), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_LIGHT_BROWN }, + { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, + { COLOUR_SATURATED_BROWN, COLOUR_YELLOW, COLOUR_SATURATED_BROWN }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_OLIVE_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index 967d7d04cb..86493c35f4 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -42,6 +42,13 @@ constexpr const RideTypeDescriptor TwisterRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 120) + SET_FIELD(BonusValue, 120), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, + { COLOUR_AQUAMARINE, COLOUR_AQUAMARINE, COLOUR_DARK_PURPLE }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_LIGHT_BLUE }, + { COLOUR_DARK_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN }, + { COLOUR_BORDEAUX_RED, COLOUR_LIGHT_ORANGE, COLOUR_WHITE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index d853721dc4..1bbb60dd19 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -42,6 +42,10 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 95) + SET_FIELD(BonusValue, 95), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BLACK, COLOUR_GREY, COLOUR_BLACK }, + { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index 7d9480a072..5fa8843104 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -41,6 +41,11 @@ constexpr const RideTypeDescriptor VirginiaReelRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), - SET_FIELD(BonusValue, 50) + SET_FIELD(BonusValue, 50), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_SATURATED_BROWN, COLOUR_GREY, COLOUR_SATURATED_BROWN }, + { COLOUR_BLACK, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN }, + { COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index e6b1c700f8..f655b6f76d 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -44,6 +44,11 @@ constexpr const RideTypeDescriptor WaterCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), - SET_FIELD(BonusValue, 60) + SET_FIELD(BonusValue, 60), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_BLACK }, + { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_PURPLE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index 2133ad42cd..a2e4fee045 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -42,6 +42,13 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), - SET_FIELD(BonusValue, 105) + SET_FIELD(BonusValue, 105), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BLACK, COLOUR_WHITE }, + { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, + { COLOUR_YELLOW, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN }, + { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_WHITE }, + { COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index 1d77a9f8e0..510a4da7ad 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -43,6 +43,11 @@ constexpr const RideTypeDescriptor WoodenWildMouseRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO3), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN }, + { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_SATURATED_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index 224488493e..1b4470423a 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -45,6 +45,12 @@ constexpr const RideTypeDescriptor CarRideRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 50) + SET_FIELD(BonusValue, 50), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_GREY }, + { COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE, COLOUR_WHITE }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_OLIVE_GREEN }, + { COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index cc4f30736e..cd4889adea 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -43,6 +43,7 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_CIRCUS_SHOW), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 39) + SET_FIELD(BonusValue, 39), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index f8c616a42d..1f041aaef2 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -43,6 +43,9 @@ constexpr const RideTypeDescriptor CrookedHouseRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 22) + SET_FIELD(BonusValue, 22), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index 92084ad0a1..c06e1795cf 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -43,6 +43,11 @@ constexpr const RideTypeDescriptor DodgemsRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_DODGEMS_BEAT), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 35) + SET_FIELD(BonusValue, 35), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN }, + { COLOUR_LIGHT_BLUE, COLOUR_GREY, COLOUR_GREY }, + { COLOUR_DARK_GREEN, COLOUR_BLACK, COLOUR_DARK_GREEN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index d515ead336..4171f0323d 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -43,6 +43,10 @@ constexpr const RideTypeDescriptor FerrisWheelRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BLACK, COLOUR_BLACK, COLOUR_BLACK }, + { COLOUR_GREY, COLOUR_GREY, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index 94298c35ce..cb08745377 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -44,6 +44,10 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 35) + SET_FIELD(BonusValue, 35), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_PURPLE, COLOUR_GREY, COLOUR_BLACK }, + { COLOUR_BLACK, COLOUR_YELLOW, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index 18945b5d53..47fa454d8e 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -45,6 +45,12 @@ constexpr const RideTypeDescriptor GhostTrainRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_HORROR), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 50) + SET_FIELD(BonusValue, 50), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_GREEN, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, + { COLOUR_TEAL, COLOUR_WHITE, COLOUR_DARK_BROWN }, + { COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, + { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index 838372e0ef..b3a76a7559 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -43,6 +43,7 @@ constexpr const RideTypeDescriptor HauntedHouseRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_HORROR), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 22) + SET_FIELD(BonusValue, 22), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index ef67846fba..a5d099de08 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -41,6 +41,9 @@ constexpr const RideTypeDescriptor MazeRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 40) + SET_FIELD(BonusValue, 40), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_GREY, COLOUR_GREY, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index 26931021a1..e7ed55392c 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -43,6 +43,7 @@ constexpr const RideTypeDescriptor MerryGoRoundRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_FAIRGROUND_ORGAN), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index 119c287c64..c9a495a04b 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -42,6 +42,10 @@ constexpr const RideTypeDescriptor MiniGolfRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 23) + SET_FIELD(BonusValue, 23), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_SATURATED_GREEN, COLOUR_DARK_BROWN, COLOUR_BLACK }, + { COLOUR_MOSS_GREEN, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index 5eab3c6a0d..cad830f0c0 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -45,6 +45,13 @@ constexpr const RideTypeDescriptor MiniHelicoptersRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_PURPLE, COLOUR_YELLOW, COLOUR_DARK_PURPLE }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_BRIGHT_RED }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_YELLOW }, + { COLOUR_BRIGHT_PINK, COLOUR_BRIGHT_PINK, COLOUR_WHITE }, + { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index 2ddcedae90..109d5bf488 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -44,6 +44,10 @@ constexpr const RideTypeDescriptor MonorailCyclesRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_DARK_BROWN }, + { COLOUR_GREY, COLOUR_BLACK, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index 560f8fa67d..d523005b0d 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -43,6 +43,10 @@ constexpr const RideTypeDescriptor ObservationTowerRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, + { COLOUR_LIGHT_BLUE, COLOUR_YELLOW, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index b7dc0b9e4b..e57053be34 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -43,6 +43,7 @@ constexpr const RideTypeDescriptor SpaceRingsRTD = SET_FIELD(DefaultPrices, { 5, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 30) + SET_FIELD(BonusValue, 30), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index cdfb9123d9..aeef81243b 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -43,6 +43,10 @@ constexpr const RideTypeDescriptor SpiralSlideRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 40) + SET_FIELD(BonusValue, 40), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_DARK_BROWN }, + { COLOUR_LIGHT_BLUE, COLOUR_BRIGHT_PINK, COLOUR_LIGHT_PURPLE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index b89d3afb20..91002a55f6 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -41,6 +41,7 @@ constexpr const RideTypeDescriptor CashMachineRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 5) + SET_FIELD(BonusValue, 5), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index 5a4996075e..f99060af54 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -42,6 +42,7 @@ constexpr const RideTypeDescriptor DrinkStallRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 15) + SET_FIELD(BonusValue, 15), + SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index 91fb1d6368..ebcfbfa211 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -42,6 +42,7 @@ constexpr const RideTypeDescriptor FirstAidRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 5) + SET_FIELD(BonusValue, 5), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index 1d7525918d..55f01bcca1 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -42,6 +42,7 @@ constexpr const RideTypeDescriptor FoodStallRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 15) + SET_FIELD(BonusValue, 15), + SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index 0944b51b79..ba36bcf462 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -42,6 +42,7 @@ constexpr const RideTypeDescriptor InformationKioskRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 15) + SET_FIELD(BonusValue, 15), + SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index 5935e8929e..d3bb56ed63 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -42,6 +42,7 @@ constexpr const RideTypeDescriptor ShopRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 15) + SET_FIELD(BonusValue, 15), + SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index 193f7beed9..211c1d9274 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -42,6 +42,7 @@ constexpr const RideTypeDescriptor ToiletsRTD = SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 5) + SET_FIELD(BonusValue, 5), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index 5407a5b3d1..002519c04e 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -44,6 +44,7 @@ constexpr const RideTypeDescriptor CinemaRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index e6135b61ab..8f4f3e3173 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -44,6 +44,7 @@ constexpr const RideTypeDescriptor EnterpriseRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index 6cb85ddf1f..6c66a8c5e1 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor GoKartsRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, + { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN }, + { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index 580c7a4af5..56517fabbe 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -43,6 +43,10 @@ constexpr const RideTypeDescriptor LaunchedFreefallRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 65) + SET_FIELD(BonusValue, 65), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_LIGHT_PURPLE }, + { COLOUR_DARK_GREEN, COLOUR_YELLOW, COLOUR_WHITE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index f51f70ee4f..2a564714ff 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -44,6 +44,11 @@ constexpr const RideTypeDescriptor MagicCarpetRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_EGYPTIAN), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 35) + SET_FIELD(BonusValue, 35), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_PURPLE, COLOUR_WHITE, COLOUR_BLACK }, + { COLOUR_YELLOW, COLOUR_WHITE, COLOUR_BLACK }, + { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index ae0335d2f8..62a52d9476 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -44,6 +44,7 @@ constexpr const RideTypeDescriptor MotionSimulatorRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index 179f07f7d7..ee5b7db283 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -44,6 +44,10 @@ constexpr const RideTypeDescriptor RotoDropRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_GREY }, + { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index 0611fbb770..f310aca253 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -43,6 +43,10 @@ constexpr const RideTypeDescriptor SwingingInverterShipRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 35) + SET_FIELD(BonusValue, 35), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK }, + { COLOUR_BLACK, COLOUR_SATURATED_BROWN, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index c7bb2c257b..2e08b3cc2e 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -44,6 +44,9 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_PIRATES), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 35) + SET_FIELD(BonusValue, 35), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index 8682dcbee5..006263a0e4 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -43,6 +43,11 @@ constexpr const RideTypeDescriptor TopSpinRTD = SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_YELLOW }, + { COLOUR_TEAL, COLOUR_WHITE, COLOUR_WHITE }, + { COLOUR_DARK_GREEN, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, + )), }; // clang-format on diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index 72e56077f7..e00c42a523 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -43,6 +43,7 @@ constexpr const RideTypeDescriptor TwistRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 40) + SET_FIELD(BonusValue, 40), + SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index ec106e59a2..9ae7d5b7e5 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -44,6 +44,11 @@ constexpr const RideTypeDescriptor ChairliftRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_GREY }, + { COLOUR_WHITE, COLOUR_WHITE, COLOUR_OLIVE_GREEN }, + { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_WHITE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index 181fa2de52..c334b34299 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -43,6 +43,11 @@ constexpr const RideTypeDescriptor LiftRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 45) + SET_FIELD(BonusValue, 45), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_GREY }, + { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY }, + { COLOUR_BLACK, COLOUR_BLACK, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index b5d775fbb8..b43ac975b0 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -45,6 +45,10 @@ constexpr const RideTypeDescriptor MiniatureRailwayRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 50) + SET_FIELD(BonusValue, 50), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_LIGHT_BLUE, COLOUR_WHITE, COLOUR_DARK_BROWN }, + { COLOUR_BRIGHT_RED, COLOUR_WHITE, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index e6bbc793d1..7d1bac32cc 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -45,6 +45,13 @@ constexpr const RideTypeDescriptor MonorailRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 60) + SET_FIELD(BonusValue, 60), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_GREY, COLOUR_GREY, COLOUR_DARK_OLIVE_GREEN }, + { COLOUR_GREY, COLOUR_GREY, COLOUR_SATURATED_BROWN }, + { COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, + { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_WHITE }, + )), }; // clang-format on diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index d0a56f9e59..ca599760b3 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -46,6 +46,11 @@ constexpr const RideTypeDescriptor SuspendedMonorailRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 60) + SET_FIELD(BonusValue, 60), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BORDEAUX_RED, COLOUR_BLACK, COLOUR_BLACK }, + { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_BLACK }, + { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_BLACK }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index 07fb3ceb01..3fcc580439 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -42,6 +42,12 @@ constexpr const RideTypeDescriptor BoatHireRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 40) + SET_FIELD(BonusValue, 40), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_WHITE }, + { COLOUR_BLACK, COLOUR_BLACK, COLOUR_DARK_GREEN }, + { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_YELLOW }, + { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index 00babc79be..15ec53b938 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -54,6 +54,11 @@ constexpr const RideTypeDescriptor DinghySlideRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), - SET_FIELD(BonusValue, 55) + SET_FIELD(BonusValue, 55), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_GREEN, COLOUR_SATURATED_BROWN, COLOUR_DARK_GREEN }, + { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_TEAL }, + { COLOUR_BRIGHT_RED, COLOUR_GREY, COLOUR_SATURATED_RED }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 6a65286752..0b8672ddf9 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -45,6 +45,10 @@ constexpr const RideTypeDescriptor LogFlumeRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), - SET_FIELD(BonusValue, 65) + SET_FIELD(BonusValue, 65), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_GREY }, + { COLOUR_OLIVE_GREEN, COLOUR_BLACK, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index 962125639d..c10e36b7fc 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -45,6 +45,9 @@ constexpr const RideTypeDescriptor RiverRaftsRTD = SET_FIELD(DefaultPrices, { 10, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), - SET_FIELD(BonusValue, 65) + SET_FIELD(BonusValue, 65), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_BLACK, COLOUR_BLACK, COLOUR_SATURATED_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 699c5f6211..f1721e872d 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -46,6 +46,9 @@ constexpr const RideTypeDescriptor RiverRapidsRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), - SET_FIELD(BonusValue, 70) + SET_FIELD(BonusValue, 70), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_WHITE, COLOUR_BLACK, COLOUR_DARK_BROWN }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index e838f3aff0..65ed2acc3f 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -45,6 +45,10 @@ constexpr const RideTypeDescriptor SplashBoatsRTD = SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO4), - SET_FIELD(BonusValue, 65) + SET_FIELD(BonusValue, 65), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, + { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY }, + )), }; // clang-format on diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index 01ce56a46d..0a1617418a 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -44,6 +44,9 @@ constexpr const RideTypeDescriptor SubmarineRideRTD = SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO), - SET_FIELD(BonusValue, 40) + SET_FIELD(BonusValue, 40), + SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( + { COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK }, + )), }; // clang-format on