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 Weapon #254

Merged
merged 16 commits into from
Sep 22, 2022
Merged

Melee Weapon #254

merged 16 commits into from
Sep 22, 2022

Conversation

Zac8668
Copy link
Collaborator

@Zac8668 Zac8668 commented Sep 14, 2022

Add Melee Weapon
#86

@Zac8668 Zac8668 marked this pull request as ready for review September 21, 2022 17:33
@odecay odecay requested review from odecay and zicklag September 21, 2022 19:23
Copy link
Member

@zicklag zicklag left a comment

Choose a reason for hiding this comment

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

This looks great!

The only thing I notice is that we might want to tweak a weapon offset of some sort for the positioning relative to the player.

image

Still, I don't think that needs to block this PR, and we can do that after this is merged.

@Zac8668
Copy link
Collaborator Author

Zac8668 commented Sep 21, 2022

The only thing I notice is that we might want to tweak a weapon offset of some sort for the positioning relative to the player.

image

@zicklag maybe this could be a field on the yaml file? Cause there's a variety of weapons that could be implemented, and with that we could have a negative offset, something that a player relative offset would not probably not allow, and as I noticed it now, the sword on jumpy has a negative one:
image

@zicklag
Copy link
Member

zicklag commented Sep 21, 2022

Yeah, that's exactly what I was thinking. 👍

Copy link
Collaborator

@odecay odecay left a comment

Choose a reason for hiding this comment

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

Looks good.

assets/levels/1_beach/beach.level.yaml Outdated Show resolved Hide resolved
src/metadata.rs Show resolved Hide resolved
src/player.rs Show resolved Hide resolved
@zicklag zicklag linked an issue Sep 22, 2022 that may be closed by this pull request
Also tweak item placement slightly.
@zicklag
Copy link
Member

zicklag commented Sep 22, 2022

Awesome, thanks a bunch!

bors merge

@bors bors bot merged commit fe167a7 into fishfolk:master Sep 22, 2022
@Zac8668 Zac8668 deleted the melee branch September 22, 2022 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Melee Weapons
3 participants