[#4861] Add combat activation types that display in turn message #4911
+162
−45
Conversation
This file contains 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
krbz999
reviewed
Dec 20, 2024
Adds three new activation types in a new "Combat" section: "Start of Encounter", "Start of Turn", and "End of Turn". These activation types will display in the combat chat message with a "Use" button to be easily activated. They also have a tooltip to display the full item description on hover. The turn chat message stores relative UUIDs of the activiations in its data model to avoid having to check all of the actor's items every time the chat message is rendered. Closes #4861
arbron
force-pushed
the
turn-activation
branch
from
cd3d098 to
001cfc8
Compare
Fyorl
requested changes
Jan 4, 2025
There was a problem hiding this comment.
In addition to my comments I noticed a couple of issues while testing:
- It seems that
turnStartis not fired for the first combatant of the combat when the combat is started. When I tested this I had only one combatant in the combat and they had rolled initiative. This might be a core v12 bug though. - Giving an activity one of the new combat activations puts them in the 'actions' section on the NPC features tab if 'group by origin' is enabled. Notably this is distinct from the 'action' section where all other actions are. I think there's still a todo for pluralising those section titles, but I think this issue is unrelated, and that combat activations should probably be sorted into the 'features' section (that we should also rename to 'traits' at some point).
Comment on lines
+167
to
+168
| .map(i => i.system.activities?.filter(a => periods.includes(a.activation?.type)).map(a => a.relativeUUID) ?? []) | ||
| .flat(); |
There was a problem hiding this comment.
Suggested change
| .map(i => i.system.activities?.filter(a => periods.includes(a.activation?.type)).map(a => a.relativeUUID) ?? []) | |
| .flat(); | |
| .flatMap(i => i.system.activities?.filter(a => periods.includes(a.activation?.type)).map(a => a.relativeUUID) ?? []);; |
There was a problem hiding this comment.
Collection doesn't have flatMap.
Had to move it from I've realized we might have a bug with updating the dynamic ring during combat, because it looks like it only updates for the user who presses the "Next Turn" button. Might need to move that code into the |
Reworked where `_recoverUses` is called for start & end of turn to ensure that the `turnStart` period is called for the first combatant and to ensure these methods are always called for a GM user. Also fixes a bug where the dynamic ring is only being refreshed for the user who presses the combat control buttons. Changes the activity usage button in chat to be a rollable link on the title, rather than a separate button. Adjusts NPC sheets so that combat activations will appear in the passive section.
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.
Adds three new activation types in a new "Combat" section: "Start of Encounter", "Start of Turn", and "End of Turn". These activation types will display in the combat chat message with a "Use" button to be easily activated. They also have a tooltip to display the full item description on hover.
The turn chat message stores relative UUIDs of the activiations in its data model to avoid having to check all of the actor's items every time the chat message is rendered.
Closes #4861