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

Pets follow stairs well #68255

Merged
merged 5 commits into from
Sep 23, 2023
Merged

Conversation

marimarigi
Copy link
Contributor

Summary

Balance "Improve pets' ability to use stairs"

Purpose of change

Fix #35665
Resolves the problem of following pets getting separated on the stairs.

Describe the solution

  • Pets that see the avatar will set that location as their destination.
  • Cancel the move if it is not necessary.

Basically repeat the above, but stop if pets loses sight of the avatar or there is a difference in Z level.
They will then move to the last set destination, so they can use the stairs without being affected by the avatar's current position.

Describe alternatives you've considered

Testing

I made pets such as dogs, horses, turkeys, zombies, and mi-gos to see how they action when moving on stairs or encountering enemies.

Additional context

There shouldn't be any effect on the pets' actions other than following, but I don't usually take them around so I can't say for sure.

referenceVideo.mp4

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) Game: Balance Balancing of (existing) in-game features. labels Sep 22, 2023
src/game.cpp Outdated Show resolved Hide resolved
src/monmove.cpp Outdated Show resolved Hide resolved
src/monmove.cpp Outdated Show resolved Hide resolved
src/monmove.cpp Outdated Show resolved Hide resolved
src/monmove.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 22, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Sep 22, 2023
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 22, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 23, 2023
@PatrikLundell
Copy link
Contributor

Have you verified that it works with default settings, i.e. experimental 3D view off?

@marimarigi marimarigi marked this pull request as draft September 23, 2023 07:24
@marimarigi
Copy link
Contributor Author

(I just checked.)
It also worked if I deleted the config folder and set it back to default. Which behavior is more expected?

@PatrikLundell
Copy link
Contributor

The desired behavior should be that pets follow you regardless of the 3D view settings, as the visibility thing really is an implementation dependency rather than a core property of the behavior. Thus, it seems it works as it ought to.

Thanks for checking!

@marimarigi marimarigi marked this pull request as ready for review September 23, 2023 10:27
@Maleclypse Maleclypse merged commit 4a89348 into CleverRaven:master Sep 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Game: Balance Balancing of (existing) in-game features. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Animals don't follow player up stairs
3 participants