[Fix] TagTeamRoll Critical Damage (#1371)

* Made some handlign for the damage when a tagTeamRoll crits

* Fixed so hope is taken from the initiator if the roll is with fear

* Raised verison

module/applications/dialogs/tagTeamDialog.mjs

@@ -1,3 +1,4 @@
+import { getCritDamageBonus } from '../../helpers/utils.mjs';
 import { GMUpdateEvent, RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@@ -76,28 +77,37 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
             cost: this.data.initiator.cost
         };
 
-        context.selectedData = Object.values(context.members).reduce(
+        const selectedMember = Object.values(context.members).find(x => x.selected);
-            (acc, member) => {
+        const selectedIsCritical = selectedMember?.roll?.system?.isCritical;
-                if (!member.roll) return acc;
+        context.selectedData = {
-                if (member.selected) {
+            result: selectedMember
-                    acc.result = `${member.roll.system.roll.total} ${member.roll.system.roll.result.label}`;
+                ? `${selectedMember.roll.system.roll.total} ${selectedMember.roll.system.roll.result.label}`
-                }
+                : null,
+            damageValues: null
+        };
 
-                if (context.usesDamage) {
+        for (const member of Object.values(context.members)) {
-                    if (!acc.damageValues) acc.damageValues = {};
+            if (!member.roll) continue;
-                    for (let damage of member.damageValues) {
+            if (context.usesDamage) {
-                        if (acc.damageValues[damage.key]) {
+                if (!context.selectedData.damageValues) context.selectedData.damageValues = {};
-                            acc.damageValues[damage.key].total += damage.total;
+                for (let damage of member.damageValues) {
-                        } else {
+                    const damageTotal = member.roll.system.isCritical
-                            acc.damageValues[damage.key] = foundry.utils.deepClone(damage);
+                        ? damage.total
-                        }
+                        : selectedIsCritical
+                          ? damage.total + (await getCritDamageBonus(member.roll.system.damage[damage.key].formula))
+                          : damage.total;
+                    if (context.selectedData.damageValues[damage.key]) {
+                        context.selectedData.damageValues[damage.key].total += damageTotal;
+                    } else {
+                        context.selectedData.damageValues[damage.key] = {
+                            ...foundry.utils.deepClone(damage),
+                            total: damageTotal
+                        };
                     }
                 }
+            }
+        }
 
-                return acc;
-            },
-            { result: null, damageValues: null }
-        );
         context.showResult = Object.values(context.members).reduce((enabled, member) => {
             if (!member.roll) return enabled;
             if (context.usesDamage) {
@@ -201,21 +211,41 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
             .map(key => game.messages.get(this.data.members[key].messageId));
 
         const systemData = foundry.utils.deepClone(mainRoll).system.toObject();
+        const criticalRoll = systemData.roll.isCritical;
         for (let roll of secondaryRolls) {
             if (roll.system.hasDamage) {
                 for (let key in roll.system.damage) {
                     var damage = roll.system.damage[key];
+                    const damageTotal =
+                        !roll.system.isCritical && criticalRoll
+                            ? (await getCritDamageBonus(damage.formula)) + damage.total
+                            : damage.total;
                     if (systemData.damage[key]) {
-                        systemData.damage[key].total += damage.total;
+                        const updatedDamageParts = damage.parts;
-                        systemData.damage[key].parts = [...systemData.damage[key].parts, ...damage.parts];
+                        if (!roll.system.isCritical && criticalRoll) {
+                            for (let part of updatedDamageParts) {
+                                const criticalDamage = await getCritDamageBonus(part.formula);
+                                if (criticalDamage) {
+                                    damage.formula = `${damage.formula} + ${criticalDamage}`;
+                                    part.formula = `${part.formula} + ${criticalDamage}`;
+                                    part.modifierTotal = part.modifierTotal + criticalDamage;
+                                    part.total += criticalDamage;
+                                    part.roll = new Roll(part.formula);
+                                }
+                            }
+                        }
+
+                        systemData.damage[key].formula = `${systemData.damage[key].formula} + ${damage.formula}`;
+                        systemData.damage[key].total += damageTotal;
+                        systemData.damage[key].parts = [...systemData.damage[key].parts, ...updatedDamageParts];
                     } else {
-                        systemData.damage[key] = damage;
+                        systemData.damage[key] = { ...damage, total: damageTotal, parts: updatedDamageParts };
                     }
                 }
             }
         }
-        systemData.title = game.i18n.localize('DAGGERHEART.APPLICATIONS.TagTeamSelect.chatMessageRollTitle');
 
+        systemData.title = game.i18n.localize('DAGGERHEART.APPLICATIONS.TagTeamSelect.chatMessageRollTitle');
         const cls = getDocumentClass('ChatMessage'),
             msgData = {
                 type: 'dualityRoll',
@@ -233,14 +263,16 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
         const fearUpdate = { key: 'fear', value: null, total: null, enabled: true };
         for (let memberId of Object.keys(this.data.members)) {
             const resourceUpdates = [];
-            if (systemData.roll.isCritical || systemData.roll.result.duality === 1) {
+            const rollGivesHope = systemData.roll.isCritical || systemData.roll.result.duality === 1;
-                const value =
+            if (memberId === this.data.initiator.id) {
-                    memberId !== this.data.initiator.id
+                const value = this.data.initiator.cost
-                        ? 1
+                    ? rollGivesHope
-                        : this.data.initiator.cost
+                        ? 1 - this.data.initiator.cost
-                          ? 1 - this.data.initiator.cost
+                        : -this.data.initiator.cost
-                          : 1;
+                    : 1;
                 resourceUpdates.push({ key: 'hope', value: value, total: -value, enabled: true });
+            } else if (rollGivesHope) {
+                resourceUpdates.push({ key: 'hope', value: 1, total: -1, enabled: true });
             }
             if (systemData.roll.isCritical) resourceUpdates.push({ key: 'stress', value: -1, total: 1, enabled: true });
             if (systemData.roll.result.duality === -1) {

module/helpers/utils.mjs

@@ -451,3 +451,8 @@ export async function waitForDiceSoNice(message) {
         await game.dice3d.waitFor3DAnimationByMessageID(message.id);
     }
 }
+
+export async function getCritDamageBonus(formula) {
+    const critRoll = new Roll(formula);
+    return critRoll.dice.reduce((acc, dice) => acc + dice.faces, 0);
+}

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.2.7",
+    "version": "1.3.0",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",