From c376096d18bbfcdc5f12a37c241a57b957864d3b Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 22 Sep 2022 16:49:38 +0200 Subject: [PATCH 1/2] Update objects to v1.3.5 --- CMakeLists.txt | 4 ++-- openrct2.proj | 4 ++-- shell.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08bf01a2f2..74ce3bd06d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,9 +64,9 @@ set(TITLE_SEQUENCE_VERSION "0.4.0") set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip") set(TITLE_SEQUENCE_SHA1 "4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0") -set(OBJECTS_VERSION "1.3.4") +set(OBJECTS_VERSION "1.3.5") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") -set(OBJECTS_SHA1 "93305caaf3d9da50516da4c69234c6031dd35808") +set(OBJECTS_SHA1 "58bddc5f845d8c7eb5d9fd25e52ab1fed24c85db") set(REPLAYS_VERSION "0.0.69") set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip") diff --git a/openrct2.proj b/openrct2.proj index ac73236852..5bdd85d425 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -45,8 +45,8 @@ f3a03c2e7b610fefa28d6962da10144f6324078d https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip 4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0 - https://github.com/OpenRCT2/objects/releases/download/v1.3.4/objects.zip - 93305caaf3d9da50516da4c69234c6031dd35808 + https://github.com/OpenRCT2/objects/releases/download/v1.3.5/objects.zip + 58bddc5f845d8c7eb5d9fd25e52ab1fed24c85db https://github.com/OpenRCT2/replays/releases/download/v0.0.69/replays.zip 3EC20AA2C90FDEEB08C26B6DA6D111C9C5C9B694 diff --git a/shell.nix b/shell.nix index a8c2c2741e..f0d377ce61 100644 --- a/shell.nix +++ b/shell.nix @@ -15,8 +15,8 @@ let objects-src = pkgs.fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.3.4"; - sha256 = "05447c4162a552f797178c06268e3b5ef094fb282aa6418b39cfce766b80b14d"; + rev = "v1.3.5"; + sha256 = "4859b7a443d0969cb1c639202fe70f40ac4c2625830657c72645d987912258ff"; }; title-sequences-src = pkgs.fetchFromGitHub { From fc2b718926fcd528287c8abad5530f82b1182718 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 22 Sep 2022 17:09:30 +0200 Subject: [PATCH 2/2] Use RCT1 Wooden RC Trains and Single-person swinging cars --- src/openrct2/rct1/Tables.cpp | 348 +++++++++++++++++------------------ 1 file changed, 174 insertions(+), 174 deletions(-) diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 79a5e92305..0dd9f5ed77 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -700,91 +700,91 @@ namespace RCT1 { static constexpr const char * map[] = { - "rct2.ride.ptct1", // RCT1_RIDE_TYPE_WOODEN_ROLLER_COASTER - "rct2.ride.togst", // RCT1_RIDE_TYPE_STAND_UP_STEEL_ROLLER_COASTER - "rct2.ride.arrsw1", // RCT1_RIDE_TYPE_SUSPENDED_ROLLER_COASTER - "rct2.ride.nemt", // RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER - "rct1.ride.ladybird_trains", // RCT1_RIDE_TYPE_STEEL_MINI_ROLLER_COASTER - "rct2.ride.nrl", // RCT1_RIDE_TYPE_MINIATURE_RAILWAY - "rct2.ride.mono2", // RCT1_RIDE_TYPE_MONORAIL - "rct2.ride.batfl", // RCT1_RIDE_TYPE_SUSPENDED_SINGLE_RAIL_ROLLER_COASTER - "rct2.ride.rboat", // RCT1_RIDE_TYPE_BOAT_HIRE - "rct2.ride.wmouse", // RCT1_RIDE_TYPE_WOODEN_CRAZY_RODENT_ROLLER_COASTER - "rct2.ride.steep1", // RCT1_RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER - "rct2.ride.spcar", // RCT1_RIDE_TYPE_CAR_RIDE - "rct2.ride.ssc1", // RCT1_RIDE_TYPE_LAUNCHED_FREEFALL - "rct2.ride.bob1", // RCT1_RIDE_TYPE_BOBSLED_ROLLER_COASTER - "rct2.ride.obs1", // RCT1_RIDE_TYPE_OBSERVATION_TOWER - "rct1.ride.steel_rc_trains", // RCT1_RIDE_TYPE_STEEL_ROLLER_COASTER - "rct2.ride.ding1", // RCT1_RIDE_TYPE_WATER_SLIDE - "rct2.ride.amt1", // RCT1_RIDE_TYPE_MINE_TRAIN_ROLLER_COASTER - "rct2.ride.clift1", // RCT1_RIDE_TYPE_CHAIRLIFT - "rct2.ride.arrt1", // RCT1_RIDE_TYPE_STEEL_CORKSCREW_ROLLER_COASTER - "rct2.ride.hmaze", // RCT1_RIDE_TYPE_HEDGE_MAZE - "rct2.ride.hskelt", // RCT1_RIDE_TYPE_SPIRAL_SLIDE - "rct2.ride.kart1", // RCT1_RIDE_TYPE_GO_KARTS - "rct2.ride.lfb1", // RCT1_RIDE_TYPE_LOG_FLUME - "rct2.ride.rapboat", // RCT1_RIDE_TYPE_RIVER_RAPIDS - "rct2.ride.dodg1", // RCT1_RIDE_TYPE_DODGEMS - "rct2.ride.swsh1", // RCT1_RIDE_TYPE_SWINGING_SHIP - "rct2.ride.swsh2", // RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP - "rct2.ride.icecr1", // RCT1_RIDE_TYPE_ICE_CREAM_STALL - "rct2.ride.chpsh", // RCT1_RIDE_TYPE_CHIPS_STALL - "rct2.ride.drnks", // RCT1_RIDE_TYPE_DRINK_STALL - "rct2.ride.cndyf", // RCT1_RIDE_TYPE_CANDYFLOSS_STALL - "rct2.ride.burgb", // RCT1_RIDE_TYPE_BURGER_BAR - "rct2.ride.mgr1", // RCT1_RIDE_TYPE_MERRY_GO_ROUND - "rct2.ride.balln", // RCT1_RIDE_TYPE_BALLOON_STALL - "rct2.ride.infok", // RCT1_RIDE_TYPE_INFORMATION_KIOSK - "rct1.ride.toilets", // RCT1_RIDE_TYPE_TOILETS - "rct2.ride.fwh1", // RCT1_RIDE_TYPE_FERRIS_WHEEL - "rct2.ride.simpod", // RCT1_RIDE_TYPE_MOTION_SIMULATOR - "rct2.ride.c3d", // RCT1_RIDE_TYPE_3D_CINEMA - "rct2.ride.topsp1", // RCT1_RIDE_TYPE_TOP_SPIN - "rct2.ride.srings", // RCT1_RIDE_TYPE_SPACE_RINGS - "rct2.ride.revf1", // RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER - "rct2.ride.souvs", // RCT1_RIDE_TYPE_SOUVENIR_STALL - "rct2.ride.bmvd", // RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER - "rct2.ride.pizzs", // RCT1_RIDE_TYPE_PIZZA_STALL - "rct2.ride.twist1", // RCT1_RIDE_TYPE_TWIST - "rct2.ride.hhbuild", // RCT1_RIDE_TYPE_HAUNTED_HOUSE - "rct2.ride.popcs", // RCT1_RIDE_TYPE_POPCORN_STALL - "rct2.ride.circus1", // RCT1_RIDE_TYPE_CIRCUS - "rct2.ride.gtc", // RCT1_RIDE_TYPE_GHOST_TRAIN - "rct2.ride.bmsd", // RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER - "rct2.ride.mft", // RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER - "rct2.ride.sfric1", // RCT1_RIDE_TYPE_WOODEN_SIDE_FRICTION_ROLLER_COASTER - "rct2.ride.smc1", // RCT1_RIDE_TYPE_STEEL_WILD_MOUSE_ROLLER_COASTER - "rct2.ride.hotds", // RCT1_RIDE_TYPE_HOT_DOG_STALL - "rct2.ride.sqdst", // RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL - "rct2.ride.hatst", // RCT1_RIDE_TYPE_HAT_STALL - "rct2.ride.toffs", // RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL - "rct2.ride.vreel", // RCT1_RIDE_TYPE_VIRGINIA_REEL - "rct2.ride.spboat", // RCT1_RIDE_TYPE_RIVER_RIDE - "rct2.ride.monbk", // RCT1_RIDE_TYPE_CYCLE_MONORAIL - "rct2.ride.vekst", // RCT1_RIDE_TYPE_FLYING_ROLLER_COASTER - "rct2.ride.smono", // RCT1_RIDE_TYPE_SUSPENDED_MONORAIL - "", // RCT1_RIDE_TYPE_40 - "rct2.ride.revcar", // RCT1_RIDE_TYPE_WOODEN_REVERSER_ROLLER_COASTER - "rct2.ride.utcar", // RCT1_RIDE_TYPE_HEARTLINE_TWISTER_ROLLER_COASTER - "rct2.ride.golf1", // RCT1_RIDE_TYPE_MINIATURE_GOLF - "", // RCT1_RIDE_TYPE_44 - "rct2.ride.gdrop1", // RCT1_RIDE_TYPE_ROTO_DROP - "rct2.ride.fsauc", // RCT1_RIDE_TYPE_FLYING_SAUCERS - "rct2.ride.chbuild", // RCT1_RIDE_TYPE_CROOKED_HOUSE - "rct2.ride.helicar", // RCT1_RIDE_TYPE_CYCLE_RAILWAY - "rct1.ride.inverted_trains", // RCT1_RIDE_TYPE_SUSPENDED_LOOPING_ROLLER_COASTER - "rct2.ride.cstboat", // RCT1_RIDE_TYPE_WATER_COASTER - "rct2.ride.thcar", // RCT1_RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER - "rct2.ride.ivmc1", // RCT1_RIDE_TYPE_INVERTED_WILD_MOUSE_COASTER - "rct2.ride.jski", // RCT1_RIDE_TYPE_JET_SKIS - "rct2.ride.tshrt", // RCT1_RIDE_TYPE_T_SHIRT_STALL - "rct2.ride.rftboat", // RCT1_RIDE_TYPE_RAFT_RIDE - "rct2.ride.dough", // RCT1_RIDE_TYPE_DOUGHNUT_SHOP - "rct2.ride.enterp", // RCT1_RIDE_TYPE_ENTERPRISE - "rct2.ride.coffs", // RCT1_RIDE_TYPE_COFFEE_SHOP - "rct2.ride.chcks", // RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL - "rct2.ride.lemst", // RCT1_RIDE_TYPE_LEMONADE_STALL + "rct1.ride.wooden_rc_trains", // RCT1_RIDE_TYPE_WOODEN_ROLLER_COASTER + "rct2.ride.togst", // RCT1_RIDE_TYPE_STAND_UP_STEEL_ROLLER_COASTER + "rct2.ride.arrsw1", // RCT1_RIDE_TYPE_SUSPENDED_ROLLER_COASTER + "rct2.ride.nemt", // RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER + "rct1.ride.ladybird_trains", // RCT1_RIDE_TYPE_STEEL_MINI_ROLLER_COASTER + "rct2.ride.nrl", // RCT1_RIDE_TYPE_MINIATURE_RAILWAY + "rct2.ride.mono2", // RCT1_RIDE_TYPE_MONORAIL + "rct1.ride.single_person_swinging_cars", // RCT1_RIDE_TYPE_SUSPENDED_SINGLE_RAIL_ROLLER_COASTER + "rct2.ride.rboat", // RCT1_RIDE_TYPE_BOAT_HIRE + "rct2.ride.wmouse", // RCT1_RIDE_TYPE_WOODEN_CRAZY_RODENT_ROLLER_COASTER + "rct2.ride.steep1", // RCT1_RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER + "rct2.ride.spcar", // RCT1_RIDE_TYPE_CAR_RIDE + "rct2.ride.ssc1", // RCT1_RIDE_TYPE_LAUNCHED_FREEFALL + "rct2.ride.bob1", // RCT1_RIDE_TYPE_BOBSLED_ROLLER_COASTER + "rct2.ride.obs1", // RCT1_RIDE_TYPE_OBSERVATION_TOWER + "rct1.ride.steel_rc_trains", // RCT1_RIDE_TYPE_STEEL_ROLLER_COASTER + "rct2.ride.ding1", // RCT1_RIDE_TYPE_WATER_SLIDE + "rct2.ride.amt1", // RCT1_RIDE_TYPE_MINE_TRAIN_ROLLER_COASTER + "rct2.ride.clift1", // RCT1_RIDE_TYPE_CHAIRLIFT + "rct2.ride.arrt1", // RCT1_RIDE_TYPE_STEEL_CORKSCREW_ROLLER_COASTER + "rct2.ride.hmaze", // RCT1_RIDE_TYPE_HEDGE_MAZE + "rct2.ride.hskelt", // RCT1_RIDE_TYPE_SPIRAL_SLIDE + "rct2.ride.kart1", // RCT1_RIDE_TYPE_GO_KARTS + "rct2.ride.lfb1", // RCT1_RIDE_TYPE_LOG_FLUME + "rct2.ride.rapboat", // RCT1_RIDE_TYPE_RIVER_RAPIDS + "rct2.ride.dodg1", // RCT1_RIDE_TYPE_DODGEMS + "rct2.ride.swsh1", // RCT1_RIDE_TYPE_SWINGING_SHIP + "rct2.ride.swsh2", // RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP + "rct2.ride.icecr1", // RCT1_RIDE_TYPE_ICE_CREAM_STALL + "rct2.ride.chpsh", // RCT1_RIDE_TYPE_CHIPS_STALL + "rct2.ride.drnks", // RCT1_RIDE_TYPE_DRINK_STALL + "rct2.ride.cndyf", // RCT1_RIDE_TYPE_CANDYFLOSS_STALL + "rct2.ride.burgb", // RCT1_RIDE_TYPE_BURGER_BAR + "rct2.ride.mgr1", // RCT1_RIDE_TYPE_MERRY_GO_ROUND + "rct2.ride.balln", // RCT1_RIDE_TYPE_BALLOON_STALL + "rct2.ride.infok", // RCT1_RIDE_TYPE_INFORMATION_KIOSK + "rct1.ride.toilets", // RCT1_RIDE_TYPE_TOILETS + "rct2.ride.fwh1", // RCT1_RIDE_TYPE_FERRIS_WHEEL + "rct2.ride.simpod", // RCT1_RIDE_TYPE_MOTION_SIMULATOR + "rct2.ride.c3d", // RCT1_RIDE_TYPE_3D_CINEMA + "rct2.ride.topsp1", // RCT1_RIDE_TYPE_TOP_SPIN + "rct2.ride.srings", // RCT1_RIDE_TYPE_SPACE_RINGS + "rct2.ride.revf1", // RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER + "rct2.ride.souvs", // RCT1_RIDE_TYPE_SOUVENIR_STALL + "rct2.ride.bmvd", // RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER + "rct2.ride.pizzs", // RCT1_RIDE_TYPE_PIZZA_STALL + "rct2.ride.twist1", // RCT1_RIDE_TYPE_TWIST + "rct2.ride.hhbuild", // RCT1_RIDE_TYPE_HAUNTED_HOUSE + "rct2.ride.popcs", // RCT1_RIDE_TYPE_POPCORN_STALL + "rct2.ride.circus1", // RCT1_RIDE_TYPE_CIRCUS + "rct2.ride.gtc", // RCT1_RIDE_TYPE_GHOST_TRAIN + "rct2.ride.bmsd", // RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER + "rct2.ride.mft", // RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER + "rct2.ride.sfric1", // RCT1_RIDE_TYPE_WOODEN_SIDE_FRICTION_ROLLER_COASTER + "rct2.ride.smc1", // RCT1_RIDE_TYPE_STEEL_WILD_MOUSE_ROLLER_COASTER + "rct2.ride.hotds", // RCT1_RIDE_TYPE_HOT_DOG_STALL + "rct2.ride.sqdst", // RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL + "rct2.ride.hatst", // RCT1_RIDE_TYPE_HAT_STALL + "rct2.ride.toffs", // RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL + "rct2.ride.vreel", // RCT1_RIDE_TYPE_VIRGINIA_REEL + "rct2.ride.spboat", // RCT1_RIDE_TYPE_RIVER_RIDE + "rct2.ride.monbk", // RCT1_RIDE_TYPE_CYCLE_MONORAIL + "rct2.ride.vekst", // RCT1_RIDE_TYPE_FLYING_ROLLER_COASTER + "rct2.ride.smono", // RCT1_RIDE_TYPE_SUSPENDED_MONORAIL + "", // RCT1_RIDE_TYPE_40 + "rct2.ride.revcar", // RCT1_RIDE_TYPE_WOODEN_REVERSER_ROLLER_COASTER + "rct2.ride.utcar", // RCT1_RIDE_TYPE_HEARTLINE_TWISTER_ROLLER_COASTER + "rct2.ride.golf1", // RCT1_RIDE_TYPE_MINIATURE_GOLF + "", // RCT1_RIDE_TYPE_44 + "rct2.ride.gdrop1", // RCT1_RIDE_TYPE_ROTO_DROP + "rct2.ride.fsauc", // RCT1_RIDE_TYPE_FLYING_SAUCERS + "rct2.ride.chbuild", // RCT1_RIDE_TYPE_CROOKED_HOUSE + "rct2.ride.helicar", // RCT1_RIDE_TYPE_CYCLE_RAILWAY + "rct1.ride.inverted_trains", // RCT1_RIDE_TYPE_SUSPENDED_LOOPING_ROLLER_COASTER + "rct2.ride.cstboat", // RCT1_RIDE_TYPE_WATER_COASTER + "rct2.ride.thcar", // RCT1_RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER + "rct2.ride.ivmc1", // RCT1_RIDE_TYPE_INVERTED_WILD_MOUSE_COASTER + "rct2.ride.jski", // RCT1_RIDE_TYPE_JET_SKIS + "rct2.ride.tshrt", // RCT1_RIDE_TYPE_T_SHIRT_STALL + "rct2.ride.rftboat", // RCT1_RIDE_TYPE_RAFT_RIDE + "rct2.ride.dough", // RCT1_RIDE_TYPE_DOUGHNUT_SHOP + "rct2.ride.enterp", // RCT1_RIDE_TYPE_ENTERPRISE + "rct2.ride.coffs", // RCT1_RIDE_TYPE_COFFEE_SHOP + "rct2.ride.chcks", // RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL + "rct2.ride.lemst", // RCT1_RIDE_TYPE_LEMONADE_STALL }; const auto index = EnumValue(rideType); @@ -797,95 +797,95 @@ namespace RCT1 { static constexpr const char * map[] = { - "rct1.ride.steel_rc_trains", // RCT1_VEHICLE_TYPE_STEEL_ROLLER_COASTER_TRAIN - "rct1.ride.steel_rc_trains_reversed", // RCT1_VEHICLE_TYPE_STEEL_ROLLER_COASTER_TRAIN_BACKWARDS - "rct2.ride.ptct1", // RCT1_VEHICLE_TYPE_WOODEN_ROLLER_COASTER_TRAIN - "rct1.ride.inverted_trains", // RCT1_VEHICLE_TYPE_INVERTED_COASTER_TRAIN (Not in RCT2) - "rct2.ride.arrsw1", // RCT1_VEHICLE_TYPE_SUSPENDED_SWINGING_CARS - "rct1.ride.ladybird_trains", // RCT1_VEHICLE_TYPE_LADYBIRD_CARS - "rct2.ride.togst", // RCT1_VEHICLE_TYPE_STANDUP_ROLLER_COASTER_CARS - "rct2.ride.wmspin", // RCT1_VEHICLE_TYPE_SPINNING_CARS - "rct2.ride.batfl", // RCT1_VEHICLE_TYPE_SINGLE_PERSON_SWINGING_CHAIRS - "rct2.ride.swans", // RCT1_VEHICLE_TYPE_SWANS_PEDAL_BOATS - "rct2.ride.mono1", // RCT1_VEHICLE_TYPE_LARGE_MONORAIL_TRAIN - "rct2.ride.cboat", // RCT1_VEHICLE_TYPE_CANOES - "rct2.ride.rboat", // RCT1_VEHICLE_TYPE_ROWING_BOATS - "rct2.ride.nrl", // RCT1_VEHICLE_TYPE_STEAM_TRAIN - "rct2.ride.wmouse", // RCT1_VEHICLE_TYPE_WOODEN_MOUSE_CARS - "rct2.ride.bboat", // RCT1_VEHICLE_TYPE_BUMPER_BOATS - "rct2.ride.ptct1", // RCT1_VEHICLE_TYPE_WOODEN_ROLLER_COASTER_TRAIN_BACKWARDS - "rct1.ride.rocket_cars", // RCT1_VEHICLE_TYPE_ROCKET_CARS - "rct2.ride.steep1", // RCT1_VEHICLE_TYPE_HORSES // Steeplechase - "rct2.ride.spcar", // RCT1_VEHICLE_TYPE_SPORTSCARS - "rct2.ride.skytr", // RCT1_VEHICLE_TYPE_LYING_DOWN_SWINGING_CARS (Inverted single-rail) - "rct2.ride.wmmine", // RCT1_VEHICLE_TYPE_WOODEN_MINE_CARS - "rct2.ride.arrsw2", // RCT1_VEHICLE_TYPE_SUSPENDED_SWINGING_AIRPLANE_CARS - "rct2.ride.mono2", // RCT1_VEHICLE_TYPE_SMALL_MONORAIL_CARS - "rct2.ride.trike", // RCT1_VEHICLE_TYPE_WATER_TRICYCLES - "rct2.ride.ssc1", // RCT1_VEHICLE_TYPE_LAUNCHED_FREEFALL_CAR - "rct2.ride.bob1", // RCT1_VEHICLE_TYPE_BOBSLEIGH_CARS - "rct2.ride.ding1", // RCT1_VEHICLE_TYPE_DINGHIES - "rct2.ride.obs1", // RCT1_VEHICLE_TYPE_ROTATING_CABIN - "rct2.ride.amt1", // RCT1_VEHICLE_TYPE_MINE_TRAIN - "rct2.ride.clift1", // RCT1_VEHICLE_TYPE_CHAIRLIFT_CARS - "rct2.ride.arrt1", // RCT1_VEHICLE_TYPE_CORKSCREW_ROLLER_COASTER_TRAIN - "rct2.ride.steep2", // RCT1_VEHICLE_TYPE_MOTORBIKES - "rct2.ride.rcr", // RCT1_VEHICLE_TYPE_RACING_CARS - "rct2.ride.truck1", // RCT1_VEHICLE_TYPE_TRUCKS - "rct2.ride.kart1", // RCT1_VEHICLE_TYPE_GO_KARTS - "rct2.ride.rapboat", // RCT1_VEHICLE_TYPE_RAPIDS_BOATS - "rct2.ride.lfb1", // RCT1_VEHICLE_TYPE_LOG_FLUME_BOATS - "rct2.ride.dodg1", // RCT1_VEHICLE_TYPE_DODGEMS - "rct2.ride.swsh1", // RCT1_VEHICLE_TYPE_SWINGING_SHIP - "rct2.ride.swsh2", // RCT1_VEHICLE_TYPE_SWINGING_INVERTER_SHIP - "rct2.ride.mgr1", // RCT1_VEHICLE_TYPE_MERRY_GO_ROUND - "rct2.ride.fwh1", // RCT1_VEHICLE_TYPE_FERRIS_WHEEL - "rct2.ride.simpod", // RCT1_VEHICLE_TYPE_SIMULATOR_POD - "rct2.ride.c3d", // RCT1_VEHICLE_TYPE_CINEMA_BUILDING - "rct2.ride.topsp1", // RCT1_VEHICLE_TYPE_TOPSPIN_CAR - "rct2.ride.srings", // RCT1_VEHICLE_TYPE_SPACE_RINGS - "rct2.ride.revf1", // RCT1_VEHICLE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER_CAR - "rct2.ride.bmvd", // RCT1_VEHICLE_TYPE_VERTICAL_ROLLER_COASTER_CARS - "rct2.ride.ctcar", // RCT1_VEHICLE_TYPE_CAT_CARS - "rct2.ride.twist1", // RCT1_VEHICLE_TYPE_TWIST_ARMS_AND_CARS - "rct2.ride.hhbuild", // RCT1_VEHICLE_TYPE_HAUNTED_HOUSE_BUILDING - "rct1.ride.log_trains", // RCT1_VEHICLE_TYPE_LOG_CARS - "rct2.ride.circus1", // RCT1_VEHICLE_TYPE_CIRCUS_TENT - "rct2.ride.gtc", // RCT1_VEHICLE_TYPE_GHOST_TRAIN_CARS - "rct2.ride.bmsd", // RCT1_VEHICLE_TYPE_STEEL_TWISTER_ROLLER_COASTER_TRAIN - "rct2.ride.mft", // RCT1_VEHICLE_TYPE_WOODEN_TWISTER_ROLLER_COASTER_TRAIN - "rct2.ride.sfric1", // RCT1_VEHICLE_TYPE_WOODEN_SIDE_FRICTION_CARS - "rct2.ride.vcr", // RCT1_VEHICLE_TYPE_VINTAGE_CARS - "rct2.ride.nrl2", // RCT1_VEHICLE_TYPE_STEAM_TRAIN_COVERED_CARS - "rct2.ride.bmsu", // RCT1_VEHICLE_TYPE_STAND_UP_STEEL_TWISTER_ROLLER_COASTER_TRAIN - "rct2.ride.bmfl", // RCT1_VEHICLE_TYPE_FLOORLESS_STEEL_TWISTER_ROLLER_COASTER_TRAIN - "rct2.ride.smc1", // RCT1_VEHICLE_TYPE_STEEL_MOUSE_CARS - "rct2.ride.clift2", // RCT1_VEHICLE_TYPE_CHAIRLIFT_CARS_ALTERNATIVE - "rct2.ride.smono", // RCT1_VEHICLE_TYPE_SUSPENDED_MONORAIL_TRAIN - "rct2.ride.helicar", // RCT1_VEHICLE_TYPE_HELICOPTER_CARS - "rct2.ride.vreel", // RCT1_VEHICLE_TYPE_VIRGINIA_REEL_TUBS - "rct2.ride.revcar", // RCT1_VEHICLE_TYPE_REVERSER_CARS - "rct2.ride.golf1", // RCT1_VEHICLE_TYPE_GOLFERS - "rct2.ride.spboat", // RCT1_VEHICLE_TYPE_RIVER_RIDE_BOATS - "rct2.ride.vekst", // RCT1_VEHICLE_TYPE_FLYING_ROLLER_COASTER_TRAIN - "rct2.ride.bmrb", // RCT1_VEHICLE_TYPE_NON_LOOPING_STEEL_TWISTER_ROLLER_COASTER_TRAIN - "rct2.ride.utcar", // RCT1_VEHICLE_TYPE_HEARTLINE_TWISTER_CARS - "rct2.ride.utcarr", // RCT1_VEHICLE_TYPE_HEARTLINE_TWISTER_CARS_REVERSED - "", // RCT1_VEHICLE_TYPE_RESERVED - "rct2.ride.gdrop1", // RCT1_VEHICLE_TYPE_ROTODROP_CAR - "rct2.ride.fsauc", // RCT1_VEHICLE_TYPE_FLYING_SAUCERS - "rct2.ride.chbuild", // RCT1_VEHICLE_TYPE_CROOKED_HOUSE_BUILDING - "rct2.ride.monbk", // RCT1_VEHICLE_TYPE_BICYCLES - "rct2.ride.arrt2", // RCT1_VEHICLE_TYPE_HYPERCOASTER_TRAIN - "rct2.ride.nemt", // RCT1_VEHICLE_TYPE_4_ACROSS_INVERTED_COASTER_TRAIN - "rct2.ride.cstboat", // RCT1_VEHICLE_TYPE_WATER_COASTER_BOATS - "rct2.ride.slcfo", // RCT1_VEHICLE_TYPE_FACEOFF_CARS - "rct2.ride.jski", // RCT1_VEHICLE_TYPE_JET_SKIS - "rct2.ride.rftboat", // RCT1_VEHICLE_TYPE_RAFT_BOATS - "rct2.ride.aml1", // RCT1_VEHICLE_TYPE_AMERICAN_STYLE_STEAM_TRAIN - "rct2.ride.thcar", // RCT1_VEHICLE_TYPE_AIR_POWERED_COASTER_TRAIN - "rct2.ride.ivmc1", // RCT1_VEHICLE_TYPE_SUSPENDED_WILD_MOUSE_CARS (Inverted Hairpin in RCT2) - "rct2.ride.enterp", // RCT1_VEHICLE_TYPE_ENTERPRISE_WHEEL + "rct1.ride.steel_rc_trains", // RCT1_VEHICLE_TYPE_STEEL_ROLLER_COASTER_TRAIN + "rct1.ride.steel_rc_trains_reversed", // RCT1_VEHICLE_TYPE_STEEL_ROLLER_COASTER_TRAIN_BACKWARDS + "rct1.ride.wooden_rc_trains", // RCT1_VEHICLE_TYPE_WOODEN_ROLLER_COASTER_TRAIN + "rct1.ride.inverted_trains", // RCT1_VEHICLE_TYPE_INVERTED_COASTER_TRAIN (Not in RCT2) + "rct2.ride.arrsw1", // RCT1_VEHICLE_TYPE_SUSPENDED_SWINGING_CARS + "rct1.ride.ladybird_trains", // RCT1_VEHICLE_TYPE_LADYBIRD_CARS + "rct2.ride.togst", // RCT1_VEHICLE_TYPE_STANDUP_ROLLER_COASTER_CARS + "rct2.ride.wmspin", // RCT1_VEHICLE_TYPE_SPINNING_CARS + "rct1.ride.single_person_swinging_cars", // RCT1_VEHICLE_TYPE_SINGLE_PERSON_SWINGING_CHAIRS + "rct2.ride.swans", // RCT1_VEHICLE_TYPE_SWANS_PEDAL_BOATS + "rct2.ride.mono1", // RCT1_VEHICLE_TYPE_LARGE_MONORAIL_TRAIN + "rct2.ride.cboat", // RCT1_VEHICLE_TYPE_CANOES + "rct2.ride.rboat", // RCT1_VEHICLE_TYPE_ROWING_BOATS + "rct2.ride.nrl", // RCT1_VEHICLE_TYPE_STEAM_TRAIN + "rct2.ride.wmouse", // RCT1_VEHICLE_TYPE_WOODEN_MOUSE_CARS + "rct2.ride.bboat", // RCT1_VEHICLE_TYPE_BUMPER_BOATS + "rct1.ride.wooden_rc_trains_reversed", // RCT1_VEHICLE_TYPE_WOODEN_ROLLER_COASTER_TRAIN_BACKWARDS + "rct1.ride.rocket_cars", // RCT1_VEHICLE_TYPE_ROCKET_CARS + "rct2.ride.steep1", // RCT1_VEHICLE_TYPE_HORSES // Steeplechase + "rct2.ride.spcar", // RCT1_VEHICLE_TYPE_SPORTSCARS + "rct2.ride.skytr", // RCT1_VEHICLE_TYPE_LYING_DOWN_SWINGING_CARS (Inverted single-rail) + "rct2.ride.wmmine", // RCT1_VEHICLE_TYPE_WOODEN_MINE_CARS + "rct2.ride.arrsw2", // RCT1_VEHICLE_TYPE_SUSPENDED_SWINGING_AIRPLANE_CARS + "rct2.ride.mono2", // RCT1_VEHICLE_TYPE_SMALL_MONORAIL_CARS + "rct2.ride.trike", // RCT1_VEHICLE_TYPE_WATER_TRICYCLES + "rct2.ride.ssc1", // RCT1_VEHICLE_TYPE_LAUNCHED_FREEFALL_CAR + "rct2.ride.bob1", // RCT1_VEHICLE_TYPE_BOBSLEIGH_CARS + "rct2.ride.ding1", // RCT1_VEHICLE_TYPE_DINGHIES + "rct2.ride.obs1", // RCT1_VEHICLE_TYPE_ROTATING_CABIN + "rct2.ride.amt1", // RCT1_VEHICLE_TYPE_MINE_TRAIN + "rct2.ride.clift1", // RCT1_VEHICLE_TYPE_CHAIRLIFT_CARS + "rct2.ride.arrt1", // RCT1_VEHICLE_TYPE_CORKSCREW_ROLLER_COASTER_TRAIN + "rct2.ride.steep2", // RCT1_VEHICLE_TYPE_MOTORBIKES + "rct2.ride.rcr", // RCT1_VEHICLE_TYPE_RACING_CARS + "rct2.ride.truck1", // RCT1_VEHICLE_TYPE_TRUCKS + "rct2.ride.kart1", // RCT1_VEHICLE_TYPE_GO_KARTS + "rct2.ride.rapboat", // RCT1_VEHICLE_TYPE_RAPIDS_BOATS + "rct2.ride.lfb1", // RCT1_VEHICLE_TYPE_LOG_FLUME_BOATS + "rct2.ride.dodg1", // RCT1_VEHICLE_TYPE_DODGEMS + "rct2.ride.swsh1", // RCT1_VEHICLE_TYPE_SWINGING_SHIP + "rct2.ride.swsh2", // RCT1_VEHICLE_TYPE_SWINGING_INVERTER_SHIP + "rct2.ride.mgr1", // RCT1_VEHICLE_TYPE_MERRY_GO_ROUND + "rct2.ride.fwh1", // RCT1_VEHICLE_TYPE_FERRIS_WHEEL + "rct2.ride.simpod", // RCT1_VEHICLE_TYPE_SIMULATOR_POD + "rct2.ride.c3d", // RCT1_VEHICLE_TYPE_CINEMA_BUILDING + "rct2.ride.topsp1", // RCT1_VEHICLE_TYPE_TOPSPIN_CAR + "rct2.ride.srings", // RCT1_VEHICLE_TYPE_SPACE_RINGS + "rct2.ride.revf1", // RCT1_VEHICLE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER_CAR + "rct2.ride.bmvd", // RCT1_VEHICLE_TYPE_VERTICAL_ROLLER_COASTER_CARS + "rct2.ride.ctcar", // RCT1_VEHICLE_TYPE_CAT_CARS + "rct2.ride.twist1", // RCT1_VEHICLE_TYPE_TWIST_ARMS_AND_CARS + "rct2.ride.hhbuild", // RCT1_VEHICLE_TYPE_HAUNTED_HOUSE_BUILDING + "rct1.ride.log_trains", // RCT1_VEHICLE_TYPE_LOG_CARS + "rct2.ride.circus1", // RCT1_VEHICLE_TYPE_CIRCUS_TENT + "rct2.ride.gtc", // RCT1_VEHICLE_TYPE_GHOST_TRAIN_CARS + "rct2.ride.bmsd", // RCT1_VEHICLE_TYPE_STEEL_TWISTER_ROLLER_COASTER_TRAIN + "rct2.ride.mft", // RCT1_VEHICLE_TYPE_WOODEN_TWISTER_ROLLER_COASTER_TRAIN + "rct2.ride.sfric1", // RCT1_VEHICLE_TYPE_WOODEN_SIDE_FRICTION_CARS + "rct2.ride.vcr", // RCT1_VEHICLE_TYPE_VINTAGE_CARS + "rct2.ride.nrl2", // RCT1_VEHICLE_TYPE_STEAM_TRAIN_COVERED_CARS + "rct2.ride.bmsu", // RCT1_VEHICLE_TYPE_STAND_UP_STEEL_TWISTER_ROLLER_COASTER_TRAIN + "rct2.ride.bmfl", // RCT1_VEHICLE_TYPE_FLOORLESS_STEEL_TWISTER_ROLLER_COASTER_TRAIN + "rct2.ride.smc1", // RCT1_VEHICLE_TYPE_STEEL_MOUSE_CARS + "rct2.ride.clift2", // RCT1_VEHICLE_TYPE_CHAIRLIFT_CARS_ALTERNATIVE + "rct2.ride.smono", // RCT1_VEHICLE_TYPE_SUSPENDED_MONORAIL_TRAIN + "rct2.ride.helicar", // RCT1_VEHICLE_TYPE_HELICOPTER_CARS + "rct2.ride.vreel", // RCT1_VEHICLE_TYPE_VIRGINIA_REEL_TUBS + "rct2.ride.revcar", // RCT1_VEHICLE_TYPE_REVERSER_CARS + "rct2.ride.golf1", // RCT1_VEHICLE_TYPE_GOLFERS + "rct2.ride.spboat", // RCT1_VEHICLE_TYPE_RIVER_RIDE_BOATS + "rct2.ride.vekst", // RCT1_VEHICLE_TYPE_FLYING_ROLLER_COASTER_TRAIN + "rct2.ride.bmrb", // RCT1_VEHICLE_TYPE_NON_LOOPING_STEEL_TWISTER_ROLLER_COASTER_TRAIN + "rct2.ride.utcar", // RCT1_VEHICLE_TYPE_HEARTLINE_TWISTER_CARS + "rct2.ride.utcarr", // RCT1_VEHICLE_TYPE_HEARTLINE_TWISTER_CARS_REVERSED + "", // RCT1_VEHICLE_TYPE_RESERVED + "rct2.ride.gdrop1", // RCT1_VEHICLE_TYPE_ROTODROP_CAR + "rct2.ride.fsauc", // RCT1_VEHICLE_TYPE_FLYING_SAUCERS + "rct2.ride.chbuild", // RCT1_VEHICLE_TYPE_CROOKED_HOUSE_BUILDING + "rct2.ride.monbk", // RCT1_VEHICLE_TYPE_BICYCLES + "rct2.ride.arrt2", // RCT1_VEHICLE_TYPE_HYPERCOASTER_TRAIN + "rct2.ride.nemt", // RCT1_VEHICLE_TYPE_4_ACROSS_INVERTED_COASTER_TRAIN + "rct2.ride.cstboat", // RCT1_VEHICLE_TYPE_WATER_COASTER_BOATS + "rct2.ride.slcfo", // RCT1_VEHICLE_TYPE_FACEOFF_CARS + "rct2.ride.jski", // RCT1_VEHICLE_TYPE_JET_SKIS + "rct2.ride.rftboat", // RCT1_VEHICLE_TYPE_RAFT_BOATS + "rct2.ride.aml1", // RCT1_VEHICLE_TYPE_AMERICAN_STYLE_STEAM_TRAIN + "rct2.ride.thcar", // RCT1_VEHICLE_TYPE_AIR_POWERED_COASTER_TRAIN + "rct2.ride.ivmc1", // RCT1_VEHICLE_TYPE_SUSPENDED_WILD_MOUSE_CARS (Inverted Hairpin in RCT2) + "rct2.ride.enterp", // RCT1_VEHICLE_TYPE_ENTERPRISE_WHEEL }; Guard::ArgumentInRange(vehicleType, 0, std::size(map), "Unsupported RCT1 vehicle type.");