Enhancements as per issue tracking sheet

templates/weapon-attack-dialog.hbs

@@ -56,11 +56,16 @@
     </div>
 
     {{#if isRanged}}
-    <div class="roll-option-row">
-      <label>{{localize "OATHHAMMER.Dialog.RangeCondition"}}</label>
-      <select name="rangeCondition">
-        {{#each rangeOptions}}<option value="{{value}}">{{label}}</option>{{/each}}
-      </select>
+    <div class="roll-option-block">
+      <label class="roll-option-block-label">{{localize "OATHHAMMER.Dialog.RangeConditions"}}</label>
+      <div class="range-conditions">
+        {{#each rangeConditions}}
+        <div class="roll-option-check">
+          <input type="checkbox" id="{{name}}" name="{{name}}" value="true" />
+          <label for="{{name}}">{{label}}</label>
+        </div>
+        {{/each}}
+      </div>
     </div>
     {{/if}}
 
@@ -70,6 +75,18 @@
       <span class="roll-option-hint">{{localize "OATHHAMMER.Dialog.ExplodeOn5Hint"}}</span>
     </div>
 
+    {{#if availableLuck}}
+    <div class="roll-option-row roll-option-luck">
+      <label>{{localize "OATHHAMMER.Dialog.LuckSpend"}} <i class="fa-solid fa-clover luck-icon"></i></label>
+      <select name="luckSpend">
+        {{#each luckOptions}}<option value="{{value}}"{{#if selected}} selected{{/if}}>{{label}}</option>{{/each}}
+      </select>
+      <label class="luck-human-label" for="attackLuckIsHuman">{{localize "OATHHAMMER.Dialog.LuckHuman"}}</label>
+      <input type="checkbox" id="attackLuckIsHuman" name="luckIsHuman" value="true" {{#if isHuman}}checked{{/if}} />
+      <span class="roll-option-hint">{{localize "OATHHAMMER.Dialog.LuckHint"}} ({{availableLuck}} {{localize "OATHHAMMER.Dialog.Available"}})</span>
+    </div>
+    {{/if}}
+
   </fieldset>
 
   {{!-- Visibility --}}