Merge pull request #169 from sasquach45932/master

Small actor sheet fixes
Xacus · Mar 29, 2024 · 523825d · 523825d
2 parents b74d65f + a149e66
commit 523825d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git 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
@@ -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
@@ -65,11 +65,12 @@
             <input
                     name="system.characteristics.insanity.value"
                     type="number"
-                    value="{{system.characteristics.insanity.value}}"
-                    placeholder="{{system.characteristics.insanity.value}}"
+                    value={{ifThen system.characteristics.insanity.immune '-' system.characteristics.insanity.value}}
+                    placeholder={{ifThen system.characteristics.insanity.immune '-' system.characteristics.insanity.value}}
                     style="color: white; border: none; box-shadow: none"
                     min="{{system.characteristics.insanity.min}}"
                     max="{{system.characteristics.insanity.max}}"
+                    {{disabled system.characteristics.insanity.immune}}
             />
           </div>
         </div>
@@ -79,10 +80,11 @@
             <input
                     name="system.characteristics.corruption.value"
                     type="number"
-                    value="{{system.characteristics.corruption.value}}"
-                    placeholder="{{system.characteristics.corruption.value}}"
+                    value={{ifThen system.characteristics.corruption.immune '-' system.characteristics.corruption.value}}
+                    placeholder={{ifThen system.characteristics.corruption.immune '-' system.characteristics.corruption.value}}
                     style="color: white; border: none; box-shadow: none"
                     min="0"
+                    {{disabled system.characteristics.corruption.immune}}
             />
           </div>
         </div>
@@ -97,21 +99,30 @@
         <div class="damage">{{system.characteristics.health.value}}</div>
       </div>
       <div class="insanity">
-        <div class="addInsanity">{{localize "DL.CharInsanity"}}</div>
+        <div class={{ifThen system.characteristics.insanity.immune "Insanity"  "addInsanity"}}>{{localize "DL.CharInsanity"}}</div>
         <div class="healthbar">
-          <span class="insanity-fill"></span>
+          <span class={{ifThen system.characteristics.insanity.immune "insanity-empty" "insanity-fill"}}></span>
         </div>
-        <div class="insanitymax">{{system.characteristics.insanity.max}}</div>
-        <div class="insanityvalue">{{system.characteristics.insanity.value}}</div>
+        {{#unless system.characteristics.insanity.immune}}
+          <div class="insanitymax">{{system.characteristics.insanity.max}}</div>
+          <div class="insanityvalue">{{system.characteristics.insanity.value}}</div>
+        {{else}}
+          <div class="insanitymiddle">–</div>
+        {{/unless}}
       </div>
       <div class="corruption">
-        <div class="addCorruption">{{localize "DL.CharCorruption"}}</div>
+        <div class={{ifThen system.characteristics.corruption.immune "Corruption"  "addCorruption"}}>{{localize "DL.CharCorruption"}}</div>
         <div class="healthbar">
-          <span class="corruption-fill"></span>
+          <span class={{ifThen system.characteristics.corruption.immune "corruption-empty" "corruption-fill"}}></span>
         </div>
-        <div class="corruptionmax">20</div>
-        <div class="corruptionvalue">{{system.characteristics.corruption.value}}</div>
-        <a class="corruption-roll" title="{{localize 'DL.CharRolCorruption'}}"><i class="fas fa-dice-d20"></i></a>
+        {{#unless system.characteristics.corruption.immune}}
+          <div class="corruptionmax">20</div>
+          <div class="corruptionvalue">{{system.characteristics.corruption.value}}</div>
+          <div class="insanityvalue">{{system.characteristics.insanity.value}}</div>
+          <a class="corruption-roll" title="{{localize 'DL.CharRolCorruption'}}"><i class="fas fa-dice-d20"></i></a>          
+        {{else}}
+          <div class="corruptionmiddle">–</div>
+        {{/unless}}
       </div>
     {{/if}}
     <div class="chars grid grid-2col">