Create index files for actor sheet styles (#1945)

module/applications/dialogs/groupRollDialog.mjs

@@ -106,7 +106,12 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
         const context = await super._prepareContext(_options);
 
         context.isGM = game.user.isGM;
-        context.isEditable = this.getIsEditable();
+        context.isEditable =
+            game.user.isGM ||
+            this.party.system.partyMembers.some(actor => {
+                const selected = Boolean(this.party.system.groupRoll.participants[actor.id]);
+                return selected && actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER);
+            });
         context.fields = this.party.system.schema.fields.groupRoll.fields;
         context.data = this.party.system.groupRoll;
         context.traitOptions = CONFIG.DH.ACTOR.abilities;
@@ -265,13 +270,6 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
         ];
     }
 
-    getIsEditable() {
-        return this.party.system.partyMembers.some(actor => {
-            const selected = Boolean(this.party.system.groupRoll.participants[actor.id]);
-            return selected && actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER);
-        });
-    }
-
     groupRollRefresh = ({ refreshType, action, parts }) => {
         if (refreshType !== RefreshType.GroupRoll) return;
 

module/applications/dialogs/tagTeamDialog.mjs

@@ -116,7 +116,12 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
 
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
-        context.isEditable = this.getIsEditable();
+        context.isEditable =
+            game.user.isGM ||
+            this.party.system.partyMembers.some(actor => {
+                const selected = Boolean(this.party.system.tagTeam.members[actor.id]);
+                return selected && actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER);
+            });
         context.fields = this.party.system.schema.fields.tagTeam.fields;
         context.data = this.party.system.tagTeam;
         context.rollTypes = CONFIG.DH.GENERAL.tagTeamRollTypes;
@@ -179,57 +184,56 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
         }
 
         if (Object.keys(this.party.system.tagTeam.members).includes(partId)) {
-            const data = this.party.system.tagTeam.members[partId];
+            const data = await this.#prepareMemberContext(partId);
-            const actor = game.actors.get(partId);
+            partContext.hasDamage |= Boolean(data?.damage);
-
+            partContext.members[partId] = data;
-            const rollOptions = [];
-            const damageRollOptions = [];
-            for (const item of actor.items) {
-                if (item.system.metadata.hasActions) {
-                    const actions = [...item.system.actions, ...(item.system.attack ? [item.system.attack] : [])];
-                    for (const action of actions) {
-                        if (action.hasRoll) {
-                            const actionItem = {
-                                value: action.uuid,
-                                label: action.name,
-                                group: item.name,
-                                baseAction: action.baseAction
-                            };
-
-                            if (action.hasDamage) damageRollOptions.push(actionItem);
-                            else rollOptions.push(actionItem);
-                        }
-                    }
-                }
-            }
-
-            const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
-            const critSelected = !selectedRoll
-                ? undefined
-                : (selectedRoll?.rollData?.options?.roll?.isCritical ?? false);
-
-            const damage = data.rollData?.options?.damage;
-            partContext.hasDamage |= Boolean(damage);
-            const critHitPointsDamage = await this.getCriticalDamage(damage);
-
-            partContext.members[partId] = {
-                ...data,
-                roll: data.roll,
-                isEditable: actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER),
-                key: partId,
-                readyToRoll: Boolean(data.rollChoice),
-                hasRolled: Boolean(data.rollData),
-                rollOptions,
-                damageRollOptions,
-                damage: damage,
-                critDamage: critHitPointsDamage,
-                useCritDamage: critSelected || (critSelected === undefined && data.rollData?.options?.roll?.isCritical)
-            };
         }
 
         return partContext;
     }
 
