mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-04-22 07:23:37 +02:00
Compare commits
3 commits
0d7469801e
...
fdfd8c5a8d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fdfd8c5a8d | ||
|
|
dbcef140a2 | ||
|
|
90f4339898 |
3 changed files with 4 additions and 3 deletions
|
|
@ -366,8 +366,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
|
||||||
let rollIsSelected = false;
|
let rollIsSelected = false;
|
||||||
for (const member of Object.values(members)) {
|
for (const member of Object.values(members)) {
|
||||||
const rollFinished = Boolean(member.rollData);
|
const rollFinished = Boolean(member.rollData);
|
||||||
const damageFinished =
|
const damageFinished = member.rollData?.options?.hasDamage ? Boolean(member.rollData.options.damage) : true;
|
||||||
member.rollData?.options?.hasDamage !== undefined ? member.rollData.options.damage : true;
|
|
||||||
|
|
||||||
rollsAreFinished = rollsAreFinished && rollFinished && damageFinished;
|
rollsAreFinished = rollsAreFinished && rollFinished && damageFinished;
|
||||||
rollIsSelected = rollIsSelected || member.selected;
|
rollIsSelected = rollIsSelected || member.selected;
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,8 @@ export default class ArmorChange extends foundry.abstract.DataModel {
|
||||||
};
|
};
|
||||||
|
|
||||||
get isSuppressed() {
|
get isSuppressed() {
|
||||||
|
if (!this.parent.parent?.actor) return false;
|
||||||
|
|
||||||
switch (this.value.interaction) {
|
switch (this.value.interaction) {
|
||||||
case CONFIG.DH.GENERAL.activeEffectArmorInteraction.active.id:
|
case CONFIG.DH.GENERAL.activeEffectArmorInteraction.active.id:
|
||||||
return !this.parent.parent?.actor.system.armor;
|
return !this.parent.parent?.actor.system.armor;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"id": "daggerheart",
|
"id": "daggerheart",
|
||||||
"title": "Daggerheart",
|
"title": "Daggerheart",
|
||||||
"description": "An unofficial implementation of the Daggerheart system",
|
"description": "An unofficial implementation of the Daggerheart system",
|
||||||
"version": "2.0.4",
|
"version": "2.0.3",
|
||||||
"compatibility": {
|
"compatibility": {
|
||||||
"minimum": "14.359",
|
"minimum": "14.359",
|
||||||
"verified": "14.359",
|
"verified": "14.359",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue