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

Martial arts docs update #68418

Merged
merged 5 commits into from
Oct 2, 2023
Merged

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Sep 30, 2023

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

Copy link
Contributor

@github-actions github-actions bot left a 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

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs Melee Melee weapons, tactics, techniques, reach attack Martial Arts Arts, Techniques, weapons and anything touching martial arts. Mods: MMA Mythical Martial Arts mod astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 30, 2023
doc/JSON_INFO.md Outdated Show resolved Hide resolved
doc/JSON_INFO.md Outdated Show resolved Hide resolved
@Maleclypse Maleclypse merged commit 28799b3 into CleverRaven:master Oct 2, 2023
@GuardianDll GuardianDll deleted the Martial_arts_docs branch October 4, 2023 07:15
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants