diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index 2533d29..f4fa909 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -73,19 +73,28 @@ export default class DeltaGreenActorSheet extends ActorSheet { const simplifiedTraining = { name: training.name, id: training.id, + key: training.attribute, + rollType: "skill", }; // Convert the machine-readable name to a human-readable one. switch (true) { case DG.statistics.includes(training.attribute): simplifiedTraining.attribute = training.attribute.toUpperCase(); + simplifiedTraining.targetNumber = + this.actor.system.statistics[training.attribute].value; + simplifiedTraining.rollType = "stat"; break; case DG.skills.includes(training.attribute): simplifiedTraining.attribute = this.actor.system.skills[training.attribute].label; + simplifiedTraining.targetNumber = + this.actor.system.skills[training.attribute].proficiency; break; default: simplifiedTraining.attribute = this.actor.system.typedSkills[training.attribute].label; + simplifiedTraining.targetNumber = + this.actor.system.typedSkills[training.attribute].proficiency; break; } return simplifiedTraining; diff --git a/module/roll/roll.js b/module/roll/roll.js index d7e9e69..8397513 100644 --- a/module/roll/roll.js +++ b/module/roll/roll.js @@ -504,10 +504,13 @@ export class DGDamageRoll extends DGRoll { this.options.rollMode || game.settings.get("core", "rollMode"); let label = this.formula; try { - label = `${game.i18n.localize("DG.Roll.Rolling",)} ${game.i18n.localize("DG.Roll.Damage"). - toUpperCase()} ${game.i18n.localize("DG.Roll.For",)} ${this.item.name}`; - } catch(ex) { - //console.log(ex); + label = `${game.i18n.localize("DG.Roll.Rolling")} ${game.i18n + .localize("DG.Roll.Damage") + .toUpperCase()} ${game.i18n.localize("DG.Roll.For")} ${ + this.item.name + }`; + } catch (ex) { + // console.log(ex); label = `Rolling DAMAGE for ${label.toUpperCase()}`; } return this.createMessage(this.total, label, rollMode); diff --git a/templates/actor/custom-skills-partial.html b/templates/actor/custom-skills-partial.html index 5950e1f..78d0f68 100644 --- a/templates/actor/custom-skills-partial.html +++ b/templates/actor/custom-skills-partial.html @@ -24,8 +24,8 @@ {{/each}} {{#each specialTraining as |training|}}