+    async #prepareMemberContext(partId) {
+        const data = this.party.system.tagTeam.members[partId] ?? {};
+        const actor = game.actors.get(partId);
+        if (!actor) console.error(`Failed to get actor ${partId}`);
+
+        const rollOptions = [];
+        const damageRollOptions = [];
+        for (const item of actor?.items ?? []) {
+            if (!item.system.metadata.hasActions) continue;
+            const actions = [...item.system.actions, ...(item.system.attack ? [item.system.attack] : [])];
+            for (const action of actions) {
+                if (action.hasRoll) {
+                    const collection = action.hasDamage ? damageRollOptions : rollOptions;
+                    collection.push({
+                        value: action.uuid,
+                        label: action.name,
+                        group: item.name,
+                        baseAction: action.baseAction
+                    });
+                }
+            }
+        }
+
+        const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
+        const critSelected = !selectedRoll ? undefined : (selectedRoll?.rollData?.options?.roll?.isCritical ?? false);
+        const damage = data.rollData?.options?.damage;
+
+        return {
+            ...data,
+            roll: data.roll,
+            isEditable: actor?.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER),
+            key: partId,
+            readyToRoll: Boolean(data.rollChoice),
+            hasRolled: Boolean(data.rollData),
+            rollOptions,
+            damageRollOptions,
+            damage: damage,
+            critDamage: await this.getCriticalDamage(damage),
+            useCritDamage: critSelected || (critSelected === undefined && data.rollData?.options?.roll?.isCritical)
+        };
+    }
+
     getUpdatingParts(target) {
         const { initialization, rollSelection, result } = this.constructor.PARTS;
         const isInitialization = this.tabGroups.application === initialization.id;
@@ -273,13 +277,6 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
         );
     }
 
-    getIsEditable() {
-        return this.party.system.partyMembers.some(actor => {
-            const selected = Boolean(this.party.system.tagTeam.members[actor.id]);
-            return selected && actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER);
-        });
-    }
-
     tagTeamRefresh = ({ refreshType, action, parts }) => {
         if (refreshType !== RefreshType.TagTeamRoll) return;
 
@@ -649,42 +646,50 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
     }
 
     async getJoinedRoll({ overrideIsCritical, displayVersion } = {}) {
-        const memberValues = Object.values(this.party.system.tagTeam.members);
+        try {
-        const selectedRoll = memberValues.find(x => x.selected);
+            const memberValues = Object.values(this.party.system.tagTeam.members);
-        let baseMainRoll = selectedRoll ?? memberValues[0];
+            const selectedRoll = memberValues.find(x => x.selected);
-        let baseSecondaryRoll = selectedRoll
+            const baseMainRoll = selectedRoll ?? memberValues[0];
-            ? memberValues.find(x => !x.selected)
+            const baseSecondaryRoll = selectedRoll
-            : memberValues.length > 1
+                ? memberValues.find(x => !x.selected)
-              ? memberValues[1]
+                : memberValues.length > 1
-              : null;
+                  ? memberValues[1]
+                  : null;
 
-        if (!baseMainRoll?.rollData || !baseSecondaryRoll) return null;
+            if (!baseMainRoll?.rollData || !baseSecondaryRoll) return null;
 
-        const mainRoll = new MemberData(baseMainRoll.toObject());
+            const mainRoll = new MemberData(baseMainRoll.toObject());
-        const secondaryRollData = new MemberData(baseSecondaryRoll.toObject()).rollData;
+            const secondaryRollData = new MemberData(baseSecondaryRoll.toObject()).rollData;
-        const systemData = mainRoll.rollData.options;
+            const systemData = mainRoll.rollData.options;
-        const isCritical = overrideIsCritical ?? systemData.roll.isCritical;
+            const isCritical = overrideIsCritical ?? systemData.roll.isCritical;
-        if (isCritical) systemData.damage = await this.getCriticalDamage(systemData.damage);
+            if (isCritical) systemData.damage = await this.getCriticalDamage(systemData.damage);
 
-        if (secondaryRollData?.options.hasDamage) {
+            if (secondaryRollData?.options.hasDamage) {
-            const secondaryDamage = (displayVersion ? overrideIsCritical : isCritical)
+                const secondaryDamage = (displayVersion ? overrideIsCritical : isCritical)
-                ? await this.getCriticalDamage(secondaryRollData.options.damage)
+                    ? await this.getCriticalDamage(secondaryRollData.options.damage)
-                : secondaryRollData.options.damage;
+                    : secondaryRollData.options.damage;
-            if (systemData.damage) {
+                if (systemData.damage) {
-                for (const key in secondaryDamage) {
+                    for (const [key, damage] of Object.entries(secondaryDamage ?? {})) {
-                    const damage = secondaryDamage[key];
+                        if (key in systemData.damage) {
-                    systemData.damage[key].formula = [systemData.damage[key].formula, damage.formula]
+                            systemData.damage[key].formula = [systemData.damage[key]?.formula, damage.formula]
-                        .filter(x => x)
+                                .filter(x => x)
-                        .join(' + ');
+                                .join(' + ');
-                    systemData.damage[key].total += damage.total;
+                            systemData.damage[key].total += damage.total;
-                    systemData.damage[key].parts.push(...damage.parts);
+                            systemData.damage[key].parts.push(...damage.parts);
+                        } else {
+                            systemData.damage[key] = damage;
+                        }
+                    }
+                } else {
+                    systemData.damage = secondaryDamage;
                 }
-            } else {
-                systemData.damage = secondaryDamage;
             }
-        }
 
-        return mainRoll;
+            return mainRoll;
+        } catch (err) {
+            console.error(err);
+            return null;
+        }
     }
 
     static async #onCancelRoll(_event, _button, options = { confirm: true }) {

styles/less/sheets/actors/adversary/index.less

@@ -0,0 +1,5 @@
+@import './features.less';
+@import './header.less';
+@import './sheet.less';
+@import './sidebar.less';
+@import './effects.less';

styles/less/sheets/actors/character/index.less

@@ -0,0 +1,8 @@
+@import './biography.less';
+@import './effects.less';
+@import './features.less';
+@import './header.less';
+@import './inventory.less';
+@import './loadout.less';
+@import './sheet.less';
+@import './sidebar.less';

styles/less/sheets/actors/companion/index.less

@@ -0,0 +1,4 @@
+@import './details.less';
+@import './header.less';
+@import './sheet.less';
+@import './effects.less';

styles/less/sheets/actors/environment/index.less

@@ -0,0 +1,4 @@
+@import './features.less';
+@import './header.less';
+@import './potentialAdversaries.less';
+@import './sheet.less';

styles/less/sheets/actors/party/index.less

@@ -0,0 +1,4 @@
+@import './header.less';
+@import './party-members.less';
+@import './sheet.less';
+@import './inventory.less';

styles/less/sheets/index.less

@@ -2,35 +2,11 @@
 
 @import './actors/actor-sheet-shared.less';
 
-@import './actors/adversary/actions.less';
+@import './actors/adversary/index.less';
-@import './actors/adversary/header.less';
+@import './actors/character/index.less';
-@import './actors/adversary/sheet.less';
+@import './actors/companion/index.less';
-@import './actors/adversary/sidebar.less';
+@import './actors/environment/index.less';
-@import './actors/adversary/effects.less';
+@import './actors/party/index.less';
-
-@import './actors/character/biography.less';
-@import './actors/character/effects.less';
-@import './actors/character/features.less';
-@import './actors/character/header.less';
-@import './actors/character/inventory.less';
-@import './actors/character/loadout.less';
-@import './actors/character/sheet.less';
-@import './actors/character/sidebar.less';
-
-@import './actors/companion/details.less';
-@import './actors/companion/header.less';
-@import './actors/companion/sheet.less';
-@import './actors/companion/effects.less';
-
-@import './actors/environment/actions.less';
-@import './actors/environment/header.less';
-@import './actors/environment/potentialAdversaries.less';
-@import './actors/environment/sheet.less';
-
-@import './actors/party/header.less';
-@import './actors/party/party-members.less';
-@import './actors/party/sheet.less';
-@import './actors/party/inventory.less';
 
 @import './items/beastform.less';
 @import './items/class.less';