-
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
calorie related math effect #73136
Merged
Merged
calorie related math effect #73136
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
[C++]
Changes (can be) made in C++. Previously named `Code`
json-styled
JSON lint passed, label assigned by github actions
astyled
astyled PR, label is assigned by github actions
labels
Apr 19, 2024
GuardianDll
force-pushed
the
calorie_math
branch
from
April 19, 2024 21:49
4bcd9a4
to
e15ae89
Compare
github-actions
bot
added
<Documentation>
Design documents, internal info, guides and help.
NPC / Factions
NPCs, AI, Speech, Factions, Ownership
[JSON]
Changes (can be) made in JSON
Mods
Issues related to mods or modding
Mutations / Traits / Professions/ Hobbies
Mutations / Traits / Professions/ Hobbies
[Markdown]
Markdown issues and PRs
Mods: Magiclysm
Anything to do with the Magiclysm mod
Mechanics: Enchantments / Spells
Enchantments and spells
Mods: Defense Mode
Anything to do with the Defense Mode mod
EOC: Effects On Condition
Anything concerning Effects On Condition
Mods: Xedra Evolved
Anything to do with Xedra Evolved
Mods: Mind Over Matter
Mods: Sky Island
Anything about the Sky Island mod
labels
Apr 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto-requesting reviews from non-collaborators: @Standing-Storm @Venera3 @andrei8l
GuardianDll
force-pushed
the
calorie_math
branch
from
April 20, 2024 10:05
199dbc5
to
6608e7c
Compare
mqrause
reviewed
Apr 20, 2024
Co-authored-by: mqrause <38702195+mqrause@users.noreply.github.com>
github-actions
bot
removed
the
astyled
astyled PR, label is assigned by github actions
label
Apr 20, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
github-actions
bot
added
the
astyled
astyled PR, label is assigned by github actions
label
Apr 20, 2024
github-actions
bot
added
the
Code: Tests
Measurement, self-control, statistics, balancing.
label
Apr 20, 2024
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Apr 21, 2024
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
github-actions
bot
removed
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Apr 21, 2024
…the returns in the function. better approach would be divide this function in two, one for raw value that return int, one for percent value that return double or function that return healthy kcal directly
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Apr 21, 2024
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
Mods: Defense Mode
Anything to do with the Defense Mode mod
Mods: Magiclysm
Anything to do with the Magiclysm mod
Mods: Mind Over Matter
Mods: Sky Island
Anything about the Sky Island mod
Mods: Xedra Evolved
Anything to do with Xedra Evolved
Mods
Issues related to mods or modding
Mutations / Traits / Professions/ Hobbies
Mutations / Traits / Professions/ Hobbies
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
Tried to add a way for math to read item calorie content, decided the best approach would be moving entire dialogue condition to the math
Describe the solution
make a math function
calories()
, that containstored_kcal
(ascalories()
orcalories('format': 'raw')
), stored_kcal_percentage (ascalories('format': 'percent')
) and also can read the caloric content of the item, if one of the talkers is itemTesting
Additional context
Albeit wonky, it worked before, but then i was told if i want optional options, i need to use kwargs instead of params, and when i changed it, it stopped working with items, which was kinda the point of all of itit worked, i just didn't use the proper EoC, duh