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

Muay Thai changes #68347

Merged
merged 3 commits into from
Sep 30, 2023
Merged

Conversation

waxcatape
Copy link
Contributor

@waxcatape waxcatape commented Sep 26, 2023

Summary

Content "Add 3 fundamental techs to Muay Thai, slight tweaks for balance and consistency."

Purpose of change

Muay Thai right now doesn't bear much resemblance to the real thing, with many bread and butter techniques completely absent: there's not a single boxing technique, the only knee tech is not even an abstract knee, but a very specific technique, no teeps. The Art of 8 Limbs right now is "The Art of 6 Limbs, and 2 of those can only be used while jumping, lol".

Describe the solution

Added a Rapid, a Cross and a Push Kick for distance control (Teeps are used all the time in Muay Thai and present good utility in-game). Renamed the Power Kick to Roundhouse Kick and bumped the damage bonus up from 1.3 to 1.4 to be consistent with the Kickboxing Roundhouse Kick tech. Added a +2 flat cutting bonus to Elbow Strike (elbow strikes often cause lacerations), made the Elbow Strike slightly slower (0.5 -> 0.66) to offset the damage bonus somewhat. Renamed Flying Knee to Knee Strike. Removed non-stunned and non-zombie requirements for the Knee Strike (how does a stunned enemy present a harder target for a knee strike? How does a similar size zombie present a harder target than a person?).

Describe alternatives you've considered

Adding uppercuts, trips and dumps/throws. Those would all be more than appropriate, but the MA is 7 techs already, making it the second highest number of techniques ingame right now after Brawling.

Make Elbow Strike and Knee Strike fire off on both normals and crits, but for normals to happen only when Grabbed. I'm not sure how to do that, maybe sometime later.

Testing

Spawned, tested that new techniques fire off, everything's as intended.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack Martial Arts Arts, Techniques, weapons and anything touching martial arts. labels Sep 26, 2023
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Sep 26, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 26, 2023
@worm-girl
Copy link
Contributor

I don't think those knee strike changes are going to fly. @Venera3 specifically made it so that stun techniques do not work on zombies.

The restrictions on flying knee are intentional and standard. Stun techs only work on non-stunned non-zombie enemies across the board.

@waxcatape
Copy link
Contributor Author

I don't think those knee strike changes are going to fly. @Venera3 specifically made it so that stun techniques do not work on zombies.

The restrictions on flying knee are intentional and standard. Stun techs only work on non-stunned non-zombie enemies across the board.

I see, I wasn't aware of that. Ideally I'd like for knees to still land on zombies and stunned enemies, just without applying stun, but I'm not sure how to do that. It would be a slight debuff to the style overall, because you have a suboptimal tech (without the stun) competing for a crit, but you'd see one of the more recognizable strikes for the style way more often. Unfortunately, the way it's set up right now, the tech basically only works on npcs, and I'm not sure how many players would ever want to unarmed melee them lol. Well, not a huge loss.

@Maleclypse Maleclypse merged commit 3fc9475 into CleverRaven:master Sep 30, 2023
19 of 23 checks passed
@waxcatape waxcatape deleted the muay-thai-additions branch October 1, 2023 03:29
detahramet pushed a commit to detahramet/Cataclysm-DDA that referenced this pull request Nov 6, 2023
* add new techniques, rename power kick to roundhouse, some tweaks.

* data/json/techniques.json:

* Fix style

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Revert knee strike conditions

---------

Co-authored-by: waxcatape <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Martial Arts Arts, Techniques, weapons and anything touching martial arts. Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants