diff --git a/CMakeLists.txt b/CMakeLists.txt index 4384ff3799..6ad6f0fe18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,9 @@ set(OBJECTS_VERSION "1.2.6") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") set(OBJECTS_SHA1 "cd86dd2e42edb513b18293ef7ae52a93a7cdfc57") -set(REPLAYS_VERSION "0.0.66") +set(REPLAYS_VERSION "0.0.67") set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip") -set(REPLAYS_SHA1 "0A7783293EB9C262DC634BB181990D7C54807433") +set(REPLAYS_SHA1 "0CA2DB3BEE021F0402D3E0F0E9EDB142CCEAFFC6") option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.") option(WITH_TESTS "Build tests") diff --git a/distribution/changelog.txt b/distribution/changelog.txt index bf001c40c4..583dbd5cff 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -42,6 +42,7 @@ - Change: [#16493] Boat Hire and Submarine Ride support costs now match their visual appearance. - Change: [#16710] Changed default view of Guest List to 'Thoughts' and selected tab will default to 'Summarised' (when opened from the menu). - Change: [#16859] Guests with umbrellas no longer always avoid going into a Maze. +- Change: [#16912] Tired or nauseated guests will no longer jump in a Maze. - Fix: [#11752] Track pieces with fractional cost are too cheap to build. - Fix: [#12556] Allow game to run without audio devices. - Fix: [#12774] [Plugin] Scripts will not be re-initialised when a new scenario is loaded from within a running scenario. diff --git a/openrct2.proj b/openrct2.proj index 118928cdeb..ea71e45245 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -48,8 +48,8 @@ 304d13a126c15bf2c86ff13b81a2f2cc1856ac8d https://github.com/OpenRCT2/objects/releases/download/v1.2.6/objects.zip cd86dd2e42edb513b18293ef7ae52a93a7cdfc57 - https://github.com/OpenRCT2/replays/releases/download/v0.0.66/replays.zip - 0A7783293EB9C262DC634BB181990D7C54807433 + https://github.com/OpenRCT2/replays/releases/download/v0.0.67/replays.zip + 0CA2DB3BEE021F0402D3E0F0E9EDB142CCEAFFC6 diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 39f32a88a0..9fcd87a702 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -4818,7 +4818,7 @@ void Guest::UpdateRideMazePathfinding() if (IsActionInterruptable()) { - if (Energy > 64 && (scenario_rand() & 0xFFFF) <= 2427 && !climate_is_raining()) + if (Energy > 80 && !(PeepFlags & PEEP_FLAGS_SLOW_WALK) && !climate_is_raining() && (scenario_rand() & 0xFFFF) <= 2427) { Action = PeepActionType::Jump; ActionFrame = 0; diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 71db0fa9a8..0600bd07bb 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -42,7 +42,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 "23" +#define NETWORK_STREAM_VERSION "24" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;