Part of #11964: Merge RideColourKey in RideTypeDescriptor (#11996)

2026-01-15 19:13:07 +01:00 · 2020-06-19 14:21:16 -04:00
parent 5a7fbc8054
commit 51f32130b3
81 changed files with 105 additions and 111 deletions
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -1433,115 +1433,6 @@ static constexpr const uint16_t ElementTypeAddColour[] = {
    MAP_COLOUR(PALETTE_INDEX_68),                     // TILE_ELEMENT_TYPE_CORRUPT
 };

-enum
-{
-    COLOUR_KEY_RIDE,
-    COLOUR_KEY_FOOD,
-    COLOUR_KEY_DRINK,
-    COLOUR_KEY_SOUVENIR,
-    COLOUR_KEY_KIOSK,
-    COLOUR_KEY_FIRST_AID,
-    COLOUR_KEY_CASH_MACHINE,
-    COLOUR_KEY_TOILETS
-};
-
-static constexpr const uint8_t RideColourKey[] = {
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SPIRAL_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_STAND_UP_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SUSPENDED_SWINGING_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_INVERTED_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_JUNIOR_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINIATURE_RAILWAY
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MONORAIL
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINI_SUSPENDED_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_BOAT_HIRE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_WOODEN_WILD_MOUSE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_STEEPLECHASE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_CAR_RIDE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LAUNCHED_FREEFALL
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_BOBSLEIGH_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_OBSERVATION_TOWER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LOOPING_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_DINGHY_SLIDE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINE_TRAIN_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_CHAIRLIFT
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_CORKSCREW_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MAZE = 20
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SPIRAL_SLIDE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_GO_KARTS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LOG_FLUME
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_RIVER_RAPIDS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_DODGEMS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SWINGING_SHIP
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SWINGING_INVERTER_SHIP
-    COLOUR_KEY_FOOD,         // RIDE_TYPE_FOOD_STALL
-    COLOUR_KEY_FOOD,         // RIDE_TYPE_1D
-    COLOUR_KEY_DRINK,        // RIDE_TYPE_DRINK_STALL
-    COLOUR_KEY_DRINK,        // RIDE_TYPE_1F
-    COLOUR_KEY_SOUVENIR,     // RIDE_TYPE_SHOP
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MERRY_GO_ROUND
-    COLOUR_KEY_SOUVENIR,     // RIDE_TYPE_22
-    COLOUR_KEY_KIOSK,        // RIDE_TYPE_INFORMATION_KIOSK
-    COLOUR_KEY_TOILETS,      // RIDE_TYPE_TOILETS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_FERRIS_WHEEL
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MOTION_SIMULATOR
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_3D_CINEMA
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_TOP_SPIN
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SPACE_RINGS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_REVERSE_FREEFALL_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LIFT
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER
-    COLOUR_KEY_CASH_MACHINE, // RIDE_TYPE_CASH_MACHINE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_TWIST
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_HAUNTED_HOUSE
-    COLOUR_KEY_FIRST_AID,    // RIDE_TYPE_FIRST_AID
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_CIRCUS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_GHOST_TRAIN
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_TWISTER_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_WOODEN_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_STEEL_WILD_MOUSE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_FLYING_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_VIRGINIA_REEL
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SPLASH_BOATS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINI_HELICOPTERS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SUSPENDED_MONORAIL
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_REVERSER_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_HEARTLINE_TWISTER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINI_GOLF
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_GIGA_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_ROTO_DROP
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_FLYING_SAUCERS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_CROOKED_HOUSE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MONORAIL_CYCLES
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_COMPACT_INVERTED_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_WATER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_INVERTED_HAIRPIN_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MAGIC_CARPET
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_SUBMARINE_RIDE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_RIVER_RAFTS
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_50
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_ENTERPRISE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_52
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_53
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_54
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_55
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_INVERTED_IMPULSE_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINI_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_MINE_RIDE
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_59
-    COLOUR_KEY_RIDE,         // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
-    COLOUR_KEY_RIDE,         //
-    COLOUR_KEY_RIDE,         //
-    COLOUR_KEY_RIDE,         //
-};
-
 static uint16_t map_window_get_pixel_colour_peep(const CoordsXY& c)
 {
    auto* surfaceElement = map_get_surface_element_at(c);
@@ -1612,12 +1503,19 @@ static uint16_t map_window_get_pixel_colour_ride(const CoordsXY& c)
                    break;
                ride = get_ride(tileElement->AsEntrance()->GetRideIndex());
                if (ride != nullptr)
-                    colourA = RideKeyColours[RideColourKey[ride->type]];
+                {
+                    const auto& colourKey = RideTypeDescriptors[ride->type].ColourKey;
+                    colourA = RideKeyColours[static_cast<size_t>(colourKey)];
+                }
                break;
            case TILE_ELEMENT_TYPE_TRACK:
                ride = get_ride(tileElement->AsTrack()->GetRideIndex());
                if (ride != nullptr)
-                    colourA = RideKeyColours[RideColourKey[ride->type]];
+                {
+                    const auto& colourKey = RideTypeDescriptors[ride->type].ColourKey;
+                    colourA = RideKeyColours[static_cast<size_t>(colourKey)];
+                }
+
                break;
        }
    } while (!(tileElement++)->IsLastForTile());
