mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14962 from duncanspumpkin/fix_14945 

Fix 14945 Incorrect drop height penalty
This commit is contained in:
Michael Steenbeek 2021-06-27 15:22:21 +02:00 committed by GitHub
parent d635345841 d4381ffeea
commit 3a0e26660d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -31,6 +31,7 @@
- Fix: [#14806] Incorrect function call in WallPlaceAction plugin code.
- Fix: [#14871] Crash when trying to place track when there are no free tile elements.
- Fix: [#14880] Unable to close changelog window when its content fails to load.
- Fix: [#14945] Incorrect drop height penalty on log flume ride.
- Improved: [#14511] “Unlock operating limits” cheat now also unlocks all music.
- Improved: [#14712, #14716]: Improve startup times.

2
src/openrct2/network/NetworkBase.cpp
View File

@ -37,7 +37,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "18"
#define NETWORK_STREAM_VERSION "19"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;

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

@ -2625,7 +2625,7 @@ void ride_ratings_calculate_log_flume(Ride* ride)
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, 22367);
ride_ratings_apply_scenery(&ratings, ride, 11155);
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 2, 2, 2, 2);
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);

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

@ -7,7 +7,7 @@ RIDE_TYPE_BOBSLEIGH_COASTER: (559, 548, 440)
RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (504, 533, 204)
RIDE_TYPE_CAR_RIDE: (418, 58, 3)
RIDE_TYPE_WOODEN_WILD_MOUSE: (324, 381, 220)
RIDE_TYPE_LOG_FLUME: (416, 139, 105)
RIDE_TYPE_LOG_FLUME: (208, 69, 52)
RIDE_TYPE_3D_CINEMA: (350, 240, 140)
RIDE_TYPE_HAUNTED_HOUSE: (341, 153, 10)
RIDE_TYPE_MONORAIL: (439, 25, 5)