Various fixes and enhancents

templates/actors/actor-sheet.hbs

@@ -158,13 +158,21 @@
               <li class="item flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
                 <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                     src="{{maneuver.img}}" /></a>
-                <span class="item-field-label-long">{{maneuver.name}}</span>
+                <span class="item-field-label-long">{{maneuver.name}}
+                  <a class="roll-item"><i class="fas fa-dice"></i></a>
+                </span>
 
                 <span class="item-field-label-very-short">{{maneuver.system.pha}}</span>
                 <span class="item-field-label-very-short">{{maneuver.system.ocv}}</span>
                 <span class="item-field-label-very-short">{{maneuver.system.dcv}}</span>
 
-                <span class="item-field-text-long">{{maneuver.system.effects}}</span>
+                <span class="item-field-text-long">{{maneuver.system.effects}}
+                  {{#if maneuver.system.haseffectroll}}
+                  <a class="roll-direct" data-roll-source="Maneuver {{maneuver.name}}" data-roll-formula="{{maneuver.system.effectrollformula}}">
+                    <i class="fas fa-dice"></i>{{maneuver.system.effectrollformula}}
+                  </a>
+                  {{/if}}
+                </span>
 
                 <span class="">&nbsp;</span>
                 <div class="item-controls item-controls-fixed">
@@ -314,7 +322,7 @@
                   <label class="">Movement</label>
                 </span>
                 <span class="item-field-label-short">
-                  <label class="short-label">C</label>
+                  <label class="short-label">Combat</label>
                 </span>
                 <span class="item-field-label-short">
                   <label class="short-label">NC</label>
@@ -325,7 +333,7 @@
                   <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                     <span class="item-field-label-long">{{char.label}}</span>
                     <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
-                    <input type="text" class="item-field-label-short" value="{{mul char.value 2}}" disabled data-dtype="Number" />
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.ncvalue" value="{{char.ncvalue}}" data-dtype="Number" />
                   </li>
                   {{/if}}
                 {{/each}}

templates/apps/combat-tracker.hbs

@@ -32,9 +32,12 @@
             </a>
             {{/if}}
 
+            {{log combat.flags}}
+
             {{#if combatCount}}
             {{#if combat.round}}
-            <h3 class="encounter-title noborder">Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}</h3>
+            <!--<h3 class="encounter-title noborder">Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}</h3>-->
+            <h3 class="encounter-title noborder">Turn {{combat.flags.world.turnData.turnNumber}} Segment {{combat.flags.world.turnData.segmentNumber}}</h3>
             {{else}}
             <h3 class="encounter-title noborder">{{localize 'COMBAT.NotStarted'}}</h3>
             {{/if}}

templates/items/item-skill-sheet.hbs

@@ -17,7 +17,7 @@
         <ul>
             <li class="flexrow"><label class="item-field-label-long">Type</label>
               <select class="item-field-label-medium" type="text" name="system.skilltype" value="{{system.skilltype}}" data-dtype="String">
-                {{#select system.skilltype}}
+                {{#select (lower system.skilltype)}}
                   {{#each config.skillType as |char key|}}
                   <option value="{{key}}">{{char}}</option>
                   {{/each}}
@@ -28,14 +28,14 @@
             {{#if (isSkillCustom system.skilltype)}}
             <li class="flexrow"><label class="item-field-label-long">Base characteristic</label>
               <select class="item-field-label-medium" type="text" name="system.characteristic" value="{{system.characteristic}}" data-dtype="String">
-                {{#select system.characteristic}}
+                {{#select (lower system.characteristic)}}
                   {{#each config.rollCharac as |char key|}}
                   <option value="{{key}}">{{char}}</option>
                   {{/each}}
                 {{/select}}
               </select> 
             </li>
-              {{#if (eq system.characteristic "manual")}}
+              {{#if (eq (lower system.characteristic) "manual")}}
                 <li class="flexrow"><label class="item-field-label-long">Base value</label>
                   <input type="text" class="item-field-label-medium" name="system.base" value="{{system.base}}" data-dtype="Number" {{#if (ne system.characteristic "manual")}}disabled{{/if}} />
                 </li>

templates/partials/partial-power-equipment-cost.hbs

@@ -1,6 +1,6 @@
       <li class="flexrow"><label class="item-field-label-long">Type</label>
         <select class="item-field-label-long" type="text" name="system.petype" value="{{system.petype}}" data-dtype="String">
-          {{#select system.petype}}
+          {{#select (lower system.petype)}}
             {{#each config.powerEquipmentType as |name key|}}
               <option value="{{key}}">{{name}}</option>
             {{/each}}
@@ -10,7 +10,7 @@
 
       <li class="flexrow"><label class="item-field-label-long">Type Modifier</label>
         <select class="item-field-label-long" type="text" name="system.typemodifier" value="{{system.typemodifier}}" data-dtype="String">
-          {{#select system.typemodifier}}
+          {{#select (lower system.typemodifier)}}
             {{#each config.powerTypeModifiers as |name key|}}
               <option value="{{key}}">{{name}}</option>
             {{/each}}
@@ -31,6 +31,16 @@
       <li class="flexrow"><label class="item-field-label-long">Endurance</label>
         <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
       </li>
+
+      <li class="flexrow"><label class="item-field-label-long">Has Charges ?</label>
+        <label class="item-field-label-medium"><input type="checkbox" name="system.hascharges" {{checked system.hascharges}}/></label>
+      </li>
+      {{#if system.hascharges}}
+      <li class="flexrow"><label class="item-field-label-long">Number of Charges</label>
+        <input type="text" class="item-field-label-short" name="system.nbcharges" value="{{system.nbcharges}}" data-dtype="Number"/>
+      </li>
+      {{/if}}
+
       {{#if quantityDone}}
       {{else}}
       <li class="flexrow"><label class="item-field-label-long">Quantity</label>