Update combat system to handle start turn, end turn; improve effect management #215
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
Azurelol
changed the title
Azurelol
changed the title
Azurelol
force-pushed
the
update/combat_turn_events
branch
2 times, most recently
from
19e9243 to
e9adc78
Compare
KSops
reviewed
Feb 9, 2025
module/helpers/flags.mjs
Outdated
| @@ -4,7 +4,9 @@ | |||
| * @example actor.getFlag(Flags.Scope, Flags.CurrentTurn) | |||
| */ | |||
| export const Flags = Object.freeze({ | |||
| CombatantsTurnStarted: 'combatantsTurnStarted', | |||
There was a problem hiding this comment.
might as well align case with other flags?
KSops
reviewed
Feb 9, 2025
module/ui/combat-hud.mjs
Outdated
| async _doTakeTurn(event) { | ||
| await ui.combat.handleTakeTurn(event); | ||
| // TODO: Why was this? | ||
| // if (!game.user.isGM) return; |
There was a problem hiding this comment.
Highlighting for explicit review
There was a problem hiding this comment.
Thanks. Will remove the comment now that it's been sorted out and the missing functionality (players can start/end turns) implemented.
KSops
reviewed
Feb 9, 2025
module/ui/combat-hud.mjs
Outdated
| @@ -397,7 +408,8 @@ export class CombatHUD extends Application { | |||
| Hooks.on('preUpdateScene', this._preUpdateScene.bind(this)); | |||
|
|
|||
| if (!game.user.isGM) return; | |||
| game.settings.set(SYSTEM, SETTINGS.optionCombatHudActorOrdering, this._backupOrdering ?? []); | |||
| // TODO: Enable back? | |||
| //game.settings.set(SYSTEM, SETTINGS.optionCombatHudActorOrdering, this._backupOrdering ?? []); | |||
There was a problem hiding this comment.
Highlighting for explicit review
There was a problem hiding this comment.
Added back without issue that I saw.
KSops
reviewed
Feb 9, 2025
module/ui/combat.mjs
Outdated
| @@ -52,7 +92,8 @@ export class FUCombat extends Combat { | |||
| */ | |||
| constructor(data, context) { | |||
| super(data, context); | |||
|
|
|||
| //this._combatant = null; | |||
Azurelol
force-pushed
the
update/combat_turn_events
branch
from
e9adc78 to
4e0118e
Compare
- Add a distinct event for starting combatant turn - Add hooks for all combat events - Move in effects with the other pipelines - Clean up the img warnings from status effects and effects in HBS templates # Conflicts: # styles/css/projectfu.css
Azurelol
force-pushed
the
update/combat_turn_events
branch
from
4e0118e to
6c67925
Compare
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.
Combat System, Tracker
Refactors the combat system and tracker to handle two discrete steps between starting a turn and ending it.
Adds hooks for the common events during a combat encounter run by the system:
Effects Pipeline
Moves the effects class on with the other pipelines.. as it acts like one. It now hooks by default into the combat system in order to manage active effects. When these events are emitted chat messages can be displayed to update users and provide easy buttons to remove effects that have expired.
Fixes