Merge pull request dmdorman#787 from aeauseth/main

Lightning Reflexes initiative dmdorman#775
phBalance · Mar 2, 2024 · 47de327 · 47de327
2 parents 3932303 + 81b5d72
commit 47de327
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/module/combat.js b/module/combat.js
@@ -35,9 +35,9 @@ export class HeroSystem6eCombat extends Combat {
             let dexValue =
                 combatant.actor.system.characteristics[characteristic].value;
             let spdValue = combatant.actor.system.characteristics.spd.value;
-            let intValue = combatant.actor.system.characteristics.int.value;
+            //let intValue = combatant.actor.system.characteristics.int.value;
 
-            let initiativeValue = dexValue + spdValue / 100 + intValue / 10000;
+            let initiativeValue = dexValue + spdValue / 100; // + intValue / 10000;
 
             if (initiativeValue != combatant.initiative) {
                 updates.push({

diff --git a/module/combatTracker.js b/module/combatTracker.js
@@ -102,11 +102,11 @@ export class HeroSystem6eCombatTracker extends CombatTracker {
                             combatant.actor.system.characteristics[
                                 characteristic
                             ].value;
-                        const intValue =
-                            combatant.actor.system.characteristics.int.value;
+                        const spdValue =
+                            combatant.actor.system.characteristics.spd.value;
                         context.turns[t].initiative =
                             dexValue +
-                            intValue / 100 +
+                            spdValue / 100 +
                             combatant.initiative +
                             parseInt(levels);
                     }

diff --git a/module/herosystem6e.js b/module/herosystem6e.js
@@ -68,7 +68,7 @@ Hooks.once("init", async function () {
      */
     CONFIG.Combat.initiative = {
         formula:
-            "@characteristics.dex.value + (@characteristics.int.value / 100)",
+            "@characteristics.dex.value + (@characteristics.spd.value / 100)",
         decimals: 2,
     };