--- a/src/openrct2/ride/RideData.h
+++ b/src/openrct2/ride/RideData.h
@@ -58,6 +58,18 @@ enum RIDE_COMPONENT_TYPE
    RIDE_COMPONENT_TYPE_COUNT
 };

+enum class RideColourKey : uint8_t
+{
+    Ride,
+    Food,
+    Drink,
+    Shop,
+    InfoKiosk,
+    FirstAid,
+    CashMachine,
+    Toilets
+};
+
 struct RideNameConvention
 {
    RIDE_COMPONENT_TYPE vehicle;
@@ -149,6 +161,7 @@ struct RideTypeDescriptor
    /** rct2: 0x0097D21E */
    uint8_t BonusValue;
    track_colour_preset_list ColourPresets;
+    RideColourKey ColourKey;

    bool HasFlag(uint64_t flag) const;
    uint64_t GetAvailableTrackPieces() const;
@@ -318,6 +331,7 @@ constexpr const RideTypeDescriptor DummyRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 0),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride)
 };
 // clang-format on

--- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h
+++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h
@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor AirPoweredVerticalCoasterRTD =
        { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_WHITE },
        { COLOUR_LIGHT_ORANGE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_YELLOW },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h
+++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD =
        { COLOUR_LIGHT_BLUE, COLOUR_WHITE, COLOUR_BLACK },
        { COLOUR_YELLOW, COLOUR_BRIGHT_RED, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h
+++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD =
        { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_YELLOW },
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD =
        { COLOUR_BLACK, COLOUR_BORDEAUX_RED, COLOUR_BLACK },
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h
@@ -50,6 +50,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD =
        { COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED },
        { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };

 // Inverted variant
@@ -87,5 +88,6 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterAltRTD =
        { COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED },
        { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/GigaCoaster.h
+++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor GigaCoasterRTD =
        { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED },
        { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h
+++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK },
        { COLOUR_DARK_PURPLE, COLOUR_WHITE, COLOUR_DARK_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h
+++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD =
        { COLOUR_BLACK, COLOUR_ICY_BLUE, COLOUR_BLACK },
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h
+++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD =
        { COLOUR_BLACK, COLOUR_ICY_BLUE, COLOUR_BLACK },
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
@@ -51,5 +51,6 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD =
        { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN },
        { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h
@@ -51,5 +51,6 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD =
        { COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_OLIVE_GREEN },
        { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD =
        { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_BROWN },
        { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h
@@ -48,6 +48,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD =
        { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_YELLOW },
        { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };

 constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD =
@@ -83,5 +84,6 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD =
        { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_YELLOW },
        { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h
@@ -52,5 +52,6 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD =
        { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_LIGHT_BROWN },
        { COLOUR_GREY, COLOUR_LIGHT_ORANGE, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/MineRide.h
+++ b/src/openrct2/ride/coaster/meta/MineRide.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor MineRideRTD =
        { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK },
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h
+++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD =
        { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_DARK_BROWN },
        { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD =
        { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN },
        { COLOUR_SALMON_PINK, COLOUR_SALMON_PINK, COLOUR_BORDEAUX_RED },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h
+++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD =
        { COLOUR_BLACK, COLOUR_BLACK, COLOUR_SATURATED_BROWN },
        { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h
@@ -49,6 +49,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD =
        { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
        { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };

 constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD =
@@ -84,5 +85,6 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD =
        { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
        { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h
+++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h
@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_YELLOW },
        { COLOUR_GREY, COLOUR_SALMON_PINK, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h
@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD =
        { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN },
        { COLOUR_SATURATED_BROWN, COLOUR_BORDEAUX_RED, COLOUR_SATURATED_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD =
        { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN },
        { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_GREEN },
        { COLOUR_GREY, COLOUR_GREY, COLOUR_BORDEAUX_RED },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h
@@ -51,5 +51,6 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD =
        { COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_WHITE },
        { COLOUR_SATURATED_BROWN, COLOUR_LIGHT_ORANGE, COLOUR_SATURATED_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h
+++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor SteelWildMouseRTD =
        { COLOUR_DARK_PURPLE, COLOUR_BRIGHT_PINK, COLOUR_DARK_PURPLE },
        { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_BORDEAUX_RED },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/Steeplechase.h
+++ b/src/openrct2/ride/coaster/meta/Steeplechase.h
@@ -52,5 +52,6 @@ constexpr const RideTypeDescriptor SteeplechaseRTD =
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_BLACK },
        { COLOUR_BRIGHT_PINK, COLOUR_BRIGHT_PINK, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h
+++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD =
        { COLOUR_SATURATED_BROWN, COLOUR_YELLOW, COLOUR_SATURATED_BROWN },
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_OLIVE_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor TwisterRollerCoasterRTD =
        { COLOUR_DARK_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN },
        { COLOUR_BORDEAUX_RED, COLOUR_LIGHT_ORANGE, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h
+++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD =
        { COLOUR_BLACK, COLOUR_GREY, COLOUR_BLACK },
        { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/VirginiaReel.h
+++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor VirginiaReelRTD =
        { COLOUR_BLACK, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN },
        { COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/WaterCoaster.h
+++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor WaterCoasterRTD =
        { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED },
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_DARK_PURPLE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h
+++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD =
        { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_WHITE },
        { COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h
+++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor WoodenWildMouseRTD =
        { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN },
        { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_SATURATED_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/CarRide.h
+++ b/src/openrct2/ride/gentle/meta/CarRide.h
@@ -52,5 +52,6 @@ constexpr const RideTypeDescriptor CarRideRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_OLIVE_GREEN },
        { COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/Circus.h
+++ b/src/openrct2/ride/gentle/meta/Circus.h
@@ -45,5 +45,6 @@ constexpr const RideTypeDescriptor CircusRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 39),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/CrookedHouse.h
+++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor CrookedHouseRTD =
    SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
        { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/Dodgems.h
+++ b/src/openrct2/ride/gentle/meta/Dodgems.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor DodgemsRTD =
        { COLOUR_LIGHT_BLUE, COLOUR_GREY, COLOUR_GREY },
        { COLOUR_DARK_GREEN, COLOUR_BLACK, COLOUR_DARK_GREEN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/FerrisWheel.h
+++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor FerrisWheelRTD =
        { COLOUR_BLACK, COLOUR_BLACK, COLOUR_BLACK },
        { COLOUR_GREY, COLOUR_GREY, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h
+++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD =
        { COLOUR_DARK_PURPLE, COLOUR_GREY, COLOUR_BLACK },
        { COLOUR_BLACK, COLOUR_YELLOW, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/GhostTrain.h
+++ b/src/openrct2/ride/gentle/meta/GhostTrain.h
@@ -52,5 +52,6 @@ constexpr const RideTypeDescriptor GhostTrainRTD =
        { COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BLACK },
        { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/HauntedHouse.h
+++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h
@@ -45,5 +45,6 @@ constexpr const RideTypeDescriptor HauntedHouseRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 22),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/Maze.h
+++ b/src/openrct2/ride/gentle/meta/Maze.h
@@ -45,5 +45,6 @@ constexpr const RideTypeDescriptor MazeRTD =
    SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
        { COLOUR_GREY, COLOUR_GREY, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/MerryGoRound.h
+++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h
@@ -45,5 +45,6 @@ constexpr const RideTypeDescriptor MerryGoRoundRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 45),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/MiniGolf.h
+++ b/src/openrct2/ride/gentle/meta/MiniGolf.h
@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor MiniGolfRTD =
        { COLOUR_SATURATED_GREEN, COLOUR_DARK_BROWN, COLOUR_BLACK },
        { COLOUR_MOSS_GREEN, COLOUR_BORDEAUX_RED, COLOUR_DARK_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h
+++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h
@@ -53,5 +53,6 @@ constexpr const RideTypeDescriptor MiniHelicoptersRTD =
        { COLOUR_BRIGHT_PINK, COLOUR_BRIGHT_PINK, COLOUR_WHITE },
        { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/MonorailCycles.h
+++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor MonorailCyclesRTD =
        { COLOUR_DARK_BROWN, COLOUR_GREY, COLOUR_DARK_BROWN },
        { COLOUR_GREY, COLOUR_BLACK, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/ObservationTower.h
+++ b/src/openrct2/ride/gentle/meta/ObservationTower.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor ObservationTowerRTD =
        { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY },
        { COLOUR_LIGHT_BLUE, COLOUR_YELLOW, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/SpaceRings.h
+++ b/src/openrct2/ride/gentle/meta/SpaceRings.h
@@ -45,5 +45,6 @@ constexpr const RideTypeDescriptor SpaceRingsRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 30),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/gentle/meta/SpiralSlide.h
+++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor SpiralSlideRTD =
        { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_DARK_BROWN },
        { COLOUR_LIGHT_BLUE, COLOUR_BRIGHT_PINK, COLOUR_LIGHT_PURPLE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/CashMachine.h
+++ b/src/openrct2/ride/shops/meta/CashMachine.h
@@ -43,5 +43,6 @@ constexpr const RideTypeDescriptor CashMachineRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 5),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::CashMachine),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/DrinkStall.h
+++ b/src/openrct2/ride/shops/meta/DrinkStall.h
@@ -44,5 +44,6 @@ constexpr const RideTypeDescriptor DrinkStallRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 15),
    SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Drink),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/FirstAid.h
+++ b/src/openrct2/ride/shops/meta/FirstAid.h
@@ -44,5 +44,6 @@ constexpr const RideTypeDescriptor FirstAidRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 5),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::FirstAid),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/FoodStall.h
+++ b/src/openrct2/ride/shops/meta/FoodStall.h
@@ -44,5 +44,6 @@ constexpr const RideTypeDescriptor FoodStallRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 15),
    SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Food),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/InformationKiosk.h
+++ b/src/openrct2/ride/shops/meta/InformationKiosk.h
@@ -44,5 +44,6 @@ constexpr const RideTypeDescriptor InformationKioskRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 15),
    SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::InfoKiosk),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/Shop.h
+++ b/src/openrct2/ride/shops/meta/Shop.h
@@ -44,5 +44,6 @@ constexpr const RideTypeDescriptor ShopRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 15),
    SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Shop),
 };
 // clang-format on
--- a/src/openrct2/ride/shops/meta/Toilets.h
+++ b/src/openrct2/ride/shops/meta/Toilets.h
@@ -44,5 +44,6 @@ constexpr const RideTypeDescriptor ToiletsRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 5),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Toilets),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/3DCinema.h
+++ b/src/openrct2/ride/thrill/meta/3DCinema.h
@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor CinemaRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 45),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/Enterprise.h
+++ b/src/openrct2/ride/thrill/meta/Enterprise.h
@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor EnterpriseRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 45),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/GoKarts.h
+++ b/src/openrct2/ride/thrill/meta/GoKarts.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor GoKartsRTD =
        { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN },
        { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h
+++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor LaunchedFreefallRTD =
        { COLOUR_WHITE, COLOUR_BRIGHT_RED, COLOUR_LIGHT_PURPLE },
        { COLOUR_DARK_GREEN, COLOUR_YELLOW, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/MagicCarpet.h
+++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor MagicCarpetRTD =
        { COLOUR_YELLOW, COLOUR_WHITE, COLOUR_BLACK },
        { COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/MotionSimulator.h
+++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h
@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor MotionSimulatorRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 45),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/RotoDrop.h
+++ b/src/openrct2/ride/thrill/meta/RotoDrop.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor RotoDropRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_GREY },
        { COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h
+++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor SwingingInverterShipRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK },
        { COLOUR_BLACK, COLOUR_SATURATED_BROWN, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/SwingingShip.h
+++ b/src/openrct2/ride/thrill/meta/SwingingShip.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor SwingingShipRTD =
    SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
        { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/TopSpin.h
+++ b/src/openrct2/ride/thrill/meta/TopSpin.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor TopSpinRTD =
        { COLOUR_TEAL, COLOUR_WHITE, COLOUR_WHITE },
        { COLOUR_DARK_GREEN, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/thrill/meta/Twist.h
+++ b/src/openrct2/ride/thrill/meta/Twist.h
@@ -45,5 +45,6 @@ constexpr const RideTypeDescriptor TwistRTD =
    SET_FIELD(PhotoItem, SHOP_ITEM_PHOTO),
    SET_FIELD(BonusValue, 40),
    SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/transport/meta/Chairlift.h
+++ b/src/openrct2/ride/transport/meta/Chairlift.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor ChairliftRTD =
        { COLOUR_WHITE, COLOUR_WHITE, COLOUR_OLIVE_GREEN },
        { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/transport/meta/Lift.h
+++ b/src/openrct2/ride/transport/meta/Lift.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor LiftRTD =
        { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY },
        { COLOUR_BLACK, COLOUR_BLACK, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/transport/meta/MiniatureRailway.h
+++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor MiniatureRailwayRTD =
        { COLOUR_LIGHT_BLUE, COLOUR_WHITE, COLOUR_DARK_BROWN },
        { COLOUR_BRIGHT_RED, COLOUR_WHITE, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/transport/meta/Monorail.h
+++ b/src/openrct2/ride/transport/meta/Monorail.h
@@ -53,5 +53,6 @@ constexpr const RideTypeDescriptor MonorailRTD =
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK },
        { COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_WHITE },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h
+++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h
@@ -52,5 +52,6 @@ constexpr const RideTypeDescriptor SuspendedMonorailRTD =
        { COLOUR_DARK_PURPLE, COLOUR_DARK_PURPLE, COLOUR_BLACK },
        { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/BoatHire.h
+++ b/src/openrct2/ride/water/meta/BoatHire.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor BoatHireRTD =
        { COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN, COLOUR_YELLOW },
        { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/DinghySlide.h
+++ b/src/openrct2/ride/water/meta/DinghySlide.h
@@ -60,5 +60,6 @@ constexpr const RideTypeDescriptor DinghySlideRTD =
        { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_TEAL },
        { COLOUR_BRIGHT_RED, COLOUR_GREY, COLOUR_SATURATED_RED },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/LogFlume.h
+++ b/src/openrct2/ride/water/meta/LogFlume.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor LogFlumeRTD =
        { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_GREY },
        { COLOUR_OLIVE_GREEN, COLOUR_BLACK, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/RiverRafts.h
+++ b/src/openrct2/ride/water/meta/RiverRafts.h
@@ -49,5 +49,6 @@ constexpr const RideTypeDescriptor RiverRaftsRTD =
    SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
        { COLOUR_BLACK, COLOUR_BLACK, COLOUR_SATURATED_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/RiverRapids.h
+++ b/src/openrct2/ride/water/meta/RiverRapids.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor RiverRapidsRTD =
    SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
        { COLOUR_WHITE, COLOUR_BLACK, COLOUR_DARK_BROWN },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/SplashBoats.h
+++ b/src/openrct2/ride/water/meta/SplashBoats.h
@@ -50,5 +50,6 @@ constexpr const RideTypeDescriptor SplashBoatsRTD =
        { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK },
        { COLOUR_DARK_GREEN, COLOUR_DARK_GREEN, COLOUR_GREY },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on
--- a/src/openrct2/ride/water/meta/SubmarineRide.h
+++ b/src/openrct2/ride/water/meta/SubmarineRide.h
@@ -48,5 +48,6 @@ constexpr const RideTypeDescriptor SubmarineRideRTD =
    SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
        { COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK },
    )),
+    SET_FIELD(ColourKey, RideColourKey::Ride),
 };
 // clang-format on