Guests will use Vanilla behaviour when choosing whether to head for a ride when leaving the park #15969 (#18500)

* Fix #18501: Guests incorrectly determining ride

This will restore guest behaviour to how it was in rct2 vanilla by having them only try to determine whether to ride a ride if they haven't already decided to leave the park

* Fix peeps incorrectly deciding when to get on rides in rain

This should now match how vanilla operates in the rain

* Update replays

Co-authored-by: reticulatingsplines <13323105+ReticulatingSplines@users.noreply.github.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>

CMakeLists.txt

@@ -68,9 +68,9 @@ set(OBJECTS_VERSION "1.3.5")
 set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
 set(OBJECTS_SHA1 "58bddc5f845d8c7eb5d9fd25e52ab1fed24c85db")
 
-set(REPLAYS_VERSION "0.0.69")
+set(REPLAYS_VERSION "0.0.70")
 set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")
-set(REPLAYS_SHA1 "3EC20AA2C90FDEEB08C26B6DA6D111C9C5C9B694")
+set(REPLAYS_SHA1 "09B339E86AAE81580C5AC3E23AC4BC9E030DA076")
 
 option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
 option(WITH_TESTS "Build tests")

contributors.md

@@ -200,6 +200,7 @@ The following people are not part of the development team, but have been contrib
 * 73 (733737)
 * Raymond Zhao (rzhao271)
 * Xixiang Chen (jacknull1991)
+* (ReticulatingSplines)
 
 ## Toolchain
 * (Balletie) - macOS

distribution/changelog.txt

@@ -8,6 +8,7 @@
 - Change: [#18230] Make the large flat to steep pieces available on the corkscrew roller coaster without cheats.
 - Change: [#18381] Convert custom invisible paths to the built-in ones.
 - Fix: [#14312] Research ride type message incorrect.
+- Fix: [#15969] Guests heading for ride use vanilla behaviour
 - Fix: [#17316] Sides of River Rapids’ corners overlay other parts of the track.
 - Fix: [#17657] When switching from buying land rights to buying construction rights, grid disables and won't re-enable afterwards.
 - Fix: [#17763] Missing validation on invalid characters in file name.

openrct2.proj

@@ -47,8 +47,8 @@
     <TitleSequencesSha1>4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0</TitleSequencesSha1>
     <ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.3.5/objects.zip</ObjectsUrl>
     <ObjectsSha1>58bddc5f845d8c7eb5d9fd25e52ab1fed24c85db</ObjectsSha1>
-    <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.69/replays.zip</ReplaysUrl>
-    <ReplaysSha1>3EC20AA2C90FDEEB08C26B6DA6D111C9C5C9B694</ReplaysSha1>
+    <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.70/replays.zip</ReplaysUrl>
+    <ReplaysSha1>09B339E86AAE81580C5AC3E23AC4BC9E030DA076</ReplaysSha1>
   </PropertyGroup>
 
   <ItemGroup>

src/openrct2/entity/Guest.cpp

@@ -2047,7 +2047,8 @@ bool Guest::ShouldGoOnRide(Ride* ride, StationIndex entranceNum, bool atQueue, b
                         return false;
                     }
                 }
-
+                else
+                {
                     if (ClimateIsRaining() && !ShouldRideWhileRaining(*ride))
                     {
                         if (peepAtRide)
@@ -2062,7 +2063,10 @@ bool Guest::ShouldGoOnRide(Ride* ride, StationIndex entranceNum, bool atQueue, b
                         ChoseNotToGoOnRide(ride, peepAtRide, true);
                         return false;
                     }
-
+                    // If it is raining and the ride provides shelter skip the
+                    // ride intensity check and get me on a sheltered ride!
+                    if (!ClimateIsRaining() || !ShouldRideWhileRaining(*ride))
+                    {
                         if (!gCheatsIgnoreRideIntensity)
                         {
                             // Intensity calculations. Even though the max intensity can go up to 15, it's capped
@@ -2116,6 +2120,8 @@ bool Guest::ShouldGoOnRide(Ride* ride, StationIndex entranceNum, bool atQueue, b
                             }
                         }
                     }
+                }
+            }
 
             // If the ride has not yet been rated and is capable of having g-forces,
             // there's a 90% chance that the peep will ignore it.

src/openrct2/network/NetworkBase.cpp

@@ -43,7 +43,7 @@
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
 
-#define NETWORK_STREAM_VERSION "6"
+#define NETWORK_STREAM_VERSION "7"
 
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION