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

Prevents allied NPCs from fleeing from the player and turning hostile #78747

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

Balthasar-eu
Copy link
Contributor

@Balthasar-eu Balthasar-eu commented Dec 23, 2024

Summary

Bugfixes "NPC flight and hostility"

Purpose of change

fixes #78741
Revert unintended behaviour introduced in the pull here:
#77622

Describe the solution

Check if the NPC is friendly before setting the attitude.

Describe alternatives you've considered

Testing

compiled cdda, created the same scenario as before, observed Liam calm down after fleeing initially.

Additional context

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [C++] Changes (can be) made in C++. Previously named `Code` new contributor astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 23, 2024
@Night-Pryanik Night-Pryanik reopened this Dec 28, 2024
@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 28, 2024
@Maleclypse Maleclypse merged commit e26ce57 into CleverRaven:master Jan 7, 2025
39 of 54 checks passed
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` json-styled JSON lint passed, label assigned by github actions new contributor NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Friendly NPCs that panic from enemies will turn hostile to the player
3 participants