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

feat(port): allow vertical movement for avatar in water #3764

Merged
merged 3 commits into from
Nov 27, 2023

Conversation

Vollch
Copy link
Contributor

@Vollch Vollch commented Nov 27, 2023

Purpose of change

Now you can actually swim out of freshwater research station through underwater hatch.

Describe the solution

Ported CleverRaven/Cataclysm-DDA#65174.

Describe alternatives you've considered

None.

Testing

Swim around. Diving test is also passing.

Additional context

Checklist

@github-actions github-actions bot added docs PRs releated to docs page src changes related to source code. JSON related to game datas in JSON format. tests changes related to tests labels Nov 27, 2023
@scarf005 scarf005 self-assigned this Nov 27, 2023
@Vollch
Copy link
Contributor Author

Vollch commented Nov 27, 2023

The Autofix app has automatically formatted this Pull Request.
...

Do we really need all that spam in comments..?
I'm pretty sure this comment won't go away even after squashing, and big PRs can easily end with dozen of such messages.

@cataclysmbnteam cataclysmbnteam deleted a comment from autofix-ci bot Nov 27, 2023
@scarf005
Copy link
Member

Do we really need all that spam in comments..?

it was supposed to be a friendly help message for first time contributors, because there has been much pain around formatting. haven't seen multiple comments from bots, however. have there been one?

@Vollch
Copy link
Contributor Author

Vollch commented Nov 27, 2023

Well, those comments wasn't here long enough to give it a chance to start spamming. But i don't see why it wouldn't, in PRs formatted multiple times. Like here: #3691, #3716
(I also had PRs with few auto-formats, but they all squashed by now)

@scarf005
Copy link
Member

if the comments get too spammy then i'll disable it.

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

2023-11-27_13-42-28.mp4

it's not possible to go down from 3x3 hole but only go up, but otherwise neat addition.

@scarf005 scarf005 added this pull request to the merge queue Nov 27, 2023
Merged via the queue into cataclysmbnteam:upload with commit 3c060a0 Nov 27, 2023
14 of 15 checks passed
@Vollch
Copy link
Contributor Author

Vollch commented Nov 27, 2023

it's not possible to go down from 3x3 hole but only go up

Well, yeah. Diving mechanic and freshwater mapgens doesn't perfectly match each others. I'm not decided yet what would be the best way to fix it.
It might be fixed by adding GOES_DOWN flag to pools. Or changing pool's terrain to regular deep water. Or reworking checks in diving code so it'll work for any "water cube up to deep water", "deep water down to water cube", "water cube up\down to water cube" shifts, without looking at GOES_* flags at all.
Or maybe it's worth to port this thing from DDA, which along the way introduces another diving related flag: CleverRaven/Cataclysm-DDA#68340
I'm leaning toward last option, for better portability, but not really sure that problem it fixes is exists in BN. I need to test it first, i suppose.

@Vollch Vollch deleted the diving branch November 27, 2023 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PRs releated to docs page JSON related to game datas in JSON format. src changes related to source code. tests changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants