Fixes and enhancements, from issue list

templates/actor/character-sheet.hbs

@@ -54,9 +54,13 @@
               <span class="res-sep">/</span>
               {{formInput systemFields.grit.fields.max value=system.grit.max name="system.grit.max" disabled=isPlayMode}}
             </div>
-            <div class="character-resource">
+            <div class="character-resource character-resource--luck">
               <span class="resource-label">{{localize "OATHHAMMER.Label.Luck"}}</span>
-              {{formInput systemFields.luck.fields.value value=system.luck.value name="system.luck.value" disabled=isPlayMode}}
+              <div class="luck-stepper">
+                <a data-action="adjustLuck" data-delta="-1" class="luck-btn">−</a>
+                {{formInput systemFields.luck.fields.value value=system.luck.value name="system.luck.value"}}
+                <a data-action="adjustLuck" data-delta="1" class="luck-btn">+</a>
+              </div>
               <span class="res-sep">/</span>
               {{formInput systemFields.luck.fields.max value=system.luck.max name="system.luck.max" disabled=isPlayMode}}
             </div>

templates/actor/party-members.hbs

@@ -9,9 +9,9 @@
         <span class="col-order">#</span>
         <span></span>
         <span class="col-name">{{localize "OATHHAMMER.Label.Name"}}</span>
-        <span>{{localize "OATHHAMMER.Label.Class"}}</span>
-        <span>{{localize "OATHHAMMER.Label.Level"}}</span>
+        <span>{{localize "OATHHAMMER.Label.Lineage"}}</span>
         <span>{{localize "OATHHAMMER.Label.Grit"}}</span>
