Merge branch 'main' into feat/add-lock-initiative

.github/workflows/release.yml

@@ -85,7 +85,7 @@ jobs:
 
       # Publishes the release to the FoundryVTT's package repository.
       - name: 🚩 Publish Module to FoundryVTT Website
-        uses: Varriount/[email protected].0
+        uses: Varriount/[email protected].1
         with:
           username: ${{ secrets.FOUNDRY_ADMIN_USERNAME }}
           password: ${{ secrets.FOUNDRY_ADMIN_PASSWORD }}

src/combat/combat.js

@@ -275,8 +275,8 @@ export default class YearZeroCombat extends Combat {
       for (const combatant of this.combatants) {
         const speed = combatant.getSpeedFromActor();
         if (speed > 1) {
-          const duplicatas = getCombatantsSharingToken(combatant);
-          const copyQty = speed - duplicatas.length;
+          const duplicates = getCombatantsSharingToken(combatant);
+          const copyQty = speed - duplicates.length;
           if (copyQty > 0) await duplicateCombatant(combatant, copyQty);
         }
       }
@@ -403,4 +403,30 @@ export default class YearZeroCombat extends Combat {
       await this.rollInitiative(ids, { newRound: true });
     }
   }
+
+  /* ------------------------------------------ */
+  /*  Static Methods                            */
+  /* ------------------------------------------ */
+
+  /**
+   * Handles createCombatant hook called when a new combatant is added to the Combat instance.
+   * @param {Combat} combat
+   * @param {Combatant} combatant
+   * @returns {Promise.<Combatant>}
+   * @static
+   * @async
+  */
+  static async createCombatant(combatant) {
+    if (!game.user.isGM) return;
+
+    // This handles cases where a combatant is added after combat started,
+    // and said combatant has a speed > 1.
+    const { parent: { started } } = combatant;
+    const speed = combatant.getSpeedFromActor();
+    if (started && speed > 1) {
+      const duplicates = getCombatantsSharingToken(combatant);
+      const copyQty = speed - duplicates.length;
+      if (copyQty > 0) await duplicateCombatant(combatant, copyQty);
+    }
+  }
 }

src/yze-combat.js

@@ -94,3 +94,5 @@ Hooks.on('getCombatTrackerEntryContext', YearZeroCombatTracker.appendControlsToC
 
 // Injects custom HTML in the combatant config.
 Hooks.on('renderCombatantConfig', onRenderCombatantConfig);
+
+Hooks.on('createCombatant', YearZeroCombat.createCombatant);