feat: Martial Arts Expansion #6054

acssimpson · 2025-02-05T17:27:45Z

Purpose of change (The Why)

The current martial arts system is very clunky/coarse in its approximation of a state machine, while also being quite limited in what it allows martial arts to do. It should be updated to fix both of these problems so we can make existing stuff cleaner, and make new stuff cooler.

(TODO: Look for related issues and add them. I'm sure there are plenty)

Describe the solution (The How)

This PR aims to greatly expand the JSON options available when defining a Martial Art, both to clean up/streamline existing logic, and to allow for more interesting/diverse patterns & mechanics. Most of the changes I am proposing either have an obvious intended use, or are an expansion of existing functionality.

The full list of planned changes can be found on this spreadsheet, but I will be attaching gifs and examples of each field below.

Also, TBD but I would really like to clean up the in-game martial arts description. It is VERY difficult to parse, and now seems like a good time since I will have to add entries for all of these field anyway.

Describe alternatives you've considered

While limited, I think the martial arts system is also relatively focused right now, and I've tried to preserve that by not expanding it too much. Changes I considered but decided against include:

Refactoring existing structures to be more generalized
"req_buffs": [ "buff_example_onhit" ] -> "req_effects": [ "buff_example_onhit", "grabbed" ]
"downed_target": true -> "req_effects_target": [ "downed" ]
Building in cross pollination of other combat systems, like allowing techniques to apply any string-specified effect, or allowing them to trigger spells/enchants like the on_hit_you effects weapons can trigger.
Anything that seemed like it would overcomplicate or add too much boiler plate JSON that might makes it more difficult to understand/work with the system.

Testing

All of these effects will be tested. Gifs and JSON examples incoming.

Additional context

Ideally this should not remove any functionality, from the game. There is an implied follow up task where existing clunky martial arts are rewritten using better logic enabled by this pr, but that is not included.

Checklist

Mandatory

I wrote the PR title in conventional commit format.
I ran the code formatter.
I linked any relevant issues using github keyword syntax like closes #1234 in Summary of the PR so it can be closed automatically.
I've committed my changes to new branch that isn't main so it won't cause conflict when updating main branch later.

Optional

This is a C++ PR that modifies JSON loading or behavior.
- I have documented the changes in the appropriate location in the doc/ folder.
- If documentation for this feature does not exist, please write it or at least note its lack in PR description.
- New localizable fields need to be added to the lang/bn_extract_json_strings.sh script if it does not support them yet.
- If applicable, add checks on game load that would validate the loaded data.
  -->

Initial commit. Also, Added knockback_follow_full, strictly_running, consume_buffs (which isn't fully functional yet), annd switch_pos (also renamed side_switch to switch_side). Started work on reach attacks.

autofix-ci · 2025-02-05T17:28:46Z

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix

Run git pull. this will merge the automated commit into your local copy of the PR branch.
Continue working.

I do not want the automated commit

Format your code locally, then commit it.
Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

This reverts commit 5b6f75d.

… into MA-Changes

…r. method Added: req_running req_half_wall switch_side_self switch_pos reach_tec reach_ok pull_target pull_self consumes_buffs req_buffs req_target_effects Updated Names for: side_switch -> switch_side_target stealthy -> quiet_movement quiet -> quiet_attacks powerful_knockback -> knockback_type knockback_follow -> knockback_follow_type

Coolthulhu · 2025-02-12T16:25:46Z

src/martialarts.cpp

@@ -534,10 +599,24 @@ bool ma_requirements::is_valid_character( const Character &u ) const
        }
    }

