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

Added Forbidden Buffs attribute to martial arts #51950

Merged
merged 2 commits into from
Sep 29, 2021
Merged

Added Forbidden Buffs attribute to martial arts #51950

merged 2 commits into from
Sep 29, 2021

Conversation

Hymore246
Copy link
Contributor

Summary

Features "Added Forbidden Buffs attribute to martial arts"

Purpose of change

Partial implements #51949
Adds new attribute to prevent buffs/techs from triggering.

Describe the solution

This is a two part update that improves the way styles interact with buffs:

First, the forbid_buffs_any and forbid_buffs_all have been added as technique and buff attributes. forbid_buffs_any will prevent a buff/technique from triggering if ANY of the listed buffs are active on the player and forbid_buffs_all will prevent a buff/technique from triggering if ALL of the listed buffs are active on the player.

Second, req_buffs has been replaced with req_buffs_all and req_buffs_any has been added. A req_buffs_any buff/technique can trigger if ANY of the listed buffs are active on the player and a req_buffs_all buff/technique can only trigger if ALL of the listed buffs are active on the player.

All existing buffs and techniques that used req_buffs have been converted over to req_buffs_all all.

@Hymore246 Hymore246 mentioned this pull request Sep 28, 2021
15 tasks
@anothersimulacrum anothersimulacrum added <Enhancement / Feature> New features, or enhancements on existing [C++] Changes (can be) made in C++. Previously named `Code` Melee Melee weapons, tactics, techniques, reach attack labels Sep 28, 2021
@kevingranade kevingranade merged commit f25af7a into CleverRaven:master Sep 29, 2021
chaosvolt added a commit to chaosvolt/cdda-arcana-mod that referenced this pull request Oct 1, 2021
Fixes stuff caused by CleverRaven/Cataclysm-DDA#51950

I'll tinker with weapon categories when  CleverRaven/Cataclysm-DDA#51867 is complete I suppose, tested and weapons added via category aren't visible but mods adding in explicit weapons don't override them.
@BrettDong BrettDong added the Martial Arts Arts, Techniques, weapons and anything touching martial arts. label Oct 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing 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.

4 participants