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

[BUGFIX] added can_have_stat attribute to patrols that reference both p_l and s_c #3091

Merged
merged 12 commits into from
Dec 2, 2024

Conversation

bakermor
Copy link
Contributor

@bakermor bakermor commented Dec 2, 2024

About The Pull Request

Added the can_have_stat attribute to patrols that reference both p_l and s_c in the text. If multiple/all cats in the patrol have the stats (including the p_l), only the p_l is prioritized to be the stat cat.

For all the patrols I could find that referenced p_l and s_c, and wouldn't make sense if s_c was p_l, the can_have_stat attribute was set to ["r_c"] or ["not_pl_rc"] to prevent the patrol leader from talking to/interacting with themselves.

Linked Issues

Fixes #3090

Proof of Testing

Before:

Since there was no can_have_stat attribute, if the p_l had the stat then it would always become the s_c. Only the p_l is in the possible_stat_cats list at the end of _get_stat_cat.
image

After:

Patrol leader is no longer in possible_stat_cats
image
image

Changelog/Credits

@scribblecrumb
Copy link
Collaborator

Could I have you PR this to the v0.12.0 branch instead? That way we can get the bugfix into the release version, then we'll just merge release into dev to get the bugfix there too.

@bakermor bakermor changed the base branch from development to release_0.12.0 December 2, 2024 17:49
@bakermor bakermor changed the title added can_have_stat attribute to patrols that reference both p_l and s_c [BUGFIX] added can_have_stat attribute to patrols that reference both p_l and s_c Dec 2, 2024
@bakermor
Copy link
Contributor Author

bakermor commented Dec 2, 2024

Yeah! It should be to the right branch now

@scribblecrumb scribblecrumb merged commit cdd0f19 into ClanGenOfficial:release_0.12.0 Dec 2, 2024
7 checks passed
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.

[BUG] Cat referenced twice in patrol
3 participants