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

Deprecate ARMOR_, EXTRA_ and ITEM_ARMOR_ enchantments #78474

Merged
merged 11 commits into from
Dec 13, 2024

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Dec 10, 2024

Summary

None

Purpose of change

hardcoded damage types is bad

Describe the solution

Refactor the enechantment code somewhat
Deprecate ARMOR_ and EXTRA_ enchantment in favor of incoming_damage_mod and incoming_damage_mod_post_absorbed fields
Deprecate ITEM_ARMOR_ code without replacement, as nothing used it, and it was an awful piece
move some code to creature, for it is used by both characters and monsters
Should fix #72000

Testing

The game is compiled, few magiclysm traits are tested to confirm they work

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON labels Dec 10, 2024
@github-actions github-actions bot requested a review from Maleclypse December 10, 2024 19:16
@github-actions github-actions bot added Bionics CBM (Compact Bionic Modules) Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. [Markdown] Markdown issues and PRs Melee Melee weapons, tactics, techniques, reach attack Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Bombastic Perks Mods: Mind Over Matter labels Dec 10, 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: @bombasticSlacks @Standing-Storm

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 10, 2024
@GuardianDll GuardianDll force-pushed the enchantment_stuff_again branch from f623637 to 48e6d46 Compare December 10, 2024 20:55
GuardianDll and others added 3 commits December 11, 2024 07:39
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions and removed astyled astyled PR, label is assigned by github actions labels Dec 11, 2024
@GuardianDll GuardianDll force-pushed the enchantment_stuff_again branch from 2dcce1a to 8df5b80 Compare December 11, 2024 17:53
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 12, 2024
@Night-Pryanik Night-Pryanik merged commit fb3126c into CleverRaven:master Dec 13, 2024
26 checks passed
@GuardianDll GuardianDll deleted the enchantment_stuff_again branch December 13, 2024 06:35
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 Bionics CBM (Compact Bionic Modules) <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. 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: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: Xedra Evolved Anything to do with Xedra Evolved Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"skills" value of enchantments only uses integers
3 participants