Merge pull request #675 from MetaMorphic-Digital/dev

13.27.3 - Prevent Combat Tracker failing

Author: farling42

Changelog.md

@@ -1,5 +1,11 @@
 # TORG Eternity Changelog
 
+## 13.27.3 - Prevent Combat Tracker errors
+
+- Deleting an Actor whilst its token was in the Combat Tracker was causing errors in the Combat Tracker.
+- Added some extra checks to prevent a combatant without a valid token or actor from breaking the Combat Tracker.
+- Context Menu in an Encounter should show the Torg options under the correct dynamic conditions now.
+
 ## 13.27.2 - Fix defenses using only attribute values
 
 - Fixes a bug where the defensees were based on the skill values BEFORE adds were added to the skill values.

module/dramaticScene/torgeternityCombat.js

@@ -78,8 +78,8 @@ export default class TorgCombat extends Combat {
       const whoFirst = await this.getFlag('torgeternity', 'combatFirstDisposition');
       combatant.update({ initiative: this.#getInitiative(combatant, whoFirst) });
 
-      if (combatant.token.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY && this.heroConflict === 'confused') {
-        const hand = combatant.actor.getDefaultHand();
+      if (combatant.token?.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY && this.heroConflict === 'confused') {
+        const hand = combatant.actor?.getDefaultHand();
         if (hand) hand.setFlag('torgeternity', 'disablePlayCards', true)
       }
 
@@ -95,7 +95,7 @@ export default class TorgCombat extends Combat {
   async _onExit(combatant) {
     // Cancel "cannot play cards"
     if (combatant.token?.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY && this.heroConflict === 'confused') {
-      const hand = combatant.actor.getDefaultHand();
+      const hand = combatant.actor?.getDefaultHand();
       if (hand) hand.setFlag('torgeternity', 'disablePlayCards', false)
     }
     combatant.token?.object?.renderFlags.set({ refreshTurnMarker: true })
@@ -311,7 +311,7 @@ export default class TorgCombat extends Combat {
    * DRAMA DECK HANDLING
    */
   getCombatantFaction(combatant) {
-    return (combatant.token.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY) ? 'heroes' : 'villains';
+    return (combatant.token?.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY) ? 'heroes' : 'villains';
   }
   getFactionActors(faction) {
     const disposition = (faction === 'heroes') ? CONST.TOKEN_DISPOSITIONS.FRIENDLY : CONST.TOKEN_DISPOSITIONS.HOSTILE;
@@ -510,12 +510,12 @@ export default class TorgCombat extends Combat {
     // Find first combatant whose turn has NOT been taken (after sorting).
     const old = this.#currentDisposition;
     const firstNotTaken = this.turns?.find(combatant => !combatant.turnTaken && !combatant.isWaiting);
-    this.#currentDisposition = firstNotTaken?.token.disposition ?? CONST.TOKEN_DISPOSITIONS.SECRET;
+    this.#currentDisposition = firstNotTaken?.token?.disposition ?? CONST.TOKEN_DISPOSITIONS.SECRET;
 
     // Combat.updateTurnMarkers won't add new ones!
     if (this.#currentDisposition != old)
       for (const combatant of this.turns)
-        if (combatant.token.rendered)
+        if (combatant.token?.rendered)
           combatant.token?.object?.renderFlags.set({ refreshTurnMarker: true });
   }
 

module/dramaticScene/torgeternityCombatTracker.js

@@ -81,10 +81,9 @@ export default class torgeternityCombatTracker extends foundry.applications.side
 
   async _prepareTrackerContext(context, options) {
     await super._prepareTrackerContext(context, options);
-    if (!this.viewed) return;
-    this.viewed.updateCurrentDisposition();
     const combat = this.viewed;
     if (!combat) return;
+    combat.updateCurrentDisposition();
 
     await this._prepareGroupContext(context, combat);
 
@@ -188,22 +187,22 @@ export default class torgeternityCombatTracker extends foundry.applications.side
     options.unshift({
       name: "torgeternity.dramaCard.replaceDrama",
       icon: '<i class="fa-solid fa-rotate-right"></i>',
-      condition: game.user.isGM && !!this.viewed,
+      condition: () => game.user.isGM && !!this.viewed,
       callback: () => this.viewed.drawDramaCard()
     }, {
       name: "torgeternity.dramaCard.getPreviousDrama",
       icon: '<i class="fa-solid fa-up-down"></i>',
-      condition: game.user.isGM && !!this.viewed,
+      condition: () => game.user.isGM && !!this.viewed,
       callback: () => this.viewed.restorePreviousDrama()
     }, {
       name: "torgeternity.dramaCard.shuffleDeck",
       icon: '<i class="fa-solid fa-random"></i>',
-      condition: game.user.isGM && !!this.viewed,
+      condition: () => game.user.isGM && !!this.viewed,
       callback: () => this.viewed.resetDramaDeck()
     }, {
       name: "torgeternity.CombatantGroup.newGroup",
       icon: '<i class="fa-solid fa-random"></i>',
-      condition: game.user.isGM && !!this.viewed,
+      condition: () => game.user.isGM && !!this.viewed,
       callback: async () => {
         const groupName = await foundry.applications.api.DialogV2.prompt({
           window: { title: "Combatant Group Creation" },
@@ -223,7 +222,7 @@ export default class torgeternityCombatTracker extends foundry.applications.side
     const getCombatant = li => this.viewed.combatants.get(li.dataset.combatantId);
     function canAddToGroup(li) {
       const combatant = getCombatant(li);
-      return !combatant?.group &&
+      return !combatant?.group && combatant.token &&
         !!combatant.combat.groups.find(group => group.disposition === undefined || group.disposition === combatant.token.disposition);
     }
 
@@ -331,7 +330,7 @@ export default class torgeternityCombatTracker extends foundry.applications.side
     const { combatantId } = button.closest("[data-combatant-id]")?.dataset ?? {};
     const combatant = this.viewed?.combatants.get(combatantId);
     if (!combatant) return;
-    await combatant.actor.toggleStatusEffect('waiting');
+    await combatant.actor?.toggleStatusEffect('waiting');
   }
 
   updateStage(document, force) {
@@ -530,24 +529,26 @@ export default class torgeternityCombatTracker extends foundry.applications.side
   static async #onToggleWaitingGroup(event, button) {
     const group = this.viewed.groups.get(button.closest('li.combatantGroup')?.dataset.groupId);
     if (group) group.isOpen = !button.open;
-    return Promise.all(group.members.map(combatant => combatant.actor.toggleStatusEffect('waiting')))
+    return Promise.all(group.members.map(combatant => combatant.actor?.toggleStatusEffect('waiting')))
   }
 
   static async #askAddToGroup(askAll, li) {
     const combat = this.viewed;
     const combatant = combat.combatants.get(li.dataset.combatantId); // getCombatant(li)
     let combatants;
     if (askAll) {
-      if (combatant.actor.type === 'stormknight') {
-        combatants = combat.combatants.filter(combatant => combatant.actor.type === 'stormknight');
+      const actor = combatant.actor;
+      if (!actor) return;// The Actor has been deleted.
+      if (actor.type === 'stormknight') {
+        combatants = combat.combatants.filter(combatant => actor.type === 'stormknight');
       } else {
-        const matchid = combatant.actor._source._id;
-        combatants = combat.combatants.filter(combatant => combatant.actor._source._id === matchid);
+        const matchid = actor._source._id;
+        combatants = combat.combatants.filter(combatant => actor._source._id === matchid);
       }
     } else
       combatants = [combatant];
 
-    const validDisposition = combatant.token.disposition;
+    const validDisposition = combatant.token?.disposition;
     const validGroups = combat.groups.filter(group => group.disposition === undefined || group.disposition === validDisposition);
     if (validGroups.length < 1)
       return ui.notifications.info('torgeternity.CombatantGroup.noValidGroup', { localize: true });

module/dramaticScene/torgeternityCombatant.js

@@ -27,8 +27,9 @@ export default class TorgCombatant extends Combatant {
         'system.multiAction': null,
       }, { combatTurn: this.combat.turn + 1 });
 
-      await this.actor.toggleStatusEffect('waiting', { active: false });
-      await this.actor.decayEffects();
+      // If the actor of a linked token is deleted, this.actor will be undefiend.
+      await this.actor?.toggleStatusEffect('waiting', { active: false });
+      await this.actor?.decayEffects();
     } else {
       // Step backwards
       await this.update({ 'system.turnTaken': value }, { combatTurn: this.combat.turn - 1 });