uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix actor for dice picker dialog, and add pack for macros

Browse Source
This commit is contained in:
Vlyan
2020-12-10 18:01:00 +01:00
parent ca69a8f182
commit 21a75c5c09
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/scripts/dice/dice-picker-dialog.js
View File

@@ -8,7 +8,7 @@ export class DicePickerDialog extends Application {
/**
* Current Actor
*/
actor = {};
actor = null;
/**
* Selected Skill data from actor
@@ -50,8 +50,6 @@ export class DicePickerDialog extends Application {
this.actor = actor;
}
console.log(this.actor); // TODO TMP
// Skill ?
if (options?.skillId) {
this.setSkillData(options.skillId);
@@ -142,8 +140,14 @@ export class DicePickerDialog extends Application {
await this.close();
});
// Default Selected
html.find("#approach_air").trigger("click");
// 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;
}
});
html.find(`#approach_${selectedStance}`).trigger("click");
html.find("#skill_" + this.skillData.value).trigger("click");
}
@@ -168,10 +172,8 @@ export class DicePickerDialog extends Application {
}
this.skillData.cat = cat;
this.skillData.value = this.actor.data.data.skills[cat]?.[this.skillData.id].value || 0;
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);
console.log("****** skillData", this.skillData, this.actor.data.data.skills);
}
/**
@@ -183,7 +185,7 @@ export class DicePickerDialog extends Application {
return {
id: e,
label: game.i18n.localize(`l5r5e.rings.${e}`),
value: this.actor ? this.actor.data.data.rings[e] : 0,
value: this.actor?.data?.data?.rings?.[e] || 0,
};
});
}