Skip to content
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 23 commits into from
Apr 23, 2024
Merged

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Apr 19, 2024

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 contain stored_kcal (as calories() or calories('format': 'raw')), stored_kcal_percentage (as calories('format': 'percent')) and also can read the caloric content of the item, if one of the talkers is item

Testing

image
image

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 it it worked, i just didn't use the proper EoC, duh

@github-actions 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 GuardianDll marked this pull request as ready for review April 19, 2024 22:38
@github-actions 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
Copy link
Contributor

@github-actions github-actions bot left a 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

src/math_parser_diag.cpp Outdated Show resolved Hide resolved
Co-authored-by: mqrause <38702195+mqrause@users.noreply.github.com>
src/math_parser_diag.cpp Outdated Show resolved Hide resolved
@github-actions 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 github-actions bot added the astyled astyled PR, label is assigned by github actions label Apr 20, 2024
@github-actions github-actions bot added the Code: Tests Measurement, self-control, statistics, balancing. label Apr 20, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 21, 2024
src/math_parser_diag.cpp Outdated Show resolved Hide resolved
src/math_parser_diag.cpp Outdated Show resolved Hide resolved
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 21, 2024
GuardianDll and others added 3 commits April 21, 2024 18:54
…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 github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 21, 2024
@Maleclypse Maleclypse merged commit 7f16ac8 into CleverRaven:master Apr 23, 2024
27 checks passed
@GuardianDll GuardianDll deleted the calorie_math branch April 23, 2024 05:47
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants