Final bugfixes for 0.80 release

foundryvtt · Jan 10, 2020 · 1aef2ee · 1aef2ee
1 parent d3aeeee
commit 1aef2ee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/dnd5e.js b/dnd5e.js
@@ -172,5 +172,8 @@ function rollItemMacro(itemName) {
   if ( !actor ) actor = game.actors.get(speaker.actor);
   const item = actor ? actor.items.find(i => i.name === itemName) : null;
   if ( !item ) return ui.notifications.warn(`Your controlled Actor does not have an item named ${itemName}`);
+
+  // Trigger the item roll
+  if ( item.data.type === "spell" ) return actor.useSpell(item);
   return item.roll();
 }
diff --git a/module/actor/entity.js b/module/actor/entity.js
@@ -285,7 +285,7 @@ export class Actor5e extends Actor {
     const checkBonus = getProperty(this.data.data, "bonuses.abilityCheck");
 
     if (![undefined, "", "0"].includes(checkBonus)) {
-      parts.push("@checkBonus")
+      parts.push("@checkBonus");
       data.checkBonus = checkBonus;
     }
 

diff --git a/module/item/entity.js b/module/item/entity.js
@@ -753,7 +753,7 @@ export class Item5e extends Item {
       const [sceneId, tokenId] = tokenKey.split(".");
       const scene = game.scenes.get(sceneId);
       if (!scene) return null;
-      const tokenData = scene.getEmbeddedEntity("tokens", tokenId);
+      const tokenData = scene.getEmbeddedEntity("Token", tokenId);
       if (!tokenData) return null;
       const token = new Token(tokenData);
       return token.actor;

diff --git a/template.json b/template.json
@@ -50,13 +50,11 @@
             "value": 0,
             "bonus": 0
           },
-          "prof": 2,
           "speed": {
             "value": "30 ft",
             "special": ""
           },
-          "spellcasting": "int",
-          "spelldc": 10
+          "spellcasting": "int"
         },
         "details": {
           "alignment": "",