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

Updates for melee enchantment bonuses #77742

Merged

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Nov 10, 2024

Summary

None

Purpose of change

#77662 was merged, so i decided to do a little sanity sweep around it
Close #48674

Describe the solution

If possible, bonus for melee is moved from enchantment to be direclty applied to the melee weapon itself
Few stuff got conditions updated, like bombastic perks Slice n' Dice, Bash n' Mash and Knifey now work only when your own melee damage of related type is higher than 1
New flag RELIC_PINK is added, to handle the fact this items are not highlighted in purple without relic_data
UI now shows all damage types item has, not only physical; Vaniila won't be affected because items here do not deal elemental damage, and mods suffer from presenting incorrect information

Testing

image
image

Additional context

I wonder how mad it would be to implement dbl_or_var for items

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs Melee Melee weapons, tactics, techniques, reach attack Mods: Magiclysm Anything to do with the Magiclysm mod Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing Mods: Defense Mode Anything to do with the Defense Mode mod Mods: Xedra Evolved Anything to do with Xedra Evolved labels Nov 10, 2024
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Nov 10, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 12, 2024
@Night-Pryanik
Copy link
Contributor

@GuardianDll will this close #48674?

@GuardianDll
Copy link
Member Author

Yes

@Night-Pryanik Night-Pryanik merged commit 2ce2168 into CleverRaven:master Nov 12, 2024
22 of 28 checks passed
@GuardianDll GuardianDll deleted the no_enchantment_damage_for_weapon branch November 12, 2024 15: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` <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: Defense Mode Anything to do with the Defense Mode mod Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display non-conventional damage and resistances, passive relic effects on items
3 participants