-    if( wall_adjacent && !get_map().is_wall_adjacent( u.pos() ) ) {
+    if( req_running && !u.movement_mode_is( CMM_RUN ) ) {


Mixed feelings on running requirement.
On one hand, it allows mode switching, which is pretty powerful - same technique could switch between, say, offensive or defensive, charge forward or stay rooted etc.
On the other hand, it allows somewhat clunky, tedious mode switching.

I'm not saying no, it's just that there may be a better way to do mode switching - something that doesn't tie it to an unrelated mode option. Tying it to movement mode feels like a workaround (for lack of free keybinds) rather than "the right thing".
Still, if no better solution is found, this is good enough.

Coolthulhu · 2025-02-12T16:26:40Z

src/martialarts.cpp

        dump += _( "* Moves target <info>behind</info> you" ) + std::string( "\n" );
    }

-    if( wall_adjacent ) {
+    if( switch_pos ) {
+        dump += _( "* switchs positions with the target" ) + std::string( "\n" );


Coolthulhu · 2025-02-12T16:30:47Z

src/melee.cpp

+                t.setpos( dest );
+            } else {
+                if( in_vehicle ) { //Don't unboard unless it's the player, and unless there is actually a place to swap to.
+                    get_map().unboard_vehicle( pos() );


This will need robust testing, boarding/unboarding code is fragile as fuck when combined with dragged vehicles.
Be sure to test at least the following cases:

Player is dragging a cart, zombie stands on cart, player swaps with zombie, player moves off cart

As above, but player is standing on cart2

Coolthulhu · 2025-02-12T16:31:33Z

src/melee.cpp

        }
    }

-    if( technique.stun_dur > 0 && !technique.powerful_knockback ) {
+    if( technique.stun_dur > 0 && technique.knockback_type.empty() ) {


Using std::optional would be better than testing for empty string.

Coolthulhu · 2025-02-12T16:33:23Z

src/melee.cpp

+
+    for( const mabuff_id &consume_id : technique.reqs.consume_buffs ) {
+        if( has_mabuff( consume_id ) ) {
+            remove_effect( efftype_id( std::string( "mabuff:" ) + consume_id.str() ) );


Evil string manipulation.
In order to limit the evilness, move that to load/finalize time. This will enable verification if the mabuff exists on load time, rather than only during runtime.

…tuff -consumed_buffs and required_buffs are now vector<pair<mabuff_id, int>> -added new effect removal methods that allow for effects to have part of the intensity reduced externally. Not happy with the location of these methods and am going to change it. -added more safety rails for existing fields that will soon be deprecated.

… into MA-Changes

acssimpson added 2 commits January 28, 2025 16:21

Update .gitignore

5b6f75d

Initial commit with martial arts changes.

614d01f

Initial commit. Also, Added knockback_follow_full, strictly_running, consume_buffs (which isn't fully functional yet), annd switch_pos (also renamed side_switch to switch_side). Started work on reach attacks.

github-actions bot added the src changes related to source code. label Feb 5, 2025

style(autofix.ci): automated formatting

e8714a8

acssimpson added 3 commits February 5, 2025 11:29

Revert "Update .gitignore"

399b1e0

This reverts commit 5b6f75d.

Merge branch 'MA-Changes' of https://github.com/acssimpson/Cataclysm-BN…

28e4df0

… into MA-Changes

github-actions bot added the JSON related to game datas in JSON format. label Feb 10, 2025

acssimpson and others added 2 commits February 10, 2025 08:12

Merge branch 'main' into MA-Changes

476ead3

style(autofix.ci): automated formatting

565d58e

Coolthulhu reviewed Feb 12, 2025

View reviewed changes

acssimpson and others added 4 commits February 12, 2025 16:59

Merge branch 'MA-Changes' of https://github.com/acssimpson/Cataclysm-BN…

9a3873e

… into MA-Changes

style(autofix.ci): automated formatting

11eb35f

style(autofix.ci): automated formatting (attempt 2/3)

5ea8b28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Martial Arts Expansion #6054

feat: Martial Arts Expansion #6054

acssimpson commented Feb 5, 2025 •

edited

Loading

autofix-ci bot commented Feb 5, 2025

Coolthulhu Feb 12, 2025

Coolthulhu Feb 12, 2025

Coolthulhu Feb 12, 2025

Coolthulhu Feb 12, 2025

Coolthulhu Feb 12, 2025

feat: Martial Arts Expansion #6054

Are you sure you want to change the base?

feat: Martial Arts Expansion #6054

Conversation

acssimpson commented Feb 5, 2025 • edited Loading

Purpose of change (The Why)

Describe the solution (The How)

Describe alternatives you've considered

Testing

Additional context

Checklist

Mandatory

Optional

autofix-ci bot commented Feb 5, 2025

Coolthulhu Feb 12, 2025

Choose a reason for hiding this comment

Coolthulhu Feb 12, 2025

Choose a reason for hiding this comment

Coolthulhu Feb 12, 2025

Choose a reason for hiding this comment

Coolthulhu Feb 12, 2025

Choose a reason for hiding this comment

Coolthulhu Feb 12, 2025

Choose a reason for hiding this comment

acssimpson commented Feb 5, 2025 •

edited

Loading