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

Allow swapping positions and moving out of the way for all types of friendly NPCs #56000

Merged
merged 1 commit into from
Mar 11, 2022
Merged

Allow swapping positions and moving out of the way for all types of friendly NPCs #56000

merged 1 commit into from
Mar 11, 2022

Conversation

Night-Pryanik
Copy link
Contributor

Summary

Features "Allow swapping positions and moving out of the way with all types of friendly NPCs"

Purpose of change

I suppose it's completely fine to ask a friendly NPC, even if he's not your ally, to swap positions and move him out of the way.

Describe the solution

Replaced check for being player ally to check for being friendly NPC.

Describe alternatives you've considered

None.

Testing

Found NPC with MGOAL_GO_TO_TYPE type of mission and with "effect": [ "follow_only" ] on start of it. Accepted his mission so he started to follow me (didn't become an ally). Interacted with him and checked if it's possible to swap positions with him and move him out of the way.

Additional context

None.

@Night-Pryanik Night-Pryanik added NPC / Factions NPCs, AI, Speech, Factions, Ownership [C++] Changes (can be) made in C++. Previously named `Code` labels Mar 10, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 10, 2022
@ZhilkinSerg ZhilkinSerg merged commit c28fcc8 into CleverRaven:master Mar 11, 2022
@Night-Pryanik Night-Pryanik deleted the swap-positions-with-follower branch March 11, 2022 05:54
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 [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Neutral NPC following player can't be moved out of the way
2 participants