mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Merge pull request #18146 from ZeeMajora/classic-calculations-2

Browse Source 
More accurate rating calculations for the classic coasters
This commit is contained in:
Michael Steenbeek
2022-09-29 20:18:11 +02:00
committed by GitHub
parent c430a03a21 234c125a73
commit d352ca3d01
5 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/openrct2/ride/RideRatings.cpp
View File

@@ -4349,6 +4349,44 @@ void ride_ratings_calculate_lim_launched_roller_coaster(Ride* ride, RideRatingUp
ride->sheltered_eighths = get_num_of_sheltered_eighths(ride).TotalShelteredEighths;
}
void ride_ratings_calculate_classic_mini_roller_coaster(Ride* ride, RideRatingUpdateState& state)
{
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 13;
set_unreliability_factor(ride);
RatingTuple ratings;
ride_ratings_set(&ratings, RIDE_RATING(2, 40), RIDE_RATING(2, 80), RIDE_RATING(1, 90));
ride_ratings_apply_length(&ratings, ride, 6000, 764);
ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0, 40), RIDE_RATING(0, 05));
ride_ratings_apply_train_length(&ratings, ride, 187245);
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, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108);
ride_ratings_apply_proximity(state, &ratings, 20130);
ride_ratings_apply_scenery(&ratings, ride, 9760);
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2);
ride_ratings_apply_max_speed_penalty(&ratings, ride, 0x70000, 2, 2, 2);
ride_ratings_apply_num_drops_penalty(&ratings, ride, 2, 2, 2, 2);
ride_ratings_apply_excessive_lateral_g_penalty(&ratings, ride, 20480, 23831, 49648);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(state, ride);
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->sheltered_eighths = get_num_of_sheltered_eighths(ride).TotalShelteredEighths;
}
void ride_ratings_calculate_hybrid_coaster(Ride* ride, RideRatingUpdateState& state)
{
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
@@ -4474,6 +4512,46 @@ void ride_ratings_calculate_alpine_coaster(Ride* ride, RideRatingUpdateState& st
ride->sheltered_eighths = get_num_of_sheltered_eighths(ride).TotalShelteredEighths;
}
void ride_ratings_calculate_classic_wooden_roller_coaster(Ride* ride, RideRatingUpdateState& state)
{
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 19;
set_unreliability_factor(ride);
RatingTuple ratings;
ride_ratings_set(&ratings, RIDE_RATING(2, 80), RIDE_RATING(2, 60), RIDE_RATING(2, 00));
ride_ratings_apply_length(&ratings, ride, 6000, 873);
ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0, 40), RIDE_RATING(0, 05));
ride_ratings_apply_train_length(&ratings, ride, 187245);
ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 40960, 34555, 49648);
ride_ratings_apply_turns(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(state, &ratings, 22367);
ride_ratings_apply_scenery(&ratings, ride, 11155);
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 1, 2);
ride_ratings_apply_max_speed_penalty(&ratings, ride, 0xA0000, 2, 1, 2);
ride_ratings_apply_max_negative_g_penalty(&ratings, ride, FIXED_2DP(0, 10), 2, 1, 2);
ride_ratings_apply_first_length_penalty(&ratings, ride, 0x1720000, 2, 1, 2);
ride_ratings_apply_num_drops_penalty(&ratings, ride, 2, 2, 1, 2);
ride_ratings_apply_excessive_lateral_g_penalty(&ratings, ride, 40960, 34555, 49648);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(state, ride);
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->sheltered_eighths = get_num_of_sheltered_eighths(ride).TotalShelteredEighths;
}
#pragma endregion
#pragma region Ride rating calculation function table

2
src/openrct2/ride/RideRatings.h
View File

@@ -140,9 +140,11 @@ void ride_ratings_calculate_inverted_impulse_coaster(Ride* ride, RideRatingUpdat
void ride_ratings_calculate_mini_roller_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_mine_ride(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_lim_launched_roller_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_classic_mini_roller_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_hybrid_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_single_rail_roller_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_alpine_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_classic_wooden_roller_coaster(Ride* ride, RideRatingUpdateState& state);
void ride_ratings_calculate_drink_stall(Ride* ride, RideRatingUpdateState& state);
// Special Track Element Adjustment functions for RTDs

2
src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h
View File

@@ -36,7 +36,7 @@ constexpr const RideTypeDescriptor ClassicMiniRollerCoasterRTD =
SET_FIELD(Heights, { 15, 24, 4, 7, }),
SET_FIELD(MaxMass, 18),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftFrictionWheels, 4, 6 }),
SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_junior_roller_coaster),
SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_classic_mini_roller_coaster),
SET_FIELD(RatingsMultipliers, { 50, 30, 10 }),
SET_FIELD(UpkeepCosts, { 40, 20, 80, 8, 3, 5 }),
SET_FIELD(BuildCosts, { 22.50_GBP, 2.00_GBP, 40, }),

4
src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h
View File

@@ -37,8 +37,8 @@ constexpr const RideTypeDescriptor ClassicWoodenRollerCoasterRTD =
SET_FIELD(Heights, { 41, 24, 8, 11, }),
SET_FIELD(MaxMass, 19),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftWood, 5, 7 }),
SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_wooden_roller_coaster),
SET_FIELD(RatingsMultipliers, { 52, 33, 8 }),
SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_classic_wooden_roller_coaster),
SET_FIELD(RatingsMultipliers, { 52, 33, 4 }),
SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }),
SET_FIELD(BuildCosts, {37.50_GBP, 3.50_GBP, 50, }),
SET_FIELD(DefaultPrices, { 20, 20 }),

2
test/tests/testdata/ratings/bpb.sv6.txt vendored
View File

@@ -16,7 +16,7 @@ RIDE_TYPE_WOODEN_ROLLER_COASTER: (634, 648, 377)
RIDE_TYPE_WOODEN_ROLLER_COASTER: (71, 68, 41)
RIDE_TYPE_STEEPLECHASE: (609, 509, 351)
RIDE_TYPE_STEEPLECHASE: (587, 492, 338)
RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (489, 460, 331)
RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (244, 245, 170)
RIDE_TYPE_SHOP: (-1, 0, 0)
RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
RIDE_TYPE_FOOD_STALL: (-1, 0, 0)