diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index 5781120..f0dd6e5 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -21,6 +21,9 @@ export class AcksActor extends Actor { data.initiative.value = data.initiative.mod; if (this.data.type == "character") { data.initiative.value += data.scores.dex.mod; + if (data.isSlow) { + data.initiative.value -= 1; + } } } else { data.initiative.value = 0; diff --git a/src/module/combat.js b/src/module/combat.js index 24dea47..7648f2b 100644 --- a/src/module/combat.js +++ b/src/module/combat.js @@ -22,12 +22,11 @@ export class AcksCombat { if (!data.combatants[i].actor) { return; } + data.combatants[i].initiative = + groups[data.combatants[i].flags.acks.group].initiative; if (data.combatants[i].actor.data.data.isSlow) { - data.combatants[i].initiative = -789; - } else { - data.combatants[i].initiative = - groups[data.combatants[i].flags.acks.group].initiative; - } + data.combatants[i].initiative -= 1; + } } combat.setupTurns(); } @@ -123,10 +122,11 @@ export class AcksCombat { static updateCombatant(combat, combatant, data) { let init = game.settings.get("acks", "initiative"); // Why do you reroll ? - if (combatant.actor.data.data.isSlow) { - data.initiative = -789; - return; - } +// Legacy Slowness code from OSE +// if (combatant.actor.data.data.isSlow) { +// data.initiative = -789; +// return; +// } if (data.initiative && init == "group") { let groupInit = data.initiative; // Check if there are any members of the group with init