Crew member enhancements

templates/roll-dialog.hbs

@@ -10,8 +10,20 @@
       <div class="dialog-skill">Damage : {{weapon.system.damage}}</div>
       <div class="dialog-skill">Weapon : {{weapon.name}}</div>
     {{else}}
-      <div class="dialog-skill">{{localize rollItem.label}}
-        : 2d6+{{rollItem.value}}</div>
+      {{#if availableSkills}}
+        <label>{{localize "FTLNOMAD.Label.selectSkill"}}</label>
+        <select name="selectedSkill" class="roll-skill-selector">
+          {{#each availableSkills as |skill|}}
+            <option
+              value="{{skill.id}}"
+              {{#if skill.selected}}selected{{/if}}
+            >{{localize skill.label}} (2d6+{{skill.value}})</option>
+          {{/each}}
+        </select>
+      {{else}}
+        <div class="dialog-skill">{{localize rollItem.label}}
+          : 2d6+{{rollItem.value}}</div>
+      {{/if}}
     {{/if}}
 
     {{#if (eq rollType "weapon")}}
@@ -46,7 +58,15 @@
       </select>
       {{#if vehicleBonus}}
         <div class="vehicle-bonus-info">
-          <label>{{localize "FTLNOMAD.Label.vehicleBonus"}}</label>
+          <label>
+            <input
+              type="checkbox"
+              name="useVehicleBonus"
+              class="use-vehicle-bonus"
+              checked
+            />
+            {{localize "FTLNOMAD.Label.vehicleBonus"}}
+          </label>
           <span class="vehicle-bonus-value">+{{vehicleBonus}}</span>
         </div>
       {{/if}}

templates/starship-main.hbs

@@ -22,12 +22,21 @@
             localize=true
             disabled=isPlayMode
           }}
+
           {{formField
             systemFields.armor
             value=system.armor
             localize=true
             disabled=isPlayMode
           }}
+
+          {{formField
+            systemFields.armorCritical
+            value=system.armorCritical
+            localize=true
+            disabled=isPlayMode
+          }}
+
           {{formField
             systemFields.endurance
             value=system.endurance
@@ -101,6 +110,21 @@
               localize=true
               disabled=isPlayMode
             }}
+            <div class="npc-crew-field">
+              <a
+                class="npc-crew-roll rollable"
+                data-action="rollNpcCrew"
+                data-tooltip="{{localize 'FTLNOMAD.RollNpcCrew'}}"
+              ><i class="fas fa-dice-d6"></i></a>
+              {{formField
+                systemFields.npcCrew
+                value=system.npcCrew
+                localize=true
+                disabled=isPlayMode
+              }}
+            </div>
+          </div>
+          <div class="flexrow">
             {{formField
               systemFields.cargo
               value=system.cargo

templates/vehicle-main.hbs

@@ -13,16 +13,25 @@
             data-tooltip="{{actor.name}}"
           />
         </div>
-        <fieldset>
-          <legend>{{localize "FTLNOMAD.Label.Agility"}}</legend>
-          <div class="flexrow">
-            {{formField
-              systemFields.agility
-              value=system.agility
-              localize=true
-              disabled=isPlayMode
-            }}
-          </div>
+        <fieldset class="spec">
+          {{formField
+            systemFields.agility
+            value=system.agility
+            localize=true
+            disabled=isPlayMode
+          }}
+          {{formField
+            systemFields.armor
+            value=system.armor
+            localize=true
+            disabled=isPlayMode
+          }}
+          {{formField
+            systemFields.armorCritical
+            value=system.armorCritical
+            localize=true
+            disabled=isPlayMode
+          }}
         </fieldset>
 
       </div>
@@ -48,12 +57,6 @@
         <fieldset class="capacity">
           <legend>{{localize "FTLNOMAD.Label.capacity"}}</legend>
           <div class="flexrow">
-            {{formField
-              systemFields.armor
-              value=system.armor
-              localize=true
-              disabled=isPlayMode
-            }}
             {{formField
               systemFields.force
               value=system.force
@@ -80,24 +83,41 @@
         <fieldset class="cargo">
           <legend>{{localize "FTLNOMAD.Label.cargo"}}</legend>
           <div class="cargo-content">
-            {{formField
-              systemFields.crewCapacity
-              value=system.crewCapacity
-              localize=true
-              disabled=isPlayMode
-            }}
-            {{formField
-              systemFields.cargo
-              value=system.cargo
-              localize=true
-              disabled=isPlayMode
-            }}
-            {{formField
-              systemFields.tonnage
-              value=system.tonnage
-              localize=true
-              disabled=isPlayMode
-            }}
+            <div class="cargo-line">
+              {{formField
+                systemFields.crewCapacity
+                value=system.crewCapacity
+                localize=true
+                disabled=isPlayMode
+              }}
+              <div class="npc-crew-field">
+                <a
+                  class="npc-crew-roll rollable"
+                  data-action="rollNpcCrew"
+                  data-tooltip="{{localize 'FTLNOMAD.RollNpcCrew'}}"
+                ><i class="fas fa-dice-d6"></i></a>
+                {{formField
+                  systemFields.npcCrew
+                  value=system.npcCrew
+                  localize=true
+                  disabled=isPlayMode
+                }}
+              </div>
+            </div>
+            <div class="cargo-line">
+              {{formField
+                systemFields.cargo
+                value=system.cargo
+                localize=true
+                disabled=isPlayMode
+              }}
+              {{formField
+                systemFields.tonnage
+                value=system.tonnage
+                localize=true
+                disabled=isPlayMode
+              }}
+            </div>
           </div>
         </fieldset>
       </div>