From 534a02a3238d09f43e063422f6e7ae45320f5e3e Mon Sep 17 00:00:00 2001
From: Vlyan <vlyan26@gmail.com>
Date: Thu, 10 Dec 2020 18:05:54 +0100
Subject: [PATCH] fix actor for dice picker dialog, and add pack for macros

---
 system/packs/macros.db                    |  2 +-
 system/scripts/dice/dice-picker-dialog.js | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/system/packs/macros.db b/system/packs/macros.db
index c35ac84..86acaa8 100644
--- a/system/packs/macros.db
+++ b/system/packs/macros.db
@@ -1 +1 @@
-{"_id":"rWFmQHPlIpLB3qou","name":"L5R5e Dice Picker","permission":{"default":1,"5kJBcDAAfAognDuD":3},"type":"script","flags":{"furnace":{"runAsGM":false}},"scope":"global","command":"new game.l5r5e.DicePickerDialog().render();","author":"ZjNlNTgyMmI0ZjBj","img":"systems/l5r5e/assets/dices/default/skill_et.png","actorIds":[]}
+{"_id":"rWFmQHPlIpLB3qou","name":"L5R Dice Picker","permission":{"default":1,"5kJBcDAAfAognDuD":3},"type":"script","flags":{"furnace":{"runAsGM":false}},"scope":"global","command":"new game.l5r5e.DicePickerDialog().render();","author":"ZjNlNTgyMmI0ZjBj","img":"systems/l5r5e/assets/dices/default/skill_et.png","actorIds":[]}
diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js
index f74f5c6..ac916f8 100644
--- a/system/scripts/dice/dice-picker-dialog.js
+++ b/system/scripts/dice/dice-picker-dialog.js
@@ -142,11 +142,13 @@ export class DicePickerDialog extends Application {
 
         // Check if a stance is selected
         let selectedStance = "air";
-        ["air", "earth", "fire", "water", "void"].forEach((e) => {
-            if (this.actor.data.data?.stances?.[e]?.isSelected?.value) {
-                selectedStance = e;
-            }
-        });
+        if (this.actor) {
+            ["air", "earth", "fire", "water", "void"].forEach((e) => {
+                if (this.actor.data.data?.stances?.[e]?.isSelected?.value) {
+                    selectedStance = e;
+                }
+            });
+        }
         html.find(`#approach_${selectedStance}`).trigger("click");
         html.find("#skill_" + this.skillData.value).trigger("click");
     }
@@ -167,13 +169,12 @@ export class DicePickerDialog extends Application {
         };
 
         const cat = RollL5r5e.getCategoryForSkillId(skillId);
-        if (!this.actor || !cat) {
+        if (!cat) {
             return;
         }
-
         this.skillData.cat = cat;
-        this.skillData.value = this.actor.data?.data?.skills[cat]?.[this.skillData.id].value || 0;
         this.skillData.name = game.i18n.localize("l5r5e.skills." + cat + "." + this.skillData.id);
+        this.skillData.value = this.actor?.data?.data?.skills[cat]?.[this.skillData.id].value || 0;
     }
 
     /**