Arithmetic is dead. And compare_int. And compare_num. Kinda. Long live the math! #70936
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>
andrei8l
reviewed
Jan 15, 2024
There was a problem hiding this comment.
Thanks a lot for doing this!
{ "u_val": "spell_level", "school": "test_trait" } - u_spell_level can't use school syntax yet
There's u_school_level(). It was split from u_spell_level() on purpose.
I lost track half way through, so I focused on the test errors. I'll take another look later.
Co-authored-by: andrei <[email protected]>
andrei8l
reviewed
Jan 15, 2024
Co-authored-by: andrei <[email protected]>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
github-actions
bot
removed
the
json-styled
github-actions
bot
added
the
json-styled
github-actions
bot
added
the
BasicBuildPassed
andrei8l
reviewed
Jan 20, 2024
| { "compare_int": [ { "faction_like": "old_guard" }, "<", { "const": -45 } ] }, | ||
| { "compare_num": [ { "u_val": "var", "var_name": "government_assassins_sent" }, "<=", { "const": 6 } ] }, | ||
| { "math": [ "u_val('faction_like: old_guard')", "<", "-45" ] }, | ||
| { "math": [ "government_assassins_sent", "<=", "6" ] }, |
There was a problem hiding this comment.
Suggested change
| { "math": [ "government_assassins_sent", "<=", "6" ] }, | |
| { "math": [ "u_government_assassins_sent", "<=", "6" ] }, |
| @@ -375,7 +375,7 @@ | |||
| "spawn_message": "A professional-looking individual steps out of hiding and begins rapidly approaching you.", | |||
| "spawn_message_plural": "Professional-looking individuals step out of hiding and begin rapidly approaching you." | |||
| }, | |||
| { "arithmetic": [ { "u_val": "var", "var_name": "government_assassins_sent" }, "+=", { "const": 2 } ] } | |||
| { "math": [ "government_assassins_sent", "+=", "2" ] } | |||
There was a problem hiding this comment.
Suggested change
| { "math": [ "government_assassins_sent", "+=", "2" ] } | |
| { "math": [ "u_government_assassins_sent", "+=", "2" ] } |
| @@ -391,7 +391,7 @@ | |||
| "spawn_message": "A professional-looking individual steps out of hiding and begins rapidly approaching you.", | |||
| "spawn_message_plural": "Professional-looking individuals step out of hiding and begin rapidly approaching you." | |||
| }, | |||
| { "arithmetic": [ { "u_val": "var", "var_name": "government_assassins_sent" }, "+=", { "const": 2 } ] } | |||
| { "math": [ "government_assassins_sent", "+=", "2" ] } | |||
There was a problem hiding this comment.
Suggested change
| { "math": [ "government_assassins_sent", "+=", "2" ] } | |
| { "math": [ "u_government_assassins_sent", "+=", "2" ] } |
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
None
Purpose of change
Replace almost all instances of
arithmetic,compare_intandcompare_numin favor of mathDescribe the solution
Search all places this three fields are met in the json, and replace them with
math, where possibleFields that are not changed:
hour,{ "time": "3 days" },time_since_cataclysm,time_since_var- anything that touches time{ "u_val": "spell_level", "school": "test_trait" }- u_spell_level can't use school syntax yetu_school_level()exists, apparentlymoon- same as timeTesting
TBD
Additional context
I hope i ported all variables to math properly, but i would ask to doublecheck it
u_adjust_varwould be the next one methinks@TGWeaver you probably want to port this changes into your out of repo version of mod, so you won't accidentally overwrite it