Fix NPC dialog around lying and succeeding mission #27972
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
|
jenkins rebuild |
1 similar comment
|
jenkins rebuild |
mlangsdorf
reviewed
Jan 30, 2019
| "effect": "clear_mission", | ||
| "mission_opinion": { "trust": 4, "value": 3 }, | ||
| "opinion": { "fear": -1, "anger": -1 } | ||
| "success": { "topic": "TALK_NONE", "mission_opinion": { "trust": 4, "value": 3 }, "opinion": { "fear": -1, "anger": -1 } } |
There was a problem hiding this comment.
There's no trial here, so the previous version should have been fine.
There was a problem hiding this comment.
I debugged the code when applying this, and without putting the opinion and mission_opinion into a success block, the JSON parsing does not pick them up at all. This change absolutely affected the outcome.
There was a problem hiding this comment.
Okay, good to know. I'll fix that at some point.
| }, | ||
| { | ||
| "text": "Glad to help. I need no payment. Bye!", | ||
| "topic": "TALK_DONE", | ||
| "effect": "clear_mission", | ||
| "mission_opinion": { "trust": 4, "value": 3 }, | ||
| "opinion": { "fear": -1, "anger": -1 } | ||
| "success": { "topic": "TALK_DONE", "mission_opinion": { "trust": 4, "value": 3 }, "opinion": { "fear": -1, "anger": -1 } } |
paroid01
pushed a commit
to paroid01/Cataclysm-DDA
that referenced
this pull request
Jan 30, 2019
Implemented changes mlangsdorf suggested on review. references CleverRaven#27972
paroid01
pushed a commit
to paroid01/Cataclysm-DDA
that referenced
this pull request
Jan 30, 2019
gorgon complains about the format of the JSON references CleverRaven#27972
|
jenkins rebuild |
paroid01
pushed a commit
to paroid01/Cataclysm-DDA
that referenced
this pull request
Jan 31, 2019
Apparently I had an extra newline at the end of the JSON file. This removes that. Also I had to create a solution to compile the format.cpp in Visual Studio, but I'm not checking that in at the moment unless others request me to. references CleverRaven#27972
paroid01
pushed a commit
to paroid01/Cataclysm-DDA
that referenced
this pull request
Jan 31, 2019
Typo in mission effect caused JSON parsing to fail. references CleverRaven#27972
JSON refactoring for dialog changed some outcomes and chances with the mission dialogs. This brings the chances and results back in line with what they were before the JSON refactor. Fixes CleverRaven#27971
paroid01
force-pushed
the
fix_json_talks
branch
from
1c72a54 to
a11526b
Compare
Putting the clear_mission effect into the success section of the JSON seems to be required. Also the clear_mission effect was removing a mission reference before the opinion modifiers could be applied. Also, choosing training for a mission reward will automatically clear the mission, and if the JSON forces it to clear with an effect, the player has to pay for the training. references CleverRaven#27972 references CleverRaven#27983
ZhilkinSerg
added
NPC / Factions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
SUMMARY: Bugfixes "Fixed NPC dialog around lying and succeeding at missions"
Purpose of change
JSON refactoring for dialog changed some outcomes and chances with the
mission dialogs. This brings the chances and results back in line with
what they were before the JSON refactor.
Fixes #27971
Describe the solution
Added opinion changes where they were missed, changed the structure of the JSON to actually pick up opinion changes when dialog is executed. Removed incorrect dialog effect for train reward.
Describe alternatives you've considered
No particular alternative considered.
Additional context
These fixes turned out to be entirely JSON edits, which I think is awesome. Also, the JSON refactoring is making the main talk code a bit more readable.