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

Add bow enchantments #550

Merged
merged 24 commits into from
Aug 1, 2022
Merged

Add bow enchantments #550

merged 24 commits into from
Aug 1, 2022

Conversation

JustTalDevelops
Copy link
Member

@JustTalDevelops JustTalDevelops commented Jul 11, 2022

Adds flame, infinity, power, and punch enchantments.

@JustTalDevelops
Copy link
Member Author

This should be ready for review.

@JustTalDevelops JustTalDevelops added the feature New feature or request label Jul 14, 2022
@DaPigGuy DaPigGuy mentioned this pull request Jul 14, 2022
89 tasks
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of it looks good to me. I've left a couple of comments. If someone else could have another look at the actual calculations and logic to make sure they match vanilla bedrock edition, that would be appreciated.

server/entity/arrow.go Outdated Show resolved Hide resolved
server/entity/arrow.go Outdated Show resolved Hide resolved
server/entity/arrow.go Outdated Show resolved Hide resolved
server/entity/arrow.go Show resolved Hide resolved
server/entity/living.go Show resolved Hide resolved
Copy link
Member

@DaPigGuy DaPigGuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Several big issues to fix,

  • Punch does not have any impact whatsoever, looks like force & height are not used?
  • Damage done by bows w/o Power are not consistent between df & Minecraft, and the Power enchantment damage bonuses also don't appear to be consistent with what the wiki has to say.
    • Tests done on Hard difficulty with an unenchanted Bow & Power III Bow. In vanilla Minecraft, the bows are consistently doing 4.5/9 hearts of damage respectively while df seems to do a varying amount of damage

@JustTalDevelops
Copy link
Member Author

Did you test with critical arrows? Critical arrows are meant to do a varying amount of extra, inconsistent damage.

@JustTalDevelops
Copy link
Member Author

JustTalDevelops commented Jul 17, 2022

Seems like this isn't the case on Bedrock, instead they seem to have a consistent 1.5 damage multiplier. Will try this and see if I can reproduce the results you're getting.

@JustTalDevelops
Copy link
Member Author

I believe the damage values should now match Bedrock @DaPigGuy.

@JustTalDevelops
Copy link
Member Author

Okay so after some testing, arrow damage seems to be fairly accurate but it still does not match vanilla.

I think that's out of the scope of this PR though, as the actual calculated power damage is fine, the issues just arise with arrow damage in general. Should probably open a separate issue for that, but the enchantments themselves seem to work flawlessly.

Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this has all been tested, I think it's ready to be merged. Feel free to merge at your own discretion.

Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that TNT has been merged, flame arrows need to ignite TNT.

@JustTalDevelops JustTalDevelops merged commit bd9d743 into master Aug 1, 2022
@JustTalDevelops JustTalDevelops deleted the feature/bow-enchantments branch August 1, 2022 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants