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.

Sign up for GitHub

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

Jump to bottom

Port some mutation/cbm specific fields to enchantments, part 2 #72106

Merged
merged 25 commits into from
Mar 7, 2024
Merged

Port some mutation/cbm specific fields to enchantments, part 2 #72106

merged 25 commits into from
Mar 7, 2024

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Mar 1, 2024 •
edited
Loading

Summary

None

Purpose of change

Continuation of #72034

Describe the solution

Porting even more of strictly mutation/cbm effects to enchantment system

Testing

Compiled, gave some mutations in debug, see no issues

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Bionics CBM (Compact Bionic Modules) Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Code: Tests Measurement, self-control, statistics, balancing. labels Mar 1, 2024
@github-actions github-actions bot requested a review from dseguin March 1, 2024 21:09
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs labels Mar 1, 2024
@github-actions github-actions bot requested a review from John-Candlebury March 1, 2024 21:09
@github-actions github-actions bot added the Melee Melee weapons, tactics, techniques, reach attack label Mar 1, 2024
@github-actions github-actions bot requested a review from KorGgenT March 1, 2024 21:09
@github-actions github-actions bot added the Mods: Magiclysm Anything to do with the Magiclysm mod label Mar 1, 2024
@github-actions github-actions bot requested a review from Maleclypse March 1, 2024 21:09
@github-actions github-actions bot added Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing Mods: Defense Mode Anything to do with the Defense Mode mod labels Mar 1, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 2, 2024
github-actions[bot]
github-actions bot reviewed Mar 2, 2024
View reviewed changes
src/character.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Mar 2, 2024
@GuardianDll @github-actions
Update src/character.cpp
9ed5fdd 
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 Mar 2, 2024
@Maleclypse Maleclypse mentioned this pull request Mar 3, 2024
Merged
@GuardianDll
Copy link
Member Author

GuardianDll commented Mar 5, 2024 •
edited
Loading

waiting #72167 to fix basic build test that blocks this PR

@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 5, 2024
@RenechCDDA
Copy link
Member

waiting #72167 to fix basic build test that blocks this PR

#72167 should fix GCC 9, your basic build failure is unrelated.

(all_mods)=> FOREST_STEALTH (mutation_branch) has two definitions from the same source (magiclysm)!

@GuardianDll
Copy link
Member Author

i got completed mission 5 was not in the active_missions list dozens of times in a row, but now it decided to change the error what the fuck

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 5, 2024
@GuardianDll
Copy link
Member Author

now just wait completed mission 5 was not in the active_missions list to be fixed

@RenechCDDA
Copy link
Member

Test failure seems unrelated, but is very suspiciously the first time I've seen that fail. I'd like to see the test re-run (and all builds succeed) before this gets merged.

@Maleclypse Maleclypse merged commit 1c2c14e into CleverRaven:master Mar 7, 2024
25 of 27 checks passed
@GuardianDll GuardianDll deleted the enchantments_2 branch March 7, 2024 22:21
@Standing-Storm Standing-Storm mentioned this pull request Mar 8, 2024
Closed
@Sohex Sohex mentioned this pull request Mar 10, 2024
Merged
@osuphobia osuphobia mentioned this pull request Nov 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@Hyperseeker Hyperseeker Hyperseeker left review comments

@dseguin dseguin Awaiting requested review from dseguin

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) [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. Info / User Interface Game - player communication, menus, etc. Items: Armor / Clothing Armor and clothing [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 Melee Melee weapons, tactics, techniques, reach attack Mods: Aftershock Anything to do with the Aftershock mod Mods: Bombastic Perks Mods: Defense Mode Anything to do with the Defense Mode mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuardianDll @Hyperseeker @RenechCDDA @Maleclypse