diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index 0a91db8..ca86e22 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -302,6 +302,10 @@ export class DeltaGreenActorSheet extends ActorSheet { // damage roll, not a skill check label = dataset.label ? `Rolling damage for ${dataset.label.toUpperCase()}` : ''; } + else if(dataset.target === "lethality"){ + // a lethality roll + label = dataset.label ? `Rolling LETHALITY for ${dataset.label.toUpperCase()}` : ''; + } roll.roll().toMessage({ speaker: ChatMessage.getSpeaker({ actor: this.actor }), diff --git a/module/deltagreen.js b/module/deltagreen.js index efff015..b083160 100644 --- a/module/deltagreen.js +++ b/module/deltagreen.js @@ -66,6 +66,15 @@ Hooks.once('init', async function() { } }); + Handlebars.registerHelper('formatLethality', function(lethality) { + if (lethality > 0) { + return lethality.toString() + "%"; + } + else { + return ""; + } + }); + Handlebars.registerHelper('getActorSkillProp', function(actorData, skillName, prop) { if(skillName != "" && prop != ""){ let skills = actorData.skills; diff --git a/system.json b/system.json index 948d7df..fec488c 100644 --- a/system.json +++ b/system.json @@ -1,8 +1,8 @@ { "name": "deltagreen", "title": "Delta Green (Unofficial)", - "description": "Delta Green: The RPG system for Foundry VTT (unaffiliated with Arc Dream Publishing or the Delta Green Partnership).", - "version": "0.6.2", + "description": "Delta Green: The RPG system for Foundry VTT (unaffiliated with Arc Dream Publishing or the Delta Green Partnership). Based on the updated rules in the Agent's Handbook.", + "version": "0.6.3", "minimumCoreVersion": "0.6.4", "compatibleCoreVersion": "0.6.2", "templateVersion": 2, diff --git a/template.json b/template.json index b1b5101..2e9be1e 100644 --- a/template.json +++ b/template.json @@ -383,7 +383,8 @@ "base" ], "disorder":"", - "crossedOut": false + "crossedOut": false, + "disorderCured": false } } } \ No newline at end of file diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html index 3f9a8dc..a280530 100644 --- a/templates/actor/actor-sheet.html +++ b/templates/actor/actor-sheet.html @@ -158,11 +158,14 @@

{{item.name}}

{{getActorSkillProp ../data item.data.skill 'label'}} {{toUpperCase item.data.damage}} - {{item.data.lethality}}% + + {{formatLethality item.data.lethality}} +
+ {{/if_eq}} diff --git a/templates/item/item-motivation-sheet.html b/templates/item/item-motivation-sheet.html index 5d3324c..662bbf7 100644 --- a/templates/item/item-motivation-sheet.html +++ b/templates/item/item-motivation-sheet.html @@ -7,12 +7,10 @@ /> - {{!-- Sheet Body --}}
- {{!-- Attributes Tab --}}
@@ -20,37 +18,44 @@
{{!-- Only Show the Disorders Section if Motivation Lost Checked --}} {{#if data.crossedOut}} +
+
+ + +
+ {{/if}}
-
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
+
- + {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html index 1317b8f..5da5be3 100644 --- a/templates/item/item-weapon-sheet.html +++ b/templates/item/item-weapon-sheet.html @@ -59,10 +59,5 @@
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
- - {{!-- Attributes Tab --}} -
- {{!-- As you add new fields, add them in here! --}} -