Missions: Move some start functions into JSON #27037
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
mlangsdorf
added
NPC / Factions
ZhilkinSerg
reviewed
Dec 10, 2018
mlangsdorf
force-pushed
the
missionstart_json_1
branch
3 times, most recently
from
c4404b3 to
5a98da9
Compare
mlangsdorf
changed the title
BevapDin
reviewed
Dec 10, 2018
BevapDin
reviewed
Dec 10, 2018
src/dialogue.h
Outdated
| */ | ||
| struct talk_response { | ||
| struct effect_t { |
There was a problem hiding this comment.
This in the global scope can be a bit confusing as there are already completely unrelated classes effect_type and effect.
There was a problem hiding this comment.
Changed to talk_effect_t and talk_effect_fun_t, thanks for pointing that out.
BevapDin
reviewed
Dec 10, 2018
BevapDin
reviewed
Dec 10, 2018
mlangsdorf
force-pushed
the
missionstart_json_1
branch
from
5a98da9 to
5ce3921
Compare
In order to move mission start functions into JSON, it would be useful to be have access to the dialogue system's effect infrastructure. Move that code outside of talk_response:: and to the top level.
start adding the infrastructure to move the mission "start" value from hardcoded C++ functions to a more flexible JSON interface. As a first step, add a way to invoke dialogue effects. Also add a way to call the reveal overmap terrain and target overmap terrain functions. Fix the MGOAL_KILL_MONSTER_TYPE and MGOAL_KILL_MONSTER_SPECIES goals to not need a hardcoded function to set the goal count.
Now that these mission start functions are replaced by generic JSON, they can be removed.
mlangsdorf
force-pushed
the
missionstart_json_1
branch
from
5ce3921 to
ffbbb44
Compare
This was referenced Dec 17, 2018
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: Infrastructure "Missions: Move some start functions into JSON"Purpose of change
Make it easier for people to add new missions by adding the ability to define more mission start
functions in JSON instead of C++. Specifically, create a structure for calling the npctalk functions
used for dialogue effects from a mission start, and add some structure to create a JSON interface
for calling the existing om_target_ter() and reveal_ter() functions.
Describe the solution
Move the effect_t and effect_fun_t classes out of talk_response:: so other pieces of code can use them.
Add a JSON object parser that can take an object instead of a string for the
"start"value in a mission_definition. If that objects has an"effects"member, invoke the existing dialogue effects parser and capture the resulting lambdas. Add a similar parser for some overmap terrain functions, and update some of the mission_definitions to take advantage of these new features.Document the new structure in doc/MISSION_JSON.md.
Describe alternatives you've considered
Pretty happy with this design for now.
Additional context
This code depends on #27050 setting up the zombie kill missions correctly. See #26794 for general context.