-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Martial arts docs update #68418
Merged
Merged
Martial arts docs update #68418
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto-requesting reviews from non-collaborators: @Hymore246
Maleclypse
reviewed
Sep 30, 2023
GuardianDll
commented
Sep 30, 2023
This was referenced Oct 2, 2023
detahramet
pushed a commit
to detahramet/Cataclysm-DDA
that referenced
this pull request
Nov 6, 2023
* initial commit * Apply suggestions from code review * Martial art documentation * also fix this weird error highlight in markdown * Update doc/JSON_INFO.md
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.
[JSON]
Changes (can be) made in JSON
json-styled
JSON lint passed, label assigned by github actions
[Markdown]
Markdown issues and PRs
Martial Arts
Arts, Techniques, weapons and anything touching martial arts.
Melee
Melee weapons, tactics, techniques, reach attack
Mods: MMA
Mythical Martial Arts mod
Mods
Issues related to mods or modding
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
None
Purpose of change
Another documentation stuff
Adress #67783
Describe the solution
Documented some fields
The reason it's a separate PR is because i found and confirmed that
powerful_knockback
has no back up in code - it was introduced in #34407:https://github.com/CleverRaven/Cataclysm-DDA/pull/34407/files#diff-2cd8dac3d0903ca1ee60a47c28e09bcb56290214bc8d1fe5cf4afaed108b9d92R1333
to change the way the game calculate said knockback to be similar with vehicle collision, and deal additional damage when pushed enemy collides with another critter or wall; However the code that made it possible was (accidentally, i believe) removed few days later, in #34483:
https://github.com/CleverRaven/Cataclysm-DDA/pull/34483/files#diff-2cd8dac3d0903ca1ee60a47c28e09bcb56290214bc8d1fe5cf4afaed108b9d92L1332
I need someone to confirm, that i am correct, and that i didn't remove anything important accidentally
Additional context
Accidentally checked it out from #68390, so it has some side commits also