Fix: Act Library acts interrupted by player actions - #46
Merged
Conversation
add movement and situation type to act library dbg effect
There was a problem hiding this comment.
Pull request overview
This PR updates the companion/actor-follow helper bindings and Act Library bindings so NPC “acts” and follow behaviors can be run at a higher priority and be less likely to be interrupted by player-driven AI events (e.g., distractions/illegal actions).
Changes:
- Replaced the old
SAIModifierRoleBindingwith a newSAIModifierBindingand added helper methods to start/stop “follow player” in an “ignore everything” mode. - Added
m_eSituationTypeto several Act Library bindings and set dance acts toESA_OVR_ALLto prevent interruption by other behaviors. - Refactored debug UI for Act Library, added a new follow-player debug effect, and parameterized the “actors follow player” effect into normal vs “ignore all else” variants.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Entity/Bindings/SFollowPlayerHelperBinding.h | Switches to SAIModifierBinding, adds follow “ignore everything” helpers and extra tuning properties. |
| src/Entity/Bindings/SAIModifierRoleBinding.h | Removes the old, narrower AI modifier role binding. |
| src/Entity/Bindings/SAIModifierBinding.h | Introduces unified AI modifier binding covering actor/role modifier properties. |
| src/Entity/Bindings/ActLibrary/SStandWaitingActEntityBinding.h | Adds m_eSituationType to control act priority/availability. |
| src/Entity/Bindings/ActLibrary/SStandDanceMatActEntityBinding.h | Adds m_eSituationType to control act priority/availability. |
| src/Entity/Bindings/ActLibrary/SLambicDanceActEntityBinding.h | Adds m_eSituationType to control act priority/availability. |
| src/Entity/Bindings/ActLibrary/SFlamingoDanceActEntityBinding.h | Adds m_eSituationType to control act priority/availability. |
| src/Entity/BehaviorTreeMatch.h | Adds constants for BT match-node names used by legacy/spsystem behaviors. |
| src/Effects/Dbg/ZActorFollowPlayerDbgEffect.h | Adds a debug-only effect wrapper for testing follow-helper behavior. |
| src/Effects/Dbg/ZActorFollowPlayerDbgEffect.cpp | Implements debug UI for selecting an actor and driving follow-helper settings/actions. |
| src/Effects/Dbg/ZActLibraryDbgEffect.cpp | Refactors debug UI with shared helpers and adds situation-type selection where supported. |
| src/Effects/Camera/ZFollowingActorCameraEffect.cpp | Uses the new “ignore everything” follow mode for the camera-follow actor. |
| src/Effects/Actors/ZActorsFollowPlayerEffect.h | Adds parameterization for normal vs “ignore all else” variants and updates naming/duration/display. |
| src/Effects/Actors/ZActorsFollowPlayerEffect.cpp | Uses new AIModifier binding and registers two parameterized effect variants. |
| src/Effects/Actors/ZActorsDanceEffect.cpp | Sets Act Library situation type to ESA_OVR_ALL before starting dance acts. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
makes it so act libary / player follow effects can fully override actor behaviour.
this makes it such that e.g. the camera man effect no longer has the actor getting scared.
this is done by setting the situtation type prop of the drama situation / sMatch prop of (follow player) behavior accordingly.
depends on shadow578/ZHMChaosModCompanion#4
Checklist