Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mandarin duck boats capacity #320

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Conversation

ZeeMaji
Copy link
Contributor

@ZeeMaji ZeeMaji commented Mar 18, 2024

This vehicle erroneously has it's seats set to 4 when only 2 guests are visible on the boat at a time. Due to some weirdness with how the swan boats animation style (animation: 2) is handled i've switched them over to the water trikes animation (animation: 5) which lets us shave off some dummy blank images the original object had to include as a hacky workaround for the swans animation style always expecting 2 sets of guest sprites (+1 for the animation if you want to count that) in a strange order.

On old saves that still have the duck vehicles spawned, they will retain their old capacity of 4 so this doesn't affect old saves. However due to the change in animation style there's a chance that on the first initial tick the sprites will be glitched as i believe it's still technically using the swans animation style for the first tick which will result in the second animation frame using some images from outside of the object's images table. After the first tick it fixes itself as it switches to the trikes animation so it's not super noticeable but i felt like it was worth mentioning just incase.

For the capacity string i've only changed en-GB, not really sure if i should change the others as it'd probably be cleaner to change them on the localisation repo.

@ZeeMaji ZeeMaji marked this pull request as draft March 18, 2024 06:19
@ZeeMaji ZeeMaji marked this pull request as ready for review March 18, 2024 06:23
Copy link
Member

@Gymnasiast Gymnasiast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks alright to me. Could you update the other languages anyway, though?

@ZeeMaji
Copy link
Contributor Author

ZeeMaji commented Mar 18, 2024

Hmm, are you sure it would be a good idea? There's some object string changes in the localisation repo so i'm not sure if the next localisation sync would overwrite this.

@Gymnasiast
Copy link
Member

Yes, I always perform that sync and I’m fully aware of the implications.

@ZeeMaji
Copy link
Contributor Author

ZeeMaji commented Mar 18, 2024

Hmm, well alright.

@Gymnasiast Gymnasiast merged commit 1f735bc into OpenRCT2:master Mar 19, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants