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

Move melee related functions from player to Character #39404

Merged
merged 6 commits into from
Apr 16, 2020

Conversation

Fris0uman
Copy link
Contributor

Summary

SUMMARY: Infrastructure "Move melee related functions from player to Character"

Purpose of change

Part of #34721

Describe the solution

Move the functions
Rename get_hit_base() to get_melee_hit_base() to avoid conflict with actual get_hit_base() function
Move MAX_RECOIL to game_constants

Describe alternatives you've considered

Testing

Compile without error
Fight monsters and NPCs, everyone gets damage as expected

Additional context

@mlangsdorf mlangsdorf added Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Mechanics: Character / Player Character / Player mechanics Melee Melee weapons, tactics, techniques, reach attack labels Apr 15, 2020
Copy link
Contributor

@mlangsdorf mlangsdorf left a comment

Choose a reason for hiding this comment

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

Straightforward changes.

@kevingranade kevingranade merged commit 8ef3706 into CleverRaven:master Apr 16, 2020
@Fris0uman Fris0uman deleted the morebodypart branch April 16, 2020 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Mechanics: Character / Player Character / Player mechanics Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants