Add new forgotten adventures token artwork

foundryvtt · Jan 23, 2020 · 250ac8c · 250ac8c
1 parent b3411ce
commit 250ac8c
Show file tree

Hide file tree

Showing 20 changed files with 221 additions and 22 deletions.
diff --git a/module/apps/ability-use-dialog.js b/module/apps/ability-use-dialog.js
@@ -43,19 +43,20 @@ export class AbilityUseDialog extends Dialog {
     });
 
     // Create the Dialog and return as a Promise
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
+      let formData = null;
       const dlg = new this(item, {
         title: `${item.name}: Ability Configuration`,
         content: html,
         buttons: {
           use: {
             icon: '<i class="fas fa-fist-raised"></i>',
             label: "Use Ability",
-            callback: html => resolve(new FormData(html[0].querySelector("#ability-use-form")))
+            callback: html => formData = new FormData(html[0].querySelector("#ability-use-form"))
           }
         },
         default: "use",
-        close: reject
+        close: () => resolve(formData)
       });
       dlg.render(true);
     });

diff --git a/module/item/entity.js b/module/item/entity.js
@@ -208,7 +208,8 @@ export class Item5e extends Item {
 
     // For feature items, optionally show an ability usage dialog
     if (this.data.type === "feat") {
-      await this._rollFeat(configureDialog);
+      let configured = await this._rollFeat(configureDialog);
+      if ( configured === false ) return;
     }
 
     // Render the chat card template
@@ -242,6 +243,7 @@ export class Item5e extends Item {
   /**
    * Additional rolling steps when rolling a feat-type item
    * @private
+   * @return {boolean} whether the roll should be prevented
    */
   async _rollFeat(configureDialog) {
     if ( this.data.type !== "feat" ) throw new Error("Wrong Item type");
@@ -253,9 +255,10 @@ export class Item5e extends Item {
 
     // Determine whether the feat uses charges
     if ( configureDialog ) {
-      const usageData = await AbilityUseDialog.create(this);
-      consume = Boolean(usageData.get("consume"));
-      placeTemplate = Boolean(usageData.get("placeTemplate"));
+      const usage = await AbilityUseDialog.create(this);
+      if ( usage === null ) return false;
+      consume = Boolean(usage.get("consume"));
+      placeTemplate = Boolean(usage.get("placeTemplate"));
     }
 
     // Update Item data
@@ -272,6 +275,7 @@ export class Item5e extends Item {
       if ( template ) template.drawPreview(event);
       if ( this.owner && this.owner.sheet ) this.owner.sheet.minimize();
     }
+    return true;
   }
 
   /* -------------------------------------------- */

diff --git a/packs/items.db b/packs/items.db
diff --git a/packs/monsters.db b/packs/monsters.db
diff --git a/tokens/beast/DireWolf.png b/tokens/beast/DireWolf.png
diff --git a/tokens/beast/GiantBat.png b/tokens/beast/GiantBat.png
diff --git a/tokens/beast/GiantCentipede.png b/tokens/beast/GiantCentipede.png
diff --git a/tokens/beast/GiantLizard.png b/tokens/beast/GiantLizard.png
diff --git a/tokens/beast/GiantPoisonousSnake.png b/tokens/beast/GiantPoisonousSnake.png
diff --git a/tokens/beast/Panther.png b/tokens/beast/Panther.png
diff --git a/tokens/beast/SwarmBats.png b/tokens/beast/SwarmBats.png
diff --git a/tokens/beast/SwarmRats.png b/tokens/beast/SwarmRats.png
diff --git a/tokens/beast/SwarmRavens.png b/tokens/beast/SwarmRavens.png
diff --git a/tokens/beast/WinterWolf.png b/tokens/beast/WinterWolf.png
diff --git a/tokens/beast/Wolf.png b/tokens/beast/Wolf.png
diff --git a/tokens/elemental/SteamMephit.png b/tokens/elemental/SteamMephit.png
diff --git a/tokens/humanoid/Grimlock.png b/tokens/humanoid/Grimlock.png
diff --git a/tokens/plant/VioletFungus.png b/tokens/plant/VioletFungus.png
diff --git a/tokens/undead/Skeleton.png b/tokens/undead/Skeleton.png
diff --git a/tokens/undead/Zombie.png b/tokens/undead/Zombie.png