+        <span data-tooltip="{{localize 'OATHHAMMER.Label.CarriesLight'}}"><i class="fa-solid fa-fire"></i></span>
         <span></span>
       </li>
       {{#each members as |member|}}
@@ -21,9 +21,13 @@
         <span class="item-name">
           <a data-action="openMember" data-actor-id="{{member.id}}">{{member.name}}</a>
         </span>
-        <span class="item-detail item-detail--small">{{member.classLabel}}</span>
-        <span class="item-detail">{{member.level}}</span>
+        <span class="item-detail item-detail--small">{{member.lineage}}</span>
         <span class="item-detail">{{member.grit}}</span>
+        <span class="item-detail item-detail--center">
+          <a data-action="toggleCarriesLight" data-idx="{{member.idx}}">
+            <i class="fa-solid fa-fire{{#unless member.carriesLight}} fa-faded{{/unless}}"></i>
+          </a>
+        </span>
         <div class="item-actions">
           {{#unless member.isFirst}}
           <a data-action="moveMemberUp" data-idx="{{member.idx}}" data-tooltip="{{localize 'OATHHAMMER.Tooltip.MoveUp'}}"><i class="fa-solid fa-chevron-up"></i></a>

templates/actor/party-sheet.hbs

@@ -48,6 +48,14 @@
           </div>
 
         </div><!-- /party-treasury -->
+
+        <!-- Slots -->
+        <div class="party-slots">
+          <span class="party-slots-label">{{localize "OATHHAMMER.Label.Slots"}}</span>
+          <span class="party-slots-current">{{currentSlots}}</span>
+          <span class="party-slots-sep">/</span>
+          <input class="party-slots-max" type="number" name="system.maxSlots" value="{{system.maxSlots}}" min="0" {{#if isPlayMode}}disabled{{/if}} />
+        </div>
       </div><!-- /party-header-body -->
     </div>
   </fieldset>

templates/actor/regiment-sheet.hbs

@@ -70,7 +70,7 @@
             <span class="vital-label">{{localize "OATHHAMMER.Label.SupplyCost"}}</span>
             <span class="vital-value">
               <input type="number" class="npc-num-input" name="system.supplyCost" value="{{system.supplyCost}}" min="0" {{#if isPlayMode}}disabled{{/if}} />
-              <span class="res-sep">gp / month</span>
+              <span class="res-sep">gp / day</span>
             </span>
           </div>
 
@@ -83,6 +83,14 @@
             </span>
           </div>
 
+          <!-- Mercenary -->
+          <div class="npc-vital regiment-mercenary-vital">
+            <span class="vital-label">{{localize "OATHHAMMER.Label.Mercenary"}}</span>
+            <span class="vital-value">
+              {{formInput systemFields.mercenary value=system.mercenary name="system.mercenary" disabled=isPlayMode}}
+            </span>
+          </div>
+
         </div><!-- /row2 -->
 
         <!-- Leader -->

templates/actor/settlement-overview.hbs

@@ -1,23 +1,18 @@
 <section data-tab="overview" data-group="{{tab.group}}" class="tab {{tab.cssClass}}">
 
-  <fieldset class="currency-bar">
-    <legend>{{localize "OATHHAMMER.Label.Treasury"}}</legend>
-    <div class="flexrow">
-      <div class="currency-item">
-        <label>{{localize "OATHHAMMER.Currency.GP"}}</label>
-        <div class="currency-stepper">
-          <a data-action="adjustCurrency" data-field="system.currency.gold" data-delta="-1" class="qty-btn">−</a>
-          {{formInput systemFields.currency.fields.gold value=system.currency.gold name="system.currency.gold"}}
-          <a data-action="adjustCurrency" data-field="system.currency.gold" data-delta="1" class="qty-btn">+</a>
+  <div class="settlement-overview-grid">
+    <fieldset class="currency-bar">
+      <legend>{{localize "OATHHAMMER.Label.Treasury"}}</legend>
+      <div class="flexrow">
+        <div class="currency-item">
+          <label>{{localize "OATHHAMMER.Currency.GP"}}</label>
+          <div class="currency-stepper">
+            <a data-action="adjustCurrency" data-field="system.currency.gold" data-delta="-1" class="qty-btn">−</a>
+            {{formInput systemFields.currency.fields.gold value=system.currency.gold name="system.currency.gold"}}
+            <a data-action="adjustCurrency" data-field="system.currency.gold" data-delta="1" class="qty-btn">+</a>
+          </div>
         </div>
       </div>
-    </div>
-  </fieldset>
-
-  <div class="settlement-overview-grid">
-    <fieldset>
-      <legend>{{localize "OATHHAMMER.Label.Garrison"}}</legend>
-      {{formInput systemFields.garrison value=system.garrison name="system.garrison" disabled=isPlayMode}}
     </fieldset>
 
     <fieldset>
@@ -33,13 +28,7 @@
 
   <fieldset>
     <legend>{{localize "OATHHAMMER.Label.Description"}}</legend>
-    {{#if isEditMode}}
-    <prose-mirror name="system.description" toggled="false" collaborate="false">
-      {{{system.description}}}
-    </prose-mirror>
-    {{else}}
-    <div class="editor-content">{{{enrichedDescription}}}</div>
-    {{/if}}
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
   </fieldset>
 
 </section>

templates/npc-magic-dialog.hbs

@@ -37,6 +37,11 @@
     </div>
     {{/if}}
 
+    <div class="roll-option-row">
+      <label>{{localize "OATHHAMMER.Dialog.ExplodeOn5"}}</label>
+      <input type="checkbox" name="explodeOn5" value="true" />
+    </div>
+
   </fieldset>
 
   <fieldset class="roll-visibility-block">

templates/npc-skill-dialog.hbs

@@ -28,6 +28,13 @@
       </select>
     </div>
 
+    {{#if showExplodeOn5}}
+    <div class="roll-option-row">
+      <label>{{localize "OATHHAMMER.Dialog.ExplodeOn5"}}</label>
+      <input type="checkbox" name="explodeOn5" value="true" />
+    </div>
+    {{/if}}
+
   </fieldset>
 
   <fieldset class="roll-visibility-block">