Merge pull request #1788 from StarWarsFoundryVTT/macro_1786

Macro 1786

CHANGELOG.md

@@ -9,6 +9,7 @@
   * Remove usage of deprecated `math.clamped` in favor of `math.clamp`
   * Fix skill roll sometimes showing a pool of only 2 difficulty when clicked ([#1763](/~https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1763))
   * XP Spending now uses a generic symbol instead of a dollar sign ([#1732](/~https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1732))
+  * Fix for skill-roll macros not being created on drag-and-drop into macro hotbar ([#1786](/~https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1786))
 
 `1.905`
 * Fixes

modules/helpers/macros.js

@@ -63,13 +63,14 @@ export async function createFFGMacro(bar, data, slot) {
         img: item.img,
         command: command,
       });
-    } else if (data.data.type === "skill") {
+    }
+  } else if (data.data.type === "skill") {
       const actor = game.actors.get(data.actorId);
       const command = `
     // game.ffg.DiceHelpers.rollSkillDirect(skill, characteristic, difficulty, actorSheet, flavortext, sound);
     const ffgactor = game.actors.get("${data.actorId}");
-    const skill = ffgactor.data.data.skills["${data.data.skill}"];
-    const characteristic = ffgactor.data.data.characteristics["${data.data.characteristic}"];
+    const skill = ffgactor.system.skills["${data.data.skill}"];
+    const characteristic = ffgactor.system.characteristics["${data.data.characteristic}"];
     const actorSheet = ffgactor.sheet.getData();
     game.ffg.DiceHelpers.rollSkillDirect(skill, characteristic, 2, actorSheet);`;
       macro = await createMacroItem({
@@ -78,7 +79,6 @@ export async function createFFGMacro(bar, data, slot) {
         command: command,
       });
     }
-  }
   if (macro) {
     game.user.assignHotbarMacro(macro, slot);
   }