Merge branch 'develop'

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.34] 2021-06-12
+### Bugfix
+- DND5e - fingers crossed now supports 0.7 and 0.8.
+
 ## [1.0.33] 2021-06-11
 ### Changed
 - Set minimum compatible core version to 0.8.0 for the moment, hopefully only temporary while I work shit out

scripts/actions/dnd5e/dnd5e-actions.js

@@ -727,10 +727,11 @@ export class ActionHandler5e extends ActionHandler {
     /** @private */
     _buildItem(tokenId, actor, macroType, item) {
         const itemData = this._getEntityData(item);
-        let encodedValue = [macroType, tokenId, item.id].join(this.delimiter);
+        const itemId = item.id ?? item._id;
+        let encodedValue = [macroType, tokenId, itemId].join(this.delimiter);
         let img = this._getImage(item);
         let icon = this._getActionIcon(item.data?.activation?.type);
-        let result = { name: item.name, id: item.id, encodedValue: encodedValue, img: img, icon: icon }
+        let result = { name: item.name, id: itemId, encodedValue: encodedValue, img: img, icon: icon }
 
         if (itemData.recharge && !itemData.recharge.charged && itemData.recharge.value) {
             result.name += ` (${this.i18n('tokenactionhud.recharge')})`;

scripts/rollHandlers/dnd5e/dnd5e-base.js

@@ -99,7 +99,8 @@ export class RollHandlerBase5e extends RollHandler {
     }
 
     needsRecharge(item) {
-        return (item.data.data.recharge && !item.data.data.recharge.charged && item.data.data.recharge.value);
+        const itemData = this._getEntityData(item);
+        return (itemData.recharge && !itemData.recharge.charged && itemData.recharge.value);
     }
 
     async performUtilityMacro(event, tokenId, actionId) {
@@ -186,4 +187,8 @@ export class RollHandlerBase5e extends RollHandler {
     }
 
 
+    _getEntityData(entity) {
+        return entity.data.data ?? entity.data;
+    }
+
 }