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

Updated special companions to use new rules dialog #75045

Merged
merged 2 commits into from
Jul 17, 2024

Conversation

PatrikLundell
Copy link
Contributor

@PatrikLundell PatrikLundell commented Jul 16, 2024

Summary

None

Purpose of change

Fix #74967, i.e. repair special companion rules setting to use the new menu rather than fail to bring up removed dialog.

Describe the solution

Copy the new dialog from the general companion dialog and apply it to the three special companions who had the obsolete dialog.
Removed the second broken dialog (also replaced by the menu) from Liam and Luo.

Describe alternatives you've considered

Only do Liam, as that's the only one I can test with a reasonable effort.

Testing

  • Load my save with Liam.
  • Talk to him.
  • Note that the new dialog option is available rather than the old one.
  • Select that dialog option and note that the menu is brought up.
  • Escape from the menu.
  • Note that the conversation is finished.

Not testing Luo and Cranberry as the work to recruit them in order to access the dialog is a lot of work. I did not find a way to change a debug spawned NPC into these characters either.

Additional context

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jul 16, 2024
@PatrikLundell PatrikLundell changed the title Updated companions to use new rules dialog Updated special companions to use new rules dialog Jul 16, 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 Jul 16, 2024
@Maleclypse Maleclypse merged commit 4faba21 into CleverRaven:master Jul 17, 2024
26 checks passed
@PatrikLundell PatrikLundell deleted the rules branch July 17, 2024 07:15
SurFlurer added a commit to SurFlurer/Cataclysm-DDA that referenced this pull request Aug 26, 2024
This reverts commit 4faba21, reversing
changes made to 57a4069.
this
This pull request was closed.
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) [JSON] Changes (can be) made in JSON 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.

Unable to set rules for npc Liam
2 participants