Skip to content

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

Merged
duncanspumpkin merged 5 commits into
OpenRCT2:developfrom
733737:reticulating-splines
Nov 4, 2022
Merged

Guests will use Vanilla behaviour when choosing whether to head for a ride when leaving the park #15969#18500
duncanspumpkin merged 5 commits into
OpenRCT2:developfrom
733737:reticulating-splines

Conversation

@733737

@733737 733737 commented Nov 3, 2022

Copy link
Copy Markdown
Contributor

this is the same as the other PR, except the other PR is being blocked from being reopened
#15969
#15903
Fix #18501

@733737 733737 force-pushed the reticulating-splines branch from b1fc667 to e8fe0e7 Compare November 3, 2022 21:03
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

Co-Authored-By: reticulatingsplines <13323105+ReticulatingSplines@users.noreply.github.com>
This should now match how vanilla operates in the rain
@duncanspumpkin

Copy link
Copy Markdown
Contributor

Its best to turn off whitespace diffs when looking at this PR. This is just bringing the logic inline with vanilla.
For the first commit:
image
See how there is a jmp to 0x696387 this is it skipping the check.

For the second commit:
image
This is how vanilla looked. The first JE is the if not raining and moves it down to the mov's. The shelter check is next but not that the jae does not go to the mov's but to a different location. This is it skipping the intensity check.

@duncanspumpkin duncanspumpkin added the network version Network version needs updating - double check before merging! label Nov 3, 2022
duncanspumpkin added a commit to OpenRCT2/replays that referenced this pull request Nov 3, 2022
@duncanspumpkin duncanspumpkin merged commit 048352e into OpenRCT2:develop Nov 4, 2022
@tupaschoal tupaschoal added this to the v0.4.3 milestone Nov 4, 2022
@733737 733737 deleted the reticulating-splines branch November 4, 2022 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

network version Network version needs updating - double check before merging!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Guest::ShouldGoOnRide logic when guest already “heading for ride”

4 participants