diff --git a/package/ose-v0.6.zip b/package/ose-v0.6.zip index 521125c..c940b4b 100644 Binary files a/package/ose-v0.6.zip and b/package/ose-v0.6.zip differ diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index 118f59b..0f40fc5 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -11,6 +11,7 @@ export class OseActor extends Actor { // Compute modifiers from actor scores this.computeModifiers(); + this._isSlow(); // Determine Initiative if (game.settings.get("ose", "individualInit")) { @@ -362,6 +363,19 @@ export class OseActor extends Actor { return mod; } + _isSlow() { + this.data.data.isSlow = false; + if (this.data.type != 'character') { + return; + } + this.data.items.forEach(item => { + if (item.type == 'weapon' && item.data.slow && item.data.equipped) { + this.data.data.isSlow = true; + return; + } + }) + } + computeModifiers() { if (this.data.type != "character") { return; diff --git a/src/module/combat.js b/src/module/combat.js index 0637674..e866200 100644 --- a/src/module/combat.js +++ b/src/module/combat.js @@ -19,7 +19,12 @@ export class OseCombat { // Set init for (let i = 0; i < data.combatants.length; ++i) { - data.combatants[i].initiative = groups[data.combatants[i].flags.ose.group].initiative; + console.log(data.combatants[i]); + if (data.combatants[i].actor.data.data.isSlow) { + data.combatants[i].initiative = -1; + } else { + data.combatants[i].initiative = groups[data.combatants[i].flags.ose.group].initiative; + } } } diff --git a/src/module/init.js b/src/module/init.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/system.json b/src/system.json index 8d2ea44..ddd0b07 100644 --- a/src/system.json +++ b/src/system.json @@ -34,5 +34,5 @@ "gridUnits": "ft", "url": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose", "manifest": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose/raw/master/src/system.json", - "download": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose/-/raw/master/package/ose-v0.5.zip" + "download": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose/-/raw/master/package/ose-v0.6.zip" }