-
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
Allow more dialog use of arithmetic, small portal storm rebalance. #57983
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
github-actions
bot
added
<Documentation>
Design documents, internal info, guides and help.
[C++]
Changes (can be) made in C++. Previously named `Code`
[JSON]
Changes (can be) made in JSON
[Markdown]
Markdown issues and PRs
Code: Tests
Measurement, self-control, statistics, balancing.
EOC: Effects On Condition
Anything concerning Effects On Condition
Mechanics: Enchantments / Spells
Enchantments and spells
Missions
Quests and missions
NPC / Factions
NPCs, AI, Speech, Factions, Ownership
json-styled
JSON lint passed, label assigned by github actions
astyled
astyled PR, label is assigned by github actions
labels
May 28, 2022
github-actions
bot
removed
the
astyled
astyled PR, label is assigned by github actions
label
May 29, 2022
github-actions
bot
added
the
astyled
astyled PR, label is assigned by github actions
label
May 29, 2022
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
May 30, 2022
bombasticSlacks
pushed a commit
to bombasticSlacks/Cataclysm-DDA
that referenced
this pull request
Jun 10, 2022
…leverRaven#57983) * nested rithmetic * Move over existing json * Update portal_storm_effect_on_condition.json * fix * linker? * Fix * Update condition.cpp * Update condition.cpp * stupid linker making this code worse * Update condition.cpp * Update condition.cpp * Update condition.cpp * Update condition.cpp * Update condition.h
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
[C++]
Changes (can be) made in C++. Previously named `Code`
Code: Tests
Measurement, self-control, statistics, balancing.
<Documentation>
Design documents, internal info, guides and help.
EOC: Effects On Condition
Anything concerning Effects On Condition
[JSON]
Changes (can be) made in JSON
json-styled
JSON lint passed, label assigned by github actions
[Markdown]
Markdown issues and PRs
Mechanics: Enchantments / Spells
Enchantments and spells
Missions
Quests and missions
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
None
Purpose of change
Part of #52475
Allow using arithmateic in more places to reduce needed json.
Adjust portal storm values, portal storms are less freqent and shorter.
Describe the solution
Had to move arithmatec from npctalk.cpp to conditions.cpp and switch some uses of talker for dialog which involved a ton of converting over code to use templates. Yeesh I wish there was an easier way.
Describe alternatives you've considered
So many, didn't want to have to refactor this many things but its a gnarly part of code. Maybe should have just ripped out the template stuff.
Testing
Used this json
Additional context