Skip to content

[core] Crit fail synthesis/cancel fishing on attack; streamline ATTACK/ON_ATTACK buffs removal#9935

Merged
WinterSolstice8 merged 3 commits into
LandSandBoat:basefrom
sruon:synth_crit_fail_on_atk
May 7, 2026
Merged

[core] Crit fail synthesis/cancel fishing on attack; streamline ATTACK/ON_ATTACK buffs removal#9935
WinterSolstice8 merged 3 commits into
LandSandBoat:basefrom
sruon:synth_crit_fail_on_atk

Conversation

@sruon
Copy link
Copy Markdown
Contributor

@sruon sruon commented May 4, 2026

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

  • Funnel all action-emitting code paths through a single function that handles clearing the appropriate effects depending on action.
    • ON_ATTACK when performing or receiving hostile actions (actor/target)
    • DETECTABLE on receiving any hostile action (main target)
    • ATTACK on outgoing autos and WS
  • Crit fail synthesis when receiving any damage. Do note that retail has a little bit of leeway but I haven't been able to figure out the modifiers so we're gonna start it very strict.
  • Cancel fishing on any received hostile action

Little bit of a clusterfuck when this should really all exist on CBattleEntity but the way the code is laid out doesn't permit it easily.

Does not touch existing actor DETECTABLE as it's too complex without breaking Hide/Camouflage

Closes #9049 #9050 #860 #8729

Steps to test these changes

  • Included tests for effects
  • Test Mazurka wears off on any hostile action (incoming<>outgoing)
  • Test invisible wears off on hostile spells/attacks/RAs
  • Test invisible does not wear off on friendly spells
  • Test synthesis is cancelled when taking > 0 damage.
  • Test fishing is cancelled on hostile spells/attacks/RAs

Still testing a little bit more.

@sruon sruon force-pushed the synth_crit_fail_on_atk branch 2 times, most recently from 930c0bd to 6ea4140 Compare May 6, 2026 10:40
@sruon sruon force-pushed the synth_crit_fail_on_atk branch from 6ea4140 to 362730d Compare May 6, 2026 10:50
@sruon sruon marked this pull request as ready for review May 6, 2026 10:51
@sruon
Copy link
Copy Markdown
Contributor Author

sruon commented May 6, 2026

Undrafted, had to tweak the way the crafting animation is cancelled.

@LandSandBoat LandSandBoat deleted a comment from github-actions Bot May 7, 2026
@WinterSolstice8 WinterSolstice8 merged commit 1569b98 into LandSandBoat:base May 7, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🔨 Crit-fail synthesis when getting attacked

3 participants