diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index f5df6df..d3e58ac 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -333,12 +333,12 @@ export class AcksActor extends Actor { rollExploration(expl, options = {}) { const label = game.i18n.localize(`ACKS.exploration.${expl}.long`); - const rollParts = ["1d6"]; + const rollParts = ["1d20"]; const data = { actor: this.data, roll: { - type: "below", + type: "check", target: this.data.data.exploration[expl], }, details: game.i18n.format("ACKS.roll.details.exploration", { @@ -553,15 +553,15 @@ export class AcksActor extends Actor { const data = this.data.data; let option = game.settings.get("acks", "encumbranceOption"); let weight = data.encumbrance.value; - let delta = data.encumbrance.max - 1600; + let delta = data.encumbrance.max - 20000; if (["detailed", "complete"].includes(option)) { if (weight > data.encumbrance.max) { data.movement.base = 0; - } else if (weight > 800 + delta) { + } else if (weight > 10000 + delta) { data.movement.base = 30; - } else if (weight > 600 + delta) { + } else if (weight > 7000 + delta) { data.movement.base = 60; - } else if (weight > 400 + delta) { + } else if (weight > 5000 + delta) { data.movement.base = 90; } else { data.movement.base = 120; @@ -703,11 +703,13 @@ export class AcksActor extends Actor { const od = { 0: 0, - 3: 1, - 9: 2, - 13: 3, - 16: 4, - 18: 5, + 3: 30, + 4: 26, + 6: 22, + 9: 18, + 13: 14, + 16: 10, + 18: 6, }; data.exploration.odMod = AcksActor._valueFromTable( od, diff --git a/src/module/config.js b/src/module/config.js index 6a6ad7e..a21ef94 100644 --- a/src/module/config.js +++ b/src/module/config.js @@ -106,75 +106,91 @@ export const ACKS = { monster_saves: { 0: { label: "Normal Human", - d: 14, - w: 15, + d: 15, + w: 17, p: 16, b: 17, s: 18 }, 1: { - label: "1-3", - d: 12, - w: 13, + label: "1", + d: 14, + w: 16, + p: 15, + b: 16, + s: 17 + }, + 2: { + label: "2-3", + d: 13, + w: 15, p: 14, b: 15, s: 16 }, 4: { - label: "4-6", - d: 10, - w: 11, + label: "4", + d: 12, + w: 14, + p: 13, + b: 14, + s: 15 + }, + 5: { + label: "5-6", + d: 11, + w: 13, p: 12, b: 13, s: 14 }, 7: { - label: "7-9", - d: 8, - w: 9, + label: "7", + d: 10, + w: 12, + p: 11, + b: 12, + s: 13 + }, + 8: { + label: "8-9", + d: 9, + w: 11, p: 10, - b: 10, + b: 11, s: 12 }, 10: { - label: "10-12", - d: 6, - w: 7, + label: "10", + d: 8, + w: 10, + p: 9, + b: 10, + s: 11 + }, + 11: { + label: "11-12", + d: 7, + w: 9, p: 8, - b: 8, + b: 9, s: 10 }, 13: { - label: "13-15", - d: 4, - w: 5, + label: "13", + d: 6, + w: 8, + p: 7, + b: 8, + s: 9 + }, + 14: { + label: "14+", + d: 5, + w: 7, p: 6, - b: 5, + b: 7, s: 8 }, - 16: { - label: "16-18", - d: 2, - w: 3, - p: 4, - b: 3, - s: 6 - }, - 19: { - label: "19-21", - d: 2, - w: 2, - p: 2, - b: 2, - s: 4 - }, - 22: { - label: "22+", - d: 2, - w: 2, - p: 2, - b: 2, - s: 2 - }, - } + }, }; \ No newline at end of file diff --git a/src/module/dice.js b/src/module/dice.js index 98eb53f..1a46437 100644 --- a/src/module/dice.js +++ b/src/module/dice.js @@ -16,14 +16,14 @@ export class AcksDice { result.isFailure = true; } } else if (data.roll.type == "below") { - // MORALE, EXPLORATION + // MORALE if (roll.total <= result.target) { result.isSuccess = true; } else { result.isFailure = true; } } else if (data.roll.type == "check") { - // SCORE CHECKS (1s and 20s) + // SCORE CHECKS (1s and 20s), EXPLORATION if (die == 1 || (roll.total <= result.target && die < 20)) { result.isSuccess = true; } else { diff --git a/src/templates/actors/dialogs/modifiers-dialog.html b/src/templates/actors/dialogs/modifiers-dialog.html index 5f5060c..c01ea67 100644 --- a/src/templates/actors/dialogs/modifiers-dialog.html +++ b/src/templates/actors/dialogs/modifiers-dialog.html @@ -6,7 +6,7 @@ {{localize 'ACKS.Melee'}} ({{mod data.scores.str.mod}})
  • - {{localize 'ACKS.exploration.od.long'}} ({{data.exploration.odMod}} in 6) + {{localize 'ACKS.exploration.od.long'}} ({{data.exploration.odMod}}+)