Fixing and cleaning up

module/data/_module.mjs

@@ -17,6 +17,3 @@ export { default as DhpAdversaryRoll } from './adversaryRoll.mjs';
 export { default as DhpDamageRoll } from './damageRoll.mjs';
 export { default as DhpAbilityUse } from './abilityUse.mjs';
 export { default as DhpEnvironment } from './environment.mjs';
-
-export * as items from './item/_module.mjs';
-export * as messages from './chat-message/_modules.mjs';

module/data/combat.mjs

@@ -1,9 +1,6 @@
 export default class DhCombat extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
-        return {
+        return {};
-            actions: new fields.NumberField({ initial: 0, integer: true }),
-            started: new fields.BooleanField({ required: true, initial: false })
-        };
     }
 }

module/data/combatant.mjs

@@ -3,8 +3,7 @@ export default class DhCombatant extends foundry.abstract.TypeDataModel {
         const fields = foundry.data.fields;
         return {
             spotlight: new fields.SchemaField({
-                requesting: new fields.BooleanField({ required: true, initial: false }),
+                requesting: new fields.BooleanField({ required: true, initial: false })
-                active: new fields.BooleanField({ required: true, initial: false })
             }),
             actionTokens: new fields.NumberField({ required: true, integer: true, initial: 3 })
         };

module/documents/combat.mjs

@@ -1,11 +1,7 @@
 export default class DhpCombat extends Combat {
-    get combatant() {
-        return this.combatants.contents.find(x => x.system.spotlight.active) ?? null;
-    }
-
     async startCombat() {
         this._playCombatSound('startEncounter');
-        const updateData = { 'system.started': true };
+        const updateData = { round: 1, turn: null };
         Hooks.callAll('combatStart', this, updateData);
         await this.update(updateData);
         return this;

module/ui/combatTracker.mjs

@@ -71,16 +71,15 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
 
     static async toggleSpotlight(_, target) {
         const { combatantId } = target.closest('[data-combatant-id]')?.dataset ?? {};
-        for (var combatant of this.viewed.combatants) {
+        const combatant = this.viewed.combatants.get(combatantId);
-            const giveSpotlight = combatant.id === combatantId;
 
-            await combatant.update({
+        const toggleTurn = this.viewed.combatants.contents
-                'system.spotlight': {
+            .sort(this.viewed._sortCombatants)
-                    requesting: giveSpotlight ? false : combatant.system.spotlight.requesting,
+            .map(x => x.id)
-                    active: giveSpotlight ? !combatant.system.spotlight.active : false
+            .indexOf(combatantId);
-                }
+
-            });
+        await this.viewed.update({ turn: this.viewed.turn === toggleTurn ? null : toggleTurn });
-        }
+        await combatant.update({ 'system.spotlight.requesting': false });
     }
 
     static async setActionTokens(_, target) {

templates/ui/combat/combatTracker.hbs

@@ -41,7 +41,7 @@
                 </div>
             {{/if}}
 
-            {{#if ../combat.system.started}}
+            {{#if ../combat.round}}
                 <div class="token-actions">
                     {{#if isOwner}}
                         {{#if (and (not isNPC) ../actionTokens.enabled)}}

templates/ui/combat/combatTrackerFooter.hbs

@@ -1,7 +1,7 @@
 <nav class="combat-controls" data-tooltip-direction="UP">
     {{~#if hasCombat~}}
         {{#if user.isGM}}
-            {{#if combat.system.started}}
+            {{#if combat.round}}
                 <button type="button" class="combat-control combat-control-lg" data-action="endCombat">
                     <i class="fa-solid fa-xmark" inert></i>
                     <span>{{ localize "COMBAT.End" }}</span>

templates/ui/combat/combatTrackerHeader.hbs

@@ -62,7 +62,7 @@
         {{!-- Combat Status --}}
         <strong class="encounter-title">
             {{#if combats.length}}
-            {{#if combat.system.started}}
+            {{#if combat.round}}
             {{ localize "DAGGERHEART.Combat.combatStarted" }}
             {{else}}
             {{ localize "COMBAT.NotStarted" }}