Fix various issues with rolls and compendiums

templates/chat-message.hbs

@@ -12,18 +12,28 @@
         {{/if}}
 
 
+        {{#if (eq rollType "damage")}}
+        <li class="result-success">Weapon Damage</li>
+        <li><strong>{{weapon.name}}</strong></li>
+        {{else}}
         {{#if weapon}}
         <li><strong>Weapon : {{weapon.name}}</strong></li>
         {{/if}}
+        {{/if}}
 
         <li><strong>{{localize rollItem.label}} : {{fullFormula}}</strong></li>
 
+        {{#if (eq rollType "damage")}}
+        {{else}}
         {{#if isEncumbered}}
         <li class="red-warning">Encumbered : -1D</li>
         {{/if}}
-
         <li>{{localize "FTLNOMAD.Label.modifier"}} : {{skillModifier}}D {{rangeModifier}}D {{numericModifier}}D</li>
+        {{/if}}
 
+
+        {{#if (eq rollType "damage")}}
+        {{else}}
         {{#if isSuccess}}
         <li class="result-success">
           {{localize "FTLNOMAD.Label.success"}}
@@ -35,6 +45,8 @@
           {{localize "FTLNOMAD.Label.failure"}}
         </li>
         {{/if}}
+        {{/if}}
+
       </ul>
     </div>
   </div>

templates/roll-dialog.hbs

@@ -6,9 +6,14 @@
     <legend>{{localize "FTLNOMAD.Label.skill"}}</legend>
     {{/if}}
 
+    {{#if (eq rollType "damage")}}
+    <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}}
 
-    {{#if weapon}}
+    {{#if (eq rollType "weapon")}}
     <div class="dialog-skill">Weapon : {{weapon.name}}</div>
     {{/if}}
 
@@ -25,28 +30,29 @@
       {{selectOptions choiceModifier selected=modifier localize=true}}
     </select>
 
-      {{#if weapon}}
-      <select name="range-modifier" class="roll-skill-range-modifier">
-        {{selectOptions choiceRangeModifier selected=rangeModifier}}
-      </select>
-      <ul>
-        <li>Two Attacks : <input type="checkbox" name="isAiming" data-field="two-attacks" class="select-combat-option"></li>
-        <li>Aiming : <input type="checkbox" data-field="aiming" class="select-combat-option"></li>
-        <li>Dim Lightning : <input type="checkbox" data-field="dim" class="select-combat-option"></li>
-        <li>Darkness : <input type="checkbox" data-field="darkness" class="select-combat-option"></li>
-        <li>Target Prone/Obscured : <input type="checkbox" data-field="prone" class="select-combat-option"></li>
-        <li>Target Cover : <input type="checkbox" data-field="cover" class="select-combat-option"></li>
-        <li>1/2 Auto Fire Recoil : <input type="checkbox" data-field="recoil-first" class="select-combat-option"></li>
-        <li>2+ Auto Fire Recoil : <input type="checkbox" data-field="recoil-third" class="select-combat-option"></li>
-        <li>Target Aware : <input type="checkbox" data-field="aware" class="select-combat-option"></li>
-      </ul>
+    {{#if (eq rollType "weapon")}}
+    <select name="range-modifier" class="roll-skill-range-modifier">
+      {{selectOptions choiceRangeModifier selected=rangeModifier}}
+    </select>
+    <ul>
+      <li>Two Attacks : <input type="checkbox" name="isAiming" data-field="two-attacks" class="select-combat-option">
+      </li>
+      <li>Aiming : <input type="checkbox" data-field="aiming" class="select-combat-option"></li>
+      <li>Dim Lightning : <input type="checkbox" data-field="dim" class="select-combat-option"></li>
+      <li>Darkness : <input type="checkbox" data-field="darkness" class="select-combat-option"></li>
+      <li>Target Prone/Obscured : <input type="checkbox" data-field="prone" class="select-combat-option"></li>
+      <li>Target Cover : <input type="checkbox" data-field="cover" class="select-combat-option"></li>
+      <li>1/2 Auto Fire Recoil : <input type="checkbox" data-field="recoil-first" class="select-combat-option"></li>
+      <li>2+ Auto Fire Recoil : <input type="checkbox" data-field="recoil-third" class="select-combat-option"></li>
+      <li>Target Aware : <input type="checkbox" data-field="aware" class="select-combat-option"></li>
+    </ul>
     {{/if}}
 
   </fieldSet>
 
   <fieldSet class="dialog-formula">
     <legend>{{localize "FTLNOMAD.Label.formula"}}</legend>
-    <label name="fullFormula" id="roll-dialog-full-formula" >{{fullFormula}}</label>
+    <label name="fullFormula" id="roll-dialog-full-formula">{{fullFormula}}</label>
   </fieldSet>
 
   <fieldSet>

templates/starship-equipment.hbs

@@ -0,0 +1,54 @@
+<section class="tab vehicle-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+  <div class="main-div">
+    <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>
+      <div class="weapons">
+        {{#each weapons as |item|}}
+        {{!log 'weapon' this}}
+        <div class="weapon item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          <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="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>
+            <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>
+          </div>
+        </div>
+        {{/each}}
+      </div>
+    </fieldset>
+
+    <fieldset>
+      <legend>{{localize "FTLNOMAD.Label.equipment"}}{{#if isEditMode}}
+        <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addEquipment"}}" data-tooltip-direction="UP"><i
+            class="fas fa-plus" data-action="createEquipment"></i></a>{{/if}}
+      </legend>
+      <div class="equipments">
+        {{#each equipments as |item|}}
+        {{!log 'armor' this}}
+        <div class="equipment" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          <div class="name" data-tooltip="{{{item.system.description}}}">
+            {{item.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>
+            <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>
+          </div>
+        </div>
+        {{/each}}
+      </div>
+    </fieldset>
+  </div>
+</section>

templates/weapon.hbs

@@ -13,7 +13,12 @@
     {{formField systemFields.damage value=system.damage}}
     {{formField systemFields.enc value=system.enc}}
 
-    {{formField systemFields.cost value=system.cost}}
+    {{formField cost value=system.cost}}
+    {{#if (eq system.weaponType "vehicle")}}
+    {{formField systemFields.ammoCost value=system.ammoCost}}
+    {{formField systemFields.magazine value=system.magazine}}
+    {{/if}}
+
   </fieldset>
 
   <fieldset>