Move dice config settings to main settings menu

Author: aaclayton

scripts/apps/dice-config.mjs

@@ -7,9 +7,9 @@ export default class DiceConfig extends FormApplication {
       title: "Dice Configuration",
       popOut: true,
       width: 720,
-      submitOnChange: true,
-      submitOnClose: true,
-      closeOnSubmit: false
+      submitOnChange: false,
+      submitOnClose: false,
+      closeOnSubmit: true
     });
   }
 

scripts/fulfillable-roll.mjs

@@ -1,5 +1,6 @@
 import ManualResolver from "./apps/manual-resolver.mjs";
 const _rollEvaluateOriginal = Roll.prototype._evaluate;
+const _dieEvaluateOriginal = Die.prototype._evaluate;
 
 /**
  * Patch the asynchronous Roll#_evaluate method to handle logistics of manual fulfillment.
@@ -34,6 +35,7 @@ export async function _rollEvaluate(options) {
  * @returns {Promise<Die>}        The evaluated Die term
  */
 export async function _dieEvaluate(options) {
+  if ( !this._fulfilled?.length > 0 ) return _dieEvaluateOriginal.call(this, options);
   if ( this.number > 999 ) throw new Error("You may not evaluate a DiceTerm with more than 999 requested results.");
   for ( let n=0; n < this.number; n++ ) {
     const v = this._fulfilled[n];

scripts/unfulfilled-rolls.mjs

@@ -10,6 +10,13 @@ Hooks.once('init', async function() {
     type: Object,
     scope: "client"
   });
+  game.settings.registerMenu("unfulfilled-rolls", "configuration", {
+    name: "Dice Configuration",
+    label: "Configure Dice",
+    icon: "fa-solid fa-dice-d20",
+    type: DiceConfig,
+    restricted: false
+  });
 
   CONFIG.Dice.DieTypes = [
     { id: "d4", faces: 4, icon: "fa-dice-d4" },
@@ -36,15 +43,3 @@ Hooks.once('init', async function() {
   Roll.prototype._evaluate = _rollEvaluate;
   Die.prototype._evaluate = _dieEvaluate;
 });
-
-Hooks.on("renderSettings", (app, html, data) => {
-  const diceConfigButton = document.createElement("button");
-  diceConfigButton.type = "button";
-  diceConfigButton.classList.add("open-dice-config");
-  diceConfigButton.innerHTML = `<i class="fas fa-dice-d20"></i> Open Dice Configuration`;
-  diceConfigButton.addEventListener("click", () => {
-    const diceConfig = new DiceConfig();
-    diceConfig.render(true);
-  });
-  html.find("button[data-action='controls']").after(diceConfigButton);
-});

templates/dice-config.hbs

@@ -3,22 +3,22 @@
     <div class="form-group">
         <label>Bluetooth Die Provider</label>
         <select name="bluetoothDieProvider">
-            {{!-- Render an option for each provider --}}
             {{selectOptions bluetoothDieProviders selected=this.bluetoothDieProvider labelAttr="label"}}
         </select>
     </div>
 
     <section>
-        {{!-- Render an option for each die size (d4, d6, d8, d10, d12, d20, percentile) --}}
         {{#each dieTypes}}
-            <div class="form-group" data-die="{{this.id}}">
-                {{!-- For each die, display its name, an icon representing it, and a dropdown to select how it's fulfilled --}}
-                <label><i class="far {{this.icon}}"></i> {{this.id}}</label>
-                <select name="{{this.id}}">
-                    {{!-- Render an option for each fulfillment method --}}
-                    {{selectOptions ../fulfillmentMethods selected=this.fulfillmentMethod}}
-                </select>
-            </div>
+        <div class="form-group" data-die="{{this.id}}">
+            <label><i class="far {{this.icon}}"></i> {{this.id}}</label>
+            <select name="{{this.id}}">
+                {{selectOptions ../fulfillmentMethods selected=this.fulfillmentMethod}}
+            </select>
+        </div>
         {{/each}}
     </section>
+
+    <footer>
+        <button type="submit"><i class="fa-solid fa-save"></i> {{localize "Save"}}</button>
+    </footer>
 </form>