-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Dana Nunez: Fix unreachable dialogue #55465
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When you first meet Dana at the refugee center she is supposed to greet you with TALK_REFUGEE_Dana_1_firstmeet. TALK_REFUGEE_Dana_1_firstmeet uses `speaker_effect.effect.npc_first_topic=TALK_REFUGEE_Dana_1` to set the initial topic for future conversations. What was broken: 1. Dana had chat=TALK_REFUGEE_Dana_1 in her NPC JSON. This caused TALK_REFUGEE_Dana_1_firstmeet to be bypassed. 2. TALK_REFUGEE_Dana_1 did not include Dana's common talk responses making most of her dialogue tree inaccessible. 3. There was no dynamic_line for TALK_REFUGEE_Dana_2 causing: ```c++ DEBUG : I don't know what to say for TALK_REFUGEE_Dana_2. (BUG (npctalk.cpp:dynamic_line)) FUNCTION : std::__cxx11::string dialogue::dynamic_line(const talk_topic&) const FILE : src/npctalk.cpp LINE : 1128 VERSION : 97018ef ``` The fix: 1. Use TALK_REFUGEE_Dana_1_firstmeet as the initial topic for Dana 2. Replace references to TALK_REFUGEE_Dana_2 with TALK_REFUGEE_Dana_1
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
Feb 17, 2022
Maleclypse
added
<Bugfix>
This is a fix for a bug (or closes open issue)
NPC / Factions
NPCs, AI, Speech, Factions, Ownership
labels
Feb 17, 2022
Someone on discord asked that I convey a message since he doesn't have a github account. Specifically 0-- says "if anyone here contributes, tell Hexagonrecursion that he is a fucking hero." |
github-actions
bot
removed
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Feb 18, 2022
Close&reopen to retry CI |
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Feb 19, 2022
Close&reopen to retry CI |
As far as I know you can also push empty commits to poke the CI. |
github-actions
bot
removed
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Feb 19, 2022
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Feb 20, 2022
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-styled
JSON lint passed, label assigned by github actions
NPC / Factions
NPCs, AI, Speech, Factions, Ownership
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Bugfixes "Fix Dana Nunez being too untalkative"
Purpose of change
When you first meet Dana at the refugee center she is supposed to greet you with TALK_REFUGEE_Dana_1_firstmeet. TALK_REFUGEE_Dana_1_firstmeet uses
speaker_effect.effect.npc_first_topic=TALK_REFUGEE_Dana_1
to set the initial topic for future conversations.What was broken:
Dana had chat=TALK_REFUGEE_Dana_1 in her NPC JSON. This caused TALK_REFUGEE_Dana_1_firstmeet to be bypassed.
TALK_REFUGEE_Dana_1 did not include Dana's common talk responses making most of her dialogue tree inaccessible.
There was no dynamic_line for TALK_REFUGEE_Dana_2 causing:
Describe the solution
Describe alternatives you've considered
Define dynamic_line for TALK_REFUGEE_Dana_2
Testing
Additional context
[.type=npc].chat
is persistent the first part of the fix does not fix existing save files - TALK_REFUGEE_Dana_1_firstmeet will still be inaccessible, but the rest of the fix still works. This has a side-effect of never setting u_met_Dana_Nunez. Fortunately it appears that the variable is unused.