Super VJ Update

module/apps/short-rest.js

@@ -1,8 +1,10 @@
+import LongRestDialog from "./long-rest.js";
+
 /**
  * A helper Dialog subclass for rolling Hit Dice on short rest
- * @type {Dialog}
+ * @extends {Dialog}
  */
-export class ShortRestDialog extends Dialog {
+export default class ShortRestDialog extends Dialog {
   constructor(actor, dialogData={}, options={}) {
     super(dialogData, options);
 
@@ -34,6 +36,8 @@ export class ShortRestDialog extends Dialog {
   /** @override */
   getData() {
     const data = super.getData();
+    
+    // Determine Hit Dice
     data.availableHD = this.actor.data.items.reduce((hd, item) => {
       if ( item.type === "class" ) {
         const d = item.data;
@@ -45,6 +49,11 @@ export class ShortRestDialog extends Dialog {
     }, {});
     data.canRoll = this.actor.data.data.attributes.hd > 0;
     data.denomination = this._denom;
+    
+    // Determine rest type
+    const variant = game.settings.get("sw5e", "restVariant");
+    data.promptNewDay = variant !== "epic";     // It's never a new day when only resting 1 minute
+    data.newDay = false;                        // It may be a new day, but not by default
     return data;
   }
 
@@ -56,7 +65,6 @@ export class ShortRestDialog extends Dialog {
     super.activateListeners(html);
     let btn = html.find("#roll-hd");
     btn.click(this._onRollHitDie.bind(this));
-    super.activateListeners(html);
   }
 
   /* -------------------------------------------- */
@@ -83,21 +91,27 @@ export class ShortRestDialog extends Dialog {
    * @return {Promise}
    */
   static async shortRestDialog({actor}={}) {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
       const dlg = new this(actor, {
         title: "Short Rest",
         buttons: {
           rest: {
             icon: '<i class="fas fa-bed"></i>',
             label: "Rest",
-            callback: () => resolve(true)
+            callback: html => {
+              let newDay = false;
+              if (game.settings.get("sw5e", "restVariant") === "gritty")
+                newDay = html.find('input[name="newDay"]')[0].checked;
+              resolve(newDay);
+            }
           },
           cancel: {
             icon: '<i class="fas fa-times"></i>',
             label: "Cancel",
-            callback: () => resolve(false)
+            callback: reject
           }
-        }
+        },
+        close: reject
       });
       dlg.render(true);
     });
@@ -108,31 +122,12 @@ export class ShortRestDialog extends Dialog {
   /**
    * A helper constructor function which displays the Long Rest confirmation dialog and returns a Promise once it's
    * workflow has been resolved.
+   * @deprecated
    * @param {Actor5e} actor
    * @return {Promise}
    */
   static async longRestDialog({actor}={}) {
-    const content = `<p>Take a long rest?</p><p>On a long rest you will recover hit points, half your maximum hit dice, 
-        class resources, limited use item charges, and power slots.</p>`;
-    return new Promise((resolve, reject) => {
-      new Dialog({
-        title: "Long Rest",
-        content: content,
-        buttons: {
-          rest: {
-            icon: '<i class="fas fa-bed"></i>',
-            label: "Rest",
-            callback: resolve
-          },
-          cancel: {
-            icon: '<i class="fas fa-times"></i>',
-            label: "Cancel",
-            callback: reject
-          },
-        },
-        default: 'rest',
-        close: reject
-      }, {classes: ["sw5e", "dialog"]}).render(true);
-    });
+    console.warn("WARNING! ShortRestDialog.longRestDialog has been deprecated, use LongRestDialog.longRestDialog instead.");
+    return LongRestDialog.longRestDialog(...arguments);
   }
 }