diff --git a/src/module/actor/sheets/base-actor-sheet.js b/src/module/actor/sheets/base-actor-sheet.js index f706971b..fe14165c 100644 --- a/src/module/actor/sheets/base-actor-sheet.js +++ b/src/module/actor/sheets/base-actor-sheet.js @@ -330,7 +330,7 @@ export default class DLBaseActorSheet extends ActorSheet { const div = $(ev.currentTarget) const attributeName = div.data('key') const attribute = this.actor.getAttribute(attributeName) - this.actor.rollChallenge(attribute) + if (!attribute.immune) this.actor.rollChallenge(attribute) }) // Set immune on rollable attribute diff --git a/src/styles/components/actor-sheets/_aside-character.scss b/src/styles/components/actor-sheets/_aside-character.scss index 1555d8c4..96a1dd56 100644 --- a/src/styles/components/actor-sheets/_aside-character.scss +++ b/src/styles/components/actor-sheets/_aside-character.scss @@ -329,6 +329,20 @@ form { color: #000; } + .insanitymiddle, + .corruptionmiddle { + margin-top: -13px; + color: #000; + text-align: center; + } + + .insanity-empty, + .corruption-empty { + display: block; + height: 12px; + border-radius: 3px; + } + .damage, .insanityvalue, .corruptionvalue { diff --git a/src/templates/actor/sidemenu.hbs b/src/templates/actor/sidemenu.hbs index 5839856b..7acf1cf3 100644 --- a/src/templates/actor/sidemenu.hbs +++ b/src/templates/actor/sidemenu.hbs @@ -65,11 +65,12 @@ @@ -79,10 +80,11 @@ @@ -97,21 +99,30 @@
{{system.characteristics.health.value}}
-
{{localize "DL.CharInsanity"}}
+
{{localize "DL.CharInsanity"}}
- +
-
{{system.characteristics.insanity.max}}
-
{{system.characteristics.insanity.value}}
+ {{#unless system.characteristics.insanity.immune}} +
{{system.characteristics.insanity.max}}
+
{{system.characteristics.insanity.value}}
+ {{else}} +
+ {{/unless}}
-
{{localize "DL.CharCorruption"}}
+
{{localize "DL.CharCorruption"}}
- +
-
20
-
{{system.characteristics.corruption.value}}
- + {{#unless system.characteristics.corruption.immune}} +
20
+
{{system.characteristics.corruption.value}}
+
{{system.characteristics.insanity.value}}
+ + {{else}} +
+ {{/unless}}
{{/if}}