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.

Sign up for GitHub

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

fix(combat): improve slot claiming #1377

Merged
merged 1 commit into from
Mar 11, 2024
Merged

fix(combat): improve slot claiming #1377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/combat-ffg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,12 +370,13 @@ export class CombatTrackerFFG extends CombatTracker {
async _claimInitiativeSlot(event) {
const slot = $(event.currentTarget).data('claim-slot');
const tokenCount = canvas.tokens.controlled.length;
const ownedTokenCount = canvas.tokens.ownedTokens.length;
// you must have a single token selected to claim a slot
if (tokenCount !== 1) {
if (tokenCount !== 1 && ownedTokenCount !== 1) {
ui.notifications.warn(game.i18n.localize("SWFFG.Notifications.Combat.Claim.OneToken"));
return;
}
const token = canvas.tokens.controlled[0];
const token = ownedTokenCount === 1 ? canvas.tokens.ownedTokens[0] : canvas.tokens.controlled[0];
const combatant = token.combatant;
if (!combatant) {
ui.notifications.warn(game.i18n.localize("SWFFG.Notifications.Combat.Claim.Combatant"));
Expand Down