Fix various glitches

templates/actor-sheet.html

@@ -88,6 +88,7 @@
               <span class="small-label padd-right packed-left">&nbsp;Cur</span><input type="text" class="padd-right" name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
               <span class="small-label padd-right packed-left">&nbsp;Mod</span><input type="text" class="padd-right" name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
               <span class="small-label padd-right packed-left">&nbsp;Max</span><input type="text" class="padd-right" name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
+              <span class="small-label padd-right packed-left"> / {{data.nrg.absolutemax}}</span>
             </li>
           </ul>
 
@@ -169,6 +170,7 @@
             <span class="small-label padd-right packed-left">&nbsp;Cur</span><input type="text" class="padd-right update-field input-numeric-short" data-field-name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left">&nbsp;Mod</span><input type="text" class="padd-right update-field input-numeric-short" data-field-name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left">&nbsp;Max</span><input type="text" class="padd-right update-field input-numeric-short" data-field-name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
+            <span class="small-label padd-right packed-left"> / {{data.nrg.absolutemax}}</span>
           </li>
           <li class="item flexrow list-item" data-attr-key="{{key}}">            
             {{#each data.secondary as |stat2 key|}}
@@ -250,6 +252,16 @@
               <img class="sheet-competence-img" src="{{perk.img}}" />
               <span class="stat-label">{{perk.name}}</span>
               <span class="stat-label">Lvl:{{perk.data.level}}</span>
+              {{#if perk.data.features.range.flag}}
+              <span class="stat-label">Range:{{perk.data.features.range.value}}</span>
+              {{else}}
+              <span class="stat-label">&nbsp;</span>
+              {{/if}}
+              {{#if perk.data.features.nbtargets.flag}}
+              <span class="stat-label">#T:{{perk.data.features.nbtargets.value}}</span>
+              {{else}}
+              <span class="stat-label">&nbsp;</span>
+              {{/if}}
               <span class="stat-label">Perk Status:
                 <select class="competence-base flexrow perk-status" type="text" value="{{perk.data.status}}" data-dtype="String">
                   {{#select perk.data.status}}
@@ -307,6 +319,7 @@
             <span class="small-label padd-right packed-left">&nbsp;Cur</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left">&nbsp;Mod</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left">&nbsp;Max</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
+            <span class="small-label padd-right packed-left"> / {{data.nrg.absolutemax}}</span>
           </li>
         </ul>
 

templates/item-perk-sheet.html

@@ -57,50 +57,51 @@
             </li>
                 
             {{#each data.features as |feature key|}}
-            <li class="flexrow">
-              <label class="generic-label">{{feature.label}} ? </label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.features.{{key}}.flag" {{checked feature.flag}}/></label>
-            </li>
-              {{#if feature.flag}}
-              <ul class="ul-level1">
-                <li class="flexrow"><label class="generic-label">{{feature.label}}</label>
-                  {{#if (eq feature.type "statdice")}}
-                    <select class="competence-base flexrow" type="text" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
-                      {{#select feature.value}}
-                      {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true}}
-                      {{/select}}
-                    </select> 
-                  {{/if}}
-                  {{#if (eq feature.type "range")}}
-                    <select class="competence-base flexrow" type="text" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
-                      {{#select feature.value}}
-                      {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
-                      {{/select}}
+              {{#if feature.isvalid}}
+              <li class="flexrow">
+                <label class="generic-label">{{feature.label}} ? </label>
+                <label class="attribute-value checkbox"><input type="checkbox" name="data.features.{{key}}.flag" {{checked feature.flag}}/></label>
+              </li>
+                {{#if feature.flag}}
+                <ul class="ul-level1">
+                  <li class="flexrow"><label class="generic-label">{{feature.label}}</label>
+                    {{#if (eq feature.type "statdice")}}
+                      <select class="competence-base flexrow" type="text" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
+                        {{#select feature.value}}
+                        {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true}}
+                        {{/select}}
                       </select> 
-                  {{/if}}
-                  {{#if (eq feature.type "number")}}
-                  <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="Number"/>
-                  {{/if}}
-                  {{#if (eq feature.type "string")}}
-                  <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
-                  {{/if}}
-                  {{#if (eq feature.type "dropspec")}}
-                  <ul class="ul-level1">
-                    <li class="flexrow"><div class="drop-spec-perk" data-key={{key}}><label>Drop Specialisation here !</label></div>
-                    </li>
+                    {{/if}}
+                    {{#if (eq feature.type "range")}}
+                      <select class="competence-base flexrow" type="text" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
+                        {{#select feature.value}}
+                        {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
+                        {{/select}}
+                        </select> 
+                    {{/if}}
+                    {{#if (eq feature.type "number")}}
+                    <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="Number"/>
+                    {{/if}}
+                    {{#if (eq feature.type "string")}}
                     <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
-                  </ul>              
-                  {{/if}}        
-                  {{#if (eq feature.type "text")}}
-                  <div class="small-editor item-text-long-line">
-                    {{editor content=features.value target="data.features.{{key}}.value" button=true owner=owner editable=editable}}
-                  </div>
-                  {{/if}}
-                </li>
-              </ul>                
+                    {{/if}}
+                    {{#if (eq feature.type "dropspec")}}
+                    <ul class="ul-level1">
+                      <li class="flexrow"><div class="drop-spec-perk" data-key={{key}}><label>Drop Specialisation here !</label></div>
+                      </li>
+                      <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
+                    </ul>              
+                    {{/if}}        
+                    {{#if (eq feature.type "text")}}
+                    <div class="small-editor item-text-long-line">
+                      {{editor content=features.value target="data.features.{{key}}.value" button=true owner=owner editable=editable}}
+                    </div>
+                    {{/if}}
+                  </li>
+                </ul>                
+                {{/if}}
               {{/if}}
             {{/each}}
-
           </ul>
 
           <label class="generic-label">Description</label>

templates/item-power-sheet.html

@@ -15,6 +15,11 @@
             <label class="generic-label">Description</label>
             {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
           </div>
+          <li class="flexrow"><label class="generic-label">Available Effects</label>
+            <div class="small-editor item-text-long-line">
+            {{editor content=data.effects target="data.effects" button=true owner=owner editable=editable}}
+            </div>
+          </li>
 
           <ul>
             <li class="flexrow"><label class="generic-label">Roll Needed ?</label>
@@ -89,11 +94,6 @@
               </ul>              
             </li>
 
-            <li class="flexrow"><label class="generic-label">Available Effects</label>
-              <div class="small-editor item-text-long-line">
-              {{editor content=data.effects target="data.effects" button=true owner=owner editable=editable}}
-              </div>
-            </li>
             <li class="flexrow"><label class="generic-label">Purchased Effects</label>
               <div class="small-editor item-text-long-line">
               {{editor content=data.purchasedeffects target="data.purchasedeffects" button=true owner=owner editable=editable}}