Skip to content

Block brake improvements#13838

Closed
spacek531 wants to merge 22 commits into
OpenRCT2:developfrom
spacek531:block-brake-improvements
Closed

Block brake improvements#13838
spacek531 wants to merge 22 commits into
OpenRCT2:developfrom
spacek531:block-brake-improvements

Conversation

@spacek531

@spacek531 spacek531 commented Jan 15, 2021

Copy link
Copy Markdown
Collaborator

I started on this branch because at the time I didn't know about the old PR. @X123M3-256 told me about the old PRs #7737 and #11649 and that there were some larger technical issues, but he didn't remember what they were and the old PR does not say what they are.

OpenRCT2 side, everything is unified to the block brake flag indicating that brakes are active and the absence meaning they are open.
SV6 side, the polarity is inverted for brakes, since they normally serialize with the flag as false.
TD6 side, block brake speed is not exported nor imported. It is set to the minimum on loading.
NSF side, a version bump is required and behavior to normalize old save format brake flags.

@Gymnasiast Gymnasiast self-requested a review January 15, 2021 12:54
@spacek531 spacek531 force-pushed the block-brake-improvements branch from ce73d5b to fc3ca4f Compare January 16, 2021 09:48
@spacek531 spacek531 marked this pull request as draft January 16, 2021 11:32
@spacek531

spacek531 commented Jan 18, 2021

Copy link
Copy Markdown
Collaborator Author

Will also solve this duplicate issue:

#8570

@spacek531 spacek531 force-pushed the block-brake-improvements branch 2 times, most recently from 182baad to d641924 Compare January 21, 2021 05:09
@spacek531 spacek531 force-pushed the block-brake-improvements branch from d641924 to d56f430 Compare January 22, 2021 19:24
@spacek531

Copy link
Copy Markdown
Collaborator Author

Changing the tile inspector text based on what track piece is selected:

openrct2_2021-01-22_17-04-44
openrct2_2021-01-22_17-04-51
openrct2_2021-01-22_17-04-31

@spacek531 spacek531 closed this Jan 25, 2021
@spacek531 spacek531 reopened this Jan 25, 2021
@spacek531 spacek531 force-pushed the block-brake-improvements branch from 8084c09 to f8eaa01 Compare January 30, 2021 07:26
@spacek531 spacek531 marked this pull request as ready for review January 30, 2021 10:47
Comment thread src/openrct2/ride/Track.cpp
@spacek531 spacek531 force-pushed the block-brake-improvements branch from 8fc89ee to 5f28da4 Compare August 30, 2021 05:33
@spacek531 spacek531 changed the base branch from develop to new-save-format August 30, 2021 05:37
@Gymnasiast Gymnasiast self-requested a review August 30, 2021 11:45
@spacek531

spacek531 commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator Author

If it's fine to export brakes with inverted isClosed polarity, then this belongs in Develop. If save file versioning is required, then this belongs in NSF. Before, brakes were created with the closed flag unset, so it's important to interpret that false state as being closed.

@spacek531 spacek531 force-pushed the block-brake-improvements branch from 0b63cd9 to 8fc89ee Compare August 31, 2021 20:24
@spacek531 spacek531 changed the base branch from new-save-format to develop August 31, 2021 20:24
@spacek531 spacek531 force-pushed the block-brake-improvements branch 2 times, most recently from 506b03e to 0a25b81 Compare August 31, 2021 21:46
Comment thread src/openrct2/ride/TrackDesign.cpp Outdated
@spacek531 spacek531 force-pushed the block-brake-improvements branch from bad4213 to 54a4e84 Compare September 17, 2021 07:29
@spacek531 spacek531 force-pushed the block-brake-improvements branch from 54a4e84 to 4cc2c31 Compare December 8, 2021 00:27
@spacek531 spacek531 force-pushed the block-brake-improvements branch 2 times, most recently from 5021d41 to 3a6545a Compare January 29, 2022 05:16
mostly completed implementation

set block brake speed to 4 when building

fix import/export comments

remove unecessary variable

satisfy warnings

fix fallthrough

unify brake/block brake closed status part 1

rename action functions

fix import and export and others

fix desync

fix formatting

remove seat rotation from block brakes

update brake status when changing brake speed

fix format

set bbrake speed on TD6 import

fix rebase error

revert unnecessary enum changes

move functions and declarations to better places

move open brake condition into velocity condition

move Track.cpp functions to a better place

revert polarity of SetBrakeClosed

fix rebase error

revert changes to strings

add changelog entry

add tile inspector strings

remove formatting from STR_6319-STR_6321

add strings for block brake construction

change function to get any sequence

use safer thingy

fix groupbox text for block brakes

only open linked brakes in block section mode

revert change to stringid.h whitespace
@spacek531 spacek531 force-pushed the block-brake-improvements branch from 3a6545a to 4112256 Compare February 13, 2022 03:44
@spacek531 spacek531 force-pushed the block-brake-improvements branch from c6678c9 to d2e457a Compare February 13, 2022 07:15
@tupaschoal

Copy link
Copy Markdown
Member

Is this ready for review?

@spacek531

Copy link
Copy Markdown
Collaborator Author

There's one or two vestigial pieces that need to be removed, but I think it's ready.

@spacek531 spacek531 force-pushed the block-brake-improvements branch from 24fe27a to e490be7 Compare February 16, 2022 21:19
Comment thread src/openrct2/rct2/S6Importer.cpp
Comment thread src/openrct2/ride/Ride.cpp
@spacek531 spacek531 marked this pull request as draft February 24, 2022 20:56
@rik-smeets

Copy link
Copy Markdown
Contributor

I'm closing this PR due to inactivity, feel free to reopen when you continue working on it.

@rik-smeets rik-smeets closed this Oct 29, 2022
@spacek531

spacek531 commented Nov 28, 2022

Copy link
Copy Markdown
Collaborator Author

I have rebased and addressed the outstanding self-comments. I would reopen this PR but since I am not a maintainer, I am not able to. Would someone please re-open this PR?

@tupaschoal

Copy link
Copy Markdown
Member

I can't:
image

@spacek531 spacek531 mentioned this pull request Nov 28, 2022
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.

4 participants