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

MELEE_DAMAGE and ITEM_DAMAGE_BASH enchantments should affect bashing damage to tile #66735

Merged
merged 6 commits into from
Jul 9, 2023

Conversation

fyhannes
Copy link
Contributor

@fyhannes fyhannes commented Jul 7, 2023

Summary

Bugfixes "Smashing now incorporates any MELEE_DAMAGE and STRENGTH enchantments"

Purpose of change

#66434. STRENGTH and ITEM_DAMAGE_BASH enchantments should influence SMASH capabilities but currently only takes in arm_strength and the weapon's bash damage.

Describe the solution

Use calculate_by_enchantment to help contribute to the amount of smash damage done.

Describe alternatives you've considered

I initially thought about just linearly adding the STRENGTH and MELEE_DAMAGE bonuses to the smash damage, but I figured that calculate_by_enchantment was better suited to handle the smash damage calculation.

Testing

  1. Create a world with Magiclysm mod. Set character with strength of 4.
  2. Locate retirement home and teleport to outside. There should be reinforced glass where the home faces the retirement home parking lot.
  3. Debug spawn pipe_mace and add TACTILE_KINESIS
  4. Cast TACTILE_KINESIS and wield pipe mace
  5. Terrorize senior citizens Smash reinforced glass until it breaks.

Reinforced glass has a bash_min of 40 and a pipe_mace has a bash rating of 24, so casting TACTILE KINESIS should allow the player to smash the window with a STRENGTH of 4

Additional context

Screenshot 2023-07-07 at 1 02 44 PM Here's an example of reinforced glass breaking. My character has 4 strength, 4 dexterity, and has the GRAVITY_CONTROL effect. My character is also wielding a pipe mace and generic survivor clothing.

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jul 7, 2023
@GuardianDll
Copy link
Member

Strength doesn't influence it? I thought it add points to your character strength, which affect the bash output?
Anyway i think ITEM_DAMAGE_BASH should also be added here

@fyhannes
Copy link
Contributor Author

fyhannes commented Jul 7, 2023

Strength doesn't influence it? I thought it add points to your character strength, which affect the bash output?

I'll remove the STRENGTH enchantment calculation I added since STRENGTH enchantments will affect cur_str which is used in calculating the bash output. Thanks for the catch.

Anyway i think ITEM_DAMAGE_BASH should also be added here

Good point on ITEM_DAMAGE_BASH, I'll add that as well.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 7, 2023
@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 Jul 7, 2023
@fyhannes fyhannes changed the title MELEE_DAMAGE and STRENGTH enchantments should affect bashing damage to tile MELEE_DAMAGE and ITEM_DAMAGE_BASH enchantments should affect bashing damage to tile Jul 8, 2023
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 8, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 8, 2023
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 <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants