-
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
Deprecate ARMOR_, EXTRA_ and ITEM_ARMOR_ enchantments #78474
Merged
Night-Pryanik
merged 11 commits into
CleverRaven:master
from
GuardianDll:enchantment_stuff_again
Dec 13, 2024
Merged
Deprecate ARMOR_, EXTRA_ and ITEM_ARMOR_ enchantments #78474
Night-Pryanik
merged 11 commits into
CleverRaven:master
from
GuardianDll:enchantment_stuff_again
Dec 13, 2024
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
…ITEM_ARMOR_ as not used
…into enchantment_stuff_again
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
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
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: @bombasticSlacks @Standing-Storm
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
force-pushed
the
enchantment_stuff_again
branch
from
December 10, 2024 20:55
f623637
to
48e6d46
Compare
emixa-d
reviewed
Dec 10, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
force-pushed
the
enchantment_stuff_again
branch
from
December 11, 2024 17:53
2dcce1a
to
8df5b80
Compare
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Dec 12, 2024
This was referenced Dec 15, 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
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
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
hardcoded damage types is bad
Describe the solution
Refactor the enechantment code somewhat
Deprecate ARMOR_ and EXTRA_ enchantment in favor of
incoming_damage_mod
andincoming_damage_mod_post_absorbed
fieldsDeprecate 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