From 4b11a4fc6a01438cc545c3698e1feba736113a53 Mon Sep 17 00:00:00 2001 From: X123M3-256 Date: Mon, 6 Jun 2022 19:10:56 +0100 Subject: [PATCH] Remove incorrect flags from alpine coaster (#17347) --- src/openrct2/ride/RideRatings.cpp | 3 --- src/openrct2/ride/coaster/meta/AlpineCoaster.h | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 324d72e438..07278fa28a 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -4456,16 +4456,13 @@ void ride_ratings_calculate_alpine_coaster(Ride* ride, RideRatingUpdateState& st ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424); ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906); ride_ratings_apply_duration(&ratings, ride, 300, 26214); - ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648); ride_ratings_apply_turns(&ratings, ride, 29721, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 8738, 5461, 6553); ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(state, &ratings, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_max_speed_penalty(&ratings, ride, 0x50000, 2, 2, 2); - ride_ratings_apply_max_negative_g_penalty(&ratings, ride, FIXED_2DP(0, 40), 2, 2, 2); ride_ratings_apply_first_length_penalty(&ratings, ride, 0x1720000, 2, 2, 2); - ride_ratings_apply_excessive_lateral_g_penalty(&ratings, ride, 40960, 35746, 49648); ride_ratings_apply_intensity_penalty(&ratings); ride_ratings_apply_adjustments(ride, &ratings); diff --git a/src/openrct2/ride/coaster/meta/AlpineCoaster.h b/src/openrct2/ride/coaster/meta/AlpineCoaster.h index b069decc51..fdded507d7 100644 --- a/src/openrct2/ride/coaster/meta/AlpineCoaster.h +++ b/src/openrct2/ride/coaster/meta/AlpineCoaster.h @@ -23,7 +23,10 @@ constexpr const RideTypeDescriptor AlpineCoasterRTD = SET_FIELD(StartTrackPiece, TrackElemType::EndStation), SET_FIELD(TrackPaintFunction, AlpineRC::GetTrackPaintFunction), SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | - RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES | + RIDE_TYPE_FLAG_HAS_DATA_LOGGING | RIDE_TYPE_FLAG_HAS_DROPS | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_PEEP_WILL_RIDE_AGAIN + | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS | RIDE_TYPE_FLAG_CHECK_FOR_STALLING | RIDE_TYPE_FLAG_HAS_TRACK + | RIDE_TYPE_FLAG_ALLOW_MUSIC | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT + | RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS | RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT| RIDE_TYPE_FLAG_HAS_LARGE_CURVES | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG_UP_INCLINE_REQUIRES_LIFT), SET_FIELD(RideModes, EnumsToFlags(RideMode::ContinuousCircuit)), SET_FIELD(DefaultMode, RideMode::ContinuousCircuit),