Add crew member option with pilot rolls integrated

templates/roll-dialog.hbs

@@ -44,6 +44,12 @@
       <select name="numericModifierSelect" class="roll-numeric-modifier">
         {{selectOptions choiceNumericModifier selected=numericModifierSelect}}
       </select>
+      {{#if vehicleBonus}}
+        <div class="vehicle-bonus-info">
+          <label>{{localize "FTLNOMAD.Label.vehicleBonus"}}</label>
+          <span class="vehicle-bonus-value">+{{vehicleBonus}}</span>
+        </div>
+      {{/if}}
     {{/if}}
 
     {{#if (eq rollType "weapon")}}

templates/starship-equipment.hbs

@@ -4,63 +4,43 @@
   data-group="{{tab.group}}"
 >
   <div class="main-div">
-
-    <!-- <div class="weapons">
-    <fieldset>
-      <legend>{{localize "FTLNOMAD.Label.weapons"}}{{#if isEditMode}}
-          <a
-            class="action"
-            data-tooltip="{{localize ' FTLNOMAD.Tooltip.addWeapon'}}"
-            data-tooltip-direction="UP"
-          ><i class="fas fa-plus" data-action="createWeapon"></i></a>{{/if}}
-      </legend>
-        {{#each weapons as |item|}}
-          {{!log 'weapon' this}}
+    <fieldset class="crew">
+      <legend>{{localize "FTLNOMAD.Label.crew"}}
+        ({{crewMembers.length}}{{#if
+          system.crewCapacity
+        }}/{{system.crewCapacity}}{{/if}})</legend>
+      <div class="crew-list">
+        {{#each crewMembers as |member|}}
           <div
-            class="weapon item"
-            data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"
+            class="crew-member"
+            data-actor-uuid="{{member.uuid}}"
             data-drag="true"
           >
             <img
-              class="item-img"
-              src="{{item.img}}"
-              data-tooltip="{{item.name}}"
+              class="crew-img"
+              src="{{member.img}}"
+              data-tooltip="{{member.name}}"
+              data-action="viewCrew"
             />
-            <div
-              class="name rollable"
-              data-roll-type="weapon"
-              data-tooltip="{{{item.system.description}}}"
-            >
-              {{item.name}}
-            </div>
-            <a
-              class="damage rollable"
-              data-item-id="{{item.id}}"
-              data-action="roll"
-              data-roll-type="damage"
-              data-roll-value="{{item.system.damage}}"
-            >{{localize "FTLNOMAD.Label.damageShort"}}
-              :
-              {{item.system.damage}}</a>
+            <div class="crew-name" data-action="viewCrew">{{member.name}}</div>
             <div class="controls">
               <a
-                data-tooltip="{{localize 'FTLNOMAD.Edit'}}"
-                data-action="edit"
-                data-item-id="{{item.id}}"
-                data-item-uuid="{{item.uuid}}"
-              ><i class="fas fa-edit"></i></a>
+                class="pilot-button"
+                data-tooltip="{{localize 'FTLNOMAD.PilotStarship'}}"
+                data-action="pilotCrew"
+              ><i class="fas fa-dice-d6"></i></a>
               <a
-                data-tooltip="{{localize 'FTLNOMAD.Delete'}}"
-                data-action="delete"
-                data-item-id="{{item.id}}"
-                data-item-uuid="{{item.uuid}}"
-              ><i class="fas fa-trash"></i></a>
+                data-tooltip="{{localize 'FTLNOMAD.RemoveCrew'}}"
+                data-action="removeCrew"
+                data-crew-uuid="{{member.uuid}}"
+              ><i class="fas fa-times"></i></a>
             </div>
           </div>
+        {{else}}
+          <div class="crew-empty">{{localize "FTLNOMAD.Label.noCrew"}}</div>
         {{/each}}
       </div>
-    </fieldset> -->
+    </fieldset>
 
     <fieldset>
       <legend>{{localize "FTLNOMAD.Label.equipment"}}{{#if isEditMode}}

templates/starship-main.hbs

@@ -96,8 +96,8 @@
           <legend>{{localize "FTLNOMAD.Label.cargo"}}</legend>
           <div class="flexrow">
             {{formField
-              systemFields.crew
-              value=system.crew
+              systemFields.crewCapacity
+              value=system.crewCapacity
               localize=true
               disabled=isPlayMode
             }}

templates/vehicle-equipment.hbs

@@ -4,6 +4,45 @@
   data-group="{{tab.group}}"
 >
   <div class="main-div">
+
+    <fieldset class="crew">
+      <legend>{{localize "FTLNOMAD.Label.crew"}}
+        ({{crewMembers.length}}{{#if
+          system.crewCapacity
+        }}/{{system.crewCapacity}}{{/if}})</legend>
+      <div class="crew-list">
+        {{#each crewMembers as |member|}}
+          <div
+            class="crew-member"
+            data-actor-uuid="{{member.uuid}}"
+            data-drag="true"
+          >
+            <img
+              class="crew-img"
+              src="{{member.img}}"
+              data-tooltip="{{member.name}}"
+              data-action="viewCrew"
+            />
+            <div class="crew-name" data-action="viewCrew">{{member.name}}</div>
+            <div class="controls">
+              <a
+                class="pilot-button"
+                data-tooltip="{{localize 'FTLNOMAD.PilotVehicle'}}"
+                data-action="pilotCrew"
+              ><i class="fas fa-dice-d6"></i></a>
+              <a
+                data-tooltip="{{localize 'FTLNOMAD.RemoveCrew'}}"
+                data-action="removeCrew"
+                data-crew-uuid="{{member.uuid}}"
+              ><i class="fas fa-times"></i></a>
+            </div>
+          </div>
+        {{else}}
+          <div class="crew-empty">{{localize "FTLNOMAD.Label.noCrew"}}</div>
+        {{/each}}
+      </div>
+    </fieldset>
+
     <fieldset>
       <legend>{{localize "FTLNOMAD.Label.weapons"}}{{#if isEditMode}}
           <a

templates/vehicle-main.hbs

@@ -81,8 +81,8 @@
           <legend>{{localize "FTLNOMAD.Label.cargo"}}</legend>
           <div class="cargo-content">
             {{formField
-              systemFields.crew
-              value=system.crew
+              systemFields.crewCapacity
+              value=system.crewCapacity
               localize=true
               disabled=isPlayMode
             }}
@@ -100,7 +100,6 @@
             }}
           </div>
         </fieldset>
-
       </div>
     </div>
   </fieldset>